Merge pull request #327866 from thiagokokada/any-nix-shell-bump

any-nix-shell: 1.2.1 -> 2.0.0
This commit is contained in:
Thiago Kenji Okada 2024-07-21 00:21:03 +01:00 committed by GitHub
commit 93efb11991
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 51 additions and 32 deletions

View File

@ -0,0 +1,51 @@
{
lib,
stdenv,
fetchFromGitHub,
makeWrapper,
bash,
gnused,
which,
}:
stdenv.mkDerivation rec {
pname = "any-nix-shell";
version = "2.0.0";
src = fetchFromGitHub {
owner = "haslersn";
repo = "any-nix-shell";
rev = "v${version}";
hash = "sha256-n4+aokW5o3EuXKqyc12vRsn5Mlkvdso27AdpahhySYw=";
};
strictDeps = true;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bash ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp -r bin $out
wrapProgram $out/bin/any-nix-shell --prefix PATH ":" ${
lib.makeBinPath [
(placeholder "out")
gnused
which
]
}
runHook postInstall
'';
meta = {
description = "fish, xonsh and zsh support for nix-shell";
license = lib.licenses.mit;
homepage = "https://github.com/haslersn/any-nix-shell";
maintainers = with lib.maintainers; [ haslersn ];
mainProgram = "any-nix-shell";
};
}

View File

@ -1,30 +0,0 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, bash }:
stdenv.mkDerivation rec {
pname = "any-nix-shell";
version = "1.2.1";
src = fetchFromGitHub {
owner = "haslersn";
repo = "any-nix-shell";
rev = "v${version}";
sha256 = "0q27rhjhh7k0qgcdcfm8ly5za6wm4rckh633d0sjz87faffkp90k";
};
strictDeps = true;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bash ];
installPhase = ''
mkdir -p $out/bin
cp -r bin $out
wrapProgram $out/bin/any-nix-shell --prefix PATH ":" $out/bin
'';
meta = with lib; {
description = "fish and zsh support for nix-shell";
license = licenses.mit;
homepage = "https://github.com/haslersn/any-nix-shell";
maintainers = with maintainers; [ haslersn ];
mainProgram = "any-nix-shell";
};
}

View File

@ -14781,8 +14781,6 @@ with pkgs;
agdsn-zsh-config = callPackage ../shells/zsh/agdsn-zsh-config { };
any-nix-shell = callPackage ../shells/any-nix-shell { };
nix-your-shell = callPackage ../shells/nix-your-shell { };
bash = lowPrio (callPackage ../shells/bash/5.nix { });