commit f264c638dfe83c62f7584bd11a22e9b5cb176736 · pyrox.dev/nixpkgs

+1 -1

pkgs/build-support/cabal/default.nix

···

       29
       29
        
       # Our GHC 6.10.x builds do not provide sharable versions of their core libraries.

     

       30
       30
        
       assert enableSharedLibraries -> versionOlder "6.12" ghc.version;

     

       31
       31
        
       

     

       32
       32
       -
       # Our GHC 6.10.x builds do not provide sharable versions of their core libraries.

     

       32
       32
       +
       # Pure shared library builds don't work before GHC 7.8.x.

     

       33
       33
        
       assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;

     

       34
       34
        
       

     

       35
       35
        
       {

+1

pkgs/development/compilers/ghc/7.0.2.nix

···

       37
       37
        
             stdenv.lib.maintainers.andres

     

       38
       38
        
           ];

     

       39
       39
        
           inherit (ghc.meta) license platforms;

     

       40
       40
       +
           broken = true;

     

       40
       41
        
         };

     

       41
       42
        
       

     

       42
       43
        
       }

+1

pkgs/development/compilers/ghc/7.0.3.nix

···

       37
       37
        
             stdenv.lib.maintainers.andres

     

       38
       38
        
           ];

     

       39
       39
        
           inherit (ghc.meta) license platforms;

     

       40
       40
       +
           broken = true;

     

       40
       41
        
         };

     

       41
       42
        
       

     

       42
       43
        
       }

+3 -3

pkgs/development/compilers/ghc/7.8.2.nix pkgs/development/compilers/ghc/7.8.3.nix

···

       1
       1
        
       { stdenv, fetchurl, ghc, perl, gmp, ncurses }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
       -
         version = "7.8.2";

     

       4
       4
       +
         version = "7.8.3";

     

       5
       5
        
         name = "ghc-${version}";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
       -
           url = "http://www.haskell.org/ghc/dist/7.8.2/${name}-src.tar.xz";

     

       9
       9
       -
           sha256 = "15kyz98zq22sgwkzy2bkx0yz98qkrzgdigz919vafd7fxnkf3la5";

     

       8
       8
       +
           url = "http://www.haskell.org/ghc/dist/7.8.3/${name}-src.tar.xz";

     

       9
       9
       +
           sha256 = "0n5rhwl83yv8qm0zrbaxnyrf8x1i3b6si927518mwfxs96jrdkdh";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ ghc perl gmp ncurses ];

+9 -6

pkgs/development/libraries/gmp/5.1.x.nix

···

       1
       1
       -
       { stdenv, fetchurl, m4, cxx ? true }:

     

       1
       1
       +
       { stdenv, fetchurl, m4, cxx ? true, withStatic ? false }:

     

       2
       2
        
       

     

       3
       3
        
       with { inherit (stdenv.lib) optional; };

     

       4
       4
        
       

     

       5
       5
       -
       stdenv.mkDerivation rec {

     

       5
       5
       +
       stdenv.mkDerivation (rec {

     

       6
       6
        
         name = "gmp-5.1.3";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv

     
···

       27
       27
        
       

     

       28
       28
        
         enableParallelBuilding = true;

     

       29
       29
        
       

     

       30
       30
       -
         meta = {

     

       30
       30
       +
         meta = with stdenv.lib; {

     

       31
       31
        
           homepage = "http://gmplib.org/";

     

       32
       32
        
           description = "GMP, the GNU multiple precision arithmetic library";

     

       33
       33
       -
           license = stdenv.lib.licenses.gpl3Plus;

     

       33
       33
       +
           license = licenses.gpl3Plus;

     

       34
       34
        
       

     

       35
       35
        
           longDescription =

     

       36
       36
        
             '' GMP is a free library for arbitrary precision arithmetic, operating

     
···

       54
       54
        
                asymptotically faster algorithms.

     

       55
       55
        
             '';

     

       56
       56
        
       

     

       57
       57
       -
           platforms = stdenv.lib.platforms.all;

     

       58
       58
       -
           maintainers = [ stdenv.lib.maintainers.simons ];

     

       57
       57
       +
           platforms = platforms.all;

     

       58
       58
       +
           maintainers = [ maintainers.simons ];

     

       59
       59
        
         };

     

       60
       60
        
       }

     

       61
       61
       +
         // stdenv.lib.optionalAttrs withStatic { dontDisableStatic = true; }

     

       62
       62
       +
       )

     

       63
       63
       +

+1

pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix

···

       22
       22
        
           license = self.stdenv.lib.licenses.bsd3;

     

       23
       23
        
           platforms = self.ghc.meta.platforms;

     

       24
       24
        
           maintainers = with self.stdenv.lib.maintainers; [andres simons];

     

       25
       25
       +
           broken = true;              # The source code is no longer available from haskell.org.

     

       25
       26
        
         };

     

       26
       27
        
       })

