Author: simons
Date: Tue Feb 14 13:47:27 2012
New Revision: 32270
URL: https://nixos.org/websvn/nix/?rev=32270&sc=1
Log:
merge latest changes from trunk
Modified:
nixpkgs/branches/stdenv-updates/ (props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/10.0.nix
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/instant-messengers/pidgin/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/java/geoipjava/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/10.0.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/10.0.nix
Tue Feb 14 10:56:01 2012 (r32269)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/10.0.nix
Tue Feb 14 13:47:27 2012 (r32270)
@@ -15,14 +15,14 @@
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 =
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/instant-messengers/pidgin/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/instant-messengers/pidgin/default.nix
Tue Feb 14 10:56:01 2012 (r32269)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/instant-messengers/pidgin/default.nix
Tue Feb 14 13:47:27 2012 (r32270)
@@ -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;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/java/geoipjava/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/java/geoipjava/default.nix
Tue Feb 14 10:56:01 2012 (r32269)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/java/geoipjava/default.nix
Tue Feb 14 13:47:27 2012 (r32270)
@@ -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 =
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue Feb
14 10:56:01 2012 (r32269)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Tue Feb
14 13:47:27 2012 (r32270)
@@ -6821,7 +6821,7 @@
firefoxWrapper = wrapFirefox { browser = pkgs.firefox; };
- firefoxPkgs = pkgs.firefox90Pkgs;
+ firefoxPkgs = pkgs.firefox100Pkgs;
firefox36Pkgs = callPackage
../applications/networking/browsers/firefox/3.6.nix {
inherit (gtkLibs) gtk pango;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
