mirror of
https://github.com/ilyakooo0/haskell.nix.git
synced 2024-09-11 06:55:40 +03:00
Add nixos-21.11 builds. (#1304)
* Add nixos-21.11 builds. * Remove references to nixpkgs-20.09.
This commit is contained in:
Tom Prince
GitHub
parent
b2479523c0
commit
a68a7dda41
@ -5,7 +5,7 @@
|
||||
let
|
||||
haskellNix = (import ./default.nix {});
|
||||
in
|
||||
{ nixpkgs ? haskellNix.sources.nixpkgs-2009
|
||||
{ nixpkgs ? haskellNix.sources.nixpkgs-2111
|
||||
, nixpkgsArgs ? haskellNix.nixpkgsArgs
|
||||
, pkgs ? import nixpkgs nixpkgsArgs
|
||||
, ifdLevel ? 1000
|
||||
|
||||
10
ci.nix
10
ci.nix
@ -10,8 +10,8 @@
|
||||
inherit (import ./ci-lib.nix { inherit pkgs; }) dimension platformFilterGeneric filterAttrsOnlyRecursive;
|
||||
inherit (pkgs.haskell-nix) sources;
|
||||
nixpkgsVersions = {
|
||||
"R2009" = "nixpkgs-2009";
|
||||
"R2105" = "nixpkgs-2105";
|
||||
"R2111" = "nixpkgs-2111";
|
||||
"unstable" = "nixpkgs-unstable";
|
||||
};
|
||||
compilerNixNames = nixpkgsName: nixpkgs: builtins.mapAttrs (compiler-nix-name: runTests: {
|
||||
@ -24,10 +24,10 @@
|
||||
# cabal-install and nix-tools plans. When removing a ghc version
|
||||
# from here (so that is no longer cached) also remove ./materialized/ghcXXX.
|
||||
# Update supported-ghc-versions.md to reflect any changes made here.
|
||||
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2009") {
|
||||
nixpkgs.lib.optionalAttrs (nixpkgsName == "R2105") {
|
||||
ghc865 = false;
|
||||
ghc8107 = false;
|
||||
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2105") {
|
||||
ghc8107 = true;
|
||||
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "R2111") {
|
||||
ghc865 = false;
|
||||
ghc8107 = true;
|
||||
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
|
||||
@ -45,7 +45,7 @@
|
||||
nixpkgs.lib.filter (v: v != "aarch64-darwin" || (
|
||||
# aarch64-darwin requires ghc 8.10.7 and does not work on older nixpkgs
|
||||
!__elem compiler-nix-name ["ghc865" "ghc884" "ghc8104" "ghc810420210212" "ghc8105" "ghc8106" "ghc901"]
|
||||
&& !__elem nixpkgsName ["R2009" "R2105"])) supportedSystems) (v: v);
|
||||
&& !__elem nixpkgsName ["R2105"])) supportedSystems) (v: v);
|
||||
crossSystems = nixpkgsName: nixpkgs: compiler-nix-name: system:
|
||||
# We need to use the actual nixpkgs version we're working with here, since the values
|
||||
# of 'lib.systems.examples' are not understood between all versions
|
||||
|
||||
@ -20,10 +20,10 @@ really should use an instance of Nixpkgs provided by `haskell.nix` itself.
|
||||
|
||||
| Nixpkgs version | Nixpkgs pinning | GHC version | `compiler-nix-name` | Tested in CI? |
|
||||
|------------------|--------------------|-------------|-----------------------|---------------|
|
||||
| 20.09 | `nixpkgs-2009` | 8.6.5 | `ghc865` | No |
|
||||
| 20.09 | `nixpkgs-2009` | 8.10.7 | `ghc8107` | No |
|
||||
| 21.05 | `nixpkgs-2105` | 8.6.5 | `ghc865` | No |
|
||||
| 21.05 | `nixpkgs-2105` | 8.10.7 | `ghc8107` | Yes |
|
||||
| 21.11 | `nixpkgs-2105` | 8.6.5 | `ghc865` | No |
|
||||
| 21.11 | `nixpkgs-2105` | 8.10.7 | `ghc8107` | Yes |
|
||||
| unstable | `nixpkgs-unstable` | 8.6.5 | `ghc865` | No |
|
||||
| unstable | `nixpkgs-unstable` | 8.8.4 | `ghc884` | No |
|
||||
| unstable | `nixpkgs-unstable` | 8.10.4 | `ghc8104` | No |
|
||||
|
||||
@ -98,7 +98,7 @@ in the files or on the command line (they are all optional):
|
||||
|
||||
```nix
|
||||
{ name = "hello"; # for better error messages and derivation names
|
||||
nixpkgsPin = "nixpkgs-unstable"; # or nixpkgs-2009 or nixpkgs-2003
|
||||
nixpkgsPin = "nixpkgs-unstable"; # or nixpkgs-2111 or nixpkgs-2105
|
||||
nixpkgs = <nixpkgs>; # use this instead of nixpkgsPin
|
||||
subDir = "some/sub/dir"; # sub dir containing the haskell project
|
||||
projectFileName = "stack.yaml"; # use this project file
|
||||
|
||||
34
flake.lock
34
flake.lock
@ -162,22 +162,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-2009": {
|
||||
"locked": {
|
||||
"lastModified": 1624271064,
|
||||
"narHash": "sha256-qns/uRW7MR2EfVf6VEeLgCsCp7pIOjDeR44JzTF09MA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "46d1c3f28ca991601a53e9a14fdd53fcd3dd8416",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-20.09-darwin",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-2105": {
|
||||
"locked": {
|
||||
"lastModified": 1630481079,
|
||||
@ -194,6 +178,22 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-2111": {
|
||||
"locked": {
|
||||
"lastModified": 1638410074,
|
||||
"narHash": "sha256-MQYI4k4XkoTzpeRjq5wl+1NShsl1CKq8MISFuZ81sWs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5b80f23502f8e902612a8c631dfce383e1c56596",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-21.11-darwin",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1635295995,
|
||||
@ -242,8 +242,8 @@
|
||||
"nixpkgs-2105"
|
||||
],
|
||||
"nixpkgs-2003": "nixpkgs-2003",
|
||||
"nixpkgs-2009": "nixpkgs-2009",
|
||||
"nixpkgs-2105": "nixpkgs-2105",
|
||||
"nixpkgs-2111": "nixpkgs-2111",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"old-ghc-nix": "old-ghc-nix",
|
||||
"stackage": "stackage"
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
description = "Alternative Haskell Infrastructure for Nixpkgs";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs-2105";
|
||||
nixpkgs.follows = "nixpkgs-2111";
|
||||
nixpkgs-2003 = { url = "github:NixOS/nixpkgs/nixpkgs-20.03-darwin"; };
|
||||
nixpkgs-2009 = { url = "github:NixOS/nixpkgs/nixpkgs-20.09-darwin"; };
|
||||
nixpkgs-2105 = { url = "github:NixOS/nixpkgs/nixpkgs-21.05-darwin"; };
|
||||
nixpkgs-2111 = { url = "github:NixOS/nixpkgs/nixpkgs-21.11-darwin"; };
|
||||
nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
|
||||
flake-utils = { url = "github:numtide/flake-utils"; };
|
||||
hackage = {
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
nixpkgsPin = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "nixpkgs-unstable";
|
||||
description = "The name of a haskell.nix nixpkgs pin to use (e.g. nixpkgs-unstable or nixpkgs-2009)";
|
||||
description = "The name of a haskell.nix nixpkgs pin to use (e.g. nixpkgs-unstable or nixpkgs-2111)";
|
||||
};
|
||||
nixpkgs = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user