Pull in NixOS/nixpkgs#129289

and update nixpkgs to master, so that that PR applies nicely. We can worry about going back to stable later (if that fix doesn’t make it anyways)
nomeata · Jul 12, 2021 · 64757c1 · 64757c1
1 parent 45cd548
commit 64757c1
Show file tree

Hide file tree

Showing 6 changed files with 1,511 additions and 212 deletions.
diff --git a/nix/default.nix b/nix/default.nix
@@ -14,9 +14,7 @@ let
     name = "nixpkgs-patched";
     src = nixpkgs_src;
     patches = [
-      # ./patches/0001-ghc865-binary-Use-binary-distribution-which-links-ag.patch
-      # ./patches/0002-openblas-0.3.10-0.3.13.patch
-      # ./patches/fb063991b26b2b93dece6d09f37041451a5ef4cb.patch
+      ./patches/c114cd459e1bac0d05e4e27c9ea43c99799cbbd1.patch
     ];
   };
 

diff --git a/nix/patches/0001-ghc865-binary-Use-binary-distribution-which-links-ag.patch b/nix/patches/0001-ghc865-binary-Use-binary-distribution-which-links-ag.patch
diff --git a/nix/patches/0002-openblas-0.3.10-0.3.13.patch b/nix/patches/0002-openblas-0.3.10-0.3.13.patch