Merge pull request #298998 from imincik/devenv-remove-cargo-lock

devenv: use cargoHash instead of cargoLock file
This commit is contained in:
Domen Kožar 2024-03-26 06:36:21 +07:00 committed by GitHub
commit 837e6d8883
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 2136 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,14 +1,18 @@
{ stdenv { lib
, lib , stdenv
, openssl , fetchFromGitHub
, makeWrapper
, rustPlatform
, testers
, cachix
, darwin , darwin
, libgit2 , libgit2
, makeWrapper
, nix , nix
, openssl
, pkg-config , pkg-config
, rustPlatform
, cachix , devenv # required to run version test
, fetchFromGitHub
}: }:
let let
@ -37,9 +41,7 @@ in rustPlatform.buildRustPackage {
hash = "sha256-JCxjmWr2+75KMPOoVybNZhy9zhhrg9BAKA8D+J6MNBc="; hash = "sha256-JCxjmWr2+75KMPOoVybNZhy9zhhrg9BAKA8D+J6MNBc=";
}; };
cargoLock = { cargoHash = "sha256-FGB8p9ClGokYDrV0b47PnjeSlOv7p+IgThNajve3yms=";
lockFile = ./Cargo.lock;
};
nativeBuildInputs = [ makeWrapper pkg-config ]; nativeBuildInputs = [ makeWrapper pkg-config ];
@ -51,6 +53,13 @@ in rustPlatform.buildRustPackage {
wrapProgram $out/bin/devenv --set DEVENV_NIX ${devenv_nix} --prefix PATH ":" "$out/bin:${cachix}/bin" wrapProgram $out/bin/devenv --set DEVENV_NIX ${devenv_nix} --prefix PATH ":" "$out/bin:${cachix}/bin"
''; '';
passthru.tests = {
version = testers.testVersion {
package = devenv;
command = "export XDG_DATA_HOME=$PWD; devenv version";
};
};
meta = { meta = {
changelog = "https://github.com/cachix/devenv/releases/tag/v${version}"; changelog = "https://github.com/cachix/devenv/releases/tag/v${version}";
description = "Fast, Declarative, Reproducible, and Composable Developer Environments"; description = "Fast, Declarative, Reproducible, and Composable Developer Environments";