gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-04-30 06:05:42 +00:00
committed by GitHub
parent 188029b410 920a79ee9b
commit 40b700a5dd
4 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/by-name/ae/aerospike/package.nix
View File

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

2
pkgs/by-name/wk/wkhtmltopdf/package.nix
View File

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

9
pkgs/development/ocaml-modules/janestreet/0.17.nix
View File

@@ -498,7 +498,8 @@ with self;
core_unix = janePackage { core_unix = janePackage {
pname = "core_unix"; pname = "core_unix";
hash = "sha256-eqBMiEJ5xUrgFJTMZoEDxqkhedQxxbbf0DedZKHprww="; version = "0.17.1";
hash = "sha256-xJoBW6TBBnzR5n38E5LHBFYO2CRIsME7OTdEZKn8EqU=";
meta.description = "Unix-specific portions of Core"; meta.description = "Unix-specific portions of Core";
buildInputs = [ jst-config ]; buildInputs = [ jst-config ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@@ -514,12 +515,6 @@ with self;
''; '';
doCheck = false; # command_validate_parsing.exe is not specified in test build deps 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 { csvfields = janePackage {

16
pkgs/servers/dns/knot-resolver/default.nix
View File

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