From 5daaaa2f0bdad7056f1da4817ca2f49eb4e3fbf4 Mon Sep 17 00:00:00 2001 From: sterni Date: Mon, 18 Nov 2024 12:13:13 +0100 Subject: [PATCH] chore(3p/sources): bump channels & overlays MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * //3p/overlays/tvl: build nixos-option with latest Nix version (2.24) as is required now. It would be nice to avoid this somehow to prevent NixOS machines in depot having to carry around two versions of Nix. Maybe we can at least use a statically linked nixos-option? * //3p/{gerrit,gerrit_plugins}: update deps hash * //tvix/eval: adjust our nixVersion “user agent” so that it'll pass the new 2.3.17 minimum version nixpkgs prescribes (to check for zstd support when substituting from the binary cache). Change-Id: I4eb715afdc3dbb857340839f08ce86612aa7f117 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12805 Reviewed-by: flokli Autosubmit: sterni Tested-by: BuildkiteCI --- third_party/gerrit/default.nix | 2 +- third_party/gerrit_plugins/oauth/default.nix | 2 +- third_party/overlays/tvl.nix | 8 ++++++- third_party/sources/sources.json | 24 ++++++++++---------- tvix/eval/src/builtins/mod.rs | 2 +- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/third_party/gerrit/default.nix b/third_party/gerrit/default.nix index fdf4a8d9d..765b8ebab 100644 --- a/third_party/gerrit/default.nix +++ b/third_party/gerrit/default.nix @@ -27,7 +27,7 @@ pkgs.lib.makeOverridable depot.nix.buildBazelPackageNG rec { find "$dir" -name .git -print0 | xargs -0 rm -rf ''; }); - depsHash = "sha256-OS2kLXjtuWf+XRyQO2qGvEaAOvxqu20+gXR+fsCvpMc="; + depsHash = "sha256:114k8ck7056c415qncqmykwqrgprmxnaw3pdv50758mrgw7zdkpm"; patches = [ ./0001-Syntax-highlight-nix.patch diff --git a/third_party/gerrit_plugins/oauth/default.nix b/third_party/gerrit_plugins/oauth/default.nix index 811614d66..a02e2dd1f 100644 --- a/third_party/gerrit_plugins/oauth/default.nix +++ b/third_party/gerrit_plugins/oauth/default.nix @@ -11,7 +11,7 @@ buildGerritBazelPlugin rec { rev = "98231604d60788bb43490f1a301d792817ac8008"; hash = "sha256-AuVO1Yys8BYqGHZI/adszCUg0JM2v4Td4fe26LdOPLM="; }; - depsHash = "sha256-7SC4NXm4zGeJrYBqtEvcrLmsZmXEX8P21J0kwHBDBZ4="; + depsHash = "sha256:10py3vq9sfq5j4gjrlxff01vp346jbcygry06x4zc26xgnf4pa9r"; postOverlayPlugin = '' cp "${src}/external_plugin_deps.bzl" "$out/plugins/external_plugin_deps.bzl" ''; diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 3835f07c9..58c48ebf3 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -16,11 +16,17 @@ depot.nix.readTree.drvTargets { }; }; }; - nix_latest = super.nix.override ({ + nix_latest_stable = super.nix.override ({ # flaky tests, long painful build, see https://github.com/NixOS/nixpkgs/pull/266443 withAWS = false; }); + # No longer builds with Nix 2.3 after + # https://github.com/nixos/nixpkgs/commit/5f9d2d95721cdf20ace744f2db75ad70a7aedd3a + nixos-option = super.nixos-option.override { + nix = self.nix_latest_stable; + }; + home-manager = super.home-manager.overrideAttrs (_: { src = depot.third_party.sources.home-manager; version = "git-" diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index 232519fb4..9b834994e 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -29,10 +29,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "35b055009afd0107b69c286fca34d2ad98940d57", - "sha256": "0wqsfqc38zaz580x36vnxajrbj8miqh4dv7lkzd1mhzqk4428iyq", + "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", + "sha256": "17wic7qq5h8r8yd4s3fksy2myfyazmfkdzayf5i852hq3gywl3mv", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/35b055009afd0107b69c286fca34d2ad98940d57.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/f3a2ff69586f3a54b461526e5702b1a2f81e740a.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "impermanence": { @@ -77,10 +77,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", - "sha256": "03pmy2dv212mmxgcvwxinf3xy6m6zzr8ri71pda1lqggmll2na12", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "sha256": "127dk2l5fr0922an96rmlzg32vh6pxh7r6qyvkhwf20jdzg9k61r", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/76612b17c0ce71689921ca12d9ffdc9c23ce40b2.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/5e4fbfb6b3de1aa2872b76d49fafc942626e2add.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-stable": { @@ -101,10 +101,10 @@ "homepage": "", "owner": "oxalica", "repo": "rust-overlay", - "rev": "27570abfd3461875f11fc07c9b01c141a6332b4f", - "sha256": "1ylwpzfgswdwmvppr0scwp62nlg6h2smpf7pb5lwvv1hm0x0xgy2", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", + "sha256": "0cfd1dgkrzwc4xw0mxp4pw3cjxcr123wyl3lzj20jayj8hnfzvis", "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/27570abfd3461875f11fc07c9b01c141a6332b4f.tar.gz", + "url": "https://github.com/oxalica/rust-overlay/archive/0be641045af6d8666c11c2c40e45ffc9667839b5.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": "509528f6775ad69ab114f1e4b37b4359cae5cef4", - "sha256": "0zpn03xz78fmpq7hs175zlb40lwq2c6ha5il0lmccgv0rlfc5jjn", + "rev": "8e353a172f1baf11c0c917cfc9ae3c5eff8b9d06", + "sha256": "1n6c9qkj3slvsfs09hxk1ajiyl0rbvsk86vf5nab5lqf7c87jb0x", "type": "tarball", - "url": "https://github.com/RustSec/advisory-db/archive/509528f6775ad69ab114f1e4b37b4359cae5cef4.tar.gz", + "url": "https://github.com/RustSec/advisory-db/archive/8e353a172f1baf11c0c917cfc9ae3c5eff8b9d06.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index 0e5d1363f..babea3200 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -1587,7 +1587,7 @@ pub fn pure_builtins() -> Vec<(&'static str, Value)> { let mut result = pure_builtins::builtins(); // Pure-value builtins - result.push(("nixVersion", Value::from("2.3-compat-tvix-0.1"))); + result.push(("nixVersion", Value::from("2.3.17-compat-tvix-0.1"))); result.push(("langVersion", Value::Integer(6))); result.push(("null", Value::Null)); result.push(("true", Value::Bool(true)));