about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2024-12-02T18·37+0100
committerclbot <clbot@tvl.fyi>2024-12-29T15·02+0000
commit08981e63c6eaf7c7d74bfcceada4ac06af1cb2af (patch)
tree4b4a45e3c6ac585d33eb06528e843833da7eceb5
parent4dce88e9975b2cb83bb329dda7c1115cc5b0a509 (diff)
chore(3p/sources): Bump channels & overlays (2024-12-02) r/9041
* //tools/nixery/popcount:
  replace removed buildGoPackage with buildGoModule.

* //users/aspen/system/system/modules:
  pkgs.nerdfonts has been removed. Instead we have a
  pkgs.nerd-fonts attribute set that contains all fonts
  as individual derivations.

* //users/tazjin/presentations:
  The ms package was removed from texlive for some reason
  in the latest release. Replace it with the packages it
  bundles (according to CTAN).

* //tvix/verify-lang-tests:
  Test on latest Nix release 2.25.2.

* //tvix/*-go:
  regenerate code from protobufs.

Change-Id: I19fcb3a0267f929f6e7388aa69ad99ac53b62236
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12859
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: flokli <flokli@flokli.de>
Reviewed-by: aspen <root@gws.fyi>
Tested-by: BuildkiteCI
Diffstat
-rw-r--r--third_party/sources/sources.json24
-rw-r--r--tools/nixery/popcount/default.nix14
-rw-r--r--tvix/build-go/build.pb.go2
-rw-r--r--tvix/build-go/rpc_build.pb.go2
-rw-r--r--tvix/castore-go/castore.pb.go2
-rw-r--r--tvix/castore-go/rpc_blobstore.pb.go2
-rw-r--r--tvix/castore-go/rpc_directory.pb.go2
-rw-r--r--tvix/store-go/pathinfo.pb.go2
-rw-r--r--tvix/store-go/rpc_pathinfo.pb.go2
-rw-r--r--tvix/verify-lang-tests/default.nix2
-rw-r--r--users/aspen/system/system/modules/fonts.nix3
-rw-r--r--users/tazjin/presentations/bootstrapping-2018/default.nix5
-rw-r--r--users/tazjin/presentations/tvix-eval-2023/default.nix5
13 files changed, 39 insertions, 28 deletions
diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json
index 9b834994e5d9..fc6d757fd6f4 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": "f3a2ff69586f3a54b461526e5702b1a2f81e740a",
-        "sha256": "17wic7qq5h8r8yd4s3fksy2myfyazmfkdzayf5i852hq3gywl3mv",
+        "rev": "873e39d5f4437d2f3ab06881fea8e63e45e1d011",
+        "sha256": "0lb3gh4vaicagim7f0w4zz2lfzf87j1rxd5ggbw8m90zs2pk8kl1",
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/f3a2ff69586f3a54b461526e5702b1a2f81e740a.tar.gz",
+        "url": "https://github.com/nix-community/home-manager/archive/873e39d5f4437d2f3ab06881fea8e63e45e1d011.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "impermanence": {
@@ -77,10 +77,10 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
-        "sha256": "127dk2l5fr0922an96rmlzg32vh6pxh7r6qyvkhwf20jdzg9k61r",
+        "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
+        "sha256": "1fbj7shlmviilmgz5z2gp59j6xwgdr01jfh75qhixx06kib4305p",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5e4fbfb6b3de1aa2872b76d49fafc942626e2add.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/ac35b104800bff9028425fec3b6e8a41de2bbfff.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-stable": {
@@ -101,10 +101,10 @@
         "homepage": "",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
-        "sha256": "0cfd1dgkrzwc4xw0mxp4pw3cjxcr123wyl3lzj20jayj8hnfzvis",
+        "rev": "e66c0d43abf5bdefb664c3583ca8994983c332ae",
+        "sha256": "1ps3i3iii557ppsv7r05z1b1f61d06vc4c91b79g6naz6qi816b8",
         "type": "tarball",
