commit bf6759839ab0d1279ad61a6623bb9e8cae8faab0 · pyrox.dev/nixpkgs

+2 -2

pkgs/development/compilers/ghc/6.10.2-binary.nix

···

       1
       1
       -
       {stdenv, lib, fetchurl, perl, libedit, ncurses, gmp}:

     

       1
       1
       +
       {stdenv, lib, fetchurl, perl, libedit, ncurses5, gmp}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "6.10.2";

     
···

       40
       40
        
           (if stdenv.isLinux then ''

     

       41
       41
        
             find . -type f -perm -0100 \

     

       42
       42
        
                 -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       43
       43
       -
                 --set-rpath "${libedit}/lib:${ncurses.out}/lib:${gmp.out}/lib" {} \;

     

       43
       43
       +
                 --set-rpath "${libedit}/lib:${ncurses5.out}/lib:${gmp.out}/lib" {} \;

     

       44
       44
        
             for prog in ld ar gcc strip ranlib; do

     

       45
       45
        
               find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;

     

       46
       46
        
             done

+2 -2

pkgs/development/compilers/ghc/7.0.4-binary.nix

···

       1
       1
       -
       {stdenv, fetchurl, perl, ncurses, gmp, libiconv}:

     

       1
       1
       +
       {stdenv, fetchurl, perl, ncurses5, gmp, libiconv}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "7.0.4";

     
···

       62
       62
        
           stdenv.lib.optionalString stdenv.isLinux ''

     

       63
       63
        
             find . -type f -perm -0100 \

     

       64
       64
        
                 -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       65
       65
       -
                 --set-rpath "${ncurses.out}/lib:${gmp.out}/lib" {} \;

     

       65
       65
       +
                 --set-rpath "${ncurses5.out}/lib:${gmp.out}/lib" {} \;

     

       66
       66
        
             sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

     

       67
       67
        
             sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2

     

       68
       68
        
             for prog in ld ar gcc strip ranlib; do

+2 -2

pkgs/development/compilers/ghc/7.4.2-binary.nix

···

       1
       1
       -
       {stdenv, fetchurl, perl, ncurses, gmp, libiconv, makeWrapper}:

     

       1
       1
       +
       {stdenv, fetchurl, perl, ncurses5, gmp, libiconv, makeWrapper}:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "7.4.2";

     
···

       61
       61
        
           # find editline/gmp.

     

       62
       62
        
           stdenv.lib.optionalString stdenv.isLinux ''

     

       63
       63
        
             mkdir -p "$out/lib"

     

       64
       64
       -
             ln -sv "${ncurses.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"

     

       64
       64
       +
             ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"

     

       65
       65
        
             find . -type f -perm -0100 \

     

       66
       66
        
                 -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

     

       67
       67
        
                 --set-rpath "$out/lib:${gmp.out}/lib" {} \;

+4 -5

pkgs/development/libraries/ncurses/default.nix

···

       1
       1
        
       { lib, stdenv, fetchurl, pkgconfig

     

       2
       2
        
       

     

       3
       3
       +
       , abiVersion

     

       3
       4
        
       , mouseSupport ? false

     

       4
       5
        
       , unicode ? true

     

       5
       6
        
       

     

       6
       7
        
       , gpm

     

       7
       8
        
       }:

     

       8
       9
        
       let

     

       9
       9
       -
         inherit (stdenv) isDarwin;

     

       10
       10
       -
         abiVersion = if isDarwin then "5" else "6";

     

       11
       11
       -
         version = if isDarwin then "5.9" else "6.0";

     

       12
       12
       -
         sha256 = if isDarwin

     

       10
       10
       +
         version = if abiVersion == "5" then "5.9" else "6.0";

     

       11
       11
       +
         sha256 = if abiVersion == "5"

     

       13
       12
        
           then "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"

     

       14
       13
        
           else "0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm";

     

       15
       14
        
       in

     
···

       21
       20
        
           inherit sha256;

     

       22
       21
        
         };

     

       23
       22
        
       

     

       24
       24
       -
         patches = [ ./clang.patch ];

     

       23
       23
       +
         patches = [ ./clang.patch ] ++ lib.optional (abiVersion == "5" && stdenv.cc.isGNU) ./gcc-5.patch;

     

       25
       24
        
       

     

       26
       25
        
         outputs = [ "dev" "out" "man" ];

     

       27
       26
        
         setOutputFlags = false; # some aren't supported

