gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #303146 from oliviacrain/icl-si

Browse Source 
tests.importCargoLock: fix self-inclusive src listings in .nix files
This commit is contained in:
Silvan Mosberger
2024-04-11 13:37:58 +02:00
committed by GitHub
parent b6f215a5d1 1348195416
commit 4c00536dff
8 changed files with 95 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix
+12 -3
View File
@@ -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;
pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix
+12 -3
View File
@@ -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;
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-branch/default.nix
+12 -3
View File
@@ -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;
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix
+11 -2
View File
@@ -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
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev/default.nix
+12 -3
View File
@@ -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;
pkgs/build-support/rust/test/import-cargo-lock/git-dependency-tag/default.nix
+12 -3
View File
@@ -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;
pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix
+12 -3
View File
@@ -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;
pkgs/build-support/rust/test/import-cargo-lock/v1/default.nix
+12 -3
View File
@@ -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;