cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2022-10-09 06:04:00 +00:00 committed by GitHub
commit efe8ad8714
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 149 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -12000,6 +12000,12 @@
github = "sioodmy";
githubId = 81568712;
};
siph = {
name = "Chris Dawkins";
email = "dawkins.chris.dev@gmail.com";
github = "siph";
githubId = 6619112;
};
schmitthenner = {
email = "development@schmitthenner.eu";
github = "fkz";

2
pkgs/applications/blockchains/erigon.nix
View file

@ -12,7 +12,7 @@ buildGoModule rec {
fetchSubmodules = true;
};
vendorSha256 = "sha256-zdm11bGkCcwnz+8dve2pdcpg6pDgLe4UG3Ob/mbqhko=";
vendorSha256 = "sha256-B9brjWvYw65ti2Ac3D4nQUEax/q+Uf5DTPBHXeWQybw=";
proxyVendor = true;
# Build errors in mdbx when format hardening is enabled:

6
pkgs/applications/misc/genact/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "genact";
version = "1.1.1";
version = "1.2.0";
src = fetchFromGitHub {
owner = "svenstaro";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Mw6mPOxiWnYu2QgqL4VccwwJhdxZ7zLJyX/oJWfGUhw=";
sha256 = "sha256-POOXawhxrPT2UgbSZE3r0br7cqJ0ao7MpycrPYa/oCc=";
};
cargoSha256 = "sha256-ygQklcRjdffGl0s77MwKsyHVJWqWJZHq4SU38cSMVug=";
cargoSha256 = "sha256-wpCzWJglX3FnNySnBRJjFWST5FIG5wAO7u+D4VIevtU=";
depsExtraArgs = {
nativeBuildInputs = [ jq ];

2
pkgs/applications/misc/hugo/default.nix
View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-bGyU0i/wwFprAoLENrmBY2IxLjwyX4pQ9z4LFIUguI4=";
};
vendorSha256 = "sha256-K7rQSs4PqFGV4gZ6UevS7S0w0OQykAkHntklKz5vPrU=";
vendorSha256 = "sha256-is1dQJwvhygn95rbeHeGI97vDXo8ftnNqug4eERN3gI=";
doCheck = false;

2
pkgs/applications/misc/mangal/default.nix
View file

@ -12,7 +12,7 @@ buildGoModule rec {
};
proxyVendor = true;
vendorSha256 = "sha256-Faz/cujnbK83vrIM1KUWXbUzNIB9eYAWCqWs+oJ1sYk=";
vendorSha256 = "sha256-dHwookjeF8U/2i0Totho0HY7FdOr/jABmqlQelthc6E=";
ldflags = [ "-s" "-w" ];

21
pkgs/applications/misc/oxker/default.nix Normal file
View file

@ -0,0 +1,21 @@
{ lib, fetchCrate, rustPlatform }:
rustPlatform.buildRustPackage rec {
pname = "oxker";
version = "0.1.5";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-OhXU61F8XK5ts4GwDUkFv4+FGNFUmJJ9ooRS9/D0yvQ=";
};
cargoSha256 = "sha256-ldf0XYBhxLL2v0+yBX9Dqq8kYgJZ2f4Lor+rUA0/47E=";
meta = with lib; {
description = "A simple tui to view & control docker containers";
homepage = "https://github.com/mrjackwills/oxker";
changelog = "https://github.com/mrjackwills/oxker/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ siph ];
};
}

2
pkgs/applications/networking/cluster/argocd-autopilot/default.nix
View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-aC3U9Qeahji3xSuJWuMlf2TzKEqPDAOuB52A4Om/fRU=";
};
vendorSha256 = "sha256-ujDtfDL1VWe4XjTHD+pXMmMFp0AiuZcE+CKRkMsiv9Q=";
vendorSha256 = "sha256-waEvrIEXQMyzSyHpPo7H0OwfD5Zo/rwWTpeWvipZXv8=";
proxyVendor = true;

