diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-21 00:02:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-21 00:02:17 +0000 |
| commit | fb3e2499b78f73e27cc256bc3516abeb822654bd (patch) | |
| tree | 33661efdde0b77c97aa36ef32eccf6d2174a0573 /pkgs/applications/misc | |
| parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
| parent | 28eb936285ed02bbd53e3771f1e0153ced640c44 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | pkgs/applications/misc/fluxboxlauncher/default.nix | 0 | ||||
| -rw-r--r-- | pkgs/applications/misc/get_iplayer/default.nix | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 00bbcdafff13f..8e7fde6d9c299 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "blender"; - version = "3.6.4"; + version = "3.6.5"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-zFL0GRWAtNC3C+SAspWZmGa8US92EiYQgVfiOsCJRx4="; + hash = "sha256-QAHA/pn22HLsfH6VX4Sp7r25raFxAPS1Gergjez38kM="; }; patches = [ diff --git a/pkgs/applications/misc/fluxboxlauncher/default.nix b/pkgs/applications/misc/fluxboxlauncher/default.nix index 4794e14b4698e..4794e14b4698e 100755..100644 --- a/pkgs/applications/misc/fluxboxlauncher/default.nix +++ b/pkgs/applications/misc/fluxboxlauncher/default.nix diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 2483cc000f01d..fe33a7df75690 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -11,13 +11,13 @@ perlPackages.buildPerlPackage rec { pname = "get_iplayer"; - version = "3.31"; + version = "3.33"; src = fetchFromGitHub { owner = "get-iplayer"; repo = "get_iplayer"; rev = "v${version}"; - sha256 = "+ChCF27nmPKbqaZVxsZ6TlbzSdEz6RfMs87NE8xaSRw="; + hash = "sha256-cX+ydMvpQNFfQICRVKyhnB5gZkVnOMLPbGgdFymzmeA="; }; nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; @@ -32,10 +32,12 @@ perlPackages.buildPerlPackage rec { installPhase = '' runHook preInstall + mkdir -p $out/bin $out/share/man/man1 cp get_iplayer $out/bin wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg ]} --prefix PERL5LIB : $PERL5LIB cp get_iplayer.1 $out/share/man/man1 + runHook postInstall ''; |