diff --git a/nixos/modules/programs/calls.nix b/nixos/modules/programs/calls.nix index 59961625e5d9..08a223b408d4 100644 --- a/nixos/modules/programs/calls.nix +++ b/nixos/modules/programs/calls.nix @@ -14,6 +14,8 @@ in { }; config = mkIf cfg.enable { + programs.dconf.enable = true; + environment.systemPackages = [ pkgs.calls ]; diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 2ae4e80d5c3f..7000d45975fc 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -6,6 +6,10 @@ let cfg = config.services.plex; in { + imports = [ + (mkRemovedOptionModule [ "services" "plex" "managePlugins" ] "Please omit or define the option: `services.plex.extraPlugins' instead.") + ]; + options = { services.plex = { enable = mkEnableOption "Plex Media Server"; @@ -42,16 +46,6 @@ in ''; }; - managePlugins = mkOption { - type = types.bool; - default = true; - description = '' - If set to true, this option will cause all of the symlinks in Plex's - plugin directory to be removed and symlinks for paths specified in - to be added. - ''; - }; - extraPlugins = mkOption { type = types.listOf types.path; default = []; @@ -59,9 +53,7 @@ in A list of paths to extra plugin bundles to install in Plex's plugin directory. Every time the systemd unit for Plex starts up, all of the symlinks in Plex's plugin directory will be cleared and this module - will symlink all of the paths specified here to that directory. If - this behavior is undesired, set to - false. + will symlink all of the paths specified here to that directory. ''; }; diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index 279105605d34..e7e8c73c9c1b 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.6.0.2"; + version = "0.6.1.0"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "sha256-9goELqV7GP2/8w3Tw4Gph0UBgR/2T+wo2g+lhrQG4tA="; + sha256 = "sha256-zkDMZT1kKCLqNvvxZFKVuXFqZptX/LG/R9kRUcNJphw="; }; nativeBuildInputs = [ qmake pkg-config ]; diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 209e9f9e3bea..a0ceabf9d105 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "cointop"; version = "1.6.10"; diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 9f1e89c0df6b..ce49cfd69ca8 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "hello"; - version = "2.10"; + version = "2.12"; src = fetchurl { url = "mirror://gnu/hello/${pname}-${version}.tar.gz"; - sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"; + sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g"; }; doCheck = true; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 4c99319fbbc4..c1629afbd03e 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "cloudflared"; version = "2022.1.2"; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 002ef8a3bc83..64a8ebd4a99b 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGo117Module rec { +buildGoModule rec { pname = "cmctl"; version = "1.7.1"; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 2d9545bc13aa..42d2e63eaac5 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGo117Module rec { +buildGoModule rec { pname = "helm"; version = "3.8.0"; gitCommit = "d14138609b01886f544b2025f5000351c9eb092e"; diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index 7ee92fcbbda4..1b1089f655cf 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -1,13 +1,13 @@ { lib -, buildGo117Module +, buildGoModule , fetchFromGitHub , makeWrapper , git -, go_1_17 +, go , gnumake }: -buildGo117Module rec { +buildGoModule rec { pname = "kubebuilder"; version = "3.3.0"; @@ -23,8 +23,8 @@ buildGo117Module rec { ldflags = [ "-X main.kubeBuilderVersion=v${version}" - "-X main.goos=${go_1_17.GOOS}" - "-X main.goarch=${go_1_17.GOARCH}" + "-X main.goos=${go.GOOS}" + "-X main.goarch=${go.GOARCH}" "-X main.gitCommit=v${version}" "-X main.buildDate=v${version}" ]; @@ -34,7 +34,7 @@ buildGo117Module rec { postInstall = '' mv $out/bin/cmd $out/bin/kubebuilder wrapProgram $out/bin/kubebuilder \ - --prefix PATH : ${lib.makeBinPath [ go_1_17 gnumake ]} + --prefix PATH : ${lib.makeBinPath [ go gnumake ]} ''; allowGoReference = true; diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index b8fada3966c9..2db30361351b 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, buildGo117Module +, buildGoModule , coredns , installShellFiles , isFull ? false @@ -14,7 +14,7 @@ ] }: -buildGo117Module rec { +buildGoModule rec { inherit pname ; version = "1.4.0"; tags = lib.optionals enableGateway ["gateway"]; diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix index 5601bad7104a..7722a7109c21 100644 --- a/pkgs/applications/networking/cluster/linkerd/generic.nix +++ b/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -1,9 +1,8 @@ -{ lib, fetchFromGitHub, buildGo117Module, installShellFiles }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: { channel, version, sha256, vendorSha256 }: -# Fix-Me: Unlock buildGoModule version when #154059 is merged. -buildGo117Module rec { +buildGoModule rec { pname = "linkerd-${channel}"; inherit version vendorSha256; diff --git a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index 8eab4d793e63..54cecde09457 100644 --- a/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, go, removeReferencesTo, buildEnv }: +{ lib, fetchFromGitHub, buildGoModule, buildEnv }: let package = buildGoModule rec { @@ -30,21 +30,19 @@ let vendorSha256 = "sha256-g3INNvAQ124kBJSe5cnsIq1y8sWpPYKLwJONgbIUaoM="; - subPackages = [ "." ]; - - nativeBuildInputs = [ removeReferencesTo ]; - - # buildGoModule overrides normal buildPhase, can't use makeTargets - postBuild = '' + buildPhase = '' + runHook preBuild make build plugins + runHook postBuild ''; # tries to pull tests from network, and fails silently anyway doCheck = false; - postInstall = '' - mkdir -p $bin/bin - mv $out/bin/nomad-autoscaler $bin/bin/nomad-autoscaler + installPhase = '' + runHook preInstall + mkdir -p $bin/bin $out/bin + mv bin/nomad-autoscaler $bin/bin ln -s $bin/bin/nomad-autoscaler $out/bin/nomad-autoscaler for d in $outputs; do @@ -54,7 +52,6 @@ let # have out contain all of the plugins for plugin in bin/plugins/*; do - remove-references-to -t ${go} "$plugin" cp "$plugin" $out/share/ done @@ -73,6 +70,7 @@ let mv bin/plugins/prometheus $prometheus/share/ mv bin/plugins/target-value $target_value/share/ mv bin/plugins/threshold $threshold/share/ + runHook postInstall ''; # make toggle-able, so that overrided versions can disable this check if diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 819bf4741aa0..e9202205ea9a 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "talosctl"; version = "0.14.1"; diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index f8d4e5f52c88..b41e443ba327 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGo117Module rec { +buildGoModule rec { pname = "vcluster"; version = "0.5.3"; diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index b369a5475e53..43cf58db2581 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -7,6 +7,7 @@ , libsndfile , lpcnetfreedv , portaudio +, pulseaudio , speexdsp , hamlib , wxGTK31-gtk3 @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - sha256 = "1dzhf944vgla9a5ilcgwivhzgdbfaknqnwbpb071a0rz8rajnv0q"; + hash = "sha256-0E7r/7+AQRPIFAcE6O1WE0NYiKzAlBR0jKbssqWvRMU="; }; nativeBuildInputs = [ cmake ]; @@ -29,16 +30,15 @@ stdenv.mkDerivation rec { libsamplerate libsndfile lpcnetfreedv - portaudio speexdsp hamlib wxGTK31-gtk3 - ]; + ] ++ (if stdenv.isLinux then [ pulseaudio ] else [ portaudio ]); cmakeFlags = [ "-DUSE_INTERNAL_CODEC2:BOOL=FALSE" "-DUSE_STATIC_DEPS:BOOL=FALSE" - ]; + ] ++ lib.optionals stdenv.isLinux [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ]; meta = with lib; { homepage = "https://freedv.org/"; diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 781533694f22..ea8697482dab 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -1,4 +1,4 @@ -{ pkgs, idris-no-deps, overrides ? (self: super: {}) }: let +{ pkgs, config, idris-no-deps, overrides ? (self: super: {}) }: let inherit (pkgs.lib) callPackageWith fix' extends; /* Taken from haskell-modules/default.nix, should probably abstract this away */ @@ -145,8 +145,6 @@ posix = callPackage ./posix.nix {}; - protobuf = throw "idrisPackages.protobuf has been removed: abandoned by upstream"; # added 2022-02-06 - quantities = callPackage ./quantities.nix {}; rationals = callPackage ./rationals.nix {}; @@ -207,5 +205,8 @@ yampa = callPackage ./yampa.nix {}; - } // builtins_; + } // builtins_ // pkgs.lib.optionalAttrs (config.allowAliases or true) { + # removed packages + protobuf = throw "idrisPackages.protobuf has been removed: abandoned by upstream"; # Added 2022-02-06 + }; in fix' (extends overrides idrisPackages) diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index c57525c01d94..a31a4472e1c4 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,6 +1,12 @@ -{ lib, stdenv, fetchFromGitHub +{ lib +, stdenv +, fetchFromGitHub , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !enableStatic +# Multi-threading with OpenMP is disabled by default +# more info on https://www.cryptopp.com/wiki/OpenMP +, withOpenMP ? false +, llvmPackages }: stdenv.mkDerivation rec { @@ -19,17 +25,22 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace GNUmakefile \ - --replace "AR = libtool" "AR = ar" \ + --replace "AR = /usr/bin/libtool" "AR = ar" \ --replace "ARFLAGS = -static -o" "ARFLAGS = -cru" ''; + buildInputs = lib.optionals (stdenv.cc.isClang && withOpenMP) [ llvmPackages.openmp ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + buildFlags = lib.optional enableStatic "static" ++ lib.optional enableShared "shared" ++ [ "libcryptopp.pc" ]; + enableParallelBuilding = true; hardeningDisable = [ "fortify" ]; + CXXFLAGS = lib.optionals (withOpenMP) [ "-fopenmp" ]; doCheck = true; @@ -38,17 +49,21 @@ stdenv.mkDerivation rec { installTargets = [ "install-lib" ]; installFlags = [ "LDCONF=true" ]; + # TODO: remove postInstall hook with v8.7 -> https://github.com/weidai11/cryptopp/commit/230c558a postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.majorMinor version} ln -sr $out/lib/libcryptopp.so.${version} $out/lib/libcryptopp.so.${lib.versions.major version} ''; - meta = { - description = "Crypto++, a free C++ class library of cryptographic schemes"; + meta = with lib; { + description = "A free C++ class library of cryptographic schemes"; homepage = "https://cryptopp.com/"; - changelog = "https://raw.githubusercontent.com/weidai11/cryptopp/CRYPTOPP_${underscoredVersion}/History.txt"; - license = with lib.licenses; [ boost publicDomain ]; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ c0bw3b ]; + changelog = [ + "https://raw.githubusercontent.com/weidai11/cryptopp/CRYPTOPP_${underscoredVersion}/History.txt" + "https://github.com/weidai11/cryptopp/releases/tag/CRYPTOPP_${underscoredVersion}" + ]; + license = with licenses; [ boost publicDomain ]; + platforms = platforms.all; + maintainers = with maintainers; [ c0bw3b ]; }; } diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 3b1fb98a42ea..9a7374f4f49c 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,22 +1,36 @@ { lib, stdenv, fetchFromGitHub, cmake, openssh -, gfortran, mpi, blas, lapack +, mpi, blas, lapack } : -assert (!blas.isILP64) && (!lapack.isILP64); +assert blas.isILP64 == lapack.isILP64; stdenv.mkDerivation rec { pname = "scalapack"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Reference-ScaLAPACK"; repo = pname; rev = "v${version}"; - sha256 = "1c10d18gj3kvpmyv5q246x35hjxaqn4ygy1cygaydhyxnm4klzdj"; + sha256 = "0hiap5i9ik6xpvl721n2slanlqygagc1pg2bcjb27ans6balhsfh"; }; - nativeBuildInputs = [ cmake openssh gfortran ]; - buildInputs = [ mpi blas lapack ]; + passthru = { inherit (blas) isILP64; }; + + # Required to activate ILP64. + # See https://github.com/Reference-ScaLAPACK/scalapack/pull/19 + postPatch = lib.optionalString passthru.isILP64 '' + sed -i 's/INTSZ = 4/INTSZ = 8/g' TESTING/EIG/* TESTING/LIN/* + sed -i 's/INTGSZ = 4/INTGSZ = 8/g' TESTING/EIG/* TESTING/LIN/* + + # These tests are not adapted to ILP64 + sed -i '/xssep/d;/xsgsep/d;/xssyevr/d' TESTING/CMakeLists.txt + ''; + + nativeBuildInputs = [ cmake ]; + checkInputs = [ openssh ]; + buildInputs = [ blas lapack ]; + propagatedBuildInputs = [ mpi ]; doCheck = true; @@ -25,6 +39,11 @@ stdenv.mkDerivation rec { -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -DLAPACK_LIBRARIES="-llapack" -DBLAS_LIBRARIES="-lblas" + -DCMAKE_Fortran_COMPILER=${mpi}/bin/mpif90 + ${lib.optionalString passthru.isILP64 '' + -DCMAKE_Fortran_FLAGS="-fdefault-integer-8" + -DCMAKE_C_FLAGS="-DInt=long" + ''} ) ''; @@ -52,5 +71,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ costrouc markuskowa ]; }; - } diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix index 3833bf9850f8..ed80bc9f81f7 100644 --- a/pkgs/development/python-modules/jq/default.nix +++ b/pkgs/development/python-modules/jq/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jq"; - version = "1.2.1"; + version = "1.2.2"; src = fetchPypi { inherit pname version; - sha256 = "73ce588025495e6ebcda20bb9e64b6d9f3f1657c22895143ae243899ac710cbc"; + sha256 = "sha256-hqzixD8XtaZKOIh+3nLHuM4qsLz6ge4o/2Q06TUBCr4="; }; patches = [ diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index c3971c687505..b1389889b59a 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -16,7 +16,7 @@ }: buildPythonPackage rec { - version = "2021.08.0"; + version = "2022.02.0"; pname = "jupyter-repo2docker"; format = "setuptools"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "jupyterhub"; repo = "repo2docker"; rev = version; - sha256 = "10hcdag7ivyqyiqrmr9c48zynp8d81ic3px1ffgnaysih7lvkwb6"; + sha256 = "sha256-L7jUaGRea5HJnb/SX2K2qfvtFwkq9jfhrpvsu+LHH3M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-raisin/default.nix b/pkgs/development/python-modules/pytest-raisin/default.nix index 7412928062d7..1dc250da2ac7 100644 --- a/pkgs/development/python-modules/pytest-raisin/default.nix +++ b/pkgs/development/python-modules/pytest-raisin/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pytest-raisin"; - version = "0.3"; + version = "0.4"; format = "flit"; src = fetchFromGitHub { owner = "wimglenn"; repo = "pytest-raisin"; rev = "v${version}"; - sha256 = "73cOrsqlE04m6X3a6VwtRzfi24oqkdO3HjKQH61bU88="; + sha256 = "sha256-BI0SWy671DYDTPH4iO811ku6SzpH4ho7eQFUA8PmxW8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 784f73f71811..e2c788f1b3eb 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -7,21 +7,22 @@ , graphql-subscription-manager , python-dateutil , pytz +, pytest-asyncio , pytestCheckHook }: buildPythonPackage rec { pname = "pytibber"; - version = "0.22.0"; + version = "0.22.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - hash = "sha256-4eARNxVXtJtUC0oxym1kv5z+WkxgCHJZtN3MrIMA8+s="; + hash = "sha256-kzKY9ixsAkfee5En0IzYl5izeXq3xY/8bc5Kz/qkE7U="; }; propagatedBuildInputs = [ @@ -33,6 +34,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 8a8957459ee5..bf9e021cf1af 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.13.0"; + version = "3.14.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-L12faNLwjlEkJZ9s9aIyUHSk7x3n908EHCYU9jECiYQ="; + sha256 = "sha256-CRE5ghYJzo/w7d2zGh3IYUb2pl8we1XcoTo2ZKWxUZ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-copybutton/default.nix b/pkgs/development/python-modules/sphinx-copybutton/default.nix index 8d408d300c71..259a7dde28b3 100644 --- a/pkgs/development/python-modules/sphinx-copybutton/default.nix +++ b/pkgs/development/python-modules/sphinx-copybutton/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "sphinx-copybutton"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "executablebooks"; repo = "sphinx-copybutton"; rev = "v${version}"; - sha256 = "sha256-vrEIvQeP7AMXSme1PBp0ox5k8Q1rz+1cbHIO+o17Jqc="; + sha256 = "sha256-W27kCU/8NHoBtiAyA+CgNa00j6ck3CAaq1hLLGo60Ro="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/dstp/default.nix b/pkgs/development/tools/dstp/default.nix index c0a7f79eae19..7e3dafc5b228 100644 --- a/pkgs/development/tools/dstp/default.nix +++ b/pkgs/development/tools/dstp/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "dstp"; version = "0.4.0"; diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/development/tools/fq/default.nix index cafcc859b5ec..066375e2c967 100644 --- a/pkgs/development/tools/fq/default.nix +++ b/pkgs/development/tools/fq/default.nix @@ -1,11 +1,11 @@ { lib -, buildGo117Module +, buildGoModule , fetchFromGitHub , fq , testVersion }: -buildGo117Module rec { +buildGoModule rec { pname = "fq"; version = "0.0.3"; diff --git a/pkgs/development/tools/kubepug/default.nix b/pkgs/development/tools/kubepug/default.nix index d14ba450103a..82a130181e0c 100644 --- a/pkgs/development/tools/kubepug/default.nix +++ b/pkgs/development/tools/kubepug/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "kubepug"; version = "1.3.2"; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index d55ab087cbd2..a707ecd18227 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-02-04"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "a58b7b5efb058ca8ba597289af2ab49ee56bfc46"; - sha256 = "018kl822mpy52fb9dza65w99i8s8xak9jdw8pv0z0dqa4m9ya2xp"; + rev = "6d9399d863e6e921c87c1a95795109b872bd3925"; + sha256 = "0rdrdli1fqqasp3jl508ikv0g6qp5y8fzrn8sq9x7fkmg4sazqg3"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -329,12 +329,12 @@ final: prev: better-escape-nvim = buildVimPluginFrom2Nix { pname = "better-escape.nvim"; - version = "2022-01-14"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "2bee35e435310c7cc1333fff983268ae3f17b06f"; - sha256 = "1y6q2r462l7p4y9x5fn04902s41n4rr0xrwnry6vwp4rdlzldw8c"; + rev = "b227dd1380bbe226b117f9b758e146aa7c2e7d82"; + sha256 = "1jzfjnry03cv8nxf30h4x5pad5s55k4grzy1jp26sb3xjlpriz3p"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -497,12 +497,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-02-05"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "02d04d54e0e98086b13f3a6dd49db9b1161d0e6c"; - sha256 = "06hsz3y4bgn41kzpk17lwxhm7075kckzxi13j5qw2dvfnazahdg3"; + rev = "7287befe22ee7fac9b83c3b3499571f6fc8143ae"; + sha256 = "16rfwpmrz7y8d0s8xn8fx90q9b3gnnmnrm9ls7ss83ay7mfvsriy"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -917,12 +917,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-02-04"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "154653f540334ad2888b5d90b66fa9346ff5095a"; - sha256 = "1fm8nagw06nhrr7bqz30vcxgb9s0kd8x8b28f9jdvm7sl7jd61hv"; + rev = "86fa3b18144aaeaa06bf5a7150c8d676ef1acca3"; + sha256 = "0ppjxkh8nqhrypl46rfs4bgfmci9idbc589js6i2waqxzha7a9jf"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1182,12 +1182,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-02-05"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "e87f233f0bd12aca30b8fad079c69548481044e3"; - sha256 = "0rsd8y41l3dgls731q8hq851i470c2rz0ji9pzrnxkypypziaigg"; + rev = "98bc8a70b66c4ac05f6e648c43a278a6ff46b7a4"; + sha256 = "15p77qk7a6p9viczl0ym5izdvfbq2d67pgv597zcy7cxmxf5vgcs"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -1422,12 +1422,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2022-02-02"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "a8b12c00ffb9c0233881680ff4f20d6228d2239f"; - sha256 = "1q4vmzwlii9gk6a3wld79rv1gjc4ar4aslg7jc8pc3ixaggw7prj"; + rev = "acaf6b6282bfab2e28fbb8a01eea6da9b9c764af"; + sha256 = "19m1g79s55pyxcm2vg4kj52c9kkl3l2km07j9cwbq4qd8vm9vjil"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1724,12 +1724,12 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2022-01-04"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "5183d43fd2b3ccbb7747f85275a94aadc84c1b11"; - sha256 = "13mmc7wb4ngxwyjb7i990mf3lgvn2n90m0cy4y0zpmyghrxa2k9z"; + rev = "607d027a8440c01be9ef8f433563ab0c8567d4c1"; + sha256 = "0pcnx53n7n5gk97kbxias65lslif6ymsjqcsvlfx0qf2bwwsdz81"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; @@ -1978,12 +1978,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-02-01"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "3a93eb5f729f52452d2e8f7b7ee23ca9b02efd71"; - sha256 = "0ba1a4ajlnwc1vkp89xwjdnbrnnd569yfryv8xs2398q8spbp5qd"; + rev = "a4ff3c978c6b4740143223bf090a7acf7444e2f8"; + sha256 = "0v8vnr10hvxg4izniaaj3awf8c30qbcjs4wzrd25lbx6didvmx56"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2171,12 +2171,12 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2022-01-23"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "74a8b7d3f39dbcbcb920a99b63adc4867363e8c3"; - sha256 = "0c80shgzxz90213qhx7bvd1fkzkdq9g79m157dnwvzh121jmpdap"; + rev = "b02056f3c4b9d64d876bbf0a58d20791345a9364"; + sha256 = "16n78ylicrd7lh41g5hvd9vnnhkwbvj28c190k5zvrblyyhipn93"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; @@ -2219,12 +2219,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2022-02-03"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "a3e19f88a6734e75d245147eee9647f621fed420"; - sha256 = "1qxqdr1hmszji0ai3qd6z6raz4iq8si3sl12lhgny4sq4071304r"; + rev = "7f677946f3243e563782834f55df5f97c36db036"; + sha256 = "0vjpnvg1qqalrg449k8in76fvv1hwv343qg5z6k0gcqakc5dxl2p"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -2267,12 +2267,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2022-02-03"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "c32ac3b9d27564f83378a3883a921eee477652e2"; - sha256 = "07qm60xaddcdgq197mivd61z12z9rjzr0i4kp9wwfa1bn7np3531"; + rev = "fdd38cf969af53acfaebde75ce74bb9bdc44daca"; + sha256 = "0pl60wgsc8pfhbzi6rgxa8kd4pbw7qdk2xc161i1qxykjjkczgwa"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -2327,12 +2327,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-02-02"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "672482df3e80e4e30587c54d4c5e3a7f729ce039"; - sha256 = "1zb8z5qpq21rg36sb0wpz0lfzw03zr5hk2ar9m2y7gj1h5zfnlpr"; + rev = "11425117a9dcd533e5d42e083248ee0caea88b04"; + sha256 = "0lsd4c446q8f6ylf5g5vyi0gb81v59a4zlcwasvxw29giwxz3grv"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2603,12 +2603,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2022-01-09"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "f418a3750ed3a7f321287a39d2c9a56d8ad630aa"; - sha256 = "0imscbnaw02cgxn1qh42zz8divnv43mgccaq4hrancnhixr44lw9"; + rev = "75f73d3959a0df7ef3642fd5138acdb1ce50fdc8"; + sha256 = "08yvjh70saffnjjxdhis9sfcbkpmbgm8jl3ax0qal41crwrv7ibb"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2916,24 +2916,24 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-02-03"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "f58a065ca348ccaa4f0ff8c6c7d7aee108166e0c"; - sha256 = "1bhnj7b2d4hfcnj24n9cxzqb0bd0mlrpcqcnqlz64pgyzzlygmjh"; + rev = "e3a1037905c27a04b1725dc4d4006c4408bcd198"; + sha256 = "12328xrsdhcysxs9ww97ngf134ibcsalf2a48c7z7bd48s8vajj7"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; kommentary = buildVimPluginFrom2Nix { pname = "kommentary"; - version = "2022-01-21"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "b3nj5m1n"; repo = "kommentary"; - rev = "a190d052fca4ce74ffddb1c87c87ccf15f9111d5"; - sha256 = "0p2hyqv73gn1lrzf8yi84cfj199jx8ix0llm4jykkxlyx3qprwq2"; + rev = "83706980d6ed022317e45f7965c9393e0f4ad96e"; + sha256 = "0vipzqnscx2vqxskibbf0jf5ifrmxcwgz4ynahqgqg12z48jr4k2"; }; meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; }; @@ -3180,12 +3180,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2022-02-03"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "d648301eebffb49853e97ffd98a0b98cbacaf97d"; - sha256 = "0q5y23i005v0qqjsdh65xz3m3d7ca3ahqk14w7pqsd8xd2nng73b"; + rev = "0c01dc2e2cad214614352d372ed9d7438240488f"; + sha256 = "05ybrag1gkhapr1yvs7zz2qfqibnpf2h4lg3x6f0ag9g0khhh96c"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3359,12 +3359,12 @@ final: prev: lspkind-nvim = buildVimPluginFrom2Nix { pname = "lspkind-nvim"; - version = "2022-02-04"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "onsails"; repo = "lspkind-nvim"; - rev = "5cd692b43a401c9635cc9c5bdb7fe7c62733b41d"; - sha256 = "1j2hjy3wk6n2mykqicd0xh91sqq7y68qbalj0qpb35y9ljv9yycq"; + rev = "93e98a0c900327ce7e9be1cbf24aebbe7170e375"; + sha256 = "1c13ll09v16prhzgmv8pappck4x3ahhc5sizp6r61kb7k4mkfpfk"; }; meta.homepage = "https://github.com/onsails/lspkind-nvim/"; }; @@ -3407,24 +3407,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-02-02"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "aed7f2546177b5ffc8300f1ecd1c9e0e06779695"; - sha256 = "19qp67k2irs3nramxap284rq3c38qi2rxq4qvbivdazbwiq7df0z"; + rev = "98dc2dd3a2a07c251bcbd43048157aa56f901402"; + sha256 = "0c3q0ggw0qdi5b0mcvksps0v76rk6p7vcz1dg6c4y67irfjsd21p"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-01-28"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "35322c97b041542f95c85e87a8215892ea4137d5"; - sha256 = "0b6yxjsahy4ap6p9jvz2jvqg6akd8hkhd42pfz3krnwg85m7waiw"; + rev = "0997bc216a136f2847343d96040c9b0c90b661c9"; + sha256 = "1iyjbk6l7y35f72cpffddsj97j140vgg0kk5iyaq6mg8rcsq49lq"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3515,12 +3515,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-02-04"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "e57df0a28e3cec66f4c4287aca4324ad4c8bf278"; - sha256 = "066mk7vqc77d3zv4nx98mrfjr6gc4fwslwj2111gr0576s6xpqjx"; + rev = "a7c9069a55d136e6dc62fc107cb996df2eaebb55"; + sha256 = "1qblxq744ldzihb57b62ykjci19fa2v918610g8jb36gjrlmxdkd"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -3599,12 +3599,12 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2021-12-06"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "a6fc41f7630e675ca5f0aeb829ad1b88c73a7c63"; - sha256 = "08lls5zzlzglxx7hw19vid4kiqdsdnwahgw306vhqlhhx8wc00w3"; + rev = "c073406d58472a6c98206a05307d108a5a727e61"; + sha256 = "0ymg9gbw7a6k1lkm1w789z3vp5pzmwjx2vsm5n00jsz5lq8sv5l0"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -3983,12 +3983,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-02-05"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "97b2fae2e412ece34a25198336fb39f8d12e7e93"; - sha256 = "00w4nna66w6ikzdqjd66cfwp6jbbimmbky5wj8mpjgmm3a0h1s18"; + rev = "27578af8581ca109ac51f0f5d215d12bf6933be1"; + sha256 = "1bc0s8c9lbdzyycncz2cqkspb353h72hnqcd5v0vb19zbxvnhsqp"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4055,12 +4055,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-01-30"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "1fff44e04d137c143af8f555963c90533ef9ae89"; - sha256 = "1zffm9zmai82v3fnclp2nds3yiab0893kssyg0a2xyqp70xrh2hr"; + rev = "88bee216a0b1429d6301faa733712da84cf0e650"; + sha256 = "069y6ji6xnanzy3ad70lcgn5g3p2nxr62qn08fdhdrq6a75iz3ys"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -4295,12 +4295,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-02-04"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "ee96111ad262ab8f8713576106c236d032d8be3d"; - sha256 = "1nzf8s3br99hmj7g948rvv4i5cdb1sajhyky9cwxzpdnb8m1ndp0"; + rev = "e8a666829a3d803844f24daa4932e4f5fe76cbeb"; + sha256 = "0inl9dizwq2j3r2z7jsxdqmrq5iyq7b123x2n23dfzsvvv5s3279"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4367,12 +4367,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-02-03"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "a6527e65d805996436c7abe49565e3ac850777cd"; - sha256 = "0w6q8b0958713z0niyklk77l9213798bgfnlgw6sb28fqp1ims3j"; + rev = "3cace9658fa504e2090b668f6652cf86ba4e81ab"; + sha256 = "1ly17jywj4idwq52x471imj7b1xm7q0j8xak3khr5jc8n7mnwydg"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4571,24 +4571,24 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2022-01-19"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "3c0a1b7fddd63620ffe6d25fb85cb71ef68e0bd3"; - sha256 = "1h7h8r6sfi6kzlr0n5wwrlda3whraw4128jr0djh9jjfywhnlls0"; + rev = "6d6e936db0ad936039ef1a503c4b0bd0fe6286de"; + sha256 = "020ln7aq3h0rh5aslrgbdvjlbyvpyjxz9fa9lvsxx9bwcx6f1ci5"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-01-06"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "1c52ff7e3dcc2b89897a16bea7b9903888656154"; - sha256 = "03x39hdnnf81qmlhwg9czd9dda6j2df6w685n2x15x01ghg86h1h"; + rev = "60ea878d3f25155f8bcccc2a2f86393d2fa2ee10"; + sha256 = "1ii7ajxcjznq030q7xydx995w33whb88vwbijsihmgd3dcakjr4s"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -4679,12 +4679,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-02-02"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "531751ef03d77bf094f1fc07844b6c03ec4862bb"; - sha256 = "1izfl8r30pabn81ncfr8zpn2inqlrpf0nng18hhhic6p00y7bhak"; + rev = "2008c5cebf2b84c5e5f8a566480b022ab2e7ebab"; + sha256 = "0698i51s6dgcanw1iz9zhb8hk6ls2zrvas4i8sqpw7jwr9vnygah"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4703,24 +4703,24 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-02-02"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "6b333c8466cdc5cfe93b975a7f72cfdc0cca3795"; - sha256 = "11wq7rigmc9s0mmgw1w4qlg81izpnyxbmlsq9pjpgja28ya1dmdj"; + rev = "ffd1a3bc198b168b9bb5e777b26f11d8fa864a78"; + sha256 = "00lzypb2zrpr1w9jyiw4vad3sfr4ki4whgpg8cr5m9qzamwr87bs"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2022-01-09"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "bfd6503ce5e2949e17e4053ca00b9e6836fe94e7"; - sha256 = "07qw00rk087p2ipp4p6k2wanqca0zhwd050n103lld42kd1lqci0"; + rev = "80d363113355e431016bd0a477b3bd56c7d82d95"; + sha256 = "1jgg0zkwfbxyfqlq5xd4vhzklmgs5p3xi8amn9vmga7zkx33cy63"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -4739,12 +4739,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-02-02"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "d6f880728da487d0ac4f957835c46b3f2af91fca"; - sha256 = "0dvplgpkps9x2bcimhz9ybb55lxi62vxjfmq8vdabyjqdbvx33xw"; + rev = "2edf33d0eb3c358716d4474d6081d361c80f7aa3"; + sha256 = "07hc9v9whyxxmnsf95a5fmmdxaw800ppaj0d588lnbnx1hs3dmpm"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4811,24 +4811,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-02-01"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "99d65afd6ef05cc57f835451126e5c44db03cef1"; - sha256 = "0w9wnlf3zd7ais1nraivwsyqjgb3qj7d5c1nkgdr1j7hfz4lbhgi"; + rev = "e42a4337d0d9de4de5c0d4ab960f2101ef33f273"; + sha256 = "125j1ng5xr12wpqg9wymxlxgzw9v2alqb9fmpwg0mbf9aybip27k"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-02-04"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "c999f9aa135c0ea36981a886fe2a87733cb6d611"; - sha256 = "1nx6zyjg4h710yii4s8vcq1040zb90cw6b0zqbir7wx878bna1cj"; + rev = "d6e6581a256061449a8a039c792a93a4b4e86b85"; + sha256 = "1m1cm1lynaa8wslpy01hkxdp5kxnwxx570wpj2wy5x1xjl5pglgz"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4883,12 +4883,12 @@ final: prev: nvim-ts-autotag = buildVimPluginFrom2Nix { pname = "nvim-ts-autotag"; - version = "2022-01-04"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "32bc46ee8b21f88f87d97b976ae6674595b311b5"; - sha256 = "1daqlkr7a53g3rcmjdw2z2fnaqb0iz6dh5g1laddv4ni27ifm5rg"; + rev = "5bbdfdaa303c698f060035f37a91eaad8d2f8e27"; + sha256 = "1gw1r3w9largx945lblbfacr3kc6pgx4qf1lhsgvp11i5v7qj1z5"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; @@ -4919,12 +4919,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-02-01"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "2f8439282575ce75784fb22d528dec7fd2e31a2e"; - sha256 = "1xa44kbigdai26j54vflipjw7whi4racqjgq5yb3mn9ch8j0p5l4"; + rev = "e3294f687626b40754bb40ac2d636d166098b2fb"; + sha256 = "1lajkfxpky4f9bprgbsik6i9n625rbq6gpazfhwy8d9dp0g7c5m4"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -4955,12 +4955,12 @@ final: prev: nvim_context_vt = buildVimPluginFrom2Nix { pname = "nvim_context_vt"; - version = "2022-02-04"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "haringsrob"; repo = "nvim_context_vt"; - rev = "54a91761d340292b3436f22634ab3743156e24a9"; - sha256 = "1mf9wa5m8ba9bgqc1mqsf57qzcg0d6gi2lwpzkfcnb6cwmqd454m"; + rev = "07da9b402a3a31659cd0418d0a84dba0b1b8dbbf"; + sha256 = "1ccsbx9s7ic85mj1ls054vzw9isi7pp1caf1cb7ki5p79sr0drxi"; }; meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; }; @@ -5123,12 +5123,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-01-19"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "7182f0ddbca2dd6f6723633a84d47f4d26518191"; - sha256 = "1v9d6r94hgki1i8dq605w03d8kqfdqk589xsaxxfj4l4g6jmrsxn"; + rev = "e5c8c01374350b4fcfd56da2afc87434c51b3972"; + sha256 = "07ai0kwh5i6ka4kxfzz25rgi2f13s7cb24wk7swpasfxllsjypqp"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -5292,12 +5292,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence.nvim"; - version = "2022-01-18"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "a579a3906ed2cfc980aed6046047ed2ebe4fbd74"; - sha256 = "1q2gkdng7r386i8f04py3nhh5hy9vl8mj59c01v2i3iwix78rvf8"; + rev = "9aeb8e0cf3df82090955d609c9d64d74bf6b9afd"; + sha256 = "0qha4byqx0g048n2k9l1p066w0cps17nd77ij9mj79pdl9az1ylg"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -6329,12 +6329,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2022-01-20"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "88242397b4d2fc03d20db189da84869ffbc31b64"; - sha256 = "0x40nvkm64zwpifbm85ir4n96pyqwv6rrkdrl4a4k2rg4k0b24d1"; + rev = "a0343f009025c0457edc92ab83b5a8ee5626d114"; + sha256 = "14lqfkp6ldrdr67r2s5zjg9kml3llirsjbcvsczs0wmwmdl8r7bp"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -6401,12 +6401,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-01-14"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "9d1740d335a4ca1da0892369c02537a8523fd8f4"; - sha256 = "0vkakb7xf6y6yk3bhfaj61ayldsxrn3mqnch4qind2vvbnjsr9si"; + rev = "b6e2f29a9af35c141bf95a751e1cf628333efcb2"; + sha256 = "1mrbrnb8r0am34wbpkanka47aanw87yan6ykzs97mym5w101krpj"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -6847,12 +6847,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-02-01"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "c428cdf605658004ae067e862ca7ec3f3e22799d"; - sha256 = "04hh8gyzf29lsj727lpxy3np15m1gnz6llxqrsf7xdxxjcszzyam"; + rev = "2a06971ba1a5b3b4c0cbed996feb20d5662fdc43"; + sha256 = "06zc93rw2bkpdi8kli9wfw3h8br1kmfqhhqrdc1b0bjw1zcawwxh"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -6955,12 +6955,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-02-01"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "91759dd6aa976a48a398250f7e4a89e95ba883a7"; - sha256 = "12n9f5wlhg1bly92445px4x0f172dkvjcw9yffvyqxlzq8n41n66"; + rev = "cc6a3d9ac374078c16a49ace984d9130b307b5e6"; + sha256 = "15yl6pk9c9dal23jlfc356z4v26a84jhflw5v04y33wv57b1kdfa"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -7219,12 +7219,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-01-12"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "95935e66b9a3cd802900ac2d23ccaaf70145d857"; - sha256 = "1frp3al8jzcmjhcz13drw1gh0nsany5vpqnhcihl8mqd04g638ax"; + rev = "d0c67776f27eb49cccbd58008724bd6caa00ed8f"; + sha256 = "1nnwq2csz1nvj4si3y4b85sv8rihnbzxhwcm35dawki57qnvxkpw"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -7267,12 +7267,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2021-09-01"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "ab784d414148e16c8f6c737c14d115783da72c30"; - sha256 = "0ihw5v9rm32351ydfvsrmkq15hls7rri9d54xqfrzhrdmygyicjf"; + rev = "12468bc4271a6e3373662e9b9f9d59b30e4ccdea"; + sha256 = "04ilkr2gl96471hp6cxcqhqn3mm25hkaw0vgbzi1izpi6fqkps00"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -7315,12 +7315,12 @@ final: prev: vim-argwrap = buildVimPluginFrom2Nix { pname = "vim-argwrap"; - version = "2021-12-16"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "FooSoft"; repo = "vim-argwrap"; - rev = "c5de0769d8c00817d42ed6f1b2e7ea4cca2cbc8d"; - sha256 = "1qp21k9dlgh5gvd4x393xkalzfj36rchn17rg9jy3gij88p2xmbn"; + rev = "0c03483702ca3ded88653c1762ba3b25ab8a6393"; + sha256 = "0bl5aiycch25jq9vkv6j3xrz56adlb7jhvzz82hc9h0fiwzshjzn"; }; meta.homepage = "https://github.com/FooSoft/vim-argwrap/"; }; @@ -7567,12 +7567,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-02-02"; + version = "2022-02-05"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "bc7fe91691a1471b9c244e84c69a5fcc698f75ff"; - sha256 = "0xmd7r2j4kg5pcckx203pjgnsw2j14769cirb8w7l3jjcb87wh1v"; + rev = "40a748c201d44d1b910159f201754adfd88b52c2"; + sha256 = "098hf2b0p7csr4b4fwfn2772xpj1m2c0zg9zf8ysgrf20lqw31a2"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -8299,12 +8299,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2022-02-04"; + version = "2022-02-07"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "79d8a5258f485b7c7541bdc6dbf44fb8aa56e371"; - sha256 = "0ixwhwnh60ssxr5pxm3pqhkabpj812l6wc0pqm5xjpayvb5lnpcq"; + rev = "d38f75fdc237ed8ff2864b9e481ce2ec5b5504a0"; + sha256 = "1h3am33r40ssih8j1n3l939qmqgh7f7awwrqdpkvgj1wisiq2v21"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -8491,12 +8491,12 @@ final: prev: vim-glsl = buildVimPluginFrom2Nix { pname = "vim-glsl"; - version = "2021-11-13"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "tikhomirov"; repo = "vim-glsl"; - rev = "25f9a7dfca64787313fb4339866ff941b8974d61"; - sha256 = "0dm0nmglf7sr9rkxq4ya14pg1wrqfbv6pigj2f1hb0gf1n9bd6rz"; + rev = "28a6dfbcd96095226bee90985b7f12c5679dbbb6"; + sha256 = "051f0q5bkgp77pz0izh5mvqsmxy0rzlvriwq4j7qzslqk7i850p2"; }; meta.homepage = "https://github.com/tikhomirov/vim-glsl/"; }; @@ -8515,12 +8515,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-01-28"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "430bc227654abc3eb5e27a9052a857344ca08cdc"; - sha256 = "0wh3g0lilzi4rjlszjf5gys11zpqvyv53hy5gyjd72k0kkbfbc2k"; + rev = "d1e3a60213fba8ca4a6050ca3c71410960a77591"; + sha256 = "1igik71zcl70mi6fqsf55pk4g0sc891zfp0pnk086cy5klf6854v"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -9560,6 +9560,18 @@ final: prev: meta.homepage = "https://github.com/LnL7/vim-nix/"; }; + vim-nixhash = buildVimPluginFrom2Nix { + pname = "vim-nixhash"; + version = "2022-02-06"; + src = fetchFromGitHub { + owner = "symphorien"; + repo = "vim-nixhash"; + rev = "d6e3c5161ef2e3fbc4a4b68a785d958d97e25b7e"; + sha256 = "1mrprl6mqapjzcya643nzvwaf01r38knjg9xnfbpvlidfq38d3cw"; + }; + meta.homepage = "https://github.com/symphorien/vim-nixhash/"; + }; + vim-noctu = buildVimPluginFrom2Nix { pname = "vim-noctu"; version = "2015-06-27"; @@ -10606,12 +10618,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-01-02"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "5518103a7a5e4d761d7ca9dd8fdc6f1aed669402"; - sha256 = "19286aa4vsif684wfywagfibzbxvq7sf62z6rmci5shvd5zsrpfi"; + rev = "13ad9c4ce43538601eb9b94dae2c55dccb5cab7e"; + sha256 = "1v8g6is8aw0wlfmxypdkdnx2vd53f3k13i9sqyq3kayj32k22cwn"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -11448,12 +11460,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-02-04"; + version = "2022-02-06"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "cb75f97b2fad28bd5208eb2278f4f06ed2fc1ff9"; - sha256 = "18rj9c5rzqqj74337hcl34gasyn37xbm61w8p8vb2wb5kp2rqn95"; + rev = "becbae7acad2fd80eeeb266ddb29f4cb1cc7846a"; + sha256 = "0ckf7ypq6cdzpcs1cknqccdx3vx3cydq19jsh83znmc1qs6zr4ab"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index f4985c892f03..91979fd08665 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -772,6 +772,7 @@ sudormrfbin/cheatsheet.nvim sunaku/vim-dasht sunjon/Shade.nvim svermeulen/vim-subversive +symphorien/vim-nixhash t9md/vim-choosewin t9md/vim-smalls TaDaa/vimade diff --git a/pkgs/servers/irc/ergochat/default.nix b/pkgs/servers/irc/ergochat/default.nix index 1aa5f5158aa8..57f79ff916c3 100644 --- a/pkgs/servers/irc/ergochat/default.nix +++ b/pkgs/servers/irc/ergochat/default.nix @@ -1,6 +1,6 @@ -{ buildGo117Module, fetchFromGitHub, lib, nixosTests }: +{ buildGoModule, fetchFromGitHub, lib, nixosTests }: -buildGo117Module rec { +buildGoModule rec { pname = "ergo"; version = "2.9.1"; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 534368a19ecc..fe2a9e0b1634 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, buildGo117Package, buildEnv +{ lib, stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv # The suffix for the Mattermost version. , versionSuffix ? "nixpkgs" @@ -14,7 +14,7 @@ let goPackagePath = "github.com/mattermost/mattermost-server"; - mattermost-server-build = buildGo117Package rec { + mattermost-server-build = buildGoPackage rec { pname = "mattermost-server"; inherit version goPackagePath; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 7579db1c090d..a56ef8c835e6 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub, olm }: +{ lib, buildGoModule, fetchFromGitHub, olm }: -buildGo117Module rec { +buildGoModule rec { pname = "mautrix-whatsapp"; version = "0.2.3"; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index bb6c0b7f3846..c842f4462370 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: -buildGo117Module rec { +buildGoModule rec { pname = "grafana"; version = "8.3.4"; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 12b124b78415..1166855deb95 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGo117Module rec { +buildGoModule rec { pname = "telegraf"; version = "1.20.4"; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index bed1c4112c0f..ac57cc51339f 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -1,5 +1,5 @@ { lib -, buildGo117Module +, buildGoModule , rustPlatform , fetchFromGitHub , makeWrapper @@ -43,7 +43,7 @@ let sha256 = "sha256-oKvDXkxA73IJOi+ciBFVLkYcmeRUsTC+3rcYf64vDoY="; }; in -buildGo117Module rec { +buildGoModule rec { pname = "teleport"; inherit src version; diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 49f884cd8b3d..9bbdcbf81d5a 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -351,7 +351,8 @@ in rec { tar xvf ${hello.src} cd hello-* - ./configure --prefix=$out + # stdenv bootstrap tools ship a broken libiconv.dylib https://github.com/NixOS/nixpkgs/issues/158331 + am_cv_func_iconv=no ./configure --prefix=$out make make install diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index abaebc8aa4aa..f44b18f4683d 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "kopia"; version = "0.10.4"; diff --git a/pkgs/development/python-modules/mailman-rss/default.nix b/pkgs/tools/misc/mailman-rss/default.nix similarity index 100% rename from pkgs/development/python-modules/mailman-rss/default.nix rename to pkgs/tools/misc/mailman-rss/default.nix diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 28868e853734..3b939021b300 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "mailutils"; - version = "3.12"; + version = "3.13"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0n51ng1f8yf5zfsnh8s0pj9bnw6icb2r0y78gl2kzijaghhzlhvd"; + hash = "sha256-2SCXHctJh4oAmRF3T9ZATxPSe9EB4tWbZkooZZpAlMc="; }; postPatch = '' @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { -e 's/chmod [24]755/chmod 0755/' \ */Makefile{.in,.am} sed -i 's:/usr/lib/mysql:${libmysqlclient}/lib/mysql:' configure.ac - sed -i 's/0\.18/0.19/' configure.ac ''; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index a30c9f3bbdcd..494fb946ea6e 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo117Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo117Module rec { +buildGoModule rec { pname = "nebula"; version = "1.5.2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3804bbe1b2b7..c61c7f0ab1ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -285,9 +285,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - conftest = callPackage ../development/tools/conftest { - buildGoModule = buildGo117Module; - }; + conftest = callPackage ../development/tools/conftest { }; corgi = callPackage ../development/tools/corgi { }; @@ -329,9 +327,7 @@ with pkgs; eclipse-mat = callPackage ../development/tools/eclipse-mat { }; - evans = callPackage ../development/tools/evans { - buildGoModule = buildGo117Module; - }; + evans = callPackage ../development/tools/evans { }; firefly-desktop = callPackage ../applications/misc/firefly-desktop { }; @@ -357,9 +353,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - proto-contrib = callPackage ../development/tools/proto-contrib { - buildGoModule = buildGo117Module; - }; + proto-contrib = callPackage ../development/tools/proto-contrib { }; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; @@ -373,15 +367,11 @@ with pkgs; protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; - protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { - buildGoModule = buildGo117Module; - }; + protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { }; protoc-gen-twirp_swagger = callPackage ../development/tools/protoc-gen-twirp_swagger { }; - protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { - buildGoModule = buildGo117Module; - }; + protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; proton-caller = callPackage ../misc/emulators/proton-caller { }; @@ -535,17 +525,13 @@ with pkgs; graph-easy = callPackage ../tools/graphics/graph-easy { }; - packer = callPackage ../development/tools/packer { - buildGoModule = buildGo117Module; - }; + packer = callPackage ../development/tools/packer { }; packr = callPackage ../development/libraries/packr { }; perseus-cli = callPackage ../development/tools/perseus-cli { }; - pet = callPackage ../development/tools/pet { - buildGoModule = buildGo117Module; - }; + pet = callPackage ../development/tools/pet { }; pkger = callPackage ../development/libraries/pkger { }; @@ -929,9 +915,7 @@ with pkgs; wxGTK = wxGTK30; } // (config.aegisub or {})); - aerc = callPackage ../applications/networking/mailreaders/aerc { - buildGoModule = buildGo117Module; - }; + aerc = callPackage ../applications/networking/mailreaders/aerc { }; aerospike = callPackage ../servers/nosql/aerospike { }; @@ -1039,13 +1023,9 @@ with pkgs; gofu = callPackage ../applications/misc/gofu { }; - godns = callPackage ../tools/networking/godns { - buildGoModule = buildGo117Module; - }; + godns = callPackage ../tools/networking/godns { }; - godspeed = callPackage ../tools/networking/godspeed { - buildGoModule = buildGo117Module; - }; + godspeed = callPackage ../tools/networking/godspeed { }; fwbuilder = libsForQt5.callPackage ../tools/security/fwbuilder { }; @@ -1075,9 +1055,7 @@ with pkgs; tnat64 = callPackage ../tools/networking/tnat64 { }; - topicctl = callPackage ../tools/misc/topicctl { - buildGoModule = buildGo117Module; - }; + topicctl = callPackage ../tools/misc/topicctl { }; veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { }; @@ -1471,9 +1449,7 @@ with pkgs; aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; - aws-vault = callPackage ../tools/admin/aws-vault { - buildGoModule = buildGo117Module; - }; + aws-vault = callPackage ../tools/admin/aws-vault { }; aws-workspaces = callPackage ../applications/networking/remote/aws-workspaces { }; @@ -1511,25 +1487,19 @@ with pkgs; chaos = callPackage ../tools/networking/chaos { }; - charm = callPackage ../applications/misc/charm { - buildGoModule = buildGo117Module; - }; + charm = callPackage ../applications/misc/charm { }; chars = callPackage ../tools/text/chars { inherit (darwin.apple_sdk.frameworks) Security; }; - checkip = callPackage ../tools/networking/checkip { - buildGoModule = buildGo117Module; - }; + checkip = callPackage ../tools/networking/checkip { }; ec2-api-tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { }; - ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { - buildGoModule = buildGo117Module; - }; + ec2-metadata-mock = callPackage ../development/tools/ec2-metadata-mock { }; exoscale-cli = callPackage ../tools/admin/exoscale-cli { }; @@ -1811,9 +1781,7 @@ with pkgs; genymotion = callPackage ../development/mobile/genymotion { }; - galene = callPackage ../servers/web-apps/galene { - buildGoModule = buildGo117Module; - }; + galene = callPackage ../servers/web-apps/galene { }; gamecube-tools = callPackage ../development/tools/gamecube-tools { }; @@ -1955,9 +1923,7 @@ with pkgs; pass = callPackage ../tools/security/pass { }; - passphrase2pgp = callPackage ../tools/security/passphrase2pgp { - buildGoModule = buildGo117Module; - }; + passphrase2pgp = callPackage ../tools/security/passphrase2pgp { }; pass-git-helper = python3Packages.callPackage ../applications/version-management/git-and-tools/pass-git-helper { }; @@ -2215,9 +2181,7 @@ with pkgs; packetbeat6 journalbeat6; - inherit (callPackages ../misc/logging/beats/7.x.nix { - buildGoModule = buildGo117Module; - }) + inherit (callPackages ../misc/logging/beats/7.x.nix { }) filebeat7 heartbeat7 metricbeat7 @@ -2251,9 +2215,7 @@ with pkgs; blitz = callPackage ../development/libraries/blitz { }; - blockbook = callPackage ../servers/blockbook { - buildGoModule = buildGo117Module; - }; + blockbook = callPackage ../servers/blockbook { }; blockhash = callPackage ../tools/graphics/blockhash { }; @@ -2396,9 +2358,7 @@ with pkgs; btrbk = callPackage ../tools/backup/btrbk { }; - buildpack = callPackage ../development/tools/buildpack { - buildGoModule = buildGo117Module; - }; + buildpack = callPackage ../development/tools/buildpack { }; bottom-rs = callPackage ../tools/misc/bottom-rs { }; @@ -2531,9 +2491,7 @@ with pkgs; cassowary = callPackage ../tools/networking/cassowary { }; - croc = callPackage ../tools/networking/croc { - buildGoModule = buildGo117Module; - }; + croc = callPackage ../tools/networking/croc { }; cbftp = callPackage ../tools/networking/cbftp { }; @@ -2597,9 +2555,7 @@ with pkgs; clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; - clusterctl = callPackage ../applications/networking/cluster/clusterctl { - buildGoModule = buildGo117Module; - }; + clusterctl = callPackage ../applications/networking/cluster/clusterctl { }; coloredlogs = with python3Packages; toPythonApplication coloredlogs; @@ -2780,9 +2736,7 @@ with pkgs; dapr-cli = callPackage ../development/tools/dapr/cli {}; - dasel = callPackage ../applications/misc/dasel { - buildGoModule = buildGo117Module; - }; + dasel = callPackage ../applications/misc/dasel { }; dasher = callPackage ../applications/accessibility/dasher { }; @@ -2810,9 +2764,7 @@ with pkgs; ddate = callPackage ../tools/misc/ddate { }; - ddosify = callPackage ../development/tools/ddosify { - buildGoModule = buildGo117Module; - }; + ddosify = callPackage ../development/tools/ddosify { }; dduper = callPackage ../tools/filesystems/dduper { }; @@ -2979,9 +2931,7 @@ with pkgs; ekam = callPackage ../development/tools/build-managers/ekam { }; - eksctl = callPackage ../tools/admin/eksctl { - buildGoModule = buildGo117Module; - }; + eksctl = callPackage ../tools/admin/eksctl { }; electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { }; @@ -3040,9 +2990,7 @@ with pkgs; eternal-terminal = callPackage ../tools/networking/eternal-terminal {}; - extrude = callPackage ../tools/security/extrude { - buildGoModule = buildGo117Module; - }; + extrude = callPackage ../tools/security/extrude { }; f3 = callPackage ../tools/filesystems/f3 { }; @@ -3092,9 +3040,7 @@ with pkgs; firestarter = callPackage ../applications/misc/firestarter { }; - fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { - buildGoModule = buildGo117Module; - }; + fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { }; flitter = callPackage ../tools/misc/flitter { }; @@ -3247,9 +3193,7 @@ with pkgs; gosu = callPackage ../tools/misc/gosu { }; - gotify-cli = callPackage ../tools/misc/gotify-cli { - buildGoModule = buildGo117Module; - }; + gotify-cli = callPackage ../tools/misc/gotify-cli { }; gotify-desktop = callPackage ../tools/misc/gotify-desktop { }; @@ -3742,15 +3686,11 @@ with pkgs; stagit = callPackage ../development/tools/stagit { }; - starboard = callPackage ../applications/networking/cluster/starboard { - buildGoModule = buildGo117Module; - }; + starboard = callPackage ../applications/networking/cluster/starboard { }; statserial = callPackage ../tools/misc/statserial { }; - steampipe = callPackage ../tools/misc/steampipe { - buildGoModule = buildGo117Module; - }; + steampipe = callPackage ../tools/misc/steampipe { }; step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; @@ -3760,9 +3700,7 @@ with pkgs; string-machine = callPackage ../applications/audio/string-machine { }; - stripe-cli = callPackage ../tools/admin/stripe-cli { - buildGoModule = buildGo117Module; - }; + stripe-cli = callPackage ../tools/admin/stripe-cli { }; bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; @@ -4176,9 +4114,7 @@ with pkgs; ciopfs = callPackage ../tools/filesystems/ciopfs { }; - circleci-cli = callPackage ../development/tools/misc/circleci-cli { - buildGoModule = buildGo117Module; - }; + circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; circus = callPackage ../tools/networking/circus { }; @@ -4331,9 +4267,7 @@ with pkgs; ibus-engines = recurseIntoAttrs { anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; - bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { - go = go_1_17; - }; + bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo { }; hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; @@ -4381,13 +4315,9 @@ with pkgs; dual-function-keys = callPackage ../tools/inputmethods/interception-tools/dual-function-keys.nix { }; }; - age = callPackage ../tools/security/age { - buildGoModule = buildGo117Module; - }; + age = callPackage ../tools/security/age { }; - agebox = callPackage ../tools/security/agebox { - buildGoModule = buildGo117Module; - }; + agebox = callPackage ../tools/security/agebox { }; age-plugin-yubikey = callPackage ../tools/security/age-plugin-yubikey { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; @@ -4427,9 +4357,7 @@ with pkgs; checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; - checkmate = callPackage ../development/tools/checkmate { - buildGoModule = buildGo117Module; - }; + checkmate = callPackage ../development/tools/checkmate { }; civetweb = callPackage ../development/libraries/civetweb { }; @@ -5660,9 +5588,7 @@ with pkgs; garmintools = callPackage ../development/libraries/garmintools {}; - gau = callPackage ../tools/security/gau { - buildGoModule = buildGo117Module; - }; + gau = callPackage ../tools/security/gau { }; gauge = callPackage ../development/tools/gauge { }; @@ -5977,9 +5903,7 @@ with pkgs; gl2ps = callPackage ../development/libraries/gl2ps { }; - glab = callPackage ../applications/version-management/git-and-tools/glab { - buildGoModule = buildGo117Module; - }; + glab = callPackage ../applications/version-management/git-and-tools/glab { }; glitter = callPackage ../applications/version-management/git-and-tools/glitter { }; @@ -6134,9 +6058,7 @@ with pkgs; gopro = callPackage ../tools/video/gopro { }; - goreleaser = callPackage ../tools/misc/goreleaser { - buildGoModule = buildGo117Module; - }; + goreleaser = callPackage ../tools/misc/goreleaser { }; goreplay = callPackage ../tools/networking/goreplay { }; @@ -6407,9 +6329,7 @@ with pkgs; haskell-language-server = callPackage ../development/tools/haskell/haskell-language-server/withWrapper.nix { }; - hasmail = callPackage ../applications/networking/mailreaders/hasmail { - buildGoModule = buildGo117Module; - }; + hasmail = callPackage ../applications/networking/mailreaders/hasmail { }; haste-client = callPackage ../tools/misc/haste-client { }; @@ -6479,9 +6399,7 @@ with pkgs; heimdall-gui = heimdall.override { enableGUI = true; }; - headscale = callPackage ../servers/headscale { - buildGoModule = buildGo117Module; - }; + headscale = callPackage ../servers/headscale { }; heisenbridge = callPackage ../servers/heisenbridge { }; @@ -6560,9 +6478,7 @@ with pkgs; httptunnel = callPackage ../tools/networking/httptunnel { }; - httpx = callPackage ../tools/security/httpx { - buildGoModule = buildGo117Module; - }; + httpx = callPackage ../tools/security/httpx { }; hurl = callPackage ../tools/networking/hurl { }; @@ -7315,9 +7231,7 @@ with pkgs; mxt-app = callPackage ../misc/mxt-app { }; - naabu = callPackage ../tools/security/naabu { - buildGoModule = buildGo117Module; - }; + naabu = callPackage ../tools/security/naabu { }; nagstamon = callPackage ../tools/misc/nagstamon { pythonPackages = python3Packages; @@ -7335,9 +7249,7 @@ with pkgs; ncrack = callPackage ../tools/security/ncrack { }; - nerdctl = callPackage ../applications/networking/cluster/nerdctl { - buildGoModule = buildGo117Module; - }; + nerdctl = callPackage ../applications/networking/cluster/nerdctl { }; netdata = callPackage ../tools/system/netdata { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; @@ -7354,9 +7266,7 @@ with pkgs; nyxt = callPackage ../applications/networking/browsers/nyxt { }; - nfpm = callPackage ../tools/package-management/nfpm { - buildGoModule = buildGo117Module; - }; + nfpm = callPackage ../tools/package-management/nfpm { }; nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { }; @@ -7634,9 +7544,7 @@ with pkgs; liquidctl = with python3Packages; toPythonApplication liquidctl; - lmp = callPackage ../tools/security/lmp { - buildGoModule = buildGo117Module; - }; + lmp = callPackage ../tools/security/lmp { }; localtime = callPackage ../tools/system/localtime { }; @@ -7873,9 +7781,7 @@ with pkgs; mimetic = callPackage ../development/libraries/mimetic { }; - minio-client = callPackage ../tools/networking/minio-client { - buildGoModule = buildGo117Module; - }; + minio-client = callPackage ../tools/networking/minio-client { }; minio-certgen = callPackage ../tools/security/minio-certgen { }; @@ -8215,10 +8121,7 @@ with pkgs; nvidiaGpuSupport = config.cudaSupport or false; }; - nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { - go = go_1_17; - buildGoModule = buildGo117Module; - }; + nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { }; @@ -8601,12 +8504,8 @@ with pkgs; opae = callPackage ../development/libraries/opae { }; - opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { - buildGoModule = buildGo117Module; - }; - opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { - buildGoModule = buildGo117Module; - }; + opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { }; + opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { }; opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; @@ -8787,9 +8686,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit; }; - otpauth = callPackage ../tools/security/otpauth { - buildGoModule = buildGo117Module; - }; + otpauth = callPackage ../tools/security/otpauth { }; pcsclite = callPackage ../tools/security/pcsclite { inherit (darwin.apple_sdk.frameworks) IOKit; @@ -8873,9 +8770,7 @@ with pkgs; phodav = callPackage ../tools/networking/phodav { }; - photon-rss = callPackage ../applications/networking/feedreaders/photon { - buildGoModule = buildGo117Module; - }; + photon-rss = callPackage ../applications/networking/feedreaders/photon { }; pim6sd = callPackage ../servers/pim6sd { }; @@ -9292,9 +9187,7 @@ with pkgs; ratools = callPackage ../tools/networking/ratools { }; - ratt = callPackage ../applications/misc/ratt { - buildGoModule = buildGo117Module; - }; + ratt = callPackage ../applications/misc/ratt { }; rc = callPackage ../shells/rc { }; @@ -9624,9 +9517,7 @@ with pkgs; scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { }; - scorecard = callPackage ../tools/security/scorecard { - buildGoModule = buildGo117Module; - }; + scorecard = callPackage ../tools/security/scorecard { }; scream = callPackage ../applications/audio/scream { }; @@ -9674,9 +9565,7 @@ with pkgs; skim = callPackage ../tools/misc/skim { }; - seaweedfs = callPackage ../applications/networking/seaweedfs { - buildGoModule = buildGo117Module; - }; + seaweedfs = callPackage ../applications/networking/seaweedfs { }; sec = callPackage ../tools/admin/sec { }; @@ -9830,9 +9719,7 @@ with pkgs; # Not updated upstream since 2018, doesn't support qt newer than 5.12 sleepyhead = libsForQt512.callPackage ../applications/misc/sleepyhead {}; - slides = callPackage ../applications/misc/slides { - buildGoModule = buildGo117Module; - }; + slides = callPackage ../applications/misc/slides { }; slirp4netns = callPackage ../tools/networking/slirp4netns { }; @@ -9899,9 +9786,7 @@ with pkgs; spicy = callPackage ../development/tools/spicy { }; - spire = callPackage ../tools/security/spire { - buildGoModule = buildGo117Module; - }; + spire = callPackage ../tools/security/spire { }; # to match naming of other package repositories spire-agent = spire.agent; spire-server = spire.server; @@ -10132,9 +10017,7 @@ with pkgs; subsonic = callPackage ../servers/misc/subsonic { }; - subfinder = callPackage ../tools/networking/subfinder { - buildGoModule = buildGo117Module; - }; + subfinder = callPackage ../tools/networking/subfinder { }; subzerod = with python3Packages; toPythonApplication subzerod; @@ -10626,9 +10509,7 @@ with pkgs; typos = callPackage ../development/tools/typos { }; - tz = callPackage ../tools/misc/tz { - buildGoModule = buildGo117Module; - }; + tz = callPackage ../tools/misc/tz { }; u9fs = callPackage ../servers/u9fs { }; @@ -10716,13 +10597,9 @@ with pkgs; uwufetch = callPackage ../tools/misc/uwufetch { }; - v2ray = callPackage ../tools/networking/v2ray { - buildGoModule = buildGo117Module; - }; + v2ray = callPackage ../tools/networking/v2ray { }; - v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { - pkgsBuildBuild.buildGoModule = pkgsBuildBuild.buildGo117Module; - }; + v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { }; v2ray-geoip = callPackage ../data/misc/v2ray-geoip { }; @@ -11502,9 +11379,7 @@ with pkgs; zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; - zsh-history = callPackage ../shells/zsh/zsh-history { - buildGoModule = buildGo117Module; - }; + zsh-history = callPackage ../shells/zsh/zsh-history { }; zsh-history-search-multi-word = callPackage ../shells/zsh/zsh-history-search-multi-word { }; @@ -11936,9 +11811,7 @@ with pkgs; dasm = callPackage ../development/compilers/dasm { }; - dbmate = callPackage ../development/tools/database/dbmate { - buildGoModule = buildGo117Module; - }; + dbmate = callPackage ../development/tools/database/dbmate { }; devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; @@ -13680,9 +13553,7 @@ with pkgs; io = callPackage ../development/interpreters/io { }; - ivy = callPackage ../development/interpreters/ivy { - buildGoModule = buildGo117Module; - }; + ivy = callPackage ../development/interpreters/ivy { }; j = callPackage ../development/interpreters/j { stdenv = clangStdenv; @@ -14205,9 +14076,7 @@ with pkgs; abuild = callPackage ../development/tools/abuild { }; - actionlint = callPackage ../development/tools/analysis/actionlint { - buildGoModule = buildGo117Module; - }; + actionlint = callPackage ../development/tools/analysis/actionlint { }; adtool = callPackage ../tools/admin/adtool { }; @@ -14396,9 +14265,7 @@ with pkgs; buildozer = bazel-buildtools; unused_deps = bazel-buildtools; - bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { - buildGoModule = buildGo117Module; - }; + bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; bazel-watcher = callPackage ../development/tools/bazel-watcher { }; @@ -14511,9 +14378,7 @@ with pkgs; buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { }; - bump = callPackage ../development/tools/github/bump { - buildGoModule = buildGo117Module; - }; + bump = callPackage ../development/tools/github/bump { }; libbpf = callPackage ../os-specific/linux/libbpf { }; @@ -14757,9 +14622,7 @@ with pkgs; cli11 = callPackage ../development/tools/misc/cli11 { }; - datree = callPackage ../development/tools/datree { - buildGoModule = buildGo117Module; - }; + datree = callPackage ../development/tools/datree { }; dcadec = callPackage ../development/tools/dcadec { }; @@ -14819,9 +14682,7 @@ with pkgs; doit = with python3Packages; toPythonApplication doit; - dolt = callPackage ../servers/sql/dolt { - buildGoModule = buildGo117Module; - }; + dolt = callPackage ../servers/sql/dolt { }; dot2tex = with python3.pkgs; toPythonApplication dot2tex; @@ -15140,9 +15001,7 @@ with pkgs; jpexs = callPackage ../development/tools/jpexs { }; - k0sctl = callPackage ../applications/networking/cluster/k0sctl { - buildGoModule = buildGo117Module; - }; + k0sctl = callPackage ../applications/networking/cluster/k0sctl { }; k2tf = callPackage ../development/tools/misc/k2tf { }; @@ -15192,13 +15051,9 @@ with pkgs; kubeprompt = callPackage ../development/tools/kubeprompt { }; - kubescape = callPackage ../tools/security/kubescape { - buildGoModule = buildGo117Module; - }; + kubescape = callPackage ../tools/security/kubescape { }; - kubesec = callPackage ../tools/security/kubesec { - buildGoModule = buildGo117Module; - }; + kubesec = callPackage ../tools/security/kubesec { }; kubespy = callPackage ../applications/networking/cluster/kubespy { }; @@ -15704,9 +15559,7 @@ with pkgs; swiftformat = callPackage ../development/tools/swiftformat { }; - symfony-cli = callPackage ../development/tools/symfony-cli { - buildGoModule = buildGo117Module; - }; + symfony-cli = callPackage ../development/tools/symfony-cli { }; swiftshader = callPackage ../development/libraries/swiftshader { }; @@ -15749,16 +15602,12 @@ with pkgs; tytools = libsForQt5.callPackage ../development/embedded/tytools { }; - terracognita = callPackage ../development/tools/misc/terracognita { - buildGoModule = buildGo117Module; - }; + terracognita = callPackage ../development/tools/misc/terracognita { }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; - terraformer = callPackage ../development/tools/misc/terraformer { - buildGoModule = buildGo117Module; - }; + terraformer = callPackage ../development/tools/misc/terraformer { }; terrascan = callPackage ../tools/security/terrascan { }; @@ -15783,9 +15632,7 @@ with pkgs; time-ghc-modules = callPackage ../development/tools/time-ghc-modules { }; - tflint = callPackage ../development/tools/analysis/tflint { - buildGoModule = buildGo117Module; - }; + tflint = callPackage ../development/tools/analysis/tflint { }; tfsec = callPackage ../development/tools/analysis/tfsec { }; @@ -15924,9 +15771,7 @@ with pkgs; yq = python3.pkgs.toPythonApplication python3.pkgs.yq; - yq-go = callPackage ../development/tools/yq-go { - buildGoModule = buildGo117Module; - }; + yq-go = callPackage ../development/tools/yq-go { }; ytt = callPackage ../development/tools/ytt {}; @@ -16731,9 +16576,7 @@ with pkgs; ganv = callPackage ../development/libraries/ganv { }; - garble = callPackage ../build-support/go/garble.nix { - buildGoModule = buildGo117Module; - }; + garble = callPackage ../build-support/go/garble.nix { }; gcab = callPackage ../development/libraries/gcab { }; @@ -18403,9 +18246,7 @@ with pkgs; libmad = callPackage ../development/libraries/libmad { }; - llama = callPackage ../applications/misc/llama { - buildGoModule = buildGo117Module; - }; + llama = callPackage ../applications/misc/llama { }; malcontent = callPackage ../development/libraries/malcontent { }; @@ -19619,9 +19460,7 @@ with pkgs; protobufc = callPackage ../development/libraries/protobufc/1.3.nix { }; - protolock = callPackage ../development/libraries/protolock { - buildGoModule = buildGo117Module; - }; + protolock = callPackage ../development/libraries/protolock { }; protozero = callPackage ../development/libraries/protozero { }; @@ -20377,9 +20216,7 @@ with pkgs; triehash = callPackage ../tools/misc/triehash { }; - trillian = callPackage ../tools/misc/trillian { - buildGoModule = buildGo117Module; - }; + trillian = callPackage ../tools/misc/trillian { }; twolame = callPackage ../development/libraries/twolame { }; @@ -20440,9 +20277,7 @@ with pkgs; vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; - vale = callPackage ../tools/text/vale { - buildGoModule = buildGo117Module; - }; + vale = callPackage ../tools/text/vale { }; valhalla = callPackage ../development/libraries/valhalla { boost = boost.override { enablePython = true; python = python38; }; @@ -20703,13 +20538,9 @@ with pkgs; yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; - yubikey-agent = callPackage ../tools/security/yubikey-agent { - buildGoModule = buildGo117Module; - }; + yubikey-agent = callPackage ../tools/security/yubikey-agent { }; - yubikey-touch-detector = callPackage ../tools/security/yubikey-touch-detector { - buildGoModule = buildGo117Module; - }; + yubikey-touch-detector = callPackage ../tools/security/yubikey-touch-detector { }; zchunk = callPackage ../development/libraries/zchunk { }; @@ -20987,9 +20818,7 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; - alps = callPackage ../servers/alps { - buildGoModule = buildGo117Module; - }; + alps = callPackage ../servers/alps { }; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = apacheHttpd_2_4; @@ -21105,9 +20934,7 @@ with pkgs; clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; - clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { - buildGoModule = buildGo117Module; - }; + clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { }; couchdb3 = callPackage ../servers/http/couchdb/3.nix { erlang = erlangR22; @@ -21158,7 +20985,6 @@ with pkgs; engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; }; envoy = callPackage ../servers/http/envoy { - go = go_1_17; jdk = openjdk11; gn = gn1924; }; @@ -21284,9 +21110,7 @@ with pkgs; https-dns-proxy = callPackage ../servers/dns/https-dns-proxy { }; - hydron = callPackage ../servers/hydron { - buildGoModule = buildGo117Module; - }; + hydron = callPackage ../servers/hydron { }; hyprspace = callPackage ../applications/networking/hyprspace { inherit (darwin) iproute2mac; }; @@ -21354,9 +21178,7 @@ with pkgs; lighttpd = callPackage ../servers/http/lighttpd { }; - livepeer = callPackage ../servers/livepeer { - buildGoModule = buildGo117Module; - }; + livepeer = callPackage ../servers/livepeer { }; lwan = callPackage ../servers/http/lwan { }; @@ -21366,7 +21188,7 @@ with pkgs; mailman = callPackage ../servers/mail/mailman/wrapped.nix { }; - mailman-rss = callPackage ../development/python-modules/mailman-rss { }; + mailman-rss = callPackage ../tools/misc/mailman-rss { }; mailman-web = with python3.pkgs; toPythonApplication mailman-web; @@ -21385,9 +21207,7 @@ with pkgs; mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - matterbridge = callPackage ../servers/matterbridge { - buildGoModule = buildGo117Module; - }; + matterbridge = callPackage ../servers/matterbridge { }; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; @@ -21399,9 +21219,7 @@ with pkgs; micronaut = callPackage ../development/tools/micronaut {}; - minio = callPackage ../servers/minio { - buildGoModule = buildGo117Module; - }; + minio = callPackage ../servers/minio { }; mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { }; @@ -21518,9 +21336,7 @@ with pkgs; nsq = callPackage ../servers/nsq { }; - oauth2-proxy = callPackage ../servers/oauth2-proxy { - buildGoModule = buildGo117Module; - }; + oauth2-proxy = callPackage ../servers/oauth2-proxy { }; openbgpd = callPackage ../servers/openbgpd { }; @@ -21577,9 +21393,7 @@ with pkgs; quark = callPackage ../servers/http/quark { }; - soft-serve = callPackage ../servers/soft-serve { - buildGoModule = buildGo117Module; - }; + soft-serve = callPackage ../servers/soft-serve { }; sympa = callPackage ../servers/mail/sympa { }; @@ -21712,12 +21526,8 @@ with pkgs; }; influxdb = callPackage ../servers/nosql/influxdb { }; - influxdb2-server = callPackage ../servers/nosql/influxdb2 { - buildGoModule = buildGo117Module; - }; - influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { - buildGoModule = buildGo117Module; - }; + influxdb2-server = callPackage ../servers/nosql/influxdb2 { }; + influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { }; # For backwards compatibility with older versions of influxdb2, # which bundled the server and CLI into the same derivation. Will be # removed in a few releases. @@ -22069,9 +21879,7 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { - buildGoModule = buildGo117Module; - }; + tailscale = callPackage ../servers/tailscale { }; thanos = callPackage ../servers/monitoring/thanos { }; @@ -22331,9 +22139,7 @@ with pkgs; cachefilesd = callPackage ../os-specific/linux/cachefilesd { }; - cariddi = callPackage ../tools/security/cariddi { - buildGoModule = buildGo117Module; - }; + cariddi = callPackage ../tools/security/cariddi { }; checkpolicy = callPackage ../os-specific/linux/checkpolicy { }; @@ -22356,9 +22162,7 @@ with pkgs; coredns = callPackage ../servers/dns/coredns { }; - corerad = callPackage ../tools/networking/corerad { - buildGoModule = buildGo117Module; - }; + corerad = callPackage ../tools/networking/corerad { }; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; @@ -22479,9 +22283,7 @@ with pkgs; gfxtablet = callPackage ../os-specific/linux/gfxtablet {}; - gmailctl = callPackage ../applications/networking/gmailctl { - buildGoModule = buildGo117Module; - }; + gmailctl = callPackage ../applications/networking/gmailctl { }; gomp = callPackage ../applications/version-management/gomp { }; @@ -22886,9 +22688,7 @@ with pkgs; open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; - air = callPackage ../development/tools/air { - buildGoModule = buildGo117Module; - }; + air = callPackage ../development/tools/air { }; delve = callPackage ../development/tools/delve { }; @@ -22952,9 +22752,7 @@ with pkgs; gotools = callPackage ../development/tools/gotools { }; - gotop = callPackage ../tools/system/gotop { - buildGoModule = buildGo117Module; - }; + gotop = callPackage ../tools/system/gotop { }; go-migrate = callPackage ../development/tools/go-migrate { }; @@ -24006,9 +23804,7 @@ with pkgs; nuclear = callPackage ../applications/audio/nuclear { }; - nuclei = callPackage ../tools/security/nuclei { - buildGoModule = buildGo117Module; - }; + nuclei = callPackage ../tools/security/nuclei { }; nullmailer = callPackage ../servers/mail/nullmailer { stdenv = gccStdenv; @@ -24648,9 +24444,7 @@ with pkgs; bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; - blocky = callPackage ../applications/networking/blocky { - buildGoModule = buildGo117Module; - }; + blocky = callPackage ../applications/networking/blocky { }; cadence = libsForQt5.callPackage ../applications/audio/cadence { }; @@ -25201,13 +24995,9 @@ with pkgs; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; docker-machine = callPackage ../applications/networking/cluster/docker-machine { }; - docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { - buildGoModule = buildGo117Module; - }; + docker-machine-hyperkit = callPackage ../applications/networking/cluster/docker-machine/hyperkit.nix { }; docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { }; - docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { - buildGoModule = buildGo117Module; - }; + docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { }; docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix { inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet; inherit (darwin) cctools; @@ -25220,9 +25010,7 @@ with pkgs; afterburn = callPackage ../tools/admin/afterburn {}; docker-buildx = callPackage ../applications/virtualization/docker/buildx.nix { }; - docker-compose_2 = callPackage ../applications/virtualization/docker/compose.nix { - buildGoModule = buildGo117Module; - }; + docker-compose_2 = callPackage ../applications/virtualization/docker/compose.nix { }; amazon-ecr-credential-helper = callPackage ../tools/admin/amazon-ecr-credential-helper { }; @@ -25274,9 +25062,7 @@ with pkgs; inherit (gnome2) libgnomeui; }; - dyff = callPackage ../development/tools/dyff { - buildGoModule = buildGo117Module; - }; + dyff = callPackage ../development/tools/dyff { }; dwl = callPackage ../applications/window-managers/dwl { }; @@ -25442,9 +25228,7 @@ with pkgs; exercism = callPackage ../applications/misc/exercism { }; - expenses = callPackage ../applications/misc/expenses { - buildGoModule = buildGo117Module; - }; + expenses = callPackage ../applications/misc/expenses { }; fnott = callPackage ../applications/misc/fnott { }; @@ -26113,9 +25897,7 @@ with pkgs; withPortAudio = stdenv.isDarwin; }; - limesctl = callPackage ../applications/misc/limesctl { - buildGoModule = buildGo117Module; - }; + limesctl = callPackage ../applications/misc/limesctl { }; linssid = libsForQt5.callPackage ../applications/networking/linssid { }; @@ -26392,9 +26174,7 @@ with pkgs; haunt = callPackage ../applications/misc/haunt { }; - hugo = callPackage ../applications/misc/hugo { - buildGoModule = buildGo117Module; - }; + hugo = callPackage ../applications/misc/hugo { }; go-org = callPackage ../applications/misc/go-org { }; @@ -26461,9 +26241,7 @@ with pkgs; shepherd = nodePackages."@nerdwallet/shepherd"; - skate = callPackage ../applications/misc/skate { - buildGoModule = buildGo117Module; - }; + skate = callPackage ../applications/misc/skate { }; slack = callPackage ../applications/networking/instant-messengers/slack { }; @@ -26962,9 +26740,7 @@ with pkgs; kubebuilder = callPackage ../applications/networking/cluster/kubebuilder { }; - kuttl = callPackage ../applications/networking/cluster/kuttl { - buildGoModule = buildGo117Module; - }; + kuttl = callPackage ../applications/networking/cluster/kuttl { }; kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { }; @@ -26978,24 +26754,17 @@ with pkgs; kubelogin-oidc = callPackage ../applications/networking/cluster/kubelogin-oidc { }; - k9s = callPackage ../applications/networking/cluster/k9s { - buildGoModule = buildGo117Module; - }; + k9s = callPackage ../applications/networking/cluster/k9s { }; pgo-client = callPackage ../applications/networking/cluster/pgo-client { }; popeye = callPackage ../applications/networking/cluster/popeye { }; - kube-capacity = callPackage ../applications/networking/cluster/kube-capacity { - buildGoModule = buildGo117Module; - }; + kube-capacity = callPackage ../applications/networking/cluster/kube-capacity { }; fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; - fluxcd = callPackage ../applications/networking/cluster/fluxcd { - # Fix-Me: This locking should be removed once PR #154059 is merged. - buildGoModule = buildGo117Module; - }; + fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; linkerd = callPackage ../applications/networking/cluster/linkerd { }; linkerd_edge = callPackage ../applications/networking/cluster/linkerd/edge.nix { }; @@ -27431,7 +27200,6 @@ with pkgs; minikube = callPackage ../applications/networking/cluster/minikube { inherit (darwin.apple_sdk.frameworks) vmnet; - buildGoModule = buildGo117Module; }; minishift = callPackage ../applications/networking/cluster/minishift { }; @@ -27731,9 +27499,7 @@ with pkgs; nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; - nwg-menu = callPackage ../applications/misc/nwg-menu { - buildGoModule = buildGo117Module; - }; + nwg-menu = callPackage ../applications/misc/nwg-menu { }; nwg-panel = callPackage ../applications/misc/nwg-panel { }; @@ -28195,9 +27961,7 @@ with pkgs; pdfchain = callPackage ../tools/typesetting/pdfchain { }; - pdfcpu = callPackage ../applications/graphics/pdfcpu { - buildGoModule = buildGo117Module; - }; + pdfcpu = callPackage ../applications/graphics/pdfcpu { }; pdftk = callPackage ../tools/typesetting/pdftk { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; @@ -28780,9 +28544,7 @@ with pkgs; sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; - shadowfox = callPackage ../tools/networking/shadowfox { - buildGoModule = buildGo117Module; - }; + shadowfox = callPackage ../tools/networking/shadowfox { }; shfmt = callPackage ../tools/text/shfmt { }; @@ -29165,9 +28927,7 @@ with pkgs; tamgamp.lv2 = callPackage ../applications/audio/tamgamp.lv2 { }; - tanka = callPackage ../applications/networking/cluster/tanka { - buildGoModule = buildGo117Module; - }; + tanka = callPackage ../applications/networking/cluster/tanka { }; teams = callPackage ../applications/networking/instant-messengers/teams { }; @@ -29289,9 +29049,7 @@ with pkgs; ticpp = callPackage ../development/libraries/ticpp { }; - ticker = callPackage ../applications/misc/ticker { - buildGoModule = buildGo117Module; - }; + ticker = callPackage ../applications/misc/ticker { }; tickrs = callPackage ../applications/misc/tickrs { inherit (darwin.apple_sdk.frameworks) Security; @@ -30443,9 +30201,7 @@ with pkgs; ergo = callPackage ../applications/blockchains/ergo { }; - erigon = callPackage ../applications/blockchains/erigon.nix { - buildGoModule = buildGo117Module; - }; + erigon = callPackage ../applications/blockchains/erigon.nix { }; exodus = callPackage ../applications/blockchains/exodus { }; @@ -30581,9 +30337,7 @@ with pkgs; scaleft = callPackage ../applications/networking/scaleft { }; - scaleway-cli = callPackage ../tools/admin/scaleway-cli { - buildGoModule = buildGo117Module; - }; + scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; beancount = with python3.pkgs; toPythonApplication beancount; @@ -31973,9 +31727,7 @@ with pkgs; conglomerate = callPackage ../applications/science/biology/conglomerate { }; - dalfox = callPackage ../tools/security/dalfox { - buildGoModule = buildGo117Module; - }; + dalfox = callPackage ../tools/security/dalfox { }; dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; @@ -33199,9 +32951,7 @@ with pkgs; helmfile = callPackage ../applications/networking/cluster/helmfile { }; - helmsman = callPackage ../applications/networking/cluster/helmsman { - buildGoModule = buildGo117Module; - }; + helmsman = callPackage ../applications/networking/cluster/helmsman { }; velero = callPackage ../applications/networking/cluster/velero { }; @@ -33237,13 +32987,9 @@ with pkgs; idsk = callPackage ../tools/filesystems/idsk { }; - colima = callPackage ../applications/virtualization/colima { - buildGoModule = buildGo117Module; - }; + colima = callPackage ../applications/virtualization/colima { }; - lima = callPackage ../applications/virtualization/lima { - buildGoModule = buildGo117Module; - }; + lima = callPackage ../applications/virtualization/lima { }; logtop = callPackage ../tools/misc/logtop { }; @@ -33925,9 +33671,7 @@ with pkgs; steamcontroller = callPackage ../misc/drivers/steamcontroller { }; - stern = callPackage ../applications/networking/cluster/stern { - buildGoModule = buildGo117Module; - }; + stern = callPackage ../applications/networking/cluster/stern { }; streamripper = callPackage ../applications/audio/streamripper { }; @@ -33939,9 +33683,7 @@ with pkgs; go-swag = callPackage ../development/tools/go-swag { }; - go-swagger = callPackage ../development/tools/go-swagger { - buildGoModule = buildGo117Module; - }; + go-swagger = callPackage ../development/tools/go-swagger { }; jx = callPackage ../applications/networking/cluster/jx {}; @@ -33953,9 +33695,7 @@ with pkgs; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; - inherit (callPackage ../applications/networking/cluster/terraform { - buildGoModule = buildGo117Module; - }) + inherit (callPackage ../applications/networking/cluster/terraform { }) mkTerraform terraform_0_13 terraform_0_14 @@ -33969,9 +33709,7 @@ with pkgs; terraform-full = terraform.full; terraform-providers = recurseIntoAttrs ( - callPackage ../applications/networking/cluster/terraform-providers { - buildGoModule = buildGo117Module; - } + callPackage ../applications/networking/cluster/terraform-providers { } ); terraforming = callPackage ../applications/networking/cluster/terraforming { }; @@ -33992,9 +33730,7 @@ with pkgs; tgswitch = callPackage ../applications/networking/cluster/tgswitch {}; - tilt = callPackage ../applications/networking/cluster/tilt { - buildGoModule = buildGo117Module; - }; + tilt = callPackage ../applications/networking/cluster/tilt { }; timeular = callPackage ../applications/office/timeular {}; @@ -34067,9 +33803,7 @@ with pkgs; unixcw = libsForQt5.callPackage ../applications/radio/unixcw { }; - vault = callPackage ../tools/security/vault { - buildGoModule = buildGo117Module; - }; + vault = callPackage ../tools/security/vault { }; vault-bin = callPackage ../tools/security/vault/vault-bin.nix { }; @@ -34094,9 +33828,7 @@ with pkgs; vice = callPackage ../misc/emulators/vice { }; - viddy = callPackage ../tools/misc/viddy { - buildGoModule = buildGo117Module; - }; + viddy = callPackage ../tools/misc/viddy { }; ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { }; @@ -34430,9 +34162,7 @@ with pkgs; zimg = callPackage ../development/libraries/zimg { }; - wtf = callPackage ../applications/misc/wtf { - buildGoModule = buildGo117Module; - }; + wtf = callPackage ../applications/misc/wtf { }; zk-shell = callPackage ../applications/misc/zk-shell { }; @@ -34634,9 +34364,7 @@ with pkgs; webwormhole = callPackage ../tools/networking/webwormhole { }; - werf = callPackage ../applications/networking/cluster/werf { - buildGoModule = buildGo117Module; - }; + werf = callPackage ../applications/networking/cluster/werf { }; wifi-password = callPackage ../os-specific/darwin/wifi-password {}; @@ -34654,9 +34382,7 @@ with pkgs; sentencepiece = callPackage ../development/libraries/sentencepiece {}; - kcli = callPackage ../development/tools/kcli { - buildGoModule = buildGo117Module; - }; + kcli = callPackage ../development/tools/kcli { }; pxlib = callPackage ../development/libraries/pxlib {};