From 30f8ac748110456eb199537f0d04b2886af8cd35 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Sat, 23 May 2026 15:06:37 +0200 Subject: [PATCH] thelounge: 4.4.3 -> 4.5.0 --- pkgs/by-name/th/thelounge/package.nix | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/th/thelounge/package.nix b/pkgs/by-name/th/thelounge/package.nix index 6a2db216f110..c1e2250b1213 100644 --- a/pkgs/by-name/th/thelounge/package.nix +++ b/pkgs/by-name/th/thelounge/package.nix @@ -3,11 +3,9 @@ stdenv, fetchFromGitHub, fetchYarnDeps, - nodejs, nodejs-slim, yarn, fixup-yarn-lock, - python3, npmHooks, sqlite, srcOnly, @@ -18,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "thelounge"; - version = "4.4.3"; + version = "4.5.0"; src = fetchFromGitHub { owner = "thelounge"; repo = "thelounge"; rev = "v${finalAttrs.version}"; - hash = "sha256-lDbyqVFjhF2etRx31ax7KiQ1QKgVhD8xkTog/E3pUlA="; + hash = "sha256-I+ITSEm/FCI4omeBM8BCowI6hXBYriJfZ0vP27771Ms="; }; # Allow setting package path for the NixOS module. @@ -37,19 +35,16 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-csVrgsEy9HjSBXxtgNG0hcBrR9COlcadhMQrw6BWPc4="; + hash = "sha256-wgG5AGZvMzdw4QnTNOzAfQGB//VWlV403AgWv4TceGQ="; }; nativeBuildInputs = [ - nodejs + nodejs-slim + nodejs-slim.npm yarn fixup-yarn-lock - python3 - python3.pkgs.distutils npmHooks.npmInstallHook - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; - buildInputs = [ sqlite ]; + ]; configurePhase = '' runHook preConfigure @@ -76,13 +71,6 @@ stdenv.mkDerivation (finalAttrs: { preInstall = '' yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive --production patchShebangs node_modules - - # Build the sqlite3 package. - npm_config_nodedir="${srcOnly nodejs}" npm_config_node_gyp="${buildPackages.nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" npm rebuild --verbose --sqlite=${sqlite.dev} - ''; - - postInstall = '' - rm -rf node_modules/sqlite3/build-tmp-napi-v6/{Release/obj.target,node_sqlite3.target.mk} ''; disallowedReferences = [ nodejs-slim.src ]; @@ -103,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { raitobezarius ]; license = lib.licenses.mit; - inherit (nodejs.meta) platforms; + inherit (nodejs-slim.meta) platforms; mainProgram = "thelounge"; }; })