+4

pkgs/development/libraries/haskell/haskell-platform/default.nix

···

       257
       257
        
             stm                       = self.stm_2_1_1_2;

     

       258
       258
        
             xhtml                     = self.xhtml_3000_2_0_1;

     

       259
       259
        
             happy                     = self.happy_1_18_4;

     

       260
       260
       +
             # not actually specified, but important to make the whole thing build

     

       261
       261
       +
             mtl                       = self.mtl_1_1_0_2;

     

       260
       262
        
           };

     

       261
       263
        
         };

     

       262
       264
        
       

     
···

       285
       287
        
             cabalInstall              = self.cabalInstall_0_6_2;

     

       286
       288
        
             alex                      = self.alex_2_3_1;

     

       287
       289
        
             happy                     = self.happy_1_18_4;

     

       290
       290
       +
             # not actually specified, but important to make the whole thing build

     

       291
       291
       +
             mtl                       = self.mtl_1_1_0_2;

     

       288
       292
        
           };

     

       289
       293
        
         };

     

       290
       294

+14 -15

pkgs/top-level/all-packages.nix

···

       2584
       2584
        
         compcert = callPackage ../development/compilers/compcert {};

     

       2585
       2585
        
       

     

       2586
       2586
        
         cryptol1 = lowPrio (callPackage ../development/compilers/cryptol/1.8.x.nix {});

     

       2587
       2587
       -
         cryptol2 = haskellPackages.cryptol;

     

       2587
       2587
       +
         cryptol2 = haskellPackages_ghc763.cryptol; # doesn't compile with the lastest 7.8.3 release

     

       2588
       2588
        
       

     

       2589
       2589
        
         cython = pythonPackages.cython;

     

       2590
       2590
        
         cython3 = python3Packages.cython;

     
···

       2935
       2935
        
       

     

       2936
       2936
        
         # Import Haskell infrastructure.

     

       2937
       2937
        
       

     

       2938
       2938
       -
         haskell = callPackage ./haskell-defaults.nix { inherit pkgs; };

     

       2938
       2938
       +
         haskell = let pkgs_       = pkgs // { gmp = gmp.override { withStatic = true; }; };

     

       2939
       2939
       +
                       callPackage = newScope pkgs_;

     

       2940
       2940
       +
                       newScope    = extra: lib.callPackageWith (pkgs_ // pkgs_.xorg // extra);

     

       2941
       2941
       +
                   in callPackage ./haskell-defaults.nix { pkgs = pkgs_; inherit callPackage newScope; };

     

       2939
       2942
        
       

     

       2940
       2943
        
         # Available GHC versions.

     

       2941
       2944
        
       

     
···

       2953
       2956
        
           builtins.substring 0 (builtins.stringLength "packages_") name == "packages_"

     

       2954
       2957
        
         ) haskell));

     

       2955
       2958
        
       

     

       2956
       2956
       -
         haskellPackages = haskellPackages_ghc763;

     

       2959
       2959
       +
         haskellPackages = haskellPackages_ghc783;

     

       2957
       2960
        
         haskellPlatform = haskellPlatformPackages."2013_2_0_0";

     

       2958
       2961
        
       

     

       2959
       2962
        
         haskellPackages_ghc6104 = haskell.packages_ghc6104;

     
···

       2961
       2964
        
         haskellPackages_ghc704  = haskell.packages_ghc704;

     

       2962
       2965
        
         haskellPackages_ghc722  = haskell.packages_ghc722;

     

       2963
       2966
        
         haskellPackages_ghc742  = haskell.packages_ghc742;

     

       2964
       2964
       -
         # For the default version, we build profiling versions of the libraries, too.

     

       2965
       2965
       -
         # The following three lines achieve that: the first two make Hydra build explicit

     

       2966
       2966
       -
         # profiling and non-profiling versions; the final respects the user-configured

     

       2967
       2967
       -
         # default setting.

     

       2968
       2968
       -
         haskellPackages_ghc763_no_profiling = recurseIntoAttrs haskell.packages_ghc763.noProfiling;

     

       2969
       2969
       -
         haskellPackages_ghc763_profiling    = recurseIntoAttrs haskell.packages_ghc763.profiling;

     

       2970
       2970
       -
         haskellPackages_ghc763              = recurseIntoAttrs haskell.packages_ghc763.highPrio;

     

       2971
       2971
       -
         # Reasonably current HEAD snapshot.

     

       2972
       2972
       -
         haskellPackages_ghc782 = haskell.packages_ghc782;

     

       2967
       2967
       +
         haskellPackages_ghc763  = haskell.packages_ghc763;

     

       2968
       2968
       +
         haskellPackages_ghc783_no_profiling = recurseIntoAttrs haskell.packages_ghc783.noProfiling;

     

       2969
       2969
       +
         haskellPackages_ghc783_profiling    = recurseIntoAttrs haskell.packages_ghc783.profiling;

     

       2970
       2970
       +
         haskellPackages_ghc783              = recurseIntoAttrs haskell.packages_ghc783.highPrio;

     

       2973
       2971
        
         haskellPackages_ghcHEAD = haskell.packages_ghcHEAD;

     

       2974
       2972
        
       

     

       2975
       2973
        
         haskellPlatformPackages = recurseIntoAttrs (import ../development/libraries/haskell/haskell-platform { inherit pkgs; });

     
