nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 07:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

cabal-install: fix build of the latest version

Browse Source
This commit is contained in:
Peter Simons 2018-03-29 17:02:50 +02:00
parent c7c3f58fad
commit 0f90640518
4 changed files with 7 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,9 +32,13 @@ self: super: {
# compiled on Linux. We provide the name to avoid evaluation errors.
unbuildable = throw "package depends on meta package 'unbuildable'";
# hackage-security's test suite does not compile with Cabal 2.x.
# See https://github.com/haskell/hackage-security/issues/188.
hackage-security = dontCheck super.hackage-security;
# Use the latest version of the Cabal library.
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
# Use the latest version, which supports Cabal 2.2.x. Unfortunately, the test
# suite depends on old versions of tasty and QuickCheck.
hackage-security = self.hackage-security_0_5_3_0;
hackage-security_0_5_3_0 = dontCheck super.hackage-security_0_5_3_0;
# Link statically to avoid runtime dependency on GHC.
jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal;

4
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
View File

@ -173,10 +173,6 @@ self: super: {
# https://github.com/thoughtpolice/hs-ed25519/issues/13
ed25519 = dontCheck super.ed25519;
# https://github.com/well-typed/hackage-security/issues/157
# https://github.com/well-typed/hackage-security/issues/158
hackage-security = dontHaddock (dontCheck super.hackage-security);
# Breaks a dependency cycle between QuickCheck and semigroups
hashable = dontCheck super.hashable;
unordered-containers = dontCheck super.unordered-containers;

3
pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
View File

@ -41,9 +41,6 @@ self: super: {
prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal";
});
# cabal-install can use the native Cabal library.
cabal-install = super.cabal-install.override { Cabal = null; };
# jailbreak-cabal doesn't seem to work right with the native Cabal version.
jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal;

35
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View File

@ -118,41 +118,6 @@ self: super: {
## On Hackage:
## Upstreamed, awaiting a Hackage release
cabal-install = overrideCabal super.cabal-install (drv: {
## Setup: Encountered missing dependencies:
## Cabal >=2.0.1.0 && <2.1, base >=4.5 && <4.11
src = pkgs.fetchFromGitHub {
owner = "haskell";
repo = "cabal";
rev = "728ad1a1e066da453ae13ee479629c00d8c2f32d";
sha256 = "0943xpva0fjlx8fanqvb6bg7myim2pki7q8hz3q0ijnf73bgzf7p";
};
prePatch = "cd cabal-install; ";
## Setup: Encountered missing dependencies:
## network >=2.4 && <2.6, resolv >=0.1.1 && <0.2
libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ network resolv ]);
});
## Upstreamed, awaiting a Hackage release
hackage-security = overrideCabal super.hackage-security (drv: {
## Setup: Encountered missing dependencies:
## Cabal >=1.14 && <1.26,
## directory >=1.1.0.2 && <1.3,
## time >=1.2 && <1.7
src = pkgs.fetchFromGitHub {
owner = "haskell";
repo = "hackage-security";
rev = "21519f4f572b9547485285ebe44c152e1230fd76";
sha256 = "1ijwmps4pzyhsxfhc8mrnc3ldjvpisnmr457vvhgymwhdrr95k0z";
};
prePatch = "cd hackage-security; ";
## https://github.com/haskell/hackage-security/issues/211
jailbreak = true;
## error: while evaluating ‘overrideCabal’ at nixpkgs://pkgs/development/haskell-modules/lib.nix:37:24, called from /home/deepfire/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix:217:22:
editedCabalFile = null;
});
## Upstreamed, awaiting a Hackage release
haskell-gi = overrideCabal super.haskell-gi (drv: {
## Setup: Encountered missing dependencies: