Author: ludo
Date: Sat Jun 11 14:36:51 2011
New Revision: 27418
URL: https://svn.nixos.org/websvn/nix/?rev=27418&sc=1

Log:
glibc: Update patch list from glibc 2.12 in Nixpkgs/trunk.

Modified:
   hydra-config/gnu/trunk/glibc/release.nix

Modified: hydra-config/gnu/trunk/glibc/release.nix
==============================================================================
--- hydra-config/gnu/trunk/glibc/release.nix    Sat Jun 11 07:28:17 2011        
(r27417)
+++ hydra-config/gnu/trunk/glibc/release.nix    Sat Jun 11 14:36:51 2011        
(r27418)
@@ -183,10 +183,9 @@
        src = glibcSrc;
 
         patches =
-          (map (x: "${nixpkgs}/pkgs/development/libraries/glibc-2.11/${x}")
-               [ "locale-override.patch"       # NixOS-specific
+          (map (x: "${nixpkgs}/pkgs/development/libraries/glibc-2.12/${x}")
+               [ "nix-locale-archive.patch"    # NixOS-specific
                  "rpcgen-path.patch"           # submit upstream?
-                 "stack-protector-link.patch"  # submit upstream?
                ])
           ++ [ ./ignore-git-diff.patch
                ./add-local-changes-to-tarball.patch
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to