pyrox.dev / nixpkgs
lol
fork atom

tests.importCargoLock: fix self-inclusive src listings in .nix files

Replace `src = ./.` instances with more explicit source listings.
Otherwise, derivations will be rebuilt on any change to the files
defining them (e.g. formatting via nixfmt-rfc-style).

Olivia Crain 13481954 c1f239fa

+95 -23
unified split
+12 -3
pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix
··· 1 - { rustPlatform }: 2 - 3 rustPlatform.buildRustPackage { 4 pname = "basic-dynamic"; 5 version = "0.1.0"; 6 7 - src = ./.; 8 9 cargoLock.lockFileContents = builtins.readFile ./Cargo.lock; 10
··· 1 + { lib, rustPlatform }: 2 + let 3 + fs = lib.fileset; 4 + in 5 rustPlatform.buildRustPackage { 6 pname = "basic-dynamic"; 7 version = "0.1.0"; 8 9 + src = fs.toSource { 10 + root = ./.; 11 + fileset = fs.unions [ 12 + ./Cargo.toml 13 + ./Cargo.lock 14 + ./src 15 + ]; 16 + }; 17 18 cargoLock.lockFileContents = builtins.readFile ./Cargo.lock; 19
+12 -3
pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix
··· 1 - { rustPlatform }: 2 - 3 rustPlatform.buildRustPackage { 4 pname = "basic"; 5 version = "0.1.0"; 6 7 - src = ./.; 8 9 cargoLock = { 10 lockFile = ./Cargo.lock;
··· 1 + { lib, rustPlatform }: 2 + let 3 + fs = lib.fileset; 4 + in 5 rustPlatform.buildRustPackage { 6 pname = "basic"; 7 version = "0.1.0"; 8 9 + src = fs.toSource { 10 + root = ./.; 11 + fileset = fs.unions [ 12 + ./Cargo.toml 13 + ./Cargo.lock 14 + ./src 15 + ]; 16 + }; 17 18 cargoLock = { 19 lockFile = ./Cargo.lock;
+12 -3
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix
··· 1 - { rustPlatform }: 2 - 3 rustPlatform.buildRustPackage { 4 pname = "git-dependency-branch"; 5 version = "0.1.0"; 6 7 - src = ./.; 8 9 cargoLock = { 10 lockFile = ./Cargo.lock;
··· 1 + { lib, rustPlatform }: 2 + let 3 + fs = lib.fileset; 4 + in 5 rustPlatform.buildRustPackage { 6 pname = "git-dependency-branch"; 7 version = "0.1.0"; 8 9 + src = fs.toSource { 10 + root = ./.; 11 + fileset = fs.unions [ 12 + ./Cargo.toml 13 + ./Cargo.lock 14 + ./src 15 + ]; 16 + }; 17 18 cargoLock = { 19 lockFile = ./Cargo.lock;
+11 -2
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix
··· 1 { rustPlatform, pkg-config, openssl, lib, darwin, stdenv }: 2 - 3 rustPlatform.buildRustPackage { 4 pname = "git-dependency-rev-non-workspace-nested-crate"; 5 version = "0.1.0"; 6 7 - src = ./.; 8 9 nativeBuildInputs = [ 10 pkg-config
··· 1 { rustPlatform, pkg-config, openssl, lib, darwin, stdenv }: 2 + let 3 + fs = lib.fileset; 4 + in 5 rustPlatform.buildRustPackage { 6 pname = "git-dependency-rev-non-workspace-nested-crate"; 7 version = "0.1.0"; 8 9 + src = fs.toSource { 10 + root = ./.; 11 + fileset = fs.unions [ 12 + ./Cargo.toml 13 + ./Cargo.lock 14 + ./src 15 + ]; 16 + }; 17 18 nativeBuildInputs = [ 19 pkg-config
+12 -3
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix
··· 1 - { rustPlatform }: 2 - 3 rustPlatform.buildRustPackage { 4 pname = "git-dependency-rev"; 5 version = "0.1.0"; 6 7 - src = ./.; 8 9 cargoLock = { 10 lockFile = ./Cargo.lock;
··· 1 + { lib, rustPlatform }: 2 + let 3 + fs = lib.fileset; 4 + in 5 rustPlatform.buildRustPackage { 6 pname = "git-dependency-rev"; 7 version = "0.1.0"; 8 9 + src = fs.toSource { 10 + root = ./.; 11 + fileset = fs.unions [ 12 + ./Cargo.toml 13 + ./Cargo.lock 14 + ./src 15 + ]; 16 + }; 17 18 cargoLock = { 19 lockFile = ./Cargo.lock;
+12 -3
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix
··· 1 - { rustPlatform }: 2 - 3 rustPlatform.buildRustPackage { 4 pname = "git-dependency-tag"; 5 version = "0.1.0"; 6 7 - src = ./.; 8 9 cargoLock = { 10 lockFile = ./Cargo.lock;
··· 1 + { lib, rustPlatform }: 2 + let 3 + fs = lib.fileset; 4 + in 5 rustPlatform.buildRustPackage { 6 pname = "git-dependency-tag"; 7 version = "0.1.0"; 8 9 + src = fs.toSource { 10 + root = ./.; 11 + fileset = fs.unions [ 12 + ./Cargo.toml 13 + ./Cargo.lock 14 + ./src 15 + ]; 16 + }; 17 18 cargoLock = { 19 lockFile = ./Cargo.lock;
+12 -3
pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix
··· 1 - { rustPlatform }: 2 - 3 rustPlatform.buildRustPackage { 4 pname = "git-dependency"; 5 version = "0.1.0"; 6 7 - src = ./.; 8 9 cargoLock = { 10 lockFile = ./Cargo.lock;
··· 1 + { lib, rustPlatform }: 2 + let 3 + fs = lib.fileset; 4 + in 5 rustPlatform.buildRustPackage { 6 pname = "git-dependency"; 7 version = "0.1.0"; 8 9 + src = fs.toSource { 10 + root = ./.; 11 + fileset = fs.unions [ 12 + ./Cargo.toml 13 + ./Cargo.lock 14 + ./src 15 + ]; 16 + }; 17 18 cargoLock = { 19 lockFile = ./Cargo.lock;
+12 -3
pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix
··· 1 - { rustPlatform }: 2 - 3 rustPlatform.buildRustPackage { 4 pname = "v1"; 5 version = "0.1.0"; 6 7 - src = ./.; 8 9 cargoLock = { 10 lockFile = ./Cargo.lock;
··· 1 + { lib, rustPlatform }: 2 + let 3 + fs = lib.fileset; 4 + in 5 rustPlatform.buildRustPackage { 6 pname = "v1"; 7 version = "0.1.0"; 8 9 + src = fs.toSource { 10 + root = ./.; 11 + fileset = fs.unions [ 12 + ./Cargo.toml 13 + ./Cargo.lock 14 + ./src 15 + ]; 16 + }; 17 18 cargoLock = { 19 lockFile = ./Cargo.lock;