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 ''; }; }; diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix index fa5ad6f3692b..7df5b832c746 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 = [ @@ -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,9 +82,19 @@ stdenv.mkDerivation (finalAttrs: { ''} ''; + outputs = [ + "out" + "man" + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + 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; [ diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 7668dae613fd..8105bf1ebc6f 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.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NW6SBaaiq2icR8j+SRnbpsB243bQPya6rcBXSMJDXdU="; + hash = "sha256-rn86G4y4i09VAJznn6fAb5nXDNY2Ae5KqRgV0FT0b3U="; }; - nativeBuildInputs = [ + build-system = [ hatch-jupyter-builder hatchling ]; - propagatedBuildInputs = [ + dependencies = [ async-lru httpx packaging 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";