From e59d263b44327bd44e1e71d45c1a7f6d4495f5b3 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 6 Dec 2023 13:30:39 +0300 Subject: [PATCH] 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 Tested-by: BuildkiteCI Autosubmit: tazjin --- third_party/overlays/tvl.nix | 33 ----------------------- third_party/rust-crates/default.nix | 5 +--- third_party/sources/sources.json | 42 ++++++++++++++--------------- users/wpcarro/emacs/default.nix | 6 +++-- 4 files changed, 26 insertions(+), 60 deletions(-) diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index d354e0278..ccd2f21d1 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; diff --git a/third_party/rust-crates/default.nix b/third_party/rust-crates/default.nix index e99de247b..8e1d68fc5 100644 --- a/third_party/rust-crates/default.nix +++ b/third_party/rust-crates/default.nix @@ -1,7 +1,7 @@ { depot, pkgs, ... }: # TVL tool rust crate dependencies, where tools like carnix are not used. -# Intended for manual updates, which keeps us honest with what we pull into our closure. +# Intended for manual updates, which makes sure we never actually update. let buildRustCrate = @@ -279,7 +279,6 @@ rec { pkg-config = buildRustCrate { pname = "pkg-config"; version = "0.3.19"; - crateName = "pkg_config"; sha256 = "1kd047p8jv6mhmfzddjvfa2nwkfrb3l1wml6lfm51n1cr06cc9lz"; }; @@ -363,7 +362,6 @@ rec { unicode-normalization = buildRustCrate { pname = "unicode-normalization"; version = "0.1.17"; - crateName = "unicode_normalization"; sha256 = "0w4s0avzlf7pzcclhhih93aap613398sshm6jrxcwq0f9lhis11c"; dependencies = [ tinyvec @@ -373,7 +371,6 @@ rec { unicode-bidi = buildRustCrate { pname = "unicode-bidi"; version = "0.3.5"; - crateName = "unicode_bidi"; sha256 = "193jzlxj1dfcms2381lyd45zh4ywlicj9lzcfpid1zbkmfarymkz"; dependencies = [ matches diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index d68487981..c4a68f6fe 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -5,10 +5,10 @@ "homepage": "https://matrix.to/#/#agenix:nixos.org", "owner": "ryantm", "repo": "agenix", - "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", - "sha256": "0gbn01hi8dh7s9rc66yawnmixcasadf20zci4ijzpd143ph492ad", + "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", + "sha256": "196k2gchfy4y0258j6n15zd96harinzx91yqcmfrv1dvgwk9x94c", "type": "tarball", - "url": "https://github.com/ryantm/agenix/archive/daf42cb35b2dc614d1551e37f96406e4c4a2d3e4.tar.gz", + "url": "https://github.com/ryantm/agenix/archive/13ac9ac6d68b9a0896e3d43a082947233189e247.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "emacs-overlay": { @@ -17,10 +17,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ff495a3172537a9a5d05fadd0699daf5deb48dc0", - "sha256": "17rji275ya0zb7ir4y36azylgz5jzrsg4b5n4mnqvvfwvh8xhj44", + "rev": "ff6270444ab7e1ab6fac3464d173b03aa8cb7a75", + "sha256": "1llr0a9ssx3r614sppbmz4g6l9swwa5nwc0q9967z1mmpvfckz9j", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/ff495a3172537a9a5d05fadd0699daf5deb48dc0.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/ff6270444ab7e1ab6fac3464d173b03aa8cb7a75.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "home-manager": { @@ -29,10 +29,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", - "sha256": "1qr1xsf4fsqmh8c7av984hvrc03y1y6s8nlxfp9zrzhlnh1v034m", + "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", + "sha256": "110m66gdxhidamz0y5i5ijpv4lx2p8iwfhiwajpwf2vginn74jn7", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/db1878f013b52ba5e4034db7c1b63e8d04173a86.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/ac7216918cd65f3824ba7817dea8f22e61221eaf.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "impermanence": { @@ -77,10 +77,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", - "sha256": "019y1skg6p0wc5x9yxpzmq1zi3yw6hlj2hqsm4rfv12a6ffm68j7", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", + "sha256": "1hf6cgaci1n186kkkjq106ryf8mmlq9vnwgfwh625wa8hfgdn4dm", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/91050ea1e57e50388fa87a3302ba12d188ef723a.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-stable": { @@ -89,10 +89,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2e4de209881b38392933fabf303cde3454b0b4c", - "sha256": "0nm6pxnji2jq7v3dx9v7cdj8rfzp64rgnxvhyphk39dhmlyyd9m0", + "rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19", + "sha256": "0370pkzfcpm05q5m0llr52y8vb87smr6hdpcfs9m1gl1s7h3qlpd", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/d2e4de209881b38392933fabf303cde3454b0b4c.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/e9f06adb793d1cca5384907b3b8a4071d5d7cb19.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "rust-overlay": { @@ -101,10 +101,10 @@ "homepage": "", "owner": "oxalica", "repo": "rust-overlay", - "rev": "055d3d2ea161dfc6ca569f2f135a107f48cf483e", - "sha256": "05jgnk4jklcw1dbl6wg3h229n9ksfj2q8v53cj35bjnb15xy7mfx", + "rev": "1fdfc1689218998460983986501bd65ba5bbee0f", + "sha256": "0ilmn9v1lmm1051m7vcp3bj6a7az0jzbq4ndvak48i53vd416i6d", "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/055d3d2ea161dfc6ca569f2f135a107f48cf483e.tar.gz", + "url": "https://github.com/oxalica/rust-overlay/archive/1fdfc1689218998460983986501bd65ba5bbee0f.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "rustsec-advisory-db": { @@ -113,10 +113,10 @@ "homepage": "https://rustsec.org", "owner": "RustSec", "repo": "advisory-db", - "rev": "3338fcfb59cea5fcd7d2a4e7fe24cbc7cb778003", - "sha256": "0fw5xrzafv061jj3lzrnqarbjcm1irzvl338yhkzw1k8firmki7d", + "rev": "43af5fef0591531a72ebb86c5f1c623ee95c62fe", + "sha256": "0w57jgwyvspak01bg492yis28rwqszfrj2k6j20hm3y61mydxghy", "type": "tarball", - "url": "https://github.com/RustSec/advisory-db/archive/3338fcfb59cea5fcd7d2a4e7fe24cbc7cb778003.tar.gz", + "url": "https://github.com/RustSec/advisory-db/archive/43af5fef0591531a72ebb86c5f1c623ee95c62fe.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/users/wpcarro/emacs/default.nix b/users/wpcarro/emacs/default.nix index 78c66c693..0b3c5a6e7 100644 --- a/users/wpcarro/emacs/default.nix +++ b/users/wpcarro/emacs/default.nix @@ -86,7 +86,8 @@ let diminish direnv dockerfile-mode - doom-themes + # TODO(wpcarro): broken since channel bump cl/10204 + # doom-themes elisp-slime-nav elixir-mode elm-mode @@ -261,5 +262,6 @@ in touch $out ''; - meta.ci.targets = [ "check" ]; + # TODO(wpcarro): commented out because of doom-themes breakage; cl/10204 + # meta.ci.targets = [ "check" ]; }