diff options
| author | Peter Simons <simons@cryp.to> | 2012-02-14 13:47:27 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-02-14 13:47:27 +0000 |
| commit | 02eaa57b562b0e2c43774ff8ffc247cabfaa5add (patch) | |
| tree | 81450e5ebdba941e677d8282b8c3f8b786011b16 /pkgs | |
| parent | f7886ac78be476514a390e3c1fd4cd95f0bcb522 (diff) | |
| download | nixpkgs-02eaa57b562b0e2c43774ff8ffc247cabfaa5add.tar nixpkgs-02eaa57b562b0e2c43774ff8ffc247cabfaa5add.tar.gz nixpkgs-02eaa57b562b0e2c43774ff8ffc247cabfaa5add.tar.bz2 nixpkgs-02eaa57b562b0e2c43774ff8ffc247cabfaa5add.tar.lz nixpkgs-02eaa57b562b0e2c43774ff8ffc247cabfaa5add.tar.xz nixpkgs-02eaa57b562b0e2c43774ff8ffc247cabfaa5add.tar.zst nixpkgs-02eaa57b562b0e2c43774ff8ffc247cabfaa5add.zip | |
merge latest changes from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32270
Diffstat (limited to 'pkgs')
4 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/10.0.nix b/pkgs/applications/networking/browsers/firefox/10.0.nix index 79869b324b9..3a688cb6669 100644 --- a/pkgs/applications/networking/browsers/firefox/10.0.nix +++ b/pkgs/applications/networking/browsers/firefox/10.0.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; rec { - firefoxVersion = "10.0"; + firefoxVersion = "10.0.1"; - xulVersion = "10.0"; # this attribute is used by other packages + xulVersion = "10.0.1"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "cbf1fb0efe0a3a2b2dafaa324b136736e93de70c"; + sha1 = "8613957db84e6722ccf1ebf74fab927139614bfc"; }; commonConfigureFlags = diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 89c3a10a45e..637744fc182 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { name = "pidgin-2.9.0"; src = fetchurl { - url = mirror://sourceforge/pidgin/pidgin-2.9.0.tar.bz2; - sha256 = "1mygaap7cbak9n9zm4wshxnvb27a68w633d712vy2knr8z78xvi8"; + url = mirror://sourceforge/pidgin/pidgin-2.10.1.tar.bz2; + sha256 = "2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8"; }; inherit nss ncurses; diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index 9cd61adf775..a924e2adfa6 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, jdk, unzip}: stdenv.mkDerivation { - name = "GeoIPJava-1.2.3"; + name = "GeoIPJava-1.2.5"; src = fetchurl { - url = http://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.3.zip; - sha256 = "0l8vxan2xh0mp1vjxh39q05jyfw8gk5y77b7i8s1aw7ssyzd05vs"; + url = http://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip; + sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; buildInputs = [ jdk unzip ]; buildPhase = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 521ac8b2a66..b0774c0e2f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6821,7 +6821,7 @@ let firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; - firefoxPkgs = pkgs.firefox90Pkgs; + firefoxPkgs = pkgs.firefox100Pkgs; firefox36Pkgs = callPackage ../applications/networking/browsers/firefox/3.6.nix { inherit (gtkLibs) gtk pango; |