5 files changed, 21 insertions, 13 deletions
diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix
index 0bd057ad5132b..ca117baca7875 100644
--- a/pkgs/development/compilers/go/1.3.nix
+++ b/pkgs/development/compilers/go/1.3.nix
@@ -8,8 +8,8 @@ let
   loaderArm = "${glibc}/lib/ld-linux.so.3";
   srcs = {
     golang = fetchurl {
-      url = https://storage.googleapis.com/golang/go1.3.1.src.tar.gz;
-      sha256 = "fdfa148cc12f1e4ea45a5565261bf43d8a2e7d1fad4a16aed592d606223b93a8";
+      url = https://storage.googleapis.com/golang/go1.3.2.src.tar.gz;
+      sha256 = "1yq6xygc5lhn3b9d4sbddlf8dzi3wihyzjwyc8rhiwrb3hj8hx1y";
     };
     tools = fetchhg {
       url = https://code.google.com/p/go.tools/;
@@ -20,7 +20,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "go-1.3.1";
+  name = "go-1.3.2";
 
   src = srcs.golang;
 
diff --git a/pkgs/development/libraries/agda/aaron-stump-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
index 5f4275a34e418..fa8ed9e80a782 100644
--- a/pkgs/development/libraries/agda/aaron-stump-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix
@@ -2,7 +2,7 @@
 
 agda.mkDerivation (self: rec {
   version = "18437";
-  name = "aaron-stump-stdlib-${version}";
+  name = "agda-iowa-stdlib-${version}";
 
   src = fetchsvn {
     url = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib";
@@ -18,7 +18,7 @@ agda.mkDerivation (self: rec {
 
   meta = {
     homepage = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/";
-    description = "A standard library by Aaron Stump";
+    description = "Agda standard library developed at Iowa";
     license = stdenv.lib.licenses.free;
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix
index 3fabfd3f7212e..1e84a81e52414 100644
--- a/pkgs/tools/package-management/python2nix/default.nix
+++ b/pkgs/tools/package-management/python2nix/default.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
-
 pythonPackages.buildPythonPackage rec {
-  name = "python2nix-dev";
+  name = "python2nix-20140927";
  
-  # TODO: change to upstream once https://github.com/proger/python2nix/pull/3 is merged
   src = fetchFromGitHub {
-    owner = "iElectric";
+    owner = "proger";
     repo = "python2nix";
-    rev = "734de5f680425c6298eff46481e5e717d6e141a9";
-    sha256 = "09qpzml38rplbr7vhplhzy3iy5n9fd3ba5b9r9cp6d08sk5xidqf";
+    rev = "84e3a5bbe82e5d9d694d6db8dabf73def4ac917b";
+    sha256 = "022gr0gw6azfi3iq4ggb3fhkw2jljs6n5rncn45hb5liwakigj8i";
   };
 
   propagatedBuildInputs = with pythonPackages; [ requests pip setuptools ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41c174223036f..d3caeccb1bfc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6786,7 +6786,7 @@ let
 
   ### DEVELOPMENT / LIBRARIES / AGDA
 
-  aaronStumpStdlib = callPackage ../development/libraries/agda/aaron-stump-stdlib {};
+  agdaIowaStdlib = callPackage ../development/libraries/agda/agda-iowa-stdlib {};
 
   agda = callPackage ../build-support/agda {
     glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 673bfb1fa9ed6..e5e2784c45cf7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3470,6 +3470,11 @@ let
       md5 = "92978492871342ad64e8ae0ccfcf200c";
     };
 
+    preConfigure = ''
+      export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+      export LC_ALL="en_US.UTF-8"
+    '';
+
     propagatedBuildInputs = [ six pytz ];
 
     meta = {
@@ -5256,7 +5261,7 @@ let
 
     buildInputs = [ coverage ];
 
-    doCheck = ! stdenv.isDarwin;
+    doCheck = false;  # lot's of transient errors, too much hassle
     checkPhase = if python.is_py3k or false then ''
       ${python}/bin/${python.executable} setup.py build_tests
     '' else "" + ''
@@ -5804,6 +5809,11 @@ let
       md5 = "8e57bdd075503903125b14621b1e533d";
     };
 
+    preConfigure = ''
+      export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
+      export LC_ALL="en_US.UTF-8"
+    '';
+
     # Test data not provided
     #buildInputs = [nose mock];
     doCheck = false;