Skip to content

Commit f67a89e

Browse files
committedMar 7, 2017
haskell: use new justStaticExecutables and add purescript
1 parent db23fe1 commit f67a89e

File tree

1 file changed

+6
-24
lines changed

1 file changed

+6
-24
lines changed
 

‎pkgs/top-level/all-packages.nix

+6-24
Original file line numberDiff line numberDiff line change
@@ -3287,14 +3287,9 @@ with pkgs;
32873287

32883288
pal = callPackage ../tools/misc/pal { };
32893289

3290-
pandoc = haskell.lib.overrideCabal haskellPackages.pandoc (drv: {
3290+
pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: {
32913291
configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
32923292
buildTools = drv.buildTools or [] ++ [haskellPackages.hsb2hs];
3293-
enableSharedExecutables = false;
3294-
enableSharedLibraries = false;
3295-
isLibrary = false;
3296-
doHaddock = false;
3297-
postFixup = "rm -rf $out/lib $out/nix-support $out/share";
32983293
});
32993294

33003295
panomatic = callPackage ../tools/graphics/panomatic { };
@@ -5132,15 +5127,12 @@ with pkgs;
51325127

51335128
cabal-install = haskell.lib.disableSharedExecutables haskellPackages.cabal-install;
51345129

5135-
stack = haskell.lib.overrideCabal haskellPackages.stack (drv: {
5136-
enableSharedExecutables = false;
5137-
isLibrary = false;
5138-
doHaddock = false;
5139-
postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
5140-
});
5130+
stack = haskell.lib.justStaticExecutables haskellPackages.stack;
51415131

51425132
all-cabal-hashes = callPackage ../data/misc/hackage/default.nix { };
51435133

5134+
purescript = haskell.lib.justStaticExecutables haskellPackages.purescript;
5135+
51445136
inherit (ocamlPackages) haxe;
51455137

51465138
hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { };
@@ -6756,12 +6748,7 @@ with pkgs;
67566748

67576749
shards = callPackage ../development/tools/build-managers/shards { };
67586750

6759-
shellcheck = haskell.lib.overrideCabal haskellPackages.ShellCheck (drv: {
6760-
isLibrary = false;
6761-
enableSharedExecutables = false;
6762-
doHaddock = false;
6763-
postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
6764-
});
6751+
shellcheck = haskell.lib.justStaticExecutables haskellPackages.ShellCheck;
67656752

67666753
shncpd = callPackage ../tools/networking/shncpd { };
67676754

@@ -13020,13 +13007,8 @@ with pkgs;
1302013007

1302113008
cyclone = callPackage ../applications/audio/pd-plugins/cyclone { };
1302213009

13023-
darcs = haskell.lib.overrideCabal haskellPackages.darcs (drv: {
13010+
darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: {
1302413011
configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"];
13025-
enableSharedExecutables = false;
13026-
enableSharedLibraries = false;
13027-
isLibrary = false;
13028-
doHaddock = false;
13029-
postFixup = "rm -rf $out/lib $out/nix-support $out/share";
1303013012
});
1303113013

1303213014
darktable = callPackage ../applications/graphics/darktable {

0 commit comments

Comments
 (0)
Please sign in to comment.