Unverified Commit 837e6d88 authored by Domen Kožar's avatar Domen Kožar Committed by GitHub
Browse files

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

devenv: use cargoHash instead of cargoLock file
parents 2b8521c4 c4003283
Loading
Loading
Loading
Loading

pkgs/by-name/de/devenv/Cargo.lock

deleted100644 → 0
+0 −2126

File deleted.

Preview size limit exceeded, changes collapsed.

+19 −10
Original line number Diff line number Diff line
{ stdenv
, lib
, openssl
{ lib
, stdenv
, fetchFromGitHub
, makeWrapper
, rustPlatform
, testers

, cachix
, darwin
, libgit2
, makeWrapper
, nix
, openssl
, pkg-config
, rustPlatform
, cachix
, fetchFromGitHub

, devenv  # required to run version test
}:

let
@@ -37,9 +41,7 @@ in rustPlatform.buildRustPackage {
    hash = "sha256-JCxjmWr2+75KMPOoVybNZhy9zhhrg9BAKA8D+J6MNBc=";
  };

  cargoLock = {
    lockFile = ./Cargo.lock;
  };
  cargoHash = "sha256-FGB8p9ClGokYDrV0b47PnjeSlOv7p+IgThNajve3yms=";

  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"
  '';

  passthru.tests = {
    version = testers.testVersion {
      package = devenv;
      command = "export XDG_DATA_HOME=$PWD; devenv version";
    };
  };

  meta = {
    changelog = "https://github.com/cachix/devenv/releases/tag/v${version}";
    description = "Fast, Declarative, Reproducible, and Composable Developer Environments";