diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index 9b834994e..fc6d757fd 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///archive/.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///archive/.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///archive/.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///archive/.tar.gz" } } diff --git a/tools/nixery/popcount/default.nix b/tools/nixery/popcount/default.nix index 4b16768e4..4acf2e883 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 b7adc024c..e42b19e39 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 e6cdb84f1..2757fa314 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 9395a392b..68c1c68e7 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 90b131bff..324d5a953 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 27a4e9423..5d4774fc8 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 4941d80a8..0b574ee8b 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 357338430..a5fea5fec 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 e6de1c1f4..1b099525a 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 598336790..85de89914 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 2775d0b3f..726e7064f 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 a4d855197..63323d5d8 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;