From b30fb4835948d3648e4d2e2ee9665a1586211f9d Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sun, 12 Jan 2025 16:43:55 +0100 Subject: [PATCH 1/2] losslesscut: 3.61.1 -> 3.64.0 --- pkgs/by-name/lo/losslesscut-bin/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/lo/losslesscut-bin/package.nix b/pkgs/by-name/lo/losslesscut-bin/package.nix index 4b7acfdf1ba40..fe4c651b10eda 100644 --- a/pkgs/by-name/lo/losslesscut-bin/package.nix +++ b/pkgs/by-name/lo/losslesscut-bin/package.nix @@ -7,7 +7,7 @@ let pname = "losslesscut"; - version = "3.61.1"; + version = "3.64.0"; metaCommon = with lib; { description = "Swiss army knife of lossless video/audio editing"; homepage = "https://mifi.no/losslesscut/"; @@ -18,22 +18,22 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - hash = "sha256-wKhEB+MfOsBvZRTIt3hLofw37+YO+hWKowlSi1OxSAU="; + hash = "sha256-K90cJuJFcIkPuAQusJcOBkZ5PQ8T25q7IFIhtmK+jzc="; inherit (buildPackages) makeWrapper; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-yZYmM533D9VzM+a0bnYz/aqocaEJVFOTgLWjbQGOQR0="; + hash = "sha256-BO2KoYAevbVL0Eix1knvaPVBkWucYI89VkueWYRTcXY="; isAarch64 = false; }; aarch64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-/qa2P0R7xRzDgnPKqkeKN6lrDbPg9WuZ/Nnc51NTzaM="; + hash = "sha256-/M5yafZQDqCoDzHpjZBC80CcL9KMO5lwvyCcq19caRg="; isAarch64 = true; }; x86_64-windows = callPackage ./build-from-windows.nix { inherit pname version metaCommon; - hash = "sha256-0awYmSGxm8M12X0WQftlapRF9m3GGCZivNwBtRjSa4E="; + hash = "sha256-FYrnTiZ5ATT+Y08zceIIHbVM//5Bg2ozIEyC5UxmIno="; }; in ( From ffa605ad6fe263b5eacd6980f43f230e1e912201 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sun, 12 Jan 2025 16:44:18 +0100 Subject: [PATCH 2/2] losslesscut: cleaup derivation --- pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix | 2 -- pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix b/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix index 5aad32368ba78..faf62ceeb2bb2 100644 --- a/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix +++ b/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix @@ -9,8 +9,6 @@ }: let - pname = "losslesscut"; - src = fetchurl { url = "https://github.com/mifi/lossless-cut/releases/download/v${version}/LosslessCut-linux-x86_64.AppImage"; inherit hash; diff --git a/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix b/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix index 88b27dc5236dc..c13fc28be9acf 100644 --- a/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix +++ b/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix @@ -10,17 +10,15 @@ metaCommon ? { }, }: -let - pname = "losslesscut"; +stdenvNoCC.mkDerivation { + inherit pname version; + src = fetchurl { url = "https://github.com/mifi/lossless-cut/releases/download/v${version}/LosslessCut-mac-${ if isAarch64 then "arm64" else "x64" }.dmg"; inherit hash; }; -in -stdenvNoCC.mkDerivation { - inherit pname version src; nativeBuildInputs = [ _7zz ];