diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-01 12:01:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-01 12:01:27 +0000 |
| commit | 25043f0f28bd3ee7fa3bc57d87e9e5eba4328d2b (patch) | |
| tree | b632181abb12e85ba02cf66acaaf13d127d967da /pkgs/applications/virtualization | |
| parent | 428401133f7131517399aa460258424e99cde1e2 (diff) | |
| parent | bd6329dd115d52bf441b6532469e0cba60a56b50 (diff) | |
| download | nixpkgs-25043f0f28bd3ee7fa3bc57d87e9e5eba4328d2b.tar nixpkgs-25043f0f28bd3ee7fa3bc57d87e9e5eba4328d2b.tar.gz nixpkgs-25043f0f28bd3ee7fa3bc57d87e9e5eba4328d2b.tar.bz2 nixpkgs-25043f0f28bd3ee7fa3bc57d87e9e5eba4328d2b.tar.lz nixpkgs-25043f0f28bd3ee7fa3bc57d87e9e5eba4328d2b.tar.xz nixpkgs-25043f0f28bd3ee7fa3bc57d87e9e5eba4328d2b.tar.zst nixpkgs-25043f0f28bd3ee7fa3bc57d87e9e5eba4328d2b.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/distrobox/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/umoci/default.nix | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index e9409004c8a..aca97a811fb 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "distrobox"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "89luca89"; repo = pname; rev = version; - sha256 = "sha256-XYqPwBiMbwG0bTiFRywZRWjp1OabTHcwhmbcx11SgPo="; + sha256 = "sha256-WIpl3eSdResAmWFc8OG8Jm0uLTGaovkItGAZTOEzhuE="; }; dontConfigure = true; diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix index 22db5503c0d..99e8ddf34a5 100644 --- a/pkgs/applications/virtualization/umoci/default.nix +++ b/pkgs/applications/virtualization/umoci/default.nix @@ -26,9 +26,7 @@ buildGoModule rec { nativeBuildInputs = [ go-md2man installShellFiles ]; postInstall = '' - substituteInPlace Makefile --replace \ - '$(shell which bash)' '${lib.getBin bash}/bin/bash' - make docs + make docs SHELL="$SHELL" installManPage doc/man/*.[1-9] ''; |