patrickaldis/garnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Haskell.nix flake input

Browse Source
This commit is contained in:
George Thomas 2026-02-19 14:03:24 +00:00
parent 7d90990b74
commit 2bab0ff94e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock generated
View File

@ -200,7 +200,7 @@
"type": "github" "type": "github"
} }
}, },
"haskellNix": { "haskell-nix": {
"inputs": { "inputs": {
"HTTP": "HTTP", "HTTP": "HTTP",
"cabal-32": "cabal-32", "cabal-32": "cabal-32",
@ -228,7 +228,7 @@
"hpc-coveralls": "hpc-coveralls", "hpc-coveralls": "hpc-coveralls",
"iserv-proxy": "iserv-proxy", "iserv-proxy": "iserv-proxy",
"nixpkgs": [ "nixpkgs": [
"haskellNix", "haskell-nix",
"nixpkgs-unstable" "nixpkgs-unstable"
], ],
"nixpkgs-2305": "nixpkgs-2305", "nixpkgs-2305": "nixpkgs-2305",
@ -744,11 +744,11 @@
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"haskellNix": "haskellNix", "haskell-nix": "haskell-nix",
"hls-2-13": "hls-2-13", "hls-2-13": "hls-2-13",
"hs-bindgen": "hs-bindgen", "hs-bindgen": "hs-bindgen",
"nixpkgs": [ "nixpkgs": [
"haskellNix", "haskell-nix",
"nixpkgs-2511" "nixpkgs-2511"
], ],
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"

8
flake.nix
View File

@ -1,8 +1,8 @@
{ {
inputs = { inputs = {
haskellNix.url = "github:input-output-hk/haskell.nix"; haskell-nix.url = "github:input-output-hk/haskell.nix";
hls-2-13 = { url = "github:haskell/haskell-language-server/2.13.0.0"; flake = false; }; hls-2-13 = { url = "github:haskell/haskell-language-server/2.13.0.0"; flake = false; };
nixpkgs.follows = "haskellNix/nixpkgs-2511"; nixpkgs.follows = "haskell-nix/nixpkgs-2511";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
crane.url = "github:ipetkov/crane"; crane.url = "github:ipetkov/crane";
rust-overlay = { rust-overlay = {
@ -16,7 +16,7 @@
inputs.flake-utils.lib.eachSystem [ "x86_64-linux" ] (system: inputs.flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
let let
overlays = [ overlays = [
inputs.haskellNix.overlay inputs.haskell-nix.overlay
(final: _prev: { (final: _prev: {
hixProject = hixProject =
final.haskell-nix.hix.project { final.haskell-nix.hix.project {
@ -36,7 +36,7 @@
}) })
(import inputs.rust-overlay) (import inputs.rust-overlay)
]; ];
pkgs = import nixpkgs { inherit system overlays; inherit (inputs.haskellNix) config; }; pkgs = import nixpkgs { inherit system overlays; inherit (inputs.haskell-nix) config; };
haskell = pkgs.hixProject.flake { }; haskell = pkgs.hixProject.flake { };
rust = (inputs.crane.mkLib pkgs).overrideToolchain (p: p.rust-bin.selectLatestNightlyWith ( rust = (inputs.crane.mkLib pkgs).overrideToolchain (p: p.rust-bin.selectLatestNightlyWith (
toolchain: toolchain.default.override { toolchain: toolchain.default.override {