mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-12 02:40:31 +08:00
Compare commits
2 Commits
revert-227
...
ghcHEAD-up
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9e80e51471 | ||
|
|
374fb7334c |
@@ -186,8 +186,8 @@ stdenv.mkDerivation (rec {
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://gitlab.haskell.org/ghc/ghc.git/";
|
||||
rev = "cc635da167fdec2dead0603b0026cb841f0aa645";
|
||||
sha256 = "1lj76l546zriwkcn2r7i5a4j35bx9fh5iggwfz2xvhh8aq8j2i46";
|
||||
rev = "d85c7dcb7c457efc23b20ac8f4e4ae88bae5b050";
|
||||
sha256 = "sha256-Ez8P2G/mYG45wajk2QnObmrJsiHOuC6qhCT76R/RhYE=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -74,4 +74,6 @@ self: super: {
|
||||
# Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
|
||||
stack = doJailbreak super.stack;
|
||||
|
||||
jailbreak-cabal = appendPatch ./patches/jailbreak-Cabal-syntax.patch super.jailbreak-cabal;
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
diff --git a/jailbreak-cabal.cabal b/jailbreak-cabal.cabal
|
||||
index d34c616..10be8d4 100644
|
||||
--- a/jailbreak-cabal.cabal
|
||||
+++ b/jailbreak-cabal.cabal
|
||||
@@ -21,5 +21,10 @@ source-repository head
|
||||
|
||||
executable jailbreak-cabal
|
||||
main-is: Main.hs
|
||||
- build-depends: base < 5, Cabal == 3.*
|
||||
+ build-depends:
|
||||
+ base < 5,
|
||||
+ Cabal == 3.*
|
||||
+ if impl(ghc >= 9.3)
|
||||
+ build-depends:
|
||||
+ Cabal-syntax
|
||||
default-language: Haskell2010
|
||||
Reference in New Issue
Block a user