Merge master into staging-next

pkgs/by-name/ae/aerospike/package.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "aerospike-server";
-  version = "8.0.0.6";
+  version = "8.0.0.7";
 
   src = fetchFromGitHub {
     owner = "aerospike";
     repo = "aerospike-server";
     rev = version;
-    hash = "sha256-pfB/K5CXwuAgLcJtp4fsllFiCRzjZY0Kv83O/1Uohfw=";
+    hash = "sha256-pusPYp3zbd+y+Gc3XnAk8sn74jp/+UzjoWb1wuD1+uE=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/wk/wkhtmltopdf/package.nix

@@ -90,7 +90,7 @@ let
 in
 stdenv.mkDerivation (
   {
-    pname = "wkhtmltopdf";
+    name = "wkhtmltopdf";
 
     dontStrip = true;
 

pkgs/development/ocaml-modules/janestreet/0.17.nix

@@ -498,7 +498,8 @@ with self;
 
   core_unix = janePackage {
     pname = "core_unix";
-    hash = "sha256-eqBMiEJ5xUrgFJTMZoEDxqkhedQxxbbf0DedZKHprww=";
+    version = "0.17.1";
+    hash = "sha256-xJoBW6TBBnzR5n38E5LHBFYO2CRIsME7OTdEZKn8EqU=";
     meta.description = "Unix-specific portions of Core";
     buildInputs = [ jst-config ];
     propagatedBuildInputs = [
@@ -514,12 +515,6 @@ with self;
     '';
     doCheck = false; # command_validate_parsing.exe is not specified in test build deps
 
-    # Compatibility with OCaml 5.3
-    patches = lib.optional (lib.versionAtLeast ocaml.version "5.3") (fetchpatch {
-      url = "https://github.com/janestreet/core_unix/commit/ebce389ac68e098f542e34400e114ac992f415af.patch";
-      includes = [ "bigstring_unix/src/bigstring_unix_stubs.c" ];
-      hash = "sha256-FGg2zlyp3aZFu1VeFdm7pgSPiW0HAkLYgMGTj+tqju8=";
-    });
   };
 
   csvfields = janePackage {

pkgs/servers/dns/knot-resolver/default.nix

@@ -27,8 +27,7 @@
   cacert,
   extraFeatures ? false, # catch-all if defaults aren't enough
 }:
-let # un-indented, over the whole file
-
+let
   result = if extraFeatures then wrapped-full else unwrapped;
 
   inherit (lib) optional optionals optionalString;
@@ -36,11 +35,11 @@ let # un-indented, over the whole file
 
   unwrapped = stdenv.mkDerivation rec {
     pname = "knot-resolver";
-    version = "5.7.4";
+    version = "5.7.5";
 
     src = fetchurl {
       url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
-      hash = "sha256-a22m7PBoKAQa+tRN+iJ3gfCuNK0YOmZwCFCTVdGL2cg=";
+      sha256 = "80239cf9aa92599d9cbad4642dea5520b2ccfbc9c6f968886ea46179cb3cdf66";
     };
 
     outputs = [
@@ -67,16 +66,9 @@ let # un-indented, over the whole file
         # Even though they should already be loaded and they're in RPATH, too.
         for f in daemon/lua/{kres,zonefile}.lua; do
           substituteInPlace "$f" \
-            --replace "ffi.load(" "ffi.load('${lib.getLib knot-dns}/lib/' .. "
+            --replace-fail "ffi.load(" "ffi.load('${lib.getLib knot-dns}/lib/' .. "
         done
       ''
-      # https://gitlab.nic.cz/knot/knot-resolver/-/issues/925
-      + ''
-        patch modules/http/meson.build <<EOF
-        @@ -22 +21,0 @@
-        -  ['http', files('http.test.lua')],
-        EOF
-      ''
       # some tests have issues with network sandboxing, apparently
       + optionalString doInstallCheck ''
         echo 'os.exit(77)' > daemon/lua/trust_anchors.test/bootstrap.test.lua