git.iko.soy/helix
on master help sign in
nix: Update to lld 13, drop flake-compat (was unused)
a45df12Blaž Hrastnik
flake.lock−17
compare with master
unifiedsplit
@@ -30,22 +30,6 @@
30 "type": "github"
30 "type": "github"
31 }
31 }
32 },
32 },
33− "flakeCompat": {
34− "flake": false,
35− "locked": {
36− "lastModified": 1627913399,
37− "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
38− "owner": "edolstra",
39− "repo": "flake-compat",
40− "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
41− "type": "github"
42− },
43− "original": {
44− "owner": "edolstra",
45− "repo": "flake-compat",
46− "type": "github"
47− }
48− },
49 "nixCargoIntegration": {
33 "nixCargoIntegration": {
50 "inputs": {
34 "inputs": {
51 "devshell": "devshell",
35 "devshell": "devshell",
@@ -103,7 +87,6 @@
103 },
87 },
104 "root": {
88 "root": {
105 "inputs": {
89 "inputs": {
106− "flakeCompat": "flakeCompat",
107 "nixCargoIntegration": "nixCargoIntegration",
90 "nixCargoIntegration": "nixCargoIntegration",
108 "nixpkgs": "nixpkgs",
91 "nixpkgs": "nixpkgs",
109 "rust-overlay": "rust-overlay"
92 "rust-overlay": "rust-overlay"
flake.nix+1−5
@@ -9,10 +9,6 @@
9 inputs.nixpkgs.follows = "nixpkgs";
9 inputs.nixpkgs.follows = "nixpkgs";
10 inputs.rustOverlay.follows = "rust-overlay";
10 inputs.rustOverlay.follows = "rust-overlay";
11 };
11 };
12− flakeCompat = {
13− url = "github:edolstra/flake-compat";
14− flake = false;
15− };
16 };
12 };
17
13
18 outputs = inputs@{ self, nixCargoIntegration, ... }:
14 outputs = inputs@{ self, nixCargoIntegration, ... }:
@@ -63,7 +59,7 @@
63 '';
59 '';
64 };
60 };
65 shell = common: prev: {
61 shell = common: prev: {
66− packages = prev.packages ++ (with common.pkgs; [ lld_12 lldb cargo-tarpaulin ]);
62+ packages = prev.packages ++ (with common.pkgs; [ lld_13 lldb cargo-tarpaulin ]);
67 env = prev.env ++ [
63 env = prev.env ++ [
68 { name = "HELIX_RUNTIME"; eval = "$PWD/runtime"; }
64 { name = "HELIX_RUNTIME"; eval = "$PWD/runtime"; }
69 { name = "RUST_BACKTRACE"; value = "1"; }
65 { name = "RUST_BACKTRACE"; value = "1"; }