From eb20178f3a7ab337c65269b6bd08f483ee897469 Mon Sep 17 00:00:00 2001 From: koral Date: Sun, 2 Oct 2022 21:11:25 +0200 Subject: [PATCH] losslesscut: 3.43.0 -> 3.46.2 --- pkgs/applications/video/losslesscut-bin/appimage.nix | 2 +- pkgs/applications/video/losslesscut-bin/default.nix | 8 ++++---- pkgs/applications/video/losslesscut-bin/dmg.nix | 2 +- pkgs/applications/video/losslesscut-bin/windows.nix | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/losslesscut-bin/appimage.nix b/pkgs/applications/video/losslesscut-bin/appimage.nix index 87518479db4b..8e84406c60eb 100644 --- a/pkgs/applications/video/losslesscut-bin/appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/appimage.nix @@ -5,7 +5,7 @@ let nameRepo = "lossless-cut"; nameCamel = "LosslessCut"; name = "${pname}-${version}"; - nameSource = "${nameCamel}-linux.AppImage"; + nameSource = "${nameCamel}-linux-x86_64.AppImage"; nameExecutable = "losslesscut"; owner = "mifi"; src = fetchurl { diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index be7786f91020..77dd6e0c35fa 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -1,9 +1,9 @@ { callPackage, stdenvNoCC, lib }: let - version = "3.43.0"; - appimage = callPackage ./appimage.nix { inherit version; sha256 = "1xfr3i4gsi13wj374yr5idhgs0q71s4h33yxdr7b7xjdg2gb8lp1"; }; - dmg = callPackage ./dmg.nix { inherit version; sha256 = "1axki47hrxx5m0hrmjpxcya091lahqfnh2pd3zhn5dd496slq8an"; }; - windows = callPackage ./windows.nix { inherit version; sha256 = "1v00gym18hjxxm42dfqmw7vhwh8lgjz2jgv6fmg234npr3d43py5"; }; + version = "3.46.2"; + appimage = callPackage ./appimage.nix { inherit version; sha256 = "sha256-p+HscYsChR90JHdYjurY4OOHgveGXbJomz1klBCsF2Q="; }; + dmg = callPackage ./dmg.nix { inherit version; sha256 = "sha256-350MHWwyjCdvIv6W6lX6Hr6PLDiAwO/e+KW0yKi/Yoc="; }; + windows = callPackage ./windows.nix { inherit version; sha256 = "sha256-48ifhvIWSPmmnBnW8tP7NeWPIWJYWNqGP925O50CAwQ="; }; in ( if stdenvNoCC.isDarwin then dmg else if stdenvNoCC.isCygwin then windows diff --git a/pkgs/applications/video/losslesscut-bin/dmg.nix b/pkgs/applications/video/losslesscut-bin/dmg.nix index 3cbd77198b93..e334c0a58b9a 100644 --- a/pkgs/applications/video/losslesscut-bin/dmg.nix +++ b/pkgs/applications/video/losslesscut-bin/dmg.nix @@ -4,7 +4,7 @@ let pname = "losslesscut"; nameRepo = "lossless-cut"; nameCamel = "LosslessCut"; - nameSource = "${nameCamel}-mac.dmg"; + nameSource = "${nameCamel}-mac-x64.dmg"; nameApp = nameCamel + ".app"; owner = "mifi"; src = fetchurl { diff --git a/pkgs/applications/video/losslesscut-bin/windows.nix b/pkgs/applications/video/losslesscut-bin/windows.nix index 0e6ed9b04123..89ccbca48323 100644 --- a/pkgs/applications/video/losslesscut-bin/windows.nix +++ b/pkgs/applications/video/losslesscut-bin/windows.nix @@ -1,7 +1,7 @@ { stdenvNoCC , lib , fetchurl -, unzip +, p7zip , version , sha256 , useMklink ? false @@ -11,8 +11,8 @@ let pname = "losslesscut"; nameRepo = "lossless-cut"; nameCamel = "LosslessCut"; - nameSourceBase = "${nameCamel}-win"; - nameSource = "${nameSourceBase}.zip"; + nameSourceBase = "${nameCamel}-win-x64"; + nameSource = "${nameSourceBase}.7z"; nameExecutable = "${nameCamel}.exe"; owner = "mifi"; getSymlinkCommand = if (customSymlinkCommand != null) then customSymlinkCommand @@ -27,10 +27,10 @@ in stdenvNoCC.mkDerivation { inherit sha256; }; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ p7zip ]; unpackPhase = '' - unzip $src -d ${nameSourceBase} + 7z x $src -o${nameSourceBase} ''; sourceRoot = nameSourceBase;