From fc139f603e4a4df52b41737dd994b92faacee44f Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Tue, 28 Jan 2025 17:25:29 -0800 Subject: [PATCH 1/8] vboot_reference: 111.15329 -> 135.16209 --- pkgs/by-name/vb/vboot_reference/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/vb/vboot_reference/package.nix b/pkgs/by-name/vb/vboot_reference/package.nix index f6aee1214a92..f3d43c78fd66 100644 --- a/pkgs/by-name/vb/vboot_reference/package.nix +++ b/pkgs/by-name/vb/vboot_reference/package.nix @@ -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 ]; @@ -32,7 +31,7 @@ stdenv.mkDerivation { 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 + # - https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/refs/heads/release-R135-16209.B/Makefile#493 # Let's apply the same flag manually. "-Wno-error=deprecated-declarations" ]; @@ -54,7 +53,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" From c61d94fdee7a299a3f5e81acc679f8bcdd5b6224 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Tue, 28 Jan 2025 17:26:07 -0800 Subject: [PATCH 2/8] vboot_reference: remove irrelevant cflags Removing these manually applied cflags do not result in build failures. --- pkgs/by-name/vb/vboot_reference/package.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/by-name/vb/vboot_reference/package.nix b/pkgs/by-name/vb/vboot_reference/package.nix index f3d43c78fd66..73fe56651421 100644 --- a/pkgs/by-name/vb/vboot_reference/package.nix +++ b/pkgs/by-name/vb/vboot_reference/package.nix @@ -29,13 +29,6 @@ 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-R135-16209.B/Makefile#493 - # Let's apply the same flag manually. - "-Wno-error=deprecated-declarations" - ]; - postPatch = '' substituteInPlace Makefile \ --replace "ar qc" '${stdenv.cc.bintools.targetPrefix}ar qc' From 3d24390579cf99a05ba84c012ad2feefb1f770db Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Tue, 28 Jan 2025 17:27:30 -0800 Subject: [PATCH 3/8] vboot_reference: use --replace-fail with substituteInPlace --- pkgs/by-name/vb/vboot_reference/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/vb/vboot_reference/package.nix b/pkgs/by-name/vb/vboot_reference/package.nix index 73fe56651421..cbe094300214 100644 --- a/pkgs/by-name/vb/vboot_reference/package.nix +++ b/pkgs/by-name/vb/vboot_reference/package.nix @@ -31,13 +31,11 @@ stdenv.mkDerivation { 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 ''; From 356c16f9848761a01f564c37d70f58761cd5aa5c Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Tue, 28 Jan 2025 17:27:50 -0800 Subject: [PATCH 4/8] vboot_reference: add jmbaur as maintainer --- pkgs/by-name/vb/vboot_reference/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/vb/vboot_reference/package.nix b/pkgs/by-name/vb/vboot_reference/package.nix index cbe094300214..3c9ffbf9a881 100644 --- a/pkgs/by-name/vb/vboot_reference/package.nix +++ b/pkgs/by-name/vb/vboot_reference/package.nix @@ -56,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 ]; }; } From ecf67f3cf1ad2d63f15c8633cd45116f331bc7a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Sep 2025 19:18:42 +0000 Subject: [PATCH 5/8] python3Packages.osc: 1.19.1 -> 1.20.0 --- pkgs/development/python-modules/osc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index 51beca1710b6..8aace8c6ed8f 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -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 From ce656bff12e03795229de265e4c373f47b8f390a Mon Sep 17 00:00:00 2001 From: zapashcanon Date: Thu, 18 Sep 2025 21:45:17 +0200 Subject: [PATCH 6/8] use latest patch for bisect_ppx --- .../ocaml-modules/bisect_ppx/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index 580fb797546e..e3a8518b7260 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -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"; From bca8a7b28a384d9b7aad1d5320a478c85f2760a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Sep 2025 04:02:52 +0000 Subject: [PATCH 7/8] bark-server: 2.2.5 -> 2.2.6 --- pkgs/by-name/ba/bark-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/bark-server/package.nix b/pkgs/by-name/ba/bark-server/package.nix index 50d6a7938291..a2d8d1df8ac0 100644 --- a/pkgs/by-name/ba/bark-server/package.nix +++ b/pkgs/by-name/ba/bark-server/package.nix @@ -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" From f9c5a2dfb3d11cc2a48de18db5ff3bc22911b36c Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 19 Sep 2025 08:07:36 +0300 Subject: [PATCH 8/8] screen: backport pending patch to fix UB in unit tests --- pkgs/by-name/sc/screen/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/sc/screen/package.nix b/pkgs/by-name/sc/screen/package.nix index 0dc36a39d3b6..67ee278ccb13 100644 --- a/pkgs/by-name/sc/screen/package.nix +++ b/pkgs/by-name/sc/screen/package.nix @@ -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";