-        "url": "https://github.com/oxalica/rust-overlay/archive/0be641045af6d8666c11c2c40e45ffc9667839b5.tar.gz",
+        "url": "https://github.com/oxalica/rust-overlay/archive/e66c0d43abf5bdefb664c3583ca8994983c332ae.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rustsec-advisory-db": {
@@ -113,10 +113,10 @@
         "homepage": "https://rustsec.org",
         "owner": "RustSec",
         "repo": "advisory-db",
-        "rev": "8e353a172f1baf11c0c917cfc9ae3c5eff8b9d06",
-        "sha256": "1n6c9qkj3slvsfs09hxk1ajiyl0rbvsk86vf5nab5lqf7c87jb0x",
+        "rev": "9dc4a0bb102451e3c71e1b639068aec5a3e1f5f3",
+        "sha256": "1r5lq9bv4z0r4rkd3agakfi6r0h5lr31h0k7lhmm3pdh28lfczp8",
         "type": "tarball",
-        "url": "https://github.com/RustSec/advisory-db/archive/8e353a172f1baf11c0c917cfc9ae3c5eff8b9d06.tar.gz",
+        "url": "https://github.com/RustSec/advisory-db/archive/9dc4a0bb102451e3c71e1b639068aec5a3e1f5f3.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/tools/nixery/popcount/default.nix b/tools/nixery/popcount/default.nix
index 4b16768e4e89..4acf2e883f55 100644
--- a/tools/nixery/popcount/default.nix
+++ b/tools/nixery/popcount/default.nix
@@ -1,13 +1,19 @@
-# Copyright 2022 The TVL Contributors
+# Copyright 2022, 2024 The TVL Contributors
 # SPDX-License-Identifier: Apache-2.0
 
-{ buildGoPackage }:
+{ buildGoModule }:
 
-buildGoPackage {
+buildGoModule {
   name = "nixery-popcount";
 
   src = ./.;
 
-  goPackagePath = "github.com/google/nixery/popcount";
+  vendorHash = null;
+
+  # https://nixos.org/manual/nixpkgs/stable/#buildGoPackage-migration
+  postPatch = ''
+    go mod init github.com/google/nixery/popcount
+  '';
+
   doCheck = true;
 }
diff --git a/tvix/build-go/build.pb.go b/tvix/build-go/build.pb.go
index b7adc024cc75..e42b19e39034 100644
--- a/tvix/build-go/build.pb.go
+++ b/tvix/build-go/build.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.35.2
 // 	protoc        (unknown)
 // source: tvix/build/protos/build.proto
 
diff --git a/tvix/build-go/rpc_build.pb.go b/tvix/build-go/rpc_build.pb.go
index e6cdb84f1669..2757fa31486e 100644
--- a/tvix/build-go/rpc_build.pb.go
+++ b/tvix/build-go/rpc_build.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.35.2
 // 	protoc        (unknown)
 // source: tvix/build/protos/rpc_build.proto
 
diff --git a/tvix/castore-go/castore.pb.go b/tvix/castore-go/castore.pb.go
index 9395a392be2e..68c1c68e7d10 100644
--- a/tvix/castore-go/castore.pb.go
+++ b/tvix/castore-go/castore.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.35.2
 // 	protoc        (unknown)
 // source: tvix/castore/protos/castore.proto
 
diff --git a/tvix/castore-go/rpc_blobstore.pb.go b/tvix/castore-go/rpc_blobstore.pb.go
index 90b131bff921..324d5a9532cd 100644
--- a/tvix/castore-go/rpc_blobstore.pb.go
+++ b/tvix/castore-go/rpc_blobstore.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.35.2
 // 	protoc        (unknown)
 // source: tvix/castore/protos/rpc_blobstore.proto
 
diff --git a/tvix/castore-go/rpc_directory.pb.go b/tvix/castore-go/rpc_directory.pb.go
index 27a4e9423036..5d4774fc8671 100644
--- a/tvix/castore-go/rpc_directory.pb.go
+++ b/tvix/castore-go/rpc_directory.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.35.2
 // 	protoc        (unknown)
 // source: tvix/castore/protos/rpc_directory.proto
 
diff --git a/tvix/store-go/pathinfo.pb.go b/tvix/store-go/pathinfo.pb.go
index 4941d80a8754..0b574ee8bb84 100644
--- a/tvix/store-go/pathinfo.pb.go
+++ b/tvix/store-go/pathinfo.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.35.2
 // 	protoc        (unknown)
 // source: tvix/store/protos/pathinfo.proto
 
diff --git a/tvix/store-go/rpc_pathinfo.pb.go b/tvix/store-go/rpc_pathinfo.pb.go
index 35733843059d..a5fea5fec2e6 100644
--- a/tvix/store-go/rpc_pathinfo.pb.go
+++ b/tvix/store-go/rpc_pathinfo.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.35.1
+// 	protoc-gen-go v1.35.2
 // 	protoc        (unknown)
 // source: tvix/store/protos/rpc_pathinfo.proto
 
diff --git a/tvix/verify-lang-tests/default.nix b/tvix/verify-lang-tests/default.nix
index e6de1c1f455c..1b099525aed3 100644
--- a/tvix/verify-lang-tests/default.nix
+++ b/tvix/verify-lang-tests/default.nix
@@ -11,7 +11,7 @@ let
 
   inherit (pkgs.nixVersions) nix_2_3;
   # The latest Nix version we've verified to work for our testing suite.
-  nix_latest_verified = pkgs.nixVersions.nix_2_24;
+  nix_latest_verified = pkgs.nixVersions.nix_2_25;
 
   parseTest = dir: baseName:
     let
diff --git a/users/aspen/system/system/modules/fonts.nix b/users/aspen/system/system/modules/fonts.nix
index 598336790a2d..85de89914b88 100644
--- a/users/aspen/system/system/modules/fonts.nix
+++ b/users/aspen/system/system/modules/fonts.nix
@@ -2,11 +2,10 @@
 {
   fonts = {
     packages = with pkgs; [
-      nerdfonts
       noto-fonts-emoji
       twitter-color-emoji
       weather-icons
-    ];
+    ] ++ builtins.filter lib.isDerivation (builtins.attrValues pkgs.nerd-fonts);
 
     fontconfig.defaultFonts.emoji = [ "Twitter Color Emoji" ];
   };
diff --git a/users/tazjin/presentations/bootstrapping-2018/default.nix b/users/tazjin/presentations/bootstrapping-2018/default.nix
index 2775d0b3fbbb..726e7064f2e1 100644
--- a/users/tazjin/presentations/bootstrapping-2018/default.nix
+++ b/users/tazjin/presentations/bootstrapping-2018/default.nix
@@ -17,7 +17,10 @@ let
       luaotfload
       luatex
       minted
-      ms
+      count1to
+      multitoc
+      prelim2e
+      ragged2e
       pgfopts
       scheme-basic
       translator;
diff --git a/users/tazjin/presentations/tvix-eval-2023/default.nix b/users/tazjin/presentations/tvix-eval-2023/default.nix
index a4d855197c5e..63323d5d8a05 100644
--- a/users/tazjin/presentations/tvix-eval-2023/default.nix
+++ b/users/tazjin/presentations/tvix-eval-2023/default.nix
@@ -16,7 +16,10 @@ let
       listings
       xetex
       minted
-      ms
+      count1to
+      multitoc
+      prelim2e
+      ragged2e
       pgfopts
       scheme-basic
       translator;
generated by cgit-pink 1.4.1 (git 2.44.2) at 2025-02-05T18·13+0000