mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/sources): Bump channels & overlays (2024-12-02)

Browse source 
* //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
This commit is contained in:
sterni 2024-12-02 19:37:27 +01:00 committed by clbot
parent 4dce88e997
commit 08981e63c6
13 changed files with 39 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
third_party/sources/sources.json vendored
View file

@ -29,10 +29,10 @@
"homepage": "https://nix-community.github.io/home-manager/", "homepage": "https://nix-community.github.io/home-manager/",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", "rev": "873e39d5f4437d2f3ab06881fea8e63e45e1d011",
"sha256": "17wic7qq5h8r8yd4s3fksy2myfyazmfkdzayf5i852hq3gywl3mv", "sha256": "0lb3gh4vaicagim7f0w4zz2lfzf87j1rxd5ggbw8m90zs2pk8kl1",
"type": "tarball", "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" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"impermanence": { "impermanence": {
@ -77,10 +77,10 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
"sha256": "127dk2l5fr0922an96rmlzg32vh6pxh7r6qyvkhwf20jdzg9k61r", "sha256": "1fbj7shlmviilmgz5z2gp59j6xwgdr01jfh75qhixx06kib4305p",
"type": "tarball", "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" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
@ -101,10 +101,10 @@
"homepage": "", "homepage": "",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "rev": "e66c0d43abf5bdefb664c3583ca8994983c332ae",
"sha256": "0cfd1dgkrzwc4xw0mxp4pw3cjxcr123wyl3lzj20jayj8hnfzvis", "sha256": "1ps3i3iii557ppsv7r05z1b1f61d06vc4c91b79g6naz6qi816b8",
"type": "tarball", "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" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"rustsec-advisory-db": { "rustsec-advisory-db": {
@ -113,10 +113,10 @@
"homepage": "https://rustsec.org", "homepage": "https://rustsec.org",
"owner": "RustSec", "owner": "RustSec",
"repo": "advisory-db", "repo": "advisory-db",
"rev": "8e353a172f1baf11c0c917cfc9ae3c5eff8b9d06", "rev": "9dc4a0bb102451e3c71e1b639068aec5a3e1f5f3",
"sha256": "1n6c9qkj3slvsfs09hxk1ajiyl0rbvsk86vf5nab5lqf7c87jb0x", "sha256": "1r5lq9bv4z0r4rkd3agakfi6r0h5lr31h0k7lhmm3pdh28lfczp8",
"type": "tarball", "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" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }

14
tools/nixery/popcount/default.nix
View file

@ -1,13 +1,19 @@
# Copyright 2022 The TVL Contributors # Copyright 2022, 2024 The TVL Contributors
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
{ buildGoPackage }: { buildGoModule }:
buildGoPackage { buildGoModule {
name = "nixery-popcount"; name = "nixery-popcount";
src = ./.; 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; doCheck = true;
} }

2
tvix/build-go/build.pb.go
View file

@ -3,7 +3,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.35.1 // protoc-gen-go v1.35.2
// protoc (unknown) // protoc (unknown)
// source: tvix/build/protos/build.proto // source: tvix/build/protos/build.proto

2
tvix/build-go/rpc_build.pb.go
View file

@ -3,7 +3,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.35.1 // protoc-gen-go v1.35.2
// protoc (unknown) // protoc (unknown)
// source: tvix/build/protos/rpc_build.proto // source: tvix/build/protos/rpc_build.proto

2
tvix/castore-go/castore.pb.go
View file

@ -3,7 +3,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.35.1 // protoc-gen-go v1.35.2
// protoc (unknown) // protoc (unknown)
// source: tvix/castore/protos/castore.proto // source: tvix/castore/protos/castore.proto

2
tvix/castore-go/rpc_blobstore.pb.go
View file

@ -3,7 +3,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.35.1 // protoc-gen-go v1.35.2
// protoc (unknown) // protoc (unknown)
// source: tvix/castore/protos/rpc_blobstore.proto // source: tvix/castore/protos/rpc_blobstore.proto

2
tvix/castore-go/rpc_directory.pb.go
View file

@ -3,7 +3,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.35.1 // protoc-gen-go v1.35.2
// protoc (unknown) // protoc (unknown)
// source: tvix/castore/protos/rpc_directory.proto // source: tvix/castore/protos/rpc_directory.proto

2
tvix/store-go/pathinfo.pb.go
View file

@ -3,7 +3,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.35.1 // protoc-gen-go v1.35.2
// protoc (unknown) // protoc (unknown)
// source: tvix/store/protos/pathinfo.proto // source: tvix/store/protos/pathinfo.proto

2
tvix/store-go/rpc_pathinfo.pb.go
View file

@ -3,7 +3,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.35.1 // protoc-gen-go v1.35.2
// protoc (unknown) // protoc (unknown)
// source: tvix/store/protos/rpc_pathinfo.proto // source: tvix/store/protos/rpc_pathinfo.proto

2
tvix/verify-lang-tests/default.nix
View file

@ -11,7 +11,7 @@ let
inherit (pkgs.nixVersions) nix_2_3; inherit (pkgs.nixVersions) nix_2_3;
# The latest Nix version we've verified to work for our testing suite. # 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: parseTest = dir: baseName:
let let

3
users/aspen/system/system/modules/fonts.nix
View file

@ -2,11 +2,10 @@
{ {
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs; [
nerdfonts
noto-fonts-emoji noto-fonts-emoji
twitter-color-emoji twitter-color-emoji
weather-icons weather-icons
]; ] ++ builtins.filter lib.isDerivation (builtins.attrValues pkgs.nerd-fonts);
fontconfig.defaultFonts.emoji = [ "Twitter Color Emoji" ]; fontconfig.defaultFonts.emoji = [ "Twitter Color Emoji" ];
}; };

5
users/tazjin/presentations/bootstrapping-2018/default.nix
View file

@ -17,7 +17,10 @@ let
luaotfload luaotfload
luatex luatex
minted minted
ms count1to
multitoc
prelim2e
ragged2e
pgfopts pgfopts
scheme-basic scheme-basic
translator; translator;

5
users/tazjin/presentations/tvix-eval-2023/default.nix
View file

@ -16,7 +16,10 @@ let
listings listings
xetex xetex
minted minted
ms count1to
multitoc
prelim2e
ragged2e
pgfopts pgfopts
scheme-basic scheme-basic
translator; translator;