diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-20 10:02:21 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-20 10:02:21 +0100 |
| commit | 10d0c68a9bb90f65684cd23ce96e93610f42a376 (patch) | |
| tree | 69d35d6d434969af02e6bc6e3d7e0fb1308f4d1f /pkgs/development/haskell-modules | |
| parent | a20dd9528b38dd02c4bf8e25f5f9e12fc9573f9f (diff) | |
| parent | 65edeb8633de16792a84195f77a6b4ea408e2608 (diff) | |
| download | nixpkgs-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar nixpkgs-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar.gz nixpkgs-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar.bz2 nixpkgs-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar.lz nixpkgs-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar.xz nixpkgs-10d0c68a9bb90f65684cd23ce96e93610f42a376.tar.zst nixpkgs-10d0c68a9bb90f65684cd23ce96e93610f42a376.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 5c54a90ce7e..ec0e4377f76 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -102,11 +102,6 @@ self: super: { vault = dontHaddock super.vault; monad-par = dontCheck super.monad-par; # test suite does not compile in monad-par-0.3.4.8 - # TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved - alex = appendPatch super.alex (pkgs.fetchpatch { - url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch"; - sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5"; - }); # https://github.com/snapframework/snap-core/issues/288 snap-core = overrideCabal super.snap-core (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail = Fail.fail' ''"; }); # needs a release diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index ba477e06e2f..e2d01c5798f 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -181,7 +181,10 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # '... foo = self.callHackage "foo" "1.5.3" {}; ...' callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version); - # callHackageDirect :: Text -> Text -> AttrSet -> HaskellPackage + # callHackageDirect + # :: { pkg :: Text, ver :: Text, sha256 :: Text } + # -> AttrSet + # -> HaskellPackage # # This function does not depend on all-cabal-hashes and therefore will work # for any version that has been released on hackage as opposed to only |