diff options
| author | Chuck <chuck@intelligence.org> | 2020-04-02 18:09:34 -0700 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-04-03 22:00:30 +0200 |
| commit | dec9ac364a4e894662e4f1895eb014bdb8abbd8f (patch) | |
| tree | 70c54c34ac8e35a0b3bc189aae990cac7a2ac5c9 | |
| parent | f660d6ec3dea443982f27152be672659ca3c7d1f (diff) | |
| download | nixpkgs-dec9ac364a4e894662e4f1895eb014bdb8abbd8f.tar nixpkgs-dec9ac364a4e894662e4f1895eb014bdb8abbd8f.tar.gz nixpkgs-dec9ac364a4e894662e4f1895eb014bdb8abbd8f.tar.bz2 nixpkgs-dec9ac364a4e894662e4f1895eb014bdb8abbd8f.tar.lz nixpkgs-dec9ac364a4e894662e4f1895eb014bdb8abbd8f.tar.xz nixpkgs-dec9ac364a4e894662e4f1895eb014bdb8abbd8f.tar.zst nixpkgs-dec9ac364a4e894662e4f1895eb014bdb8abbd8f.zip | |
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).
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 | ||||
| -rw-r--r-- | 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 23853787b9c..9c3b99f3525 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 5b98cdb2dad..2239053f877 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 2b47fdbc72e..1fa50a1eb20 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"]; }); |