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-09-19 05:30:01 +00:00
committed by GitHub
parent e2278891fa 1aa3c1ba5d
commit f2bbb6dd03
5 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/ba/bark-server/package.nix
+3 -3
View File
@@ -8,13 +8,13 @@
buildGoModule (finalAttrs: {
pname = "bark-server";
version = "2.2.5";
version = "2.2.6";
src = fetchFromGitHub {
owner = "Finb";
repo = "bark-server";
tag = "v${finalAttrs.version}";
hash = "sha256-Fe0PXwwVCrvoMTYMoTUkQaT6kVDdGPadFLkTDRhlh5U=";
hash = "sha256-PHUQA0Iv0iJ5Hmv129sQjtmdmnVfqEqYQqbyGux+gFg=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
'';
};
vendorHash = "sha256-lpRxwCF+3+32FSn5XQ551l2ONtyuA9ewDQgwHgYUnT0=";
vendorHash = "sha256-/h3L4Ow2aBPkbH1hPXCEb9DKrzVEcaLh2+O9iZXkXN8=";
ldflags = [
"-s"
pkgs/by-name/sc/screen/package.nix
+10 -7
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
fetchpatch,
autoreconfHook,
ncurses,
libxcrypt,
@@ -17,13 +18,21 @@ stdenv.mkDerivation rec {
hash = "sha256-La429Ns3n/zRS2kVlrpuwYrDqeIrxHrCOXiatYQJhp0=";
};
patches = [
(fetchpatch {
url = "https://file.savannah.gnu.org/file/0001-test-fix-unit-tests.patch?file_id=57558";
stripLen = 1;
hash = "sha256-q3jQQrzweLf2T/V5X9iL4ZZK342QEXLG5fZTaMOB4tY=";
})
];
configureFlags = [
"--enable-telnet"
"--enable-pam"
];
# We need _GNU_SOURCE so that mallocmock_reset() is defined: https://savannah.gnu.org/bugs/?66416
env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types";
env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE=1";
nativeBuildInputs = [
autoreconfHook
@@ -34,12 +43,6 @@ stdenv.mkDerivation rec {
pam
];
# The test suite seems to have some glibc malloc hooks that don't exist/link on macOS
# With pkgsLLVM / on loongarch64-linux:
# tests/test-winmsgcond.c:53: assertion 'wmc_end(&wmc, pos + 1, &chg) == pos' failed
doCheck =
!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.useLLVM && !stdenv.hostPlatform.isLoongArch64;
meta = with lib; {
homepage = "https://www.gnu.org/software/screen/";
description = "Window manager that multiplexes a physical terminal";
pkgs/by-name/vb/vboot_reference/package.nix
+10 -20
View File
@@ -10,14 +10,13 @@
}:
stdenv.mkDerivation {
version = "111.15329";
pname = "vboot_reference";
version = "135.16209";
src = fetchFromGitiles {
url = "https://chromium.googlesource.com/chromiumos/platform/vboot_reference";
rev = "1a1cb5c9a38030a5868e2aaad295c68432c680fd"; # refs/heads/release-R111-15329.B
sha256 = "sha256-56/hqqFiKHw0/ah0D20U1ueIU2iq8I4Wn5DiEWxB9qA=";
rev = "bf4b21294a1c2c6b94f400819d3fce4a905b3afe"; # refs/heads/release-R135-16209.B
hash = "sha256-frg7NkK173wAHJRedtbJI5jI8Kee/VkByh5DCUzD9OA=";
};
nativeBuildInputs = [ pkg-config ];
@@ -30,22 +29,13 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
env.NIX_CFLAGS_COMPILE = toString [
# This apparently doesn't work as expected:
# - https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/refs/heads/release-R111-15329.B/Makefile#439
# Let's apply the same flag manually.
"-Wno-error=deprecated-declarations"
];
postPatch = ''
substituteInPlace Makefile \
--replace "ar qc" '${stdenv.cc.bintools.targetPrefix}ar qc'
--replace-fail "ar qc" '${stdenv.cc.bintools.targetPrefix}ar qc'
# Drop flag unrecognized by GCC 9 (for e.g. aarch64-linux)
substituteInPlace Makefile \
--replace "-Wno-unknown-warning" ""
'';
--replace-fail "-Wno-unknown-warning" ""
preBuild = ''
patchShebangs scripts
'';
@@ -54,7 +44,7 @@ stdenv.mkDerivation {
"HOST_ARCH=${stdenv.hostPlatform.parsed.cpu.name}"
"USE_FLASHROM=0"
# Upstream has weird opinions about DESTDIR
# https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/refs/heads/release-R111-15329.B/Makefile#51
# https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/refs/heads/release-R135-16209.B/Makefile#51
"UB_DIR=${placeholder "out"}/bin"
"UL_DIR=${placeholder "out"}/lib"
"UI_DIR=${placeholder "out"}/include/vboot"
@@ -66,10 +56,10 @@ stdenv.mkDerivation {
cp -r tests/devkeys* $out/share/vboot/
'';
meta = with lib; {
meta = {
description = "Chrome OS partitioning and kernel signing tools";
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = [ ];
license = lib.licenses.bsd3;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.jmbaur ];
};
}
pkgs/development/ocaml-modules/bisect_ppx/default.nix
+14 -4
View File
@@ -19,10 +19,20 @@ buildDunePackage rec {
};
# Ensure compatibility with ppxlib 0.36
patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch {
url = "https://github.com/aantron/bisect_ppx/commit/f35fdf4bdcb82c308d70f7c9c313a77777f54bdf.patch";
hash = "sha256-hQMDU6zrHDV9JszGAj2p4bd9zlqqjc1TLU+cfMEgz9c=";
});
patches = lib.optionals (lib.versionAtLeast ppxlib.version "0.36") [
(fetchpatch {
url = "https://github.com/aantron/bisect_ppx/commit/f35fdf4bdcb82c308d70f7c9c313a77777f54bdf.patch";
hash = "sha256-hQMDU6zrHDV9JszGAj2p4bd9zlqqjc1TLU+cfMEgz9c=";
})
(fetchpatch {
url = "https://github.com/aantron/bisect_ppx/commit/07bfceec652773de4b140cebc236a15e2429809e.patch";
hash = "sha256-9gDIndPIZMkIkd847qd2QstsZJInBPuWXAUIzZMkHcw=";
})
(fetchpatch {
url = "https://github.com/aantron/bisect_ppx/commit/4f0cb2a2e1b0b786b6b5f1c94985b201aa012f12.patch";
hash = "sha256-20nr7ApKPnnol0VEOirwXdJX+AiFRzBzAq4YzCWn7W0=";
})
];
minimalOCamlVersion = "4.11";
pkgs/development/python-modules/osc/default.nix
+2 -2
View File
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "osc";
version = "1.19.1";
version = "1.20.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "osc";
rev = version;
hash = "sha256-klPO873FwQOf4DCTuDd86vmGLI4ep9xgS6c+HasJv0Q=";
hash = "sha256-00tS5iOnGkQ6XgROtY6cVU2ewIMtWVZSKobvB+FPPZM=";
};
buildInputs = [ bashInteractive ]; # needed for bash-completion helper