mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p): bump NixOS channels to 2022-01-12

Browse source 
Temporarily use a master commit as some interesting failures have been
fixed there (yubikey-manager and notmuch).

* //users/tazjin/nixos/camden: The acme module was moved around, so we
  need to adjust the disabled module path.

Change-Id: I21c6a1963ffe4205f3577f531ce10b778a82e2ff
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4865
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
sterni 2022-01-12 13:37:22 +01:00
parent b6496b8e60
commit f48d655021
3 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
third_party/nixpkgs/default.nix vendored
View file

@ -13,16 +13,16 @@ let
# nixos-unstable, and the current stable channel of the latest NixOS # nixos-unstable, and the current stable channel of the latest NixOS
# release. # release.
# Tracking nixos-unstable as of 2022-01-02. # Tracking nixpkgs master as of 2022-01-12.
unstableHashes = { unstableHashes = {
commit = "59bfda72480496f32787cec8c557182738b1bd3f"; commit = "47d693f2f6673c5197f9606982b697f840b4dcc6";
sha256 = "18akd1chfvniq1q774rigfxgmxwi0wyjljpa1j9ls59szpzr316d"; sha256 = "0vwm922ak6s61d09dyayy0inh3r3bgmy9xj8gg55jr79jkl2rab3";
}; };
# Tracking nixos-21.11 as of 2022-01-02. # Tracking nixos-21.11 as of 2022-01-11.
stableHashes = { stableHashes = {
commit = "d1e59cfc49961e121583abe32e2f3db1550fbcff"; commit = "386234e2a61e1e8acf94dfa3a3d3ca19a6776efb";
sha256 = "03ldf1dlxqf3g8qh9x5vp6vd9zvvr481fyjds111imll69y60wpm"; sha256 = "1qhfham6vhy67xjdvsmhb3prvsg854wfw4l4avxnvclrcm3k2yg8";
}; };
# import the nixos-unstable package set, or optionally use the # import the nixos-unstable package set, or optionally use the

10
third_party/overlays/tvl.nix vendored
View file

@ -49,14 +49,4 @@ self: super: {
mkShell = super.lib.makeOverridable(args: (super.mkShell args) // { mkShell = super.lib.makeOverridable(args: (super.mkShell args) // {
meta.ci = false; meta.ci = false;
}); });
# TODO(tazjin): determine whether this is the cause of my suspend
# bugs, and if so, upstream it to nixpkgs.
xsecurelock = super.xsecurelock.overrideAttrs(drv: rec {
buildInputs = drv.buildInputs ++ [ self.makeWrapper ];
postInstall = ''
wrapProgram $out/libexec/xsecurelock/saver_blank \
--prefix PATH : ${self.coreutils}/bin
'';
});
} }

2
users/tazjin/nixos/camden/default.nix
View file

@ -13,7 +13,7 @@ in lib.fix(self: {
# Disable the current ACME module and use the old one from 19.09 # Disable the current ACME module and use the old one from 19.09
# instead, until the various regressions have been sorted out. # instead, until the various regressions have been sorted out.
# TODO(tazjin): Remove this once the new ACME module works. # TODO(tazjin): Remove this once the new ACME module works.
disabledModules = [ "security/acme.nix" ]; disabledModules = [ "security/acme" ];
imports = imports =
let oldChannel = fetchTarball { let oldChannel = fetchTarball {
# NixOS 19.09 on 2020-10-04 # NixOS 19.09 on 2020-10-04