Merge pull request #6807 from NixOS/curl-patch

curl: patch for netrc regression in Nix
2022-07-14 19:30:14 -05:00 · 2022-07-14 19:30:14 -05:00 · de287964d5
parent ca4d5bee09 99208bb8cc
commit de287964d5
2 changed files with 5 additions and 5 deletions
--- a/flake.lock
+++ b/flake.lock
@ -18,11 +18,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1653988320,
-        "narHash": "sha256-ZaqFFsSDipZ6KVqriwM34T739+KLYJvNmCWzErjAg7c=",
+        "lastModified": 1657693803,
+        "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "2fa57ed190fd6c7c746319444f34b5917666e5c1",
+        "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -108,7 +108,7 @@
          ++ lib.optionals stdenv.hostPlatform.isLinux [(buildPackages.util-linuxMinimal or buildPackages.utillinuxMinimal)];

        buildDeps =
-          [ curl
+          [ (curl.override { patchNetrcRegression = true; })
            bzip2 xz brotli editline
            openssl sqlite
            libarchive
@ -363,7 +363,7 @@

              buildInputs =
                [ nix
-                  curl
+                  (curl.override { patchNetrcRegression = true; })
                  bzip2
                  xz
                  pkgs.perl