From a27f3e7c8ab8fce38c495a9f9b7094483dbf9895 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Mon, 9 Sep 2024 13:49:20 +0300 Subject: [PATCH 1/9] sonarr: 4.0.4.1491 -> 4.0.9.2244 Backports version bumps from the unstable channel that builds Sonarr from source since the changes cannot be automatically cherry-picked for release-24.05 channel (that uses prebuilt binary package). Note that source build depends on a set of changes in the .NET language framework that are not eligible for backport, hence the manual package version update. --- pkgs/servers/sonarr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index cc59c9f27970..114d4db8420a 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -10,15 +10,15 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-rtlOFfeiZLsoZR/bUPAtWicK1Cu/pxtiBhHdHYbGrHo="; - arm64-linux_hash = "sha256-jMp1kDVCQYtDhO28HoBuo7IAlEaoqPFW8EPYXc1zpKM="; - x64-osx_hash = "sha256-2wcTRqbvlQAFY20IeIQnqWGJYMB1P3z+PftKau1ucdk="; - arm64-osx_hash = "sha256-3CrNLxmk5oHiGHkrKt17tfo021+O6JZ6RKBdsaf0f1I="; + x64-linux_hash = "sha256-C61LCeYckO46E/Wm+64DyWS4LBl4mmkFFmY7FLdfFbA="; + arm64-linux_hash = "sha256-BKa1sk/ecEQXJ+4THOHbkburgL5/cBZ7/qZETRLxomU="; + x64-osx_hash = "sha256-AtmDPJUNa2pbmWxgubgVk0t1RoY/sG4d2RCUWPk209U="; + arm64-osx_hash = "sha256-K+ahg3XdrAnyTi4zm9IYxMfhlNRopR+5e7OTNKgnTK8="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "sonarr"; - version = "4.0.4.1491"; + version = "4.0.9.2244"; src = fetchurl { url = "https://github.com/Sonarr/Sonarr/releases/download/v${version}/Sonarr.main.${version}.${os}-${arch}.tar.gz"; From 39244a17cf2a79e68e1b7981bd261e8ce539b583 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 26 May 2024 18:30:03 +0900 Subject: [PATCH 2/9] python311Packages.jupyterlab: 4.2.0 -> 4.2.1 Changelog: https://github.com/jupyterlab/jupyterlab/blob/v4.2.1/CHANGELOG.md (cherry picked from commit d7cf5a7f731bc3d0df9410bb51359022acce42d4) --- pkgs/development/python-modules/jupyterlab/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 7668dae613fd..166a1bb82b3f 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -21,22 +21,22 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.2.0"; + version = "4.2.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NW6SBaaiq2icR8j+SRnbpsB243bQPya6rcBXSMJDXdU="; + hash = "sha256-oQ+3EIWmkAggxi1DMkAFBGQC/8jw/eaWED43I4qDlQc="; }; - nativeBuildInputs = [ + build-system = [ hatch-jupyter-builder hatchling ]; - propagatedBuildInputs = [ + dependencies = [ async-lru httpx packaging From 7f65c0136d258819ddb4a0d8982e7f8519bdee1d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 19 Jun 2024 05:06:06 +0200 Subject: [PATCH 3/9] python3Packages.jupyterlab: 4.2.1 -> 4.2.2 https://github.com/jupyterlab/jupyterlab/blob/v4.2.2/CHANGELOG.md (cherry picked from commit 57256e00c3a0e9efaee3a3970d68f17bee16e6a5) --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 166a1bb82b3f..9f3df60d49ca 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.2.1"; + version = "4.2.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-oQ+3EIWmkAggxi1DMkAFBGQC/8jw/eaWED43I4qDlQc="; + hash = "sha256-pTS2olcZqSpA1RT7Ezqf6PDZmBsLvOXYpfyqMzRKMDg="; }; build-system = [ From 9653879429ee8811372d9bc9ca244b7512cda4da Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 7 Jul 2024 12:18:38 +0900 Subject: [PATCH 4/9] python312Packages.jupyterlab: 4.2.2 -> 4.2.3 Changelog: https://github.com/jupyterlab/jupyterlab/blob/v4.2.3/CHANGELOG.md (cherry picked from commit 1e686ef21b04466e15d02fe4edda8c8730c37ba0) --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 9f3df60d49ca..f64f383895ff 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.2.2"; + version = "4.2.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pTS2olcZqSpA1RT7Ezqf6PDZmBsLvOXYpfyqMzRKMDg="; + hash = "sha256-325Glp6lHWaBUWfyPZLxBUI7fx8G+mBNT0SusBjILHs="; }; build-system = [ From 7853547f7d0f78285abfe32eb9d8a7bcb2975170 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 25 Jul 2024 20:34:51 +0900 Subject: [PATCH 5/9] python312Packages.jupyterlab: 4.2.3 -> 4.2.4 Changelog: https://github.com/jupyterlab/jupyterlab/blob/v4.2.4/CHANGELOG.md (cherry picked from commit af0897b39560dbae11dd47d3a6ced255e30e3f7c) --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index f64f383895ff..ab4c0c705323 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.2.3"; + version = "4.2.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-325Glp6lHWaBUWfyPZLxBUI7fx8G+mBNT0SusBjILHs="; + hash = "sha256-NDqXn7lYL9CMhRGCPjIHAygc0HKgBJvNr9x6/tp/JTc="; }; build-system = [ From 843ab11aa0057bf4766fa5a1f06b87136f8ae77e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 1 Sep 2024 10:58:14 +0900 Subject: [PATCH 6/9] python312Packages.jupyterlab: 4.2.4 -> 4.2.5 Changelog: https://github.com/jupyterlab/jupyterlab/blob/v4.2.5/CHANGELOG.md (cherry picked from commit 371ecc2e5f657965902a571774064b286e88dc0a) --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index ab4c0c705323..8105bf1ebc6f 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.2.4"; + version = "4.2.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NDqXn7lYL9CMhRGCPjIHAygc0HKgBJvNr9x6/tp/JTc="; + hash = "sha256-rn86G4y4i09VAJznn6fAb5nXDNY2Ae5KqRgV0FT0b3U="; }; build-system = [ From 6b25604415b5ff831d405105a3c5f8c4384f0a1f Mon Sep 17 00:00:00 2001 From: Florian Agbuya Date: Thu, 12 Sep 2024 15:52:09 +0800 Subject: [PATCH 7/9] flarum: fix installation and migration logic (cherry picked from commit 317a52a7570617ec89d733f8e4dd5865fb653f8a) --- nixos/modules/services/web-apps/flarum.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/flarum.nix b/nixos/modules/services/web-apps/flarum.nix index 95ebcc23e7e8..129f5a282681 100644 --- a/nixos/modules/services/web-apps/flarum.nix +++ b/nixos/modules/services/web-apps/flarum.nix @@ -203,10 +203,13 @@ in { ln -sf ${cfg.package}/share/php/flarum/public/index.php public/ '' + optionalString (cfg.createDatabaseLocally && cfg.database.driver == "mysql") '' if [ ! -f config.php ]; then - php flarum install --file=${flarumInstallConfig} + php flarum install --file=${flarumInstallConfig} + fi + '' + '' + if [ -f config.php ]; then + php flarum migrate + php flarum cache:clear fi - php flarum migrate - php flarum cache:clear ''; }; }; From 2143122291a8e2fd7a718057144a893eacfb3c89 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:48:35 +0530 Subject: [PATCH 8/9] uwsm: 0.18.2 -> 0.19.0 Changelog: https://github.com/Vladimir-csp/uwsm/releases/tag/v0.19.0 (cherry picked from commit e32ed381ecf07fac29d2d89aa59755ffc6c33f4c) --- pkgs/by-name/uw/uwsm/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix index fa5ad6f3692b..3e6db1d64791 100644 --- a/pkgs/by-name/uw/uwsm/package.nix +++ b/pkgs/by-name/uw/uwsm/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uwsm"; - version = "0.18.2"; + version = "0.19.0"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "uwsm"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-/LmSc1AKNZ/VZ2rkUsOvwqpJmPgb6dThTtOu44BriQs="; + hash = "sha256-gptZld9BIQaujg9fGAgKD7wXjKeL5quXnSGOKn25jn8="; }; nativeBuildInputs = [ @@ -88,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Universal wayland session manager"; homepage = "https://github.com/Vladimir-csp/uwsm"; + changelog = "https://github.com/Vladimir-csp/uwsm/releases/tag/v${finalAttrs.version}"; mainProgram = "uwsm"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ From 5d28a3e31a5b353e9338b51dc218c77524f42994 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:54:32 +0530 Subject: [PATCH 9/9] uwsm: pass python-bin meson option enable man output dir (cherry picked from commit 04e88717732460acb7ef1cce758b8a63f0cce3ec) --- pkgs/by-name/uw/uwsm/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix index 3e6db1d64791..7df5b832c746 100644 --- a/pkgs/by-name/uw/uwsm/package.nix +++ b/pkgs/by-name/uw/uwsm/package.nix @@ -60,12 +60,9 @@ stdenv.mkDerivation (finalAttrs: { "uuctl" = uuctlSupport; "man-pages" = true; }) + (lib.mesonOption "python-bin" python.interpreter) ]; - passthru = { - updateScript = nix-update-script { }; - }; - postInstall = let wrapperArgs = '' @@ -85,6 +82,15 @@ stdenv.mkDerivation (finalAttrs: { ''} ''; + outputs = [ + "out" + "man" + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "Universal wayland session manager"; homepage = "https://github.com/Vladimir-csp/uwsm";