From d71b64f5c5dd99021a582ce6bf6c1d97b1c55af3 Mon Sep 17 00:00:00 2001 From: Timon Date: Tue, 27 Oct 2026 13:26:54 +0000 Subject: [PATCH 1/2] Update Nix flake --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6b0e09a28ed..19fae35f59d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1789760033, - "narHash": "sha256-jtT4yxZpR8seYnlCMMWSSPlFN92zO6ICuZ8pJrmi86k=", + "lastModified": 1792350552, + "narHash": "sha256-292lvpvxTGKryKxh3/3tcIVi85CwYGdl4oOi113Sob8=", "owner": "ipetkov", "repo": "crane", - "rev": "73b980519cefc727a5f6cc8e5c0947a2f9be6edd", + "rev": "e675a36b7377bebe41d548388a2501cbb16d380d", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1790578696, - "narHash": "sha256-ZoxIApko70jCdbH3l20HWXOBaT2HZd87orzd2yJ9dVE=", + "lastModified": 1792773339, + "narHash": "sha256-rZLrzrC6i+jnTAlvPZHogKDulY7WWDEv9hJeHieO7Zw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7a0f122f5090cf4c2ade2a13a0e229d4e19ba71f", + "rev": "3ec636362e1816bc2f0888fa0fa2c69f1bc9e504", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1790756160, - "narHash": "sha256-NPs4nNLxCpho3Ctj8O7t/bzmX0zR8r0zndKghAFEz5U=", + "lastModified": 1793086596, + "narHash": "sha256-ObKS44vw4IIVpQ69YJzUGjZ0IwnpWoUlwjJSY7gefdo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ed3a19fd0439ed618ec5fe1e12f0ba69a8be38b5", + "rev": "c7e9d512653a35ef4d5879c3df4d44d7b78d0e6d", "type": "github" }, "original": { From 2a72bd1d35a4f0a51422691fedab8957e4118773 Mon Sep 17 00:00:00 2001 From: Timon Date: Tue, 27 Oct 2026 14:41:20 +0000 Subject: [PATCH 2/2] Update cargo-about --- .nix/default.nix | 1 + .nix/deps/cargo-about.nix | 18 ++++++++++++++++++ .nix/dev.nix | 2 +- .nix/pkgs/graphite.nix | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 .nix/deps/cargo-about.nix diff --git a/.nix/default.nix b/.nix/default.nix index 588d29801d0..1902928edfe 100644 --- a/.nix/default.nix +++ b/.nix/default.nix @@ -32,6 +32,7 @@ let deps = { crane = lib.call ./deps/crane.nix; rustGPU = lib.call ./deps/rust-gpu.nix; + cargoAbout = lib.call ./deps/cargo-about.nix; }; args = { diff --git a/.nix/deps/cargo-about.nix b/.nix/deps/cargo-about.nix new file mode 100644 index 00000000000..76b48eb6747 --- /dev/null +++ b/.nix/deps/cargo-about.nix @@ -0,0 +1,18 @@ +# TODO: Remove once nixpkgs ships cargo-about >= 0.9.3, and switch back to `pkgs.cargo-about` +{ pkgs, ... }: + +pkgs.cargo-about.overrideAttrs ( + finalAttrs: _: { + version = "0.9.3"; + src = pkgs.fetchFromGitHub { + owner = "EmbarkStudios"; + repo = "cargo-about"; + tag = finalAttrs.version; + hash = "sha256-Jlr4TYNZkzYo5V77n0YYrx1e8m17ELN/1+ZcR/Bl0K4="; + }; + cargoDeps = pkgs.rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-kNGfQQumgvtDPhiQcqc9K2ohhEsTzuySeisHcNcmig8="; + }; + } +) diff --git a/.nix/dev.nix b/.nix/dev.nix index 3266fe16bdc..db2fb25e78a 100644 --- a/.nix/dev.nix +++ b/.nix/dev.nix @@ -23,7 +23,7 @@ let pkgs.nodejs pkgs.binaryen pkgs.wasm-bindgen-cli_0_2_127 - pkgs.cargo-about + deps.cargoAbout pkgs.rustc pkgs.cargo diff --git a/.nix/pkgs/graphite.nix b/.nix/pkgs/graphite.nix index 04a87b98f6a..31052cc83ce 100644 --- a/.nix/pkgs/graphite.nix +++ b/.nix/pkgs/graphite.nix @@ -85,7 +85,7 @@ deps.crane.lib.buildPackage ( pkgs.nodejs pkgs.binaryen pkgs.wasm-bindgen-cli_0_2_127 - pkgs.cargo-about + deps.cargoAbout pkgs.removeReferencesTo pkgs.importNpmLock.npmConfigHook ];