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 8725e466ef and the PR it was merged in #369694
This commit is contained in:
jopejoe1
2025-05-13 20:28:49 +02:00
parent 03edc07d09
commit 48ccdb5d4e
37 changed files with 34 additions and 117 deletions
@@ -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;
@@ -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";
};
@@ -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;
@@ -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";
};
@@ -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";
};
@@ -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";
};
@@ -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";
};
@@ -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";
};
@@ -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;