diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/bird/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/komga/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/redpanda/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/periods.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_embedding.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_net.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/pg_repack.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/plv8/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/postgis.nix | 1 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/promscale_extension.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/repmgr.nix | 3 | ||||
-rw-r--r-- | pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/web-apps/galene/default.nix | 6 |
17 files changed, 20 insertions, 29 deletions
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index ecc400e32066..dbf480c401dd 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bird"; - version = "2.14"; + version = "2.15"; src = fetchurl { url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz"; - hash = "sha256-sLn2+FZlQbm+SvHwysZ1xaN4VgGlVmen7D194pc1p4Y="; + hash = "sha256-emRY+kEQnABVMbI+P3q9Y9cACpnRldtJROvMtTntAvA="; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index 994428abb1b8..84d1b958a57b 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.10.3"; + version = "1.10.4"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; - sha256 = "sha256-t/nwqEVrsBeELJLLtizDI737VnODRsuPfQlnDUBfoKc="; + sha256 = "sha256-WKiybcQH+xxBUUbuXrN2u7oIBbQBp34Y1mgJe0u7hiI="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 0a6e690bf385..9b2042113e15 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, sqlite, pkg-config, dovecot, libtool, xapian, icu64 }: stdenv.mkDerivation rec { pname = "dovecot-fts-xapian"; - version = "1.7.6"; + version = "1.7.8"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; rev = version; - sha256 = "sha256-QF+RFw1wNBGKDrNpEEJDPyX1pzKEMeI9Stsco1ivh/4="; + sha256 = "sha256-xhQdEgW/FqzK/OBGq0QVZhEHj/hCnvfV7joEKUsk/Uk="; }; buildInputs = [ dovecot xapian icu64 sqlite ]; diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 5d10e3668dc7..e593b2f57307 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.3.6"; + version = "23.3.7"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-8VkMVbiwQDsYGour9fn0qYXXS/kWnhtARNaGmXVyaIY="; + sha256 = "sha256-z5V9u81skkCBDoYGyC3ThGKI4KhQEdtmBqJSEbBHPF0="; }; server = callPackage ./server.nix { inherit src version; }; in @@ -21,7 +21,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-nXAjtRhiLmzgb6OVerX2liCinstsnxeBBpxSAQoLrjg="; + vendorHash = "sha256-dSCF44F+2GjWD/IcdA4fsfHsjVnX0bCXsG7r6C6ECak="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' diff --git a/pkgs/servers/sql/postgresql/ext/periods.nix b/pkgs/servers/sql/postgresql/ext/periods.nix index 102f80cf8d71..422d6ddaf2b3 100644 --- a/pkgs/servers/sql/postgresql/ext/periods.nix +++ b/pkgs/servers/sql/postgresql/ext/periods.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ivan ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; - broken = versionOlder postgresql.version "9.5"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 51b7d4fd70fa..ad3c6895b2ae 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-OIWykfFbVskrkPG/zSmZtZjc+W956KSfIzK7f5QOqpI="; }; - buildInputs = [ postgresql openssl zlib readline libkrb5 ] - ++ lib.optionals (stdenv.isLinux && lib.versionOlder postgresql.version "13") [ libxcrypt ]; + buildInputs = postgresql.buildInputs ++ [ postgresql ]; installPhase = '' install -D -t $out/bin src/bin/pg_autoctl/pg_autoctl @@ -28,6 +27,5 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.marsam ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; - broken = versionOlder postgresql.version "10"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pg_embedding.nix b/pkgs/servers/sql/postgresql/ext/pg_embedding.nix index a39dcd537275..e858d6f0c5d0 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_embedding.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_embedding.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ivan ]; platforms = postgresql.meta.platforms; license = licenses.asl20; - broken = versionOlder postgresql.version "12"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix index 8ef3182ebeb6..a86f53eeef05 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_net.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix @@ -30,6 +30,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; - broken = versionOlder postgresql.version "12"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix index e29918373c77..c265ae39ca46 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "pg_repack"; version = "1.5.0"; - buildInputs = [ postgresql openssl zlib readline ]; + buildInputs = postgresql.buildInputs ++ [ postgresql ]; src = fetchFromGitHub { owner = "reorg"; diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 9e8b02c993f2..c2c974a8d872 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/okbob/plpgsql_check/releases/tag/v${version}"; platforms = postgresql.meta.platforms; license = licenses.mit; - broken = versionOlder postgresql.version "12"; maintainers = [ maintainers.marsam ]; }; } diff --git a/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch b/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch index 74e4eb1922de..05f607911f20 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch +++ b/pkgs/servers/sql/postgresql/ext/plv8/0001-build-Allow-using-V8-from-system.patch @@ -5,7 +5,7 @@ index 38879cc..6e78eeb 100644 @@ -20,6 +20,7 @@ OBJS = $(SRCS:.cc=.o) MODULE_big = plv8-$(PLV8_VERSION) EXTENSION = plv8 - PLV8_DATA = plv8.control plv8--$(PLV8_VERSION).sql $(wildcard upgrade/*.sql) + PLV8_DATA = plv8.control plv8--$(PLV8_VERSION).sql +USE_SYSTEM_V8 = 0 diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix index 2c4989711cce..241aa610c8f9 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plv8"; - version = "3.1.5"; + version = "3.1.10"; src = fetchFromGitHub { owner = "plv8"; repo = "plv8"; rev = "v${finalAttrs.version}"; - hash = "sha256-LodC2eQJSm5fLckrjm2RuejZhmOyQMJTv9b0iPCnzKQ="; + hash = "sha256-g1A/XPC0dX2360Gzvmo9/FSQnM6Wt2K4eR0pH0p9fz4="; }; patches = [ diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index f044790c9660..a493048bbc80 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -81,6 +81,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; teams.geospatial.members ++ [ marcweber ]; inherit (postgresql.meta) platforms; - broken = versionOlder postgresql.version "12"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/promscale_extension.nix b/pkgs/servers/sql/postgresql/ext/promscale_extension.nix index e031bb4c021b..80de9315d985 100644 --- a/pkgs/servers/sql/postgresql/ext/promscale_extension.nix +++ b/pkgs/servers/sql/postgresql/ext/promscale_extension.nix @@ -54,7 +54,6 @@ buildPgxExtension rec { license = licenses.unfree; # as it needs to be used with timescaledb, simply use the condition from there - broken = versionOlder postgresql.version "12" - || versionAtLeast postgresql.version "15"; + broken = versionAtLeast postgresql.version "15"; }; } diff --git a/pkgs/servers/sql/postgresql/ext/repmgr.nix b/pkgs/servers/sql/postgresql/ext/repmgr.nix index 93f607671579..e4e8c5afdb24 100644 --- a/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -24,8 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex ]; - buildInputs = [ postgresql openssl zlib readline curl json_c ] - ++ lib.optionals (stdenv.isLinux && lib.versionOlder postgresql.version "13") [ libxcrypt ]; + buildInputs = postgresql.buildInputs ++ [ postgresql curl json_c ]; installPhase = '' mkdir -p $out/{bin,lib,share/postgresql/extension} diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index 4f0e02059adf..77dd41db7f6d 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix @@ -62,6 +62,6 @@ in license = licenses.asl20; # as it needs to be used with timescaledb, simply use the condition from there - broken = versionOlder postgresql.version "12" || stdenv.isDarwin; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index f66d57d22bfd..73503242378a 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "galene"; - version = "0.8"; + version = "0.8.1"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - hash = "sha256-UWh55+9+5s31VwRb7oOzOPKv9Ew7AxsOjWXaFRxuans="; + hash = "sha256-CeyxeZPvClKxjEU5GYqZzV2SCyHNAktHNQbmN9wUa+4="; }; - vendorHash = "sha256-MEO6ktMrpvuWBPBgpBRAuIrup4Zc8IQKoJ/6JEnD6+U="; + vendorHash = "sha256-NT6bNVoh26I4z/QUSJWwF5YDuzf3LUc/7OQgtslc4ME="; ldflags = [ "-s" "-w" ]; preCheck = "export TZ=UTC"; |