From 48ccdb5d4e3329bb7c44d0ac6788a3de80cc3383 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 9 May 2025 21:42:10 +0200 Subject: [PATCH] tests.importCargoLock.*: remove usage of lib.fileset The usage of lib.fileset was forbidden in nixpkgs due to a bug in nix. For more information, see 8725e466ef2bcc5be69106c16dbf69b9ef989273 and the PR it was merged in #369694 --- .../basic-dynamic/default.nix | 17 ++++------------- .../basic-dynamic/{ => package}/Cargo.lock | 0 .../basic-dynamic/{ => package}/Cargo.toml | 0 .../basic-dynamic/{ => package}/src/main.rs | 0 .../import-cargo-lock/basic-sparse/default.nix | 18 ++++-------------- .../{ => package}/.cargo/config.toml | 0 .../basic-sparse/{ => package}/Cargo.lock | 0 .../basic-sparse/{ => package}/Cargo.toml | 0 .../basic-sparse/{ => package}/src/main.rs | 0 .../test/import-cargo-lock/basic/default.nix | 15 +++------------ .../basic/{ => package}/Cargo.lock | 0 .../basic/{ => package}/Cargo.toml | 0 .../basic/{ => package}/src/main.rs | 0 .../git-dependency-branch/default.nix | 17 ++++------------- .../{ => package}/Cargo.lock | 0 .../{ => package}/Cargo.toml | 0 .../{ => package}/src/main.rs | 0 .../default.nix | 16 +++------------- .../{ => package}/Cargo.lock | 0 .../{ => package}/Cargo.toml | 0 .../{ => package}/src/main.rs | 0 .../git-dependency-rev/default.nix | 17 ++++------------- .../{ => package}/Cargo.lock | 0 .../{ => package}/Cargo.toml | 0 .../{ => package}/src/main.rs | 0 .../git-dependency-tag/default.nix | 17 ++++------------- .../{ => package}/Cargo.lock | 0 .../{ => package}/Cargo.toml | 0 .../{ => package}/src/main.rs | 0 .../git-dependency/default.nix | 17 ++++------------- .../git-dependency/{ => package}/Cargo.lock | 0 .../git-dependency/{ => package}/Cargo.toml | 0 .../git-dependency/{ => package}/src/main.rs | 0 .../rust/test/import-cargo-lock/v1/default.nix | 17 ++++------------- .../v1/{ => package}/Cargo.lock | 0 .../v1/{ => package}/Cargo.toml | 0 .../v1/{ => package}/src/main.rs | 0 37 files changed, 34 insertions(+), 117 deletions(-) rename pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/{ => package}/.cargo/config.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/basic/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/git-dependency/{ => package}/src/main.rs (100%) rename pkgs/build-support/rust/test/import-cargo-lock/v1/{ => package}/Cargo.lock (100%) rename pkgs/build-support/rust/test/import-cargo-lock/v1/{ => package}/Cargo.toml (100%) rename pkgs/build-support/rust/test/import-cargo-lock/v1/{ => package}/src/main.rs (100%) 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 105303201617..40dd67bb8302 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,21 +1,12 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "basic-dynamic"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; - cargoLock.lockFileContents = builtins.readFile ./Cargo.lock; + cargoLock.lockFileContents = builtins.readFile ./package/Cargo.lock; doInstallCheck = true; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/src/main.rs diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix index 203badd86755..5bf1f12ee6bb 100644 --- a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix +++ b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix @@ -1,23 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "basic-sparse"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./.cargo/config.toml - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; extraRegistries = { "sparse+https://index.crates.io/" = "https://static.crates.io/crates"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/.cargo/config.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/.cargo/config.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/.cargo/config.toml rename to pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/.cargo/config.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/src/main.rs 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 325380977b88..7bcca6064f08 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,22 +1,13 @@ { lib, rustPlatform }: -let - fs = lib.fileset; -in + rustPlatform.buildRustPackage { pname = "basic"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; }; doInstallCheck = true; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/basic/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/basic/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/basic/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/basic/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/basic/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/basic/package/src/main.rs 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 3111c747d372..265c964ce0c9 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,22 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "git-dependency-branch"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; outputHashes = { "rand-0.8.4" = "1ilk9wvfw3mdm57g199ys8f5nrgdrh0n3a4c8b7nz6lgnqvfrv6z"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/src/main.rs 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 6dac7a801284..f9a314f49d7a 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 @@ -3,23 +3,13 @@ pkg-config, openssl, zlib, - lib, }: -let - fs = lib.fileset; -in + rustPlatform.buildRustPackage { pname = "git-dependency-rev-non-workspace-nested-crate"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; nativeBuildInputs = [ pkg-config @@ -31,7 +21,7 @@ rustPlatform.buildRustPackage { ]; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; outputHashes = { "cargo-test-macro-0.1.0" = "1yy1y1d523xdzwg1gc77pigbcwsbawmy4b7vw8v21m7q957sk0c4"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/src/main.rs 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 d3cb0fa7df81..34eb36941576 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,22 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "git-dependency-rev"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; outputHashes = { "rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/src/main.rs 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 dfaa1e3028da..d0d267a40cae 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,22 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "git-dependency-tag"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; outputHashes = { "rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/src/main.rs 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 98aa35bf8e1d..5f1a060268bf 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,22 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "git-dependency"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; outputHashes = { "rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa"; }; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/git-dependency/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/src/main.rs 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 b53b7113590c..9b9228e5696d 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,22 +1,13 @@ -{ lib, rustPlatform }: -let - fs = lib.fileset; -in +{ rustPlatform }: + rustPlatform.buildRustPackage { pname = "v1"; version = "0.1.0"; - src = fs.toSource { - root = ./.; - fileset = fs.unions [ - ./Cargo.toml - ./Cargo.lock - ./src - ]; - }; + src = ./package; cargoLock = { - lockFile = ./Cargo.lock; + lockFile = ./package/Cargo.lock; }; doInstallCheck = true; diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.lock b/pkgs/build-support/rust/test/import-cargo-lock/v1/package/Cargo.lock similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.lock rename to pkgs/build-support/rust/test/import-cargo-lock/v1/package/Cargo.lock diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.toml b/pkgs/build-support/rust/test/import-cargo-lock/v1/package/Cargo.toml similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.toml rename to pkgs/build-support/rust/test/import-cargo-lock/v1/package/Cargo.toml diff --git a/pkgs/build-support/rust/test/import-cargo-lock/v1/src/main.rs b/pkgs/build-support/rust/test/import-cargo-lock/v1/package/src/main.rs similarity index 100% rename from pkgs/build-support/rust/test/import-cargo-lock/v1/src/main.rs rename to pkgs/build-support/rust/test/import-cargo-lock/v1/package/src/main.rs