commit 71eaa3e8ab2dce90f26a9be5534bfe1e9e110490 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

tests.importCargoLock: various fixes (#397281)

authored by winter.bsky.social and committed by GitHub 9 months ago 71eaa3e8 c010a1bf

+6 -10

2 changed files

expand all

unified split

pkgs

build-support

rust

test

import-cargo-lock

git-dependency-rev-non-workspace-nested-crate

default.nix

git-dependency-workspace-inheritance

want.toml

+5 -9

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-rev-non-workspace-nested-crate/default.nix

··· 2 rustPlatform, 3 pkg-config, 4 openssl, 5 lib, 6 - darwin, 7 - stdenv, 8 }: 9 let 10 fs = lib.fileset; ··· 26 pkg-config 27 ]; 28 29 - buildInputs = 30 - [ 31 - openssl 32 - ] 33 - ++ lib.optionals stdenv.hostPlatform.isDarwin [ 34 - darwin.apple_sdk.frameworks.Security 35 - ]; 36 37 cargoLock = { 38 lockFile = ./Cargo.lock;

··· 2 rustPlatform, 3 pkg-config, 4 openssl, 5 + zlib, 6 lib, 7 }: 8 let 9 fs = lib.fileset; ··· 25 pkg-config 26 ]; 27 28 + buildInputs = [ 29 + openssl 30 + zlib 31 + ]; 32 33 cargoLock = { 34 lockFile = ./Cargo.lock;

+1 -1

pkgs/build-support/rust/test/import-cargo-lock/git-dependency-workspace-inheritance/want.toml

··· 12 bar = "1.0.0" 13 14 [dependencies.foo] 15 features = [ 16 "cat", 17 "meow", 18 ] 19 - version = "1.0.0"

··· 12 bar = "1.0.0" 13 14 [dependencies.foo] 15 + version = "1.0.0" 16 features = [ 17 "cat", 18 "meow", 19 ]