diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/code-server/playwright.patch | 10 | ||||
-rw-r--r-- | pkgs/servers/geospatial/fit-trackee/default.nix | 11 | ||||
-rw-r--r-- | pkgs/servers/geospatial/geoserver/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/home-assistant/component-packages.nix | 7 | ||||
-rw-r--r-- | pkgs/servers/home-assistant/default.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/http/router/default.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/http/router/librusty_v8.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/misc/virtiofsd/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/ipmi-exporter.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/pve-exporter.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/prometheus/redis-exporter.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/mqtt/flashmq/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/nextcloud/default.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/nominatim/default.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/routinator/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/sozu/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/web-apps/livebook/default.nix | 10 |
17 files changed, 59 insertions, 58 deletions
diff --git a/pkgs/servers/code-server/playwright.patch b/pkgs/servers/code-server/playwright.patch deleted file mode 100644 index 95a74748189d9..0000000000000 --- a/pkgs/servers/code-server/playwright.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./vendor/modules/code-oss-dev/node_modules/playwright/install.js -+++ ./vendor/modules/code-oss-dev/node_modules/playwright/install.js -@@ -14,6 +14,4 @@ - * limitations under the License. - */ - --const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry'); -- --installDefaultBrowsersForNpmInstall(); -+process.stdout.write('Browser install disabled by Nix build script\n'); diff --git a/pkgs/servers/geospatial/fit-trackee/default.nix b/pkgs/servers/geospatial/fit-trackee/default.nix index 5a3673244e30e..0e7377f1258c5 100644 --- a/pkgs/servers/geospatial/fit-trackee/default.nix +++ b/pkgs/servers/geospatial/fit-trackee/default.nix @@ -25,21 +25,19 @@ let in python.pkgs.buildPythonApplication rec { pname = "fit-trackee"; - version = "0.7.22"; + version = "0.7.29"; format = "pyproject"; src = fetchFromGitHub { owner = "SamR1"; repo = "FitTrackee"; rev = "v${version}"; - hash = "sha256-aPQ8jLssN9nx0Bpd/44E3sQi2w0cR8ecG76DJjreeHA="; + hash = "sha256-NWWQ+lPUMaeF3UPglllaLGJnNgF54SXo4DcF3VAQbO4="; }; postPatch = '' - substituteInPlace pyproject.toml \ - --replace psycopg2-binary psycopg2 \ - --replace 'poetry>=0.12' 'poetry-core' \ - --replace 'poetry.masonry.api' 'poetry.core.masonry.api' + substituteInPlace pyproject.toml --replace psycopg2-binary psycopg2 \ + --replace 'flask = "^3.0.0"' 'flask = "*"' ''; nativeBuildInputs = [ @@ -55,6 +53,7 @@ python.pkgs.buildPythonApplication rec { flask-dramatiq flask-limiter flask-migrate + flask-sqlalchemy gpxpy gunicorn humanize diff --git a/pkgs/servers/geospatial/geoserver/default.nix b/pkgs/servers/geospatial/geoserver/default.nix index 8b2db14048ae5..a58a3bb717e1c 100644 --- a/pkgs/servers/geospatial/geoserver/default.nix +++ b/pkgs/servers/geospatial/geoserver/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "geoserver"; - version = "2.24.1"; + version = "2.24.2"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - sha256 = "sha256-3GdpM5BIH6+NME+/Zig0c7pYFWuWZywT6goD9JT6gZI="; + sha256 = "sha256-1ArG7CneJRY9y6rYaVjNU6L6RsUgVvjpwt07Rd+WGrE="; }; patches = [ diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 26e4dc0949501..abfb8c7b9417d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -5073,7 +5073,8 @@ psutil-home-assistant python-kasa sqlalchemy - ]; # missing inputs: python-kasa.optional-dependencies.speedups + ] + ++ python-kasa.optional-dependencies.speedups; "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected "tplink_omada" = ps: with ps; [ @@ -5256,7 +5257,8 @@ "valve" = ps: with ps; [ ]; "vasttrafik" = ps: with ps; [ - ]; # missing inputs: vtjp + vtjp + ]; "velbus" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher @@ -6400,6 +6402,7 @@ "tomorrowio" "toon" "totalconnect" + "tplink" "tplink_omada" "traccar" "trace" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ee1375c5044ac..17e142b6ab438 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -322,6 +322,16 @@ let }; }); + python-kasa = super.python-kasa.overridePythonAttrs (oldAttrs: rec { + version = "0.5.4"; + src = fetchFromGitHub { + owner = "python-kasa"; + repo = "python-kasa"; + rev = "refs/tags/${version}"; + hash = "sha256-wGPMrYaTtKkkNW88eyiiciFcBSTRqqChYi6e15WUCHo="; + }; + }); + python-roborock = super.python-roborock.overridePythonAttrs (oldAttrs: rec { version = "0.38.0"; src = fetchFromGitHub { diff --git a/pkgs/servers/http/router/default.nix b/pkgs/servers/http/router/default.nix index 01f1415d0af86..f4903b2f31f7c 100644 --- a/pkgs/servers/http/router/default.nix +++ b/pkgs/servers/http/router/default.nix @@ -2,6 +2,7 @@ , callPackage , fetchFromGitHub , rustPlatform +, cmake , pkg-config , protobuf , elfutils @@ -9,18 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "router"; - version = "1.19.0"; + version = "1.30.1"; src = fetchFromGitHub { owner = "apollographql"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IuS7NmlTNmHHnnSZ+YIbV6BnxJW2xprOQ5mkz5FuJEQ="; + sha256 = "sha256-mQtIjfXDcEy5HfZbWauL0NQLPneGq9EJt/yB8zMuhSU="; }; - cargoHash = "sha256-yeb+4lgRDssjkEx6bYfGIbn4DJGpZZ/JDmuwFjQ+U+8="; + cargoHash = "sha256-XCDU6cXw+Wf5MR6m+HCI8/VFRRylMywktZbd5k7Lcwo="; nativeBuildInputs = [ + cmake pkg-config protobuf ]; diff --git a/pkgs/servers/http/router/librusty_v8.nix b/pkgs/servers/http/router/librusty_v8.nix index 3e3bf55c757e4..1d5e334f2d07b 100644 --- a/pkgs/servers/http/router/librusty_v8.nix +++ b/pkgs/servers/http/router/librusty_v8.nix @@ -9,11 +9,11 @@ let }; in fetch_librusty_v8 { - version = "0.60.1"; + version = "0.74.3"; shas = { - x86_64-linux = "sha256-P8H+XJqrt9jdKM885L1epMldp+stwmEw+0Gtd2x3r4g="; - aarch64-linux = "sha256-frHpBP2pL3o4efFLHP2r3zsWJrNT93yYu2Qkxv+7m8Y="; - x86_64-darwin = "sha256-taewoYBkyikqWueLSD9dW1EDjzkV68Xplid1UaLZgRM="; - aarch64-darwin = "sha256-s2YEVbuYpiT/qrmE37aXk13MetrnJo6l+s1Q2y6b5kU="; + x86_64-linux = "sha256-8pa8nqA6rbOSBVnp2Q8/IQqh/rfYQU57hMgwU9+iz4A="; + aarch64-linux = "sha256-3kXOV8rlCNbNBdXgOtd3S94qO+JIKyOByA4WGX+XVP0="; + x86_64-darwin = "sha256-iBBVKZiSoo08YEQ8J/Rt1/5b7a+2xjtuS6QL/Wod5nQ="; + aarch64-darwin = "sha256-Djnuc3l/jQKvBf1aej8LG5Ot2wPT0m5Zo1B24l1UHsM="; }; } diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index b2f17aab50360..027235986c5e0 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - sha256 = "sha256-SMh1jHD64OtmqBtNcBbFh4MYWs+FAVlKHMCCSMmbKHU="; + sha256 = "sha256-qHrgNuPDEtFzucE6ACPemUcjEqOvbo4xV0ru4bP3ATE="; }; separateDebugInfo = true; - cargoHash = "sha256-3FlAbfqketgWuddCqmV1oz/XLgwcCUQZoFh/jWzledE="; + cargoHash = "sha256-BVl4Inr7ZLnilkPVTD2cjJx9RuqB0Mg230o2c2TLw3I="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = diff --git a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix index 11264a637983d..1b1ac3c62420d 100644 --- a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ipmi_exporter"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "ipmi_exporter"; rev = "v${version}"; - hash = "sha256-yVFpYedWELqDNzmHQfMJa95iKQsn1N/wa82sQEQh1Uw="; + hash = "sha256-ZF5mBjq+IhSQrQ1dUfHlfyUMK2dkpZ5gu9djPkUYvRQ="; }; - vendorHash = "sha256-1ntFcOmVN4I1aa/5gWnzkYNYxxFT9ZM1usNnE23KfR0="; + vendorHash = "sha256-q5MFAvFCrr24b1VO0Z03C08CGd+0pUerXZEKiu4r7cE="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix index f3598304b89c4..1b12f29bb9423 100644 --- a/pkgs/servers/monitoring/prometheus/pve-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -6,11 +6,11 @@ python3.pkgs.buildPythonApplication rec { pname = "prometheus-pve-exporter"; - version = "2.3.0"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hL1+vP+/Xi3od+17906YARgg4APlFhRkdOCnRxDHJmM="; + sha256 = "sha256-ruJGp/juRxFJwnd0A7/qWgeJHFg9oIKekjWIe3kiUa4="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index 42db8a165a556..177537588d63d 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.56.0"; + version = "1.57.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-7tnl8iItGegfRXLF3f+tmNxgJWkai6n8EOP00zyqyYs="; + sha256 = "sha256-M5Mv2gAQMR0j2zIX6OwePA9w7OtjJ0i2mR9I4BvUcXI="; }; - vendorHash = "sha256-r+VJ2+4F3BQ0tmNTVHDOxKaKAPSIvgu7ZcQZ6BXt2kA="; + vendorHash = "sha256-32EjLEPeFsihdG83ru4SSf03F2XJGD8+tbO9ANaI1hs="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/servers/mqtt/flashmq/default.nix b/pkgs/servers/mqtt/flashmq/default.nix index 7ecad55000abf..eb4c607b7804d 100644 --- a/pkgs/servers/mqtt/flashmq/default.nix +++ b/pkgs/servers/mqtt/flashmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.4.5"; + version = "1.8.4"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-DcxwwUNpnMeK8A3LuyfrWAMCng0yIcX9bKxNGY0uDSo="; + hash = "sha256-CMZim7FSTzjUaViVFq5OABOAUX3Aee+I3/HQhNIdIVM="; }; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 1b7620eb5f867..6538c3f2cb628 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -43,14 +43,14 @@ let }; in { nextcloud26 = generic { - version = "26.0.10"; - hash = "sha256-yArkYMxOmvfQsJd6TJJX+t22a/V5OW9nwHfgLZsmlIw="; + version = "26.0.11"; + hash = "sha256-Vc0QCCy495oYeRnpWaYwc4Nf4D/ko4VsODoKcS7YADA="; packages = nextcloud26Packages; }; nextcloud27 = generic { - version = "27.1.5"; - hash = "sha256-O1NMmOdrf+2Mo5NMrUGbEK9YViWfMTvsIs06e/pu+WE="; + version = "27.1.6"; + hash = "sha256-rntyt/xSWsSXmMLeaml6TP8ls0ly1p1GmVmIXTNRvvo="; packages = nextcloud27Packages; }; diff --git a/pkgs/servers/nominatim/default.nix b/pkgs/servers/nominatim/default.nix index a666da35f4ca6..db126863fe04b 100644 --- a/pkgs/servers/nominatim/default.nix +++ b/pkgs/servers/nominatim/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { jinja2 pyicu datrie + pyosmium ])) # python3Packages.pylint # We don't want to run pylint because the package could break on pylint bumps which is really annoying. # python3Packages.pytest # disabled since I can't get it to run tests anyway diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 6864556fd55df..1fdf6d8fdba23 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-gInJS7JpvEbmOuZecB4xjff2d7TnjcVV+8mPOmy5Oyo="; + hash = "sha256-ia9N2jZlFW0Gu5YDfwh023zorMyWWL/KggeBRvCD1W4="; }; - cargoHash = "sha256-c5SQysjO821pfGhnyB4aGOZuwrHaN502PfkA1gBPtY4="; + cargoHash = "sha256-RHT6+zrY4SjoC/hgoMRal+cG8Ruip/6v7oVtKvR8doU="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index 0735e6d85f257..705c5b935bfbd 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "sozu"; - version = "0.15.18"; + version = "0.15.19"; src = fetchFromGitHub { owner = "sozu-proxy"; repo = pname; rev = version; - hash = "sha256-tmQgihbE4Ga2NXKwTQTaMP2ZKyL9G1zTojHG2mwFn0o="; + hash = "sha256-9TSu27s/rnO48zEhBzaHaU3pHyIJ0LVZC8LBRhn0PNM="; }; - cargoHash = "sha256-93I9HcGCnli8gK7BkS4h4pecmN/yRpwbjFzqlMLMbM0="; + cargoHash = "sha256-h9igqV9YqMqRhqwsKYIji8WAVmcPQfErcPPm0PcDwss="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/servers/web-apps/livebook/default.nix b/pkgs/servers/web-apps/livebook/default.nix index f0eee2eed605d..e1815a819bbf2 100644 --- a/pkgs/servers/web-apps/livebook/default.nix +++ b/pkgs/servers/web-apps/livebook/default.nix @@ -22,15 +22,11 @@ beamPackages.mixRelease rec { hash = "sha256-dyKhrbb7vazBV6LFERtGHLQXEx29vTgn074mY4fsHy4="; }; - installPhase = '' - mix escript.build - mkdir -p $out/bin - mv ./livebook $out/bin - + postInstall = '' wrapProgram $out/bin/livebook \ - --prefix PATH : ${lib.makeBinPath [ elixir ]} \ + --prefix PATH : ${lib.makeBinPath [ elixir erlang ]} \ --set MIX_REBAR3 ${rebar3}/bin/rebar3 - ''; + ''; passthru.tests = { livebook-service = nixosTests.livebook-service; |