commit 643169bbb48126a3b6ec3c4a32bbbe7a815d11c8 · pyrox.dev/nixpkgs

+10

pkgs/development/compilers/ghc/8.10.1.nix

···

       116
       116
        
       

     

       117
       117
        
         outputs = [ "out" "doc" ];

     

       118
       118
        
       

     

       119
       119
       +
         patches = [

     

       120
       120
       +
           # See upstream patch at

     

       121
       121
       +
           # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build

     

       122
       122
       +
           # from source distributions, the auto-generated configure script needs to be

     

       123
       123
       +
           # patched as well, therefore we use an in-tree patch instead of pulling the

     

       124
       124
       +
           # upstream patch. Don't forget to check backport status of the upstream patch

     

       125
       125
       +
           # when adding new GHC releases in nixpkgs.

     

       126
       126
       +
           ./respect-ar-path.patch

     

       127
       127
       +
         ];

     

       128
       128
       +
       

     

       119
       129
        
         postPatch = "patchShebangs .";

     

       120
       130
        
       

     

       121
       131
        
         # GHC is a bit confused on its cross terminology.

+9 -1

pkgs/development/compilers/ghc/8.10.2.nix

···

       107
       107
        
       

     

       108
       108
        
         outputs = [ "out" "doc" ];

     

       109
       109
        
       

     

       110
       110
       -
         # https://gitlab.haskell.org/ghc/ghc/-/issues/18549

     

       111
       110
        
         patches = [

     

       111
       111
       +
           # See upstream patch at

     

       112
       112
       +
           # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build

     

       113
       113
       +
           # from source distributions, the auto-generated configure script needs to be

     

       114
       114
       +
           # patched as well, therefore we use an in-tree patch instead of pulling the

     

       115
       115
       +
           # upstream patch. Don't forget to check backport status of the upstream patch

     

       116
       116
       +
           # when adding new GHC releases in nixpkgs.

     

       117
       117
       +
           ./respect-ar-path.patch

     

       118
       118
       +
       

     

       119
       119
       +
           # https://gitlab.haskell.org/ghc/ghc/-/issues/18549

     

       112
       120
        
           ./issue-18549.patch

     

       113
       121
        
         ] ++ lib.optionals stdenv.isDarwin [

     

       114
       122
        
           # Make Block.h compile with c++ compilers. Remove with the next release

+9 -1

pkgs/development/compilers/ghc/8.10.3.nix

···

       107
       107
        
       

     

       108
       108
        
         outputs = [ "out" "doc" ];

     

       109
       109
        
       

     

       110
       110
       -
         patches = lib.optionals stdenv.isDarwin [

     

       110
       110
       +
         patches = [

     

       111
       111
       +
           # See upstream patch at

     

       112
       112
       +
           # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build

     

       113
       113
       +
           # from source distributions, the auto-generated configure script needs to be

     

       114
       114
       +
           # patched as well, therefore we use an in-tree patch instead of pulling the

     

       115
       115
       +
           # upstream patch. Don't forget to check backport status of the upstream patch

     

       116
       116
       +
           # when adding new GHC releases in nixpkgs.

     

       117
       117
       +
           ./respect-ar-path.patch

     

       118
       118
       +
         ] ++ stdenv.lib.optionals stdenv.isDarwin [

     

       111
       119
        
           # Make Block.h compile with c++ compilers. Remove with the next release

     

       112
       120
        
           (fetchpatch {

     

       113
       121
        
             url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";

+8

pkgs/development/compilers/ghc/8.6.5.nix

···

       110
       110
        
         outputs = [ "out" "doc" ];

     

       111
       111
        
       

     

       112
       112
        
         patches = [

     

       113
       113
       +
           # See upstream patch at

     

       114
       114
       +
           # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build

     

       115
       115
       +
           # from source distributions, the auto-generated configure script needs to be

     

       116
       116
       +
           # patched as well, therefore we use an in-tree patch instead of pulling the

     

       117
       117
       +
           # upstream patch. Don't forget to check backport status of the upstream patch

     

       118
       118
       +
           # when adding new GHC releases in nixpkgs.

     

       119
       119
       +
           ./respect-ar-path.patch

     

       120
       120
       +
       

     

       113
       121
        
           (fetchpatch { # https://phabricator.haskell.org/D5123

     

       114
       122
        
            url = "https://gitlab.haskell.org/ghc/ghc/-/commit/13ff0b7ced097286e0d7b054f050871effe07f86.diff";

     

       115
       123
        
            name = "D5123.diff";

+10

pkgs/development/compilers/ghc/8.8.2.nix

···

       111
       111
        
       

     

       112
       112
        
         outputs = [ "out" "doc" ];

     

       113
       113
        
       

     

       114
       114
       +
         patches = [

     

       115
       115
       +
           # See upstream patch at

     

       116
       116
       +
           # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build

     

       117
       117
       +
           # from source distributions, the auto-generated configure script needs to be

     

       118
       118
       +
           # patched as well, therefore we use an in-tree patch instead of pulling the

     

       119
       119
       +
           # upstream patch. Don't forget to check backport status of the upstream patch

     

       120
       120
       +
           # when adding new GHC releases in nixpkgs.

     

       121
       121
       +
           ./respect-ar-path.patch

     

       122
       122
       +
         ];

     

       123
       123
       +
       

     

       114
       124
        
         postPatch = "patchShebangs .";

     

       115
       125
        
       

     

       116
       126
        
         # GHC is a bit confused on its cross terminology.

+10

pkgs/development/compilers/ghc/8.8.3.nix

···

       116
       116
        
       

     

       117
       117
        
         outputs = [ "out" "doc" ];

     

       118
       118
        
       

     

       119
       119
       +
         patches = [

     

       120
       120
       +
           # See upstream patch at

     

       121
       121
       +
           # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build

     

       122
       122
       +
           # from source distributions, the auto-generated configure script needs to be

     

       123
       123
       +
           # patched as well, therefore we use an in-tree patch instead of pulling the

     

       124
       124
       +
           # upstream patch. Don't forget to check backport status of the upstream patch

     

       125
       125
       +
           # when adding new GHC releases in nixpkgs.

     

       126
       126
       +
           ./respect-ar-path.patch

     

       127
       127
       +
         ];

     

       128
       128
       +
       

     

       119
       129
        
         postPatch = "patchShebangs .";

     

       120
       130
        
       

     

       121
       131
        
         # GHC is a bit confused on its cross terminology.

+10

pkgs/development/compilers/ghc/8.8.4.nix

···

       116
       116
        
       

     

       117
       117
        
         outputs = [ "out" "doc" ];

     

       118
       118
        
       

     

       119
       119
       +
         patches = [

     

       120
       120
       +
           # See upstream patch at

     

       121
       121
       +
           # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build

     

       122
       122
       +
           # from source distributions, the auto-generated configure script needs to be

     

       123
       123
       +
           # patched as well, therefore we use an in-tree patch instead of pulling the

     

       124
       124
       +
           # upstream patch. Don't forget to check backport status of the upstream patch

     

       125
       125
       +
           # when adding new GHC releases in nixpkgs.

     

       126
       126
       +
           ./respect-ar-path.patch

     

       127
       127
       +
         ];

     

       128
       128
       +
       

     

       119
       129
        
         postPatch = "patchShebangs .";

     

       120
       130
        
       

     

       121
       131
        
         # GHC is a bit confused on its cross terminology.

+25

pkgs/development/compilers/ghc/respect-ar-path.patch

···

       1
       1
       +
       diff -urd a/aclocal.m4 b/aclocal.m4

     

       2
       2
       +
       --- a/aclocal.m4

     

       3
       3
       +
       +++ b/aclocal.m4

     

       4
       4
       +
       @@ -1199,7 +1199,8 @@

     

       5
       5
       +
        # thinks that target == host so it never checks the unqualified

     

       6
       6
       +
        # tools for Windows. See #14274.

     

       7
       7
       +
        AC_DEFUN([FP_PROG_AR],

     

       8
       8
       +
       -[if test -z "$fp_prog_ar"; then

     

       9
       9
       +
       +[AC_SUBST(fp_prog_ar,$AR)

     

       10
       10
       +
       +if test -z "$fp_prog_ar"; then

     

       11
       11
       +
          if test "$HostOS" = "mingw32"

     

       12
       12
       +
          then

     

       13
       13
       +
            AC_PATH_PROG([fp_prog_ar], [ar])

     

       14
       14
       +
       diff -urd a/configure b/configure

     

       15
       15
       +
       --- a/configure

     

       16
       16
       +
       +++ b/configure

     

       17
       17
       +
       @@ -10744,6 +10744,8 @@

     

       18
       18
       +
        test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'

     

       19
       19
       +
        

     

       20
       20
       +
        

     

       21
       21
       +
       +fp_prog_ar=$AR

     

       22
       22
       +
       +

     

       23
       23
       +
        if test -z "$fp_prog_ar"; then

     

       24
       24
       +
          if test "$HostOS" = "mingw32"

     

       25
       25
       +
          then