From 7fbf9ed09a2cde0d33ff41db745b9e384fb59939 Mon Sep 17 00:00:00 2001 From: MakiseKurisu Date: Sat, 15 Mar 2025 18:42:22 +0800 Subject: [PATCH 1/4] iscc: stdenv -> stdenvNoCC --- pkgs/by-name/is/iscc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/is/iscc/package.nix b/pkgs/by-name/is/iscc/package.nix index cc402d9cbd46..394d9623bdb3 100644 --- a/pkgs/by-name/is/iscc/package.nix +++ b/pkgs/by-name/is/iscc/package.nix @@ -1,5 +1,5 @@ { - stdenv, + stdenvNoCC, fetchurl, innoextract, runtimeShell, @@ -11,7 +11,7 @@ let version = "6.2.2"; majorVersion = builtins.substring 0 1 version; in -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "iscc"; inherit version; src = fetchurl { From a30471969e900fcdc73d95536c9bf4cee8c6eddc Mon Sep 17 00:00:00 2001 From: MakiseKurisu Date: Sat, 15 Mar 2025 18:46:16 +0800 Subject: [PATCH 2/4] iscc: add meta.mainProgram --- pkgs/by-name/is/iscc/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/is/iscc/package.nix b/pkgs/by-name/is/iscc/package.nix index 394d9623bdb3..d424a8b637b3 100644 --- a/pkgs/by-name/is/iscc/package.nix +++ b/pkgs/by-name/is/iscc/package.nix @@ -59,6 +59,7 @@ stdenvNoCC.mkDerivation rec { changelog = "https://jrsoftware.org/files/is6-whatsnew.htm"; license = licenses.unfreeRedistributable; maintainers = [ ]; + mainProgram = "iscc"; platforms = wineWow64Packages.stable.meta.platforms; }; } From f2244d88ecbd6c062edab4911fff88bbe7cf6843 Mon Sep 17 00:00:00 2001 From: MakiseKurisu Date: Sat, 15 Mar 2025 18:53:56 +0800 Subject: [PATCH 3/4] innoextract: 1.9 -> 1.9-unstable-2025-02-06 --- pkgs/by-name/in/innoextract/package.nix | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/in/innoextract/package.nix b/pkgs/by-name/in/innoextract/package.nix index 6e145f31300c..e6faaf372b1b 100644 --- a/pkgs/by-name/in/innoextract/package.nix +++ b/pkgs/by-name/in/innoextract/package.nix @@ -1,8 +1,7 @@ { lib, stdenv, - fetchurl, - fetchpatch, + fetchFromGitHub, cmake, makeWrapper, boost, @@ -14,23 +13,15 @@ stdenv.mkDerivation rec { pname = "innoextract"; - version = "1.9"; + version = "1.9-unstable-2025-02-06"; - src = fetchurl { - url = "https://constexpr.org/innoextract/files/innoextract-${version}.tar.gz"; - sha256 = "09l1z1nbl6ijqqwszdwch9mqr54qb7df0wp2sd77v17dq6gsci33"; + src = fetchFromGitHub { + owner = "dscharrer"; + repo = "innoextract"; + rev = "6e9e34ed0876014fdb46e684103ef8c3605e382e"; + hash = "sha256-bgACPDo1phjIiwi336JEB1UAJKyL2NmCVOhyZxBFLJo="; }; - patches = [ - # Fix boost-1.86 build: - # https://github.com/dscharrer/innoextract/pull/169 - (fetchpatch { - name = "boost-1.86.patch"; - url = "https://github.com/dscharrer/innoextract/commit/264c2fe6b84f90f6290c670e5f676660ec7b2387.patch"; - hash = "sha256-QYwrqLXC7FE4oYi6G1erpX/RUUtS5zNBv7/fO7AdZQg="; - }) - ]; - buildInputs = [ xz boost From 8ad15bf85bce80e5e973416066b0d7a63b17022a Mon Sep 17 00:00:00 2001 From: MakiseKurisu Date: Sat, 15 Mar 2025 18:54:16 +0800 Subject: [PATCH 4/4] iscc: 6.2.2 -> 6.4.1 The latest 6.4.2 is not supported by the innoextract. --- pkgs/by-name/is/iscc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/is/iscc/package.nix b/pkgs/by-name/is/iscc/package.nix index d424a8b637b3..043727e8edcd 100644 --- a/pkgs/by-name/is/iscc/package.nix +++ b/pkgs/by-name/is/iscc/package.nix @@ -8,7 +8,7 @@ }: let - version = "6.2.2"; + version = "6.4.1"; majorVersion = builtins.substring 0 1 version; in stdenvNoCC.mkDerivation rec { @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec { inherit version; src = fetchurl { url = "https://files.jrsoftware.org/is/${majorVersion}/innosetup-${version}.exe"; - hash = "sha256-gRfRDQCirTOhOQl46jhyhhwzDgh5FEEKY3eyLExbhWM="; + hash = "sha256-9Bdg4fGuFdIIm7arFi4hcguSrnUG7XBmezkgAGPWjjQ="; }; nativeBuildInputs = [ innoextract