nix: Update nixpkgs, and thus remove the workaround
This commit is contained in:
parent
304fb5a1ad
commit
a8b6d1f547
2 changed files with 3 additions and 24 deletions
22
flake.lock
generated
22
flake.lock
generated
|
@ -65,11 +65,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1678418513,
|
||||
"narHash": "sha256-HLLR2Fmkn3TgD0F+u5gMcTKx5YzAU1rbS4cLfm6ugiU=",
|
||||
"lastModified": 1678594102,
|
||||
"narHash": "sha256-OHAHYiMWJFPNxuW/PcOMlSD2tvXnEYC1jxREBADHwwQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5496585eb876f2ce97654bc8f96838c6f8642563",
|
||||
"rev": "796b4a3c1d903c4b9270cd2548fe46f524eeb886",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -79,21 +79,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-140774-workaround": {
|
||||
"locked": {
|
||||
"lastModified": 1677708284,
|
||||
"narHash": "sha256-syAhlmvVlVDwgoKS6b3EfrQKfaeCY3zjT2q7VBk/yx8=",
|
||||
"owner": "srid",
|
||||
"repo": "nixpkgs-140774-workaround",
|
||||
"rev": "5fe054e8560cf474b3c89622c1ea7688023425c1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "srid",
|
||||
"repo": "nixpkgs-140774-workaround",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
|
@ -119,7 +104,6 @@
|
|||
"haskell-flake": "haskell-flake",
|
||||
"mission-control": "mission-control",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-140774-workaround": "nixpkgs-140774-workaround",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
}
|
||||
},
|
||||
|
|
|
@ -8,8 +8,6 @@
|
|||
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
flake-root.url = "github:srid/flake-root";
|
||||
mission-control.url = "github:Platonic-Systems/mission-control";
|
||||
|
||||
nixpkgs-140774-workaround.url = "github:srid/nixpkgs-140774-workaround";
|
||||
};
|
||||
|
||||
outputs = inputs@{ self, nixpkgs, flake-parts, ... }:
|
||||
|
@ -25,9 +23,6 @@
|
|||
# The "main" project. You can have multiple projects, but this template
|
||||
# has only one.
|
||||
haskellProjects.main = {
|
||||
imports = [
|
||||
inputs.nixpkgs-140774-workaround.haskellFlakeProjectModules.default
|
||||
];
|
||||
# packages.haskell-template.root = ./.; # Auto-discovered by haskell-flake
|
||||
overrides = self: super: { };
|
||||
devShell = {
|
||||
|
|
Loading…
Reference in a new issue