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

jopejoe1 48ccdb5d 03edc07d

Changed files
+34 -117
pkgs
build-support
rust
test
import-cargo-lock
basic
basic-dynamic
basic-sparse
git-dependency
git-dependency-branch
git-dependency-rev
git-dependency-rev-non-workspace-nested-crate
git-dependency-tag
v1
pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.lock pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/Cargo.lock
pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.toml pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/Cargo.toml
+4 -13
pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix
···
-
{ 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;
pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/src/main.rs pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/package/src/main.rs
pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/.cargo/config.toml pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/.cargo/config.toml
pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.lock pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/Cargo.lock
pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/Cargo.toml pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/Cargo.toml
+4 -14
pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/default.nix
···
-
{ 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";
};
pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/src/main.rs pkgs/build-support/rust/test/import-cargo-lock/basic-sparse/package/src/main.rs
pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock pkgs/build-support/rust/test/import-cargo-lock/basic/package/Cargo.lock
pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml pkgs/build-support/rust/test/import-cargo-lock/basic/package/Cargo.toml
+3 -12
pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix
···
{ 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;
pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs pkgs/build-support/rust/test/import-cargo-lock/basic/package/src/main.rs
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.lock pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/Cargo.lock
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/Cargo.toml pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/Cargo.toml
+4 -13
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix
···
-
{ 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";
};
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/src/main.rs pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/package/src/main.rs
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.lock pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/Cargo.lock
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/Cargo.toml pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/Cargo.toml
+3 -13
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix
···
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
···
];
cargoLock = {
-
lockFile = ./Cargo.lock;
+
lockFile = ./package/Cargo.lock;
outputHashes = {
"cargo-test-macro-0.1.0" = "1yy1y1d523xdzwg1gc77pigbcwsbawmy4b7vw8v21m7q957sk0c4";
};
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/src/main.rs pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/package/src/main.rs
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.lock pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/Cargo.lock
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/Cargo.toml pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/Cargo.toml
+4 -13
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix
···
-
{ 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";
};
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/src/main.rs pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/package/src/main.rs
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.lock pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/Cargo.lock
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/Cargo.toml pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/Cargo.toml
+4 -13
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix
···
-
{ 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";
};
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/src/main.rs pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/package/src/main.rs
pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/Cargo.lock
pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/Cargo.toml
+4 -13
pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix
···
-
{ 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";
};
pkgs/build-support/rust/test/import-cargo-lock/git-dependency/src/main.rs pkgs/build-support/rust/test/import-cargo-lock/git-dependency/package/src/main.rs
pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.lock pkgs/build-support/rust/test/import-cargo-lock/v1/package/Cargo.lock
pkgs/build-support/rust/test/import-cargo-lock/v1/Cargo.toml pkgs/build-support/rust/test/import-cargo-lock/v1/package/Cargo.toml
+4 -13
pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix
···
-
{ 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;
pkgs/build-support/rust/test/import-cargo-lock/v1/src/main.rs pkgs/build-support/rust/test/import-cargo-lock/v1/package/src/main.rs