lol
fork

Configure Feed

Select the types of activity you want to include in your feed.

ghc-head: Fixes for new base and Cabal

+46 -2
+7
pkgs/development/haskell-modules/configuration-ghc-head.nix
··· 86 86 # Won't work with LLVM 3.5. 87 87 llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; 88 88 89 + # A bunch of jailbreaks due to 'base' bump 90 + old-locale = doJailbreak super.old-locale; 91 + primitive = doJailbreak super.primitive; 92 + test-framework = doJailbreak super.test-framework; 93 + atomic-primops = doJailbreak (appendPatch super.atomic-primops ./patches/atomic-primops-Cabal-1.25.patch); 94 + hashable = doJailbreak super.hashable; 95 + stm = doJailbreak super.stm; 89 96 }
+2 -2
pkgs/development/haskell-modules/hackage-packages.nix
··· 106695 106695 ({ mkDerivation, base, Cabal }: 106696 106696 mkDerivation { 106697 106697 pname = "jailbreak-cabal"; 106698 - version = "1.3.1"; 106699 - sha256 = "610d8dbd04281eee3d5da05c9eef45bfd1a1ddca20dfe54f283e15ddf6d5c235"; 106698 + version = "1.3.2"; 106699 + sha256 = "1x2h54sx4ycik34q8f9g698xc2b7fai18918cd08qx7w7ny8nai1"; 106700 106700 isLibrary = false; 106701 106701 isExecutable = true; 106702 106702 executableHaskellDepends = [ base Cabal ];
+37
pkgs/development/haskell-modules/patches/atomic-primops-Cabal-1.25.patch
··· 1 + diff --git a/Setup.hs b/Setup.hs 2 + index ddf5a02..7ad1f26 100644 3 + --- a/Setup.hs 4 + +++ b/Setup.hs 5 + @@ -1,4 +1,4 @@ 6 + - 7 + +{-# LANGUAGE CPP #-} 8 + import Control.Monad (when) 9 + import Language.Haskell.TH 10 + import Distribution.Simple (defaultMainWithHooks, simpleUserHooks, UserHooks(postConf), Args) 11 + @@ -6,14 +6,25 @@ import Distribution.Simple.Utils (cabalVersion) 12 + import Distribution.Simple.LocalBuildInfo 13 + import Distribution.Simple.Setup (ConfigFlags) 14 + import Distribution.Version (Version(..)) 15 + +#if MIN_VERSION_Cabal(1,25,0) 16 + +import Distribution.Version (mkVersion) 17 + +#endif 18 + import Distribution.PackageDescription (PackageDescription) 19 + import Debug.Trace 20 + 21 + +#if MIN_VERSION_Cabal(1,25,0) 22 + +versionBranch :: Version -> Version 23 + +versionBranch = id 24 + +#else 25 + +mkVersion :: [Int] -> Version 26 + +mkVersion vs = Version vs [] 27 + +#endif 28 + + 29 + -- I couldn't figure out a way to do this check from the cabal file, so we drop down 30 + -- here to do it instead: 31 + checkGoodVersion :: IO () 32 + checkGoodVersion = 33 + - if cabalVersion >= Version [1,17,0] [] 34 + + if cabalVersion >= mkVersion [1,17,0] 35 + then putStrLn (" [Setup.hs] This version of Cabal is ok for profiling: "++show cabalVersion) 36 + else error (" [Setup.hs] This package should not be used in profiling mode with cabal version "++ 37 + show (versionBranch cabalVersion)++" < 1.17.0\n"++