Unverified Commit 98954326 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #322024 from xzfc/cached-nix-shell

cached-nix-shell: 0.1.5 -> 0.1.6
parents 1b256bc0 e170ba17
Loading
Loading
Loading
Loading
+61 −0
Original line number Diff line number Diff line
{ lib, fetchFromGitHub, nix, ronn, rustPlatform }:
{
  fetchFromGitHub,
  lib,
  nix,
  ronn,
  rustPlatform,
}:

let
  blake3-src = fetchFromGitHub {
    owner = "BLAKE3-team";
    repo = "BLAKE3";
    rev = "0.3.3";
    sha256 = "0av41ld0gqf3g60gcllpz59nqlr7r62v99mgfq9gs0p8diw5gi7x";
    rev = "refs/tags/1.5.1";
    hash = "sha256-STWAnJjKrtb2Xyj6i1ACwxX/gTkQo5jUHilcqcgJYxc=";
  };

in rustPlatform.buildRustPackage rec {
in
rustPlatform.buildRustPackage rec {
  pname = "cached-nix-shell";
  version = "0.1.5";
  version = "0.1.6";

  src = fetchFromGitHub {
    owner = "xzfc";
    repo = pname;
    rev = "v${version}";
    sha256 = "17v38llx83mp05a0axjxcd2zyafd57syh7xhx5cq6qibcbha0by9";
    repo = "cached-nix-shell";
    rev = "refs/tags/v${version}";
    hash = "sha256-LI/hecqeRg3eCzU2bASJA8VoG4nvrSeHSeaGYn7M/UI=";
  };

  cargoSha256 = "1jkkwsn3k2anmzf99x99r9zfnf0gpcjbi5pyakh4agiryqcdyg0j";
  cargoHash = "sha256-Jf0VRTGwdKxCwyb9hVKDQcdZsHHWaedrDbwq9MK1tn4=";

  nativeBuildInputs = [
    nix
    ronn
  ];

  # The BLAKE3 C library is intended to be built by the project depending on it
  # rather than as a standalone library.
  # https://github.com/BLAKE3-team/BLAKE3/blob/0.3.1/c/README.md#building
  BLAKE3_CSRC = "${blake3-src}/c";

  nativeBuildInputs = [ nix ronn ];
  env.BLAKE3_CSRC = "${blake3-src}/c";

  postBuild = ''
    make -f nix/Makefile post-build
@@ -36,12 +45,17 @@ in rustPlatform.buildRustPackage rec {
    make -f nix/Makefile post-install
  '';

  meta = with lib; {
  meta = {
    description = "Instant startup time for nix-shell";
    mainProgram = "cached-nix-shell";
    homepage = "https://github.com/xzfc/cached-nix-shell";
    license = with licenses; [ unlicense /* or */ mit ];
    maintainers = with maintainers; [ xzfc ];
    platforms = platforms.linux;
    changelog = "https://github.com/xzfc/cached-nix-shell/releases/tag/v${version}";
    license = with lib.licenses; [
      unlicense
      # or
      mit
    ];
    maintainers = with lib.maintainers; [ xzfc ];
    platforms = lib.platforms.linux ++ lib.platforms.darwin;
  };
}
+0 −2
Original line number Diff line number Diff line
@@ -38767,8 +38767,6 @@ with pkgs;
  brightnessctl = callPackage ../misc/brightnessctl { };
  cached-nix-shell = callPackage ../tools/nix/cached-nix-shell { };
  calaos_installer = libsForQt5.callPackage ../misc/calaos/installer { };
  civo = callPackage ../applications/networking/cluster/civo { };