From 13481954160723e1080b02851ae38a72e04f4fee Mon Sep 17 00:00:00 2001 From: Olivia Crain Date: Wed, 10 Apr 2024 10:01:45 -0500 Subject: [PATCH] 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). --- .../import-cargo-lock/basic-dynamic/default.nix | 15 ++++++++++++--- .../rust/test/import-cargo-lock/basic/default.nix | 15 ++++++++++++--- .../git-dependency-branch/default.nix | 15 ++++++++++++--- .../default.nix | 13 +++++++++++-- .../git-dependency-rev/default.nix | 15 ++++++++++++--- .../git-dependency-tag/default.nix | 15 ++++++++++++--- .../import-cargo-lock/git-dependency/default.nix | 15 ++++++++++++--- .../rust/test/import-cargo-lock/v1/default.nix | 15 ++++++++++++--- 8 files changed, 95 insertions(+), 23 deletions(-) diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix index eea2c3760599..105303201617 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix @@ -1,10 +1,19 @@ -{ rustPlatform }: - +{ lib, rustPlatform }: +let + fs = lib.fileset; +in rustPlatform.buildRustPackage { pname = "basic-dynamic"; version = "0.1.0"; - src = ./.; + src = fs.toSource { + root = ./.; + fileset = fs.unions [ + ./Cargo.toml + ./Cargo.lock + ./src + ]; + }; cargoLock.lockFileContents = builtins.readFile ./Cargo.lock; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix index d595b58109ad..325380977b88 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix @@ -1,10 +1,19 @@ -{ rustPlatform }: - +{ lib, rustPlatform }: +let + fs = lib.fileset; +in rustPlatform.buildRustPackage { pname = "basic"; version = "0.1.0"; - src = ./.; + src = fs.toSource { + root = ./.; + fileset = fs.unions [ + ./Cargo.toml + ./Cargo.lock + ./src + ]; + }; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix index f274d86c52b8..3111c747d372 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix @@ -1,10 +1,19 @@ -{ rustPlatform }: - +{ lib, rustPlatform }: +let + fs = lib.fileset; +in rustPlatform.buildRustPackage { pname = "git-dependency-branch"; version = "0.1.0"; - src = ./.; + src = fs.toSource { + root = ./.; + fileset = fs.unions [ + ./Cargo.toml + ./Cargo.lock + ./src + ]; + }; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix index dcf1e601c31c..63e3bea3ca1f 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix @@ -1,10 +1,19 @@ { rustPlatform, pkg-config, openssl, lib, darwin, stdenv }: - +let + fs = lib.fileset; +in rustPlatform.buildRustPackage { pname = "git-dependency-rev-non-workspace-nested-crate"; version = "0.1.0"; - src = ./.; + src = fs.toSource { + root = ./.; + fileset = fs.unions [ + ./Cargo.toml + ./Cargo.lock + ./src + ]; + }; nativeBuildInputs = [ pkg-config diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix index 40487d6829a2..d3cb0fa7df81 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix @@ -1,10 +1,19 @@ -{ rustPlatform }: - +{ lib, rustPlatform }: +let + fs = lib.fileset; +in rustPlatform.buildRustPackage { pname = "git-dependency-rev"; version = "0.1.0"; - src = ./.; + src = fs.toSource { + root = ./.; + fileset = fs.unions [ + ./Cargo.toml + ./Cargo.lock + ./src + ]; + }; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix index 2a2f860ac8a1..dfaa1e3028da 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix @@ -1,10 +1,19 @@ -{ rustPlatform }: - +{ lib, rustPlatform }: +let + fs = lib.fileset; +in rustPlatform.buildRustPackage { pname = "git-dependency-tag"; version = "0.1.0"; - src = ./.; + src = fs.toSource { + root = ./.; + fileset = fs.unions [ + ./Cargo.toml + ./Cargo.lock + ./src + ]; + }; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix index 944de9b45cb5..98aa35bf8e1d 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix @@ -1,10 +1,19 @@ -{ rustPlatform }: - +{ lib, rustPlatform }: +let + fs = lib.fileset; +in rustPlatform.buildRustPackage { pname = "git-dependency"; version = "0.1.0"; - src = ./.; + src = fs.toSource { + root = ./.; + fileset = fs.unions [ + ./Cargo.toml + ./Cargo.lock + ./src + ]; + }; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix index d13d468ae7f9..b53b7113590c 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix @@ -1,10 +1,19 @@ -{ rustPlatform }: - +{ lib, rustPlatform }: +let + fs = lib.fileset; +in rustPlatform.buildRustPackage { pname = "v1"; version = "0.1.0"; - src = ./.; + src = fs.toSource { + root = ./.; + fileset = fs.unions [ + ./Cargo.toml + ./Cargo.lock + ./src + ]; + }; cargoLock = { lockFile = ./Cargo.lock;