4
pkgs/applications/networking/cluster/terraform-providers/default.nix
View file

@ -1,6 +1,6 @@
{ lib
, stdenv
, buildGoModule
, buildGo119Module
, fetchFromGitHub
, callPackage
, config
@ -21,7 +21,7 @@ let
, vendorHash ? throw "use vendorHash instead of vendorSha256" # added 2202/09
, deleteVendor ? false
, proxyVendor ? false
, mkProviderGoModule ? buildGoModule
, mkProviderGoModule ? buildGo119Module
# Looks like "registry.terraform.io/vancluever/acme"
, provider-source-address
, ...

19
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -47,13 +47,12 @@
"version": "2.4.2"
},
"alicloud": {
"deleteVendor": true,
"hash": "sha256-lJsCXLSIbb/jLjNsvU0GFljlrKBR2TDDOGXDhBTaIKI=",
"owner": "aliyun",
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
"repo": "terraform-provider-alicloud",
"rev": "v1.187.0",
"vendorHash": "sha256-aiybvpps/TyrMRP8vbfhBAUO+9kR7WWrgo1kOWKTj24=",
"vendorHash": null,
"version": "1.187.0"
},
"ansible": {
@ -138,13 +137,12 @@
"version": "1.0.0"
},
"baiducloud": {
"deleteVendor": true,
"hash": "sha256-LaehOof8T2LGgn6Q/oo+SPcld9QRVk+MjaEJnYvNNnQ=",
"owner": "baidubce",
"provider-source-address": "registry.terraform.io/baidubce/baiducloud",
"repo": "terraform-provider-baiducloud",
"rev": "v1.15.10",
"vendorHash": "sha256-v07NMx8caXvY97FefNnRV7gMQbUq4k2ZmE5huqqe354=",
"vendorHash": null,
"version": "1.15.10"
},
"bigip": {
@ -411,7 +409,7 @@
"proxyVendor": true,
"repo": "terraform-provider-fortios",
"rev": "v1.15.0",
"vendorHash": "sha256-WkF2mVDrDlCefM4pjADoXsVwpa7E02c6kUyOgHxNFpo=",
"vendorHash": "sha256-QsUJ9BqoCtMC9PpGzwlKvBn+BDlcjUR2rU9zx8FvLCk=",
"version": "1.15.0"
},
"gandi": {
@ -448,7 +446,7 @@
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.39.0",
"vendorHash": "sha256-U5J9X51PAq3Cq/XH5ggThzsPaEy+AveHqD4D6NbK/AU=",
"vendorHash": "sha256-PWSok1sTU/57Xeri4Un5B9Fbwg8gBP6Quy5oIZrjxUI=",
"version": "4.39.0"
},
"google-beta": {
@ -458,7 +456,7 @@
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.39.0",
"vendorHash": "sha256-U5J9X51PAq3Cq/XH5ggThzsPaEy+AveHqD4D6NbK/AU=",
"vendorHash": "sha256-PWSok1sTU/57Xeri4Un5B9Fbwg8gBP6Quy5oIZrjxUI=",
"version": "4.39.0"
},
"googleworkspace": {
@ -531,7 +529,7 @@
"proxyVendor": true,
"repo": "terraform-provider-htpasswd",
"rev": "v1.0.4",
"vendorHash": "sha256-VlJO11t7uqAl0U26T/UY2u//+Vfq97+h4gABWt7iQwk=",
"vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=",
"version": "1.0.4"
},
"http": {
@ -754,10 +752,9 @@
"hash": "sha256-NVbUKSG5rGUtRlaJVND3nW+0Svc2d8R8uvxGKcQktco=",
"owner": "mongodb",
"provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",
"proxyVendor": true,
"repo": "terraform-provider-mongodbatlas",
"rev": "v1.4.6",
"vendorHash": "sha256-jmT5SoJA4iQDmP9cRedQ4wTPoOXB4NL8hHClsp37ykU=",
"vendorHash": "sha256-OwyzkTgOcn9brsQS1bfOEaXYk9nNLyHsEwli+5PAIPE=",
"version": "1.4.6"
},
"namecheap": {
@ -1201,7 +1198,7 @@
"proxyVendor": true,
"repo": "terraform-provider-vault",
"rev": "v3.9.1",
"vendorHash": "sha256-l0uKS8ZIXq0LgSLtYBwtiWuPLeYA62rCt6eDxrnTZfA=",
"vendorHash": "sha256-/ZIGfLHkHq1Yv+AsSO7KueK5ANxnUWFKwLKyZ02q1cY=",
"version": "3.9.1"
},
"vcd": {

2
pkgs/applications/networking/cluster/werf/default.nix
View file

@ -19,7 +19,7 @@ buildGoModule rec {
hash = "sha256-hvMDQlWlAy7gRiSJMt2qAtBpYEbfhGS/DZeQK5ueHYA=";
};
vendorHash = "sha256-ZZh6vKbipp/JmDiB2ELKCFuRUDetmA3+WG7o6ZIQXZk=";
vendorHash = "sha256-4QVLxvprm27Bv/ZFgxTtqZcSAWak1e+G8s+heW1JZnA=";
proxyVendor = true;

4
pkgs/applications/networking/flexget/default.nix
View file

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.3.31";
version = "3.3.32";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
hash = "sha256-JUeH62y2Y73N843ADvvK91PpHAwn1QApnz5Qusm64mI=";
hash = "sha256-AeEVsgJtg9QVSstliKNbwogbXKpVhL3VnnsnEqg27wc=";
};
postPatch = ''

