Unverified Commit 4c00536d authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

Merge pull request #303146 from oliviacrain/icl-si 

tests.importCargoLock: fix self-inclusive src listings in .nix files
parents b6f215a5 13481954

pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix

+12 −3
Original line number Diff line number Diff line 
{ 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
Original line number Diff line number Diff line 
{ 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
Original line number Diff line number Diff line 
{ 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
Original line number Diff line number Diff line 
{ 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
Original line number Diff line number Diff line 
{ 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;