diff options
| author | Vincent Ambo <tazjin@tvl.su> | 2023-12-06T10·30+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-12-06T12·39+0000 |
| commit | e59d263b44327bd44e1e71d45c1a7f6d4495f5b3 (patch) | |
| tree | d53cf860517459c4f07a0eed648ef48aaba042eb /third_party/overlays/tvl.nix | |
| parent | 9bb50a89b786edf72e086c5a426a528208729b98 (diff) | |
chore(3p/sources): bump channels & overlays (2023-12-06) r/7122
* 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>
Diffstat (limited to 'third_party/overlays/tvl.nix')
| -rw-r--r-- | third_party/overlays/tvl.nix | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index d354e0278b4c..ccd2f21d1a53 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -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; |