mirrors/IHaskell
1
0
Fork 0
mirror of https://github.com/IHaskell/IHaskell.git synced 2025-04-16 03:16:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

flake.nix: use Nixpkgs 24.05 (#1500)

Browse Source 
* flake.nix: use Nixpkgs 24.05
* .github/workflows/nix.yml: update
* .github/workflows/nix.yml: update
This commit is contained in:
Vaibhav Sagar 2024-06-03 21:49:25 +10:00 committed by GitHub
parent 5a61dbd566
commit b47e6a24f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/nix.yml vendored
View File

@ -38,13 +38,10 @@ jobs:
fail-fast: false
matrix:
env:
- ihaskell-env-ghc94
- ihaskell-env-ghc96
- ihaskell-env-ghc98
- ihaskell-env-display-ghc94
- ihaskell-env-display-ghc96
- ihaskell-env-display-ghc98
steps:
- uses: actions/checkout@v3

12
flake.lock generated
View File

@ -87,18 +87,18 @@
"type": "github"
}
},
"nixpkgs23_11": {
"nixpkgs24_05": {
"locked": {
"lastModified": 1717265169,
"narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=",
"lastModified": 1717406828,
"narHash": "sha256-3Elk5hOFKkas+JwIEbYHu3Cw0z7F18vx+1v8fNYGZqc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc",
"rev": "7b7774f5431ea2faed7c5eb9b612f42f718d10e3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.11",
"ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
@ -124,7 +124,7 @@
"flake-utils": "flake-utils",
"hls": "hls",
"nix-filter": "nix-filter",
"nixpkgs23_11": "nixpkgs23_11",
"nixpkgs24_05": "nixpkgs24_05",
"nixpkgsMaster": "nixpkgsMaster"
}
},

15
flake.nix
View File

@ -1,7 +1,7 @@
{
description = "A Haskell kernel for IPython.";
inputs.nixpkgs23_11.url = "github:NixOS/nixpkgs/release-23.11";
inputs.nixpkgs24_05.url = "github:NixOS/nixpkgs/release-24.05";
inputs.nixpkgsMaster.url = "github:NixOS/nixpkgs/master";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.hls = {
@ -15,10 +15,10 @@
extra-trusted-public-keys = [ "ihaskell.cachix.org-1:WoIvex/Ft/++sjYW3ntqPUL3jDGXIKDpX60pC8d5VLM="];
};
outputs = { self, nixpkgs23_11, nixpkgsMaster, flake-utils, hls, nix-filter, ... }:
outputs = { self, nixpkgs24_05, nixpkgsMaster, flake-utils, hls, nix-filter, ... }:
flake-utils.lib.eachDefaultSystem (system: let
baseOverlay = self: super: { inherit nix-filter; };
pkgs23_11 = import nixpkgs23_11 { inherit system; overlays = [baseOverlay]; };
pkgs24_05 = import nixpkgs24_05 { inherit system; overlays = [baseOverlay]; };
pkgsMaster = import nixpkgsMaster { inherit system; overlays = [baseOverlay]; };
jupyterlab = pkgsMaster.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
@ -33,9 +33,8 @@
};
in
pkgsMaster.lib.listToAttrs [
(mkVersion nixpkgs23_11 "ghc94" [(import ./nix/overlay-9.4.nix)] {})
(mkVersion nixpkgsMaster "ghc96" [(import ./nix/overlay-9.6.nix)] {})
(mkVersion nixpkgsMaster "ghc98" [(import ./nix/overlay-9.8.nix)] { enableHlint = false; })
(mkVersion nixpkgs24_05 "ghc96" [(import ./nix/overlay-9.6.nix)] {})
(mkVersion nixpkgsMaster "ghc98" [(import ./nix/overlay-9.8.nix)] { enableHlint = false; })
];
# Helper function for building environments with a given set of packages
@ -103,8 +102,8 @@
}
) envs;
defaultPackage = self.packages.${system}.ihaskell-env-ghc94;
defaultPackage = self.packages.${system}.ihaskell-env-ghc96;
devShell = self.packages.${system}.ihaskell-dev-ghc94;
devShell = self.packages.${system}.ihaskell-dev-ghc96;
});
}