2
pkgs/applications/networking/instant-messengers/element/keytar/update.sh
View file

@ -2,7 +2,7 @@
#!nix-shell -I nixpkgs=../../../../../../ -i bash -p wget prefetch-yarn-deps yarn
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates packaging data for the seshat package."
echo "Regenerates packaging data for the keytar package."
echo "Usage: $0 [git release tag]"
exit 1
fi

1
pkgs/applications/video/mkvtoolnix/default.nix
View file

@ -127,6 +127,7 @@ stdenv.mkDerivation rec {
description = "Cross-platform tools for Matroska";
homepage = "https://mkvtoolnix.download/";
license = licenses.gpl2Only;
mainProgram = if withGUI then "mkvtoolnix-gui" else "mkvtoolnix";
maintainers = with maintainers; [ codyopel rnhmjoj ];
platforms = platforms.unix;
};

13
pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix
View file

@ -1,27 +1,26 @@
{ lib, stdenvNoCC, fetchFromGitHub, youtube-dl }:
{ lib, stdenvNoCC, fetchFromGitHub, yt-dlp }:
stdenvNoCC.mkDerivation rec {
pname = "mpv-playlistmanager";
version = "unstable-2021-09-27";
version = "unstable-2022-08-26";
src = fetchFromGitHub {
owner = "jonniek";
repo = "mpv-playlistmanager";
rev = "9a759b300c92b55e82be5824fe058e263975741a";
sha256 = "qMzDJlouBptwyNdw2ag4VKEtmkQNUlos0USPerBAV/s=";
rev = "07393162f7f78f8188e976f616f1b89813cec741";
sha256 = "sha256-Vgh5F6c90ijp5LVrP2cdAOXo+QtJ9aXI9G/3C2HGqd4=";
};
postPatch = ''
substituteInPlace playlistmanager.lua \
--replace "'youtube-dl'" "'${youtube-dl}/bin/youtube-dl'" \
--replace "youtube-dl" "${lib.getBin yt-dlp}/bin/yt-dlp"
'';
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/mpv/scripts
cp playlistmanager.lua $out/share/mpv/scripts
install -D -t $out/share/mpv/scripts playlistmanager.lua
runHook postInstall
'';

4
pkgs/development/compilers/openjdk/openjfx/17.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7
, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib
, ffmpeg, python3, ruby, icu68 }:
, ffmpeg_4, python3, ruby, icu68 }:
let
major = "17";
@ -21,7 +21,7 @@ let
sha256 = "sha256-PSiE9KbF/4u9VyBl9PAMLGzKyGFB86/XByeh7vhL6Kw=";
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg icu68 ];
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 icu68 ];
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ];
dontUseCmakeConfigure = true;

