diff options
Diffstat (limited to 'pkgs/servers')
33 files changed, 114 insertions, 237 deletions
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 629842669388e..db112aad6038f 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -11,6 +11,7 @@ , nixosTests , darwin , findutils +, libiconv , rustSupport ? true @@ -28,15 +29,15 @@ let else llvmPackages.stdenv).mkDerivation; in mkDerivation rec { pname = "clickhouse"; - version = "23.11.1.2711"; + version = "24.3.2.23"; src = fetchFromGitHub rec { owner = "ClickHouse"; repo = "ClickHouse"; - rev = "v${version}-stable"; + rev = "v${version}-lts"; fetchSubmodules = true; name = "clickhouse-${rev}.tar.gz"; - hash = "sha256-xRg9NzUkjTbR2Lp6DgDzcUp2Hrc4sfgkot7KxPw2Uy8="; + hash = "sha256-2OdlePEFJu4k2ysSPqa3kwsPgVRIlaU1B80LmU5w0yQ="; postFetch = '' # delete files that make the source too big rm -rf $out/contrib/llvm-project/llvm/test @@ -95,6 +96,8 @@ in mkDerivation rec { rustPlatform.cargoSetupHook ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + # their vendored version is too old and missing this patch: https://github.com/corrosion-rs/corrosion/pull/205 corrosionSrc = if rustSupport then fetchFromGitHub { owner = "corrosion-rs"; @@ -112,7 +115,7 @@ in mkDerivation rec { inherit src; name = "rust-deps"; preBuild = "cd rust"; - hash = "sha256-fWDAGm19b7uZv8aBdBoieY5c6POd8IxFXbGdtONpZbw="; + hash = "sha256-rbEfCRB2QAZ2WBgSLYYUqeYtI4Y5d9oQ2G8/mPirIp4="; } else null; dontCargoSetupPostUnpack = true; @@ -177,10 +180,13 @@ in mkDerivation rec { "-DENABLE_EMBEDDED_COMPILER=ON" ]; - env = lib.optionalAttrs stdenv.isDarwin { - # Silence ``-Wimplicit-const-int-float-conversion` error in MemoryTracker.cpp and - # ``-Wno-unneeded-internal-declaration` TreeOptimizer.cpp. - NIX_CFLAGS_COMPILE = "-Wno-implicit-const-int-float-conversion -Wno-unneeded-internal-declaration"; + env = { + NIX_CFLAGS_COMPILE = + # undefined reference to '__sync_val_compare_and_swap_16' + lib.optionalString stdenv.isx86_64 " -mcx16" + + # Silence ``-Wimplicit-const-int-float-conversion` error in MemoryTracker.cpp and + # ``-Wno-unneeded-internal-declaration` TreeOptimizer.cpp. + lib.optionalString stdenv.isDarwin " -Wno-implicit-const-int-float-conversion -Wno-unneeded-internal-declaration"; }; # https://github.com/ClickHouse/ClickHouse/issues/49988 @@ -206,7 +212,7 @@ in mkDerivation rec { homepage = "https://clickhouse.com"; description = "Column-oriented database management system"; license = licenses.asl20; - maintainers = with maintainers; [ orivej ]; + maintainers = with maintainers; [ orivej mbalatsko ]; # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685 platforms = lib.filter (x: (lib.systems.elaborate x).is64bit) (platforms.linux ++ platforms.darwin); diff --git a/pkgs/servers/etcd/3.5/default.nix b/pkgs/servers/etcd/3.5/default.nix index 43f47aa0eaa15..2cd6cdefcb8c0 100644 --- a/pkgs/servers/etcd/3.5/default.nix +++ b/pkgs/servers/etcd/3.5/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub, symlinkJoin, nixosTests, k3s }: let - version = "3.5.12"; - etcdSrcHash = "sha256-Z2WXNzFJYfRQCldUspQjUR5NyUzCCINycuEXWaTn4vU="; - etcdServerVendorHash = "sha256-S5cEIV4hKRjn9JFEKWBiSEPytHtVacsSnG6T8dofgyk="; - etcdUtlVendorHash = "sha256-Vgp44Kg6zUDYVJU6SiYd8ZEcAWqKPPTsqYafcfk89Cc="; - etcdCtlVendorHash = "sha256-PZLsekZzwlGzccCirNk9uUj70Ue5LMDs6LMWBI9yivs="; + version = "3.5.13"; + etcdSrcHash = "sha256-6dQXgM6VEWwv5CfHvxxPxdhMwNjFsinwhsbSqvQoDxI="; + etcdServerVendorHash = "sha256-PB4gACfeYhdOXYs0xbcq2CmSMJnf/ifX2U2DN6zfJ1o="; + etcdUtlVendorHash = "sha256-f23mn4zE6beM8yPSbs9gEEEifyF2D+CVKdlYwQtzAkQ="; + etcdCtlVendorHash = "sha256-gSlyhmLKarDwc+MhYuTeTqwj0wLiN6+k2bHEVVTkyPc="; src = fetchFromGitHub { owner = "etcd-io"; diff --git a/pkgs/servers/frr/clippy-helper.nix b/pkgs/servers/frr/clippy-helper.nix index bb5887bda0f3a..c2b4b918ceca5 100644 --- a/pkgs/servers/frr/clippy-helper.nix +++ b/pkgs/servers/frr/clippy-helper.nix @@ -8,7 +8,7 @@ , flex , bison , pkg-config -, libelf +, elfutils , perl , python3 @@ -29,8 +29,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libelf python3 + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ + elfutils ]; configureFlags = [ diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index d588fee004838..d4adb5ed34faa 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -16,7 +16,7 @@ , c-ares , json_c , libcap -, libelf +, elfutils , libunwind , libyang , net-snmp @@ -118,7 +118,6 @@ stdenv.mkDerivation rec { buildInputs = [ c-ares json_c - libelf libunwind libyang openssl @@ -132,6 +131,8 @@ stdenv.mkDerivation rec { libcap ] ++ lib.optionals snmpSupport [ net-snmp + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ + elfutils ]; # otherwise in cross-compilation: "configure: error: no working python version found" diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 27cfd755bcdd2..b3d499415dde4 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre2, libiconv, lynx, which, libxcrypt -, fetchpatch , nixosTests , proxySupport ? true , sslSupport ? true, openssl @@ -13,11 +12,11 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.58"; + version = "2.4.59"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "sha256-+hbXKgeCEKVMR91b7y+Lm4oB2UkJpRRTlWs+xkQupMU="; + hash = "sha256-7FFQHsSAKE/1L2NyWBNdMzIwp9Ipw6+m9sL5BA4yEyM="; }; # FIXME: -dev depends on -doc @@ -36,20 +35,6 @@ stdenv.mkDerivation rec { lib.optional http2Support nghttp2 ++ lib.optional stdenv.isDarwin libiconv; - patches = lib.optionals modTlsSupport [ - (fetchpatch { - name = "compat-with-rustls-ffi-0.10.0.patch"; - url = "https://github.com/apache/httpd/commit/918620a183d843fb393ed939423a25d42c1044ec.patch"; - hash = "sha256-YZi3t++hjM0skisax2xuh9DifZVZjCjVn6XQr6QKGEs="; - }) - ] ++ lib.optionals libxml2Support [ - (fetchpatch { - name = "compat-with-libxml2-2.12.patch"; - url = "https://github.com/apache/httpd/commit/27a68e54b7c6d2ae80dca396fd2727852897dab1.patch"; - hash = "sha256-k2EqCaDkckrXLsHnjP4h+b1brTnde4pUyrbOiPFB6qk="; - }) - ]; - postPatch = '' sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|' diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index a8af63754277a..2fe617dea43b0 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.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Bqb4UO4R5CnV8+2OthGrEVORzH+k+zgzI4UsvwRHgk8="; + sha256 = "sha256-BS6ErS2Wi8pOy8oFmVnbujYPwClxX8e+GL4CcqvOL9E="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix index 3efaae6301989..1760a41777df5 100644 --- a/pkgs/servers/mesos-dns/default.nix +++ b/pkgs/servers/mesos-dns/default.nix @@ -1,22 +1,28 @@ -{ buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "mesos-dns"; - version = "0.1.2"; - rev = "v${version}"; - - goPackagePath = "github.com/mesosphere/mesos-dns"; - - # Avoid including the benchmarking test helper in the output: - subPackages = [ "." ]; + version = "0.9.0"; src = fetchFromGitHub { - inherit rev; - owner = "mesosphere"; + owner = "m3scluster"; repo = "mesos-dns"; - sha256 = "0zs6lcgk43j7jp370qnii7n55cd9pa8gl56r8hy4nagfvlvrcm02"; + rev = "v${version}"; + hash = "sha256-lURD0WAHC4klRdV6/YhKNtXh03zcVuDzTj/LvKYomLk="; }; - goDeps = ./deps.nix; - meta.mainProgram = "mesos-dns"; + vendorHash = "sha256-OILARWv9CDQEzzn7He/P8Z2Ug7m05AqOndoeM1sUpII="; + + subPackages = [ "." ]; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + homepage = "https://m3scluster.github.io/mesos-dns/"; + changelog = "https://github.com/m3scluster/mesos-dns/releases/tag/v${version}"; + description = "DNS-based service discovery for Mesos"; + license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "mesos-dns"; + }; } diff --git a/pkgs/servers/mesos-dns/deps.nix b/pkgs/servers/mesos-dns/deps.nix deleted file mode 100644 index 00f0f245f6b36..0000000000000 --- a/pkgs/servers/mesos-dns/deps.nix +++ /dev/null @@ -1,101 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; - sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "7883e1468d48d969e1c3ce4bcde89b6a7dd4adc4"; - sha256 = "16ja7lqq96q0pnzgnbwnh0j8qzvqgns1nfk8ndxgkg4sg93bg372"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "fca8c8854093a154ff1eb580aae10276ad6b1b5f"; - sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"; - }; - } - { - goPackagePath = "github.com/mesos/mesos-go"; - fetch = { - type = "git"; - url = "https://github.com/mesos/mesos-go"; - rev = "aaa5b2fecf0e2db463f4f996c89617d6766b2969"; - sha256 = "1pk1fpxksjln6kqvgm1igw3582jgrn14fwa8bdj5cwbpy6skjdvk"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; - sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; - }; - } - { - goPackagePath = "github.com/samuel/go-zookeeper"; - fetch = { - type = "git"; - url = "https://github.com/samuel/go-zookeeper"; - rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4"; - sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "cbeaeb16a013161a98496fad62933b1d21786672"; - sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d"; - sha256 = "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful"; - rev = "892402ba11a2e2fd5e1295dd633481f27365f14d"; - sha256 = "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "089c7181b8c728499929ff09b62d3fdd8df8adff"; - sha256 = "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p"; - }; - } -] diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index d35d0e6c259df..c75b4854daa55 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.49.1"; + version = "0.49.2"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-oyh25h59udfwuLqZJ4ngGYL+tup9GEWgegcTNb0PeHE="; + hash = "sha256-PmfzYPnfIFX92I0tnXJoZa3EdOF7EFo5bc0T9bo4bS0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 0ce2189568cb6..7830d309b082d 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { inherit version; pname = "meteor"; - src = srcs.${system}; + src = srcs.${system} or (throw "unsupported system ${system}"); #dontStrip = true; diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 48003cae46935..cd0f6bbd4ac43 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.24.0"; + version = "3.25.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-JGgkhNSKprqaUBaW+m/5vYnuDri1Ibyf2Y6SMlscnIU="; + hash = "sha256-cb4FYsYMkrna/1IjPlEglAmeQ/vfbUiaTb5OjrWiYR4="; }; - vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8="; + vendorHash = "sha256-fB/PjOO3+/RVQ5DGAHx4O8wAb9p+RdDC9+xkTCefP8A="; postConfigure = '' export CGO_ENABLED=0 diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index c939c145c46e6..7b1763c93446f 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: buildGoModule rec { pname = "mimir"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - hash = "sha256-avmVNuUBvKBF7Wm05/AsK5Ld3ykmXCkOw0QQhGy8CKc="; + hash = "sha256-V+O89hS2UopGLxGkg6W4gW8kj5QRzpwCQtq0QFrOWf0="; }; vendorHash = null; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 0354cb258594f..9fbdd6c0a94d7 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pushgateway"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "pushgateway"; rev = "v${version}"; - sha256 = "sha256-yiLVLt1+Klr34rF+rj+T9SWNCiYi//g/e/kfJJokkYk="; + sha256 = "sha256-WZ7Gi7jiHoH6ZL0TdB7Z3C9sAzxL/iJtOAm/MsZVRI8="; }; - vendorHash = "sha256-cbwTjjh4g5ISMuump6By0xmF3wKrdA3kToG7j8ZgHNs="; + vendorHash = "sha256-W2gGp36f1OZonXVkoBvWOaeGnnF5Xi5Kv8JE+iDm+fg="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/servers/monitoring/unpoller/default.nix index c2e0f6c9f7ed4..4362feb1b91e1 100644 --- a/pkgs/servers/monitoring/unpoller/default.nix +++ b/pkgs/servers/monitoring/unpoller/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-aJbK1Fhlfm0CrI1O7sWh1xjk+OR8gLa1goSnQ4wfrI0="; + hash = "sha256-VRABezPSppkVouOb6Oz4SpZLwOWhvNKQ+v4ss8wCDFg="; }; - vendorHash = "sha256-iOfjjRjN07iD+B7GjWKbmQu/xNm5wjFQOTA4jBxMh/E="; + vendorHash = "sha256-JF+DwPjtDfFFN9DbEqY9Up8CjDqOsD4IYrMitUd/5Pg="; ldflags = [ "-w" "-s" diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 871f9abb74b87..12c9cb2e5ab24 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "peertube"; - version = "6.0.3"; + version = "6.0.4"; src = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; rev = "v${version}"; - hash = "sha256-Pskxfi+qqVk75hu22niLNFsToCJks1k8w8mTnXjr6jg="; + hash = "sha256-FxXIvibwdRcv8OaTQEXiM6CvWOIptfQXDQ1/PW910wg="; }; yarnOfflineCacheServer = fetchYarnDeps { diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 8bb1f29de42db..fac52dfa9397f 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -21,15 +21,15 @@ let }.${stdenv.hostPlatform.system} or unsupported; hash = { - aarch64-darwin = "sha256-mHXoX526X0PYNViHgAdCPTRX6cqzlCyYLybdY1LRS8c="; - aarch64-linux = "sha256-wgHASkz6RMtKzBehnbqXsNbF057eK0i6xpOmuefMVx8="; - x86_64-darwin = "sha256-3EkGKDDsuUdbTvBILBClwPVvXN5JzTWGHBaG2lmHQ7s="; - x86_64-linux = "sha256-l24/thKqDCJQbeirSYiL5sqH8LRs7k3rk0qY6DZQvD8="; + aarch64-darwin = "sha256-ImivrfKromlA4753KUJIJCZr3yFYm/fWEqK6veEJBfw="; + aarch64-linux = "sha256-6UvjzheFkIRE1m0Wglhuch8oL5mmZoVMd9mtS7Gz7JQ="; + x86_64-darwin = "sha256-SvdMYwTcSm+Ozs2eBgTtjgMcUpgHK+VfQqmhPwD7VIk="; + x86_64-linux = "sha256-9yGQ7f28hTo+WKr6wqrSqMUqMTeRuq1cBs9e2INQfqM="; }.${stdenv.hostPlatform.system} or unsupported; in stdenv.mkDerivation rec { inherit pname; - version = "1.14.3.4333"; + version = "1.15.0.4361"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index 3f29cc8d7f234..511493bc99982 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-4kCDbmq47wb7OuE5JzHPZ/mM9w6wcupFblJieu5dFxc="; - arm64-linux_hash = "sha256-Val9dEB4E3dnfeXT2ERwE+VoITSXeA7Lc51dyz1jJyQ="; - x64-osx_hash = "sha256-LvjAeftlNw5F6YFyhKLW9Fv9UIk6AgnGnxOu6ctmQNg="; + x64-linux_hash = "sha256-dPiavOh69pFWgzM533P7Cv0IUa3YOmCBROjdXflya0s="; + arm64-linux_hash = "sha256-dzGdOm4Uj1RavpwLQ5PmeeCBELoTZz7VCtuv9+cZPxQ="; + x64-osx_hash = "sha256-i5KKY1r2zlIRPggoo9Ju7WSkHA44x42thVQswnXYAp4="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.20.2452"; + version = "0.3.21.2475"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 603b8332776aa..5e816ab13b4db 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.3.10"; + version = "23.3.11"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-PW1L+JwKnfeGFqXo+PTuzJS2FfkcoCU+xFjIt6zhn/M="; + sha256 = "sha256-/z8KkkjGxHgtKXsM0OaUHHYI1bpe79gf9KYvAGLAVR8="; }; server = callPackage ./server.nix { inherit src version; }; in diff --git a/pkgs/servers/rustypaste/default.nix b/pkgs/servers/rustypaste/default.nix index e00d59648e030..ec2a667b18231 100644 --- a/pkgs/servers/rustypaste/default.nix +++ b/pkgs/servers/rustypaste/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rustypaste"; - version = "0.14.4"; + version = "0.15.0"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7CZi76IQR6CIf3EnoysaTrVf2kIDP9sOBXL4kqFFHtY="; + sha256 = "sha256-mDNWIqA3t8AGNTqryiH2q8Tvg4k5d0II3EBkf7tdoNo="; }; - cargoHash = "sha256-fAj/z21do0GV41MIn5hifEZyZPgrb288TRz55BFsdz8="; + cargoHash = "sha256-ZmlA6O/9ZVLHvBHMkY+hpb6Eb0o0RxfXpwop6BLCdWc="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index b97313d9b354a..66a9bcc5c6841 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -61,11 +61,11 @@ let in stdenv.mkDerivation rec { pname = "samba"; - version = "4.19.5"; + version = "4.20.0"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - hash = "sha256-DiQFtM7CnQRZYh9DQKGnSvdx7Hz/7f9DJQytfx+HYF4="; + hash = "sha256-AmclQlEKxuXQyRwMFNkKtObsOXxwnpUsbaOm4LTVpC8="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index e9bd1a2ae58e7..122222e4721d9 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "groonga"; - version = "14.0.1"; + version = "14.0.2"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/groonga-${finalAttrs.version}.tar.gz"; - hash = "sha256-zXiDXYSvdyQ2HBZHUZaYHtZMs7BjzHJaix1ShLbkWtA="; + hash = "sha256-o9C6lPOPkb2KCbF4CqLyKtXHfOdB3jAIv5P6SjTJAJc="; }; patches = [ diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index 5b0b09afda8eb..e15add96d644e 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.50"; + version = "2.51"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-FtSJVqbzUG4XYmfpeZ1tNwudcUfvLF426cTRXpqy5BQ="; + hash = "sha256-ahUWHWtVgJksOg6CTqJSQBaD577zaNu4u1sDG0ksr4g="; }; buildInputs = [ curl openssl ]; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index bb6687c204730..2ae5e937b10e3 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.35.4"; + version = "1.35.7"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-9EEqwS7IKlRfE5bwxjScDX7KMCTpmbxixAznRhbaOE0="; + sha256 = "sha256-n6J6gFXdUvR1G2KmZf/k1ngeXAUbYorNFDxND+e5YIY="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-TXx+YmXsAwh2J+nHpff0oHatI6G2QY2QZmMMcHAG6Lc="; + vendorHash = "sha256-o9b+eoFCrC7oN26nyeFGMWnLtvU+Wk7e9cr38bSsKTs="; proxyVendor = true; doCheck = false; diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix index e146ec04175e4..af3df00fca644 100644 --- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix +++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix @@ -1,22 +1,22 @@ { stdenv, lib, fetchFromGitHub, postgresql, boost182, nixosTests }: let - version = "1.6.0"; + version = "1.7.0"; main_src = fetchFromGitHub { name = "datasketches-postgresql"; owner = "apache"; repo = "datasketches-postgresql"; rev = "refs/tags/${version}"; - hash = "sha256-sz94fIe7nyWhjiw8FAm6ZzVpB0sAK5YxUrtbaZt/guA="; + hash = "sha256-W41uAs3W4V7c9O/wBw3rut65bcmY8EdQS1/tPszMGqA="; }; cpp_src = fetchFromGitHub { name = "datasketches-cpp"; owner = "apache"; repo = "datasketches-cpp"; - rev = "refs/tags/4.1.0"; - hash = "sha256-vPoFzRxOXlEAiiHH9M5S6255ahzaKsGNYS0cdHwrRYw="; + rev = "refs/tags/5.0.2"; + hash = "sha256-yGk1OckYipAgLTQK6w6p6EdHMxBIQSjPV/MMND3cDks="; }; in @@ -38,7 +38,7 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - install -D -m 644 ./datasketches.so -t $out/lib/ + install -D -m 644 ./datasketches${postgresql.dlSuffix} -t $out/lib/ cat \ sql/datasketches_cpc_sketch.sql \ sql/datasketches_kll_float_sketch.sql \ @@ -56,6 +56,7 @@ stdenv.mkDerivation { ./sql/datasketches--1.3.0--1.4.0.sql \ ./sql/datasketches--1.4.0--1.5.0.sql \ ./sql/datasketches--1.5.0--1.6.0.sql \ + ./sql/datasketches--1.6.0--1.7.0.sql \ -t $out/share/postgresql/extension runHook postInstall ''; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 10e899f810d09..87ee50411b754 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "5.0.1"; + version = "5.1.0"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-sJODpyRgqpeg/Lb584wNgCCFRaH22ELcbof1bA612aw="; + sha256 = "sha256-GrVOJ5ywZMyqyDroYDLdKkXDdIJSDGhDfveO/ZvrmYs="; }; installPhase = '' diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix index 3f06ae1e43da2..8a46f4bfe0aa2 100644 --- a/pkgs/servers/sql/rqlite/default.nix +++ b/pkgs/servers/sql/rqlite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rqlite"; - version = "8.23.0"; + version = "8.23.1"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n4ALjayvcOR+VcpKPRh6WswAEEdlYyxhYyfPRje98Rs="; + sha256 = "sha256-vBBxLUS6BSPJnJqxXVC6brKd70na7JPkA6F4mtEqXZw="; }; - vendorHash = "sha256-UYO5asCX+KpESAT1ws7O91QaOJ8zPbd06JzHexBiWj0="; + vendorHash = "sha256-CXwcz4L5Y0HbOdQm62YQGFtguk3X+dYx5Gc6E55PhjM="; subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index 23b782c540dba..7cbf0cd77ad9d 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -8,12 +8,12 @@ with builtins; stdenv.mkDerivation rec { pname = "ttyd"; - version = "1.7.4"; + version = "1.7.7"; src = fetchFromGitHub { owner = "tsl0922"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-BNvJkDOSlcNXt5W9/3/4I+MhQYn0W37zrJRYpAoZWaA="; + sha256 = "sha256-7e08oBKU7BMZ8328qCfNynCSe7LVZ88+iQZRRKl2YkY="; }; nativeBuildInputs = [ pkg-config cmake xxd ]; diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index 4d058e916ab77..1d45e156096ce 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -5,19 +5,19 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.45.16"; + version = "0.45.17"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; rev = version; - hash = "sha256-ln522U3XqZfhvLvMEzrqXV3SjhpgnrRk2MxQQRBL5VU="; + hash = "sha256-3LaNZourDjFjdSh5+hwc2l2DRMEI/rbfyksFD9uUebg="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace "apprise~=1.7.1" "apprise" \ + --replace "apprise~=1.7.4" "apprise" \ --replace "cryptography~=3.4" "cryptography" \ --replace "dnspython~=2.4" "dnspython" \ --replace "pytest ~=7.2" "" \ diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 494513648c9b7..b47ab2cd350b7 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -22,8 +22,8 @@ lib.fix (self: { }; netbox_3_7 = callPackage generic { - version = "3.7.3"; - hash = "sha256-8apjw3mO3RKT/IgJOG1+2GSjNwFhddZ9rIChdP26leE="; + version = "3.7.4"; + hash = "sha256-jQJYtu1K13AsFXx4GTgtMOdppK1Tgoaf2/fKKhS1sQo="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix index 6b99e6c593738..65aae2be2ce5f 100644 --- a/pkgs/servers/wsdd/default.nix +++ b/pkgs/servers/wsdd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wsdd"; - version = "0.7.1"; + version = "0.8"; src = fetchFromGitHub { owner = "christgau"; repo = pname; rev = "v${version}"; - hash = "sha256-xfZVGi3OxuRI+Zh6L3Ru4J4j5BB1EAN3fllRCVA/c5o="; + hash = "sha256-T8/XlQpx4CtNy8LuLwOQBG9muFe9pp5583tDaCT4ReI="; }; outputs = [ "out" "man" ]; @@ -17,12 +17,6 @@ stdenv.mkDerivation rec { buildInputs = [ python3 ]; - patches = [ - # Increase timeout to socket urlopen - # See https://github.com/christgau/wsdd/issues/80#issuecomment-76848906 - ./increase_timeout.patch - ]; - installPhase = '' install -Dm0555 src/wsdd.py $out/bin/wsdd installManPage man/wsdd.8 diff --git a/pkgs/servers/wsdd/increase_timeout.patch b/pkgs/servers/wsdd/increase_timeout.patch deleted file mode 100644 index ac619f705d8e3..0000000000000 --- a/pkgs/servers/wsdd/increase_timeout.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/wsdd.py b/src/wsdd.py -index 88a7a2a..360e4f7 100755 ---- a/src/wsdd.py -+++ b/src/wsdd.py -@@ -699,7 +699,7 @@ class WSDClient(WSDUDPMessageHandler): - request.add_header('Host', host) - - try: -- with urllib.request.urlopen(request, None, 2.0) as stream: -+ with urllib.request.urlopen(request, None, 5.0) as stream: - self.handle_metadata(stream.read(), endpoint, xaddr) - except urllib.error.URLError as e: - logger.warning('could not fetch metadata from: {} {}'.format(url, e)) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 6b2efa04a5c4e..125b6cb78b9b8 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "23.2.4"; + version = "23.2.5"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - sha256 = "sha256-qZ4Vm20NMwmLO2qyKoi/zs4jyLnQynLFNcVdywaBtGs="; + hash = "sha256-M+x/8mh6WfqqUrmwmqjK8Rjn7Lau2JU/UmpiX/n0vZA="; }; depsBuildBuild = [ diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index c566ca090581a..19242ddf0c510 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -1,7 +1,6 @@ { lib , buildNpmPackage , fetchFromGitHub -, nodejs_18 , systemdMinimal , nixosTests , nix-update-script @@ -9,18 +8,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.36.0"; + version = "1.36.1"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-Eyp6VQAt0bd3rXovoaUvTuEY8E67cI5vFadpClhHcrA="; + hash = "sha256-LZ25EWO4cOVnF0bWFKwGfnX7kpzNafp1X6+/JYxn6Ek="; }; - npmDepsHash = "sha256-Kr2gjCMf7yRldvLImuU92sN7a4T2ARFcTshwGOWX+zw="; - - nodejs = nodejs_18; + npmDepsHash = "sha256-6EorAqPLusWAEfTePn+O+tgZcv3g82mkPs2hSHPRRfo="; buildInputs = [ systemdMinimal |