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

Use Nixpkgs 24.11 ()

Browse Source 
* Use Nixpkgs 24.11
* nix/overlay-9.8.nix: update overrides
This commit is contained in:
Vaibhav Sagar 2024-12-01 23:08:27 +11:00 committed by GitHub
parent 6053b7ed65
commit d896621edb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 15 deletions

18
flake.lock generated

@ -87,29 +87,29 @@
"type": "github"
}
},
"nixpkgs24_05": {
"nixpkgs24_11": {
"locked": {
"lastModified": 1733016324,
"narHash": "sha256-8qwPSE2g1othR1u4uP86NXxm6i7E9nHPyJX3m3lx7Q4=",
"lastModified": 1733051707,
"narHash": "sha256-W3SXPj02ZQ7ubzAD+CQDiW0bsjq2rSUwAwNvxFi4qrQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7e1ca67996afd8233d9033edd26e442836cc2ad6",
"rev": "8b5e45a51799bc3569fc389ec4d79cf28c0ce699",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-24.05",
"ref": "release-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgsMaster": {
"locked": {
"lastModified": 1733015953,
"narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
"lastModified": 1733051162,
"narHash": "sha256-lgALHzwMM2qWKBGoOfSCQ+J+P7CvfRQTQdaHsX8HeGc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
"rev": "aa3e602431593f4b83a3b71aaf0b84fbde8f1a4b",
"type": "github"
},
"original": {
@ -124,7 +124,7 @@
"flake-utils": "flake-utils",
"hls": "hls",
"nix-filter": "nix-filter",
"nixpkgs24_05": "nixpkgs24_05",
"nixpkgs24_11": "nixpkgs24_11",
"nixpkgsMaster": "nixpkgsMaster"
}
},

8
flake.nix

@ -1,7 +1,7 @@
{
description = "A Haskell kernel for IPython.";
inputs.nixpkgs24_05.url = "github:NixOS/nixpkgs/release-24.05";
inputs.nixpkgs24_11.url = "github:NixOS/nixpkgs/release-24.11";
inputs.nixpkgsMaster.url = "github:NixOS/nixpkgs/master";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.hls = {
@ -15,7 +15,7 @@
extra-trusted-public-keys = [ "ihaskell.cachix.org-1:WoIvex/Ft/++sjYW3ntqPUL3jDGXIKDpX60pC8d5VLM="];
};
outputs = { self, nixpkgs24_05, nixpkgsMaster, flake-utils, hls, nix-filter, ... }:
outputs = { self, nixpkgs24_11, nixpkgsMaster, flake-utils, hls, nix-filter, ... }:
flake-utils.lib.eachDefaultSystem (system: let
baseOverlay = _self: _super: { inherit nix-filter; };
pkgsMaster = import nixpkgsMaster { inherit system; overlays = [baseOverlay]; };
@ -32,8 +32,8 @@
};
in
pkgsMaster.lib.listToAttrs [
(mkVersion nixpkgs24_05 "ghc96" [(import ./nix/overlay-9.6.nix)] {})
(mkVersion nixpkgs24_05 "ghc98" [(import ./nix/overlay-9.8.nix)] {})
(mkVersion nixpkgs24_11 "ghc96" [(import ./nix/overlay-9.6.nix)] {})
(mkVersion nixpkgs24_11 "ghc98" [(import ./nix/overlay-9.8.nix)] {})
(mkVersion nixpkgsMaster "ghc910" [(import ./nix/overlay-9.10.nix)] { enableHlint = false; })
];

4
nix/overlay-9.8.nix

@ -3,8 +3,8 @@ _sel: sup: {
packages = sup.haskell.packages // {
ghc98 = sup.haskell.packages.ghc98.override {
overrides = self: super: {
ghc-syntax-highlighter = super.ghc-syntax-highlighter_0_0_11_0.overrideScope(self: _super: {
ghc-lib-parser = self.ghc-lib-parser_9_8_2_20240223;
ghc-syntax-highlighter = (self.callHackage "ghc-syntax-highlighter" "0.0.11.0" {}).overrideScope(self: _super: {
ghc-lib-parser = self.ghc-lib-parser_9_8_3_20241022;
});
# For display libs