diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/home-assistant/default.nix | 12 | ||||
-rw-r--r-- | pkgs/servers/http/trafficserver/default.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/mail/postfix/default.nix | 7 | ||||
-rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/nosql/arangodb/default.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/ursadb/default.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/xmpp/prosody/default.nix | 12 |
7 files changed, 46 insertions, 8 deletions
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ce72bb0f8ed..32273d35e7a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -59,6 +59,18 @@ let }) (self: super: { + hatasmota = super.hatasmota.overridePythonAttrs (oldAttrs: { + version = "0.3.1"; + src = fetchFromGitHub { + owner = "emontnemery"; + repo = "hatasmota"; + rev = "0.3.1"; + sha256 = "sha256-/am6cRhAdiqMq0u7Ed4qhIA+Em2O0gIt7HfP19+2XHw="; + }; + }); + }) + + (self: super: { huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec { version = "1.4.18"; src = fetchFromGitHub { diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix index 9058a4cbda7..06d640a5bc0 100644 --- a/pkgs/servers/http/trafficserver/default.nix +++ b/pkgs/servers/http/trafficserver/default.nix @@ -13,6 +13,7 @@ , python3 , xz , zlib +, catch2 # recommended dependencies , withHwloc ? true , hwloc @@ -113,6 +114,8 @@ stdenv.mkDerivation rec { tools/check-unused-dependencies substituteInPlace configure --replace '/usr/bin/file' '${file}/bin/file' + + cp ${catch2}/include/catch2/catch.hpp tests/include/catch.hpp '' + lib.optionalString stdenv.isLinux '' substituteInPlace configure \ --replace '/usr/include/linux' '${linuxHeaders}/include/linux' diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 08c55f77172..942023b4eaf 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl , coreutils, findutils, gnugrep, gawk, icu, pcre, m4 +, fetchpatch , buildPackages, nixosTests , withLDAP ? true, openldap , withPgSQL ? false, postgresql @@ -46,6 +47,12 @@ in stdenv.mkDerivation rec { ./postfix-3.0-no-warnings.patch ./post-install-script.patch ./relative-symlinks.patch + + # glibc 2.34 compat + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/postfix/raw/2f9d42453e67ebc43f786d98262a249037f80a77/f/postfix-3.6.2-glibc-234-build-fix.patch"; + sha256 = "sha256-xRUL5gaoIt6HagGlhsGwvwrAfYvzMgydsltYMWvl9BI="; + }) ]; postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index e3877265ca3..c541c74d5be 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "grafana"; version = "8.4.5"; - excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; + excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" ]; src = fetchFromGitHub { rev = "v${version}"; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index bf7f7b43960..d9f1892beca 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, openssl, zlib, cmake, python2, perl, snappy, lzo, which }: +{ stdenv, lib, fetchFromGitHub, openssl, zlib, cmake, python2, perl, snappy, lzo, which, catch2, catch }: let common = { version, sha256 }: stdenv.mkDerivation { @@ -26,6 +26,14 @@ let # with nixpkgs, it has no sense to check for a version update substituteInPlace js/client/client.js --replace "require('@arangodb').checkAvailableVersions();" "" substituteInPlace js/server/server.js --replace "require('@arangodb').checkAvailableVersions();" "" + + ${if (lib.versionOlder version "3.4") then '' + cp ${catch}/include/catch/catch.hpp 3rdParty/catch/catch.hpp + '' else if (lib.versionOlder version "3.5") then '' + cp ${catch2}/include/catch2/catch.hpp 3rdParty/catch/catch.hpp + '' else '' + (cd 3rdParty/boost/1.69.0 && patch -p1 < ${../../../development/libraries/boost/pthread-stack-min-fix.patch}) + ''} ''; cmakeFlags = [ diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/servers/ursadb/default.nix index 836a5934d96..c9b39eccd8a 100644 --- a/pkgs/servers/ursadb/default.nix +++ b/pkgs/servers/ursadb/default.nix @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { hash = "sha256-/EK1CKJ0IR7fkKSpQkONbWcz6uhUoAwK430ljNYsV5U="; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace \ + "add_executable(ursadb_test Tests.cpp)" "" \ + --replace \ + "target_link_libraries(ursadb_test ursa)" "" + ''; + installPhase = '' mkdir -p $out/bin cp ursadb $out/bin/ diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 1556250447a..6b70c4cc987 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -72,17 +72,17 @@ stdenv.mkDerivation rec { cp -r $communityModules/mod_${module} $out/lib/prosody/modules/ '') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))} wrapProgram $out/bin/prosody \ - --set LUA_PATH "$luaEnvPath" \ - --set LUA_CPATH "$luaEnvCPath" + --prefix LUA_PATH ';' "$luaEnvPath" \ + --prefix LUA_CPATH ';' "$luaEnvCPath" wrapProgram $out/bin/prosodyctl \ --add-flags '--config "/etc/prosody/prosody.cfg.lua"' \ - --set LUA_PATH "$luaEnvPath" \ - --set LUA_CPATH "$luaEnvCPath" + --prefix LUA_PATH ';' "$luaEnvPath" \ + --prefix LUA_CPATH ';' "$luaEnvCPath" make -C tools/migration install wrapProgram $out/bin/prosody-migrator \ - --set LUA_PATH "$luaEnvPath" \ - --set LUA_CPATH "$luaEnvCPath" + --prefix LUA_PATH ';' "$luaEnvPath" \ + --prefix LUA_CPATH ';' "$luaEnvCPath" ''; passthru = { |