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

stutter: move overrides into configuration-nix.nix

Browse Source 
Move necessary overrides into configuration-nix.nix, so there's no
discrepancy between stutter and haskellPackages.stutter.

However the build of stutter is still broken its dependency snipcheck
doesn't build with the pandoc version we have.
This commit is contained in:
sternenseemann 2021-05-04 11:20:34 +02:00 committed by sterni
parent 86c975b00c
commit caf7725f95
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -841,4 +841,11 @@ self: super: builtins.intersectAttrs super {
export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH
''; '';
}); });
# tests need to execute the built executable
stutter = overrideCabal super.stutter (drv: {
preCheck = ''
export PATH=dist/build/stutter:$PATH
'' + (drv.preCheck or "");
});
} }

4
pkgs/top-level/all-packages.nix
View File

@ -8665,9 +8665,7 @@ in
stunnel = callPackage ../tools/networking/stunnel { }; stunnel = callPackage ../tools/networking/stunnel { };
stutter = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.stutter) (drv: { stutter = haskell.lib.justStaticExecutables haskellPackages.stutter;
preCheck = "export PATH=dist/build/stutter:$PATH";
});
strongswan = callPackage ../tools/networking/strongswan { }; strongswan = callPackage ../tools/networking/strongswan { };
strongswanTNC = strongswan.override { enableTNC = true; }; strongswanTNC = strongswan.override { enableTNC = true; };