diff options
Diffstat (limited to 'pkgs/servers')
40 files changed, 350 insertions, 204 deletions
diff --git a/pkgs/servers/bloat/default.nix b/pkgs/servers/bloat/default.nix index d6063961f844b..84004ef16e2d6 100644 --- a/pkgs/servers/bloat/default.nix +++ b/pkgs/servers/bloat/default.nix @@ -6,12 +6,12 @@ buildGoModule { pname = "bloat"; - version = "0-unstable-2024-02-12"; + version = "0-unstable-2024-06-17"; src = fetchgit { url = "git://git.freesoftwareextremist.com/bloat"; - rev = "6ddec8db3ee73d3abdc85b6a2101020cf2455bce"; - hash = "sha256-NWi8vL1zyKgPlZo73qpR232r65foaYcjUKkVwyJ/C7c="; + rev = "51d6ff26fe224444b921b5b1f367f15782cf84d3"; + hash = "sha256-g5CbX134o9aeFggsVYnPfbZ4bsRQUUNnAe1KhTlONuU="; }; vendorHash = null; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 78912dc115c36..4c0853a6e3e3e 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { homepage = "https://freeradius.org/"; description = "Modular, high performance free RADIUS suite"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ sheenobu willibutz lheckemann ]; + maintainers = with maintainers; [ sheenobu willibutz ]; platforms = with platforms; linux; }; } diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 9b09a69fa136a..320042f7157ea 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "gotify-server"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - hash = "sha256-TZeQcrJCH9TW039r499fxY4xJ27nZm9GdrilsI33Iqc="; + hash = "sha256-Na/bxETIgVm1mxMOXWTgYIFFuB6XG1jGvbW6q/n5LRw="; }; # With `allowGoReference = true;`, `buildGoModule` adds the `-trimpath` @@ -24,7 +24,7 @@ buildGoModule rec { # server[780]: stat /var/lib/private/ui/build/index.html: no such file or directory allowGoReference = true; - vendorHash = "sha256-TR6YGNhSMQ/1kvX3p3QGlXovuoJdaRH0LOwIPZwQ/xY="; + vendorHash = "sha256-Vnk/c2dzxIXDChobFSP++9uyiFD+SKyxJC9ZwaQ2pVw="; doCheck = false; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1fe093dfb2d07..c56be24eaac5e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.6.3"; + version = "2024.6.4"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -2893,6 +2893,7 @@ hassil home-assistant-intents ifaddr + motionblindsble mutagen psutil-home-assistant pyserial @@ -2900,7 +2901,7 @@ sqlalchemy webrtc-noise-gain zeroconf - ]; # missing inputs: motionblindsble + ]; "motioneye" = ps: with ps; [ motioneye-client ]; @@ -5663,6 +5664,7 @@ "moon" "mopeka" "motion_blinds" + "motionblinds_ble" "motioneye" "motionmount" "mqtt" diff --git a/pkgs/servers/home-assistant/custom-components/awtrix/default.nix b/pkgs/servers/home-assistant/custom-components/awtrix/default.nix new file mode 100644 index 0000000000000..738dbbea5dbca --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/awtrix/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchFromGitHub +, buildHomeAssistantComponent +, requests +}: + +buildHomeAssistantComponent rec { + owner = "10der"; + domain = "awtrix"; + version = "unstable-2024-05-26"; + + src = fetchFromGitHub { + inherit owner; + repo = "homeassistant-custom_components-awtrix"; + rev = "329d8eec28478574b9f34778f96b5768f30be2ab"; + hash = "sha256-ucSaQWMS6ZwXHnw5Ct/STxpl1JjBRua3edrLvBAsdyw="; + }; + + propagatedBuildInputs = [ + requests + ]; + + meta = with lib; { + description = "Home-assistant integration for awtrix"; + homepage = "https://github.com/10der/homeassistant-custom_components-awtrix"; + maintainers = with maintainers; [ pinpox ]; + license = licenses.mit; + }; +} + diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 8f5766aac0be4..3a1184016f3ef 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -6,6 +6,8 @@ auth-header = callPackage ./auth-header {}; + awtrix = callPackage ./awtrix {}; + better_thermostat = callPackage ./better_thermostat {}; emporia_vue = callPackage ./emporia_vue {}; @@ -46,6 +48,8 @@ smartthinq-sensors = callPackage ./smartthinq-sensors {}; + spook = callPackage ./spook {}; + tuya_local = callPackage ./tuya_local {}; waste_collection_schedule = callPackage ./waste_collection_schedule {}; diff --git a/pkgs/servers/home-assistant/custom-components/spook/default.nix b/pkgs/servers/home-assistant/custom-components/spook/default.nix new file mode 100644 index 0000000000000..280f7b9491b2a --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/spook/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + pillow, + fnv-hash-fast, + psutil-home-assistant, + sqlalchemy, +}: +buildHomeAssistantComponent rec { + owner = "frenck"; + domain = "spook"; + version = "3.0.1"; + + src = fetchFromGitHub { + inherit owner; + repo = domain; + rev = "refs/tags/v${version}"; + hash = "sha256-ChHsevryWuim8BEFqXVkCOW9fGMrt5vol+B2SreMUws="; + }; + + patches = [./remove-sub-integration-symlink-hack.patch]; + + dependencies = [ + pillow + fnv-hash-fast + psutil-home-assistant + sqlalchemy + ]; + + meta = { + changelog = "https://github.com/frenck/spook/releases/tag/v${version}"; + description = "Toolbox for Home Assistant"; + homepage = "https://spook.boo/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [kkoniuszy]; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/spook/remove-sub-integration-symlink-hack.patch b/pkgs/servers/home-assistant/custom-components/spook/remove-sub-integration-symlink-hack.patch new file mode 100644 index 0000000000000..4756e4a2c389a --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/spook/remove-sub-integration-symlink-hack.patch @@ -0,0 +1,109 @@ +diff --git a/custom_components/spook/__init__.py b/custom_components/spook/__init__.py +index 213fb2c..c7dc299 100644 +--- a/custom_components/spook/__init__.py ++++ b/custom_components/spook/__init__.py +@@ -23,8 +23,6 @@ from .templating import SpookTemplateFunctionManager + from .util import ( + async_ensure_template_environments_exists, + async_forward_setup_entry, +- link_sub_integrations, +- unlink_sub_integrations, + ) + + if TYPE_CHECKING: +@@ -34,48 +32,6 @@ if TYPE_CHECKING: + + async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: + """Set up from a config entry.""" +- # Symlink all sub integrations from Spook to the parent integrations folder +- # if one is missing, we have to restart Home Assistant. +- # This is a workaround for the fact that Home Assistant doesn't support +- # sub integrations. +- if await hass.async_add_executor_job(link_sub_integrations, hass): +- LOGGER.debug("Newly symlinked sub integrations, restarting Home Assistant") +- +- @callback +- def _restart(_: Event | None = None) -> None: +- """Restart Home Assistant.""" +- hass.data["homeassistant_stop"] = asyncio.create_task( +- hass.async_stop(RESTART_EXIT_CODE), +- ) +- +- # User asked to restart Home Assistant in the config flow. +- if hass.data.get(DOMAIN) == "Boo!": +- _restart() +- return False +- +- # Should be OK to restart. Better to do it before anything else started. +- if hass.state == CoreState.starting: +- _restart() +- return False +- +- # If all other fails, but we are not running yet... wait for it. +- if hass.state == CoreState.not_running: +- # Listen to both... just in case. +- hass.bus.async_listen_once(EVENT_HOMEASSISTANT_START, _restart) +- hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STARTED, _restart) +- return False +- +- LOGGER.info( +- "Home Assistant needs to be restarted in for Spook to complete setting up", +- ) +- ir.async_create_issue( +- hass=hass, +- domain=DOMAIN, +- issue_id="restart_required", +- is_fixable=True, +- severity=ir.IssueSeverity.WARNING, +- translation_key="restart_required", +- ) + + # Ensure template environments exists + async_ensure_template_environments_exists(hass) +@@ -120,4 +76,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: + + async def async_remove_entry(hass: HomeAssistant, _: ConfigEntry) -> None: + """Remove a config entry.""" +- await hass.async_add_executor_job(unlink_sub_integrations, hass) +diff --git a/custom_components/spook/util.py b/custom_components/spook/util.py +index 32e9bd2..845d463 100644 +--- a/custom_components/spook/util.py ++++ b/custom_components/spook/util.py +@@ -104,37 +104,6 @@ async def async_forward_platform_entry_setups_to_ectoplasm( + ) + + +-def link_sub_integrations(hass: HomeAssistant) -> bool: +- """Link Spook sub integrations.""" +- LOGGER.debug("Linking up Spook sub integrations") +- +- changes = False +- for manifest in Path(__file__).parent.rglob("integrations/*/manifest.json"): +- LOGGER.debug("Linking Spook sub integration: %s", manifest.parent.name) +- dest = Path(hass.config.config_dir) / "custom_components" / manifest.parent.name +- if not dest.exists(): +- src = ( +- Path(hass.config.config_dir) +- / "custom_components" +- / DOMAIN +- / "integrations" +- / manifest.parent.name +- ) +- dest.symlink_to(src) +- changes = True +- return changes +- +- +-def unlink_sub_integrations(hass: HomeAssistant) -> None: +- """Unlink Spook sub integrations.""" +- LOGGER.debug("Unlinking Spook sub integrations") +- for manifest in Path(__file__).parent.rglob("integrations/*/manifest.json"): +- LOGGER.debug("Unlinking Spook sub integration: %s", manifest.parent.name) +- dest = Path(hass.config.config_dir) / "custom_components" / manifest.parent.name +- if dest.exists(): +- dest.unlink() +- +- + @callback + def async_ensure_template_environments_exists(hass: HomeAssistant) -> None: + """Ensure default template environments exist. diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix index b3f93c0b50c4c..9398e57486f99 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix @@ -5,18 +5,18 @@ buildNpmPackage rec { pname = "android-tv-card"; - version = "3.8.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-DYNfDGvCLJHhp2p9iPsxWAyPPUNI+sLwDYP6FRQA1vk="; + hash = "sha256-ARFJJ119zJzjW0d59JFARMcjVAJ2IFDkShIN43d1adI="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-9O5T3x3uLm5qpZwIbeo2DJ/CirRilJ17BZuT3+NDP8A="; + npmDepsHash = "sha256-t/kZTcXs3IpbrEfnmYQlJqhM8F3mO4prbQNnKtFqsDM="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2e60e21ae8f2a..02f83ba82b62f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -533,7 +533,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.6.3"; + hassVersion = "2024.6.4"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -551,13 +551,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-hpKfdcTc9vddA/1EsfugDIKUPe0g3fPQnmwHLSEIF9w="; + hash = "sha256-WIAFTVNHzrKTRONmOc/lq5PvC34PDKF7UfIokLCVzNY="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-lhTVAYwtYf7UzplAIHTWqgd0P7V93gjNbBUlMd3i3oQ="; + hash = "sha256-Ymv3AlArAD2rSXQwMhEVeynwhAo8ZMrtV1zUK4U8xqQ="; }; build-system = with python.pkgs; [ diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 06b68cfd383ee..88944efe35930 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.6.5"; + version = "2024.6.21"; pyproject = true; disabled = pythonOlder "3.9"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents-package"; rev = "refs/tags/${version}"; - hash = "sha256-2rACxdgvCWnyhfVRAVbLTaEAYquAkLnfxi7zeZYZslI="; + hash = "sha256-tgbZqcxv/uFoNCGq7TySffhqQXzupZodQfQHBqkSHrE="; fetchSubmodules = true; }; diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index 2fe617dea43b0..8a08962f646bb 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BS6ErS2Wi8pOy8oFmVnbujYPwClxX8e+GL4CcqvOL9E="; + sha256 = "sha256-3o9XxxTlWppq1mFgIUjstUFz6bT44mvBJa4FBgcc4Pc="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/pkgs/servers/jellyseerr/default.nix b/pkgs/servers/jellyseerr/default.nix index ca8e93753e69f..b469e46cf10d8 100644 --- a/pkgs/servers/jellyseerr/default.nix +++ b/pkgs/servers/jellyseerr/default.nix @@ -1,36 +1,32 @@ -{ lib -, fetchFromGitHub -, makeWrapper -, mkYarnPackage -, nodejs -, fetchYarnDeps -, python3 +{ + lib, + mkYarnPackage, + fetchFromGitHub, + fetchYarnDeps, + makeWrapper, + nodejs, + python3, + sqlite, }: -let - pin = lib.importJSON ./pin.json; -in - mkYarnPackage rec { pname = "jellyseerr"; - inherit (pin) version; + version = "1.8.1"; src = fetchFromGitHub { owner = "Fallenbagel"; repo = "jellyseerr"; rev = "v${version}"; - hash = pin.srcHash; + hash = "sha256-B8Hnpi4XwK0WrHRgj7OSVUh49oRH9SVEHdzGbnDa8p8="; }; packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - sha256 = pin.yarnSha256; + hash = "sha256-ME19kHlVw0Q5oCytYQCUj4Ek0+712NkqB6eozOtF6/k="; }; - doDist = false; - nativeBuildInputs = [ nodejs makeWrapper @@ -38,16 +34,23 @@ mkYarnPackage rec { # Fixes "SQLite package has not been found installed" at launch pkgConfig.sqlite3 = { - nativeBuildInputs = [ nodejs.pkgs.node-pre-gyp python3 ]; + nativeBuildInputs = [ + nodejs.pkgs.node-pre-gyp + python3 + sqlite + ]; postInstall = '' export CPPFLAGS="-I${nodejs}/include/node" - node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node + node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node --sqlite=${sqlite.dev} rm -r build-tmp-napi-v6 ''; }; pkgConfig.bcrypt = { - nativeBuildInputs = [ nodejs.pkgs.node-pre-gyp python3 ]; + nativeBuildInputs = [ + nodejs.pkgs.node-pre-gyp + python3 + ]; postInstall = '' export CPPFLAGS="-I${nodejs}/include/node" node-pre-gyp install --prefer-offline --build-from-source --nodedir=${nodejs}/include/node @@ -72,6 +75,8 @@ mkYarnPackage rec { --set NODE_ENV production ''; + doDist = false; + passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/servers/jellyseerr/pin.json b/pkgs/servers/jellyseerr/pin.json deleted file mode 100644 index 715f91a73b31c..0000000000000 --- a/pkgs/servers/jellyseerr/pin.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "1.8.1", - "srcHash": "sha256-B8Hnpi4XwK0WrHRgj7OSVUh49oRH9SVEHdzGbnDa8p8=", - "yarnSha256": "ME19kHlVw0Q5oCytYQCUj4Ek0+712NkqB6eozOtF6/k=" -} diff --git a/pkgs/servers/jellyseerr/update.sh b/pkgs/servers/jellyseerr/update.sh index 719fc622a6e4c..cd8f6c03081c7 100755 --- a/pkgs/servers/jellyseerr/update.sh +++ b/pkgs/servers/jellyseerr/update.sh @@ -1,39 +1,16 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix curl jq prefetch-yarn-deps nix-prefetch-github +#!nix-shell -i bash -p curl jq common-updater-scripts nix prefetch-yarn-deps -set -euo pipefail +set -eu -o pipefail -if [[ "$#" -gt 1 || "$1" == -* ]]; then - echo "Regenerates packaging data for jellyseerr." - echo "Usage: $0 [git release tag]" - exit 1 -fi +version=${1:-$(curl -s https://api.github.com/repos/Fallenbagel/jellyseerr/releases/latest | jq --raw-output '.tag_name[1:]')} +update-source-version jellyseerr $version -tag="$1" +nix_file=$(nix-instantiate --eval --strict -A "jellyseerr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') +nix_dir=$(dirname $nix_file) +cp $(nix-instantiate --eval --expr 'with import ./default.nix { }; "${jellyseerr.src}/package.json"' | sed 's/"//g') $nix_dir -if [ -z "$tag" ]; then - tag="$( - curl "https://api.github.com/repos/Fallenbagel/jellyseerr/releases?per_page=1" | - jq -r '.[0].tag_name' - )" -fi - -src="https://raw.githubusercontent.com/Fallenbagel/jellyseerr/$tag" -src_hash=$(nix-prefetch-github Fallenbagel jellyseerr --rev ${tag} | jq -r .sha256) - -tmpdir=$(mktemp -d) -trap 'rm -rf "$tmpdir"' EXIT - -pushd $tmpdir -curl -O "$src/yarn.lock" -yarn_sha256=$(prefetch-yarn-deps yarn.lock) -popd - -curl -O "$src/package.json" -cat > pin.json << EOF -{ - "version": "$(echo $tag | grep -P '(\d|\.)+' -o)", - "srcHash": "sha256-$src_hash", - "yarnSha256": "$yarn_sha256" -} -EOF +old_yarn_hash=$(nix-instantiate --eval --strict -A "jellyseerr.offlineCache.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g') +lock_file=$(nix-instantiate --eval --expr 'with import ./default.nix { }; "${jellyseerr.src}/yarn.lock"' | sed 's/"//g') +new_yarn_hash=$(nix hash to-sri --type sha256 $(prefetch-yarn-deps $lock_file)) +sed -i "$nix_file" -re "s|\"$old_yarn_hash\"|\"$new_yarn_hash\"|" diff --git a/pkgs/servers/jitsi-excalidraw/default.nix b/pkgs/servers/jitsi-excalidraw/default.nix index 4fa9a55e20821..01e66309e556a 100644 --- a/pkgs/servers/jitsi-excalidraw/default.nix +++ b/pkgs/servers/jitsi-excalidraw/default.nix @@ -1,8 +1,10 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -, nodejs -, python3 +{ + lib, + buildNpmPackage, + fetchFromGitHub, + nodejs, + python3, + nix-update-script, }: buildNpmPackage rec { @@ -31,6 +33,8 @@ buildNpmPackage rec { --chdir $out/share ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Excalidraw collaboration backend for Jitsi"; homepage = "https://github.com/jitsi/excalidraw-backend"; diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 743607a3f4718..48d9ecec2b01b 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "24.0.5"; + version = "25.0.1"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-lf1miVEGQvPbmlOZMCXUyX/pKE+JoJFawhjVEPJDJ6s="; + hash = "sha256-gwnBCH65s8KGca2FNBxfBfNKox9OFTN3oEAPcYhSx9o="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 69288124e3207..079ad6cd8403f 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "0.12.0-unstable-2024-06-05"; + version = "0.12.0-unstable-2024-06-21"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "49c0ad6369670da574f550aa878ce9f6e1899e74"; - sha256 = "sha256-9kzOIv5FS0+FqgrMD2rtWoX1ZbidOfrh6pOalru8HWo="; + rev = "6d70050261ec3290f3c2e4015438e4910fd430d0"; + sha256 = "sha256-vN1lrFM/ifcMCZfrvfK/MDLYx0qnAMgfBW9UWdyv+MY="; }; sourceRoot = "${src.name}/klippy"; diff --git a/pkgs/servers/mail/mailman/python.nix b/pkgs/servers/mail/mailman/python.nix index 29d2f6c6d36a5..933b8357a33db 100644 --- a/pkgs/servers/mail/mailman/python.nix +++ b/pkgs/servers/mail/mailman/python.nix @@ -28,6 +28,10 @@ python3.override { hash = "sha256-WF3FFrnrBCphnvCjnD19Vf6BvbTfCaUsnN3g0Hvxqn0="; }; }); + + readme-renderer = super.readme-renderer.overridePythonAttrs (_: { + propagatedBuildInputs = [ self.cmarkgfm ]; + }); }) overlay; diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index 3fbbf7f4cbd31..f50d30d3aa04d 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -1,21 +1,24 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "consul-alerts"; version = "0.6.0"; - rev = "v${version}"; - - goPackagePath = "github.com/AcalephStorage/consul-alerts"; - - goDeps = ./deps.nix; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "AcalephStorage"; repo = "consul-alerts"; sha256 = "0836zicv76sd6ljhbbii1mrzh65pch10w3gfa128iynaviksbgn5"; }; + postPatch = '' + go mod init github.com/AcalephStorage/consul-alerts + ''; + + vendorHash = null; + + doCheck = false; + meta = with lib; { mainProgram = "consul-alerts"; description = "Extendable open source continuous integration server"; diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix deleted file mode 100644 index 1b4d0d04fa302..0000000000000 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }: - -with lib; - -buildGoPackage rec { - pname = "reporter"; - version = "2.3.1"; - rev = "v${version}"; - - goPackagePath = "github.com/IzakMarais/reporter"; - - nativeBuildInputs = [ makeWrapper ]; - - src = fetchFromGitHub { - inherit rev; - owner = "IzakMarais"; - repo = "reporter"; - sha256 = "sha256-lsraJwx56I2Gn8CePWUlQu1qdMp78P4xwPzLxetYUcw="; - }; - - postInstall = '' - wrapProgram $out/bin/grafana-reporter \ - --prefix PATH : ${makeBinPath [ tetex ]} - ''; - - meta = { - description = "PDF report generator from a Grafana dashboard"; - mainProgram = "grafana-reporter"; - homepage = "https://github.com/IzakMarais/reporter"; - license = licenses.mit; - maintainers = with maintainers; [ disassembler ]; - }; -} diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index 9e406689c1125..dd4ffa53e65b4 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mtail"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "google"; repo = "mtail"; rev = "v${version}"; - hash = "sha256-zIegPQEzG7qrvS40lDODw0oisZtMN5LnLdZA01K0FQs="; + hash = "sha256-AFSEMc7ZFT3fMupCPIA2nQZXIuJvsMXwsS4/zrJV+wM="; }; vendorHash = "sha256-qn27BYQdYNfR+9w2SBfBzevtOLTm4Q6nwduL13TgmoY="; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index ba1c35ee294d3..1db975f591d98 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -3,6 +3,7 @@ , buildGoModule , fetchFromGitHub , installShellFiles +, nixosTests }: buildGoModule rec { @@ -39,6 +40,8 @@ buildGoModule rec { installShellCompletion amtool.zsh ''; + passthru.tests = { inherit (nixosTests.prometheus) alertmanager; }; + meta = with lib; { description = "Alert dispatcher for the Prometheus monitoring system"; homepage = "https://github.com/prometheus/alertmanager"; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index f7cc47311ef23..9229eb4546a2a 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.52.0"; + version = "2.53.0"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-/HTNDu/msUFLiqbD5ryVPlDOqfAT+8MEGNusmu3xH1w="; + hash = "sha256-oGhVpr47+blG7udu4Pcd+4Ndn0U+R47i69nheauDDoo="; }; in buildGoModule rec { @@ -47,10 +47,10 @@ buildGoModule rec { owner = "prometheus"; repo = "prometheus"; rev = "v${version}"; - hash = "sha256-7HLSSls1aMZ6Zju2F9dArTFsCSESxDxWQ1a0QgD5Nxo="; + hash = "sha256-clI8/P6Gdl8WSK1DsXUj+M9f/h35GX961QtpyvGNxUY="; }; - vendorHash = "sha256-IzYYfB8cvvQAsOqEREVaCe80V3hhhmOEYsl9E9NJq20="; + vendorHash = "sha256-0TR0jFEY+ls8C9EJEhSl2vX5VVZqZ8jGWDUalOddUPM="; excludedPackages = [ "documentation/prometheus-mixin" ]; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index c47019aeada72..cc8e11ade6355 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, prometheus-pushgateway }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests, testers, prometheus-pushgateway }: buildGoModule rec { pname = "pushgateway"; @@ -23,8 +23,11 @@ buildGoModule rec { "-X github.com/prometheus/common/version.BuildDate=19700101-00:00:00" ]; - passthru.tests.version = testers.testVersion { - package = prometheus-pushgateway; + passthru.tests = { + inherit (nixosTests.prometheus) pushgateway; + version = testers.testVersion { + package = prometheus-pushgateway; + }; }; meta = with lib; { diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index d3e797a1c34c4..ce4a75cea75b7 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { passthru = { updateScript = nix-update-script { }; tests = { - inherit (nixosTests) prometheus; + inherit (nixosTests) thanos; version = testers.testVersion { command = "thanos --version"; package = thanos; diff --git a/pkgs/servers/monitoring/vmagent/default.nix b/pkgs/servers/monitoring/vmagent/default.nix deleted file mode 100644 index 1dd054de46bcf..0000000000000 --- a/pkgs/servers/monitoring/vmagent/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: -buildGoModule rec { - pname = "vmagent"; - version = "1.101.0"; - - src = fetchFromGitHub { - owner = "VictoriaMetrics"; - repo = "VictoriaMetrics"; - rev = "v${version}"; - sha256 = "sha256-Jjz/CbVCvc9NFbvzYTFthG8cov4pYpc6y1A1Kmd3Mjg="; - }; - - ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; - - vendorHash = null; - - subPackages = [ "app/vmagent" ]; - - meta = with lib; { - homepage = "https://github.com/VictoriaMetrics/VictoriaMetrics/tree/master/app/vmagent"; - description = "VictoriaMetrics metrics scraper"; - mainProgram = "vmagent"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ nullx76 leona ]; - }; -} diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 3c46db2f34b34..9bd96afbbfc79 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -189,6 +189,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3Plus; homepage = "https://joinpeertube.org/"; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - maintainers = with maintainers; [ immae izorkin mohe2015 stevenroose ]; + maintainers = with maintainers; [ immae izorkin stevenroose ]; }; } diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index a6b2d512f641e..b3d2fe1e69731 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "24.1.7"; + version = "24.1.8"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-+JCFbLWDhqHYYpeNPpcGXL8tNsi4jpGbAd8DGSIsc7A="; + sha256 = "sha256-Eemo1NhRa6CX+fgtNT22zoQqN8Vrrl8mkqhy4zmhJHo="; }; server = callPackage ./server.nix { inherit src version; }; in diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock index b7419052a84bf..321e3053e5363 100644 --- a/pkgs/servers/search/meilisearch/Cargo.lock +++ b/pkgs/servers/search/meilisearch/Cargo.lock @@ -494,7 +494,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "benchmarks" -version = "1.8.2" +version = "1.8.3" dependencies = [ "anyhow", "bytes", @@ -639,7 +639,7 @@ dependencies = [ [[package]] name = "build-info" -version = "1.8.2" +version = "1.8.3" dependencies = [ "anyhow", "time", @@ -1539,7 +1539,7 @@ dependencies = [ [[package]] name = "dump" -version = "1.8.2" +version = "1.8.3" dependencies = [ "anyhow", "big_s", @@ -1787,7 +1787,7 @@ dependencies = [ [[package]] name = "file-store" -version = "1.8.2" +version = "1.8.3" dependencies = [ "faux", "tempfile", @@ -1810,7 +1810,7 @@ dependencies = [ [[package]] name = "filter-parser" -version = "1.8.2" +version = "1.8.3" dependencies = [ "insta", "nom", @@ -1830,7 +1830,7 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "1.8.2" +version = "1.8.3" dependencies = [ "criterion", "serde_json", @@ -1948,7 +1948,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.8.2" +version = "1.8.3" dependencies = [ "arbitrary", "clap", @@ -2442,7 +2442,7 @@ checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" [[package]] name = "index-scheduler" -version = "1.8.2" +version = "1.8.3" dependencies = [ "anyhow", "big_s", @@ -2638,7 +2638,7 @@ dependencies = [ [[package]] name = "json-depth-checker" -version = "1.8.2" +version = "1.8.3" dependencies = [ "criterion", "serde_json", @@ -3275,7 +3275,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.8.2" +version = "1.8.3" dependencies = [ "insta", "md5", @@ -3284,7 +3284,7 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.8.2" +version = "1.8.3" dependencies = [ "actix-cors", "actix-http", @@ -3377,7 +3377,7 @@ dependencies = [ [[package]] name = "meilisearch-auth" -version = "1.8.2" +version = "1.8.3" dependencies = [ "base64 0.21.7", "enum-iterator", @@ -3396,7 +3396,7 @@ dependencies = [ [[package]] name = "meilisearch-types" -version = "1.8.2" +version = "1.8.3" dependencies = [ "actix-web", "anyhow", @@ -3426,7 +3426,7 @@ dependencies = [ [[package]] name = "meilitool" -version = "1.8.2" +version = "1.8.3" dependencies = [ "anyhow", "clap", @@ -3465,7 +3465,7 @@ dependencies = [ [[package]] name = "milli" -version = "1.8.2" +version = "1.8.3" dependencies = [ "arroy", "big_s", @@ -3906,7 +3906,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissive-json-pointer" -version = "1.8.2" +version = "1.8.3" dependencies = [ "big_s", "serde_json", @@ -6074,7 +6074,7 @@ dependencies = [ [[package]] name = "xtask" -version = "1.8.2" +version = "1.8.3" dependencies = [ "anyhow", "build-info", diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 55810cf589975..4a67233194168 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.8.2"; + version = "1.8.3"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "MeiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-x5hHgEhM3iljB7KoJcRoEEZm5bc/lZevT9x/bf2mEMI="; + hash = "sha256-R074dn9kWxHf5loq/K4aLWvrJwpt7YAigNU0YHc0mRg="; }; cargoBuildFlags = [ "--package=meilisearch" ]; diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix index e51bbf5eb528c..c57ef45b3a267 100644 --- a/pkgs/servers/sftpgo/default.nix +++ b/pkgs/servers/sftpgo/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; rev = "refs/tags/v${version}"; - hash = "sha256-HsSBW30qSU3SRyexk2tRjY1FQcBsa70fK3UuT+Gdtm0="; + hash = "sha256-LMZAEr0PVTpn4YY22Lz0IuJfRzvADybNExBrgb1qqQ8="; }; - vendorHash = "sha256-BMwEDsXzk8ExygKreWmtkNvhlg3+YU9KcY1pp+9XffI="; + vendorHash = "sha256-fhS6uq0uEtSBeWFjh4/HqXDcAsYyvp9jtxcDr+s+uAo="; ldflags = [ "-s" diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index f982b97057223..4c534cc2bfe46 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.31.0"; + version = "3.31.1"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-aJqEmSjmfJiFE0vz9fyDvjyvpbQiul+N8LD+j3f70/0="; + hash = "sha256-qcivNJ3CrvToT8CBq5Z/xssP/srTerXJfRGXcvNh2Ag="; }; patches = [ diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 412f8d4de2e91..a7afa073b122d 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "spicedb"; - version = "1.33.0"; + version = "1.33.1"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-DjicS/rrSMcdUkRPOJ5jon2uYVKF+3DkHBvM93v/CmQ="; + hash = "sha256-qEEttgo7OqCEuC+mj2e5HW1IpIl5czxScBmaLiJJuUY="; }; vendorHash = "sha256-pqHDSQQMvfas9yeyhs5cWokBPISQygz2aHf6W5Zc+co="; diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix index 2cafd510c51dd..f408ec0221609 100644 --- a/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/pkgs/servers/sql/mssql/jdbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mssql-jdbc"; - version = "12.6.2"; + version = "12.6.3"; src = fetchurl { url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar"; - sha256 = "sha256-PR6oWlbCLPtVUMspw+DrQ8VhjXu4Mgqlpx9kSKds7S0="; + sha256 = "sha256-Q5XwJ3j6J06DjX2tIVM676tXvKSrBb0W6/EucHpyTI4="; }; dontUnpack = true; diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-std-detect-use-upstream.diff b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-std-detect-use-upstream.diff new file mode 100644 index 0000000000000..bd20cf6619a71 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/0002-std-detect-use-upstream.diff @@ -0,0 +1,25 @@ +diff --git a/Cargo.lock b/Cargo.lock +index a52b978..092bc1d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2788,7 +2788,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] + name = "std_detect" + version = "0.1.5" +-source = "git+https://github.com/tensorchord/stdarch.git?branch=avx512fp16#db0cdbc9b02074bfddabfd23a4a681f21640eada" ++source = "git+https://github.com/rust-lang/stdarch.git?branch=master#d2b1a070afc72d9ba4df80e055109ede5fc0a81f" + dependencies = [ + "cfg-if", + "libc", +diff --git a/crates/detect/Cargo.toml b/crates/detect/Cargo.toml +index b3ac782..c671c6a 100644 +--- a/crates/detect/Cargo.toml ++++ b/crates/detect/Cargo.toml +@@ -4,6 +4,6 @@ version.workspace = true + edition.workspace = true + + [dependencies] +-std_detect = { git = "https://github.com/tensorchord/stdarch.git", branch = "avx512fp16" } ++std_detect = { git = "https://github.com/rust-lang/stdarch.git", branch = "master" } + ctor = "0.2.6" + rustix.workspace = true diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock index a52b9787460e5..092bc1d2e31c8 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/Cargo.lock @@ -2788,7 +2788,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "std_detect" version = "0.1.5" -source = "git+https://github.com/tensorchord/stdarch.git?branch=avx512fp16#db0cdbc9b02074bfddabfd23a4a681f21640eada" +source = "git+https://github.com/rust-lang/stdarch.git?branch=master#d2b1a070afc72d9ba4df80e055109ede5fc0a81f" dependencies = [ "cfg-if", "libc", diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix index 9cbf6ae442e4e..0041c555362bf 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/default.nix @@ -44,6 +44,10 @@ in src = ./0001-read-clang-flags-from-environment.diff; clang = lib.getExe clang; }) + # Fix build failure on rustc 1.78 due to missing feature flag. + # Can (likely) be removed when pgvecto-rs 0.3.0 is released. + # See https://github.com/NixOS/nixpkgs/issues/320131 + ./0002-std-detect-use-upstream.diff ]; src = fetchFromGitHub { @@ -59,7 +63,7 @@ in lockFile = ./Cargo.lock; outputHashes = { "openai_api_rust-0.1.8" = "sha256-os5Y8KIWXJEYEcNzzT57wFPpEXdZ2Uy9W3j5+hJhhR4="; - "std_detect-0.1.5" = "sha256-RwWejfqyGOaeU9zWM4fbb/hiO1wMpxYPKEjLO0rtRmU="; + "std_detect-0.1.5" = "sha256-Rsy8N0pTJ/3AIHjRyeOeyY7Q9Ho46ZcDmJFurCbRxiQ="; }; }; diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 627c64e67b3ef..529deabd48bcd 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -118,7 +118,7 @@ let license = licenses.gpl3Plus; homepage = "https://matomo.org/"; platforms = platforms.all; - maintainers = with maintainers; [ florianjacob kiwi sebbel twey boozedog ] ++ teams.flyingcircus.members; + maintainers = with maintainers; [ florianjacob sebbel twey boozedog ] ++ teams.flyingcircus.members; }; }; in diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index 35cd19636269f..89175e5e5a674 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -4,15 +4,15 @@ , enableActiveSync ? false , libwbxml }: gnustep.stdenv.mkDerivation rec { - pname = "SOGo"; - version = "5.9.1"; + pname = "sogo"; + version = "5.10.0"; # always update the sope package as well, when updating sogo src = fetchFromGitHub { - owner = "inverse-inc"; + owner = "Alinto"; repo = pname; rev = "SOGo-${version}"; - hash = "sha256-b6BZZ61wY0Akt1Q6+Bq6JXAx/67MwBNbzHr3sB0NuRg="; + hash = "sha256-ZmpOI1zk/TkRNFmwTXugVb9IvxYSP4LgNrApSytdI7s="; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ]; @@ -45,7 +45,7 @@ gnustep.stdenv.mkDerivation rec { "--enable-mfa" ]; - env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=int-conversion -Wno-error=implicit-int"; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=int-conversion -Wno-error=implicit-int -Wno-error=return-type"; preFixup = '' # Create gnustep.conf |