colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge latest changes from trunk

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32270
This commit is contained in:
Peter Simons 2012-02-14 13:47:27 +00:00
parent f7886ac78b
commit 02eaa57b56
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/firefox/10.0.nix
View File

@ -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 =

4
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View File

@ -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;

6
pkgs/development/libraries/java/geoipjava/default.nix
View File

@ -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 =

2
pkgs/top-level/all-packages.nix
View File

@ -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;