summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2023-01-26 18:19:22 +0100
committerVladimír Čunát <v@cunat.cz>2023-01-26 18:19:22 +0100
commitd027021c717b8ec2cdd451337b8fcb97c41c9707 (patch)
tree59b2da5c849149e67f4e97c2a7e8d5136329a3b8
parent3a1388724ebdf084a6ff38738b07755e93326641 (diff)
downloadnixpkgs-d027021c717b8ec2cdd451337b8fcb97c41c9707.tar
nixpkgs-d027021c717b8ec2cdd451337b8fcb97c41c9707.tar.gz
nixpkgs-d027021c717b8ec2cdd451337b8fcb97c41c9707.tar.bz2
nixpkgs-d027021c717b8ec2cdd451337b8fcb97c41c9707.tar.lz
nixpkgs-d027021c717b8ec2cdd451337b8fcb97c41c9707.tar.xz
nixpkgs-d027021c717b8ec2cdd451337b8fcb97c41c9707.tar.zst
nixpkgs-d027021c717b8ec2cdd451337b8fcb97c41c9707.zip
knot-resolver: 5.5.3 -> 5.6.0
https://gitlab.nic.cz/knot/knot-resolver/-/tags/v5.6.0
There's a security fix, though I don't consider it severe.
-rw-r--r--pkgs/servers/dns/knot-resolver/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 929c76e7e2c..aee57689308 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -3,7 +3,7 @@
 , runCommand, pkg-config, meson, ninja, makeWrapper
 # build+runtime deps.
 , knot-dns, luajitPackages, libuv, gnutls, lmdb
-, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle
+, jemalloc, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle
 # test-only deps.
 , cmocka, which, cacert
 , extraFeatures ? false /* catch-all if defaults aren't enough */
@@ -17,11 +17,11 @@ lua = luajitPackages;
 
 unwrapped = stdenv.mkDerivation rec {
   pname = "knot-resolver";
-  version = "5.5.3";
+  version = "5.6.0";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
-    sha256 = "a38f57c68b7d237d662784d8406e6098aad66a148f44dcf498d1e9664c5fed2d";
+    sha256 = "0c82ae937b685dc477fb3176098e3dc106c898b7cd83553e5bc54dccb83c80d7";
   };
 
   outputs = [ "out" "dev" ];
@@ -63,7 +63,7 @@ unwrapped = stdenv.mkDerivation rec {
   # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
   buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ]
     ++ optionals stdenv.isLinux [ /*lib*/systemd libcap_ng ]
-    ++ [ nghttp2 ]
+    ++ [ jemalloc nghttp2 ]
     ## optional dependencies; TODO: dnstap
     ;
 
@@ -71,6 +71,7 @@ unwrapped = stdenv.mkDerivation rec {
     "-Dkeyfile_default=${dns-root-data}/root.ds"
     "-Droot_hints=${dns-root-data}/root.hints"
     "-Dinstall_kresd_conf=disabled" # not really useful; examples are inside share/doc/
+    "-Dmalloc=jemalloc"
     "--default-library=static" # not used by anyone
   ]
   ++ optional doInstallCheck "-Dunit_tests=enabled"