maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/sources): bump channels & overlays (2025-03-07)

Browse source 
* Bump Emacs 29 to 30 to address CVEs in prior versions:
  https://github.com/NixOS/nixpkgs/pull/386174

* //3p/overlays/tvl:

  - Drop upstreamed fix for buildkite-agent
  - Drop tpm2-pkcs11 patch for an issue that has been
    addressed in 1.9.1.
  - Drop Nix 2.3 patch for home-manager. An alternative
    to it has been upstreamed in
    <https://github.com/nix-community/home-manager/pull/5067>.

* //users/flokli/presentations: disable derivations that have
  been failing since the latest chromium upgrade (presumably).
  reveal-md … --print fails to export a PDF. Enabling debug
  output reveals that a timeout in pupeteer is hit.

Change-Id: Id83eb5e5fe2db77e648817c5c737b2f95b43deeb
Reviewed-on: https://cl.tvl.fyi/c/depot/+/13217
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
sterni 2025-03-07 18:49:13 +01:00 • committed by clbot
parent 93282ac6f0
commit 25d28cb1d5
8 changed files with 22 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

32
third_party/overlays/patches/0001-home-environment-fix-compatibility-with-Nix-2.3.patch vendored
View file

@ -1,32 +0,0 @@
From 949776a927faf69887ba71eb339762381e90e105 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Fri, 21 Feb 2025 17:45:23 +0300
Subject: [PATCH] home-environment: fix compatibility with Nix 2.3
---
modules/home-environment.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/home-environment.nix b/modules/home-environment.nix
index fffb3b1c..d12f143a 100644
--- a/modules/home-environment.nix
+++ b/modules/home-environment.nix
@@ -728,13 +728,13 @@ in
# Create a temporary GC root to prevent collection during activation.
trap 'run rm -f $VERBOSE_ARG "$newGenGcPath"' EXIT
- run --silence nix-store --realise "$newGenPath" --add-root "$newGenGcPath"
+ run --quiet nix-store --realise "$newGenPath" --add-root "$newGenGcPath" --indirect
${activationCmds}
${optionalString (!config.uninstall) ''
# Create the "current generation" GC root.
- run --silence nix-store --realise "$newGenPath" --add-root "$currentGenGcPath"
+ run --silence nix-store --realise "$newGenPath" --add-root "$currentGenGcPath" --indirect
if [[ -e "$legacyGenGcPath" ]]; then
run rm $VERBOSE_ARG "$legacyGenGcPath"
--
2.47.2

29
third_party/overlays/patches/tpm2-pkcs11-190-dbupgrade.patch vendored
View file

@ -1,29 +0,0 @@
From 987323794148a6ff5ce3d02eef8cfeb46bee1761 Mon Sep 17 00:00:00 2001
From: Anton <tracefinder@gmail.com>
Date: Tue, 7 Nov 2023 12:02:15 +0300
Subject: [PATCH] Skip null attribute during DB update
Signed-off-by: Anton <tracefinder@gmail.com>
---
src/lib/db.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/lib/db.c b/src/lib/db.c
index b4bbd1bf..74c5a7b4 100644
--- a/src/lib/db.c
+++ b/src/lib/db.c
@@ -2169,9 +2169,11 @@ static CK_RV dbup_handler_from_7_to_8(sqlite3 *updb) {
/* for each tobject */
CK_ATTRIBUTE_PTR a = attr_get_attribute_by_type(tobj->attrs, CKA_ALLOWED_MECHANISMS);
- CK_BYTE type = type_from_ptr(a->pValue, a->ulValueLen);
- if (type != TYPE_BYTE_INT_SEQ) {
- rv = _db_update_tobject_attrs(updb, tobj->id, tobj->attrs);
+ if (a) {
+ CK_BYTE type = type_from_ptr(a->pValue, a->ulValueLen);
+ if (type != TYPE_BYTE_INT_SEQ) {
+ rv = _db_update_tobject_attrs(updb, tobj->id, tobj->attrs);
+ }
}
tobject_free(tobj);

18
third_party/overlays/tvl.nix vendored
View file

@ -33,14 +33,6 @@ depot.nix.readTree.drvTargets {
withAWS = false;
});
# see b/439; this fix will be upstreamed in nixpkgs
buildkite-agent = super.buildkite-agent.overrideAttrs (old: {
# once PR#386414 propagates here (& len(ldflags) = 2), we can delete this
ldflags = assert (builtins.length old.ldflags) == 1; old.ldflags ++ [
"-X github.com/buildkite/agent/v3/version.buildNumber=nix"
];
});
# No longer builds with Nix 2.3 after
# https://github.com/nixos/nixpkgs/commit/5f9d2d95721cdf20ace744f2db75ad70a7aedd3a
nixos-option = super.nixos-option.override {
@ -49,7 +41,6 @@ depot.nix.readTree.drvTargets {
home-manager = super.home-manager.overrideAttrs (_: {
src = depot.third_party.sources.home-manager;
patches = [ ./patches/0001-home-environment-fix-compatibility-with-Nix-2.3.patch ];
version = "git-"
+ builtins.substring 0 7 depot.third_party.sources.home-manager.rev;
});
@ -171,15 +162,6 @@ depot.nix.readTree.drvTargets {
doCheck = false;
};
# Imports a patch that fixes usage of this package on versions
# >=1.9. The patch has been proposed upstream, but so far with no
# reactions from the maintainer:
#
# https://github.com/tpm2-software/tpm2-pkcs11/pull/849
tpm2-pkcs11 = super.tpm2-pkcs11.overrideAttrs (old: {
patches = (old.patches or [ ]) ++ [ ./patches/tpm2-pkcs11-190-dbupgrade.patch ];
});
# Dependency isn't supported by Python 3.12
html5validator = super.html5validator.override {
python3 = self.python311;