From c189a699aa61f88eae0ff851a3dda84ea6052069 Mon Sep 17 00:00:00 2001 From: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> Date: Sat, 21 Sep 2024 21:06:14 +0200 Subject: [PATCH 1/3] thelounge: 4.4.1 -> 4.4.3 Co-authored-by: Eman Resu <78693624+quatquatt@users.noreply.github.com> Changelog: https://github.com/thelounge/thelounge/releases/tag/v4.4.3 --- .../networking/irc/thelounge/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/irc/thelounge/default.nix b/pkgs/applications/networking/irc/thelounge/default.nix index 0abeec15939f..7462ff8b8d87 100644 --- a/pkgs/applications/networking/irc/thelounge/default.nix +++ b/pkgs/applications/networking/irc/thelounge/default.nix @@ -5,7 +5,7 @@ , nodejs , yarn , fixup-yarn-lock -, python3 +, python311 , npmHooks , cctools , sqlite @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "thelounge"; - version = "4.4.1"; + version = "4.4.3"; src = fetchFromGitHub { owner = "thelounge"; repo = "thelounge"; rev = "v${finalAttrs.version}"; - hash = "sha256-4FdNYP9VLgv/rfvT7KHCF+ABFsZvPbJjfz6IvvDkRNA="; + hash = "sha256-csVrgsEy9HjSBXxtgNG0hcBrR9COlcadhMQrw6BWPc4="; }; # Allow setting package path for the NixOS module. @@ -35,10 +35,12 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0="; + hash = "sha256-csVrgsEy9HjSBXxtgNG0hcBrR9COlcadhMQrw6BWPc4="; }; - nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; + # Distutils was deprecated in 3.10, and removed in 3.12. This build needs it. An alternative could be adding + # setuptools, but testing with that and 3.12 still fails. + nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python311 npmHooks.npmInstallHook ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; buildInputs = [ sqlite ]; configurePhase = '' From beeae88591c02a9bc8d3ff8c2188230f8b180b05 Mon Sep 17 00:00:00 2001 From: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> Date: Mon, 23 Sep 2024 00:02:14 +0200 Subject: [PATCH 2/3] Fixed hash --- pkgs/applications/networking/irc/thelounge/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/thelounge/default.nix b/pkgs/applications/networking/irc/thelounge/default.nix index 7462ff8b8d87..e82457b29166 100644 --- a/pkgs/applications/networking/irc/thelounge/default.nix +++ b/pkgs/applications/networking/irc/thelounge/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "thelounge"; repo = "thelounge"; rev = "v${finalAttrs.version}"; - hash = "sha256-csVrgsEy9HjSBXxtgNG0hcBrR9COlcadhMQrw6BWPc4="; + hash = "sha256-lDbyqVFjhF2etRx31ax7KiQ1QKgVhD8xkTog/E3pUlA="; }; # Allow setting package path for the NixOS module. From d87b06135e06564de5d797e5e5db18bc3f1ef8fc Mon Sep 17 00:00:00 2001 From: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com> Date: Wed, 25 Sep 2024 22:17:01 +0200 Subject: [PATCH 3/3] Update pkgs/applications/networking/irc/thelounge/default.nix Co-authored-by: Pol Dellaiera --- pkgs/applications/networking/irc/thelounge/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/irc/thelounge/default.nix b/pkgs/applications/networking/irc/thelounge/default.nix index e82457b29166..b297ba4e253a 100644 --- a/pkgs/applications/networking/irc/thelounge/default.nix +++ b/pkgs/applications/networking/irc/thelounge/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { # Distutils was deprecated in 3.10, and removed in 3.12. This build needs it. An alternative could be adding # setuptools, but testing with that and 3.12 still fails. - nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python311 npmHooks.npmInstallHook ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; + nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python311 npmHooks.npmInstallHook ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools ]; buildInputs = [ sqlite ]; configurePhase = ''