2
pkgs/development/compilers/p4c/default.nix
View file

@ -65,7 +65,6 @@ stdenv.mkDerivation rec {
bison
flex
cmake
python3
]
++ lib.optional enableDocumentation [ doxygen graphviz ]
++ lib.optional enableBPF [ libllvm libbpf ];
@ -76,6 +75,7 @@ stdenv.mkDerivation rec {
boehmgc
gmp
flex
python3
];
meta = with lib; {

4
pkgs/development/python-modules/apprise/default.nix
View file

@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "apprise";
version = "1.0.0";
version = "1.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-llOQAzH4vR9O+pzaLCueJ7aar7Kt8UsrzmV5f3UzOss=";
hash = "sha256-92eoBwp3fcKb9zCBeeC2ndLeZeZpM+2JsZmef/5yO2A=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/datasets/default.nix
View file

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "datasets";
version = "2.5.1";
version = "2.5.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-1I7ZnYgzEFd3JvlrnHRcEd48nbO1UR5s7sddVkYM23Y=";
hash = "sha256-C+REl68BZKP3NwkSmBQ/Xs8/sMGNT4bjXa8Jkk/C0Uw=";
};
postPatch = ''

7
pkgs/development/python-modules/devito/default.nix
View file

@ -18,6 +18,8 @@
, pytestCheckHook
, matplotlib
, pytest-xdist
, gcc
, llvmPackages
}:
buildPythonPackage rec {
@ -46,7 +48,7 @@ buildPythonPackage rec {
-i requirements.txt
'';
checkInputs = [ pytestCheckHook pytest-xdist matplotlib ];
checkInputs = [ pytestCheckHook pytest-xdist matplotlib gcc ];
# I've had to disable the following tests since they fail while using nix-build, but they do pass
# outside the build. They mostly related to the usage of MPI in a sandboxed environment.
@ -88,12 +90,11 @@ buildPythonPackage rec {
pyrevolve
scipy
sympy
];
] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
pythonImportsCheck = [ "devito" ];
meta = with lib; {
broken = stdenv.isDarwin;
homepage = "https://www.devitoproject.org/";
description = "Code generation framework for automated finite difference computation";
license = licenses.mit;

4
pkgs/development/python-modules/potentials/default.nix
View file

@ -20,7 +20,7 @@
}:
buildPythonPackage rec {
version = "0.3.4";
version = "0.3.5";
pname = "potentials";
format = "setuptools";
@ -28,7 +28,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
hash = "sha256-yBqU1FN2KlWE2Stg9OMdBLUfIQdbUGWCH4GU6r6HkDI=";
hash = "sha256-e2+Yrgpj6Cy76qzw9/NhDq9ogsNQAJcKi9kvY2fZE+k=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/sphinx-argparse/default.nix
View file

@ -7,11 +7,11 @@
buildPythonPackage rec {
pname = "sphinx-argparse";
version = "0.3.1";
version = "0.3.2";
src = fetchPypi {
inherit pname version;
sha256 = "82151cbd43ccec94a1530155f4ad34f251aaca6a0ffd5516d7fadf952d32dc1e";
sha256 = "sha256-5UrWyPiVrGu50N2foH5H4TeipCrhinFFFSYuhrTMS6s=";
};
postPatch = ''

4
pkgs/development/tools/gojq/default.nix
View file

@ -11,9 +11,7 @@ buildGoModule rec {
sha256 = "sha256-AII3mC+JWOP0x4zf8FQdRhOmckPgY7BDRoKICCFkn9Q=";
};
proxyVendor = true;
vendorSha256 = "sha256-kq9vfmST8M69yiWqzsM/ORG7F7ERtEv9dyfy8u3sWYk=";
vendorSha256 = "sha256-RtackQ4uJo1j2jePu9xd0idQBKbwBh4L2spiS2mRynw=";
ldflags = [ "-s" "-w" ];

6
pkgs/development/tools/ruff/default.nix
View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.61";
version = "0.0.63";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Gmuf8vZMP74r3CtImmD9hCTPIxaMfHGXO0C/hGAyqb0=";
sha256 = "sha256-mbwBTKC6ibYBYDSA6A0AGHWj9NzHgdfmcIYnFh8c+do=";
};
cargoSha256 = "sha256-jSBTou8GekqHoTTXRrhCwCWA2tjU5woKKB0g63M2VGU=";
cargoSha256 = "sha256-g/TNPBKc1pEoWRNclmtJsiSXxXmPn+T30e4JSt/wqE4=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices

6
pkgs/development/tools/rust/cargo-edit/default.nix
View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-edit";
version = "0.11.4";
version = "0.11.5";
src = fetchFromGitHub {
owner = "killercup";
repo = pname;
rev = "v${version}";
hash = "sha256-s3hcwYnP45eeU7T499phpuRHb0A8xRKlhO1haxwcPpc=";
hash = "sha256-6hiRxVxm9GGss4rLctYiA5ukkyd6V9N47RJ0c/VhqTY=";
};
cargoSha256 = "sha256-abtOI+enjTRNwLqSv5ZCbTAm8/EKPgfb2wqj2jXivdo=";
cargoSha256 = "sha256-+JKBmqtDxi30T5Lw5YOn47gSW7p5fecOxZ8i9smDz/s=";
nativeBuildInputs = [ pkg-config ];

6
pkgs/development/tools/rust/cargo-zigbuild/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-zigbuild";
version = "0.12.3";
version = "0.13.0";
src = fetchFromGitHub {
owner = "messense";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qwOlYy9pNAKEJDgt3ML4dxDwlkyPIVO+X/q/YijEHo0=";
sha256 = "sha256-lYQmuenL7cbgfb6tdhdxkNe3wrQj7hTijyrhr/p4zLo=";
};
cargoSha256 = "sha256-8x2B8WBN9u17HS58bAwMNPEoSabNX6KzyPBLEvaGOBk=";
cargoSha256 = "sha256-Ae0ootHGbW5FJTkIRc9lTKHWsHOz6/WZCWCLZlSROU4=";
nativeBuildInputs = [ makeWrapper ];

20
pkgs/development/tools/snazy/default.nix
View file

@ -1,16 +1,26 @@
{ lib, fetchFromGitHub, rustPlatform }:
{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
rustPlatform.buildRustPackage rec {
pname = "snazy";
version = "0.10.1";
version = "0.50.0";
src = fetchFromGitHub {
owner = "chmouel";
repo = pname;
rev = version;
sha256 = "sha256-kUoML6UUgZLOBCbakj1CJeRSt268rv2ymAdvPkcn8R4=";
sha256 = "sha256-wSRIJF2XPJvzmxuGbuPYPFgn9Eap3vqHT1CM/oQy8vM=";
};
cargoSha256 = "sha256-MPfzC5iEE8GficLUaGaBy5usZzYoreYsdadoiiRoVQI=";
cargoSha256 = "sha256-IGZZEyy9IGqkpsbnOzLdBSFbinZ7jhH2LWub/+gP89E=";
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd snazy \
--bash <($out/bin/snazy --shell-completion bash) \
--fish <($out/bin/snazy --shell-completion fish) \
--zsh <($out/bin/snazy --shell-completion zsh)
'';
doInstallCheck = true;
installCheckPhase = ''
@ -29,6 +39,6 @@ rustPlatform.buildRustPackage rec {
with nice colors.
'';
license = licenses.asl20;
maintainers = with maintainers; [ jk ];
maintainers = with maintainers; [ figsoda jk ];
};
}

4
pkgs/development/tools/wabt/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "wabt";
version = "1.0.29";
version = "1.0.30";
src = fetchFromGitHub {
owner = "WebAssembly";
repo = "wabt";
rev = version;
sha256 = "sha256-7Kh8kCwdSZX7E2s7UWptQHabYCVZG4luMiB1RJ72hQc=";
sha256 = "sha256-C8S1+wcJhfv65HY8KCSnX+F6wP1E4Vkr0iwW83OwZxk=";
fetchSubmodules = true;
};

2
pkgs/development/tools/wails/default.nix
View file

@ -23,7 +23,7 @@ buildGoModule rec {
sha256 = "sha256-mAHRjIi4/cC29NqTdUF9sMLyHhFANw+QBibk1ENo1BA=";
} + "/v2";
vendorSha256 = "sha256-jvjFV7StHCYn85iLWTRBXjPSUeWM+Yr5F3H0rFciCOc=";
vendorSha256 = "sha256-Ufm7sUak31/PzR3UGlUKdcrzdX6NRhFEXqteaowmz9k=";
proxyVendor = true;

6
pkgs/games/ferium/default.nix
View file

@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "ferium";
version = "4.1.11";
version = "4.2.0";
src = fetchFromGitHub {
owner = "gorilla-devs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-CqErnyBoGC+jTN1wNzKsjuAmfuwZ0NzZKyqdP2hPKUM=";
sha256 = "sha256-pJis4Lab/qRc5taeTxSoJOvNrhsWhGJrPILvkmB8k2A=";
};
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
cargoSha256 = "sha256-2IEIIO4Gi9nyf0FoTiqGuA/ebE15sIFjeFqlETARaJY=";
cargoSha256 = "sha256-J1BY0gSkUQRFZJ/UlikvQqrLvCjHlf2jxbg6BIoZZUE=";
# Disable the GUI file picker so that GTK/XDG dependencies aren't used
buildNoDefaultFeatures = true;

2
pkgs/servers/monitoring/telegraf/default.nix
View file

@ -15,7 +15,7 @@ buildGoModule rec {
sha256 = "sha256-2DUP3g7k0DLXlmhCZH0IUgWpYbdUnRjtsc7uEioYzrE=";
};
vendorSha256 = "sha256-RsNsjDUAqNtNDqCC+UjKTw4ue4Yd0A7k8tU+wYiQIbc=";
vendorSha256 = "sha256-q6NMzfXoUYpv/BF6ddiQTPq6Xf3oKuUWrEF6fTDvkZI=";
proxyVendor = true;
ldflags = [

4
pkgs/servers/web-apps/galene/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "galene";
version = "0.5.5";
version = "0.6.1";
src = fetchFromGitHub {
owner = "jech";
repo = "galene";
rev = "galene-${version}";
hash = "sha256-J1cX8mm1yZTvsaz7DOAbmjmXkdoIrs793aDnmHm8BFk=";
hash = "sha256-Bnx0GqgkOHfoDYLJqVAz/tKyF+cZ0BQTRTGO2pDv7tM=";
};
vendorSha256 = "sha256-HZQeVa4UB/1jpPbfrh3XgWQe2S3qA8CM268KghgJA0w=";

2
pkgs/servers/web-apps/hedgedoc/update.sh
View file

@ -4,7 +4,7 @@ set -euo pipefail
cd "$(dirname "$0")"
if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then
echo "Regenerates packaging data for the element packages."
echo "Regenerates packaging data for the hedgedoc packages."
echo "Usage: $0 [git release tag]"
exit 1
fi

2
pkgs/tools/admin/trivy/default.nix
View file

@ -15,7 +15,7 @@ buildGoModule rec {
};
# hash missmatch on across linux and darwin
proxyVendor = true;
vendorSha256 = "sha256-iXc70QOZZjnFuvRDm9e1uWqjkJNqV/1uAu1EdZNjL70=";
vendorSha256 = "sha256-h9GydAVW2mIFNMlz9aEW6hUioD9noQwnueatkoQDkpY=";
excludedPackages = "misc";

2
pkgs/tools/misc/opentelemetry-collector/contrib.nix
View file

@ -16,7 +16,7 @@ buildGoModule rec {
};
# proxy vendor to avoid hash missmatches between linux and macOS
proxyVendor = true;
vendorSha256 = "sha256-Fl2/rPrtbL3/gcM5hm4MgQwcS0PValuxa+nThYAE4l0=";
vendorSha256 = "sha256-aEhNq/e3erW2e5tHMtoePiVFpIY6Mb25k+SVRhIWTr0=";
subPackages = [ "cmd/otelcontribcol" ];

2
pkgs/tools/networking/hysteria/default.nix
View file

@ -13,7 +13,7 @@ buildGoModule rec {
sha256 = "sha256-xL8xRVJdCyaP39TO+cJLAPbdc7WHxgBQMEyxkyhWlA8=";
};
vendorSha256 = "sha256-DxbH0vtNnuOycvUp2TBN2TS9sF6RYVqwfUbVH11HDN8=";
vendorSha256 = "sha256-VCQHkkYmGU0ZPmTuYu2XFa5ezDJ3x7dZGN+Usmq4sOY=";
proxyVendor = true;
ldflags = [

4
pkgs/tools/security/cfssl/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cfssl";
version = "1.6.2";
version = "1.6.3";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cfssl";
rev = "v${version}";
sha256 = "sha256-cyriV6z904QlkDlP80CSpakISJn7S81/2fcspAf5uk4=";
sha256 = "sha256-aZjb4mWoevRnPyL+b7H+VjIVklNe+u054OsmJbxPx4g=";
};
subPackages = [

2
pkgs/tools/system/gotop/default.nix
View file

@ -23,7 +23,7 @@ buildGoModule rec {
};
proxyVendor = true;
vendorSha256 = "sha256-gpgduZbFCMMg/mXefhwMHvs4omml3RZ0h5XexO5vslM=";
vendorSha256 = "sha256-KLeVSrPDS1lKsKFemRmgxT6Pxack3X3B/btSCOUSUFY=";
ldflags = [ "-s" "-w" "-X main.Version=v${version}" ];

4
pkgs/tools/text/languagetool/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "LanguageTool";
version = "5.8";
version = "5.9";
src = fetchzip {
url = "https://www.languagetool.org/download/${pname}-${version}.zip";
sha256 = "sha256-xwwC+I4cThl2iq3eKcjInFciWlhBfQvNA5LBalaXBuQ=";
sha256 = "sha256-x4xGgYeMi7KbD2WGHOd/ixmZ+5EY5g6CLd7/CBYldNQ=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jre ];

47
pkgs/top-level/all-packages.nix
View file

@ -733,7 +733,9 @@ with pkgs;
graph-easy = callPackage ../tools/graphics/graph-easy { };
mangal = callPackage ../applications/misc/mangal { };
mangal = callPackage ../applications/misc/mangal {
buildGoModule = buildGo119Module;
};
graphw00f = callPackage ../tools/security/graphw00f { };
@ -4206,7 +4208,9 @@ with pkgs;
});
};
hysteria = callPackage ../tools/networking/hysteria { };
hysteria = callPackage ../tools/networking/hysteria {
buildGoModule = buildGo119Module;
};
hyx = callPackage ../tools/text/hyx { };
@ -6091,7 +6095,9 @@ with pkgs;
tridactyl-native = callPackage ../tools/networking/tridactyl-native { };
trivy = callPackage ../tools/admin/trivy { };
trivy = callPackage ../tools/admin/trivy {
buildGoModule = buildGo119Module;
};
trompeloeil = callPackage ../development/libraries/trompeloeil { };
@ -7456,7 +7462,9 @@ with pkgs;
gvolicon = callPackage ../tools/audio/gvolicon {};
gvproxy = callPackage ../tools/networking/gvproxy { };
gvproxy = callPackage ../tools/networking/gvproxy {
buildGoModule = buildGo118Module; # fails to build with 1.19
};
gzip = callPackage ../tools/compression/gzip { };
@ -9845,7 +9853,9 @@ with pkgs;
opae = callPackage ../development/libraries/opae { };
opentelemetry-collector = callPackage ../tools/misc/opentelemetry-collector { };
opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix { };
opentelemetry-collector-contrib = callPackage ../tools/misc/opentelemetry-collector/contrib.nix {
buildGoModule = buildGo119Module;
};
opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { };
@ -9902,6 +9912,8 @@ with pkgs;
overmind = callPackage ../applications/misc/overmind { };
oxker = callPackage ../applications/misc/oxker { };
ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { };
ovito = libsForQt5.callPackage ../applications/graphics/ovito {
@ -11685,7 +11697,9 @@ with pkgs;
teip = callPackage ../tools/text/teip { };
telegraf = callPackage ../servers/monitoring/telegraf { };
telegraf = callPackage ../servers/monitoring/telegraf {
buildGoModule = buildGo119Module;
};
teleport = callPackage ../servers/teleport {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
@ -17619,7 +17633,9 @@ with pkgs;
vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { };
wails = callPackage ../development/tools/wails { };
wails = callPackage ../development/tools/wails {
buildGoModule = buildGo119Module;
};
whatsapp-for-linux = callPackage ../applications/networking/instant-messengers/whatsapp-for-linux { };
@ -25070,6 +25086,7 @@ with pkgs;
gotop = callPackage ../tools/system/gotop {
inherit (darwin.apple_sdk.frameworks) IOKit;
buildGoModule = buildGo119Module;
};
go-migrate = callPackage ../development/tools/go-migrate { };
@ -26861,7 +26878,9 @@ with pkgs;
argocd = callPackage ../applications/networking/cluster/argocd { };
argocd-autopilot = callPackage ../applications/networking/cluster/argocd-autopilot { };
argocd-autopilot = callPackage ../applications/networking/cluster/argocd-autopilot {
buildGoModule = buildGo119Module;
};
argo-rollouts = callPackage ../applications/networking/cluster/argo-rollouts { };
@ -28757,7 +28776,9 @@ with pkgs;
haunt = callPackage ../applications/misc/haunt { };
hugo = callPackage ../applications/misc/hugo { };
hugo = callPackage ../applications/misc/hugo {
buildGoModule = buildGo119Module;
};
gatekeeper = callPackage ../applications/networking/cluster/gatekeeper { };
@ -33042,7 +33063,9 @@ with pkgs;
ergo = callPackage ../applications/blockchains/ergo { };
erigon = callPackage ../applications/blockchains/erigon.nix { };
erigon = callPackage ../applications/blockchains/erigon.nix {
buildGoModule = buildGo119Module;
};
exodus = callPackage ../applications/blockchains/exodus { };
@ -37381,7 +37404,9 @@ with pkgs;
webwormhole = callPackage ../tools/networking/webwormhole { };
werf = callPackage ../applications/networking/cluster/werf { };
werf = callPackage ../applications/networking/cluster/werf {
buildGoModule = buildGo119Module;
};
wifi-password = callPackage ../os-specific/darwin/wifi-password {};