swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-11-06 02:06:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
nixpkgs/pkgs/top-level/haskell-packages.nix

209 lines
8.2 KiB
Nix
Raw Normal View History

ghc: Remove old cross work That way the next commit can apply a similar diff to each GHC.
2017-02-02 17:44:11 +01:00
{ buildPackages, pkgs
pkgs/*: remove unreferenced function arguments
2018-07-21 02:44:44 +02:00
, newScope
ghc: Remove old cross work That way the next commit can apply a similar diff to each GHC.
2017-02-02 17:44:11 +01:00
}:
Major Haskell packages overhaul. Several changes, some highlights: * Structure of haskell-packages.nix updated. It's now easier to select different default versions of packages for different versions of GHC. * GHC 7.0.2 is now default. * Haskell Platform 2011.2.0.0 has been added and is now default. * Several packages have been updated (gtk2hs, gitit, xmonad, darcs, ...). * Some old packages have been removed. svn path=/nixpkgs/trunk/; revision=26288
2011-03-12 18:28:15 +01:00
haskell infra: Misc cleanups - The haskell lib is very close to not relying on Nixpkgs. I think this is good---simpler to think about and matches Nixpkgs's lib. - The haskell lib is only imported once - stdenv is exposed more shallowly so it can be overriden more easily. I'll eventually use this on Darwin to avoid the Sierra shared library problems (unless changes are to be made system-wide). Closes https://github.com/NixOS/nixpkgs/pull/27840.
2017-08-01 18:44:08 +02:00
let
# These are attributes in compiler and packages that don't support integer-simple.
integerSimpleExcludes = [
ghc: wire up new binary ghc for bootstrapping This change brings development feedback loop improvement from a couple of ghc rebuilds to only one for working on generic builder. To completely eliminate the rebuilds, use two nixpkgs clones and point boot packages to the unmodified one.
2017-12-28 11:01:55 +01:00
"ghc7103Binary"
"ghc821Binary"
haskell infra: Misc cleanups - The haskell lib is very close to not relying on Nixpkgs. I think this is good---simpler to think about and matches Nixpkgs's lib. - The haskell lib is only imported once - stdenv is exposed more shallowly so it can be overriden more easily. I'll eventually use this on Darwin to avoid the Sierra shared library problems (unless changes are to be made system-wide). Closes https://github.com/NixOS/nixpkgs/pull/27840.
2017-08-01 18:44:08 +02:00
"ghcjs"
GHCJS 8.2
2018-05-12 07:06:47 +02:00
"ghcjs710"
"ghcjs80"
"ghcjs82"
"ghcjs84"
haskell infra: Misc cleanups - The haskell lib is very close to not relying on Nixpkgs. I think this is good---simpler to think about and matches Nixpkgs's lib. - The haskell lib is only imported once - stdenv is exposed more shallowly so it can be overriden more easily. I'll eventually use this on Darwin to avoid the Sierra shared library problems (unless changes are to be made system-wide). Closes https://github.com/NixOS/nixpkgs/pull/27840.
2017-08-01 18:44:08 +02:00
"integer-simple"
];
haskellLib = import ../development/haskell-modules/lib.nix {
inherit (pkgs) lib;
inherit pkgs;
};
* Move the composition of Haskell packages out of all-packages.nix into haskell-packages.nix, which depends on an instance of GHC. This allows a consistent set of packages to be built with the same GHC. For instance, $ nix-build -A haskellPackages_ghc683.xmonad builds xmonad and all its dependencies with GHC 6.8.3, while $ nix-build -A haskellPackages_ghc6102.xmonad does the same with GHC 6.10.2. This is the same technique used with kernelPackages. It also means that we don't need things like "cabal682" and "cabal683" anymore. * The setup hook is now in a separate wrapper package so that we don't have to recompile all of GHC every time we want to make a small change. * cinelerra: this package appears to have an accidental dependency on the "X11" Haskell package. svn path=/nixpkgs/trunk/; revision=15125
2009-04-18 14:47:11 +02:00
haskell: allow overriding all package sets at once Setting haskell.packageOverrides like so: haskell = super.haskell // { packageOverrides = self: super: { my-package = ...; my-other-package = ...; }; }; causes all compiler-specific package sets to be overridden with those overrides.
2018-04-21 19:37:49 +02:00
callPackage = newScope {
inherit haskellLib;
overrides = pkgs.haskell.packageOverrides;
};
* Move the composition of Haskell packages out of all-packages.nix into haskell-packages.nix, which depends on an instance of GHC. This allows a consistent set of packages to be built with the same GHC. For instance, $ nix-build -A haskellPackages_ghc683.xmonad builds xmonad and all its dependencies with GHC 6.8.3, while $ nix-build -A haskellPackages_ghc6102.xmonad does the same with GHC 6.10.2. This is the same technique used with kernelPackages. It also means that we don't need things like "cabal682" and "cabal683" anymore. * The setup hook is now in a separate wrapper package so that we don't have to recompile all of GHC every time we want to make a small change. * cinelerra: this package appears to have an accidental dependency on the "X11" Haskell package. svn path=/nixpkgs/trunk/; revision=15125
2009-04-18 14:47:11 +02:00
Configure Haskell bootstrapping package sets to perform minimal builds.
2018-03-16 21:52:18 +01:00
bootstrapPackageSet = self: super: {
mkDerivation = drv: super.mkDerivation (drv // {
doCheck = false;
doHaddock = false;
enableExecutableProfiling = false;
enableLibraryProfiling = false;
enableSharedExecutables = false;
enableSharedLibraries = false;
});
};
haskellPackages: Avoid outer `rec { .. }` This is much nicer for overlays. For example, if someone binds a new compiler / package set, its integer-simple variation will automatically appear.
2018-09-25 00:34:04 +02:00
# Use this rather than `rec { ... }` below for sake of overlays.
inherit (pkgs.haskell) compiler packages;
in {
haskell infra: Misc cleanups - The haskell lib is very close to not relying on Nixpkgs. I think this is good---simpler to think about and matches Nixpkgs's lib. - The haskell lib is only imported once - stdenv is exposed more shallowly so it can be overriden more easily. I'll eventually use this on Darwin to avoid the Sierra shared library problems (unless changes are to be made system-wide). Closes https://github.com/NixOS/nixpkgs/pull/27840.
2017-08-01 18:44:08 +02:00
lib = haskellLib;
Trying to fix priorities of various GHC/Haskell package versions. svn path=/nixpkgs/trunk/; revision=24701
2010-11-15 21:28:42 +01:00
Replace old "haskellPackages" code with Haskell NG.
2015-04-19 18:47:45 +02:00
compiler = {
Switching haskell-packages.nix to callPackage ... svn path=/nixpkgs/trunk/; revision=23551
2010-08-30 19:10:21 +02:00
ghc-{7.8.4, 7.10.3, 8.2.1}-binary: Init
2017-09-23 03:23:08 +02:00
ghc7103Binary = callPackage ../development/compilers/ghc/7.10.3-binary.nix { };
ghc821Binary = callPackage ../development/compilers/ghc/8.2.1-binary.nix { };
hp2any-manager: tool for haskell heap profile visualization
2014-06-13 10:22:46 +02:00
ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args The compilers themselves can pull them from `bootPkgs`, where they should always come from anyways. This enforces that, simplifies that code, and allows use to avoid more `rec { ... }` too.
2018-09-25 01:59:17 +02:00
ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix {
ghc: wire up new binary ghc for bootstrapping This change brings development feedback loop improvement from a couple of ghc rebuilds to only one for working on generic builder. To completely eliminate the rebuilds, use two nixpkgs clones and point boot packages to the unmodified one.
2017-12-28 11:01:55 +01:00
bootPkgs = packages.ghc7103Binary;
ghc: Fix cross compilation to work with new system
2017-02-02 17:44:11 +01:00
buildLlvmPackages = buildPackages.llvmPackages_35;
llvmPackages = pkgs.llvmPackages_35;
clean up GHC expressions
2016-01-13 21:04:13 +01:00
};
ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args The compilers themselves can pull them from `bootPkgs`, where they should always come from anyways. This enforces that, simplifies that code, and allows use to avoid more `rec { ... }` too.
2018-09-25 01:59:17 +02:00
ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix {
ghc: wire up new binary ghc for bootstrapping This change brings development feedback loop improvement from a couple of ghc rebuilds to only one for working on generic builder. To completely eliminate the rebuilds, use two nixpkgs clones and point boot packages to the unmodified one.
2017-12-28 11:01:55 +01:00
bootPkgs = packages.ghc7103Binary;
ghc: Sphinx is a build-time dependency
2018-09-25 22:02:45 +02:00
inherit (buildPackages.python27Packages) sphinx;
ghc: Fix cross compilation to work with new system
2017-02-02 17:44:11 +01:00
buildLlvmPackages = buildPackages.llvmPackages_37;
llvmPackages = pkgs.llvmPackages_37;
ghc: add release candidate 1 for 8.0.2
2016-11-26 21:24:08 +01:00
};
ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args The compilers themselves can pull them from `bootPkgs`, where they should always come from anyways. This enforces that, simplifies that code, and allows use to avoid more `rec { ... }` too.
2018-09-25 01:59:17 +02:00
ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix {
ghc: bootstrap 8.2.2 with 8.2.1-binary.
2018-01-02 21:15:16 +01:00
bootPkgs = packages.ghc821Binary;
ghc: Sphinx is a build-time dependency
2018-09-25 22:02:45 +02:00
inherit (buildPackages.python3Packages) sphinx;
ghc: Fix cross compilation to work with new system
2017-02-02 17:44:11 +01:00
buildLlvmPackages = buildPackages.llvmPackages_39;
llvmPackages = pkgs.llvmPackages_39;
ghc: add 8.2.2-rc2
2017-10-31 19:56:28 +01:00
};
ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args The compilers themselves can pull them from `bootPkgs`, where they should always come from anyways. This enforces that, simplifies that code, and allows use to avoid more `rec { ... }` too.
2018-09-25 01:59:17 +02:00
ghc843 = callPackage ../development/compilers/ghc/8.4.3.nix {
ghc: add version 8.4.3
2018-05-30 00:37:47 +02:00
bootPkgs = packages.ghc821Binary;
buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5;
};
ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args The compilers themselves can pull them from `bootPkgs`, where they should always come from anyways. This enforces that, simplifies that code, and allows use to avoid more `rec { ... }` too.
2018-09-25 01:59:17 +02:00
ghc861 = callPackage ../development/compilers/ghc/8.6.1.nix {
ghc: add 8.6.1-alpha1 pre-release
2018-07-01 18:00:52 +02:00
bootPkgs = packages.ghc822;
ghc861: use llvm6 so we're using supported LLVM version Otherwise complains that LLVM version used is unsupported and that LLVM 6.0 is the only supported version. So, let's use it! :)
2018-07-10 19:32:00 +02:00
buildLlvmPackages = buildPackages.llvmPackages_6;
llvmPackages = pkgs.llvmPackages_6;
ghc: add 8.6.1-alpha1 pre-release
2018-07-01 18:00:52 +02:00
};
ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args The compilers themselves can pull them from `bootPkgs`, where they should always come from anyways. This enforces that, simplifies that code, and allows use to avoid more `rec { ... }` too.
2018-09-25 01:59:17 +02:00
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
ghc: wire up new binary ghc for bootstrapping This change brings development feedback loop improvement from a couple of ghc rebuilds to only one for working on generic builder. To completely eliminate the rebuilds, use two nixpkgs clones and point boot packages to the unmodified one.
2017-12-28 11:01:55 +01:00
bootPkgs = packages.ghc821Binary;
ghc: Fix cross compilation to work with new system
2017-02-02 17:44:11 +01:00
buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5;
Initial support for cross-compiling ghc
2016-11-15 22:59:09 +01:00
};
Make GHCJS 8.4 the default, in line with LTS 12.x
2018-07-16 04:13:52 +02:00
ghcjs = compiler.ghcjs84;
ghcjs-{7.10, 8.0}: Expose the good `.override` The per-version `default.nix`es just fill in default arguments. It is much more useful to have the `.override` from the inner `callPackage`, for finer control. Converting the outer `callPackage` to a plain import makes the inner one the only one, revealing its `.override`.
2018-09-28 00:43:59 +02:00
# Use `import` because `callPackage inside`.
ghcjs710 = import ../development/compilers/ghcjs/7.10 {
Fixed GHCJS
2018-01-18 22:39:15 +01:00
bootPkgs = packages.ghc7103;
ghc: Remove old cross work That way the next commit can apply a similar diff to each GHC.
2017-02-02 17:44:11 +01:00
inherit (pkgs) cabal-install;
ghcjs-{7.10, 8.0}: Expose the good `.override` The per-version `default.nix`es just fill in default arguments. It is much more useful to have the `.override` from the inner `callPackage`, for finer control. Converting the outer `callPackage` to a plain import makes the inner one the only one, revealing its `.override`.
2018-09-28 00:43:59 +02:00
inherit (buildPackages) fetchgit fetchFromGitHub;
haskell-hscolour: define the bootstap version of this package using 'extension' rather than by passing an additional parameter to it
2014-06-09 10:31:29 +02:00
};
ghcjs-{7.10, 8.0}: Expose the good `.override` The per-version `default.nix`es just fill in default arguments. It is much more useful to have the `.override` from the inner `callPackage`, for finer control. Converting the outer `callPackage` to a plain import makes the inner one the only one, revealing its `.override`.
2018-09-28 00:43:59 +02:00
# `import` on purpose; see above.
ghcjs80 = import ../development/compilers/ghcjs/8.0 {
Fixed GHCJS
2018-01-18 22:39:15 +01:00
bootPkgs = packages.ghc802;
ghc: Remove old cross work That way the next commit can apply a similar diff to each GHC.
2017-02-02 17:44:11 +01:00
inherit (pkgs) cabal-install;
ghcjs-{7.10, 8.0}: Expose the good `.override` The per-version `default.nix`es just fill in default arguments. It is much more useful to have the `.override` from the inner `callPackage`, for finer control. Converting the outer `callPackage` to a plain import makes the inner one the only one, revealing its `.override`.
2018-09-28 00:43:59 +02:00
inherit (buildPackages) fetchgit fetchFromGitHub;
ghcjs: add ghcsjHEAD, tracking ghc-8.0 branch Closes https://github.com/NixOS/nixpkgs/pull/20071. Closes https://github.com/NixOS/nixpkgs/issues/19905.
2016-11-02 03:04:53 +01:00
};
ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args The compilers themselves can pull them from `bootPkgs`, where they should always come from anyways. This enforces that, simplifies that code, and allows use to avoid more `rec { ... }` too.
2018-09-25 01:59:17 +02:00
ghcjs82 = callPackage ../development/compilers/ghcjs-ng {
GHCJS 8.2
2018-05-12 07:06:47 +02:00
bootPkgs = packages.ghc822;
ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json;
stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
};
ghc, ghcjs: Get rid of extraneous alex, happy, and hscolour args The compilers themselves can pull them from `bootPkgs`, where they should always come from anyways. This enforces that, simplifies that code, and allows use to avoid more `rec { ... }` too.
2018-09-25 01:59:17 +02:00
ghcjs84 = callPackage ../development/compilers/ghcjs-ng {
ghc: drop compiler version 8.4.2; we prefer 8.4.3
2018-06-17 10:37:06 +02:00
bootPkgs = packages.ghc843;
GHCJS 8.4
2018-05-12 23:11:41 +02:00
ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json;
stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix;
ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {};
};
Move definitions of 'uhc' and 'jhc' to 'haskell.compiler' attribute set.
2015-05-15 15:25:53 +02:00
ghc: support building with integer-simple and provide package sets for it If the flag enableIntegerSimple is true GHC will be build with the GPL-free but slower integer-simple library instead of the faster but GPLed integer-gmp library. The attribute `pkgs.haskell.compiler.integer-simple."${ghcVersion}"` provides a GHC compiler build with `integer-simple`. Similarly, the attribute `pkgs.haskell.packages.integer-simple."${ghcVersion}"` provides a package set supporting `integer-simple`. Closes https://github.com/NixOS/nixpkgs/pull/22121. Closes https://github.com/NixOS/nixpkgs/issues/5493.
2017-01-25 00:00:54 +01:00
# The integer-simple attribute set contains all the GHC compilers
# build with integer-simple instead of integer-gmp.
ghc: Remove old cross work That way the next commit can apply a similar diff to each GHC.
2017-02-02 17:44:11 +01:00
integer-simple = let
integerSimpleGhcNames = pkgs.lib.filter
(name: ! builtins.elem name integerSimpleExcludes)
(pkgs.lib.attrNames compiler);
in pkgs.recurseIntoAttrs (pkgs.lib.genAttrs
integerSimpleGhcNames
(name: compiler."${name}".override { enableIntegerSimple = true; }));
haskell-hscolour: define the bootstap version of this package using 'extension' rather than by passing an additional parameter to it
2014-06-09 10:31:29 +02:00
};
Build Haddocks with source hyperlinks unless doHscolour is false
2014-05-30 03:00:04 +02:00
haskell: allow overriding all package sets at once Setting haskell.packageOverrides like so: haskell = super.haskell // { packageOverrides = self: super: { my-package = ...; my-other-package = ...; }; }; causes all compiler-specific package sets to be overridden with those overrides.
2018-04-21 19:37:49 +02:00
# Default overrides that are applied to all package sets.
packageOverrides = self : super : {};
ghc: Remove old cross work That way the next commit can apply a similar diff to each GHC.
2017-02-02 17:44:11 +01:00
# Always get compilers from `buildPackages`
haskell infra: nativeGhc != ghc.bootPkgs.ghc There's no reason to wait for non-binary native to *build* cross ghc, but we want a nix-built GHC for Setup.hs or things won't work.
2018-01-04 22:18:02 +01:00
packages = let bh = buildPackages.haskell; in {
Add haskell package 'taffybar'
2014-02-08 21:16:43 +01:00
Revert "Merge branch 'improved-make-overridable' of git://github.com/ElvishJerricco/nixpkgs" This reverts commit c3af1210b4c5d7ef380e75add463b37574fdcc8b, reversing changes made to 49f175cd0c80a39e1d05fc687c4a2a40e0aba58c.
2017-09-29 15:11:26 +02:00
ghc7103 = callPackage ../development/haskell-modules {
haskell infra: nativeGhc != ghc.bootPkgs.ghc There's no reason to wait for non-binary native to *build* cross ghc, but we want a nix-built GHC for Setup.hs or things won't work.
2018-01-04 22:18:02 +01:00
buildHaskellPackages = bh.packages.ghc7103;
ghc = bh.compiler.ghc7103;
Add haskell.packages.ghc7103 package set.
2015-12-16 15:10:38 +01:00
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
};
ghc: wire up new binary ghc for bootstrapping This change brings development feedback loop improvement from a couple of ghc rebuilds to only one for working on generic builder. To completely eliminate the rebuilds, use two nixpkgs clones and point boot packages to the unmodified one.
2017-12-28 11:01:55 +01:00
ghc7103Binary = callPackage ../development/haskell-modules {
haskell infra: nativeGhc != ghc.bootPkgs.ghc There's no reason to wait for non-binary native to *build* cross ghc, but we want a nix-built GHC for Setup.hs or things won't work.
2018-01-04 22:18:02 +01:00
buildHaskellPackages = bh.packages.ghc7103Binary;
ghc = bh.compiler.ghc7103Binary;
ghc: wire up new binary ghc for bootstrapping This change brings development feedback loop improvement from a couple of ghc rebuilds to only one for working on generic builder. To completely eliminate the rebuilds, use two nixpkgs clones and point boot packages to the unmodified one.
2017-12-28 11:01:55 +01:00
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
Configure Haskell bootstrapping package sets to perform minimal builds.
2018-03-16 21:52:18 +01:00
packageSetConfig = bootstrapPackageSet;
ghc: wire up new binary ghc for bootstrapping This change brings development feedback loop improvement from a couple of ghc rebuilds to only one for working on generic builder. To completely eliminate the rebuilds, use two nixpkgs clones and point boot packages to the unmodified one.
2017-12-28 11:01:55 +01:00
};
Revert "Merge branch 'improved-make-overridable' of git://github.com/ElvishJerricco/nixpkgs" This reverts commit c3af1210b4c5d7ef380e75add463b37574fdcc8b, reversing changes made to 49f175cd0c80a39e1d05fc687c4a2a40e0aba58c.
2017-09-29 15:11:26 +02:00
ghc802 = callPackage ../development/haskell-modules {
haskell infra: nativeGhc != ghc.bootPkgs.ghc There's no reason to wait for non-binary native to *build* cross ghc, but we want a nix-built GHC for Setup.hs or things won't work.
2018-01-04 22:18:02 +01:00
buildHaskellPackages = bh.packages.ghc802;
ghc = bh.compiler.ghc802;
ghc: add release candidate 1 for 8.0.2
2016-11-26 21:24:08 +01:00
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
};
haskell infra: nativeGhc != ghc.bootPkgs.ghc There's no reason to wait for non-binary native to *build* cross ghc, but we want a nix-built GHC for Setup.hs or things won't work.
2018-01-04 22:18:02 +01:00
ghc821Binary = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc821Binary;
ghc = bh.compiler.ghc821Binary;
ghc: add 8.2.2-rc2
2017-10-31 19:56:28 +01:00
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
Configure Haskell bootstrapping package sets to perform minimal builds.
2018-03-16 21:52:18 +01:00
packageSetConfig = bootstrapPackageSet;
ghc: add 8.2.2-rc2
2017-10-31 19:56:28 +01:00
};
haskell infra: nativeGhc != ghc.bootPkgs.ghc There's no reason to wait for non-binary native to *build* cross ghc, but we want a nix-built GHC for Setup.hs or things won't work.
2018-01-04 22:18:02 +01:00
ghc822 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc822;
ghc = bh.compiler.ghc822;
ghc: wire up new binary ghc for bootstrapping This change brings development feedback loop improvement from a couple of ghc rebuilds to only one for working on generic builder. To completely eliminate the rebuilds, use two nixpkgs clones and point boot packages to the unmodified one.
2017-12-28 11:01:55 +01:00
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
};
ghc: add version 8.4.3
2018-05-30 00:37:47 +02:00
ghc843 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc843;
ghc = bh.compiler.ghc843;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
};
ghc-8.6.x: create an initial package set configuration
2018-07-04 10:46:07 +02:00
ghc861 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc861;
ghc = bh.compiler.ghc861;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { };
};
Revert "Merge branch 'improved-make-overridable' of git://github.com/ElvishJerricco/nixpkgs" This reverts commit c3af1210b4c5d7ef380e75add463b37574fdcc8b, reversing changes made to 49f175cd0c80a39e1d05fc687c4a2a40e0aba58c.
2017-09-29 15:11:26 +02:00
ghcHEAD = callPackage ../development/haskell-modules {
haskell infra: nativeGhc != ghc.bootPkgs.ghc There's no reason to wait for non-binary native to *build* cross ghc, but we want a nix-built GHC for Setup.hs or things won't work.
2018-01-04 22:18:02 +01:00
buildHaskellPackages = bh.packages.ghcHEAD;
ghc = bh.compiler.ghcHEAD;
hackage-packages.nix: switch our default package set to Stackage Nightly This update was generated by hackage2nix v20150903-82-g351b6f8 using the following inputs: - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/af161fdf178e996c83d9c06059cb81cc4480b035 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/da73308b6359aa6083591ec7a2069090977d3be7 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/1994a4f865fe7e1cbe2c5b94a2214a5d91507f2c
2015-09-16 09:19:56 +02:00
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
Replace old "haskellPackages" code with Haskell NG.
2015-04-19 18:47:45 +02:00
};
Make GHCJS 8.4 the default, in line with LTS 12.x
2018-07-16 04:13:52 +02:00
ghcjs = packages.ghcjs84;
GHCJS 8.2
2018-05-12 07:06:47 +02:00
ghcjs710 = callPackage ../development/haskell-modules rec {
haskell infra: nativeGhc != ghc.bootPkgs.ghc There's no reason to wait for non-binary native to *build* cross ghc, but we want a nix-built GHC for Setup.hs or things won't work.
2018-01-04 22:18:02 +01:00
buildHaskellPackages = ghc.bootPkgs;
GHCJS darwin fixes (#41120) * GHCJS darwin fixes * Fix ghcjs 80 and 710 packages * Add socket-io to ghcjs 82 and 84 passthru
2018-05-29 23:39:21 +02:00
ghc = bh.compiler.ghcjs710;
haskellPackages: apply GHC specific overrides before GHCJS GHCJS is effectively a backend for GHC, so all the GHC version specific package set overrides should in general apply to the GHCJS package sets, too.
2017-03-05 17:13:27 +01:00
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
hackage-packages.nix: switch our default package set to Stackage Nightly This update was generated by hackage2nix v20150903-82-g351b6f8 using the following inputs: - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/af161fdf178e996c83d9c06059cb81cc4480b035 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/da73308b6359aa6083591ec7a2069090977d3be7 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/1994a4f865fe7e1cbe2c5b94a2214a5d91507f2c
2015-09-16 09:19:56 +02:00
};
GHCJS 8.2
2018-05-12 07:06:47 +02:00
ghcjs80 = callPackage ../development/haskell-modules rec {
haskell infra: nativeGhc != ghc.bootPkgs.ghc There's no reason to wait for non-binary native to *build* cross ghc, but we want a nix-built GHC for Setup.hs or things won't work.
2018-01-04 22:18:02 +01:00
buildHaskellPackages = ghc.bootPkgs;
GHCJS darwin fixes (#41120) * GHCJS darwin fixes * Fix ghcjs 80 and 710 packages * Add socket-io to ghcjs 82 and 84 passthru
2018-05-29 23:39:21 +02:00
ghc = bh.compiler.ghcjs80;
haskellPackages: apply GHC specific overrides before GHCJS GHCJS is effectively a backend for GHC, so all the GHC version specific package set overrides should in general apply to the GHCJS package sets, too.
2017-03-05 17:13:27 +01:00
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
ghcjs: add ghcsjHEAD, tracking ghc-8.0 branch Closes https://github.com/NixOS/nixpkgs/pull/20071. Closes https://github.com/NixOS/nixpkgs/issues/19905.
2016-11-02 03:04:53 +01:00
};
GHCJS 8.2
2018-05-12 07:06:47 +02:00
ghcjs82 = callPackage ../development/haskell-modules rec {
buildHaskellPackages = ghc.bootPkgs;
ghc = bh.compiler.ghcjs82;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
};
GHCJS 8.4
2018-05-12 23:11:41 +02:00
ghcjs84 = callPackage ../development/haskell-modules rec {
buildHaskellPackages = ghc.bootPkgs;
ghc = bh.compiler.ghcjs84;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
};
hackage-packages.nix: switch our default package set to Stackage Nightly This update was generated by hackage2nix v20150903-82-g351b6f8 using the following inputs: - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/af161fdf178e996c83d9c06059cb81cc4480b035 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/da73308b6359aa6083591ec7a2069090977d3be7 - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/1994a4f865fe7e1cbe2c5b94a2214a5d91507f2c
2015-09-16 09:19:56 +02:00
ghc: support building with integer-simple and provide package sets for it If the flag enableIntegerSimple is true GHC will be build with the GPL-free but slower integer-simple library instead of the faster but GPLed integer-gmp library. The attribute `pkgs.haskell.compiler.integer-simple."${ghcVersion}"` provides a GHC compiler build with `integer-simple`. Similarly, the attribute `pkgs.haskell.packages.integer-simple."${ghcVersion}"` provides a package set supporting `integer-simple`. Closes https://github.com/NixOS/nixpkgs/pull/22121. Closes https://github.com/NixOS/nixpkgs/issues/5493.
2017-01-25 00:00:54 +01:00
# The integer-simple attribute set contains package sets for all the GHC compilers
# using integer-simple instead of integer-gmp.
ghc: Remove old cross work That way the next commit can apply a similar diff to each GHC.
2017-02-02 17:44:11 +01:00
integer-simple = let
integerSimpleGhcNames = pkgs.lib.filter
(name: ! builtins.elem name integerSimpleExcludes)
(pkgs.lib.attrNames packages);
in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override {
Use build packages GHC for haskell.packages.integer-simple
2018-05-08 05:48:04 +02:00
ghc = bh.compiler.integer-simple."${name}";
haskell: fix package sets based on integer-simple Fixes mass build failures in these package sets, due to "unknown pacakge: integer-simple". Attributes that demonstrate this (see before/after): * haskell.packages.integer-simple.ghc843.hello * haskell.packages.integer-simple.ghc802.scientific The second one is from the NixOS manual, FWIW.
2018-07-11 17:51:27 +02:00
buildHaskellPackages = bh.packages.integer-simple."${name}";
ghc: Remove old cross work That way the next commit can apply a similar diff to each GHC.
2017-02-02 17:44:11 +01:00
overrides = _self : _super : {
integer-simple = null;
integer-gmp = null;
};
ghc: support building with integer-simple and provide package sets for it If the flag enableIntegerSimple is true GHC will be build with the GPL-free but slower integer-simple library instead of the faster but GPLed integer-gmp library. The attribute `pkgs.haskell.compiler.integer-simple."${ghcVersion}"` provides a GHC compiler build with `integer-simple`. Similarly, the attribute `pkgs.haskell.packages.integer-simple."${ghcVersion}"` provides a package set supporting `integer-simple`. Closes https://github.com/NixOS/nixpkgs/pull/22121. Closes https://github.com/NixOS/nixpkgs/issues/5493.
2017-01-25 00:00:54 +01:00
});
Replace old "haskellPackages" code with Haskell NG.
2015-04-19 18:47:45 +02:00
};
Revert "Add amazonka, amazonka-core, amazonka-cloudwatch haskell packages" Unnecessary change to the haskell packages infrastructure, will move this to haskellng packages. This reverts commit 0f04707953933923cf957b7800c2eba83b4f8f34.
2015-01-08 15:38:47 +01:00
}
Reference in a new issue Copy permalink