From dec9ac364a4e894662e4f1895eb014bdb8abbd8f Mon Sep 17 00:00:00 2001 From: Chuck Date: Thu, 2 Apr 2020 18:09:34 -0700 Subject: [PATCH] darcs: Fix build (Use old GHC) This is fixed at upstream's head; this change can be reverted after darcs cuts a new release (current release is 2.14.2). --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 23853787b9c8..9c3b99f3525f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1498,4 +1498,8 @@ self: super: { # version of Polysemy the plugin goes with polysemy = self.polysemy_1_3_0_0; }; + + # Fixed at head, but hasn't cut a release in awhile. + darcs = doJailbreak super.darcs; + } // 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 5b98cdb2dad7..2239053f877c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3953,7 +3953,6 @@ broken-packages: - Dao - dao - dapi - - darcs - darcs-benchmark - darcs-beta - darcs-buildpackage diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b47fdbc72e7..1fa50a1eb20f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18883,7 +18883,7 @@ in dablin = callPackage ../applications/radio/dablin { }; - darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { + darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskell.packages.ghc865.darcs) (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; });