bump nixpkgs and ghcs

This commit is contained in:
Torsten Schmits 2022-09-28 19:41:06 +02:00
parent 6e1e5e9c5e
commit 4aba283491
2 changed files with 23 additions and 21 deletions

View File

@ -2,11 +2,11 @@
"nodes": {
"flake-utils": {
"locked": {
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
@ -17,11 +17,11 @@
},
"nixpkgs_2009": {
"locked": {
"lastModified": 1636935165,
"narHash": "sha256-J4smKTYTp8wJ57znUerWlS/QRgp0jcm/StcfIhsa5eA=",
"lastModified": 1651477912,
"narHash": "sha256-YDFgJElf0ZL977+fo6ueQAmpb6lwrw1lzDlxLEINVXE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f7949198dcff52265b322ca8abf7450610e7e49e",
"rev": "66b0db71f463164486a36dded50bedee185e45c2",
"type": "github"
},
"original": {
@ -33,11 +33,11 @@
},
"nixpkgs_2105": {
"locked": {
"lastModified": 1637497871,
"narHash": "sha256-UXjWFjZSQW56Ax2fKspG0aezeRmV7j4WAbkbnZpIFtk=",
"lastModified": 1659914493,
"narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d5c4e868ce3783a95bc1dd898777f09af7ff69ee",
"rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf",
"type": "github"
},
"original": {
@ -57,11 +57,11 @@
},
"unstable": {
"locked": {
"lastModified": 1637453606,
"narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=",
"lastModified": 1664356419,
"narHash": "sha256-PD0hM9YWp2lepAJk7edh8g1VtzJip5rals1fpoQUlY0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8afc4e543663ca0a6a4f496262cd05233737e732",
"rev": "46e8398474ac3b1b7bb198bf9097fc213bbf59b1",
"type": "github"
},
"original": {

View File

@ -18,8 +18,8 @@
"865" = hsPkgs nixpkgs_2009 "ghc865";
"884" = hsPkgs nixpkgs_2105 "ghc884";
"8107" = hsPkgs unstable "ghc8107";
"901" = hsPkgs unstable "ghc901";
"921" = hsPkgs unstable "ghc921";
"902" = hsPkgs unstable "ghc902";
"924" = hsPkgs unstable "ghc924";
};
mkPackages = version: {
@ -27,8 +27,12 @@
"polysemy-plugin-${version}" = ghcs.${version}.polysemy-plugin;
};
packages =
foldl' (l: r: l // r) { inherit (ghcs."8107") polysemy polysemy-plugin; } (map mkPackages (attrNames ghcs));
defaultPackages = {
inherit (ghcs."902") polysemy polysemy-plugin;
default = ghcs."902".polysemy;
};
packages = foldl' (l: r: l // r) defaultPackages (map mkPackages (attrNames ghcs));
mkDevShell = extra: ghc: ghc.shellFor {
packages = p: [p.polysemy p.polysemy-plugin];
@ -38,14 +42,12 @@
withHoogle = extra;
};
devShells = mapAttrs' (n: g: nameValuePair "ghc${n}" (mkDevShell (n != "921") g)) ghcs;
devShells = mapAttrs' (n: g: nameValuePair "ghc${n}" (mkDevShell (n != "924") g)) ghcs;
in {
inherit packages devShells;
inherit packages;
defaultPackage = packages.polysemy;
devShell = devShells.ghc8107;
devShells = devShells // { default = devShells.ghc902; };
checks = packages;
});