From ff870352fe4702323f356963c89fd2d292b5b2b9 Mon Sep 17 00:00:00 2001 From: "Jan T. Sott" Date: Wed, 4 Jun 2025 16:48:35 +0200 Subject: [PATCH 1/3] nsis: 3.06.1 -> 3.11 --- pkgs/by-name/ns/nsis/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ns/nsis/package.nix b/pkgs/by-name/ns/nsis/package.nix index c16c9cea6bad..0476cd221768 100644 --- a/pkgs/by-name/ns/nsis/package.nix +++ b/pkgs/by-name/ns/nsis/package.nix @@ -11,16 +11,16 @@ stdenv.mkDerivation rec { pname = "nsis"; - version = "3.06.1"; + version = "3.11"; src = fetchurl { - url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}-src.tar.bz2"; - sha256 = "1w1z2m982l6j8lw8hy91c3979wbnqglcf4148f9v79vl32znhpcv"; - }; + url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}-src.tar.bz2"; + sha256 = "19e72062676ebdc67c11dc032ba80b979cdbffd3886c60b04bb442cdd401ff4b"; + }; srcWinDistributable = fetchzip { - url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}.zip"; - sha256 = "04qm9jqbcybpwcrjlksggffdyafzwxxcaz9xhjw8w5rb95x7lw5q"; - }; + url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}.zip"; + sha256 = "e574f335ab9d3ad73118f46615e5c9f2a52f3e4622ecbb7e5886badbc8601348"; + }; postUnpack = '' mkdir -p $out/share/nsis From ebf65fa21ab523a28bf5b7f6e3a4801fbd948b2d Mon Sep 17 00:00:00 2001 From: "Jan T. Sott" Date: Wed, 4 Jun 2025 16:55:00 +0200 Subject: [PATCH 2/3] nsis: run nix fmt --- pkgs/by-name/ns/nsis/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ns/nsis/package.nix b/pkgs/by-name/ns/nsis/package.nix index 0476cd221768..88039df00db6 100644 --- a/pkgs/by-name/ns/nsis/package.nix +++ b/pkgs/by-name/ns/nsis/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { version = "3.11"; src = fetchurl { - url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}-src.tar.bz2"; - sha256 = "19e72062676ebdc67c11dc032ba80b979cdbffd3886c60b04bb442cdd401ff4b"; - }; + url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}-src.tar.bz2"; + sha256 = "19e72062676ebdc67c11dc032ba80b979cdbffd3886c60b04bb442cdd401ff4b"; + }; srcWinDistributable = fetchzip { - url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}.zip"; - sha256 = "e574f335ab9d3ad73118f46615e5c9f2a52f3e4622ecbb7e5886badbc8601348"; - }; + url = "mirror://sourceforge/project/nsis/NSIS%203/${version}/nsis-${version}.zip"; + sha256 = "e574f335ab9d3ad73118f46615e5c9f2a52f3e4622ecbb7e5886badbc8601348"; + }; postUnpack = '' mkdir -p $out/share/nsis From 07128f7700040bd2e2573f816da0306d870a584e Mon Sep 17 00:00:00 2001 From: "Jan T. Sott" Date: Thu, 12 Jun 2025 22:47:37 +0200 Subject: [PATCH 3/3] nsis: pass version to scons --- pkgs/by-name/ns/nsis/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ns/nsis/package.nix b/pkgs/by-name/ns/nsis/package.nix index 88039df00db6..7d93e463090e 100644 --- a/pkgs/by-name/ns/nsis/package.nix +++ b/pkgs/by-name/ns/nsis/package.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { "SKIPUTILS=all" "SKIPMISC=all" "NSIS_CONFIG_CONST_DATA=no" + "VERSION=${version}" ] ++ lib.optional stdenv.hostPlatform.isDarwin "APPEND_LINKFLAGS=-liconv"; preBuild = ''