diff options
| author | Benjamin Hipple <bhipple@protonmail.com> | 2020-02-16 02:33:02 -0500 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-02-28 18:54:23 -0800 |
| commit | ad30a304883f5a689f499e47e7ec388265f024f5 (patch) | |
| tree | ef30fd49acd3ca14f55378e0d63d64477af79cb0 /pkgs/applications/virtualization/railcar | |
| parent | 71d5e1595c1c10ccc0ccffdc7a1cf42919a82d3e (diff) | |
| download | nixpkgs-ad30a304883f5a689f499e47e7ec388265f024f5.tar nixpkgs-ad30a304883f5a689f499e47e7ec388265f024f5.tar.gz nixpkgs-ad30a304883f5a689f499e47e7ec388265f024f5.tar.bz2 nixpkgs-ad30a304883f5a689f499e47e7ec388265f024f5.tar.lz nixpkgs-ad30a304883f5a689f499e47e7ec388265f024f5.tar.xz nixpkgs-ad30a304883f5a689f499e47e7ec388265f024f5.tar.zst nixpkgs-ad30a304883f5a689f499e47e7ec388265f024f5.zip | |
rustPlatform.fetchCargo: handle custom Cargo.lock patchfiles with validation
Previously, we would asssert that the lockfiles are consistent during the unpackPhase, but if the pkg has a patch for the lockfile itself then we must wait until the patchPhase is complete to check. This also removes an implicity dependency on the src attribute coming from `fetchzip` / `fetchFromGitHub`, which happens to name the source directory "source". Now we glob for it, so different fetchers will work consistently.
Diffstat (limited to 'pkgs/applications/virtualization/railcar')
| -rw-r--r-- | pkgs/applications/virtualization/railcar/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix index 8dd3c270b23..7b56da0f7bc 100644 --- a/pkgs/applications/virtualization/railcar/default.nix +++ b/pkgs/applications/virtualization/railcar/default.nix @@ -11,15 +11,11 @@ rustPlatform.buildRustPackage rec { sha256 = "09zn160qxd7760ii6rs5nhr00qmaz49x1plclscznxh9hinyjyh9"; }; - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "1k4y37x783fsd8li17k56vlx5ziwmrz167a0w5mcb9sgyd2kc19a"; - - buildInputs = [ libseccomp ]; - # Submitted upstream https://github.com/oracle/railcar/pull/44 cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "10qxkxpdprl2rcgy52s3q5gyg3i75qmx68rpl7cx1bgjzppfn9c3"; + + buildInputs = [ libseccomp ]; meta = with lib; { description = "Rust implementation of the Open Containers Initiative oci-runtime"; |