From 9d17ec40734ba261bab39a39909c54958f72b66d Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Mon, 20 Jul 2020 22:53:53 +0200 Subject: [PATCH] haskellPackages.splot: fix build Also introduce the top-level `splot` package which only provides the statically linked `splot` binary. --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8cf0db998bde..cf32796c6e80 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1405,4 +1405,9 @@ self: super: { # https://github.com/lehins/massiv/pull/104 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 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 13b693ddc9bd..76e1b780f62c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -9769,7 +9769,6 @@ broken-packages: - splines - split-morphism - splitter - - splot - Spock - Spock-api-ghcjs - Spock-api-server diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a3e1da7c159..2c05589aae85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6873,6 +6873,8 @@ in speech-denoiser = callPackage ../applications/audio/speech-denoiser {}; + splot = haskell.lib.justStaticExecutables haskellPackages.splot; + squashfsTools = callPackage ../tools/filesystems/squashfs { }; squashfs-tools-ng = callPackage ../tools/filesystems/squashfs-tools-ng { };