JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haskellPackages.hnix: Patch to fix broken location annotations

Browse Source 
Also reenable tests for update-nix-fetchgit
This commit is contained in:
Joe Hermaszewski 2021-05-22 16:14:27 +08:00
parent d45bcb549e
commit 4d9f73595f
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -203,6 +203,13 @@ self: super: {
sha256 = "0pqmijfkysjixg3gb4kmrqdif7s2saz8qi6k337jf15i0npzln8d"; sha256 = "0pqmijfkysjixg3gb4kmrqdif7s2saz8qi6k337jf15i0npzln8d";
revert = true; revert = true;
}) })
# fix broken location annotations (necessary for update-nix-fetchgit).
# Can be removed on the next hnix release after
# https://github.com/haskell-nix/hnix/pull/936 is merged.
(pkgs.fetchpatch {
url = "https://github.com/expipiplus1/hnix/commit/7cd998426ab7d930d288a1d6e266dc4e85cece3d.patch";
sha256 = "19ay6vxa90ykgdd0fis2djvki2kpgfsq7z55iyqg965m583vsfr6";
})
] ++ (drv.patches or []); ] ++ (drv.patches or []);
# make sure patches are not broken by cabal file revisions # make sure patches are not broken by cabal file revisions
revision = null; revision = null;
@ -1379,10 +1386,7 @@ self: super: {
}" }"
''; '';
# 2021-04-09: test failure # These can both be removed upon the release of update-nix-fetchgit-0.2.7
# PR pending https://github.com/expipiplus1/update-nix-fetchgit/pull/60
doCheck = false;
patches = [ patches = [
# 2021-05-17 compile with hnix >= 0.13 # 2021-05-17 compile with hnix >= 0.13
# https://github.com/expipiplus1/update-nix-fetchgit/pull/64 # https://github.com/expipiplus1/update-nix-fetchgit/pull/64
@ -1390,6 +1394,12 @@ self: super: {
url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/bc28c8b26c38093aa950574802012c0cd8447ce8.patch"; url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/bc28c8b26c38093aa950574802012c0cd8447ce8.patch";
sha256 = "1dwd1jdsrx3ss6ql1bk2ch7ln74mkq6jy9ms8vi8kmf3gbg8l9fg"; sha256 = "1dwd1jdsrx3ss6ql1bk2ch7ln74mkq6jy9ms8vi8kmf3gbg8l9fg";
}) })
# Fix test failure
# https://github.com/expipiplus1/update-nix-fetchgit/pull/60
(pkgs.fetchpatch {
url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/4a43e1ea4e7e1c18de81e3f9fe0b86faa70865f5.patch";
sha256 = "1z74c1blgwr4q37m1rhlj7534qbnp3nnxf63m8j2b7iz0ljgm0m9";
})
] ++ (drv.patches or []); ] ++ (drv.patches or []);
})); }));