diff options
Diffstat (limited to 'pkgs/servers')
25 files changed, 197 insertions, 61 deletions
diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 434aeeb3a198a..c6d66427ab20f 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -12,8 +12,6 @@ let meta = with lib; { homepage = "https://qpid.apache.org"; - repositories.git = "git://git.apache.org/qpid.git"; - repositories.svn = "http://svn.apache.org/repos/asf/qpid"; description = "An AMQP message broker and a C++ messaging API"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/servers/dict/wiktionary/default.nix b/pkgs/servers/dict/wiktionary/default.nix index 98e2230104804..9ebbfb7673918 100644 --- a/pkgs/servers/dict/wiktionary/default.nix +++ b/pkgs/servers/dict/wiktionary/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dict-db-wiktionary"; - version = "20210920"; + version = "20220301"; src = fetchurl { url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; - sha256 = "UeufbpSpRL+JrU3SkhxzWJncEsrM1es88grRmFwGABk="; + sha256 = "Gobilm9Rlb7qtZU+hlsYOl1/BAjj/MtNp5z2GQx8NN8="; }; # script in nixpkgs does not support python2 diff --git a/pkgs/servers/dns/https-dns-proxy/default.nix b/pkgs/servers/dns/https-dns-proxy/default.nix index c32d3eca22637..5e2efae8a2878 100644 --- a/pkgs/servers/dns/https-dns-proxy/default.nix +++ b/pkgs/servers/dns/https-dns-proxy/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "https-dns-proxy"; # there are no stable releases (yet?) - version = "unstable-20200419"; + version = "unstable-2021-03-29"; src = fetchFromGitHub { owner = "aarond10"; repo = "https_dns_proxy"; - rev = "79fc7b085e3b1ad64c8332f7115dfe2bf5f1f3e4"; - sha256 = "1cdfswfjby4alp6gy7yyjm76kfyclh5ax0zadnqs2pyigg9plh0b"; + rev = "bbd9ef272dcda3ead515871f594768af13192af7"; + sha256 = "sha256-r+IpDklI3vITK8ZlZvIFm3JdDe2r8DK2ND3n1a/ThrM="; }; nativeBuildInputs = [ cmake gtest ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7f765eb9fd8d2..53d1cb6b836d3 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 = "2022.3.5"; + version = "2022.3.6"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9e7fc76e4e3ff..94899c7a81f8e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -164,7 +164,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.3.5"; + hassVersion = "2022.3.6"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -182,7 +182,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-VXE2zQH/HHhogo5qjneC0zlo9892wgGN1qd3ZFKfyqw="; + hash = "sha256-Cw3OLUDHkbGsxY3gQaAXcfoKeh5udODS8vVlT0Qta9Y="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index 4a6adb2b024a1..75282ad15c4f0 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.9.6"; + version = "2.10.0"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "sha256:1kcn1kkhm8fkwhjqmpysd2hvnrvh6bka8r67yq8d58m117l9wnpq"; + sha256 = "sha256:0fhhq6mzpwj3dh6w583n4sngshf15dm8zgbli5cacy7jkzmsz0wn"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix index 7e67e645be911..e9075d7d043a4 100644 --- a/pkgs/servers/icingaweb2/ipl.nix +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2-ipl"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Icinga"; repo = "icinga-php-library"; rev = "v${version}"; - sha256 = "sha256:118bg9mxjxajm2ydbycgqdmdx8przwxblsaxc373r0g1dp1lv0fz"; + sha256 = "sha256:05k0qcd5c5xb124dpp6lvfdh4dzf6bkd34v4sy7aj776p4hrlqx2"; }; installPhase = '' diff --git a/pkgs/servers/keycloak/all-plugins.nix b/pkgs/servers/keycloak/all-plugins.nix new file mode 100644 index 0000000000000..4dbd248726314 --- /dev/null +++ b/pkgs/servers/keycloak/all-plugins.nix @@ -0,0 +1,7 @@ +{ callPackage }: + +{ + scim-for-keycloak = callPackage ./scim-for-keycloak {}; + keycloak-discord = callPackage ./keycloak-discord {}; + keycloak-metrics-spi = callPackage ./keycloak-metrics-spi {}; +} diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 9d8a2b31bf127..d9797de6d174e 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchzip, makeWrapper, jre, writeText, nixosTests , postgresql_jdbc ? null, mysql_jdbc ? null +, callPackage }: let @@ -50,12 +51,17 @@ stdenv.mkDerivation rec { ln -s ${mkModuleXml "com.mysql" "mysql-connector-java.jar"} $module_path/com/mysql/main/module.xml ''} - wrapProgram $out/bin/standalone.sh --set JAVA_HOME ${jre} - wrapProgram $out/bin/add-user-keycloak.sh --set JAVA_HOME ${jre} - wrapProgram $out/bin/jboss-cli.sh --set JAVA_HOME ${jre} + for script in add-user-keycloak.sh add-user.sh domain.sh elytron-tool.sh jboss-cli.sh jconsole.sh jdr.sh standalone.sh wsconsume.sh wsprovide.sh; do + wrapProgram $out/bin/$script --set JAVA_HOME ${jre} + done + wrapProgram $out/bin/kcadm.sh --prefix PATH : ${jre}/bin + wrapProgram $out/bin/kcreg.sh --prefix PATH : ${jre}/bin ''; - passthru.tests = nixosTests.keycloak; + passthru = { + tests = nixosTests.keycloak; + plugins = callPackage ./all-plugins.nix {}; + }; meta = with lib; { homepage = "https://www.keycloak.org/"; diff --git a/pkgs/servers/keycloak/keycloak-discord/default.nix b/pkgs/servers/keycloak/keycloak-discord/default.nix new file mode 100644 index 0000000000000..047bc67fbc564 --- /dev/null +++ b/pkgs/servers/keycloak/keycloak-discord/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, lib +, fetchurl +}: + +stdenv.mkDerivation rec { + pname = "keycloak-discord"; + version = "0.3.1"; + + src = fetchurl { + url = "https://github.com/wadahiro/keycloak-discord/releases/download/v${version}/keycloak-discord-ear-${version}.ear"; + sha256 = "0fswhbnxc80dpfqf5y6j29dxk3vcnm4kki6qdk22qliasvpw5n9c"; + }; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + mkdir -p "$out" + install "$src" "$out/${pname}-ear-${version}.ear" + ''; + + meta = with lib; { + homepage = "https://github.com/wadahiro/keycloak-discord"; + description = "Keycloak Social Login extension for Discord"; + license = licenses.apsl20; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix new file mode 100644 index 0000000000000..b5e23d0fe22dd --- /dev/null +++ b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchurl }: + +stdenv.mkDerivation rec { + pname = "keycloak-metrics-spi"; + version = "2.5.3"; + + src = fetchurl { + url = "https://github.com/aerogear/keycloak-metrics-spi/releases/download/${version}/keycloak-metrics-spi-${version}.jar"; + sha256 = "15lsy8wjw6nlfdfhllc45z9l5474p0lsghrwzzsssvd68bw54gwv"; + }; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out + install "$src" "$out" + ''; + + meta = with lib; { + homepage = "https://github.com/aerogear/keycloak-metrics-spi"; + description = "Keycloak Service Provider that adds a metrics endpoint"; + license = licenses.apsl20; + maintainers = with maintainers; [ benley ]; + }; +} diff --git a/pkgs/servers/keycloak/scim-for-keycloak/default.nix b/pkgs/servers/keycloak/scim-for-keycloak/default.nix new file mode 100644 index 0000000000000..1ef06061326e3 --- /dev/null +++ b/pkgs/servers/keycloak/scim-for-keycloak/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, maven +, javaPackages +}: + +javaPackages.mavenfod rec { + pname = "scim-for-keycloak"; + version = "kc-15-b2"; # When updating also update mvnHash + + src = fetchFromGitHub { + owner = "Captain-P-Goldfish"; + repo = "scim-for-keycloak"; + rev = version; + sha256 = "K34c7xISjEETI3jFkRLdZ0C8pZHTWtPtrrIzwC76Tv0="; + }; + + mvnHash = "sha256-kDYhXTEOAWH/dcRJalKtbwBpoxcD1aX9eqcRKs6ewbE="; + + nativeBuildInputs = [ + maven + ]; + + installPhase = '' + EAR=$(find -iname "*.ear") + install -D "$EAR" "$out/$(basename $EAR)" + ''; + + meta = with lib; { + homepage = "https://github.com/Captain-P-Goldfish/scim-for-keycloak"; + description = "A third party module that extends Keycloak with SCIM functionality"; + license = licenses.bsd3; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index e2932c16a1092..490bb9c9e094e 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/klipper cp -r ./* $out/lib/klipper + # Moonraker expects `config_examples` and `docs` to be available + # under `klipper_path` + cp -r $src/docs $out/lib/docs + cp -r $src/config $out/lib/config + chmod 755 $out/lib/klipper/klippy.py runHook postInstall ''; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 824e90b4869f7..4461930b13cc9 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A distributed memory object caching system"; - repositories.git = "https://github.com/memcached/memcached.git"; homepage = "http://memcached.org/"; license = licenses.bsd3; maintainers = [ maintainers.coconnor ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 9823ee5dddd38..afa537bddd46c 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-03-17T06-34-49Z"; + version = "2022-03-22T02-05-10Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-iHwFkxfSLrtzSiOmfVFggBvfL0SL6ZLVJWMGK3RHZGU="; + sha256 = "sha256-N0ua+XHkLr33PElSdOzVQF3POPU+lx4/M6LJzxtkisI="; }; - vendorSha256 = "sha256-ujkrbP7FuL7jdYTRaGMEYha1BJKJnpCssuO47XGMBGo="; + vendorSha256 = "sha256-Ql3J2r489Hzhy6E9uZwQXJIw/njb5oafCYjOyWGzbXs="; doCheck = false; diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index da235ff96fb23..2349bac177c9f 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "blackbox_exporter"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "1lrabbp6nsd9h3hs3y5a37yl4g8zzkv0m3vhz2vrir3wmfn07n4g"; + sha256 = "sha256-Y3HdFIChkQVooxy2I2Gbqw3WLHsI4Zm+osHTzFluRZA="; }; - vendorSha256 = "1wi9dmbxb6i1qglnp1v0lkqpp7l29lrbsg4lvx052nkcwkgq8g1y"; + vendorSha256 = "sha256-KFLR0In4txQQp5dt8P0yAFtf82b4SBq2xMnlz+vMuuU="; # dns-lookup is performed for the tests doCheck = false; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 7d40e919773d1..0da2bb604a0b1 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -1,4 +1,7 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests + # darwin + , CoreFoundation, IOKit +}: buildGoModule rec { pname = "node_exporter"; @@ -17,6 +20,13 @@ buildGoModule rec { # FIXME: tests fail due to read-only nix store doCheck = false; + buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation IOKit ]; + # upstream currently doesn't work with the version of the macOS SDK + # we're building against in nix-darwin without a patch. + # this patch has been submitted upstream at https://github.com/prometheus/node_exporter/pull/2327 + # and only needs to be carried until it lands in a new release. + patches = lib.optionals stdenv.isDarwin [ ./node-exporter/node-exporter-darwin.patch ]; + excludedPackages = [ "docs/node-mixin" ]; ldflags = [ diff --git a/pkgs/servers/monitoring/prometheus/node-exporter/node-exporter-darwin.patch b/pkgs/servers/monitoring/prometheus/node-exporter/node-exporter-darwin.patch new file mode 100644 index 0000000000000..8077bbc47511e --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/node-exporter/node-exporter-darwin.patch @@ -0,0 +1,17 @@ +diff --git a/collector/powersupplyclass_darwin.go b/collector/powersupplyclass_darwin.go +index a070f64..01d7f18 100644 +--- a/collector/powersupplyclass_darwin.go ++++ b/collector/powersupplyclass_darwin.go +@@ -18,9 +18,11 @@ package collector + + /* + #cgo LDFLAGS: -framework IOKit -framework CoreFoundation ++#include <CoreFoundation/CFNumber.h> ++#include <CoreFoundation/CFRunLoop.h> ++#include <CoreFoundation/CFString.h> + #include <IOKit/ps/IOPowerSources.h> + #include <IOKit/ps/IOPSKeys.h> +-#include <CoreFoundation/CFArray.h> + + // values collected from IOKit Power Source APIs + // Functions documentation available at diff --git a/pkgs/servers/moonraker/default.nix b/pkgs/servers/moonraker/default.nix index 31525464c0cc3..2350cd18042a1 100644 --- a/pkgs/servers/moonraker/default.nix +++ b/pkgs/servers/moonraker/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater }: +{ lib, stdenvNoCC, fetchFromGitHub, python3, makeWrapper, unstableGitUpdater, nixosTests }: let pythonEnv = python3.withPackages (packages: with packages; [ tornado - pyserial + pyserial-asyncio pillow lmdb streaming-form-data @@ -12,16 +12,21 @@ let libnacl paho-mqtt pycurl + zeroconf + preprocess-cancellation + jinja2 + dbus-next + apprise ]); in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "unstable-2021-12-05"; + version = "unstable-2022-03-10"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "ac73036857cc1ca83df072dd94bf28eb9d0ed8b0"; - sha256 = "Oqjt0z4grt+hdQ4t7KQSwkkCeRGoFFedJsTpMHwMm34="; + rev = "ee312ee9c6597c8d077d7c3208ccea4e696c97ca"; + sha256 = "l0VOQIfKgZ/Je4z+SKhWMgYzxye8WKs9W1GkNs7kABo="; }; nativeBuildInputs = [ makeWrapper ]; @@ -34,7 +39,10 @@ in stdenvNoCC.mkDerivation rec { --add-flags "$out/lib/moonraker/moonraker.py" ''; - passthru.updateScript = unstableGitUpdater { url = meta.homepage; }; + passthru = { + updateScript = unstableGitUpdater { url = meta.homepage; }; + tests.moonraker = nixosTests.moonraker; + }; meta = with lib; { description = "API web server for Klipper"; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index d9a4465a10a45..92e8d6ff5d21e 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -46,13 +46,13 @@ in { ''; nextcloud22 = generic { - version = "22.2.5"; - sha256 = "sha256-gb5N0u5tu4/nI2xIpjXwm2hiSDCrBhIDyN6gKGOsdS8="; + version = "22.2.6"; + sha256 = "0f1d0f0cb000c51b11886be25a8adce478846c3233572fcf28b44c5d4036e235"; }; nextcloud23 = generic { - version = "23.0.2"; - sha256 = "sha256-ngJGLTjqq2RX/KgHe9Rv54w6qtRC6RpuEuMvp9UbxO4="; + version = "23.0.3"; + sha256 = "39401d400fab02a84a175ea6e995b8ed4110fbaea48c876230b4f09755a62986"; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index aec7178281e33..861d66b3d04f3 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.25.7.5604-980a13e02"; + version = "1.25.8.5663-e071c3d62"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - hash = "sha256-X0KaaX5NvF04pyRHSUeHtXQ+OTv9BK0bzDl1J5C6Vts="; + hash = "sha256-w9k8phyiA/sK+zRlK8PAciebt5UJvmVFA+cfx4r78Gs="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - hash = "sha256-tqpOQDdHBl55jSyonNV7/UjCcx6jY9VdAzh/zBA/CAs="; + hash = "sha256-baOofe+7PZfLhwIXrB1ibKkkEJRVivgGHDN4phlg57Q="; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/sql/patroni/default.nix b/pkgs/servers/sql/patroni/default.nix index 846e61a5b4649..abf84d4bc6688 100644 --- a/pkgs/servers/sql/patroni/default.nix +++ b/pkgs/servers/sql/patroni/default.nix @@ -5,13 +5,13 @@ pythonPackages.buildPythonApplication rec { pname = "patroni"; - version = "2.0.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "zalando"; repo = pname; rev = "v${version}"; - sha256 = "048g211njwmgl2v7nx6x5x82b4bbp35n234z7ah10aybm3yrxnc7"; + sha256 = "sha256-cBkiBrty/6A3rIv9A1oh8GvPjwxhHwYEKuDIsNzHw1g="; }; # cdiff renamed to ydiff; remove when patroni source reflects this. diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index dae9d21c7f507..70b9c869f1162 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchurl, perl, openldap, pam, db, cyrus_sasl, libcap -, expat, libxml2, openssl, pkg-config +, expat, libxml2, openssl, pkg-config, systemd }: stdenv.mkDerivation rec { pname = "squid"; - version = "4.17"; + version = "5.4.1"; src = fetchurl { - url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz"; - sha256 = "sha256-y5KKwIx8hrFRscj4J6vhqE2DGBoqhuDVEihhY+HjFBg="; + url = "http://www.squid-cache.org/Versions/v5/${pname}-${version}.tar.xz"; + sha256 = "sha256-300xCpFmOuWcKbD4GD8iYjxeb3MYaa95OAWYerlMpBw="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl openldap db cyrus_sasl expat libxml2 openssl - ] ++ lib.optionals stdenv.isLinux [ libcap pam ]; + ] ++ lib.optionals stdenv.isLinux [ libcap pam systemd ]; configureFlags = [ "--enable-ipv6" @@ -26,7 +26,9 @@ stdenv.mkDerivation rec { "--enable-removal-policies=lru,heap" "--enable-delay-pools" "--enable-x-accelerator-vary" - ] ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "--enable-linux-netfilter"; + "--enable-htcp" + ] ++ lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isMusl) + "--enable-linux-netfilter"; meta = with lib; { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 7d52b3a0a2665..31884fd802236 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -51,15 +51,8 @@ in version = "6.0.10"; sha256 = "1sr60wg5mzjb14y75cga836f19sbmmpgh13mwc4alyg3irsbz1bb"; }; - varnish70 = (common { - version = "7.0.2"; - sha256 = "0q9z1iilqwbh5flfy9pl18kxv0yjs5z91c4j81z5pgyjd9d4jjjj"; - }).overrideAttrs (oA: { - patches = [ - (fetchpatch { - url = "https://github.com/varnishcache/varnish-cache/commit/20e007a5b17c1f68f70ab42080de384f9e192900.patch"; - sha256 = "0vvihbjknb0skdv2ksn2lz89pwmn4f2rjmb6q65cvgnnjfj46s82"; - }) - ]; - }); + varnish71 = common { + version = "7.1.0"; + sha256 = "1flyqr212jamqpwafdil170vc966r1mbb7n3ngjn8xk6hn3bhjpm"; + }; } diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix index 257b421112ed5..60141b1382965 100644 --- a/pkgs/servers/varnish/packages.nix +++ b/pkgs/servers/varnish/packages.nix @@ -1,4 +1,4 @@ -{ callPackages, callPackage, varnish60, varnish70, fetchFromGitHub }: { +{ callPackages, callPackage, varnish60, varnish71, fetchFromGitHub }: { varnish60Packages = rec { varnish = varnish60; modules = (callPackages ./modules.nix { inherit varnish; }).modules15; @@ -13,8 +13,8 @@ sha256 = "1n94slrm6vn3hpymfkla03gw9603jajclg84bjhwb8kxsk3rxpmk"; }; }; - varnish70Packages = rec { - varnish = varnish70; + varnish71Packages = rec { + varnish = varnish71; modules = (callPackages ./modules.nix { inherit varnish; }).modules19; digest = callPackage ./digest.nix { inherit varnish; |