summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Stachurski <jakub@wilkuu.nl>2026-10-03 15:34:47 +0200
committerJakub Stachurski <jakub@wilkuu.nl>2026-10-03 15:34:47 +0200
commitc312d1fb63435f2cb2152d13ff4d782e369a5031 (patch)
tree6a66b32c3a0132cd822214fc1aca14b404cb58d6
parentcd81083acb98174f834b61d6252caa28797b846f (diff)
toolchainmaster
-rw-r--r--flake.lock30
-rw-r--r--flake.nix10
-rw-r--r--rust-toolchain.toml2
3 files changed, 21 insertions, 21 deletions
diff --git a/flake.lock b/flake.lock
index 4a7ecf7..af0e10d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"crane": {
"locked": {
- "lastModified": 1771438068,
- "narHash": "sha256-nGBbXvEZVe/egCPVPFcu89RFtd8Rf6J+4RFoVCFec0A=",
+ "lastModified": 1790899423,
+ "narHash": "sha256-THGtz65UGJU+sonZidRboyCMk+9DclpMF7pwL4uDV4M=",
"owner": "ipetkov",
"repo": "crane",
- "rev": "b5090e53e9d68c523a4bb9ad42b4737ee6747597",
+ "rev": "47b6b27ed9a3a9181415e4367d0c30ab2a0e0250",
"type": "github"
},
"original": {
@@ -23,11 +23,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
- "lastModified": 1771657407,
- "narHash": "sha256-ZkKTcOgfy8lIkdTNpGfc01G21d5oT7xMqGT4cazFl60=",
+ "lastModified": 1791026615,
+ "narHash": "sha256-F1kbChHSEQ9rnMWvH2lc7RxE2TUzqObA797b5oWKTQM=",
"owner": "nix-community",
"repo": "fenix",
- "rev": "6d86ae5186ba275b7874d02908505fc658448658",
+ "rev": "24ce8305b35f9f0351d87c4ad939500228678ac6",
"type": "github"
},
"original": {
@@ -56,11 +56,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1771369470,
- "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+ "lastModified": 1790822859,
+ "narHash": "sha256-69xHQhAeMAD2wDXO7T2pcOZIF9Sga2W+JkmY2a11Ops=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "0182a361324364ae3f436a63005877674cf45efb",
+ "rev": "c59305bab2065cfecc4944690d9eedbb56f3a9fa",
"type": "github"
},
"original": {
@@ -82,11 +82,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
- "lastModified": 1771585531,
- "narHash": "sha256-xMDlGXSLxr5F2lt7ydy3ve4rE7xFVvBx1u8OyYOXyDI=",
+ "lastModified": 1790945856,
+ "narHash": "sha256-NFVMI5fBIijd+xVkz6+Ab8GxZOB964b8s00DDFjBtP8=",
"owner": "rust-lang",
"repo": "rust-analyzer",
- "rev": "46a214b5d35f2e2a02c0b278d9287b20760821eb",
+ "rev": "cdc4aa0a6142ff7cda91dae5ae373792d81c522c",
"type": "github"
},
"original": {
@@ -118,11 +118,11 @@
]
},
"locked": {
- "lastModified": 1770228511,
- "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
+ "lastModified": 1786901030,
+ "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
+ "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index a413f57..92afb0d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,7 +31,7 @@
rustToolchain = fenix.packages.${system}.fromToolchainFile {
file = ./rust-toolchain.toml;
- sha256 = "sha256-lEeYHNJjEVlYS+kLomkfpFWNEJQFhgSjuISZwMdWmb8=" ;
+ sha256 = "sha256-p8h3Sl/YRByZfZTAKXdsvF6xEenXKrXSVvpphmZENH4=" ;
};
craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
@@ -102,10 +102,10 @@
env = {
"LD_LIBRARY_PATH" = lib.makeLibraryPath (with pkgs; [ stdenv.cc.cc.lib
vulkan-loader
- xorg.libX11
- xorg.libXcursor
- xorg.libXi
- xorg.libXrandr
+ libx11
+ libxcursor
+ libxi
+ libxrandr
libxkbcommon
]);
};
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 39171ab..072c715 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
[toolchain]
-channel = "nightly"
+channel = "1.98.1"
targets = [
#linux
"x86_64-unknown-linux-gnu",