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

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;