From 1e54ee80f298d533ea05bc4063d9181d2a771405 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 27 Nov 2018 15:54:06 +0100 Subject: [PATCH] haskell-chell: pin build to patience-0.1.x Newer version are not supported yet. --- .../haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/configuration-hackage2nix.yaml | 1 + .../haskell-modules/hackage-packages.nix | 14 ++++++++++++++ 3 files changed, 18 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e1c58dd49c4e..50901b7d1dac 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1185,4 +1185,7 @@ self: super: { # }); libnix = dontCheck super.libnix; + # https://github.com/jmillikin/chell/issues/1 + chell = super.chell.override { patience = self.patience_0_1_1; }; + } // 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 8ac91d65973f..4b50a1d52633 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2455,6 +2455,7 @@ extra-packages: - yesod-persistent < 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 - yesod-static ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 - yesod-test ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 + - patience ^>= 0.1 # required by chell-0.4.x package-maintainers: peti: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e6bfba602abd..6c30537c2ca1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -161832,6 +161832,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "patience_0_1_1" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "patience"; + version = "0.1.1"; + sha256 = "0qyv20gqy9pb1acy700ahv70lc6vprcwb26cc7fcpcs4scsc7irm"; + revision = "1"; + editedCabalFile = "0xj4hypjnhsn5jhs66l9wwhpkn5pbd8xmx7pgcy2ib08cz1087y7"; + libraryHaskellDepends = [ base containers ]; + description = "Patience diff and longest increasing subsequence"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "patience" = callPackage ({ mkDerivation, base, containers }: mkDerivation {