commit ff6e6b99477511c9e30a9c61b37618b53139ebca · pyrox.dev/nixpkgs

+22 -1

pkgs/development/haskell-modules/configuration-common.nix

···

       58
        
               in

     

       59
        
               # Some dead code is not properly eliminated on aarch64-darwin, leading

     

       60
        
               # to bogus references to some dependencies.

     

       61
       -
               overrideCabal (old: lib.optionalAttrs (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       62
        
                 postInstall = ''

     

       63
        
                   ${old.postInstall or ""}

     

       64
        
                   remove-references-to -t ${scope.HTTP} "$out/bin/.cabal-wrapped"

···

       58
        
               in

     

       59
        
               # Some dead code is not properly eliminated on aarch64-darwin, leading

     

       60
        
               # to bogus references to some dependencies.

     

       61
       +
               overrideCabal (old: {

     

       62
       +
                 # Prevent DOS line endings from Hackage from breaking a patch

     

       63
       +
                 prePatch = old.prePatch or "" + ''

     

       64
       +
                   ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal

     

       65
       +
                 '';

     

       66
       +
                 # Ignore unix bound intended to prevent an unix bug on 32bit systems.

     

       67
       +
                 # We apply a patch for this issue to the GHC core packages directly.

     

       68
       +
                 # See unix-fix-ctimeval-size-32-bit.patch in ../compilers/ghc/common-*.nix

     

       69
       +
                 patches =

     

       70
       +
                   old.patches or [ ]

     

       71
       +
                   ++ lib.optionals (

     

       72
       +
                     scope.unix == null

     

       73
       +
                     && lib.elem self.ghc.version [

     

       74
       +
                       "9.8.1"

     

       75
       +
                       "9.8.2"

     

       76
       +
                       "9.8.3"

     

       77
       +
                       "9.10.1"

     

       78
       +
                     ]

     

       79
       +
                   ) [

     

       80
       +
                     ./patches/cabal-install-3.14.1.1-lift-unix-bound.patch

     

       81
       +
                   ];

     

       82
       +
               } // lib.optionalAttrs (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) {

     

       83
        
                 postInstall = ''

     

       84
        
                   ${old.postInstall or ""}

     

       85
        
                   remove-references-to -t ${scope.HTTP} "$out/bin/.cabal-wrapped"

+11

pkgs/development/haskell-modules/patches/cabal-install-3.14.1.1-lift-unix-bound.patch

···

       1
       +
       --- a/cabal-install.cabal

     

       2
       +
       +++ b/cabal-install.cabal

     

       3
       +
       @@ -261,7 +261,7 @@

     

       4
       +
              -- newer directory for symlinks

     

       5
       +
              build-depends: Win32 >= 2.8 && < 3, directory >=1.3.1.0

     

       6
       +
            else

     

       7
       +
       -      build-depends: unix >= 2.5 && < 2.8 || >= 2.8.6.0 && < 2.9

     

       8
       +
       +      build-depends: unix >= 2.5 && < 2.9

     

       9
       +
        

     

       10
       +
            if flag(lukko)

     

       11
       +
              build-depends: lukko >= 0.1 && <0.2