ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 11:00:19 +03:00
Code Issues Projects Releases Wiki Activity

haskellPackages.yarn2nix: unbreak build

Browse Source 
* fix compilation error concerning protolude 0.3 by applying patch
* remove dependency on regex-tdfa-text which has been merged into
  regex-tdfa
This commit is contained in:
sternenseemann 2021-02-25 23:28:33 +01:00 committed by (cdep)illabout
parent c9fb7d308d
commit 1cdbaf46c0
No known key found for this signature in database
GPG Key ID: 462E0C03D11422F4
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1589,4 +1589,26 @@ self: super: {
# Overly strict version bounds: https://github.com/Profpatsch/yarn-lock/issues/8
yarn-lock = doJailbreak super.yarn-lock;
# Dependency to regex-tdfa-text can be removed for later regex-tdfa versions.
# Fix protolude compilation error by applying patch from pull-request.
# Override can be removed for the next release > 0.8.0.
yarn2nix = overrideCabal (super.yarn2nix.override {
regex-tdfa-text = null;
}) (attrs: {
jailbreak = true;
# remove dependency on regex-tdfa-text
# which has been merged into regex-tdfa
postPatch = ''
sed -i '/regex-tdfa-text/d' yarn2nix.cabal
'';
patches = (attrs.patches or []) ++ [
# fix a compilation error related to protolude 0.3
(pkgs.fetchpatch {
url = "https://github.com/Profpatsch/yarn2nix/commit/ca78cf06226819b2e78cb6cdbc157d27afb41532.patch";
sha256 = "1vkczwzhxilnp87apyb18nycn834y5nbw4yr1kpwlwhrhalvzw61";
includes = [ "*/ResolveLockfile.hs" ];
})
];
});
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super