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

haskellPackages.splot: fix build

Browse Source 
Also introduce the top-level `splot` package which only provides the
statically linked `splot` binary.
This commit is contained in:
Bas van Dijk 2020-07-20 22:53:53 +02:00 committed by Peter Simons
parent 5d021fedc3
commit 9d17ec4073
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1405,4 +1405,9 @@ self: super: {
# https://github.com/lehins/massiv/pull/104 # https://github.com/lehins/massiv/pull/104
massiv = dontCheck super.massiv; massiv = dontCheck super.massiv;
# Upstream PR: https://github.com/jkff/splot/pull/9
splot = appendPatch super.splot (pkgs.fetchpatch {
url = "https://github.com/jkff/splot/commit/a6710b05470d25cb5373481cf1cfc1febd686407.patch";
sha256 = "1c5ck2ibag2gcyag6rjivmlwdlp5k0dmr8nhk7wlkzq2vh7zgw63";
});
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -9769,7 +9769,6 @@ broken-packages:
- splines - splines
- split-morphism - split-morphism
- splitter - splitter
- splot
- Spock - Spock
- Spock-api-ghcjs - Spock-api-ghcjs
- Spock-api-server - Spock-api-server

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

@ -6873,6 +6873,8 @@ in
speech-denoiser = callPackage ../applications/audio/speech-denoiser {}; speech-denoiser = callPackage ../applications/audio/speech-denoiser {};
splot = haskell.lib.justStaticExecutables haskellPackages.splot;
squashfsTools = callPackage ../tools/filesystems/squashfs { }; squashfsTools = callPackage ../tools/filesystems/squashfs { };
squashfs-tools-ng = callPackage ../tools/filesystems/squashfs-tools-ng { }; squashfs-tools-ng = callPackage ../tools/filesystems/squashfs-tools-ng { };