+46

pkgs/development/libraries/ncurses/gcc-5.patch

···

       1
       1
       +
       https://bugs.gentoo.org/545114

     

       2
       2
       +
       

     

       3
       3
       +
       extracted from the upstream change (which had many unrelated commits in one)

     

       4
       4
       +
       

     

       5
       5
       +
       From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001

     

       6
       6
       +
       From: "Thomas E. Dickey" <dickey@invisible-island.net>

     

       7
       7
       +
       Date: Sun, 7 Dec 2014 03:10:09 +0000

     

       8
       8
       +
       Subject: [PATCH] ncurses 5.9 - patch 20141206

     

       9
       9
       +
       

     

       10
       10
       +
       + modify MKlib_gen.sh to work around change in development version of

     

       11
       11
       +
         gcc introduced here:

     

       12
       12
       +
       	  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html

     

       13
       13
       +
       	  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html

     

       14
       14
       +
         (reports by Marcus Shawcroft, Maohui Lei).

     

       15
       15
       +
       

     

       16
       16
       +
       diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh

     

       17
       17
       +
       index d8cc3c9..b91398c 100755

     

       18
       18
       +
       --- a/ncurses/base/MKlib_gen.sh

     

       19
       19
       +
       +++ b/ncurses/base/MKlib_gen.sh

     

       20
       20
       +
       @@ -474,11 +474,22 @@ sed -n -f $ED1 \

     

       21
       21
       +
        	-e 's/gen_$//' \

     

       22
       22
       +
        	-e 's/  / /g' >>$TMP

     

       23
       23
       +
        

     

       24
       24
       +
       +cat >$ED1 <<EOF

     

       25
       25
       +
       +s/  / /g

     

       26
       26
       +
       +s/^ //

     

       27
       27
       +
       +s/ $//

     

       28
       28
       +
       +s/P_NCURSES_BOOL/NCURSES_BOOL/g

     

       29
       29
       +
       +EOF

     

       30
       30
       +
       +

     

       31
       31
       +
       +# A patch discussed here:

     

       32
       32
       +
       +#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html

     

       33
       33
       +
       +# introduces spurious #line markers.  Work around that by ignoring the system's

     

       34
       34
       +
       +# attempt to define "bool" and using our own symbol here.

     

       35
       35
       +
       +sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2

     

       36
       36
       +
       +cat $ED2 >$TMP

     

       37
       37
       +
       +

     

       38
       38
       +
        $preprocessor $TMP 2>/dev/null \

     

       39
       39
       +
       -| sed \

     

       40
       40
       +
       -	-e 's/  / /g' \

     

       41
       41
       +
       -	-e 's/^ //' \

     

       42
       42
       +
       -	-e 's/_Bool/NCURSES_BOOL/g' \

     

       43
       43
       +
       +| sed -f $ED1 \

     

       44
       44
       +
        | $AWK -f $AW2 \

     

       45
       45
       +
        | sed -f $ED3 \

     

       46
       46
       +
        | sed \

+3 -1

pkgs/top-level/all-packages.nix

···

       8716
       8716
        
       

     

       8717
       8717
        
         notify-sharp = callPackage ../development/libraries/notify-sharp { };

     

       8718
       8718
        
       

     

       8719
       8719
       -
         ncurses = callPackage ../development/libraries/ncurses { };

     

       8719
       8719
       +
         ncurses5 = callPackage ../development/libraries/ncurses { abiVersion = "5"; };

     

       8720
       8720
       +
         ncurses6 = callPackage ../development/libraries/ncurses { abiVersion = "6"; };

     

       8721
       8721
       +
         ncurses = if stdenv.isDarwin then ncurses5 else ncurses6;

     

       8720
       8722
        
       

     

       8721
       8723
        
         neardal = callPackage ../development/libraries/neardal { };

     

       8722
       8724