chore(3p/sources): bump channels & overlays (2023-12-06)
* 3p/rust-crates: fix names of crate URLs to accommodate recent crates.io changes: https://blog.rust-lang.org/2023/10/27/crates-io-non-canonical-downloads.html * 3p/rust-crates: fix comment describing what this is * 3p/overlays: discard custom overrides of Nix 2.3: it's now maintained properly upstream * users/wpcarro/emacs: disable doom themes package Change-Id: Ic5def77319a0a55e78c8ffe05b9309d59784cfd9 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10204 Reviewed-by: wpcarro <wpcarro@gmail.com> Tested-by: BuildkiteCI Autosubmit: tazjin <tazjin@tvl.su>
This commit is contained in:
parent
9bb50a89b7
commit
e59d263b44
4 changed files with 26 additions and 60 deletions
33
third_party/overlays/tvl.nix
vendored
33
third_party/overlays/tvl.nix
vendored
|
|
@ -3,40 +3,7 @@
|
|||
{ lib, depot, localSystem, ... }:
|
||||
|
||||
self: super:
|
||||
let
|
||||
# Rollback Nix to a stable version (2.3) with some backports applied.
|
||||
# We currently track a commit on the 2.3-maintenance that didn't make it into
|
||||
# a release yet - tracked in https://github.com/NixOS/nix/issues/9244.
|
||||
nixSrc =
|
||||
let
|
||||
# branch 2.3-maintenance
|
||||
rev = "f76990444c17716506080e5445e430a9c5c880f9";
|
||||
in
|
||||
self.fetchFromGitHub
|
||||
{
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
inherit rev;
|
||||
hash = "sha256-EK0pgHDekJFqr0oMj+8ANIjq96WPjICe2s0m4xkUdH4=";
|
||||
} // { revCount = 0; shortRev = builtins.substring 0 7 rev; };
|
||||
|
||||
nixTarball = (scopedImport
|
||||
{
|
||||
# The tarball job always uses currentSystem which we need to purify
|
||||
builtins = builtins // { currentSystem = localSystem; };
|
||||
}
|
||||
"${nixSrc}/release.nix"
|
||||
{
|
||||
nix = nixSrc;
|
||||
nixpkgs = self.path;
|
||||
systems = [ ];
|
||||
}
|
||||
).tarball;
|
||||
in
|
||||
depot.nix.readTree.drvTargets {
|
||||
nix_2_3 = super.nix_2_3.overrideAttrs (_: {
|
||||
src = "${nixTarball}/tarballs/nix-${nixTarball.version}.tar.xz";
|
||||
});
|
||||
nix = self.nix_2_3;
|
||||
nix_latest = super.nix;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue