summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2011-06-22 12:21:15 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2011-06-22 12:21:15 +0000
commit611aecaeeb1d2f4731cea7fbc488ece636e00fff (patch)
treef461c95293d40345284423f61f1037a9a8751c99 /pkgs
parent0f1bf980346101a23e4b33d7d02c82fc21e01575 (diff)
downloadnixlib-611aecaeeb1d2f4731cea7fbc488ece636e00fff.tar
nixlib-611aecaeeb1d2f4731cea7fbc488ece636e00fff.tar.gz
nixlib-611aecaeeb1d2f4731cea7fbc488ece636e00fff.tar.bz2
nixlib-611aecaeeb1d2f4731cea7fbc488ece636e00fff.tar.lz
nixlib-611aecaeeb1d2f4731cea7fbc488ece636e00fff.tar.xz
nixlib-611aecaeeb1d2f4731cea7fbc488ece636e00fff.tar.zst
nixlib-611aecaeeb1d2f4731cea7fbc488ece636e00fff.zip
* Firefox 5.0.
* nspr updated to 4.8.8.

svn path=/nixpkgs/trunk/; revision=27516
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/browsers/firefox/5.0.nix10
-rw-r--r--pkgs/development/libraries/nspr/default.nix4
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/5.0.nix b/pkgs/applications/networking/browsers/firefox/5.0.nix
index 8848219845ef..e1e6ef44a019 100644
--- a/pkgs/applications/networking/browsers/firefox/5.0.nix
+++ b/pkgs/applications/networking/browsers/firefox/5.0.nix
@@ -19,12 +19,10 @@ rec {
   
   xulVersion = "5.0"; # this attribute is used by other packages
 
-  versionSuffix = "-rc1";
-
   
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/5.0-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha256 = "0i6zxvhvf717bzz3mwlbvrk601k81r38fym0fv2nlvr9r207vybb";
+    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
+    sha1 = "22b7b4751173c2142a0f09cca1aebc717d97b45a";
   };
 
   
@@ -52,7 +50,7 @@ rec {
 
 
   xulrunner = stdenv.mkDerivation rec {
-    name = "xulrunner-${xulVersion}${versionSuffix}";
+    name = "xulrunner-${xulVersion}";
     
     inherit src;
 
@@ -121,7 +119,7 @@ rec {
 
 
   firefox = stdenv.mkDerivation rec {
-    name = "firefox-${firefoxVersion}${versionSuffix}";
+    name = "firefox-${firefoxVersion}";
 
     inherit src;
 
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index c259a30441ac..2509f26b5cbe 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl }:
 
-let version = "4.8.7"; in
+let version = "4.8.8"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "eb9459c31d43d1000fb1304f1e0cedab0bdac3c54c71988259c1ac10c1fe16a3";
+    sha256 = "1jfl97hbb88lpyvhcv6q8zrqyw9wri2m838qdhwkwcgfsbgg9wwj";
   };
 
   preConfigure = "cd mozilla/nsprpub";