···

       8279
       8277
        
       

     

       8280
       8278
        
         d4x = callPackage ../applications/misc/d4x { };

     

       8281
       8279
        
       

     

       8282
       8282
       -
         darcs = haskellPackages.darcs.override {

     

       8280
       8280
       +
         darcs = haskellPackages_ghc763.darcs.override {

     

       8283
       8281
        
           # A variant of the Darcs derivation that containts only the executable and

     

       8284
       8284
       -
           # thus has no dependencies on other Haskell packages.

     

       8285
       8285
       -
           cabal = haskellPackages.cabal.override {

     

       8282
       8282
       +
           # thus has no dependencies on other Haskell packages. We have to use the older

     

       8283
       8283
       +
           # GHC 7.6.3 package set because darcs won't compile with 7.8.x.

     

       8284
       8284
       +
           cabal = haskellPackages_ghc763.cabal.override {

     

       8286
       8285
        
             extension = self : super : {

     

       8287
       8286
        
               isLibrary = false;

     

       8288
       8287
        
               configureFlags = "-f-library " + super.configureFlags or "";

+5 -5

pkgs/top-level/haskell-defaults.nix

···

       20
       20
        
           transformersCompat = super.transformersCompat_0_3_3;

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         ghc782Prefs = self : super : ghcHEADPrefs self super // {

     

       23
       23
       +
         ghc783Prefs = self : super : ghcHEADPrefs self super // {

     

       24
       24
        
           cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_1; };

     

       25
       25
        
           codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_1; }; };

     

       26
       26
        
           mtl = self.mtl_2_1_2;

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
       -
         ghc763Prefs = self : super : ghc782Prefs self super // {

     

       29
       29
       +
         ghc763Prefs = self : super : ghc783Prefs self super // {

     

       30
       30
        
           ariadne = super.ariadne.override {

     

       31
       31
        
             haskellNames = self.haskellNames.override {

     

       32
       32
        
               haskellPackages = self.haskellPackages.override { Cabal = self.Cabal_1_18_1_3; };

     
···

       214
       214
        
                      };

     

       215
       215
        
                    };

     

       216
       216
        
       

     

       217
       217
       -
         packages_ghc782 =

     

       218
       218
       -
           packages { ghcPath = ../development/compilers/ghc/7.8.2.nix;

     

       217
       217
       +
         packages_ghc783 =

     

       218
       218
       +
           packages { ghcPath = ../development/compilers/ghc/7.8.3.nix;

     

       219
       219
        
                      ghcBinary = ghc742Binary;

     

       220
       220
       -
                      prefFun = ghc782Prefs;

     

       220
       220
       +
                      prefFun = ghc783Prefs;

     

       221
       221
        
                    };

     

       222
       222
        
       

     

       223
       223
        
         packages_ghc763 =

+2 -2

pkgs/top-level/haskell-packages.nix

···

       1358
       1358
        
             additionalPackages = [ self.lambdabot ];

     

       1359
       1359
        
           };

     

       1360
       1360
        
         };

     

       1361
       1361
       -
         

     

       1361
       1361
       +
       

     

       1362
       1362
        
         lambdabotUtils = callPackage ../development/libraries/haskell/lambdabot-utils {};

     

       1363
       1363
        
       

     

       1364
       1364
        
         lambdacubeEngine = callPackage ../development/libraries/haskell/lambdacube-engine {};

     
···

       2364
       2364
        
         transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {};

     

       2365
       2365
        
         transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {};

     

       2366
       2366
        
         transformers_0_4_1_0 = callPackage ../development/libraries/haskell/transformers/0.4.1.0.nix {};

     

       2367
       2367
       -
         transformers = null;          # core package since ghc >= 7.8.2

     

       2367
       2367
       +
         transformers = null;          # core package since ghc >= 7.8.x

     

       2368
       2368
        
       

     

       2369
       2369
        
         transformersBase = callPackage ../development/libraries/haskell/transformers-base {};

     

       2370
       2370