From a95eedac3bf538faf511b2b86c488c930afe8f17 Mon Sep 17 00:00:00 2001 From: sterni Date: Mon, 2 Dec 2024 19:37:27 +0100 Subject: [PATCH] chore(3p/sources): Bump channels & overlays (2024-12-02) * //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 Reviewed-by: tazjin Reviewed-by: flokli Reviewed-by: aspen Tested-by: BuildkiteCI --- popcount/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/popcount/default.nix b/popcount/default.nix index 4b16768..4acf2e8 100644 --- a/popcount/default.nix +++ b/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; }