about summary refs log tree commit diff
path: root/pkgs/development/libraries/glibc/common.nix
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2022-12-08 14:34:53 +0100
committerVladimír Čunát <v@cunat.cz>2022-12-08 14:34:53 +0100
commit5dffcba8fe7bd664d0da16dbe2a155a674ab9088 (patch)
tree09b737218bbfa3daa0dab8fec139a6261cd471e0 /pkgs/development/libraries/glibc/common.nix
parentec7567ba190d60a090952066bec4d3d53d003380 (diff)
glibc: revert one patch from those added in parent commit
For now.  It causes issues in python3Packages.twisted testsuite,
so maybe it's buggy.  The tests might be buggy instead, but so far
we've had no report of the issues that are to be fixed by the patch.
https://github.com/NixOS/nixpkgs/pull/201805#issuecomment-1342735635
Diffstat (limited to 'pkgs/development/libraries/glibc/common.nix')
-rw-r--r--pkgs/development/libraries/glibc/common.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 88b101ced7035..61c0c92d5280a 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -72,6 +72,9 @@ stdenv.mkDerivation ({
        */
       ./2.35-master.patch.gz
 
+      /* Revert this patch contained in the previous bundle.  For now, until we know more. */
+      ./revert-mktime.patch
+
       /* Allow NixOS and Nix to handle the locale-archive. */
       ./nix-locale-archive.patch