diff --git a/flake.lock b/flake.lock
index fa292273..d33c404e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,9 +18,6 @@
},
"dream2nix": {
"inputs": {
- "alejandra": [
- "nci"
- ],
"all-cabal-json": [
"nci"
],
@@ -28,6 +25,8 @@
"devshell": [
"nci"
],
+ "drv-parts": "drv-parts",
+ "flake-compat": "flake-compat",
"flake-parts": [
"nci",
"parts"
@@ -51,6 +50,7 @@
"nci",
"nixpkgs"
],
+ "nixpkgsV1": "nixpkgsV1",
"poetry2nix": [
"nci"
],
@@ -62,11 +62,11 @@
]
},
"locked": {
- "lastModified": 1677289985,
- "narHash": "sha256-lUp06cTTlWubeBGMZqPl9jODM99LpWMcwxRiscFAUJg=",
+ "lastModified": 1680258209,
+ "narHash": "sha256-lEo50RXI/17/a9aCIun8Hz62ZJ5JM5RGeTgclIP+Lgc=",
"owner": "nix-community",
"repo": "dream2nix",
- "rev": "28b973a8d4c30cc1cbb3377ea2023a76bc3fb889",
+ "rev": "6f512b5a220fdb26bd3c659f7b55e4f052ec8b35",
"type": "github"
},
"original": {
@@ -75,6 +75,54 @@
"type": "github"
}
},
+ "drv-parts": {
+ "inputs": {
+ "flake-compat": [
+ "nci",
+ "dream2nix",
+ "flake-compat"
+ ],
+ "flake-parts": [
+ "nci",
+ "dream2nix",
+ "flake-parts"
+ ],
+ "nixpkgs": [
+ "nci",
+ "dream2nix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1680172861,
+ "narHash": "sha256-QMyI338xRxaHFDlCXdLCtgelGQX2PdlagZALky4ZXJ8=",
+ "owner": "davhau",
+ "repo": "drv-parts",
+ "rev": "ced8a52f62b0a94244713df2225c05c85b416110",
+ "type": "github"
+ },
+ "original": {
+ "owner": "davhau",
+ "repo": "drv-parts",
+ "type": "github"
+ }
+ },
+ "flake-compat": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1673956053,
+ "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
"flake-utils": {
"locked": {
"lastModified": 1659877975,
@@ -119,11 +167,11 @@
]
},
"locked": {
- "lastModified": 1677297103,
- "narHash": "sha256-ArlJIbp9NGV9yvhZdV0SOUFfRlI/kHeKoCk30NbSiLc=",
+ "lastModified": 1680329418,
+ "narHash": "sha256-+KN0eQLSZvL1J0kDO8/fxv0UCHTyZCADLmpIfeeiSGo=",
"owner": "yusdacra",
"repo": "nix-cargo-integration",
- "rev": "a79272a2cb0942392bb3a5bf9a3ec6bc568795b2",
+ "rev": "98c1d2ff5155f0fee5d290f6b982cb990839d540",
"type": "github"
},
"original": {
@@ -134,11 +182,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1677063315,
- "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=",
+ "lastModified": 1680213900,
+ "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "988cc958c57ce4350ec248d2d53087777f9e1949",
+ "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
"type": "github"
},
"original": {
@@ -151,11 +199,11 @@
"nixpkgs-lib": {
"locked": {
"dir": "lib",
- "lastModified": 1675183161,
- "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=",
+ "lastModified": 1678375444,
+ "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e",
+ "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e",
"type": "github"
},
"original": {
@@ -166,6 +214,21 @@
"type": "github"
}
},
+ "nixpkgsV1": {
+ "locked": {
+ "lastModified": 1678500271,
+ "narHash": "sha256-tRBLElf6f02HJGG0ZR7znMNFv/Uf7b2fFInpTHiHaSE=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "5eb98948b66de29f899c7fe27ae112a47964baf8",
+ "type": "github"
+ },
+ "original": {
+ "id": "nixpkgs",
+ "ref": "nixos-22.11",
+ "type": "indirect"
+ }
+ },
"parts": {
"inputs": {
"nixpkgs-lib": [
@@ -174,11 +237,11 @@
]
},
"locked": {
- "lastModified": 1675933616,
- "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=",
+ "lastModified": 1679737941,
+ "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "47478a4a003e745402acf63be7f9a092d51b83d7",
+ "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c",
"type": "github"
},
"original": {
@@ -192,11 +255,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
- "lastModified": 1675933616,
- "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=",
+ "lastModified": 1679737941,
+ "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "47478a4a003e745402acf63be7f9a092d51b83d7",
+ "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c",
"type": "github"
},
"original": {
@@ -221,11 +284,11 @@
]
},
"locked": {
- "lastModified": 1677292251,
- "narHash": "sha256-D+6q5Z2MQn3UFJtqsM5/AvVHi3NXKZTIMZt1JGq/spA=",
+ "lastModified": 1680315536,
+ "narHash": "sha256-0AsBuKssJMbcRcw4HJQwJsUHhZxR5+gaf6xPQayhR44=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "34cdbf6ad480ce13a6a526f57d8b9e609f3d65dc",
+ "rev": "5c8c151bdd639074a0051325c16df1a64ee23497",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 2ac76488..6dcaf6cc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -123,8 +123,6 @@
then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
else "$RUSTFLAGS";
in {
- # by default NCI adds rust-analyzer component, but helix toolchain doesn't have rust-analyzer
- nci.toolchains.shell.components = ["rust-src" "rustfmt" "clippy"];
nci.projects."helix-project".relPath = "";
nci.crates."helix-term" = {
overrides = {