commit 6d2cfa967d7fc4e83811d412c8167a745aae51a2 · pyrox.dev/nixpkgs

+4

pkgs/development/compilers/ghc/9.6.7.nix

···

       1
       1
       +
       import ./common-hadrian.nix {

     

       2
       2
       +
         version = "9.6.7";

     

       3
       3
       +
         sha256 = "sha256-0FO/bOHViKdc/oyTFiaUhunY+4nc32/ZKDb6Lj32EwU=";

     

       4
       4
       +
       }

+2 -1

pkgs/development/compilers/ghc/common-hadrian.nix

···

       173
       173
        
               in

     

       174
       174
        
       

     

       175
       175
        
               # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129

     

       176
       176
       -
               lib.optionals (lib.versionOlder version "9.8") [

     

       176
       176
       +
               lib.optionals (lib.versionOlder version "9.6.7") [

     

       177
       177
        
                  ./docs-sphinx-7.patch

     

       178
       178
        
               ]

     

       179
       179
        
       

     

       180
       180
        
               ++ lib.optional (

     

       181
       181
        
                 # 2025-01-16: unix >= 2.8.6.0 is unaffected which is shipped by GHC 9.12.1 and 9.8.4

     

       182
       182
        
                 lib.versionOlder version "9.11"

     

       183
       183
       +
                 && !(lib.versionAtLeast version "9.6.7" && lib.versionOlder version "9.8")

     

       183
       184
        
                 && !(lib.versionAtLeast version "9.8.4" && lib.versionOlder version "9.9")

     

       184
       185
        
               ) [

     

       185
       186
        
                 # Determine size of time related types using hsc2hs instead of assuming CLong.

+2 -1

pkgs/development/tools/haskell/hadrian/hadrian.nix

···

       52
       52
        
           # that only seems to affect Windows. We never build GHC natively on Windows.

     

       53
       53
        
           # https://gitlab.haskell.org/ghc/ghc/-/issues/24382

     

       54
       54
        
           # https://gitlab.haskell.org/ghc/ghc/-/commit/a2c033cf82635c83f3107706634bebee43297b99

     

       55
       55
       -
           (lib.versionAtLeast ghcVersion "9.12" && lib.versionOlder ghcVersion "9.15");

     

       55
       55
       +
           (lib.versionAtLeast ghcVersion "9.6.7" && lib.versionOlder ghcVersion "9.7")

     

       56
       56
       +
           || (lib.versionAtLeast ghcVersion "9.12" && lib.versionOlder ghcVersion "9.15");

     

       56
       57
        
         isLibrary = false;

     

       57
       58
        
         isExecutable = true;

     

       58
       59
        
         executableHaskellDepends =

+25 -2

pkgs/top-level/haskell-packages.nix

···

       267
       267
        
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;

     

       268
       268
        
               llvmPackages = pkgs.llvmPackages_15;

     

       269
       269
        
             };

     

       270
       270
       -
             ghc96 = compiler.ghc966;

     

       270
       270
       +
             ghc967 = callPackage ../development/compilers/ghc/9.6.7.nix {

     

       271
       271
       +
               bootPkgs =

     

       272
       272
       +
                 # For GHC 9.2 no armv7l bindists are available.

     

       273
       273
       +
                 if stdenv.buildPlatform.isAarch32 then

     

       274
       274
       +
                   bb.packages.ghc928

     

       275
       275
       +
                 else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then

     

       276
       276
       +
                   bb.packages.ghc928

     

       277
       277
       +
                 else

     

       278
       278
       +
                   bb.packages.ghc924Binary;

     

       279
       279
       +
               inherit (buildPackages.python3Packages) sphinx;

     

       280
       280
       +
               # Need to use apple's patched xattr until

     

       281
       281
       +
               # https://github.com/xattr/xattr/issues/44 and

     

       282
       282
       +
               # https://github.com/xattr/xattr/issues/55 are solved.

     

       283
       283
       +
               inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;

     

       284
       284
       +
               # Support range >= 11 && < 16

     

       285
       285
       +
               buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15;

     

       286
       286
       +
               llvmPackages = pkgs.llvmPackages_15;

     

       287
       287
       +
             };

     

       288
       288
       +
             ghc96 = compiler.ghc967;

     

       271
       289
        
             ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix {

     

       272
       290
        
               bootPkgs =

     

       273
       291
        
                 # For GHC 9.6 no armv7l bindists are available.

     
···

       527
       545
        
               ghc = bh.compiler.ghc966;

     

       528
       546
        
               compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };

     

       529
       547
        
             };

     

       530
       530
       -
             ghc96 = packages.ghc966;

     

       548
       548
       +
             ghc967 = callPackage ../development/haskell-modules {

     

       549
       549
       +
               buildHaskellPackages = bh.packages.ghc967;

     

       550
       550
       +
               ghc = bh.compiler.ghc967;

     

       551
       551
       +
               compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };

     

       552
       552
       +
             };

     

       553
       553
       +
             ghc96 = packages.ghc967;

     

       531
       554
        
             ghc981 = callPackage ../development/haskell-modules {

     

       532
       555
        
               buildHaskellPackages = bh.packages.ghc981;

     

       533
       556
        
               ghc = bh.compiler.ghc981;

+1

pkgs/top-level/release-haskell.nix