From 121e2f7e1554794e7392427cf77e94ab9887871e Mon Sep 17 00:00:00 2001 From: wucke13 Date: Sun, 19 Dec 2021 13:39:42 +0100 Subject: [PATCH 001/814] honor sdImage.compressImage in intermediate build steps --- nixos/lib/make-ext4-fs.nix | 9 +++++++++ nixos/modules/installer/sd-card/sd-image.nix | 15 ++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix index 416beeb32f2f..b8e1b8d24c48 100644 --- a/nixos/lib/make-ext4-fs.nix +++ b/nixos/lib/make-ext4-fs.nix @@ -78,6 +78,15 @@ pkgs.stdenv.mkDerivation { # get rid of the unnecessary slack here--but see # https://github.com/NixOS/nixpkgs/issues/125121 for caveats. + # shrink to fit + resize2fs -M $img + + # Add 16 MebiByte to the current_size + new_size=$(dumpe2fs -h $img | awk -F: \ + '/Block count/{count=$2} /Block size/{size=$2} END{print (count*size+16*2**20)/size}') + + resize2fs $img $new_size + if [ ${builtins.toString compressImage} ]; then echo "Compressing image" zstd -v --no-progress ./$img -o $out diff --git a/nixos/modules/installer/sd-card/sd-image.nix b/nixos/modules/installer/sd-card/sd-image.nix index a964cf2d6f85..1fd2db39fc56 100644 --- a/nixos/modules/installer/sd-card/sd-image.nix +++ b/nixos/modules/installer/sd-card/sd-image.nix @@ -18,7 +18,7 @@ with lib; let rootfsImage = pkgs.callPackage ../../../lib/make-ext4-fs.nix ({ inherit (config.sdImage) storePaths; - compressImage = true; + compressImage = config.sdImage.compressImage; populateImageCommands = config.sdImage.populateRootCommands; volumeLabel = "NIXOS_SD"; } // optionalAttrs (config.sdImage.rootPartitionUUID != null) { @@ -174,7 +174,8 @@ in mtools, libfaketime, util-linux, zstd }: stdenv.mkDerivation { name = config.sdImage.imageName; - nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime util-linux zstd ]; + nativeBuildInputs = [ dosfstools e2fsprogs libfaketime mtools util-linux ] + ++ lib.optional config.sdImage.compressImage zstd; inherit (config.sdImage) compressImage; @@ -189,14 +190,18 @@ in echo "file sd-image $img" >> $out/nix-support/hydra-build-products fi + root_fs=${rootfsImage} + ${lib.optionalString config.sdImage.compressImage '' + root_fs=./root-fs.img echo "Decompressing rootfs image" - zstd -d --no-progress "${rootfsImage}" -o ./root-fs.img + zstd -d --no-progress "${rootfsImage}" -o $root_fs + ''} # Gap in front of the first partition, in MiB gap=${toString config.sdImage.firmwarePartitionOffset} # Create the image file sized to fit /boot/firmware and /, plus slack for the gap. - rootSizeBlocks=$(du -B 512 --apparent-size ./root-fs.img | awk '{ print $1 }') + rootSizeBlocks=$(du -B 512 --apparent-size $root_fs | awk '{ print $1 }') firmwareSizeBlocks=$((${toString config.sdImage.firmwareSize} * 1024 * 1024 / 512)) imageSize=$((rootSizeBlocks * 512 + firmwareSizeBlocks * 512 + gap * 1024 * 1024)) truncate -s $imageSize $img @@ -214,7 +219,7 @@ in # Copy the rootfs into the SD image eval $(partx $img -o START,SECTORS --nr 2 --pairs) - dd conv=notrunc if=./root-fs.img of=$img seek=$START count=$SECTORS + dd conv=notrunc if=$root_fs of=$img seek=$START count=$SECTORS # Create a FAT32 /boot/firmware partition of suitable size into firmware_part.img eval $(partx $img -o START,SECTORS --nr 1 --pairs) From 372b7d8db4ac160f7ff42e1c4276b3ebea53ed5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Mar 2022 19:25:45 +0000 Subject: [PATCH 002/814] ginac: 1.8.2 -> 1.8.3 --- pkgs/applications/science/math/ginac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 1fff1156c1a0..2e18801a8812 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ginac"; - version = "1.8.2"; + version = "1.8.3"; src = fetchurl { url = "https://www.ginac.de/ginac-${version}.tar.bz2"; - sha256 = "sha256-v811Gryviv3bg5WMKtInY6deokAyVT5QPumzjj6jtsM="; + sha256 = "sha256-d8caWGrfb8C12rVzQ08wz/FXkVPNd8broCKS4Xj3pJA="; }; propagatedBuildInputs = [ cln ]; From 5850ce19a3cba5beb232e8b1b434680ae51714e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 Apr 2022 04:56:02 +0000 Subject: [PATCH 003/814] python310Packages.pygmt: 0.6.0 -> 0.6.1 --- pkgs/development/python-modules/pygmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index f7728cfa28db..127150a1a626 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.6.0"; + version = "0.6.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "GenericMappingTools"; repo = "pygmt"; - rev = "v${version}"; - sha256 = "sha256-QzqQKnANReSHIsDbiKSZ1ZgMgbj3NAfq4bmRQktnRjQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/hZUDvMhF/ojTXBcap5lL6X2bYu+opf+TwYNjANgtiw="; }; postPatch = '' From 2a9691e0c00a4d14f52bd35ec40f9d2b174534f4 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Thu, 24 Feb 2022 13:31:02 -0500 Subject: [PATCH 004/814] nixos/systemd: prepare tests for formatters - Code formatters normally strip trailing whitespace. Since this test depends on the whitespace to succeed, formatting the code would break the test - This small change make this file to be formatted while at the same time preserving the test meaning --- nixos/tests/systemd-networkd-vrf.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/nixos/tests/systemd-networkd-vrf.nix b/nixos/tests/systemd-networkd-vrf.nix index 8a1580fc2ada..3839a49375db 100644 --- a/nixos/tests/systemd-networkd-vrf.nix +++ b/nixos/tests/systemd-networkd-vrf.nix @@ -159,23 +159,18 @@ in { node2.wait_for_unit("network.target") node3.wait_for_unit("network.target") - # NOTE: please keep in mind that the trailing whitespaces in the following strings - # are intentional as the output is compared against the raw `iproute2`-output. - # editorconfig-checker-disable client_ipv4_table = """ - 192.168.1.2 dev vrf1 proto static metric 100 + 192.168.1.2 dev vrf1 proto static metric 100\x20 192.168.2.3 dev vrf2 proto static metric 100 """.strip() vrf1_table = """ - broadcast 192.168.1.0 dev eth1 proto kernel scope link src 192.168.1.1 - 192.168.1.0/24 dev eth1 proto kernel scope link src 192.168.1.1 - local 192.168.1.1 dev eth1 proto kernel scope host src 192.168.1.1 + 192.168.1.0/24 dev eth1 proto kernel scope link src 192.168.1.1\x20 + local 192.168.1.1 dev eth1 proto kernel scope host src 192.168.1.1\x20 broadcast 192.168.1.255 dev eth1 proto kernel scope link src 192.168.1.1 """.strip() vrf2_table = """ - broadcast 192.168.2.0 dev eth2 proto kernel scope link src 192.168.2.1 - 192.168.2.0/24 dev eth2 proto kernel scope link src 192.168.2.1 - local 192.168.2.1 dev eth2 proto kernel scope host src 192.168.2.1 + 192.168.2.0/24 dev eth2 proto kernel scope link src 192.168.2.1\x20 + local 192.168.2.1 dev eth2 proto kernel scope host src 192.168.2.1\x20 broadcast 192.168.2.255 dev eth2 proto kernel scope link src 192.168.2.1 """.strip() # editorconfig-checker-enable From ae52a3c76589523302fd731a9108cd9403891a2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 15:14:43 +0000 Subject: [PATCH 005/814] faudio: 22.02 -> 22.04 --- pkgs/development/libraries/faudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 58601c39a57f..f085f33827c3 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "22.02"; + version = "22.04"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-qjXFpxoFF70aOaEq9/JfI2DtFxxHjyK2OnDaXMiqQMM="; + sha256 = "sha256-2XQpwPNWjK5FF9ex5QxrGEPsUXT/MBqjXy7P2D/SxZw="; }; nativeBuildInputs = [cmake]; From 55b54803f0a964dc4d63c12a735cec678912da5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Apr 2022 19:26:06 +0000 Subject: [PATCH 006/814] gcompris: 2.3 -> 2.4 --- pkgs/games/gcompris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index 5343bae4a6cb..99ee63ed057f 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -18,11 +18,11 @@ mkDerivation rec { pname = "gcompris"; - version = "2.3"; + version = "2.4"; src = fetchurl { url = "https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz"; - sha256 = "sha256-UgWLp5IVqbeFFCO/PRFJ/X1sPm7nSkagVcgEp5SdzGI="; + sha256 = "sha256-/QZub48rarVHcD0PgOPc6NTlOKrsEzVK/qjHb5CjWS0="; }; cmakeFlags = [ From c64cc3fbd431c02b7a9faf190d5a7a152da897ae Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 27 Sep 2021 17:17:46 +0200 Subject: [PATCH 007/814] decoder: init at unstable-2021-11-20 --- pkgs/tools/security/decoder/default.nix | 39 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/security/decoder/default.nix diff --git a/pkgs/tools/security/decoder/default.nix b/pkgs/tools/security/decoder/default.nix new file mode 100644 index 000000000000..baaacac5da8a --- /dev/null +++ b/pkgs/tools/security/decoder/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, openssl +}: + +stdenv.mkDerivation rec { + pname = "decoder"; + version = "unstable-2021-11-20"; + + src = fetchFromGitHub { + owner = "PeterPawn"; + repo = "decoder"; + rev = "da0f826629d4e7b873f9d1a39f24c50ff0a68cd2"; + sha256 = "sha256-1sT1/iwtc2ievmLuNuooy9b14pTs1ZC5noDwzFelk7w="; + }; + + buildInputs = [ + openssl + ]; + + makeFlags = [ "OPENSSL=y" ]; + + installPhase = '' + runHook preInstall + + install -Dm755 src/decoder "$out/bin/decoder" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/PeterPawn/decoder"; + description = ''"secrets" decoding for FRITZ!OS devices''; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e665d0bdc23d..331acab3da1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6995,6 +6995,8 @@ with pkgs; deco = callPackage ../applications/misc/deco { }; + decoder = callPackage ../tools/security/decoder { }; + icoutils = callPackage ../tools/graphics/icoutils { }; idutils = callPackage ../tools/misc/idutils { }; From 89a903ae8bb1427169a42f2b5b7dfe740697b1de Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 15 May 2022 01:30:56 +0000 Subject: [PATCH 008/814] v8: Add libv8_monolith.a symbolic link --- pkgs/development/libraries/v8/8_x.nix | 1 + pkgs/development/libraries/v8/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/v8/8_x.nix b/pkgs/development/libraries/v8/8_x.nix index 5d95a0716eff..323c2459a420 100644 --- a/pkgs/development/libraries/v8/8_x.nix +++ b/pkgs/development/libraries/v8/8_x.nix @@ -148,6 +148,7 @@ stdenv.mkDerivation rec { install -D d8 $out/bin/d8 install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a install -D -m644 icudtl.dat $out/share/v8/icudtl.dat + ln -s libv8.a $out/lib/libv8_monolith.a cp -r ../../include $out mkdir -p $out/lib/pkgconfig diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 2b56d2e5dcf8..cf9d597edc21 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -148,6 +148,7 @@ stdenv.mkDerivation rec { install -D d8 $out/bin/d8 install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a install -D -m644 icudtl.dat $out/share/v8/icudtl.dat + ln -s libv8.a $out/lib/libv8_monolith.a cp -r ../../include $out mkdir -p $out/lib/pkgconfig From bac0d3b001a693fabaf89e24761ae47ada371c52 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 15 May 2022 15:12:02 +0200 Subject: [PATCH 009/814] dotnetPackages.SharpZipLib: 0.86.0 -> 1.3.3 Fixes CVE-2021-32840 --- pkgs/top-level/dotnet-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 10188cee9148..732fb66731ef 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -53,8 +53,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { SharpZipLib = fetchNuGet { pname = "SharpZipLib"; - version = "0.86.0"; - sha256 = "01w2038gckfnq31pncrlgm7d0c939pwr1x4jj5450vcqpd4c41jr"; + version = "1.3.3"; + sha256 = "sha256-HWEQTKh9Ktwg/zIl079dAiH+ob2ShWFAqLgG6XgIMr4="; outputFiles = [ "lib/*" ]; }; From 7a959a64dffe725d7f6a3b1ace1afc5e99c242ca Mon Sep 17 00:00:00 2001 From: Shadaj Laddad Date: Thu, 19 May 2022 18:38:00 -0700 Subject: [PATCH 010/814] vscode-extensions.ms-toolsai.jupyter: 2021.9.1101343141 - > 2022.5.1001411044 --- .../editors/vscode/extensions/ms-toolsai-jupyter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix index 6be5e225fa38..ab3403852409 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai-jupyter/default.nix @@ -7,8 +7,8 @@ in buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2021.9.1101343141"; - sha256 = "1c5dgkk5yn6a8k3blbqakqdy8ppwgfbm0ciki7ix696bvlksbpdg"; + version = "2022.5.1001411044"; + sha256 = "0z6i7a5sba42yc2inp3yvw6lm6m0kings2iv18h4d6zyhm2lb61p"; }; nativeBuildInputs = [ From 83602a5aba89105ba5b8d6cbf30c88e497d1e482 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sun, 22 May 2022 17:54:13 +0200 Subject: [PATCH 011/814] htmldoc: 1.9.15 -> 1.9.16 --- pkgs/tools/typesetting/htmldoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index 9ce2de02d302..06c660625ae5 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "htmldoc"; - version = "1.9.15"; + version = "1.9.16"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "htmldoc"; rev = "v${version}"; - sha256 = "sha256-WNsYJacZBYoZ8Bxj+InQ9ePvelqhU5y9nY7aikUNxEk="; + sha256 = "117cj5sfzl18gan53ld8lxb0wycizcp9jcakcs3nsvnss99rw3a6"; }; nativeBuildInputs = [ pkg-config ]; From fa22eab4c1313eeb57a8c77b4bf6b01bd3f05e6e Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 22 May 2022 18:20:49 +0200 Subject: [PATCH 012/814] metabase: 0.42.1 -> 0.43.1 Fixes CVE-2022-24853, CVE-2022-24854 and CVE-2022-24855 https://github.com/metabase/metabase/releases/tag/v0.43.1 https://github.com/metabase/metabase/releases/tag/v0.43.0 --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 814626fec125..f31b2547f52c 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.42.1"; + version = "0.43.1"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-PmcVVAS/5mDhmOSoFvkZeYkbvFD/KOcgVYuScwD4Olg="; + hash = "sha256-WGbIsmCWsSxgE7Ktr539qTt/o5cJrYi0yu3ZkfbxOV0="; }; nativeBuildInputs = [ makeWrapper ]; From c3182eace3fe93b30e4e245254bd0503c6bd183f Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 22 May 2022 18:45:16 +0200 Subject: [PATCH 013/814] panotools: 2.9.20 -> 2.9.21 Fixes CVE-2021-33293 https://sourceforge.net/projects/panotools/files/libpano13/libpano13-2.9.21/ --- pkgs/applications/graphics/panotools/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 52351fab4ce5..dbc5b973fe9c 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -1,15 +1,16 @@ -{ fetchurl, lib, stdenv, libjpeg, libpng, libtiff, perl }: +{ fetchurl, lib, stdenv, libjpeg, libpng, libtiff, perl, cmake }: stdenv.mkDerivation rec { pname = "libpano13"; - version = "2.9.20"; + version = "2.9.21"; src = fetchurl { url = "mirror://sourceforge/panotools/${pname}-${version}.tar.gz"; - sha256 = "12cv4886l1czfjwy7k6ipgf3zjksgwhdjzr2s9fdg33vqcv2hlrv"; + sha256 = "sha256-eeWhRSGZMF4pYUYnIO9ZQRUnecEnxblvw0DSSS5jNZA="; }; buildInputs = [ perl libjpeg libpng libtiff ]; + nativeBuildInputs = [ cmake ]; # one of the tests succeeds on my machine but fails on Hydra (no idea why) #doCheck = true; From 1bf834a1dd58c68e55e80fa6b9ee20956f6c509a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 9 May 2022 23:33:46 +0100 Subject: [PATCH 014/814] qjoypad: 4.1.0 -> 4.3.1 --- pkgs/tools/misc/qjoypad/default.nix | 36 ++++++++++++++--------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 0c3b4a9ed2f8..018086e6dc7c 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -1,21 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, libX11, libXtst, qt4 }: -stdenv.mkDerivation rec { +{ lib, mkDerivation, fetchFromGitHub, pkg-config, cmake, libX11, libXtst, qtbase, qttools, qtx11extras }: +mkDerivation rec { pname = "qjoypad"; - version = "4.1.0"; - src = fetchurl { - url = "mirror://sourceforge/qjoypad/qjoypad-${version}.tar.gz"; - sha256 = "1jlm7i26nfp185xrl41kz5z6fgvyj51bjpz48cg27xx64y40iamm"; + version = "4.3.1"; + + src = fetchFromGitHub { + owner = "panzi"; + repo = pname; + rev = "v${version}"; + hash = "sha256:1w26ddxb1xirb7qjf7kv9llxzjhbhcb7warnxbx41qhbni46g26y"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 libXtst qt4 ]; - NIX_LDFLAGS = "-lX11"; - patchPhase = '' - cd src - substituteInPlace config --replace /bin/bash ${stdenv.shell} - mkdir -p $out - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${libX11}/lib" - ''; - meta = { + + nativeBuildInputs = [ pkg-config cmake ]; + buildInputs = [ libX11 libXtst qtbase qttools qtx11extras ]; + + meta = with lib; { description = "A program that lets you use gaming devices anywhere"; longDescription = '' A simple Linux/QT program that lets you use your gaming devices @@ -33,9 +31,9 @@ stdenv.mkDerivation rec { of gaming devices in Linux, and makes the Linux gaming experience just a little bit nicer. ''; - homepage = "http://qjoypad.sourceforge.net"; + homepage = "https://github.com/panzi/qjoypad/"; license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ astsmtl ]; - platforms = with lib.platforms; linux; + maintainers = with maintainers; [ astsmtl ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b30eeac305d6..b5daded6e3eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9675,7 +9675,7 @@ with pkgs; qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { }; - qjoypad = callPackage ../tools/misc/qjoypad { }; + qjoypad = libsForQt5.callPackage ../tools/misc/qjoypad { }; qmk = callPackage ../tools/misc/qmk { }; From 24bb1b1c9acf0de5bf2e72910b18669ea0e6c12b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 11:00:14 +0000 Subject: [PATCH 015/814] chafa: 1.8.0 -> 1.10.3 --- pkgs/tools/misc/chafa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 7a0178eea735..85b52dd398c2 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.8.0"; + version = "1.10.3"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "sha256-8ENPmcl0KVxoBu8FGOGk+y8XsONWW0YW32MHAKBUiPE="; + sha256 = "sha256-GRPn0xPWtCayOdmA6M+KQrObAHtZIJLEydXaKhhO5IU="; }; nativeBuildInputs = [ autoconf From 03d0929ba954f7dba1b304a6cd83c1ab5957ffb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 14:44:26 +0000 Subject: [PATCH 016/814] python310Packages.audible: 0.8.1 -> 0.8.2 --- pkgs/development/python-modules/audible/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/audible/default.nix b/pkgs/development/python-modules/audible/default.nix index 987859fbcdd6..f28256f557e8 100644 --- a/pkgs/development/python-modules/audible/default.nix +++ b/pkgs/development/python-modules/audible/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "audible"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "mkb79"; repo = "Audible"; - rev = "v${version}"; - sha256 = "0fsb5av4s7fvpn0iryl8jj3lwffwlxgbwj46l3fidy0l58nq3b1d"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-SIEDBuMCC/Hap2mGVbKEFic96ClN369SEsV06Sg+poY="; }; propagatedBuildInputs = [ beautifulsoup4 httpx pbkdf2 pillow pyaes rsa ]; From 9f598bb87ddbf33e8cd995c2d66a270e72573697 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 May 2022 00:14:59 +0000 Subject: [PATCH 017/814] amtk: 5.4.0 -> 5.4.1 --- pkgs/development/libraries/amtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 961c63a3037f..30a16cb48df0 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "amtk"; - version = "5.4.0"; + version = "5.4.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "g10IUHo96sie91NRzOu0szWv/qNhuIvQ+mZ/QM53enA="; + sha256 = "frq8QpsO67KzI2DJv9vjaOSJs1w83AhqhWz8mzpGanI="; }; nativeBuildInputs = [ From 6ad120be1f7d61113607fd3dfd509f65bd5dde11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 May 2022 03:02:35 +0000 Subject: [PATCH 018/814] geonkick: 2.9.0 -> 2.9.1 --- pkgs/applications/audio/geonkick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index 9739a88586ae..0a99edd7b069 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/BDK1PyRw4xOt+rzC9yX29aRQb1aDnDBIenSz+859OY="; + sha256 = "sha256-XSqcj8+X6QMBnIusPB9VNrgcbdiWhNMOYeFyKklGmO8="; }; nativeBuildInputs = [ cmake pkg-config ]; From c41b541b22fb02bfae325446f58da81b76be148d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 May 2022 04:54:44 +0000 Subject: [PATCH 019/814] frostwire-bin: 6.9.7 -> 6.9.8 --- pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index cfee9d91c930..2d9a319b22c0 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "6.9.7"; + version = "6.9.8"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "sha256-LsmDfNAj10x+txJ4PugyF3Irj/N1reb3ChTvFFIucdc="; + sha256 = "sha256-gslNdvxA4rGKg0bjf2KWw7w9NMp3zqrii144AfKsV4s="; }; nativeBuildInputs = [ makeWrapper ]; From 88e182b3bf46aaa820d2f56a3c02323ff66285e8 Mon Sep 17 00:00:00 2001 From: Jeroen Simonetti Date: Fri, 27 May 2022 09:03:09 +0200 Subject: [PATCH 020/814] maintainers: add jsimonetti Signed-off-by: Jeroen Simonetti --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b1bed259a050..82e2a04a59c3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6342,6 +6342,13 @@ github = "jsierles"; githubId = 82; }; + jsimonetti = { + email = "jeroen+nixpkgs@simonetti.nl"; + matrix = "@jeroen:simonetti.nl"; + name = "Jeroen Simonetti"; + github = "jsimonetti"; + githubId = 5478838; + }; jtcoolen = { email = "jtcoolen@pm.me"; name = "Julien Coolen"; From 116832edbf8da93dedaca69384083e57b7c9f9a0 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 3 Dec 2021 12:23:23 +0000 Subject: [PATCH 021/814] dockerTools: Add example of using NixOS' etc (cherry picked from commit 9b2af8673be82d48ce76c8c152de85ad921d26ba) --- nixos/tests/docker-tools.nix | 5 ++++ pkgs/build-support/docker/examples.nix | 41 ++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 80859ac7a96e..99a968f17af2 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -419,5 +419,10 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker rmi layered-image-with-path", ) + with subtest("etc"): + docker.succeed("${examples.etc} | docker load") + docker.succeed("docker run --rm etc | grep localhost") + docker.succeed("docker image rm etc:latest") + ''; }) diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 9b9a21a1469c..a1be3a111fb3 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -9,6 +9,16 @@ { pkgs, buildImage, buildLayeredImage, fakeNss, pullImage, shadowSetup, buildImageWithNixDb, pkgsCross }: +let + nixosLib = import ../../../nixos/lib { + # Experimental features need testing too, but there's no point in warning + # about it, so we enable the feature flag. + featureFlags.minimalModules = {}; + }; + evalMinimalConfig = module: nixosLib.evalModules { modules = [ module ]; }; + +in + rec { # 1. basic example bash = buildImage { @@ -582,6 +592,37 @@ rec { includeStorePaths = false; }; + etc = + let + inherit (pkgs) lib; + nixosCore = (evalMinimalConfig ({ config, ... }: { + imports = [ + pkgs.pkgsModule + ../../../nixos/modules/system/etc/etc.nix + ]; + environment.etc."hosts" = { + text = '' + 127.0.0.1 localhost + ::1 localhost + ''; + # For executables: + # mode = "0755"; + }; + })); + in pkgs.dockerTools.streamLayeredImage { + name = "etc"; + tag = "latest"; + enableFakechroot = true; + fakeRootCommands = '' + mkdir -p /etc + ${nixosCore.config.system.build.etcActivationCommands} + ''; + config.Cmd = pkgs.writeScript "etc-cmd" '' + #!${pkgs.busybox}/bin/sh + ${pkgs.busybox}/bin/cat /etc/hosts + ''; + }; + # Example export of the bash image exportBash = pkgs.dockerTools.exportImage { fromImage = bash; }; From 44522c1d5996ac1a16a2f7672b7306d557bd5a26 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 30 May 2022 14:32:14 +0200 Subject: [PATCH 022/814] dockerTools.examples.etc: Make it a reliable test /etc/hosts is generally also provided by the container runtime. --- pkgs/build-support/docker/examples.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index a1be3a111fb3..f0535f59dfcc 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -600,7 +600,7 @@ rec { pkgs.pkgsModule ../../../nixos/modules/system/etc/etc.nix ]; - environment.etc."hosts" = { + environment.etc."some-config-file" = { text = '' 127.0.0.1 localhost ::1 localhost @@ -619,7 +619,7 @@ rec { ''; config.Cmd = pkgs.writeScript "etc-cmd" '' #!${pkgs.busybox}/bin/sh - ${pkgs.busybox}/bin/cat /etc/hosts + ${pkgs.busybox}/bin/cat /etc/some-config-file ''; }; From e673666c66d4c1491048f6cacfca2b3ad3977356 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 30 May 2022 19:44:37 +0200 Subject: [PATCH 023/814] tautulli: 2.9.5 -> 2.10.1 --- pkgs/servers/tautulli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index df327f0e8f32..c2d44b29a0e0 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.9.5"; + version = "2.10.1"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "sha256-agkYfLWmeQOD+dtoYvTcNPXjfU3kv56c15AFeB7eVTw="; + sha256 = "sha256-qM3PiBZD0AfbhIdJFYFUGYhsB4U6ZZEW4i7S9waP7VE="; }; installPhase = '' From 581143fafd43a113e8aa7a353551d82538f30395 Mon Sep 17 00:00:00 2001 From: Brian Ryall Date: Wed, 1 Jun 2022 16:12:14 -0400 Subject: [PATCH 024/814] beancount: 2.3.4 -> 2.3.5 --- pkgs/development/python-modules/beancount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 665fd6806bfa..d4ced793f830 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage rec { - version = "2.3.4"; + version = "2.3.5"; pname = "beancount"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-K/CM5qldmAAPTXM5WYXNHeuBwNUu1aduYQusd9gvhsA="; + sha256 = "sha256-FONWJaLpy9Q8rmF42gjLPxIk9iYeVBymcm3zXZjpw2o="; }; # Tests require files not included in the PyPI archive. From c035336c8d6fd97e8db2165a5f7f5d0cd0ba3df3 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Thu, 26 May 2022 17:46:45 +0200 Subject: [PATCH 025/814] sm64ex-coop: init at 0.pre+date=2022-05-14 --- pkgs/games/sm64ex/default.nix | 104 ++++++++++++++------------------ pkgs/games/sm64ex/generic.nix | 83 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 ++- 3 files changed, 134 insertions(+), 61 deletions(-) create mode 100644 pkgs/games/sm64ex/generic.nix diff --git a/pkgs/games/sm64ex/default.nix b/pkgs/games/sm64ex/default.nix index c6df2099d3ce..a6bf7202adcf 100644 --- a/pkgs/games/sm64ex/default.nix +++ b/pkgs/games/sm64ex/default.nix @@ -1,71 +1,55 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, python3 -, pkg-config -, audiofile -, SDL2 -, hexdump -, requireFile -, compileFlags ? [ ] -, region ? "us" -, baseRom ? requireFile { - name = "baserom.${region}.z64"; - message = '' - This nix expression requires that baserom.${region}.z64 is - already part of the store. To get this file you can dump your Super Mario 64 cartridge's contents - and add it to the nix store with nix-store --add-fixed sha256 . - Note that if you are not using a US baserom, you must overwrite the "region" attribute with either "eu" or "jp". - ''; - sha256 = { - "us" = "17ce077343c6133f8c9f2d6d6d9a4ab62c8cd2aa57c40aea1f490b4c8bb21d91"; - "eu" = "c792e5ebcba34c8d98c0c44cf29747c8ee67e7b907fcc77887f9ff2523f80572"; - "jp" = "9cf7a80db321b07a8d461fe536c02c87b7412433953891cdec9191bfad2db317"; - }.${region}; - } +, callPackage +, autoPatchelfHook +, branch }: -stdenv.mkDerivation rec { - pname = "sm64ex"; - version = "unstable-2021-11-30"; +{ + sm64ex = callPackage ./generic.nix { + pname = "sm64ex"; + version = "0.pre+date=2021-11-30"; - src = fetchFromGitHub { - owner = "sm64pc"; - repo = "sm64ex"; - rev = "db9a6345baa5acb41f9d77c480510442cab26025"; - sha256 = "sha256-q7JWDvNeNrDpcKVtIGqB1k7I0FveYwrfqu7ZZK7T8F8="; + src = fetchFromGitHub { + owner = "sm64pc"; + repo = "sm64ex"; + rev = "db9a6345baa5acb41f9d77c480510442cab26025"; + sha256 = "sha256-q7JWDvNeNrDpcKVtIGqB1k7I0FveYwrfqu7ZZK7T8F8="; + }; + + extraMeta = { + homepage = "https://github.com/sm64pc/sm64ex"; + description = "Super Mario 64 port based off of decompilation"; + }; }; - nativeBuildInputs = [ python3 pkg-config ]; - buildInputs = [ audiofile SDL2 hexdump ]; + sm64ex-coop = callPackage ./generic.nix { + pname = "sm64ex-coop"; + version = "0.pre+date=2022-05-14"; - makeFlags = [ "VERSION=${region}" ] ++ compileFlags - ++ lib.optionals stdenv.isDarwin [ "OSX_BUILD=1" ]; + src = fetchFromGitHub { + owner = "djoslin0"; + repo = "sm64ex-coop"; + rev = "8200b175607fe2939f067d496627c202a15fe24c"; + sha256 = "sha256-c1ZmMBtvYYcaJ/WxkZBVvNGVCeSXfm8NKe/BiAIJtks="; + }; - inherit baseRom; + extraNativeBuildInputs = [ + autoPatchelfHook + ]; - preBuild = '' - patchShebangs extract_assets.py - cp $baseRom ./baserom.${region}.z64 - ''; - - installPhase = '' - mkdir -p $out/bin - cp build/${region}_pc/sm64.${region}.f3dex2e $out/bin/sm64ex - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://github.com/sm64pc/sm64ex"; - description = "Super Mario 64 port based off of decompilation"; - longDescription = '' - Super Mario 64 port based off of decompilation. - Note that you must supply a baserom yourself to extract assets from. - If you are not using an US baserom, you must overwrite the "region" attribute with either "eu" or "jp". - If you would like to use patches sm64ex distributes as makeflags, add them to the "compileFlags" attribute. + postInstall = let + sharedLib = stdenv.hostPlatform.extensions.sharedLibrary; + in '' + mkdir -p $out/lib + cp $src/lib/bass/libbass{,_fx}${sharedLib} $out/lib + cp $src/lib/discordsdk/libdiscord_game_sdk${sharedLib} $out/lib ''; - license = licenses.unfree; - maintainers = with maintainers; [ ivar ]; - platforms = platforms.unix; + + extraMeta = { + homepage = "https://github.com/djoslin0/sm64ex-coop"; + description = "Super Mario 64 online co-op mod, forked from sm64ex"; + }; }; -} +}.${branch} diff --git a/pkgs/games/sm64ex/generic.nix b/pkgs/games/sm64ex/generic.nix new file mode 100644 index 000000000000..ab75ac70b9c5 --- /dev/null +++ b/pkgs/games/sm64ex/generic.nix @@ -0,0 +1,83 @@ +{ pname +, version +, src +, extraNativeBuildInputs ? [ ] +, extraMeta ? {} +, compileFlags ? [ ] +, postInstall ? "" +, region ? "us" + +, lib +, stdenv +, fetchFromGitHub +, python3 +, pkg-config +, audiofile +, SDL2 +, hexdump +, requireFile +, baseRom ? requireFile { + name = "baserom.${region}.z64"; + message = '' + This nix expression requires that baserom.${region}.z64 is + already part of the store. To get this file you can dump your Super Mario 64 cartridge's contents + and add it to the nix store with nix-store --add-fixed sha256 . + Note that if you are not using a US baserom, you must overwrite the "region" attribute with either "eu" or "jp". + ''; + sha256 = { + "us" = "17ce077343c6133f8c9f2d6d6d9a4ab62c8cd2aa57c40aea1f490b4c8bb21d91"; + "eu" = "c792e5ebcba34c8d98c0c44cf29747c8ee67e7b907fcc77887f9ff2523f80572"; + "jp" = "9cf7a80db321b07a8d461fe536c02c87b7412433953891cdec9191bfad2db317"; + }.${region}; + } +}: + +stdenv.mkDerivation rec { + inherit pname version src postInstall; + + nativeBuildInputs = [ + python3 + pkg-config + hexdump + ] ++ extraNativeBuildInputs; + + buildInputs = [ + audiofile + SDL2 + ]; + + enableParallelBuilding = true; + + makeFlags = [ + "VERSION=${region}" + ] ++ lib.optionals stdenv.isDarwin [ + "OSX_BUILD=1" + ] ++ compileFlags; + + preBuild = '' + patchShebangs extract_assets.py + ln -s ${baseRom} ./baserom.${region}.z64 + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp build/${region}_pc/sm64.${region}.f3dex2e $out/bin/sm64ex + + runHook postInstall + ''; + + meta = with lib; { + longDescription = + extraMeta.description or "Super Mario 64 port based off of decompilation" + "\n" + '' + Note that you must supply a baserom yourself to extract assets from. + If you are not using an US baserom, you must overwrite the "region" attribute with either "eu" or "jp". + If you would like to use patches sm64ex distributes as makeflags, add them to the "compileFlags" attribute. + ''; + mainProgram = "sm64ex"; + license = licenses.unfree; + maintainers = with maintainers; [ ivar ]; + platforms = platforms.unix; + } // extraMeta; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdb1dc71df2c..149635fc708e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31411,7 +31411,13 @@ with pkgs; runescape = callPackage ../games/runescape-launcher { }; - sm64ex = callPackage ../games/sm64ex { }; + sm64ex = callPackage ../games/sm64ex { + branch = "sm64ex"; + }; + + sm64ex-coop = callPackage ../games/sm64ex { + branch = "sm64ex-coop"; + }; snipes = callPackage ../games/snipes { }; From 7a687b7dbe4c09fc72e6f6e4beab2d0596e8bde7 Mon Sep 17 00:00:00 2001 From: Reed Date: Wed, 1 Jun 2022 18:15:40 -0400 Subject: [PATCH 026/814] shairport-sync: add dbus, mpris, and metadata flags --- pkgs/servers/shairport-sync/default.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index ed3c0dcc7f9d..dbe478568ac6 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -1,6 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl, avahi, alsa-lib -, libdaemon, popt, pkg-config, libconfig, libpulseaudio, soxr }: +{ lib, stdenv, fetchFromGitHub +, autoreconfHook, pkg-config +, openssl, avahi, alsa-lib, glib, libdaemon, popt, libconfig, libpulseaudio, soxr +, enableDbus ? stdenv.isLinux +, enableMetadata ? false +, enableMpris ? stdenv.isLinux +}: +with lib; stdenv.mkDerivation rec { version = "3.3.9"; pname = "shairport-sync"; @@ -23,7 +29,12 @@ stdenv.mkDerivation rec { libconfig libpulseaudio soxr - ]; + ] ++ optional stdenv.isLinux glib; + + prePatch = '' + sed -i -e 's/G_BUS_TYPE_SYSTEM/G_BUS_TYPE_SESSION/g' dbus-service.c + sed -i -e 's/G_BUS_TYPE_SYSTEM/G_BUS_TYPE_SESSION/g' mpris-service.c + ''; enableParallelBuilding = true; @@ -32,7 +43,10 @@ stdenv.mkDerivation rec { "--with-avahi" "--with-ssl=openssl" "--with-soxr" "--without-configfiles" "--sysconfdir=/etc" - ]; + ] + ++ optional enableDbus "--with-dbus-interface" + ++ optional enableMetadata "--with-metadata" + ++ optional enableMpris "--with-mpris-interface"; meta = with lib; { inherit (src.meta) homepage; From bc5882186725ab95194d2d26bd50c694ed3efa8b Mon Sep 17 00:00:00 2001 From: Philipp Mildenberger Date: Thu, 2 Jun 2022 15:14:32 +0200 Subject: [PATCH 027/814] grpc-client-cli: init at 1.12.0 --- .../tools/misc/grpc-client-cli/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/misc/grpc-client-cli/default.nix diff --git a/pkgs/development/tools/misc/grpc-client-cli/default.nix b/pkgs/development/tools/misc/grpc-client-cli/default.nix new file mode 100644 index 000000000000..59beb7acd8bb --- /dev/null +++ b/pkgs/development/tools/misc/grpc-client-cli/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "grpc-client-cli"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "vadimi"; + repo = "grpc-client-cli"; + rev = "v${version}"; + sha256 = "sha256-hsx+nmkYLkSsrUEDAf5556qNLeZ3w5txFBUpDv+b3a4="; + }; + + vendorSha256 = "sha256-1WcnEl3odjxyXfSNyzPU3fa5yrF4MaEgfCAsbr3xedA="; + + meta = with lib; { + description = "generic gRPC command line client"; + maintainers = with maintainers; [ Philipp-M ]; + homepage = "https://github.com/vadimi/grpc-client-cli"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afcab99ca6a5..65907ce4a61f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6691,6 +6691,8 @@ with pkgs; grpc-tools = callPackage ../development/tools/misc/grpc-tools { }; + grpc-client-cli = callPackage ../development/tools/misc/grpc-client-cli { }; + grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; } // (config.grub or {})); From 728c5e0d1a312462ad27bbc2716c09b60effcd04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Jun 2022 00:57:09 +0000 Subject: [PATCH 028/814] bikeshed: 3.5.2 -> 3.7.0 --- pkgs/applications/misc/bikeshed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bikeshed/default.nix b/pkgs/applications/misc/bikeshed/default.nix index a6433ee777ae..1316b7f26783 100644 --- a/pkgs/applications/misc/bikeshed/default.nix +++ b/pkgs/applications/misc/bikeshed/default.nix @@ -22,11 +22,11 @@ buildPythonApplication rec { pname = "bikeshed"; - version = "3.5.2"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fa9z/y4Enrei8gb48MSS7vzDcttZVO7MJkdEIaDZb0I="; + sha256 = "sha256-3fVo+B71SsJs+XF4+FWH2nz0ouTnpC/02fXYr1C9Jrk="; }; # Relax requirements from "==" to ">=" From 2de8b939481550e4e62b69a7227fae1aa6002a23 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sat, 4 Jun 2022 23:35:59 +0200 Subject: [PATCH 029/814] solvespace: 3.0 -> 3.1 --- pkgs/applications/graphics/solvespace/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 68744831538c..e0605ad81e43 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -7,6 +7,7 @@ , at-spi2-core , cairo , dbus +, eigen , freetype , fontconfig , glew @@ -18,6 +19,7 @@ , libpng , libselinux , libsepol +, libspnav , libthai , libxkbcommon , pangomm @@ -29,13 +31,13 @@ stdenv.mkDerivation rec { pname = "solvespace"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-aaYqUZ0c1lCL91fmxtKFAAE2uUWrjnDB3WdcqdutXhE="; + hash = "sha256-sSDht8pBrOG1YpsWfC/CLTTWh2cI5pn2PXGH900Z0yA="; fetchSubmodules = true; }; @@ -49,6 +51,7 @@ stdenv.mkDerivation rec { at-spi2-core cairo dbus + eigen freetype fontconfig glew @@ -60,6 +63,7 @@ stdenv.mkDerivation rec { libpng libselinux libsepol + libspnav libthai libxkbcommon pangomm From e9af7d1551294850757430c468ec3ac48a9b82f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Jun 2022 00:58:36 +0000 Subject: [PATCH 030/814] cvehound: 1.0.9 -> 1.1.0 --- pkgs/development/tools/analysis/cvehound/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cvehound/default.nix b/pkgs/development/tools/analysis/cvehound/default.nix index 3fe3c043c238..12d36dc6089e 100644 --- a/pkgs/development/tools/analysis/cvehound/default.nix +++ b/pkgs/development/tools/analysis/cvehound/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "cvehound"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "evdenis"; repo = "cvehound"; - rev = version; - hash = "sha256-qwQfpelY1Air3wVQ3RziM/+MNOR3jiKmLpO2w6kXZwM="; + rev = "refs/tags/${version}"; + hash = "sha256-4+0Virpsq4mwOIpostS87VYTX8hsumXEL1w8FiOrNtA="; }; makeWrapperArgs = [ From ac66ff97ed1f86d2ac98e1f49cfff427fe1e526d Mon Sep 17 00:00:00 2001 From: Mirco Bauer Date: Fri, 3 Jun 2022 15:32:43 +0800 Subject: [PATCH 031/814] doc/builders/images/dockertools: improve shadowSetup example The example snippet will fail with this error as it is not self contained and assumes `shadowSetup` was given: $ nix-build docker-image.nix error: undefined variable 'shadowSetup' at docker-image.nix:20:7 Instead use the full reference to `shadowSetup` in the example so it will work as stated. --- doc/builders/images/dockertools.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md index 458b0b36720f..d7f8741437cc 100644 --- a/doc/builders/images/dockertools.section.md +++ b/doc/builders/images/dockertools.section.md @@ -302,7 +302,7 @@ buildImage { runAsRoot = '' #!${pkgs.runtimeShell} - ${shadowSetup} + ${pkgs.dockerTools.shadowSetup} groupadd -r redis useradd -r -g redis redis mkdir /data From 8b501a1089c346ea6efcddd6de18015512467493 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 5 Jun 2022 22:12:24 +0300 Subject: [PATCH 032/814] rss-glx: fix build --- pkgs/misc/screensavers/rss-glx/cstddef.patch | 12 ++++++++++++ pkgs/misc/screensavers/rss-glx/default.nix | 20 ++++++++++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 pkgs/misc/screensavers/rss-glx/cstddef.patch diff --git a/pkgs/misc/screensavers/rss-glx/cstddef.patch b/pkgs/misc/screensavers/rss-glx/cstddef.patch new file mode 100644 index 000000000000..8bec510b0405 --- /dev/null +++ b/pkgs/misc/screensavers/rss-glx/cstddef.patch @@ -0,0 +1,12 @@ +diff --git i/src/Implicit/impSurface.h w/src/Implicit/impSurface.h +index 41fab81..027587f 100644 +--- i/src/Implicit/impSurface.h ++++ w/src/Implicit/impSurface.h +@@ -25,6 +25,7 @@ + #ifdef WIN32 + #include + #endif ++#include + #include + #include + diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 981db782c7c9..a90b5d65653e 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,4 +1,16 @@ -{lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libXext, libGLU, libGL, imagemagick6, libtiff, bzip2}: +{ lib +, stdenv +, fetchurl +, autoconf +, pkg-config +, xlibsWrapper +, libXext +, libGLU +, libGL +, imagemagick6 +, libtiff +, bzip2 +}: stdenv.mkDerivation rec { version = "0.9.1"; @@ -9,9 +21,13 @@ stdenv.mkDerivation rec { sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg"; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoconf pkg-config ]; buildInputs = [ libGLU libGL xlibsWrapper imagemagick6 libtiff bzip2 ]; + patches = [ + ./cstddef.patch + ]; + NIX_CFLAGS_COMPILE = "-I${imagemagick6.dev}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2c3b14d2811..ba3ec0cdbd4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34562,7 +34562,7 @@ with pkgs; stdenv = gccStdenv; }; - rss-glx = callPackage ../misc/screensavers/rss-glx { stdenv = gcc10StdenvCompat; }; + rss-glx = callPackage ../misc/screensavers/rss-glx { }; run-scaled = callPackage ../tools/X11/run-scaled { }; From 5bd650e06216d13e6db91c4b5dda5b94632dfb39 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 5 Jun 2022 23:08:44 +0300 Subject: [PATCH 033/814] dapper: use buildGoModule --- pkgs/development/tools/dapper/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/development/tools/dapper/default.nix index 45e4614b448a..8e3160b4cddc 100644 --- a/pkgs/development/tools/dapper/default.nix +++ b/pkgs/development/tools/dapper/default.nix @@ -1,30 +1,29 @@ -{ buildGoPackage -, lib +{ lib +, buildGoModule , fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "dapper"; version = "0.5.8"; - goPackagePath = "github.com/rancher/dapper"; - src = fetchFromGitHub { owner = "rancher"; repo = "dapper"; rev = "v${version}"; sha256 = "sha256-t1w8bhwCjZHmvgBG6Tv8kgqTbC7v5P5QOvJGuTJUC04="; }; - patchPhase = '' - substituteInPlace main.go --replace 0.0.0 ${version} - ''; + vendorSha256 = null; + + patchPhase = '' + substituteInPlace main.go --replace 0.0.0 ${version} + ''; meta = with lib; { - description = "Docker Build Wrapper"; + description = "Docker build wrapper"; homepage = "https://github.com/rancher/dapper"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ kuznero ]; }; } - From 94d64660218a109c4b6ac8985271434689292131 Mon Sep 17 00:00:00 2001 From: Rahul Butani Date: Mon, 6 Jun 2022 01:16:33 -0500 Subject: [PATCH 034/814] lc3tools: fix build on macOS --- .../lc3tools/0004-configure-use-cc.patch | 22 +++++++++++++++++++ pkgs/development/tools/lc3tools/default.nix | 10 +++++++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/lc3tools/0004-configure-use-cc.patch diff --git a/pkgs/development/tools/lc3tools/0004-configure-use-cc.patch b/pkgs/development/tools/lc3tools/0004-configure-use-cc.patch new file mode 100644 index 000000000000..caaec2200008 --- /dev/null +++ b/pkgs/development/tools/lc3tools/0004-configure-use-cc.patch @@ -0,0 +1,22 @@ +diff --git a/configure b/configure +index dfc1b3e..55577af 100755 +--- a/configure ++++ b/configure +@@ -18,7 +18,7 @@ esac + # Some binaries that we'll need, and the places that we might find them. + + IFS=: +-binlist="uname:flex:gcc:wish:rm:cp:mkdir:chmod:sed" ++binlist="uname:flex:cc:wish:rm:cp:mkdir:chmod:sed" + pathlist=$PATH + libpathlist=$LIBS + incpathlist=$INCLUDES +@@ -109,7 +109,7 @@ fi + # Splice it all in to Makefile.def to create the Makefile. + + rm -f Makefile +-sed -e "s __GCC__ $gcc g" -e "s __FLEX__ $flex g" -e "s __EXE__ $EXE g" \ ++sed -e "s __GCC__ $cc g" -e "s __FLEX__ $flex g" -e "s __EXE__ $EXE g" \ + -e "s*__OS_SIM_LIBS__*$OS_SIM_LIBS*g" -e "s __RM__ $rm g" \ + -e "s __CP__ $cp g" -e "s __MKDIR__ $mkdir g" -e "s __CHMOD__ $chmod g" \ + -e "s __USE_READLINE__ $USE_READLINE g" -e "s*__RLLPATH__*$RLLPATH*g" \ diff --git a/pkgs/development/tools/lc3tools/default.nix b/pkgs/development/tools/lc3tools/default.nix index 3e7f81bb4e7b..c6120a227a99 100644 --- a/pkgs/development/tools/lc3tools/default.nix +++ b/pkgs/development/tools/lc3tools/default.nix @@ -19,6 +19,9 @@ stdenv.mkDerivation { # lc3sim-tk looks for lc3sim in $out/bin instead of $out ./0003-lc3sim-tk-path.patch + + # use `cc` instead of `gcc`; on macOS the latter is not present + ./0004-configure-use-cc.patch ]; nativeBuildInputs = [ unzip ]; @@ -40,8 +43,15 @@ stdenv.mkDerivation { ''; meta = with lib; { + longDescription = '' + The LC-3 tools package contains the lc3as assembler, the lc3sim simulator, + and lc3sim-tk, a Tcl/Tk-based GUI frontend to the simulator. + ''; description = "Toolchain and emulator for the LC-3 architecture"; + homepage = "https://highered.mheducation.com/sites/0072467509/student_view0/lc-3_simulator.html"; license = licenses.gpl2; maintainers = with maintainers; [ anna328p ]; + mainProgram = "lc3sim-tk"; + platforms = with lib.platforms; unix ++ windows; }; } From 62f0b2fa4e6de1d640634ef30b4e1a12cb70bb7a Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Fri, 11 Mar 2022 14:38:25 -0500 Subject: [PATCH 035/814] checkbashisms: 2.21.1 -> 2.22.1 --- pkgs/development/tools/misc/checkbashisms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 6222bb312bb0..b648a082fa3f 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, perl, installShellFiles }: stdenv.mkDerivation rec { - version = "2.21.1"; + version = "2.22.1"; pname = "checkbashisms"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - hash = "sha256-1ZbIiUrFd38uMVLy7YayLLm5RrmcovsA++JTb8PbTFI="; + hash = "sha256-Nd1eYCnSe+NblujG44uKpvunkaITcdrC3g+M3uX+M9U="; }; nativeBuildInputs = [ installShellFiles ]; From 43629f3d2e57da46b403b681909c324a7614aa1d Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 30 May 2022 19:29:39 +0200 Subject: [PATCH 036/814] fancy-motd: unstable-2021-07-15 -> unstable-2022-06-06 --- pkgs/tools/system/fancy-motd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/fancy-motd/default.nix b/pkgs/tools/system/fancy-motd/default.nix index e8f21c6fbd31..f2ac62f2874a 100644 --- a/pkgs/tools/system/fancy-motd/default.nix +++ b/pkgs/tools/system/fancy-motd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fancy-motd"; - version = "unstable-2021-07-15"; + version = "unstable-2022-06-06"; src = fetchFromGitHub { owner = "bcyran"; repo = pname; - rev = "e8d2d2602d9b9fbc132ddc4f9fbf22428d715721"; - sha256 = "10fxr1grsiwvdc5m2wd4n51lvz0zd4sldg9rzviaim18nw68gdq3"; + rev = "812c58f04f65053271f866f3797baa2eba7324f5"; + sha256 = "sha256-O/euB63Dyj+NyfZK42egSEYwZhL8B0jCxSSDYoT4cpo="; }; buildInputs = [ bc curl figlet fortune gawk iproute2 ]; From 360206abd00bea2ec8ddc0f714f5845e7c2210f6 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Tue, 7 Jun 2022 09:45:29 +0200 Subject: [PATCH 037/814] tfplugindocs: init at 0.9.0 --- .../tools/tfplugindocs/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/tfplugindocs/default.nix diff --git a/pkgs/development/tools/tfplugindocs/default.nix b/pkgs/development/tools/tfplugindocs/default.nix new file mode 100644 index 000000000000..8308092d3369 --- /dev/null +++ b/pkgs/development/tools/tfplugindocs/default.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "tfplugindocs"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "terraform-plugin-docs"; + rev = "v${version}"; + sha256 = "sha256-1grwbi/nG0d2NwEE/eOeo1+0uGpZ1BRJdubyLwhvKfU="; + }; + + vendorSha256 = "sha256-VhnPRBVlvR/Xh7wkX7qx0m5s+yBOCJQE1zcAe8//lNw="; + + meta = with lib; { + description = "Generate and validate Terraform plugin/provider documentation"; + homepage = "https://github.com/hashicorp/terraform-plugin-docs"; + license = licenses.mpl20; + maintainers = with maintainers; [ lewo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa1a9c46f08b..a2621dade782 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1213,6 +1213,8 @@ with pkgs; tfk8s = callPackage ../tools/misc/tfk8s { }; + tfplugindocs = callPackage ../development/tools/tfplugindocs { }; + thumbs = callPackage ../tools/misc/thumbs { }; tnat64 = callPackage ../tools/networking/tnat64 { }; From 70b31373b4b4c5673e36f1bb6fe88045304d705f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 7 Jun 2022 13:37:11 +0200 Subject: [PATCH 038/814] tt-rss: downgrade to php 8.0 --- nixos/modules/services/web-apps/tt-rss.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 9aa38ab25c9a..c441a2a7764e 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -534,6 +534,7 @@ let services.phpfpm.pools = mkIf (cfg.pool == "${poolName}") { ${poolName} = { inherit (cfg) user; + phpPackage = pkgs.php80; settings = mapAttrs (name: mkDefault) { "listen.owner" = "nginx"; "listen.group" = "nginx"; From 95052027078143e62c65869474d33bb2023ab184 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 7 Jun 2022 23:44:08 +0300 Subject: [PATCH 039/814] =?UTF-8?q?gpxsee:=2011.0=20=E2=86=92=2011.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/gpxsee/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index fa85ad367ec2..7ce85dc6f767 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, qmake, qttools, qttranslations, qtlocation, wrapQtAppsHook, substituteAll }: +{ lib, stdenv, fetchFromGitHub, qmake, qttools, qttranslations, qtlocation, qtpbfimageplugin, wrapQtAppsHook, substituteAll }: stdenv.mkDerivation rec { pname = "gpxsee"; - version = "11.0"; + version = "11.1"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-UT3Q7pirEXvwQmqHHiSivX/VNZPVLwRJ/aiP7wpkhqQ="; + sha256 = "sha256-0n1XPrJ+gssIP/7k9CI8AWXs9ddKOg3Lo3DfrXGUl84="; }; patches = (substituteAll { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { inherit qttranslations; }); - buildInputs = [ qtlocation ]; + buildInputs = [ qtlocation qtpbfimageplugin ]; nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; From f98680b4e4faa5babb86e01541e7198366a94ad6 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 7 Jun 2022 16:58:26 -0400 Subject: [PATCH 040/814] python3Packages.tensorflow: 2.8.0 -> 2.9.0 --- .../python-modules/tensorboard/default.nix | 4 +-- .../tensorflow-estimator/default.nix | 4 +-- .../python-modules/tensorflow/default.nix | 29 ++++++++++++------- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index 47025bf4a28a..42fe33dcab69 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.8.0"; + version = "2.9.0"; format = "wheel"; disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-ZaM45EJOkHnyYEkjvb4wF5KtzirOG+aNprPd8AUXDe8="; + hash = "sha256-vXghEHbcpe+icmCvrPqpbNBcfbEqbAnMdqHWsph8piE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix index 7c7f155adb09..b52a96a3ea5b 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; - version = "2.8.0"; + version = "2.9.0"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - hash = "sha256-vujgUgxgrn6vbKjLRsWp9LRXJVMTgNuPvjj8tIR4trs="; + hash = "sha256-6XYrswL1G8HrLzXRnwGQpqLYCddU1d73iMQyj+N0Z0Q="; }; propagatedBuildInputs = [ mock numpy absl-py ]; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 3a8eba3ba97f..92b78b02e063 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -4,7 +4,7 @@ , buildPythonPackage, pythonOlder, python # Python libraries , numpy, tensorboard, absl-py -, setuptools, wheel, keras, keras-preprocessing, google-pasta +, packaging, setuptools, wheel, keras, keras-preprocessing, google-pasta , opt-einsum, astunparse, h5py , termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator , dill, flatbuffers-python, portpicker, tblib, typing-extensions @@ -76,7 +76,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.8.0"; + version = "2.9.0"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -94,6 +94,7 @@ let keras-preprocessing numpy opt-einsum + packaging protobuf-python setuptools six @@ -189,7 +190,7 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - hash = "sha256-w78ehpsnXElIyYftgZEq3b/+TSrRN1gyWVUVlSZpGFM="; + hash = "sha256-9VsgNvl+2gxxkC4F+pq4ABuOONpcf96Qbk46shDRpVY="; }; # On update, it can be useful to steal the changes from gentoo @@ -350,7 +351,13 @@ let bazelBuildFlags = [ "--config=opt" # optimize using the flags set in the configure phase ] - ++ lib.optionals stdenv.cc.isClang [ "--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++" ] + ++ lib.optionals stdenv.cc.isClang [ + "--cxxopt=-x" "--cxxopt=c++" + "--host_cxxopt=-x" "--host_cxxopt=c++" + + # workaround for https://github.com/bazelbuild/bazel/issues/15359 + "--spawn_strategy=sandboxed" + ] ++ lib.optionals (mklSupport) [ "--config=mkl" ]; bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow"; @@ -362,12 +369,12 @@ let fetchAttrs = { # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "sha256-dQEyfueuQPcGvbhuh8Al45np3nRLDw2PCfC2lEqAH50=" + "sha256-mcK60pLz70tOAu1+THUXweiO2SCSFUdFdT91HaUokzA=" else if stdenv.isDarwin then - "sha256-yfnZVtKWqNQGvlfq2owXhem0LmzDYriVfYgf1ZRlaDo=" + "sha256-j2k9Q+k41nq5nP1VjjkkNjXRov1uAda4RCMDMAthjrk=" else - "sha256:12i1ix2xwq77f3h8qr4h57g0aazrdsjjqa536cpwx3n1mvl5p6qi"; + "sha256-teW6o9Fb4hUxmaHpQU2F+5ihE/DA+MIY8QaMEKMnFiE="; }; buildAttrs = { @@ -428,16 +435,15 @@ in buildPythonPackage { src = bazel-build.python; # Adjust dependency requirements: - # - Relax gast version requirement that doesn't match what we have packaged - # - Relax tf-estimator, that would require a nightly version + # - Relax flatbuffers and gast version requirements # - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet # - keras and tensorlow-io-gcs-filesystem will be considered as optional for now. postPatch = '' sed -i setup.py \ + -e "s/'flatbuffers[^']*',/'flatbuffers',/" \ -e "s/'gast[^']*',/'gast',/" \ - -e "s/'tf-estimator-nightly[^']*',/'tensorflow-estimator',/" \ -e "/'libclang[^']*',/d" \ - -e "/'keras[^']*',/d" \ + -e "/'keras[^']*')\?,/d" \ -e "/'tensorflow-io-gcs-filesystem[^']*',/d" ''; @@ -463,6 +469,7 @@ in buildPythonPackage { keras-preprocessing numpy opt-einsum + packaging protobuf-python six tensorflow-estimator From ba40bab6e5dbbbd4d18383f6d776f98dc41c1650 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 10 May 2022 16:12:22 -0700 Subject: [PATCH 041/814] perlPackages: add meta.mainProgram to pacakges with single executable where the executable's name differs from the packages `name` or `pname` --- .../WWW-YoutubeViewer/default.nix | 3 +- pkgs/development/perl-modules/ham/default.nix | 1 + pkgs/top-level/perl-packages.nix | 274 ++++++++++++++++-- 3 files changed, 260 insertions(+), 18 deletions(-) diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index 17ec8ab48b59..6ab6233fc700 100644 --- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -25,7 +25,8 @@ buildPerlPackage rec { meta = with lib; { description = "A lightweight application for searching and streaming videos from YouTube"; homepage = "https://github.com/trizen/youtube-viewer"; - maintainers = with maintainers; [ woffs ]; license = with licenses; [ artistic2 ]; + maintainers = with maintainers; [ woffs ]; + mainProgram = "youtube-viewer"; }; } diff --git a/pkgs/development/perl-modules/ham/default.nix b/pkgs/development/perl-modules/ham/default.nix index 8b19c9404fe0..2fc4b3c3b430 100644 --- a/pkgs/development/perl-modules/ham/default.nix +++ b/pkgs/development/perl-modules/ham/default.nix @@ -37,6 +37,7 @@ buildPerlPackage { homepage = "https://github.com/kernkonzept/ham"; license = "unknown"; # should be gpl2, but not quite sure maintainers = with lib.maintainers; [ aw ]; + mainProgram = "ham"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f24b11399206..7a7716ed2c65 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -182,6 +182,7 @@ let meta = { description = "Perl extension to generate and test check digits"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "checkdigits.pl"; }; }; @@ -476,6 +477,9 @@ let }; propagatedBuildInputs = [ AnyEvent commonsense ]; meta = { + description = "Quickly ping a large number of hosts"; + license = with lib.licenses; [ artistic1 gpl2Plus ]; + mainProgram = "fastping"; }; }; @@ -724,6 +728,7 @@ let meta = { description = "pack your dependencies onto your script file"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "fatpack"; }; }; @@ -747,6 +752,7 @@ let homepage = "https://github.com/miyagawa/cpanminus"; description = "Get, unpack, build and install modules from CPAN"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "cpanm"; }; }; @@ -768,6 +774,7 @@ let description = "A fast CPAN module installer"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.zakame ]; + mainProgram = "cpm"; }; }; @@ -805,6 +812,7 @@ let homepage = "https://www.chordpro.org"; description = "A lyrics and chords formatting program"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "chordpro"; }; }; @@ -836,6 +844,7 @@ let meta = { description = "Manage perl installations in your $HOME"; license = lib.licenses.mit; + mainProgram = "perlbrew"; }; }; @@ -868,6 +877,7 @@ let homepage = "https://sqitch.org/"; description = "Sane database change management"; license = lib.licenses.mit; + mainProgram = "sqitch"; }; }; @@ -887,6 +897,7 @@ let license = lib.licenses.mit; homepage = "https://github.com/nferraz/st"; maintainers = [ maintainers.eelco ]; + mainProgram = "st"; }; }; @@ -985,6 +996,7 @@ let description = "Module for manipulations of cpio archives"; # See https://rt.cpan.org/Public/Bug/Display.html?id=43597#txn-569710 license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "cpio-filter"; }; }; @@ -1038,6 +1050,7 @@ let meta = { description = "Provide an interface to ZIP archive files"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "crc32"; }; }; @@ -1173,6 +1186,7 @@ let meta = { description = "Generate Tickets (Signed HTTP Cookies) for mod_auth_pubtkt protected websites"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "mod_auth_pubtkt.pl"; }; }; @@ -1338,6 +1352,7 @@ let homepage = "http://www.aarontrevena.co.uk/opensource/autodia/"; license = lib.licenses.gpl2Plus; + mainProgram = "autodia.pl"; }; buildInputs = [ DBI ]; }; @@ -1554,6 +1569,7 @@ let homepage = "https://metacpan.org/release/Bot-Training"; description = "Plain text training material for bots like Hailo and AI::MegaHAL"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "bot-training"; }; }; @@ -1997,6 +2013,7 @@ let homepage = "https://github.com/perl-carton/carton"; description = "Perl module dependency manager (aka Bundler for Perl)"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "carton"; }; }; @@ -2203,6 +2220,7 @@ let homepage = "http://wiki.catalystframework.org/wiki/"; description = "The Catalyst Framework Runtime"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "catalyst.pl"; }; }; @@ -2630,6 +2648,7 @@ let description = "a data toolkit"; license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/LibreCat/Catmandu"; + mainProgram = "catmandu"; }; }; @@ -2644,6 +2663,7 @@ let description = "Get the CDDB info for an audio cd"; license = lib.licenses.artistic1; maintainers = [ maintainers.endgame ]; + mainProgram = "cddb.pl"; }; }; @@ -3005,6 +3025,11 @@ let url = "mirror://cpan/authors/id/M/MS/MSCHLUE/Class-Classgen-classgen-3.03.tar.gz"; sha256 = "9b65d41b991538992e816b32cc4fa9b4a4a0bb3e9c10e7eebeff82658dbbc8f6"; }; + meta = { + description = "Simplifies creation, manipulation and usage of complex objects."; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "classgen"; + }; }; ClassContainer = buildPerlModule { @@ -3450,6 +3475,7 @@ let meta = { description = "Engine for tidyall, your all-in-one code tidier and validator"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "tidyall"; }; }; @@ -3847,6 +3873,7 @@ let meta = { description = "Simple, versioned access to configuration data"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "cfgver"; }; }; @@ -4075,6 +4102,7 @@ let meta = { description = "Coro based PSGI web server"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "corona"; }; }; @@ -4110,6 +4138,7 @@ let description = "Create a minimal mirror of CPAN"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; + mainProgram = "minicpan"; }; }; @@ -4123,6 +4152,7 @@ let meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "cpanel_json_xs"; }; }; @@ -4153,6 +4183,7 @@ let meta = { description = "Read and write Changes files"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "tidy_changelog"; }; }; @@ -4253,6 +4284,7 @@ let homepage = "https://github.com/rjbs/cpan-uploader"; description = "Upload things to the CPAN"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "cpan-upload"; }; }; @@ -4536,6 +4568,7 @@ let meta = { description = "Interface to /dev/random and /dev/urandom"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "makerandom"; }; }; @@ -4725,6 +4758,7 @@ let description = "Pure-Perl OpenPGP implementation"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; + mainProgram = "pgplet"; }; doCheck = false; /* test fails with 'No random source available!' */ }; @@ -5064,6 +5098,7 @@ let meta = { description = "Dump with recursive encoding"; license = lib.licenses.artistic2; + mainProgram = "edumper"; }; }; @@ -5139,6 +5174,7 @@ let meta = { description = "Hexadecimal Dumper"; maintainers = with maintainers; [ AndersonTorres ]; + mainProgram = "hexdump"; }; }; @@ -5773,6 +5809,7 @@ let meta = { description = "Create machine readable date/time with natural parsing logic"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "dateparse"; }; }; @@ -6038,6 +6075,7 @@ let homepage = "https://github.com/bingos/devel-patchperl"; description = "Patch perl source a la Devel::PPPort's buildperl.pl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "patchperl"; }; }; @@ -6381,6 +6419,7 @@ let homepage = "https://metacpan.org/pod/DBIx::Class"; description = "Extensible and flexible object <-> relational mapper"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "dbicadmin"; }; }; @@ -6501,6 +6540,7 @@ let meta = { description = "Create a DBIx::Class::Schema based on a database"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "dbicdump"; }; }; @@ -6925,6 +6965,7 @@ let description = "Perl extension for SHA-3"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; + mainProgram = "sha3sum"; }; }; @@ -7016,6 +7057,7 @@ let homepage = "http://dzil.org/"; description = "Distribution builder; installer not included!"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "dzil"; }; doCheck = false; }; @@ -7372,6 +7414,7 @@ let description = "More reliable benchmarking with the least amount of thinking"; license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/briandfoy/dumbbench"; + mainProgram = "dumbbench"; }; }; @@ -7563,6 +7606,7 @@ let description = "A .MSG to mbox converter"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ peterhoeg ]; + mainProgram = "msgconvert"; }; }; @@ -7809,6 +7853,11 @@ let url = "mirror://cpan/authors/id/D/DS/DSB/Env-Path-0.19.tar.gz"; sha256 = "1qhmj15a66h90pjl2dgnxsb9jj3b1r5mpvnr87cafcl8g69z0jr4"; }; + meta = { + description = "Advanced operations on path variables"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "envpath"; + }; }; EnvSanctify = buildPerlPackage { @@ -7871,9 +7920,9 @@ let }; propagatedBuildInputs = [ ArchiveZip ]; meta = { - homepage = "http://jmcnamara.github.com/excel-writer-xlsx/"; description = "Create a new file in the Excel 2007+ XLSX format"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "extract_vba"; }; }; @@ -8146,6 +8195,7 @@ let meta = { description = "Create a module Makefile"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "instmodsh"; }; }; @@ -8232,6 +8282,11 @@ let sha256 = "1zx84f93lkymqz7qa4d63gzlnhnkxm5i3gvsrwkvvqr9cxjasxli"; }; buildInputs = [ TestBase TestDifferences ]; + meta = { + description = "XS++ is just a thin layer over plain XS"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "xspp"; + }; }; FatalException = buildPerlModule { @@ -8498,6 +8553,7 @@ let homepage = "https://www.shlomifish.org/open-source/projects/File-Find-Object/"; description = "Alternative interface to File::Find::Object"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "findorule"; }; }; @@ -8509,6 +8565,11 @@ let sha256 = "1znachnhmi1w5pdqx8dzgfa892jb7x8ivrdy4pzjj7zb6g61cvvy"; }; propagatedBuildInputs = [ NumberCompare TextGlob ]; + meta = { + description = "File::Find::Rule is a friendlier interface to File::Find"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "findrule"; + }; }; FileFindRulePerl = buildPerlPackage { @@ -8887,6 +8948,7 @@ let meta = { description = "Estimate file space usage (similar to `du`)"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "fdu"; }; }; @@ -9224,6 +9286,12 @@ let hardeningDisable = [ "format" ]; makeMakerFlags = "--lib_png_path=${pkgs.libpng.out} --lib_jpeg_path=${pkgs.libjpeg.out} --lib_zlib_path=${pkgs.zlib.out} --lib_ft_path=${pkgs.freetype.out} --lib_fontconfig_path=${pkgs.fontconfig.lib} --lib_xpm_path=${pkgs.xorg.libXpm.out}"; + + meta = { + description = "Interface to Gd Graphics Library"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "bdf2gdfont.pl"; + }; }; GDGraph = buildPerlPackage { @@ -9291,6 +9359,7 @@ let meta = { description = "Perl API for MaxMind's GeoIP2 web services and databases"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "web-service-request"; }; }; @@ -9368,9 +9437,10 @@ let shortenPerlShebang $out/bin/git-autofixup ''; meta = { - maintainers = [ maintainers.DamienCassou ]; description = "Create fixup commits for topic branches"; license = lib.licenses.artistic2; + maintainers = [ maintainers.DamienCassou ]; + mainProgram = "git-autofixup"; }; }; @@ -9532,6 +9602,10 @@ let }; buildInputs = [ pkgs.gnupg1orig ]; doCheck = false; + meta = { + description = "Perl interface to the GNU Privacy Guard"; + mainProgram = "gpgmailtunl"; + }; }; GnuPGInterface = buildPerlPackage { @@ -9620,6 +9694,7 @@ let meta = { description = "Simple interface to Google Protocol Buffers"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "protoc-perl"; }; }; @@ -9922,6 +9997,7 @@ let homepage = "https://github.com/hailo/hailo"; description = "A pluggable Markov engine analogous to MegaHAL"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "hailo"; }; }; @@ -10082,6 +10158,7 @@ let meta = { description = "Cleans up HTML code for web browsers, not humans"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "htmlclean"; }; }; @@ -10121,6 +10198,9 @@ let }; propagatedBuildInputs = [ HTMLParser TermVT102Boundless ]; meta = { + description = "Mark up ANSI sequences as HTML"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "ansi2html"; }; }; @@ -10437,6 +10517,11 @@ let sed -i "s#/usr/lib#${pkgs.tidyp}/lib#" Makefile.PL ''; buildInputs = [ TestException ]; + meta = { + description = "HTML::Tidy is an HTML checker in a handy dandy object"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "webtidy"; + }; }; HTMLTiny = buildPerlPackage { @@ -10474,6 +10559,7 @@ let meta = { description = "Work with HTML in a DOM-like tree structure"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "htmltree"; }; }; @@ -10618,6 +10704,8 @@ let }; meta = { description = "WebDAV client library."; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "dave"; }; propagatedBuildInputs = [ XMLDOM ]; }; @@ -10879,6 +10967,7 @@ let meta = { description = "Perl interface to the C library \"libpng\""; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "pnginspect"; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.ImagePNGLibpng.x86_64-darwin }; }; @@ -10970,6 +11059,7 @@ let meta = { description = "Read the dimensions of an image in several popular formats"; license = with lib.licenses; [ artistic1 lgpl21Plus ]; + mainProgram = "imgsize"; }; }; @@ -10993,6 +11083,7 @@ let meta = { description = "Read an image with tesseract ocr and get output"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "ocr"; }; }; @@ -11063,6 +11154,7 @@ let meta = { description = "Asynchronous/Advanced Input/Output"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "treescan"; }; }; @@ -11242,6 +11334,10 @@ let sha256 = "15dimh3i61y6kybhbap91kwh9837xfww072rh95h7j40sb1did5w"; }; propagatedBuildInputs = [ pkgs.more FileWhich TermReadKey ]; # `more` used in tests + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "tp"; + }; }; IOPty = buildPerlModule { @@ -11429,6 +11525,7 @@ let meta = { description = "Fast lookup of country codes from IP addresses"; license = lib.licenses.mit; + mainProgram = "ip2cc"; }; }; @@ -11539,8 +11636,6 @@ let description = "A tool to read, write and edit EXIF meta information"; homepage = "https://exiftool.org/"; - mainProgram = "exiftool"; - longDescription = '' ExifTool is a platform-independent Perl library plus a command-line application for reading, writing and editing meta information in a wide @@ -11554,8 +11649,8 @@ let ''; license = with licenses; [ gpl1Plus /* or */ artistic2 ]; - maintainers = [ maintainers.kiloreux ]; + mainProgram = "exiftool"; }; }; @@ -11741,6 +11836,7 @@ let meta = { description = "JSON::XS compatible pure-Perl module"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "json_pp"; }; }; @@ -11767,6 +11863,7 @@ let meta = { description = "Read JSON into a Perl variable"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "validjson"; }; }; @@ -11812,6 +11909,11 @@ let }; propagatedBuildInputs = [ TypesSerialiser ]; buildInputs = [ CanaryStability ]; + meta = { + description = "JSON serialising/deserialising, done correctly and fast"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "json_xs"; + }; }; JSONXSVersionOneAndTwo = buildPerlPackage { @@ -12203,6 +12305,11 @@ let sha256 = "113f91d8fc2c630437153a49fb7a52b023af8f6278ed96c070b1f60824b8eae1"; }; doCheck = false; + meta = { + description = "Transliterates text between writing systems"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "translit"; + }; }; LinkEmbedder = buildPerlPackage { @@ -12487,6 +12594,7 @@ let meta = { description = "Use other catalog formats in Maketext"; license = "mit"; + mainProgram = "xgettext.pl"; }; }; @@ -12796,6 +12904,7 @@ let homepage = "https://mschilli.github.io/log4perl/"; description = "Log4j implementation for Perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "l4p-tmpl"; }; }; @@ -13049,12 +13158,13 @@ let url = "mirror://cpan/authors/id/W/WY/WYANT/Mac-Pasteboard-0.011.tar.gz"; sha256 = "1a82pacp6pph3y2agdihzr4vc0phx85mq5am9czc81g8n484b35x"; }; + buildInputs = [ pkgs.darwin.apple_sdk.frameworks.ApplicationServices ]; meta = with lib; { description = "Manipulate Mac OS X pasteboards"; license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.darwin; + mainProgram = "pbtool"; }; - buildInputs = [ pkgs.darwin.apple_sdk.frameworks.ApplicationServices ]; }; MailAuthenticationResults = buildPerlPackage { @@ -13311,6 +13421,7 @@ let meta = { description = "Human-readable unit-aware calculator"; license = with lib.licenses; [ artistic1 gpl2 ]; + mainProgram = "ucalc"; }; }; @@ -13845,6 +13956,10 @@ let }; outputs = [ "out" ]; buildInputs = [ ProcWaitStat ]; + meta = { + description = "Construct and optionally mail MIME messages"; + license = lib.licenses.gpl2Plus; + }; }; MIMEEncWords = buildPerlPackage { @@ -14009,8 +14124,9 @@ let }; meta = { description = "Micro Objects. Mo is less."; - license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/ingydotnet/mo-pm"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "mo-inline"; }; }; @@ -14069,6 +14185,7 @@ let meta = { description = "Build and install Perl modules"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "config_data"; }; }; @@ -14413,6 +14530,7 @@ let homepage = "https://github.com/neilbowers/Module-Path"; description = "Get the full path to a locally installed module"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "mpath"; }; }; @@ -14497,6 +14615,7 @@ let meta = { description = "Recursively scan Perl code for dependencies"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "scandeps.pl"; }; }; @@ -14511,6 +14630,7 @@ let meta = { description = "Module signature file manipulation"; license = lib.licenses.cc0; + mainProgram = "cpansign"; }; }; @@ -14524,6 +14644,7 @@ let meta = { description = "Module name tools and transformations"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "pm_which"; }; }; @@ -14583,6 +14704,7 @@ let meta = { description = "Embed a Perl interpreter in the Apache HTTP server"; license = lib.licenses.asl20; + mainProgram = "mp2bug"; }; passthru.tests = nixosTests.mod_perl; @@ -14964,6 +15086,7 @@ let description = "A postmodern object system for Perl 5"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.eelco ]; + mainProgram = "moose-outdated"; }; }; @@ -15627,6 +15750,7 @@ let homepage = "https://github.com/moose/MooseX-Runnable"; description = "Tag a class as a runnable application"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "mx-run"; }; }; @@ -16040,6 +16164,7 @@ let description = "Generates a database upgrade instruction set"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; + mainProgram = "mysqldiff"; }; }; @@ -16167,6 +16292,7 @@ let meta = { description = "Use the Amazon S3 - Simple Storage Service"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "s3cl"; }; }; @@ -16313,10 +16439,10 @@ let propagatedBuildInputs = [ XMLTwig ]; # https://gitlab.com/berrange/perl-net-dbus/-/merge_requests/19 - patches = (fetchpatch { + patches = fetchpatch { url = "https://gitlab.com/berrange/perl-net-dbus/-/commit/6bac8f188fb06e5e5edd27aee672d66b7c28caa4.patch"; sha256 = "19nf4xn9xhyd0sd2az9iliqldjj0k6ah2dmkyqyvq4rp2d9k5jgb"; - }); + }; postPatch = '' substituteInPlace Makefile.PL --replace pkg-config $PKG_CONFIG @@ -16526,6 +16652,9 @@ let sha256 = "1zk3591822dg187sgkwjjvg18qmvkn3yib1c34mq8z5i617xwi9q"; }; meta = { + description = "Perl extension for manipulating IPv4 addresses"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "ipv4calc"; }; }; @@ -16691,6 +16820,8 @@ let doCheck = false; # seems to hang waiting for connections meta = { description = "Extensible, general Perl server engine"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "net-server"; }; }; @@ -16781,6 +16912,11 @@ let sha256 = "0hdpn1cw52x8cw24m9ayzpf4rwarm0khygn1sv3wvwxkrg0pphql"; }; doCheck = false; # The test suite fails, see https://rt.cpan.org/Public/Bug/Display.html?id=85799 + meta = { + description = "Object oriented interface to SNMP"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "snmpkey"; + }; }; NetSNPP = buildPerlPackage rec { @@ -16862,6 +16998,7 @@ let meta = { description = "Sends statistics to the stats daemon over UDP"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "benchmark.pl"; }; }; @@ -17298,6 +17435,7 @@ let meta = { description = "Routines for manipulating stashes"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "package-stash-conflicts"; }; }; @@ -17475,8 +17613,9 @@ let buildInputs = [ PathTiny ]; meta = { description = "interface to PAUSE's module permissions file (06perms.txt)"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/neilb/PAUSE-Permissions"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "pause-permissions"; }; }; @@ -17607,6 +17746,7 @@ let meta = { description = "Perl extension for generating and using LALR parsers"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "yapp"; }; }; @@ -17849,14 +17989,15 @@ let buildInputs = [ TestDeep ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ListMoreUtils ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/perlcritic + ''; meta = { homepage = "http://perlcritic.com"; description = "Critique Perl source code for best-practices"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "perlcritic"; }; - postInstall = lib.optionalString stdenv.isDarwin '' - shortenPerlShebang $out/bin/perlcritic - ''; }; PerlCriticCommunity = buildPerlModule { @@ -18063,6 +18204,7 @@ let meta = { description = "Indent and reformat perl scripts"; license = lib.licenses.gpl2Plus; + mainProgram = "perltidy"; }; }; @@ -18111,6 +18253,7 @@ let homepage = "https://github.com/plack/Plack"; description = "Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "plackup"; }; }; @@ -18313,6 +18456,7 @@ let description = "Perl Language Server"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.artturin ]; + mainProgram = "pls"; }; }; @@ -18330,6 +18474,7 @@ let homepage = "http://user42.tuxfamily.org/pod-minimumversion/index.html"; description = "Determine minimum Perl version of POD directives"; license = lib.licenses.free; + mainProgram = "pod-minimumversion"; }; }; @@ -18375,9 +18520,10 @@ let sha256 = "0yx4wsljfmdzsiv0ni98x6lw975cm82ahngbwqvzv60wx5pwkl5y"; }; meta = { - maintainers = teams.deshaw.members; description = "Reusable tests for POE::Loop authors"; license = lib.licenses.artistic2; + maintainers = teams.deshaw.members; + mainProgram = "poe-gen-tests"; }; }; @@ -18467,6 +18613,9 @@ let sha256 = "91b6a5aeb841b1c313498c78fad08e37d17595702dc6205b5ad38ef69949b7ee"; }; meta = { + description = "Provides a generic interface to running background processes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "timed-process"; }; }; @@ -18664,6 +18813,7 @@ let homepage = "https://github.com/neilbowers/Perl-MinimumVersion"; description = "Find a minimum required version of perl for Perl code"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "perlver"; }; }; @@ -18694,6 +18844,7 @@ let meta = { description = "a tool to scan your Perl code for its prerequisites"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "scan-perl-prereqs-nqlite"; }; }; @@ -18708,6 +18859,7 @@ let meta = { description = "Parse and manipulate Perl version strings"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "perl-reversion"; }; }; @@ -18722,6 +18874,7 @@ let meta = { description = "An abstract, tree-based interface to perl POD documents"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "paf"; }; }; @@ -18732,6 +18885,11 @@ let url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.74.tar.gz"; sha256 = "12559997r7wbhhs0p6cdxdzv7rzviv0nx1hq0dby8q481apn489f"; }; + meta = { + description = "Check POD documents for syntax errors"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "podchecker"; + }; }; PodCoverage = buildPerlPackage { @@ -18742,6 +18900,11 @@ let sha256 = "01xifj83dv492lxixijmg6va02rf3ydlxly0a9slmx22r6qa1drh"; }; propagatedBuildInputs = [ DevelSymdump PodParser ]; + meta = { + description = "Checks if the documentation of a module is comprehensive"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "pod_cover"; + }; }; PodCoverageTrustPod = buildPerlPackage { @@ -18816,6 +18979,7 @@ let meta = { description = "Modules for parsing/translating POD format documents"; license = lib.licenses.artistic1; + mainProgram = "podselect"; }; }; @@ -18860,6 +19024,7 @@ let homepage = "https://github.com/ktat/Pod-Section"; description = "Select specified section from Module's POD"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "podsection"; }; }; @@ -18875,6 +19040,7 @@ let homepage = "https://github.com/timj/perl-Pod-LaTeX/tree/master"; description = "Convert Pod data to formatted Latex"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "pod2latex"; }; }; @@ -18933,6 +19099,7 @@ let meta = { description = "Look up Perl documentation in Pod format"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "perldoc"; }; }; @@ -18962,6 +19129,7 @@ let homepage = "https://github.com/rwstauner/Pod-Markdown"; description = "Convert POD to Markdown"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "pod2markdown"; }; propagatedBuildInputs = [ URI ]; }; @@ -18978,6 +19146,7 @@ let meta = { description = "Convert POD to Github's specific markdown"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "pod2github"; }; }; @@ -18999,6 +19168,11 @@ let }; propagatedBuildInputs = [ ClassTiny FileShareDir LinguaENInflect PathTiny PodParser ]; buildInputs = [ FileShareDirInstall TestDeep ]; + meta = { + description = "A formatter for spellchecking Pod"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "podspell"; + }; }; PodStrip = buildPerlModule { @@ -19026,6 +19200,7 @@ let meta = { description = "a reformatting Pod Processor"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "podtidy"; }; }; @@ -19055,6 +19230,7 @@ let propagatedBuildInputs = [ PodParser ]; meta = { license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "podwrap"; }; }; @@ -19113,6 +19289,7 @@ let homepage = "https://github.com/creaktive/rainbarf"; description = "CPU/RAM/battery stats chart bar for tmux (and GNU screen)"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "rainbarf"; }; }; @@ -19344,6 +19521,11 @@ let }; propagatedBuildInputs = [ XMLParser ]; doCheck = false; + meta = { + description = "An implementation of XML-RPC"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "make_method"; + }; }; ReturnValue = buildPerlPackage { @@ -19627,6 +19809,7 @@ let meta = with lib; { description = "Linux/POSIX emulation of Win32::SerialPort functions."; license = with licenses; [ artistic1 gpl1Plus ]; + mainProgram = "modemtest"; }; }; @@ -19642,6 +19825,7 @@ let homepage = "https://github.com/kazuho/p5-Server-Starter"; description = "A superdaemon for hot-deploying server programs"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "start_server"; }; }; @@ -19732,6 +19916,11 @@ let url = "mirror://cpan/authors/id/R/RA/RAAB/SGMLSpm-1.1.tar.gz"; sha256 = "1gdjf3mcz2bxir0l9iljxiz6qqqg3a9gg23y5wjg538w552r432m"; }; + meta = { + description = "Library for parsing the output from SGMLS and NSGMLS parsers"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "sgmlspl.pl"; + }; }; SignalMask = buildPerlPackage { @@ -19758,6 +19947,7 @@ let meta = { description = "Porters stemming algorithm for norwegian."; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "stemmer-no.pl"; }; }; @@ -19771,6 +19961,7 @@ let meta = { description = "Porters stemming algorithm for swedish."; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "stemmer-se.pl"; }; }; @@ -19939,6 +20130,7 @@ let meta = { description = "Write to a cross platform Excel binary file"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "chartex"; }; }; @@ -19992,6 +20184,11 @@ let }; buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassAccessor ListMoreUtils RegexpCommon SQLTokenizer ]; + meta = { + description = "Split any SQL code into atomic statements"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "sql-split"; + }; }; SQLStatement = buildPerlPackage { @@ -20100,6 +20297,7 @@ let homepage = "https://github.com/miyagawa/Starman"; description = "High-performance preforking PSGI/Plack web server"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "starman"; }; }; @@ -20363,6 +20561,11 @@ let url = "mirror://cpan/authors/id/C/CG/CGRAU/String-MkPasswd-0.05.tar.gz"; sha256 = "15lvcc8c9hp6mg3jx02wd3b85aphn8yl5db62q3pam04c0sgh42k"; }; + meta = { + description = "Random password generator"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "mkpasswd.pl"; + }; }; StringRandom = buildPerlModule { @@ -20398,7 +20601,9 @@ let doCheck = !stdenv.isDarwin; meta = { # http://cpansearch.perl.org/src/ROSCH/String-ShellQuote-1.04/README + description = "Quote strings for passing through the shell"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "shell-quote"; }; }; @@ -20744,6 +20949,7 @@ let homepage = "https://github.com/ingydotnet/swim-pm"; description = "See What I Mean?!"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "swin"; }; }; @@ -21321,6 +21527,7 @@ let homepage = "https://sourceforge.net/projects/perl-trg/"; description = "Perl extension for the GNU Readline/History Library"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "perlsh"; }; }; @@ -21500,6 +21707,7 @@ let meta = { description = "A new and improved test harness with better Test2 integration"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "yath"; broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Test2Harness.x86_64-darwin }; }; @@ -22110,8 +22318,9 @@ let buildInputs = [ CPANMetaCheck TestDeep TestWarnings ]; meta = { description = "Test the Kwalitee of a distribution before you release it"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/karenetheridge/Test-Kwalitee"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "kwalitee-metrics"; }; }; @@ -22328,6 +22537,7 @@ let homepage = "https://github.com/creaktive/Test-Mojibake"; description = "Check your source for encoding misbehavior"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "scan_mojibake"; }; }; @@ -22650,6 +22860,7 @@ let homepage = "http://web-cpan.berlios.de/modules/Test-Run/"; description = "Analyze tests from the command line using Test::Run"; license = lib.licenses.mit; + mainProgram = "runprove"; }; }; @@ -23087,6 +23298,11 @@ let sha256 = "0pwrrnwi1qaiy3c5522vy0kzncxc9g02r4b056wqqaa69w1hsc0z"; }; buildInputs = [ TestBase ]; + meta = { + description = "Testing Module for YAML Implementations"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "test-yaml"; + }; }; TextAligner = buildPerlModule { @@ -23398,6 +23614,7 @@ let description = "Generate random Latin looking text"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.sgo ]; + mainProgram = "lorem"; }; }; @@ -23426,6 +23643,11 @@ let postInstall = '' shortenPerlShebang $out/bin/Markdown.pl ''; + meta = { + description = "Convert Markdown syntax to (X)HTML"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "Markdown.pl"; + }; }; TextMarkdownHoedown = buildPerlModule { @@ -23484,6 +23706,7 @@ let meta = { description = "Convert MultiMarkdown syntax to (X)HTML"; license = lib.licenses.bsd3; + mainProgram = "MultiMarkdown.pl"; }; }; @@ -24310,8 +24533,9 @@ let buildInputs = [ TestRequires TestSharedFork TestTCP ]; meta = { description = "AnyEvent HTTP server for PSGI (like Thin)"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/miyagawa/Twiggy"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "twiggy"; }; }; @@ -24523,6 +24747,7 @@ let meta = { description = "Find URIs in arbitrary text"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "urifind"; }; }; @@ -24730,9 +24955,10 @@ let }; outputs = [ "out" ]; meta = { - maintainers = [ maintainers.chreekat ]; description = "Edit a directory in $EDITOR"; license = with lib.licenses; [ gpl1 ]; + maintainers = [ maintainers.chreekat ]; + mainProgram = "vidir"; }; }; @@ -24777,6 +25003,7 @@ let homepage = "https://validator.w3.org/checklink"; description = "A tool to check links and anchors in Web pages or full Web sites"; license = lib.licenses.w3c; + mainProgram = "checklink"; }; }; @@ -24826,6 +25053,7 @@ let homepage = "https://github.com/libwww-perl/WWW-Mechanize"; description = "Handy web browsing in a Perl object"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "mech-dump"; }; buildInputs = [ CGI HTTPServerSimple PathTiny TestDeep TestFatal TestOutput TestWarnings ]; }; @@ -25125,6 +25353,11 @@ let postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/xmlsort ''; + meta = { + description = "SAX filter for sorting elements in XML"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "xmlsort"; + }; }; XMLGrove = buildPerlPackage { @@ -25154,6 +25387,7 @@ let propagatedBuildInputs = [ libxml_perl ]; meta = { description = "Yet another Perl SAX XML Writer"; + mainProgram = "xmlpretty"; }; }; @@ -25259,6 +25493,7 @@ let meta = { description = "Modules for parsing and evaluating XPath statements"; license = lib.licenses.artistic2; + mainProgram = "xpath"; }; }; @@ -25448,6 +25683,11 @@ let ''; propagatedBuildInputs = [ XMLParser ]; doCheck = false; # requires lots of extra packages + meta = { + description = "A Perl module for processing huge XML documents in tree mode"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "xml_grep"; + }; }; XMLValidatorSchema = buildPerlPackage { From 25b5943729726370ff86a06929b36041d607036a Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 17 May 2022 02:18:53 -0700 Subject: [PATCH 042/814] perlPackages: add meta.mainProgram to packages with multiple executables where none of the executables match the package's `name` or `pname`, and one of the executables is the obvious `mainProgram`. --- pkgs/top-level/perl-packages.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7a7716ed2c65..901fb4ff8c69 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -683,9 +683,10 @@ let --replace 'sed' '${pkgs.gnused}/bin/sed' ''; meta = { + homepage = "https://github.com/duncs/clusterssh/wiki"; description = "A container for functions of the ClusterSSH programs"; license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/duncs/clusterssh/wiki"; + mainProgram = "cssh"; }; }; @@ -1023,6 +1024,7 @@ let meta = { description = "Manipulates TAR archives"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "ptar"; }; }; @@ -1402,6 +1404,7 @@ let homepage = "https://github.com/rurban/perl-compiler"; description = "Perl compiler"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "perlcc"; }; doCheck = false; /* test fails */ }; @@ -4117,6 +4120,7 @@ let meta = { description = "Query, download and build perl modules from CPAN sites"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "cpan"; }; }; @@ -4269,6 +4273,7 @@ let homepage = "https://github.com/jib/cpanplus-devel"; description = "Ameliorated interface to the CPAN"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "cpanp"; }; }; @@ -7699,6 +7704,7 @@ let meta = { description = "Character encodings in Perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "piconv"; }; }; @@ -9269,6 +9275,7 @@ let meta = { description = "Verify solutions for solitaire games"; license = lib.licenses.mit; + mainProgram = "verify-solitaire-solution"; }; }; @@ -11241,6 +11248,7 @@ let meta = { description = "IO Interface to compressed data files/buffers"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "streamzip"; }; # Same as CompressRawZlib doCheck = false && !stdenv.isDarwin; @@ -11976,6 +11984,7 @@ let homepage = "https://dlmf.nist.gov/LaTeXML/"; license = lib.licenses.publicDomain; maintainers = with maintainers; [ xworld21 ]; + mainProgram = "latexml"; }; passthru = { tlType = "run"; @@ -13332,6 +13341,7 @@ let meta = { description = "An object-oriented implementation of Sender Policy Framework"; license = lib.licenses.bsd3; + mainProgram = "spfquery"; }; }; @@ -13930,6 +13940,7 @@ let homepage = "https://www.mhonarc.org/"; description = "A mail-to-HTML converter"; maintainers = with maintainers; [ lovek323 ]; + mainProgram = "mhonarc"; license = licenses.gpl2; }; }; @@ -14391,6 +14402,7 @@ let meta = { description = "Information about Perl modules"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "module_info"; }; propagatedBuildInputs = [ BUtils ]; }; @@ -14722,6 +14734,7 @@ let description = "Real-time web framework"; license = lib.licenses.artistic2; maintainers = with maintainers; [ thoughtpolice sgo ]; + mainProgram = "mojo"; }; }; @@ -17935,6 +17948,7 @@ let homepage = "http://pdl.perl.org/"; description = "Perl Data Language"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "pdl2"; platforms = lib.platforms.linux; }; }; @@ -18237,6 +18251,7 @@ let description = "Pure-Perl Core-Only replacement for pkg-config"; license = with lib.licenses; [ artistic1 gpl1Plus ]; maintainers = teams.deshaw.members; + mainProgram = "ppkg-config"; }; }; @@ -18829,6 +18844,7 @@ let homepage = "https://github.com/rjbs/Perl-PrereqScanner"; description = "A tool to scan your Perl code for its prerequisites"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "scan-perl-prereqs"; }; }; @@ -18995,6 +19011,7 @@ let homepage = "https://github.com/neilb/Pod-POM"; description = "POD Object Model"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "pom2"; }; }; @@ -20235,6 +20252,7 @@ let meta = { description = "SQL DDL transformations and more"; license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "sqlt"; }; }; From 1a5f94115ce86f6ec861ec136fee8b64a53dffac Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 7 Jun 2022 14:50:58 -0700 Subject: [PATCH 043/814] perlPackages: fix indentation --- pkgs/top-level/perl-packages.nix | 2632 +++++++++++++++--------------- 1 file changed, 1316 insertions(+), 1316 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 901fb4ff8c69..03ca1f4134b9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -308,16 +308,16 @@ let }; asa = buildPerlPackage { - pname = "asa"; - version = "1.04"; - src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/asa-1.04.tar.gz"; - sha256 = "0pk783s1h2f45zbmm6a62yfgy71w4sqh8ppgs4cyxfikwxs3p0z5"; - }; - meta = { - description = "Lets your class/object say it works like something else"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "asa"; + version = "1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/asa-1.04.tar.gz"; + sha256 = "0pk783s1h2f45zbmm6a62yfgy71w4sqh8ppgs4cyxfikwxs3p0z5"; + }; + meta = { + description = "Lets your class/object say it works like something else"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; AlienSDL = buildPerlModule { @@ -676,11 +676,11 @@ let postInstall = '' mkdir -p $out/share/bash-completion/completions mv $out/bin/clusterssh_bash_completion.dist \ - $out/share/bash-completion/completions/clusterssh_bash_completion + $out/share/bash-completion/completions/clusterssh_bash_completion substituteInPlace $out/share/bash-completion/completions/clusterssh_bash_completion \ - --replace '/bin/true' '${pkgs.coreutils}/bin/true' \ - --replace 'grep' '${pkgs.gnugrep}/bin/grep' \ - --replace 'sed' '${pkgs.gnused}/bin/sed' + --replace '/bin/true' '${pkgs.coreutils}/bin/true' \ + --replace 'grep' '${pkgs.gnugrep}/bin/grep' \ + --replace 'sed' '${pkgs.gnused}/bin/sed' ''; meta = { homepage = "https://github.com/duncs/clusterssh/wiki"; @@ -720,17 +720,17 @@ let }; AppFatPacker = buildPerlPackage { - pname = "App-FatPacker"; - version = "0.010008"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010008.tar.gz"; - sha256 = "1kzcbpsf1p7ww45d9fl2w0nfn5jj5pz0r0c649c1lrj5r1nv778j"; - }; - meta = { - description = "pack your dependencies onto your script file"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - mainProgram = "fatpack"; - }; + pname = "App-FatPacker"; + version = "0.010008"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010008.tar.gz"; + sha256 = "1kzcbpsf1p7ww45d9fl2w0nfn5jj5pz0r0c649c1lrj5r1nv778j"; + }; + meta = { + description = "pack your dependencies onto your script file"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "fatpack"; + }; }; Appcpanminus = buildPerlPackage { @@ -850,18 +850,18 @@ let }; ArchiveAnyLite = buildPerlPackage { - pname = "Archive-Any-Lite"; - version = "0.11"; - src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Archive-Any-Lite-0.11.tar.gz"; - sha256 = "0w2i50fd81ip674zmnrb15nadw162fdpiw4rampbd94k74jqih8m"; - }; - propagatedBuildInputs = [ ArchiveZip ]; - buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; - meta = { - description = "simple CPAN package extractor"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Archive-Any-Lite"; + version = "0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Archive-Any-Lite-0.11.tar.gz"; + sha256 = "0w2i50fd81ip674zmnrb15nadw162fdpiw4rampbd94k74jqih8m"; + }; + propagatedBuildInputs = [ ArchiveZip ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; + meta = { + description = "simple CPAN package extractor"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; AppSqitch = buildPerlModule { @@ -931,17 +931,17 @@ let }; ArrayDiff = buildPerlPackage { - pname = "Array-Diff"; - version = "0.09"; - src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Array-Diff-0.09.tar.gz"; - sha256 = "0xsh8k312spzl90xds075qprcaz4r0b93g1bgi9l3rv1k0p3j1l0"; - }; - propagatedBuildInputs = [ AlgorithmDiff ClassAccessor ]; - meta = { - description = "Find the differences between two arrays"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Array-Diff"; + version = "0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEILB/Array-Diff-0.09.tar.gz"; + sha256 = "0xsh8k312spzl90xds075qprcaz4r0b93g1bgi9l3rv1k0p3j1l0"; + }; + propagatedBuildInputs = [ AlgorithmDiff ClassAccessor ]; + meta = { + description = "Find the differences between two arrays"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; ArrayFIFO = buildPerlPackage { @@ -1029,16 +1029,16 @@ let }; ArchiveTarWrapper = buildPerlPackage { - pname = "Archive-Tar-Wrapper"; - version = "0.38"; - src = fetchurl { - url = "mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.38.tar.gz"; - sha256 = "0ymknznhk5ky7f835l0l5wfkx8kl0vfm0hvhijvgyp5rm3dd1wqr"; - }; - propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; - meta = { - description = "API wrapper around the 'tar' utility"; - }; + pname = "Archive-Tar-Wrapper"; + version = "0.38"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.38.tar.gz"; + sha256 = "0ymknznhk5ky7f835l0l5wfkx8kl0vfm0hvhijvgyp5rm3dd1wqr"; + }; + propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; + meta = { + description = "API wrapper around the 'tar' utility"; + }; }; ArchiveZip = buildPerlPackage { @@ -1300,17 +1300,17 @@ let }; AuthenSimplePasswd = buildPerlModule { - pname = "Authen-Simple-Passwd"; - version = "0.6"; - src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-Passwd-0.6.tar.gz"; - sha256 = "1ckl2ry9r5nb1rcn1ik2l5b5pp1i3g4bmllsmzb0zpwy4lvbqmfg"; - }; - propagatedBuildInputs = [ AuthenSimple ]; - meta = { - description = "Simple Passwd authentication"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Authen-Simple-Passwd"; + version = "0.6"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-Passwd-0.6.tar.gz"; + sha256 = "1ckl2ry9r5nb1rcn1ik2l5b5pp1i3g4bmllsmzb0zpwy4lvbqmfg"; + }; + propagatedBuildInputs = [ AuthenSimple ]; + meta = { + description = "Simple Passwd authentication"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; autobox = buildPerlPackage { @@ -1656,18 +1656,18 @@ let }; BUtils = buildPerlPackage { - pname = "B-Utils"; - version = "0.27"; - src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/B-Utils-0.27.tar.gz"; - sha256 = "1spzhmk3z6c4blmra3kn84nq20fira2b3vjg86m0j085lgv56zzr"; - }; - propagatedBuildInputs = [ TaskWeaken ]; - buildInputs = [ ExtUtilsDepends ]; - meta = { - description = "Helper functions for op tree manipulation"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "B-Utils"; + version = "0.27"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/B-Utils-0.27.tar.gz"; + sha256 = "1spzhmk3z6c4blmra3kn84nq20fira2b3vjg86m0j085lgv56zzr"; + }; + propagatedBuildInputs = [ TaskWeaken ]; + buildInputs = [ ExtUtilsDepends ]; + meta = { + description = "Helper functions for op tree manipulation"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; BusinessHours = buildPerlPackage { @@ -1906,15 +1906,15 @@ let }; capitalization = buildPerlPackage { - pname = "capitalization"; - version = "0.03"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/capitalization-0.03.tar.gz"; - sha256 = "0g7fpckydzxsf8mjkfbyj0pv42dzym4hwbizqahnh7wlfbaicdgi"; - }; - propagatedBuildInputs = [ DevelSymdump ]; - meta = { - }; + pname = "capitalization"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/capitalization-0.03.tar.gz"; + sha256 = "0g7fpckydzxsf8mjkfbyj0pv42dzym4hwbizqahnh7wlfbaicdgi"; + }; + propagatedBuildInputs = [ DevelSymdump ]; + meta = { + }; }; CanaryStability = buildPerlPackage { @@ -2700,19 +2700,19 @@ let }; CGICompile = buildPerlModule { - pname = "CGI-Compile"; - version = "0.25"; - src = fetchurl { - url = "mirror://cpan/authors/id/R/RK/RKITOVER/CGI-Compile-0.25.tar.gz"; - sha256 = "198f94r9xjxgn0hvwy5f93xfa8jlw7d9v3v8z7qbh7mxvzp78jzl"; - }; - propagatedBuildInputs = [ Filepushd SubName ]; - buildInputs = [ CGI CaptureTiny ModuleBuildTiny SubIdentify Switch TestNoWarnings TestRequires TryTiny ]; - meta = { - description = "Compile .cgi scripts to a code reference like ModPerl::Registry"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/miyagawa/CGI-Compile"; - }; + pname = "CGI-Compile"; + version = "0.25"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RK/RKITOVER/CGI-Compile-0.25.tar.gz"; + sha256 = "198f94r9xjxgn0hvwy5f93xfa8jlw7d9v3v8z7qbh7mxvzp78jzl"; + }; + propagatedBuildInputs = [ Filepushd SubName ]; + buildInputs = [ CGI CaptureTiny ModuleBuildTiny SubIdentify Switch TestNoWarnings TestRequires TryTiny ]; + meta = { + description = "Compile .cgi scripts to a code reference like ModPerl::Registry"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/CGI-Compile"; + }; }; CGICookieXS = buildPerlPackage { @@ -3252,17 +3252,17 @@ let }; ClassTiny = buildPerlPackage { - pname = "Class-Tiny"; - version = "1.008"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.008.tar.gz"; - sha256 = "05anh4hn8va46xwbdx7rqxnhb8i1lingb614lywzr89gj5iql1gf"; - }; - meta = { - description = "Minimalist class construction"; - license = with lib.licenses; [ asl20 ]; - homepage = "https://github.com/dagolden/Class-Tiny"; - }; + pname = "Class-Tiny"; + version = "1.008"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.008.tar.gz"; + sha256 = "05anh4hn8va46xwbdx7rqxnhb8i1lingb614lywzr89gj5iql1gf"; + }; + meta = { + description = "Minimalist class construction"; + license = with lib.licenses; [ asl20 ]; + homepage = "https://github.com/dagolden/Class-Tiny"; + }; }; ClassLoad = buildPerlPackage { @@ -3441,59 +3441,59 @@ let }; CloneChoose = buildPerlPackage { - pname = "Clone-Choose"; - version = "0.010"; - src = fetchurl { - url = "mirror://cpan/authors/id/H/HE/HERMES/Clone-Choose-0.010.tar.gz"; - sha256 = "0cin2bjn5z8xhm9v4j7pwlkx88jnvz8al0njdjwyvs6fb0glh8sn"; - }; - buildInputs = [ Clone ClonePP TestWithoutModule ]; - meta = { - description = "Choose appropriate clone utility"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Clone-Choose"; + version = "0.010"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HE/HERMES/Clone-Choose-0.010.tar.gz"; + sha256 = "0cin2bjn5z8xhm9v4j7pwlkx88jnvz8al0njdjwyvs6fb0glh8sn"; + }; + buildInputs = [ Clone ClonePP TestWithoutModule ]; + meta = { + description = "Choose appropriate clone utility"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; ClonePP = buildPerlPackage { - pname = "Clone-PP"; - version = "1.08"; - src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.08.tar.gz"; - sha256 = "0y7m25fksiavzg4xj4cm9zkz8rmnk4iqy7lm01m4nmyqlna3082p"; - }; - meta = { - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Clone-PP"; + version = "1.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.08.tar.gz"; + sha256 = "0y7m25fksiavzg4xj4cm9zkz8rmnk4iqy7lm01m4nmyqlna3082p"; + }; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; CodeTidyAll = buildPerlPackage { - pname = "Code-TidyAll"; - version = "0.78"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.78.tar.gz"; - sha256 = "1dmr6zkgcnc6cam204f00g5yly46cplbn9k45ginw02rv10vnpij"; - }; - propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; - buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; - meta = { - description = "Engine for tidyall, your all-in-one code tidier and validator"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - mainProgram = "tidyall"; - }; + pname = "Code-TidyAll"; + version = "0.78"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.78.tar.gz"; + sha256 = "1dmr6zkgcnc6cam204f00g5yly46cplbn9k45ginw02rv10vnpij"; + }; + propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; + buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; + meta = { + description = "Engine for tidyall, your all-in-one code tidier and validator"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "tidyall"; + }; }; CodeTidyAllPluginPerlAlignMooseAttributes = buildPerlPackage { - pname = "Code-TidyAll-Plugin-Perl-AlignMooseAttributes"; - version = "0.01"; - src = fetchurl { - url = "mirror://cpan/authors/id/J/JS/JSWARTZ/Code-TidyAll-Plugin-Perl-AlignMooseAttributes-0.01.tar.gz"; - sha256 = "1r8w5kfm17j1dyrrsjhwww423zzdzhx1i3d3brl32wzhasgf47cd"; - }; - propagatedBuildInputs = [ CodeTidyAll TextAligner ]; - meta = { - description = "TidyAll plugin to sort and align Moose-style attributes"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Code-TidyAll-Plugin-Perl-AlignMooseAttributes"; + version = "0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JS/JSWARTZ/Code-TidyAll-Plugin-Perl-AlignMooseAttributes-0.01.tar.gz"; + sha256 = "1r8w5kfm17j1dyrrsjhwww423zzdzhx1i3d3brl32wzhasgf47cd"; + }; + propagatedBuildInputs = [ CodeTidyAll TextAligner ]; + meta = { + description = "TidyAll plugin to sort and align Moose-style attributes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; ColorLibrary = buildPerlPackage { @@ -3554,7 +3554,7 @@ let }; }; - CompressLZF = buildPerlPackage rec { + CompressLZF = buildPerlPackage rec { pname = "Compress-LZF"; version = "3.8"; src = fetchurl { @@ -3725,19 +3725,19 @@ let }; ConfigIdentity = buildPerlPackage { - pname = "Config-Identity"; - version = "0.0019"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Config-Identity-0.0019.tar.gz"; - sha256 = "1a0jx12pxwpbnkww4xg4lav8j6ls89hrdimhj4a697k56zdhnli9"; - }; - propagatedBuildInputs = [ FileHomeDir IPCRun ]; - buildInputs = [ TestDeep ]; - meta = { - description = "Load (and optionally decrypt via GnuPG) user/pass identity information "; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/dagolden/Config-Identity"; - }; + pname = "Config-Identity"; + version = "0.0019"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Config-Identity-0.0019.tar.gz"; + sha256 = "1a0jx12pxwpbnkww4xg4lav8j6ls89hrdimhj4a697k56zdhnli9"; + }; + propagatedBuildInputs = [ FileHomeDir IPCRun ]; + buildInputs = [ TestDeep ]; + meta = { + description = "Load (and optionally decrypt via GnuPG) user/pass identity information "; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/dagolden/Config-Identity"; + }; }; ConfigIniFiles = buildPerlPackage { @@ -3901,18 +3901,18 @@ let }; ConstFast = buildPerlModule { - pname = "Const-Fast"; - version = "0.014"; - src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEONT/Const-Fast-0.014.tar.gz"; - sha256 = "1nwlldgrx86yn7y6a53cqgvzm2ircsvxg1addahlcy6510x9a1gq"; - }; - propagatedBuildInputs = [ SubExporterProgressive ]; - buildInputs = [ ModuleBuildTiny TestFatal ]; - meta = { - description = "Facility for creating read-only scalars, arrays, and hashes"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Const-Fast"; + version = "0.014"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEONT/Const-Fast-0.014.tar.gz"; + sha256 = "1nwlldgrx86yn7y6a53cqgvzm2ircsvxg1addahlcy6510x9a1gq"; + }; + propagatedBuildInputs = [ SubExporterProgressive ]; + buildInputs = [ ModuleBuildTiny TestFatal ]; + meta = { + description = "Facility for creating read-only scalars, arrays, and hashes"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; ConvertASCIIArmour = buildPerlPackage { @@ -4006,16 +4006,16 @@ let }; curry = buildPerlPackage { - pname = "curry"; - version = "1.001000"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTROUT/curry-1.001000.tar.gz"; - sha256 = "1m2n3w67cskh8ic6vf6ik0fmap9zma875kr5rhyznr1041wn064b"; - }; - meta = { - description = "Create automatic curried method call closures for any class or object"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "curry"; + version = "1.001000"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSTROUT/curry-1.001000.tar.gz"; + sha256 = "1m2n3w67cskh8ic6vf6ik0fmap9zma875kr5rhyznr1041wn064b"; + }; + meta = { + description = "Create automatic curried method call closures for any class or object"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; constant-defer = buildPerlPackage { @@ -4064,16 +4064,16 @@ let }; Coro = buildPerlPackage { - pname = "Coro"; - version = "6.57"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.57.tar.gz"; - sha256 = "1ihl2zaiafr2k5jzj46j44j8vxqs23fqcsahypmi23jl6f0f8a0r"; - }; - propagatedBuildInputs = [ AnyEvent Guard commonsense ]; - buildInputs = [ CanaryStability ]; - meta = { - }; + pname = "Coro"; + version = "6.57"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.57.tar.gz"; + sha256 = "1ihl2zaiafr2k5jzj46j44j8vxqs23fqcsahypmi23jl6f0f8a0r"; + }; + propagatedBuildInputs = [ AnyEvent Guard commonsense ]; + buildInputs = [ CanaryStability ]; + meta = { + }; }; CoroEV = buildPerlPackage rec { @@ -4094,19 +4094,19 @@ let }; Corona = buildPerlPackage { - pname = "Corona"; - version = "0.1004"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Corona-0.1004.tar.gz"; - sha256 = "0g5gpma3998rn61qfjv5csv2nrdi4sc84ipkb4k6synyhfgd3xgz"; - }; - propagatedBuildInputs = [ NetServerCoro Plack ]; - buildInputs = [ TestSharedFork TestTCP ]; - meta = { - description = "Coro based PSGI web server"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - mainProgram = "corona"; - }; + pname = "Corona"; + version = "0.1004"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Corona-0.1004.tar.gz"; + sha256 = "0g5gpma3998rn61qfjv5csv2nrdi4sc84ipkb4k6synyhfgd3xgz"; + }; + propagatedBuildInputs = [ NetServerCoro Plack ]; + buildInputs = [ TestSharedFork TestTCP ]; + meta = { + description = "Coro based PSGI web server"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "corona"; + }; }; CPAN = buildPerlPackage { @@ -4221,16 +4221,16 @@ let }; CPANDistnameInfo = buildPerlPackage { - pname = "CPAN-DistnameInfo"; - version = "0.12"; - src = fetchurl { - url = "mirror://cpan/authors/id/G/GB/GBARR/CPAN-DistnameInfo-0.12.tar.gz"; - sha256 = "0d94kx596w7k328cvq4y96z1gz12hdhn3z1mklkbrb7fyzlzn91g"; - }; - meta = { - description = "Extract distribution name and version from a distribution filename"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "CPAN-DistnameInfo"; + version = "0.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GB/GBARR/CPAN-DistnameInfo-0.12.tar.gz"; + sha256 = "0d94kx596w7k328cvq4y96z1gz12hdhn3z1mklkbrb7fyzlzn91g"; + }; + meta = { + description = "Extract distribution name and version from a distribution filename"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; CPANMetaCheck = buildPerlPackage { @@ -4795,17 +4795,17 @@ let }; CryptOpenSSLGuess = buildPerlPackage { - pname = "Crypt-OpenSSL-Guess"; - version = "0.11"; - src = fetchurl { - url = "mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.11.tar.gz"; - sha256 = "0rvi9l4ljcbhwwvspq019nfq2h2v746dk355h2nwnlmqikiihsxa"; - }; - meta = { - description = "Guess OpenSSL include path"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/akiym/Crypt-OpenSSL-Guess"; - }; + pname = "Crypt-OpenSSL-Guess"; + version = "0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.11.tar.gz"; + sha256 = "0rvi9l4ljcbhwwvspq019nfq2h2v746dk355h2nwnlmqikiihsxa"; + }; + meta = { + description = "Guess OpenSSL include path"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/akiym/Crypt-OpenSSL-Guess"; + }; }; CryptOpenSSLRandom = buildPerlPackage { @@ -6006,32 +6006,32 @@ let }; DevelCheckBin = buildPerlPackage { - pname = "Devel-CheckBin"; - version = "0.04"; - src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Devel-CheckBin-0.04.tar.gz"; - sha256 = "1r735yzgvsxkj4m6ks34xva5m21cfzp9qiis2d4ivv99kjskszqm"; - }; - meta = { - description = "check that a command is available"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/tokuhirom/Devel-CheckBin"; - }; + pname = "Devel-CheckBin"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Devel-CheckBin-0.04.tar.gz"; + sha256 = "1r735yzgvsxkj4m6ks34xva5m21cfzp9qiis2d4ivv99kjskszqm"; + }; + meta = { + description = "check that a command is available"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/tokuhirom/Devel-CheckBin"; + }; }; DevelCheckCompiler = buildPerlModule { - pname = "Devel-CheckCompiler"; - version = "0.07"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/SY/SYOHEX/Devel-CheckCompiler-0.07.tar.gz"; - sha256 = "1db973a4dbyknjxq608hywil5ai6vplnayshqxrd7m5qnjbpd2vn"; - }; - buildInputs = [ ModuleBuildTiny ]; - meta = { - description = "Check the compiler's availability"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/tokuhirom/Devel-CheckCompiler"; - }; + pname = "Devel-CheckCompiler"; + version = "0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SY/SYOHEX/Devel-CheckCompiler-0.07.tar.gz"; + sha256 = "1db973a4dbyknjxq608hywil5ai6vplnayshqxrd7m5qnjbpd2vn"; + }; + buildInputs = [ ModuleBuildTiny ]; + meta = { + description = "Check the compiler's availability"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/tokuhirom/Devel-CheckCompiler"; + }; }; DevelChecklib = buildPerlPackage { @@ -6725,16 +6725,16 @@ let }; DevelGlobalPhase = buildPerlPackage { - pname = "Devel-GlobalPhase"; - version = "0.003003"; - src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalPhase-0.003003.tar.gz"; - sha256 = "1x9jzy3l7gwikj57swzl94qsq03j9na9h1m69azzs7d7ghph58wd"; - }; - meta = { - description = "Detect perl's global phase on older perls."; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Devel-GlobalPhase"; + version = "0.003003"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalPhase-0.003003.tar.gz"; + sha256 = "1x9jzy3l7gwikj57swzl94qsq03j9na9h1m69azzs7d7ghph58wd"; + }; + meta = { + description = "Detect perl's global phase on older perls."; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; DevelHide = buildPerlPackage { @@ -6767,18 +6767,18 @@ let }; DevelOverloadInfo = buildPerlPackage { - pname = "Devel-OverloadInfo"; - version = "0.005"; - src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.005.tar.gz"; - sha256 = "1rx6g8pyhi7lx6z130b7vlf8syzrq92w9ky8mpw4d6bwlkzy5zcb"; - }; - propagatedBuildInputs = [ MROCompat PackageStash SubIdentify ]; - buildInputs = [ TestFatal ]; - meta = { - description = "introspect overloaded operators"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Devel-OverloadInfo"; + version = "0.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.005.tar.gz"; + sha256 = "1rx6g8pyhi7lx6z130b7vlf8syzrq92w9ky8mpw4d6bwlkzy5zcb"; + }; + propagatedBuildInputs = [ MROCompat PackageStash SubIdentify ]; + buildInputs = [ TestFatal ]; + meta = { + description = "introspect overloaded operators"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; DevelPartialDump = buildPerlPackage { @@ -7269,19 +7269,19 @@ let }; DistZillaPluginTestNoTabs = buildPerlModule { - pname = "Dist-Zilla-Plugin-Test-NoTabs"; - version = "0.15"; - src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-NoTabs-0.15.tar.gz"; - sha256 = "196hchmn8y591533v3p7kl75nlhpaygbfdiw2iqbnab9j510qq8v"; - }; - propagatedBuildInputs = [ DistZilla ]; - buildInputs = [ ModuleBuildTiny TestDeep TestNoTabs TestRequires ]; - meta = { - description = "Author tests that ensure hard tabs are not used"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-NoTabs"; - }; + pname = "Dist-Zilla-Plugin-Test-NoTabs"; + version = "0.15"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-NoTabs-0.15.tar.gz"; + sha256 = "196hchmn8y591533v3p7kl75nlhpaygbfdiw2iqbnab9j510qq8v"; + }; + propagatedBuildInputs = [ DistZilla ]; + buildInputs = [ ModuleBuildTiny TestDeep TestNoTabs TestRequires ]; + meta = { + description = "Author tests that ensure hard tabs are not used"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-NoTabs"; + }; }; DistZillaPluginTestPerlCritic = buildPerlModule { @@ -7306,7 +7306,7 @@ let url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.004.tar.gz"; sha256 = "325d236da0940388d2aa86ec5c1326516b4ad45adef8e7a4f83bb91d5ee15490"; }; -# buildInputs = [ TestPodLinkCheck ]; + # buildInputs = [ TestPodLinkCheck ]; propagatedBuildInputs = [ DistZilla ]; meta = { homepage = "https://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck"; @@ -7377,19 +7377,19 @@ let }; DistZillaRoleFileWatcher = buildPerlModule { - pname = "Dist-Zilla-Role-FileWatcher"; - version = "0.006"; - src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Role-FileWatcher-0.006.tar.gz"; - sha256 = "15jfpr257xxp27gz156npgpj7kh2dchzgfmvzivi5bvdb2wl8fpy"; - }; - propagatedBuildInputs = [ DistZilla SafeIsa ]; - buildInputs = [ ModuleBuildTiny TestDeep TestFatal ]; - meta = { - description = "Receive notification when something changes a file's contents"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/karenetheridge/Dist-Zilla-Role-FileWatcher"; - }; + pname = "Dist-Zilla-Role-FileWatcher"; + version = "0.006"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Role-FileWatcher-0.006.tar.gz"; + sha256 = "15jfpr257xxp27gz156npgpj7kh2dchzgfmvzivi5bvdb2wl8fpy"; + }; + propagatedBuildInputs = [ DistZilla SafeIsa ]; + buildInputs = [ ModuleBuildTiny TestDeep TestFatal ]; + meta = { + description = "Receive notification when something changes a file's contents"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/karenetheridge/Dist-Zilla-Role-FileWatcher"; + }; }; Dotenv = buildPerlPackage { @@ -7467,16 +7467,16 @@ let }; EmailAddressXS = buildPerlPackage { - pname = "Email-Address-XS"; - version = "1.04"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.04.tar.gz"; - sha256 = "0gjrrl81z3sfwavgx5kwjd87gj44mlnbbqsm3dgdv1xllw26spwr"; - }; - meta = { - description = "Parse and format RFC 2822 email addresses and groups"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Email-Address-XS"; + version = "1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.04.tar.gz"; + sha256 = "0gjrrl81z3sfwavgx5kwjd87gj44mlnbbqsm3dgdv1xllw26spwr"; + }; + meta = { + description = "Parse and format RFC 2822 email addresses and groups"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; EmailDateFormat = buildPerlPackage { @@ -7798,17 +7798,17 @@ let }; EncodeNewlines = buildPerlPackage { - pname = "Encode-Newlines"; - version = "0.05"; - src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Encode-Newlines-0.05.tar.gz"; - sha256 = "1gipd3wnma28w5gjbzycfkpi6chksy14lhxkp4hwizf8r351zcrl"; - }; - meta = { - description = "Normalize line ending sequences"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/neilb/Encode-Newlines"; - }; + pname = "Encode-Newlines"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEILB/Encode-Newlines-0.05.tar.gz"; + sha256 = "1gipd3wnma28w5gjbzycfkpi6chksy14lhxkp4hwizf8r351zcrl"; + }; + meta = { + description = "Normalize line ending sequences"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/neilb/Encode-Newlines"; + }; }; EncodePunycode = buildPerlPackage { @@ -8206,17 +8206,17 @@ let }; ExtUtilsMakeMakerCPANfile = buildPerlPackage { - pname = "ExtUtils-MakeMaker-CPANfile"; - version = "0.09"; - src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.09.tar.gz"; - sha256 = "0xg2z100vjhcndwaz9m3mmi90rb8h5pggpvlj1b0i8dhsh3pc1rc"; - }; - propagatedBuildInputs = [ ModuleCPANfile ]; - meta = { - description = "cpanfile support for EUMM"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "ExtUtils-MakeMaker-CPANfile"; + version = "0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.09.tar.gz"; + sha256 = "0xg2z100vjhcndwaz9m3mmi90rb8h5pggpvlj1b0i8dhsh3pc1rc"; + }; + propagatedBuildInputs = [ ModuleCPANfile ]; + meta = { + description = "cpanfile support for EUMM"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; ExtUtilsPkgConfig = buildPerlPackage { @@ -8319,17 +8319,17 @@ let }; FCGIClient = buildPerlModule { - pname = "FCGI-Client"; - version = "0.09"; - src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.09.tar.gz"; - sha256 = "1s11casbv0jmkcl5dk8i2vhfy1nc8rg43d3bg923zassrq4wndym"; - }; - propagatedBuildInputs = [ Moo TypeTiny ]; - meta = { - description = "client library for fastcgi protocol"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "FCGI-Client"; + version = "0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.09.tar.gz"; + sha256 = "1s11casbv0jmkcl5dk8i2vhfy1nc8rg43d3bg923zassrq4wndym"; + }; + propagatedBuildInputs = [ Moo TypeTiny ]; + meta = { + description = "client library for fastcgi protocol"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; buildInputs = [ ModuleBuildTiny ]; }; @@ -8480,18 +8480,18 @@ let }; FileCopyRecursiveReduced = buildPerlPackage { - pname = "File-Copy-Recursive-Reduced"; - version = "0.006"; - src = fetchurl { - url = "mirror://cpan/authors/id/J/JK/JKEENAN/File-Copy-Recursive-Reduced-0.006.tar.gz"; - sha256 = "0b3yf33bahaf4ipfqipn8y5z4296k3vgzzsqbhh5ahwzls9zj676"; - }; - buildInputs = [ CaptureTiny PathTiny ]; - meta = { - description = "Recursive copying of files and directories within Perl 5 toolchain"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "http://thenceforward.net/perl/modules/File-Copy-Recursive-Reduced/"; - }; + pname = "File-Copy-Recursive-Reduced"; + version = "0.006"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JK/JKEENAN/File-Copy-Recursive-Reduced-0.006.tar.gz"; + sha256 = "0b3yf33bahaf4ipfqipn8y5z4296k3vgzzsqbhh5ahwzls9zj676"; + }; + buildInputs = [ CaptureTiny PathTiny ]; + meta = { + description = "Recursive copying of files and directories within Perl 5 toolchain"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "http://thenceforward.net/perl/modules/File-Copy-Recursive-Reduced/"; + }; }; FileCountLines = buildPerlPackage { @@ -9086,16 +9086,16 @@ let }; FileZglob = buildPerlPackage { - pname = "File-Zglob"; - version = "0.11"; - src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/File-Zglob-0.11.tar.gz"; - sha256 = "16v61rn0yimpv5kp6b20z2f1c93n5kpsyjvr0gq4w2dc43gfvc8w"; - }; - meta = { - description = "Extended globs."; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "File-Zglob"; + version = "0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/File-Zglob-0.11.tar.gz"; + sha256 = "16v61rn0yimpv5kp6b20z2f1c93n5kpsyjvr0gq4w2dc43gfvc8w"; + }; + meta = { + description = "Extended globs."; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; Filter = buildPerlPackage { @@ -10299,18 +10299,18 @@ let }; HTMLFormFuMultiForm = buildPerlPackage { - pname = "HTML-FormFu-MultiForm"; - version = "1.03"; - src = fetchurl { - url = "mirror://cpan/authors/id/N/NI/NIGELM/HTML-FormFu-MultiForm-1.03.tar.gz"; - sha256 = "17qm94hwhn6jyhd2am4gqxq7yrlhv3jv0ayx17df95mqdgbhrw1n"; - }; - propagatedBuildInputs = [ CryptCBC CryptDES HTMLFormFu ]; - meta = { - description = "Handle multi-page/stage forms with FormFu"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/FormFu/HTML-FormFu-MultiForm"; - }; + pname = "HTML-FormFu-MultiForm"; + version = "1.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NI/NIGELM/HTML-FormFu-MultiForm-1.03.tar.gz"; + sha256 = "17qm94hwhn6jyhd2am4gqxq7yrlhv3jv0ayx17df95mqdgbhrw1n"; + }; + propagatedBuildInputs = [ CryptCBC CryptDES HTMLFormFu ]; + meta = { + description = "Handle multi-page/stage forms with FormFu"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/FormFu/HTML-FormFu-MultiForm"; + }; }; HTMLFormHandler = buildPerlPackage { @@ -10687,19 +10687,19 @@ let }; HTTPEntityParser = buildPerlModule { - pname = "HTTP-Entity-Parser"; - version = "0.25"; - src = fetchurl { - url = "mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.25.tar.gz"; - sha256 = "0fpchgj6jgxmjkmljjnrpmyj9anz85rjvs2fq3c7rld3rgcd131s"; - }; - propagatedBuildInputs = [ HTTPMultiPartParser HashMultiValue JSONMaybeXS StreamBuffered WWWFormUrlEncoded ]; - buildInputs = [ HTTPMessage ModuleBuildTiny ]; - meta = { - description = "PSGI compliant HTTP Entity Parser"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/kazeburo/HTTP-Entity-Parser"; - }; + pname = "HTTP-Entity-Parser"; + version = "0.25"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.25.tar.gz"; + sha256 = "0fpchgj6jgxmjkmljjnrpmyj9anz85rjvs2fq3c7rld3rgcd131s"; + }; + propagatedBuildInputs = [ HTTPMultiPartParser HashMultiValue JSONMaybeXS StreamBuffered WWWFormUrlEncoded ]; + buildInputs = [ HTTPMessage ModuleBuildTiny ]; + meta = { + description = "PSGI compliant HTTP Entity Parser"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/kazeburo/HTTP-Entity-Parser"; + }; }; HTTPDAV = buildPerlPackage { @@ -10787,17 +10787,17 @@ let }; HTTPMultiPartParser = buildPerlPackage { - pname = "HTTP-MultiPartParser"; - version = "0.02"; - src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHANSEN/HTTP-MultiPartParser-0.02.tar.gz"; - sha256 = "04hbs0b1lzv2c8dqfcc9qjm5akh25fn40903is36zlalkwaxmpay"; - }; - buildInputs = [ TestDeep ]; - meta = { - description = "HTTP MultiPart Parser"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "HTTP-MultiPartParser"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHANSEN/HTTP-MultiPartParser-0.02.tar.gz"; + sha256 = "04hbs0b1lzv2c8dqfcc9qjm5akh25fn40903is36zlalkwaxmpay"; + }; + buildInputs = [ TestDeep ]; + meta = { + description = "HTTP MultiPart Parser"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; HTTPNegotiate = buildPerlPackage { @@ -10905,18 +10905,18 @@ let }; HTTPServerSimplePSGI = buildPerlPackage { - pname = "HTTP-Server-Simple-PSGI"; - version = "0.16"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Server-Simple-PSGI-0.16.tar.gz"; - sha256 = "1fhx2glycd66m4l4m1gja81ixq8nh4r5g9wjhhkrffq4af2cnz2z"; - }; - propagatedBuildInputs = [ HTTPServerSimple ]; - meta = { - description = "PSGI handler for HTTP::Server::Simple"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/miyagawa/HTTP-Server-Simple-PSGI"; - }; + pname = "HTTP-Server-Simple-PSGI"; + version = "0.16"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Server-Simple-PSGI-0.16.tar.gz"; + sha256 = "1fhx2glycd66m4l4m1gja81ixq8nh4r5g9wjhhkrffq4af2cnz2z"; + }; + propagatedBuildInputs = [ HTTPServerSimple ]; + meta = { + description = "PSGI handler for HTTP::Server::Simple"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/HTTP-Server-Simple-PSGI"; + }; }; HTTPTinyCache = buildPerlPackage { @@ -11278,15 +11278,15 @@ let }; IOHandleUtil = buildPerlModule { - pname = "IO-Handle-Util"; - version = "0.02"; - src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/IO-Handle-Util-0.02.tar.gz"; - sha256 = "1vncvsx53iiw1yy3drlk44hzx2pk5cial0h74djf9i6s2flndfcd"; - }; - propagatedBuildInputs = [ IOString SubExporter asa ]; - meta = { - }; + pname = "IO-Handle-Util"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/IO-Handle-Util-0.02.tar.gz"; + sha256 = "1vncvsx53iiw1yy3drlk44hzx2pk5cial0h74djf9i6s2flndfcd"; + }; + propagatedBuildInputs = [ IOString SubExporter asa ]; + meta = { + }; buildInputs = [ ModuleBuildTiny TestSimple13 ]; }; @@ -11761,17 +11761,17 @@ let }; JavaScriptValueEscape = buildPerlModule { - pname = "JavaScript-Value-Escape"; - version = "0.07"; - src = fetchurl { - url = "mirror://cpan/authors/id/K/KA/KAZEBURO/JavaScript-Value-Escape-0.07.tar.gz"; - sha256 = "1p5365lvnax8kbcfrj169lx05af3i3qi5wg5x9mizqgd10vxmjws"; - }; - meta = { - description = "Avoid XSS with JavaScript value interpolation"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/kazeburo/JavaScript-Value-Escape"; - }; + pname = "JavaScript-Value-Escape"; + version = "0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/JavaScript-Value-Escape-0.07.tar.gz"; + sha256 = "1p5365lvnax8kbcfrj169lx05af3i3qi5wg5x9mizqgd10vxmjws"; + }; + meta = { + description = "Avoid XSS with JavaScript value interpolation"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/kazeburo/JavaScript-Value-Escape"; + }; }; JSON = buildPerlPackage { @@ -11892,7 +11892,7 @@ let }; }; - JSONWebToken = buildPerlModule { + JSONWebToken = buildPerlModule { pname = "JSON-WebToken"; version = "0.10"; src = fetchurl { @@ -12112,17 +12112,17 @@ let }; librelative = buildPerlPackage { - pname = "lib-relative"; - version = "1.000"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/lib-relative-1.000.tar.gz"; - sha256 = "1mvcdl87d3kyrdx4y6x79k3n5qdd1x5m1hp8lwjxvgfqbw0cgq6z"; - }; - meta = { - description = "Add paths relative to the current file to @INC"; - license = with lib.licenses; [ artistic2 ]; - homepage = "https://github.com/Grinnz/lib-relative"; - }; + pname = "lib-relative"; + version = "1.000"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DB/DBOOK/lib-relative-1.000.tar.gz"; + sha256 = "1mvcdl87d3kyrdx4y6x79k3n5qdd1x5m1hp8lwjxvgfqbw0cgq6z"; + }; + meta = { + description = "Add paths relative to the current file to @INC"; + license = with lib.licenses; [ artistic2 ]; + homepage = "https://github.com/Grinnz/lib-relative"; + }; }; libxml_perl = buildPerlPackage { @@ -12235,17 +12235,17 @@ let }; LinguaPTStemmer = buildPerlPackage { - pname = "Lingua-PT-Stemmer"; - version = "0.02"; - src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Lingua-PT-Stemmer-0.02.tar.gz"; - sha256 = "17c48sfbgwd2ivlgf59sr6jdhwa3aim8750f8pyzz7xpi8gz0var"; - }; - meta = { - description = "Portuguese language stemming"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/neilb/Lingua-PT-Stemmer"; - }; + pname = "Lingua-PT-Stemmer"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEILB/Lingua-PT-Stemmer-0.02.tar.gz"; + sha256 = "17c48sfbgwd2ivlgf59sr6jdhwa3aim8750f8pyzz7xpi8gz0var"; + }; + meta = { + description = "Portuguese language stemming"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/neilb/Lingua-PT-Stemmer"; + }; }; LinguaStem = buildPerlModule { @@ -12260,50 +12260,50 @@ let }; LinguaStemFr = buildPerlPackage { - pname = "Lingua-Stem-Fr"; - version = "0.02"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/SD/SDP/Lingua-Stem-Fr-0.02.tar.gz"; - sha256 = "0vyrspwzaqjxm5mqshf4wvwa3938mkajd1918d9ii2l9m2rn8kwx"; - }; - meta = { - }; + pname = "Lingua-Stem-Fr"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SD/SDP/Lingua-Stem-Fr-0.02.tar.gz"; + sha256 = "0vyrspwzaqjxm5mqshf4wvwa3938mkajd1918d9ii2l9m2rn8kwx"; + }; + meta = { + }; }; LinguaStemIt = buildPerlPackage { - pname = "Lingua-Stem-It"; - version = "0.02"; - src = fetchurl { - url = "mirror://cpan/authors/id/A/AC/ACALPINI/Lingua-Stem-It-0.02.tar.gz"; - sha256 = "1207r183s5hlh4mfwa6p46vzm0dhvrs2dnss5s41a0gyfkxp7riq"; - }; - meta = { - }; + pname = "Lingua-Stem-It"; + version = "0.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AC/ACALPINI/Lingua-Stem-It-0.02.tar.gz"; + sha256 = "1207r183s5hlh4mfwa6p46vzm0dhvrs2dnss5s41a0gyfkxp7riq"; + }; + meta = { + }; }; LinguaStemRu = buildPerlPackage { - pname = "Lingua-Stem-Ru"; - version = "0.04"; - src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Lingua-Stem-Ru-0.04.tar.gz"; - sha256 = "0a2jmdz7jn32qj5hyiw5kbv8fvlpmws8i00a6xcbkzb48yvwww0j"; - }; - meta = { - description = "Porter's stemming algorithm for Russian (KOI8-R only)"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/neilb/Lingua-Stem-Ru"; - }; + pname = "Lingua-Stem-Ru"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEILB/Lingua-Stem-Ru-0.04.tar.gz"; + sha256 = "0a2jmdz7jn32qj5hyiw5kbv8fvlpmws8i00a6xcbkzb48yvwww0j"; + }; + meta = { + description = "Porter's stemming algorithm for Russian (KOI8-R only)"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/neilb/Lingua-Stem-Ru"; + }; }; LinguaStemSnowballDa = buildPerlPackage { - pname = "Lingua-Stem-Snowball-Da"; - version = "1.01"; - src = fetchurl { - url = "mirror://cpan/authors/id/C/CI/CINE/Lingua-Stem-Snowball-Da-1.01.tar.gz"; - sha256 = "0mm0m7glm1s6i9f6a78jslw6wh573208arxhq93yriqmw17bwf9f"; - }; - meta = { - }; + pname = "Lingua-Stem-Snowball-Da"; + version = "1.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CI/CINE/Lingua-Stem-Snowball-Da-1.01.tar.gz"; + sha256 = "0mm0m7glm1s6i9f6a78jslw6wh573208arxhq93yriqmw17bwf9f"; + }; + meta = { + }; }; LinguaTranslit = buildPerlPackage { @@ -12486,19 +12486,19 @@ let }; ListMoreUtilsXS = buildPerlPackage { - pname = "List-MoreUtils-XS"; - version = "0.430"; - src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.430.tar.gz"; - sha256 = "0hmjkhmk1qlzbg8skq7g1zral07k1x0fk4w2fpcfr7hpgkaldkp8"; - }; - preConfigure = '' - export LD=$CC - ''; - meta = { - description = "Provide the stuff missing in List::Util in XS"; - license = with lib.licenses; [ asl20 ]; - }; + pname = "List-MoreUtils-XS"; + version = "0.430"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.430.tar.gz"; + sha256 = "0hmjkhmk1qlzbg8skq7g1zral07k1x0fk4w2fpcfr7hpgkaldkp8"; + }; + preConfigure = '' + export LD=$CC + ''; + meta = { + description = "Provide the stuff missing in List::Util in XS"; + license = with lib.licenses; [ asl20 ]; + }; }; ListSomeUtils = buildPerlPackage { @@ -12566,18 +12566,18 @@ let }; LocaleMOFile = buildPerlPackage { - pname = "Locale-MO-File"; - version = "0.09"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-MO-File-0.09.tar.gz"; - sha256 = "0gsaaqimsh5bdhns2v67j1nvb178hx2536lxmr971cwxy31ns0wp"; - }; - propagatedBuildInputs = [ ConstFast MooXStrictConstructor MooXTypesMooseLike ParamsValidate namespaceautoclean ]; - buildInputs = [ TestDifferences TestException TestHexDifferences TestNoWarnings ]; - meta = { - description = "Locale::MO::File - Write or read gettext MO files."; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Locale-MO-File"; + version = "0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-MO-File-0.09.tar.gz"; + sha256 = "0gsaaqimsh5bdhns2v67j1nvb178hx2536lxmr971cwxy31ns0wp"; + }; + propagatedBuildInputs = [ ConstFast MooXStrictConstructor MooXTypesMooseLike ParamsValidate namespaceautoclean ]; + buildInputs = [ TestDifferences TestException TestHexDifferences TestNoWarnings ]; + meta = { + description = "Locale::MO::File - Write or read gettext MO files."; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; LocaleMaketextFuzzy = buildPerlPackage { @@ -12634,78 +12634,78 @@ let }; LocaleTextDomainOO = buildPerlPackage { - pname = "Locale-TextDomain-OO"; - version = "1.036"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-1.036.tar.gz"; - sha256 = "0f0fajq4k1sgyywsb7qypsf6xa1sxjx4agm8l8z2284nm3hq65xm"; - }; - propagatedBuildInputs = [ ClassLoad Clone JSON LocaleMOFile LocalePO LocaleTextDomainOOUtil LocaleUtilsPlaceholderBabelFish LocaleUtilsPlaceholderMaketext LocaleUtilsPlaceholderNamed MooXSingleton PathTiny TieSub ]; - buildInputs = [ TestDifferences TestException TestNoWarnings ]; - meta = { - description = "Locale::TextDomain::OO - Perl OO Interface to Uniforum Message Translation"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Locale-TextDomain-OO"; + version = "1.036"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-1.036.tar.gz"; + sha256 = "0f0fajq4k1sgyywsb7qypsf6xa1sxjx4agm8l8z2284nm3hq65xm"; + }; + propagatedBuildInputs = [ ClassLoad Clone JSON LocaleMOFile LocalePO LocaleTextDomainOOUtil LocaleUtilsPlaceholderBabelFish LocaleUtilsPlaceholderMaketext LocaleUtilsPlaceholderNamed MooXSingleton PathTiny TieSub ]; + buildInputs = [ TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Locale::TextDomain::OO - Perl OO Interface to Uniforum Message Translation"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; LocaleTextDomainOOUtil = buildPerlPackage { - pname = "Locale-TextDomain-OO-Util"; - version = "4.002"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-Util-4.002.tar.gz"; - sha256 = "1826pl11vr9p7zv7vqs7kcd8y5218086l90dw8lw0xzdcmzs0prw"; - }; - propagatedBuildInputs = [ namespaceautoclean ]; - buildInputs = [ TestDifferences TestException TestNoWarnings ]; - meta = { - description = "Locale::TextDomain::OO::Util - Lexicon utils"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Locale-TextDomain-OO-Util"; + version = "4.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-Util-4.002.tar.gz"; + sha256 = "1826pl11vr9p7zv7vqs7kcd8y5218086l90dw8lw0xzdcmzs0prw"; + }; + propagatedBuildInputs = [ namespaceautoclean ]; + buildInputs = [ TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Locale::TextDomain::OO::Util - Lexicon utils"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; LocaleUtilsPlaceholderBabelFish = buildPerlPackage { - pname = "Locale-Utils-PlaceholderBabelFish"; - version = "0.006"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderBabelFish-0.006.tar.gz"; - sha256 = "1k54njj8xz19c8bjb0iln1mnfq55j3pvbff7samyrab3k59h071f"; - }; - propagatedBuildInputs = [ HTMLParser MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; - buildInputs = [ TestDifferences TestException TestNoWarnings ]; - meta = { - description = "Locale::Utils::PlaceholderBabelFish - Utils to expand BabelFish palaceholders"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Locale-Utils-PlaceholderBabelFish"; + version = "0.006"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderBabelFish-0.006.tar.gz"; + sha256 = "1k54njj8xz19c8bjb0iln1mnfq55j3pvbff7samyrab3k59h071f"; + }; + propagatedBuildInputs = [ HTMLParser MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; + buildInputs = [ TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Locale::Utils::PlaceholderBabelFish - Utils to expand BabelFish palaceholders"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; LocaleUtilsPlaceholderMaketext = buildPerlPackage { - pname = "Locale-Utils-PlaceholderMaketext"; - version = "1.005"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderMaketext-1.005.tar.gz"; - sha256 = "1srlbp8sfnzhndgh9s4d8bglpzw0vb8gnab9r8r8sggkv15n0a2h"; - }; - propagatedBuildInputs = [ MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; - buildInputs = [ TestDifferences TestException TestNoWarnings ]; - meta = { - description = "Locale::Utils::PlaceholderMaketext - Utils to expand maketext placeholders"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Locale-Utils-PlaceholderMaketext"; + version = "1.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderMaketext-1.005.tar.gz"; + sha256 = "1srlbp8sfnzhndgh9s4d8bglpzw0vb8gnab9r8r8sggkv15n0a2h"; + }; + propagatedBuildInputs = [ MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; + buildInputs = [ TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Locale::Utils::PlaceholderMaketext - Utils to expand maketext placeholders"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; LocaleUtilsPlaceholderNamed = buildPerlPackage { - pname = "Locale-Utils-PlaceholderNamed"; - version = "1.004"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderNamed-1.004.tar.gz"; - sha256 = "1gd68lm5w5c6ndcilx91rn84zviqyrk3fx92jjx5khxm76i8xmvg"; - }; - propagatedBuildInputs = [ MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; - buildInputs = [ TestDifferences TestException TestNoWarnings ]; - meta = { - description = "Locale::Utils::PlaceholderNamed - Utils to expand named placeholders"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Locale-Utils-PlaceholderNamed"; + version = "1.004"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderNamed-1.004.tar.gz"; + sha256 = "1gd68lm5w5c6ndcilx91rn84zviqyrk3fx92jjx5khxm76i8xmvg"; + }; + propagatedBuildInputs = [ MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; + buildInputs = [ TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Locale::Utils::PlaceholderNamed - Utils to expand named placeholders"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; locallib = buildPerlPackage { @@ -12866,17 +12866,17 @@ let }; LogMessageSimple = buildPerlPackage { - pname = "Log-Message-Simple"; - version = "0.10"; - src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-Simple-0.10.tar.gz"; - sha256 = "15nxi935nfrf8dkdrgvcrf2qlai4pbz03yj8sja0n9mcq2jd24ma"; - }; - propagatedBuildInputs = [ LogMessage ]; - meta = { - description = "Simplified interface to Log::Message"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Log-Message-Simple"; + version = "0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-Simple-0.10.tar.gz"; + sha256 = "15nxi935nfrf8dkdrgvcrf2qlai4pbz03yj8sja0n9mcq2jd24ma"; + }; + propagatedBuildInputs = [ LogMessage ]; + meta = { + description = "Simplified interface to Log::Message"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; LogTrace = buildPerlPackage { @@ -12889,17 +12889,17 @@ let }; MCE = buildPerlPackage { - pname = "MCE"; - version = "1.874"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.874.tar.gz"; - sha256 = "1l6khsmwzfr88xb81kdvmdskxgz3pm4yz2ybxkbml4bmhh0y62fq"; - }; - meta = { - description = "Many-Core Engine for Perl providing parallel processing capabilities"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/marioroy/mce-perl"; - }; + pname = "MCE"; + version = "1.874"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.874.tar.gz"; + sha256 = "1l6khsmwzfr88xb81kdvmdskxgz3pm4yz2ybxkbml4bmhh0y62fq"; + }; + meta = { + description = "Many-Core Engine for Perl providing parallel processing capabilities"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/marioroy/mce-perl"; + }; }; LogLog4perl = buildPerlPackage { @@ -13076,17 +13076,17 @@ let }; LWPProtocolhttp10 = buildPerlPackage { - pname = "LWP-Protocol-http10"; - version = "6.03"; - src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-http10-6.03.tar.gz"; - sha256 = "1lxq40qfwfai9ryhzhsdnycc4189c8kfl43rf7qq34fmz48skzzk"; - }; - propagatedBuildInputs = [ LWP ]; - meta = { - description = "Legacy HTTP/1.0 support for LWP"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "LWP-Protocol-http10"; + version = "6.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-http10-6.03.tar.gz"; + sha256 = "1lxq40qfwfai9ryhzhsdnycc4189c8kfl43rf7qq34fmz48skzzk"; + }; + propagatedBuildInputs = [ LWP ]; + meta = { + description = "Legacy HTTP/1.0 support for LWP"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; LWPUserAgentCached = buildPerlPackage { @@ -13231,17 +13231,17 @@ let }; MailMessage = buildPerlPackage { - pname = "Mail-Message"; - version = "3.010"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.010.tar.gz"; - sha256 = "04wblxrkcjwn7hw6vkvf307lbpc9blj1glqmm59q3642wcd4nhaq"; - }; - propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; - meta = { - description = "Processing MIME messages"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Mail-Message"; + version = "3.010"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.010.tar.gz"; + sha256 = "04wblxrkcjwn7hw6vkvf307lbpc9blj1glqmm59q3642wcd4nhaq"; + }; + propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; + meta = { + description = "Processing MIME messages"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; MailDKIM = buildPerlPackage { @@ -13361,17 +13361,17 @@ let }; MailTransport = buildPerlPackage { - pname = "Mail-Transport"; - version = "3.005"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.005.tar.gz"; - sha256 = "18wna71iyrgn63l7samacvnx2a5ydpcffkg313c8a4jwf0zvkp6h"; - }; - propagatedBuildInputs = [ MailMessage ]; - meta = { - description = "Email message exchange"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Mail-Transport"; + version = "3.005"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.005.tar.gz"; + sha256 = "18wna71iyrgn63l7samacvnx2a5ydpcffkg313c8a4jwf0zvkp6h"; + }; + propagatedBuildInputs = [ MailMessage ]; + meta = { + description = "Email message exchange"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; MathBase85 = buildPerlPackage { @@ -13463,16 +13463,16 @@ let }; MathBigIntLite = buildPerlPackage { - pname = "Math-BigInt-Lite"; - version = "0.19"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.19.tar.gz"; - sha256 = "06hm4vgihxr7m4jrq558phnnxy4am6ifba447j0h4p6jym5h7xih"; - }; - propagatedBuildInputs = [ MathBigInt ]; - meta = { - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Math-BigInt-Lite"; + version = "0.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.19.tar.gz"; + sha256 = "06hm4vgihxr7m4jrq558phnnxy4am6ifba447j0h4p6jym5h7xih"; + }; + propagatedBuildInputs = [ MathBigInt ]; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; MathClipper = buildPerlModule { @@ -13810,17 +13810,17 @@ let }; MemoizeExpireLRU = buildPerlPackage { - pname = "Memoize-ExpireLRU"; - version = "0.56"; - src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Memoize-ExpireLRU-0.56.tar.gz"; - sha256 = "1xnp3jqabl4il5kfadlqimbxhzsbm7gpwrgw0m5s5fdsrc0n70zf"; - }; - meta = { - description = "Expiry plug-in for Memoize that adds LRU cache expiration"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/neilb/Memoize-ExpireLRU"; - }; + pname = "Memoize-ExpireLRU"; + version = "0.56"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEILB/Memoize-ExpireLRU-0.56.tar.gz"; + sha256 = "1xnp3jqabl4il5kfadlqimbxhzsbm7gpwrgw0m5s5fdsrc0n70zf"; + }; + meta = { + description = "Expiry plug-in for Memoize that adds LRU cache expiration"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/neilb/Memoize-ExpireLRU"; + }; }; Menlo = buildPerlPackage { @@ -13878,7 +13878,7 @@ let # Most tests are online, so we only include offline tests postPatch = '' substituteInPlace Makefile.PL \ - --replace '"t/*.t t/api/*.t"' \ + --replace '"t/*.t t/api/*.t"' \ '"t/00-report-prereqs.t t/api/_get.t t/api/_get_or_search.t t/api/_search.t t/entity.t t/request.t t/resultset.t"' ''; @@ -14127,31 +14127,31 @@ let MNI-Perllib = callPackage ../development/perl-modules/MNI {}; Mo = buildPerlPackage { - pname = "Mo"; - version = "0.40"; - src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/Mo-0.40.tar.gz"; - sha256 = "1fff81awg9agfawf3wxx0gpf6vgav8w920rmxsbjg30z75943lli"; - }; - meta = { - description = "Micro Objects. Mo is less."; - homepage = "https://github.com/ingydotnet/mo-pm"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - mainProgram = "mo-inline"; - }; + pname = "Mo"; + version = "0.40"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TI/TINITA/Mo-0.40.tar.gz"; + sha256 = "1fff81awg9agfawf3wxx0gpf6vgav8w920rmxsbjg30z75943lli"; + }; + meta = { + description = "Micro Objects. Mo is less."; + homepage = "https://github.com/ingydotnet/mo-pm"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "mo-inline"; + }; }; MockConfig = buildPerlPackage { - pname = "Mock-Config"; - version = "0.03"; - src = fetchurl { - url = "mirror://cpan/authors/id/R/RU/RURBAN/Mock-Config-0.03.tar.gz"; - sha256 = "06q0xkg5cwdwafzmb9rkaa305ddv7vli9gpm6n9jnkyaaxbk9f55"; - }; - meta = { - description = "temporarily set Config or XSConfig values"; - license = with lib.licenses; [ artistic1 gpl1Plus artistic2 ]; - }; + pname = "Mock-Config"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RU/RURBAN/Mock-Config-0.03.tar.gz"; + sha256 = "06q0xkg5cwdwafzmb9rkaa305ddv7vli9gpm6n9jnkyaaxbk9f55"; + }; + meta = { + description = "temporarily set Config or XSConfig values"; + license = with lib.licenses; [ artistic1 gpl1Plus artistic2 ]; + }; }; ModernPerl = buildPerlPackage { @@ -14318,49 +14318,49 @@ let }; ModuleCPANTSAnalyse = buildPerlPackage { - pname = "Module-CPANTS-Analyse"; - version = "1.01"; - src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.01.tar.gz"; - sha256 = "0jf83v9ylw7s9i2zv0l1v11gafp3k4389asc52r6s6q5s2j0p6dx"; - }; - propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff DataBinary FileFindObject PerlPrereqScannerNotQuiteLite SoftwareLicense ]; - buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings ]; - meta = { - description = "Generate Kwalitee ratings for a distribution"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://cpants.cpanauthors.org"; - }; + pname = "Module-CPANTS-Analyse"; + version = "1.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.01.tar.gz"; + sha256 = "0jf83v9ylw7s9i2zv0l1v11gafp3k4389asc52r6s6q5s2j0p6dx"; + }; + propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff DataBinary FileFindObject PerlPrereqScannerNotQuiteLite SoftwareLicense ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings ]; + meta = { + description = "Generate Kwalitee ratings for a distribution"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://cpants.cpanauthors.org"; + }; }; ModuleCPANfile = buildPerlPackage { - pname = "Module-CPANfile"; - version = "1.1004"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Module-CPANfile-1.1004.tar.gz"; - sha256 = "08a9a5mybf0llwlfvk7n0q7az6lrrzgzwc3432mcwbb4k8pbxvw8"; - }; - meta = { - description = "Parse cpanfile"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/miyagawa/cpanfile"; - }; + pname = "Module-CPANfile"; + version = "1.1004"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Module-CPANfile-1.1004.tar.gz"; + sha256 = "08a9a5mybf0llwlfvk7n0q7az6lrrzgzwc3432mcwbb4k8pbxvw8"; + }; + meta = { + description = "Parse cpanfile"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/cpanfile"; + }; buildInputs = [ Filepushd ]; }; ModuleExtractUse = buildPerlModule { - pname = "Module-ExtractUse"; - version = "0.343"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOMM/Module-ExtractUse-0.343.tar.gz"; - sha256 = "00hcggwnqk953s4zbvkcabd5mfidg60hawlqsw6146in91dlclj8"; - }; - propagatedBuildInputs = [ ParseRecDescent PodStrip ]; - buildInputs = [ TestDeep TestNoWarnings ]; - meta = { - description = "Find out what modules are used"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Module-ExtractUse"; + version = "0.343"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DO/DOMM/Module-ExtractUse-0.343.tar.gz"; + sha256 = "00hcggwnqk953s4zbvkcabd5mfidg60hawlqsw6146in91dlclj8"; + }; + propagatedBuildInputs = [ ParseRecDescent PodStrip ]; + buildInputs = [ TestDeep TestNoWarnings ]; + meta = { + description = "Find out what modules are used"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; ModuleFind = buildPerlPackage { @@ -15119,77 +15119,77 @@ let }; MooXLocalePassthrough = buildPerlPackage { - pname = "MooX-Locale-Passthrough"; - version = "0.001"; - src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-Passthrough-0.001.tar.gz"; - sha256 = "04h5xhqdvydd4xk9ckb6a79chn0ygf915ix55vg1snmba9z841bs"; - }; - propagatedBuildInputs = [ Moo ]; - meta = { - description = "provide API used in translator modules without translating"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "MooX-Locale-Passthrough"; + version = "0.001"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-Passthrough-0.001.tar.gz"; + sha256 = "04h5xhqdvydd4xk9ckb6a79chn0ygf915ix55vg1snmba9z841bs"; + }; + propagatedBuildInputs = [ Moo ]; + meta = { + description = "provide API used in translator modules without translating"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; MooXLocaleTextDomainOO = buildPerlPackage { - pname = "MooX-Locale-TextDomain-OO"; - version = "0.001"; - src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-TextDomain-OO-0.001.tar.gz"; - sha256 = "0g8pwj45ccqrzvs9cqyhw29nm68vai1vj46ad39rajnqzp7m53jv"; - }; - propagatedBuildInputs = [ LocaleTextDomainOO MooXLocalePassthrough ]; - meta = { - description = "provide API used in translator modules without translating"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "MooX-Locale-TextDomain-OO"; + version = "0.001"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-TextDomain-OO-0.001.tar.gz"; + sha256 = "0g8pwj45ccqrzvs9cqyhw29nm68vai1vj46ad39rajnqzp7m53jv"; + }; + propagatedBuildInputs = [ LocaleTextDomainOO MooXLocalePassthrough ]; + meta = { + description = "provide API used in translator modules without translating"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; MooXOptions = buildPerlPackage { - pname = "MooX-Options"; - version = "4.103"; - src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Options-4.103.tar.gz"; - sha256 = "0v9j0wxx4f6z6lrmdqf2k084b2c2f2jbvh86pwib0vgjz1sdbyad"; - }; - propagatedBuildInputs = [ GetoptLongDescriptive MROCompat MooXLocalePassthrough PathClass UnicodeLineBreak strictures ]; - buildInputs = [ Mo MooXCmd MooXLocaleTextDomainOO Moose TestTrap ]; - preCheck = "rm t/16-namespace_clean.t"; # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=942275 - meta = { - description = "Explicit Options eXtension for Object Class"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "MooX-Options"; + version = "4.103"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Options-4.103.tar.gz"; + sha256 = "0v9j0wxx4f6z6lrmdqf2k084b2c2f2jbvh86pwib0vgjz1sdbyad"; + }; + propagatedBuildInputs = [ GetoptLongDescriptive MROCompat MooXLocalePassthrough PathClass UnicodeLineBreak strictures ]; + buildInputs = [ Mo MooXCmd MooXLocaleTextDomainOO Moose TestTrap ]; + preCheck = "rm t/16-namespace_clean.t"; # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=942275 + meta = { + description = "Explicit Options eXtension for Object Class"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; MooXSingleton = buildPerlModule { - pname = "MooX-Singleton"; - version = "1.20"; - src = fetchurl { - url = "mirror://cpan/authors/id/A/AJ/AJGB/MooX-Singleton-1.20.tar.gz"; - sha256 = "03i1wfag279ldjjkwi9gvpfs8fgi05my47icq5ggi66yzxpn5mzp"; - }; - propagatedBuildInputs = [ RoleTiny ]; - buildInputs = [ Moo ]; - meta = { - description = "turn your Moo class into singleton"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "MooX-Singleton"; + version = "1.20"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AJ/AJGB/MooX-Singleton-1.20.tar.gz"; + sha256 = "03i1wfag279ldjjkwi9gvpfs8fgi05my47icq5ggi66yzxpn5mzp"; + }; + propagatedBuildInputs = [ RoleTiny ]; + buildInputs = [ Moo ]; + meta = { + description = "turn your Moo class into singleton"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; MooXStrictConstructor = buildPerlPackage { - pname = "MooX-StrictConstructor"; - version = "0.011"; - src = fetchurl { - url = "mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.011.tar.gz"; - sha256 = "1qjkqrmzgz7lxhv14klsv0v9v6blf8js86d47ah24kpw5y12yf6s"; - }; - propagatedBuildInputs = [ Moo strictures ]; - buildInputs = [ TestFatal ]; - meta = { - description = "Make your Moo-based object constructors blow up on unknown attributes."; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "MooX-StrictConstructor"; + version = "0.011"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.011.tar.gz"; + sha256 = "1qjkqrmzgz7lxhv14klsv0v9v6blf8js86d47ah24kpw5y12yf6s"; + }; + propagatedBuildInputs = [ Moo strictures ]; + buildInputs = [ TestFatal ]; + meta = { + description = "Make your Moo-based object constructors blow up on unknown attributes."; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; MooXTypesMooseLike = buildPerlPackage { @@ -15337,18 +15337,18 @@ let }; MooXCmd = buildPerlPackage { - pname = "MooX-Cmd"; - version = "0.017"; - src = fetchurl { - url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Cmd-0.017.tar.gz"; - sha256 = "1xbhmq07v9z371ygkyghva9aryhc22kwbzn5qwkp72c0ma6z4gwl"; - }; - propagatedBuildInputs = [ ListMoreUtils ModulePluggable Moo PackageStash ParamsUtil RegexpCommon ]; - buildInputs = [ CaptureTiny ]; - meta = { - description = "Giving an easy Moo style way to make command organized CLI apps"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "MooX-Cmd"; + version = "0.017"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Cmd-0.017.tar.gz"; + sha256 = "1xbhmq07v9z371ygkyghva9aryhc22kwbzn5qwkp72c0ma6z4gwl"; + }; + propagatedBuildInputs = [ ListMoreUtils ModulePluggable Moo PackageStash ParamsUtil RegexpCommon ]; + buildInputs = [ CaptureTiny ]; + meta = { + description = "Giving an easy Moo style way to make command organized CLI apps"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; MooXlate = buildPerlPackage { @@ -16484,17 +16484,17 @@ let }; NetDNSResolverMock = buildPerlPackage { - pname = "Net-DNS-Resolver-Mock"; - version = "1.20200215"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20200215.tar.gz"; - sha256 = "1rv745c16l3m3w6xx2hjmmgzkdklmzm9imdfiddmdr9hwm8g3xxy"; - }; - propagatedBuildInputs = [ NetDNS ]; - meta = { - description = "Mock a DNS Resolver object for testing"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Net-DNS-Resolver-Mock"; + version = "1.20200215"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20200215.tar.gz"; + sha256 = "1rv745c16l3m3w6xx2hjmmgzkdklmzm9imdfiddmdr9hwm8g3xxy"; + }; + propagatedBuildInputs = [ NetDNS ]; + meta = { + description = "Mock a DNS Resolver object for testing"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; buildInputs = [ TestException ]; }; @@ -16512,17 +16512,17 @@ let }; NetFastCGI = buildPerlPackage { - pname = "Net-FastCGI"; - version = "0.14"; - src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHANSEN/Net-FastCGI-0.14.tar.gz"; - sha256 = "0sjrnlzci21sci5m52zz0x9bf889j67i6vnhrjlypsfm9w5914qi"; - }; - buildInputs = [ TestException TestHexString ]; - meta = { - description = "FastCGI Toolkit"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Net-FastCGI"; + version = "0.14"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHANSEN/Net-FastCGI-0.14.tar.gz"; + sha256 = "0sjrnlzci21sci5m52zz0x9bf889j67i6vnhrjlypsfm9w5914qi"; + }; + buildInputs = [ TestException TestHexString ]; + meta = { + description = "FastCGI Toolkit"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; NetFrame = buildPerlModule { @@ -16856,35 +16856,35 @@ let }; NetServerCoro = buildPerlPackage { - pname = "Net-Server-Coro"; - version = "1.3"; - src = fetchurl { - url = "mirror://cpan/authors/id/A/AL/ALEXMV/Net-Server-Coro-1.3.tar.gz"; - sha256 = "11pvfxsi0q37kd17z597wb8r9dv3r96fiagq57kc746k1lmp06hy"; - }; - propagatedBuildInputs = [ Coro NetServer ]; - meta = { - description = "A co-operative multithreaded server using Coro"; - license = with lib.licenses; [ mit ]; - }; + pname = "Net-Server-Coro"; + version = "1.3"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AL/ALEXMV/Net-Server-Coro-1.3.tar.gz"; + sha256 = "11pvfxsi0q37kd17z597wb8r9dv3r96fiagq57kc746k1lmp06hy"; + }; + propagatedBuildInputs = [ Coro NetServer ]; + meta = { + description = "A co-operative multithreaded server using Coro"; + license = with lib.licenses; [ mit ]; + }; }; NetServerSSPrefork = buildPerlPackage { - pname = "Net-Server-SS-PreFork"; - version = "0.06pre"; - src = fetchFromGitHub { - owner = "kazuho"; - repo = "p5-Net-Server-SS-PreFork"; - rev = "5fccc0c270e25c65ef634304630af74b48807d21"; - sha256 = "0z02labw0dd76sdf301bhrmgnsjds0ddsg22138g8ys4az49bxx6"; - }; - checkInputs = [ HTTPMessage LWP TestSharedFork HTTPServerSimple TestTCP TestUNIXSock ]; - buildInputs = [ ModuleInstall ]; - propagatedBuildInputs = [ NetServer ServerStarter ]; - meta = { - description = "A hot-deployable variant of Net::Server::PreFork"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Net-Server-SS-PreFork"; + version = "0.06pre"; + src = fetchFromGitHub { + owner = "kazuho"; + repo = "p5-Net-Server-SS-PreFork"; + rev = "5fccc0c270e25c65ef634304630af74b48807d21"; + sha256 = "0z02labw0dd76sdf301bhrmgnsjds0ddsg22138g8ys4az49bxx6"; + }; + checkInputs = [ HTTPMessage LWP TestSharedFork HTTPServerSimple TestTCP TestUNIXSock ]; + buildInputs = [ ModuleInstall ]; + propagatedBuildInputs = [ NetServer ServerStarter ]; + meta = { + description = "A hot-deployable variant of Net::Server::PreFork"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; NetSMTPSSL = buildPerlPackage { @@ -17122,16 +17122,16 @@ let }; NumberMisc = buildPerlModule { - pname = "Number-Misc"; - version = "1.2"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIKO/Number-Misc-1.2.tar.gz"; - sha256 = "1n4ivj4ydplanwbxn3jbsfyfcl91ngn2d0addzqrq1hac26bdfbp"; - }; - meta = { - description = "Number::Misc - handy utilities for numbers"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Number-Misc"; + version = "1.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIKO/Number-Misc-1.2.tar.gz"; + sha256 = "1n4ivj4ydplanwbxn3jbsfyfcl91ngn2d0addzqrq1hac26bdfbp"; + }; + meta = { + description = "Number::Misc - handy utilities for numbers"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; NumberPhone = buildPerlPackage { @@ -17569,18 +17569,18 @@ let }; ParamsValidationCompiler = buildPerlPackage { - pname = "Params-ValidationCompiler"; - version = "0.30"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.30.tar.gz"; - sha256 = "1jqn1l4m4i341g14kmjsf3a1kn7vv6z89cix0xjjgr1v70iywnyw"; - }; - propagatedBuildInputs = [ EvalClosure ExceptionClass ]; - buildInputs = [ Specio Test2PluginNoWarnings Test2Suite TestWithoutModule ]; - meta = { - description = "Build an optimized subroutine parameter validator once, use it forever"; - license = with lib.licenses; [ artistic2 ]; - }; + pname = "Params-ValidationCompiler"; + version = "0.30"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.30.tar.gz"; + sha256 = "1jqn1l4m4i341g14kmjsf3a1kn7vv6z89cix0xjjgr1v70iywnyw"; + }; + propagatedBuildInputs = [ EvalClosure ExceptionClass ]; + buildInputs = [ Specio Test2PluginNoWarnings Test2Suite TestWithoutModule ]; + meta = { + description = "Build an optimized subroutine parameter validator once, use it forever"; + license = with lib.licenses; [ artistic2 ]; + }; }; Paranoid = buildPerlPackage { @@ -17616,20 +17616,20 @@ let }; PAUSEPermissions = buildPerlPackage { - pname = "PAUSE-Permissions"; - version = "0.17"; - src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/PAUSE-Permissions-0.17.tar.gz"; - sha256 = "021ink414w4mdk6rd54cc1f23kfqg0zk4njx4ngr0bw3wc6r4kks"; - }; - propagatedBuildInputs = [ FileHomeDir HTTPDate MooXOptions TimeDurationParse ]; - buildInputs = [ PathTiny ]; - meta = { - description = "interface to PAUSE's module permissions file (06perms.txt)"; - homepage = "https://github.com/neilb/PAUSE-Permissions"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - mainProgram = "pause-permissions"; - }; + pname = "PAUSE-Permissions"; + version = "0.17"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEILB/PAUSE-Permissions-0.17.tar.gz"; + sha256 = "021ink414w4mdk6rd54cc1f23kfqg0zk4njx4ngr0bw3wc6r4kks"; + }; + propagatedBuildInputs = [ FileHomeDir HTTPDate MooXOptions TimeDurationParse ]; + buildInputs = [ PathTiny ]; + meta = { + description = "interface to PAUSE's module permissions file (06perms.txt)"; + homepage = "https://github.com/neilb/PAUSE-Permissions"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "pause-permissions"; + }; }; Parent = buildPerlPackage { @@ -17670,18 +17670,18 @@ let }; ParseLocalDistribution = buildPerlPackage { - pname = "Parse-LocalDistribution"; - version = "0.19"; - src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-LocalDistribution-0.19.tar.gz"; - sha256 = "17p92nj4k3acrqqjnln1j5x8hbra9jkx5hdcybrq37ld9qnc62vb"; - }; - propagatedBuildInputs = [ ParsePMFile ]; - buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; - meta = { - description = "parses local .pm files as PAUSE does"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Parse-LocalDistribution"; + version = "0.19"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-LocalDistribution-0.19.tar.gz"; + sha256 = "17p92nj4k3acrqqjnln1j5x8hbra9jkx5hdcybrq37ld9qnc62vb"; + }; + propagatedBuildInputs = [ ParsePMFile ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; + meta = { + description = "parses local .pm files as PAUSE does"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; ParsePlainConfig = buildPerlPackage { @@ -17700,17 +17700,17 @@ let }; ParsePMFile = buildPerlPackage { - pname = "Parse-PMFile"; - version = "0.43"; - src = fetchurl { - url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-PMFile-0.43.tar.gz"; - sha256 = "08q6j1lw5l49yhzx8gm4zal7zp1gk58iacpda86cyf27403yhqdy"; - }; - buildInputs = [ ExtUtilsMakeMakerCPANfile ]; - meta = { - description = "parses .pm file as PAUSE does"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Parse-PMFile"; + version = "0.43"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-PMFile-0.43.tar.gz"; + sha256 = "08q6j1lw5l49yhzx8gm4zal7zp1gk58iacpda86cyf27403yhqdy"; + }; + buildInputs = [ ExtUtilsMakeMakerCPANfile ]; + meta = { + description = "parses .pm file as PAUSE does"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; ParseRecDescent = buildPerlModule { @@ -18273,50 +18273,50 @@ let }; PlackAppProxy = buildPerlPackage { - pname = "Plack-App-Proxy"; - version = "0.29"; - src = fetchurl { - url = "mirror://cpan/authors/id/L/LE/LEEDO/Plack-App-Proxy-0.29.tar.gz"; - sha256 = "03x6yb6ykz1ms90jp1s0pq19yplf7wswljvhzqkr16jannfrmah4"; - }; - propagatedBuildInputs = [ AnyEventHTTP LWP Plack ]; - buildInputs = [ TestRequires TestSharedFork TestTCP ]; - meta = { - description = "proxy requests"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Plack-App-Proxy"; + version = "0.29"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LE/LEEDO/Plack-App-Proxy-0.29.tar.gz"; + sha256 = "03x6yb6ykz1ms90jp1s0pq19yplf7wswljvhzqkr16jannfrmah4"; + }; + propagatedBuildInputs = [ AnyEventHTTP LWP Plack ]; + buildInputs = [ TestRequires TestSharedFork TestTCP ]; + meta = { + description = "proxy requests"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; PlackMiddlewareAuthDigest = buildPerlModule { - pname = "Plack-Middleware-Auth-Digest"; - version = "0.05"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Auth-Digest-0.05.tar.gz"; - sha256 = "1sqm23kfsl3ac4060zcclc3r86x1vxzhsgvgzg6mxk9njj93zgcs"; - }; - propagatedBuildInputs = [ DigestHMAC Plack ]; - buildInputs = [ LWP ModuleBuildTiny TestSharedFork TestTCP ]; - meta = { - description = "Digest authentication"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/miyagawa/Plack-Middleware-Auth-Digest"; - }; + pname = "Plack-Middleware-Auth-Digest"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Auth-Digest-0.05.tar.gz"; + sha256 = "1sqm23kfsl3ac4060zcclc3r86x1vxzhsgvgzg6mxk9njj93zgcs"; + }; + propagatedBuildInputs = [ DigestHMAC Plack ]; + buildInputs = [ LWP ModuleBuildTiny TestSharedFork TestTCP ]; + meta = { + description = "Digest authentication"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/Plack-Middleware-Auth-Digest"; + }; }; PlackMiddlewareConsoleLogger = buildPerlModule { - pname = "Plack-Middleware-ConsoleLogger"; - version = "0.05"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ConsoleLogger-0.05.tar.gz"; - sha256 = "1ngvhwdw9ll4cwnvf0i89ppa9pbyiwng6iba04scrqjda353lrsm"; - }; - propagatedBuildInputs = [ JavaScriptValueEscape Plack ]; - buildInputs = [ ModuleBuildTiny TestRequires ]; - meta = { - description = "Write logs to Firebug or Webkit Inspector"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/miyagawa/Plack-Middleware-ConsoleLogger"; - }; + pname = "Plack-Middleware-ConsoleLogger"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ConsoleLogger-0.05.tar.gz"; + sha256 = "1ngvhwdw9ll4cwnvf0i89ppa9pbyiwng6iba04scrqjda353lrsm"; + }; + propagatedBuildInputs = [ JavaScriptValueEscape Plack ]; + buildInputs = [ ModuleBuildTiny TestRequires ]; + meta = { + description = "Write logs to Firebug or Webkit Inspector"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/miyagawa/Plack-Middleware-ConsoleLogger"; + }; }; PlackMiddlewareDebug = buildPerlModule { @@ -18336,18 +18336,18 @@ let }; PlackMiddlewareDeflater = buildPerlPackage { - pname = "Plack-Middleware-Deflater"; - version = "0.12"; - src = fetchurl { - url = "mirror://cpan/authors/id/K/KA/KAZEBURO/Plack-Middleware-Deflater-0.12.tar.gz"; - sha256 = "0xf2visi16hgwgyp9q0cjr10ikbn474hjia5mj8mb2scvbkrbni8"; - }; - propagatedBuildInputs = [ Plack ]; - buildInputs = [ TestRequires TestSharedFork TestTCP ]; - meta = { - description = "Compress response body with Gzip or Deflate"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Plack-Middleware-Deflater"; + version = "0.12"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/Plack-Middleware-Deflater-0.12.tar.gz"; + sha256 = "0xf2visi16hgwgyp9q0cjr10ikbn474hjia5mj8mb2scvbkrbni8"; + }; + propagatedBuildInputs = [ Plack ]; + buildInputs = [ TestRequires TestSharedFork TestTCP ]; + meta = { + description = "Compress response body with Gzip or Deflate"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; PlackMiddlewareFixMissingBodyInRedirect = buildPerlPackage { @@ -18366,17 +18366,17 @@ let }; PlackMiddlewareHeader = buildPerlPackage { - pname = "Plack-Middleware-Header"; - version = "0.04"; - src = fetchurl { - url = "mirror://cpan/authors/id/C/CH/CHIBA/Plack-Middleware-Header-0.04.tar.gz"; - sha256 = "0pjxxbnilphn38s3mmv0fmg9q2hm4z02ngp2a1lxblzjfbzvkdjy"; - }; - propagatedBuildInputs = [ Plack ]; - meta = { - description = "modify HTTP response headers"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Plack-Middleware-Header"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHIBA/Plack-Middleware-Header-0.04.tar.gz"; + sha256 = "0pjxxbnilphn38s3mmv0fmg9q2hm4z02ngp2a1lxblzjfbzvkdjy"; + }; + propagatedBuildInputs = [ Plack ]; + meta = { + description = "modify HTTP response headers"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; PlackMiddlewareMethodOverride = buildPerlPackage { @@ -18423,19 +18423,19 @@ let }; PlackMiddlewareSession = buildPerlModule { - pname = "Plack-Middleware-Session"; - version = "0.33"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.33.tar.gz"; - sha256 = "1vm4a66civdzh7xvl5hy5wn1w8j1vndppwyz8ndh9n4as74s5yag"; - }; - propagatedBuildInputs = [ DigestHMAC Plack ]; - buildInputs = [ HTTPCookies LWP ModuleBuildTiny TestFatal TestRequires TestSharedFork TestTCP ]; - meta = { - description = "Middleware for session management"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/plack/Plack-Middleware-Session"; - }; + pname = "Plack-Middleware-Session"; + version = "0.33"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.33.tar.gz"; + sha256 = "1vm4a66civdzh7xvl5hy5wn1w8j1vndppwyz8ndh9n4as74s5yag"; + }; + propagatedBuildInputs = [ DigestHMAC Plack ]; + buildInputs = [ HTTPCookies LWP ModuleBuildTiny TestFatal TestRequires TestSharedFork TestTCP ]; + meta = { + description = "Middleware for session management"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/plack/Plack-Middleware-Session"; + }; }; PlackTestExternalServer = buildPerlPackage { @@ -19152,19 +19152,19 @@ let }; PodMarkdownGithub = buildPerlPackage { - pname = "Pod-Markdown-Github"; - version = "0.04"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.04.tar.gz"; - sha256 = "04y67c50hpf1vb9cwsza3fbj4rshdqa47vi3zcj4kkjckh02yzmk"; - }; - propagatedBuildInputs = [ PodMarkdown ]; - buildInputs = [ TestDifferences ]; - meta = { - description = "Convert POD to Github's specific markdown"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - mainProgram = "pod2github"; - }; + pname = "Pod-Markdown-Github"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.04.tar.gz"; + sha256 = "04y67c50hpf1vb9cwsza3fbj4rshdqa47vi3zcj4kkjckh02yzmk"; + }; + propagatedBuildInputs = [ PodMarkdown ]; + buildInputs = [ TestDifferences ]; + meta = { + description = "Convert POD to Github's specific markdown"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "pod2github"; + }; }; PodSimple = buildPerlPackage { @@ -19193,32 +19193,32 @@ let }; PodStrip = buildPerlModule { - pname = "Pod-Strip"; - version = "1.02"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DO/DOMM/Pod-Strip-1.02.tar.gz"; - sha256 = "1zsjfw2cjq1bd3ppl67fdvrx46vj9lina0c3cv9qgk5clzvaq3fq"; - }; - meta = { - description = "Remove POD from Perl code"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Pod-Strip"; + version = "1.02"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DO/DOMM/Pod-Strip-1.02.tar.gz"; + sha256 = "1zsjfw2cjq1bd3ppl67fdvrx46vj9lina0c3cv9qgk5clzvaq3fq"; + }; + meta = { + description = "Remove POD from Perl code"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; PodTidy = buildPerlModule { - pname = "Pod-Tidy"; - version = "0.10"; - src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHOBLITT/Pod-Tidy-0.10.tar.gz"; - sha256 = "1gcxjplgksnc5iggi8dzbkbkcryii5wjhypd7fs3kmbwx91y2vl8"; - }; - propagatedBuildInputs = [ EncodeNewlines IOString PodWrap TextGlob ]; - buildInputs = [ TestCmd ]; - meta = { - description = "a reformatting Pod Processor"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - mainProgram = "podtidy"; - }; + pname = "Pod-Tidy"; + version = "0.10"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JH/JHOBLITT/Pod-Tidy-0.10.tar.gz"; + sha256 = "1gcxjplgksnc5iggi8dzbkbkcryii5wjhypd7fs3kmbwx91y2vl8"; + }; + propagatedBuildInputs = [ EncodeNewlines IOString PodWrap TextGlob ]; + buildInputs = [ TestCmd ]; + meta = { + description = "a reformatting Pod Processor"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "podtidy"; + }; }; PodWeaver = buildPerlPackage { @@ -19238,17 +19238,17 @@ let }; PodWrap = buildPerlModule { - pname = "Pod-Wrap"; - version = "0.01"; - src = fetchurl { - url = "mirror://cpan/authors/id/N/NU/NUFFIN/Pod-Wrap-0.01.tar.gz"; - sha256 = "0qwb5hp26f85xnb3zivf8ccfdplabiyl5sd53c6wgdgvzzicpjjh"; - }; - propagatedBuildInputs = [ PodParser ]; - meta = { - license = with lib.licenses; [ artistic1 gpl1Plus ]; - mainProgram = "podwrap"; - }; + pname = "Pod-Wrap"; + version = "0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NU/NUFFIN/Pod-Wrap-0.01.tar.gz"; + sha256 = "0qwb5hp26f85xnb3zivf8ccfdplabiyl5sd53c6wgdgvzzicpjjh"; + }; + propagatedBuildInputs = [ PodParser ]; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "podwrap"; + }; }; ProbePerl = buildPerlPackage { @@ -19955,31 +19955,31 @@ let }; SnowballNorwegian = buildPerlModule { - pname = "Snowball-Norwegian"; - version = "1.2"; - src = fetchurl { - url = "mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Norwegian-1.2.tar.gz"; - sha256 = "0675v45bbsh7vr7kpf36xs2q79g02iq1kmfw22h20xdk4rzqvkqx"; - }; - meta = { - description = "Porters stemming algorithm for norwegian."; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - mainProgram = "stemmer-no.pl"; - }; + pname = "Snowball-Norwegian"; + version = "1.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Norwegian-1.2.tar.gz"; + sha256 = "0675v45bbsh7vr7kpf36xs2q79g02iq1kmfw22h20xdk4rzqvkqx"; + }; + meta = { + description = "Porters stemming algorithm for norwegian."; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "stemmer-no.pl"; + }; }; SnowballSwedish = buildPerlModule { - pname = "Snowball-Swedish"; - version = "1.2"; - src = fetchurl { - url = "mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Swedish-1.2.tar.gz"; - sha256 = "0agwc12jk5kmabnpsplw3wf4ii5w1zb159cpin44x3srb0sr5apg"; - }; - meta = { - description = "Porters stemming algorithm for swedish."; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - mainProgram = "stemmer-se.pl"; - }; + pname = "Snowball-Swedish"; + version = "1.2"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Swedish-1.2.tar.gz"; + sha256 = "0agwc12jk5kmabnpsplw3wf4ii5w1zb159cpin44x3srb0sr5apg"; + }; + meta = { + description = "Porters stemming algorithm for swedish."; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "stemmer-se.pl"; + }; }; SOAPLite = buildPerlPackage { @@ -20030,19 +20030,19 @@ let }; SoftwareLicenseCCpack = buildPerlPackage { - pname = "Software-License-CCpack"; - version = "1.11"; - src = fetchurl { - url = "mirror://cpan/authors/id/B/BB/BBYRD/Software-License-CCpack-1.11.tar.gz"; - sha256 = "1cakbn7am8mhalwas5h33l7c6avdqpg42z478p6rav11pim5qksr"; - }; - propagatedBuildInputs = [ SoftwareLicense ]; - buildInputs = [ TestCheckDeps ]; - meta = { - description = "Software::License pack for Creative Commons' licenses"; - license = with lib.licenses; [ lgpl3Plus ]; - homepage = "https://github.com/SineSwiper/Software-License-CCpack"; - }; + pname = "Software-License-CCpack"; + version = "1.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BB/BBYRD/Software-License-CCpack-1.11.tar.gz"; + sha256 = "1cakbn7am8mhalwas5h33l7c6avdqpg42z478p6rav11pim5qksr"; + }; + propagatedBuildInputs = [ SoftwareLicense ]; + buildInputs = [ TestCheckDeps ]; + meta = { + description = "Software::License pack for Creative Commons' licenses"; + license = with lib.licenses; [ lgpl3Plus ]; + homepage = "https://github.com/SineSwiper/Software-License-CCpack"; + }; }; SortKey = buildPerlPackage { @@ -20068,33 +20068,33 @@ let }; Specio = buildPerlPackage { - pname = "Specio"; - version = "0.46"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.46.tar.gz"; - sha256 = "15lmxffbzj1gq7n9m80a3ka8nqxmmk3p4azp33y6wv872shjmx0b"; - }; - propagatedBuildInputs = [ DevelStackTrace EvalClosure MROCompat ModuleRuntime RoleTiny SubQuote TryTiny ]; - buildInputs = [ TestFatal TestNeeds ]; - meta = { - description = "Type constraints and coercions for Perl"; - license = with lib.licenses; [ artistic2 ]; - }; + pname = "Specio"; + version = "0.46"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.46.tar.gz"; + sha256 = "15lmxffbzj1gq7n9m80a3ka8nqxmmk3p4azp33y6wv872shjmx0b"; + }; + propagatedBuildInputs = [ DevelStackTrace EvalClosure MROCompat ModuleRuntime RoleTiny SubQuote TryTiny ]; + buildInputs = [ TestFatal TestNeeds ]; + meta = { + description = "Type constraints and coercions for Perl"; + license = with lib.licenses; [ artistic2 ]; + }; }; SpecioLibraryPathTiny = buildPerlPackage { - pname = "Specio-Library-Path-Tiny"; - version = "0.04"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-Library-Path-Tiny-0.04.tar.gz"; - sha256 = "0cyfx8gigsgisdwynjamh8jkpad23sr8v6a98hq285zmibm16s7g"; - }; - propagatedBuildInputs = [ PathTiny Specio ]; - buildInputs = [ Filepushd TestFatal ]; - meta = { - description = "Path::Tiny types and coercions for Specio"; - license = with lib.licenses; [ asl20 ]; - }; + pname = "Specio-Library-Path-Tiny"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-Library-Path-Tiny-0.04.tar.gz"; + sha256 = "0cyfx8gigsgisdwynjamh8jkpad23sr8v6a98hq285zmibm16s7g"; + }; + propagatedBuildInputs = [ PathTiny Specio ]; + buildInputs = [ Filepushd TestFatal ]; + meta = { + description = "Path::Tiny types and coercions for Specio"; + license = with lib.licenses; [ asl20 ]; + }; }; Spiffy = buildPerlPackage { @@ -21423,7 +21423,7 @@ let buildInputs = [ CGI TestLeakTrace ]; }; - TemplateGD = buildPerlPackage { + TemplateGD = buildPerlPackage { pname = "Template-GD"; version = "2.66"; src = fetchurl { @@ -21660,17 +21660,17 @@ let }; TermUI = buildPerlPackage { - pname = "Term-UI"; - version = "0.46"; - src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/Term-UI-0.46.tar.gz"; - sha256 = "19p92za5cx1v7g57pg993amprcvm1az3pp7y9g5b1aplsy06r54i"; - }; - propagatedBuildInputs = [ LogMessageSimple ]; - meta = { - description = "User interfaces via Term::ReadLine made easy"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Term-UI"; + version = "0.46"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BI/BINGOS/Term-UI-0.46.tar.gz"; + sha256 = "19p92za5cx1v7g57pg993amprcvm1az3pp7y9g5b1aplsy06r54i"; + }; + propagatedBuildInputs = [ LogMessageSimple ]; + meta = { + description = "User interfaces via Term::ReadLine made easy"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; TermVT102 = buildPerlPackage { @@ -21744,7 +21744,7 @@ let }; }; - Test2PluginUUID = buildPerlPackage { + Test2PluginUUID = buildPerlPackage { pname = "Test2-Plugin-UUID"; version = "0.002001"; src = fetchurl { @@ -21760,17 +21760,17 @@ let }; Test2PluginNoWarnings = buildPerlPackage { - pname = "Test2-Plugin-NoWarnings"; - version = "0.09"; - src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.09.tar.gz"; - sha256 = "0x7vy9r5gyxqg3qy966frj8ywkckkv7mc83xy4mkdvrf0h0dhgdy"; - }; - buildInputs = [ IPCRun3 Test2Suite ]; - meta = { - description = "Fail if tests warn"; - license = with lib.licenses; [ artistic2 ]; - }; + pname = "Test2-Plugin-NoWarnings"; + version = "0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.09.tar.gz"; + sha256 = "0x7vy9r5gyxqg3qy966frj8ywkckkv7mc83xy4mkdvrf0h0dhgdy"; + }; + buildInputs = [ IPCRun3 Test2Suite ]; + meta = { + description = "Fail if tests warn"; + license = with lib.licenses; [ artistic2 ]; + }; propagatedBuildInputs = [ TestSimple13 ]; }; @@ -21789,19 +21789,19 @@ let }; TestAbortable = buildPerlPackage { - pname = "Test-Abortable"; - version = "0.002"; - src = fetchurl { - url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Abortable-0.002.tar.gz"; - sha256 = "0v97y31j56f4mxw0vxyjbdprq4951h4wcdh4acnfm63np7wvg44p"; - }; - propagatedBuildInputs = [ SubExporter ]; - buildInputs = [ TestNeeds ]; - meta = { - description = "subtests that you can die your way out of ... but survive"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/rjbs/Test-Abortable"; - }; + pname = "Test-Abortable"; + version = "0.002"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Abortable-0.002.tar.gz"; + sha256 = "0v97y31j56f4mxw0vxyjbdprq4951h4wcdh4acnfm63np7wvg44p"; + }; + propagatedBuildInputs = [ SubExporter ]; + buildInputs = [ TestNeeds ]; + meta = { + description = "subtests that you can die your way out of ... but survive"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/rjbs/Test-Abortable"; + }; }; TestAssert = buildPerlModule { @@ -21897,17 +21897,17 @@ let }; TestClassMost = buildPerlModule { - pname = "Test-Class-Most"; - version = "0.08"; - src = fetchurl { - url = "mirror://cpan/authors/id/O/OV/OVID/Test-Class-Most-0.08.tar.gz"; - sha256 = "1zvx9hil0mg0pnb8xfa4m0xgjpvh8s5gnbyprq3xwpdsdgcdwk33"; - }; - buildInputs = [ TestClass TestDeep TestDifferences TestException TestMost TestWarn ]; - meta = { - description = "Test Classes the easy way"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Test-Class-Most"; + version = "0.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OV/OVID/Test-Class-Most-0.08.tar.gz"; + sha256 = "1zvx9hil0mg0pnb8xfa4m0xgjpvh8s5gnbyprq3xwpdsdgcdwk33"; + }; + buildInputs = [ TestClass TestDeep TestDifferences TestException TestMost TestWarn ]; + meta = { + description = "Test Classes the easy way"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; TestCleanNamespaces = buildPerlPackage { @@ -21927,18 +21927,18 @@ let }; TestCmd = buildPerlPackage { - pname = "Test-Cmd"; - version = "1.09"; - src = fetchurl { - url = "mirror://cpan/authors/id/N/NE/NEILB/Test-Cmd-1.09.tar.gz"; - sha256 = "114nfafwfxxn7kig265b7lg0znb5ybvc282sjjwf14g7vpn20cyg"; - }; - doCheck = false; /* test fails */ - meta = { - description = "Perl module for portable testing of commands and scripts"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/neilb/Test-Cmd"; - }; + pname = "Test-Cmd"; + version = "1.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/N/NE/NEILB/Test-Cmd-1.09.tar.gz"; + sha256 = "114nfafwfxxn7kig265b7lg0znb5ybvc282sjjwf14g7vpn20cyg"; + }; + doCheck = false; /* test fails */ + meta = { + description = "Perl module for portable testing of commands and scripts"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/neilb/Test-Cmd"; + }; }; TestCommand = buildPerlModule { @@ -21983,17 +21983,17 @@ let }; TestCPANMetaJSON = buildPerlPackage { - pname = "Test-CPAN-Meta-JSON"; - version = "0.16"; - src = fetchurl { - url = "mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-JSON-0.16.tar.gz"; - sha256 = "1jg9ka50ixwq083wd4k12rhdjq87w0ihb34gd8jjn7gvvyd51b37"; - }; - propagatedBuildInputs = [ JSON ]; - meta = { - description = "Validate your CPAN META.json files"; - license = with lib.licenses; [ artistic2 ]; - }; + pname = "Test-CPAN-Meta-JSON"; + version = "0.16"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-JSON-0.16.tar.gz"; + sha256 = "1jg9ka50ixwq083wd4k12rhdjq87w0ihb34gd8jjn7gvvyd51b37"; + }; + propagatedBuildInputs = [ JSON ]; + meta = { + description = "Validate your CPAN META.json files"; + license = with lib.licenses; [ artistic2 ]; + }; }; TestDataSplit = buildPerlModule { @@ -22263,29 +22263,29 @@ let }; TestHexDifferences = buildPerlPackage { - pname = "Test-HexDifferences"; - version = "1.001"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/ST/STEFFENW/Test-HexDifferences-1.001.tar.gz"; - sha256 = "18lh6shpfx567gjikrid4hixydgv1hi3mycl20qzq2j2vpn4afd6"; - }; - propagatedBuildInputs = [ SubExporter TextDiff ]; - buildInputs = [ TestDifferences TestNoWarnings ]; - meta = { - }; + pname = "Test-HexDifferences"; + version = "1.001"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Test-HexDifferences-1.001.tar.gz"; + sha256 = "18lh6shpfx567gjikrid4hixydgv1hi3mycl20qzq2j2vpn4afd6"; + }; + propagatedBuildInputs = [ SubExporter TextDiff ]; + buildInputs = [ TestDifferences TestNoWarnings ]; + meta = { + }; }; TestHexString = buildPerlModule { - pname = "Test-HexString"; - version = "0.03"; - src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Test-HexString-0.03.tar.gz"; - sha256 = "0h1zl2l1ljlcxsn0xvin9dwiymnhyhnfnxgzg3f9899g37f4qk3x"; - }; - meta = { - description = "test binary strings with hex dump diagnostics"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Test-HexString"; + version = "0.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/Test-HexString-0.03.tar.gz"; + sha256 = "0h1zl2l1ljlcxsn0xvin9dwiymnhyhnfnxgzg3f9899g37f4qk3x"; + }; + meta = { + description = "test binary strings with hex dump diagnostics"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; TestIdentity = buildPerlModule { @@ -22326,20 +22326,20 @@ let }; TestKwalitee = buildPerlPackage { - pname = "Test-Kwalitee"; - version = "1.28"; - src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.28.tar.gz"; - sha256 = "18s3c8qfr3kmmyxmsn5la2zgbdsgpnkmscnl68i7fnavfpfnqlxl"; - }; - propagatedBuildInputs = [ ModuleCPANTSAnalyse ]; - buildInputs = [ CPANMetaCheck TestDeep TestWarnings ]; - meta = { - description = "Test the Kwalitee of a distribution before you release it"; - homepage = "https://github.com/karenetheridge/Test-Kwalitee"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - mainProgram = "kwalitee-metrics"; - }; + pname = "Test-Kwalitee"; + version = "1.28"; + src = fetchurl { + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.28.tar.gz"; + sha256 = "18s3c8qfr3kmmyxmsn5la2zgbdsgpnkmscnl68i7fnavfpfnqlxl"; + }; + propagatedBuildInputs = [ ModuleCPANTSAnalyse ]; + buildInputs = [ CPANMetaCheck TestDeep TestWarnings ]; + meta = { + description = "Test the Kwalitee of a distribution before you release it"; + homepage = "https://github.com/karenetheridge/Test-Kwalitee"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "kwalitee-metrics"; + }; }; TestLWPUserAgent = buildPerlPackage { @@ -22530,18 +22530,18 @@ let }; TestMockTimeHiRes = buildPerlModule { - pname = "Test-MockTime-HiRes"; - version = "0.08"; - src = fetchurl { - url = "mirror://cpan/authors/id/T/TA/TARAO/Test-MockTime-HiRes-0.08.tar.gz"; - sha256 = "1hfykcjrls6ywgbd49w29c7apj3nq4wlyx7jzpd2glwmz2pgfjaz"; - }; - buildInputs = [ AnyEvent ModuleBuildTiny TestClass TestMockTime TestRequires ]; - meta = { - description = "Replaces actual time with simulated high resolution time"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/tarao/perl5-Test-MockTime-HiRes"; - }; + pname = "Test-MockTime-HiRes"; + version = "0.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TA/TARAO/Test-MockTime-HiRes-0.08.tar.gz"; + sha256 = "1hfykcjrls6ywgbd49w29c7apj3nq4wlyx7jzpd2glwmz2pgfjaz"; + }; + buildInputs = [ AnyEvent ModuleBuildTiny TestClass TestMockTime TestRequires ]; + meta = { + description = "Replaces actual time with simulated high resolution time"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/tarao/perl5-Test-MockTime-HiRes"; + }; }; TestMojibake = buildPerlPackage { @@ -22560,16 +22560,16 @@ let }; TestMoreUTF8 = buildPerlPackage { - pname = "Test-More-UTF8"; - version = "0.05"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MO/MONS/Test-More-UTF8-0.05.tar.gz"; - sha256 = "016fs77lmw8xxrcnapvp6wq4hjwgsdfi3l9ylpxgxkcpdarw9wdr"; - }; - meta = { - description = "Enhancing Test::More for UTF8-based projects"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Test-More-UTF8"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MO/MONS/Test-More-UTF8-0.05.tar.gz"; + sha256 = "016fs77lmw8xxrcnapvp6wq4hjwgsdfi3l9ylpxgxkcpdarw9wdr"; + }; + meta = { + description = "Enhancing Test::More for UTF8-based projects"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; TestMost = buildPerlPackage { @@ -22663,18 +22663,18 @@ let }; TestPAUSEPermissions = buildPerlPackage { - pname = "Test-PAUSE-Permissions"; - version = "0.07"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/Test-PAUSE-Permissions-0.07.tar.gz"; - sha256 = "0gh7f67g1y30yggmwj1pq6xgrx3cfjibj2378nl3gilvyaxw2w2m"; - }; - propagatedBuildInputs = [ ConfigIdentity PAUSEPermissions ParseLocalDistribution ]; - buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; - meta = { - description = "tests module permissions in your distribution"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Test-PAUSE-Permissions"; + version = "0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SK/SKAJI/Test-PAUSE-Permissions-0.07.tar.gz"; + sha256 = "0gh7f67g1y30yggmwj1pq6xgrx3cfjibj2378nl3gilvyaxw2w2m"; + }; + propagatedBuildInputs = [ ConfigIdentity PAUSEPermissions ParseLocalDistribution ]; + buildInputs = [ ExtUtilsMakeMakerCPANfile TestUseAllModules ]; + meta = { + description = "tests module permissions in your distribution"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; TestPerlCritic = buildPerlModule { @@ -22808,16 +22808,16 @@ let }; TestRequiresInternet = buildPerlPackage { - pname = "Test-RequiresInternet"; - version = "0.05"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz"; - sha256 = "0gl33vpj9bb78pzyijp884b66sbw6jkh1ci0xki8rmf03hmb79xv"; - }; - meta = { - description = "Easily test network connectivity"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Test-RequiresInternet"; + version = "0.05"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz"; + sha256 = "0gl33vpj9bb78pzyijp884b66sbw6jkh1ci0xki8rmf03hmb79xv"; + }; + meta = { + description = "Easily test network connectivity"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; TestRoo = buildPerlPackage { @@ -22880,7 +22880,7 @@ let license = lib.licenses.mit; mainProgram = "runprove"; }; - }; + }; TestRunPluginAlternateInterpreters = buildPerlModule { pname = "Test-Run-Plugin-AlternateInterpreters"; @@ -23159,16 +23159,16 @@ let }; TestToolbox = buildPerlModule { - pname = "Test-Toolbox"; - version = "0.4"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIKO/Test-Toolbox-0.4.tar.gz"; - sha256 = "1hxx9rhvncvn7wvzhzx4sk00w0xq2scgspfhhyqwjnm1yg3va820"; - }; - meta = { - description = "Test::Toolbox - tools for testing"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Test-Toolbox"; + version = "0.4"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIKO/Test-Toolbox-0.4.tar.gz"; + sha256 = "1hxx9rhvncvn7wvzhzx4sk00w0xq2scgspfhhyqwjnm1yg3va820"; + }; + meta = { + description = "Test::Toolbox - tools for testing"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; TestTrailingSpace = buildPerlModule { @@ -23519,14 +23519,14 @@ let }; TextGerman = buildPerlPackage { - pname = "Text-German"; - version = "0.06"; - src = fetchurl { - url = "mirror://cpan/authors/id/U/UL/ULPFR/Text-German-0.06.tar.gz"; - sha256 = "1p87pgap99lw0nv62i3ghvsi7yg90lhn8vsa3yqp75rd04clybcj"; - }; - meta = { - }; + pname = "Text-German"; + version = "0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/U/UL/ULPFR/Text-German-0.06.tar.gz"; + sha256 = "1p87pgap99lw0nv62i3ghvsi7yg90lhn8vsa3yqp75rd04clybcj"; + }; + meta = { + }; }; TextGlob = buildPerlPackage { @@ -24269,18 +24269,18 @@ let }; TieSub = buildPerlPackage { - pname = "Tie-Sub"; - version = "1.001"; - src = fetchurl { - url = "mirror://cpan/authors/id/S/ST/STEFFENW/Tie-Sub-1.001.tar.gz"; - sha256 = "1cgiyj85hhw2m4x2iv4zgaj3hzf3fghircpcfqmjndni4r4a0wgg"; - }; - propagatedBuildInputs = [ ParamsValidate ]; - buildInputs = [ ModuleBuild TestDifferences TestException TestNoWarnings ]; - meta = { - description = "Tie::Sub - Tying a subroutine, function or method to a hash"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "Tie-Sub"; + version = "1.001"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Tie-Sub-1.001.tar.gz"; + sha256 = "1cgiyj85hhw2m4x2iv4zgaj3hzf3fghircpcfqmjndni4r4a0wgg"; + }; + propagatedBuildInputs = [ ParamsValidate ]; + buildInputs = [ ModuleBuild TestDifferences TestException TestNoWarnings ]; + meta = { + description = "Tie::Sub - Tying a subroutine, function or method to a hash"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; TieToObject = buildPerlPackage { @@ -24541,20 +24541,20 @@ let }; Twiggy = buildPerlPackage { - pname = "Twiggy"; - version = "0.1025"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Twiggy-0.1025.tar.gz"; - sha256 = "1a57knbwync7rlzhsz1kdc0sd380xnaccwgiy1qwj5d87abdynnp"; - }; - propagatedBuildInputs = [ AnyEvent Plack ]; - buildInputs = [ TestRequires TestSharedFork TestTCP ]; - meta = { - description = "AnyEvent HTTP server for PSGI (like Thin)"; - homepage = "https://github.com/miyagawa/Twiggy"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - mainProgram = "twiggy"; - }; + pname = "Twiggy"; + version = "0.1025"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Twiggy-0.1025.tar.gz"; + sha256 = "1a57knbwync7rlzhsz1kdc0sd380xnaccwgiy1qwj5d87abdynnp"; + }; + propagatedBuildInputs = [ AnyEvent Plack ]; + buildInputs = [ TestRequires TestSharedFork TestTCP ]; + meta = { + description = "AnyEvent HTTP server for PSGI (like Thin)"; + homepage = "https://github.com/miyagawa/Twiggy"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + mainProgram = "twiggy"; + }; }; TypeTiny = buildPerlPackage { @@ -24587,15 +24587,15 @@ let }; TypesSerialiser = buildPerlPackage { - pname = "Types-Serialiser"; - version = "1.01"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Types-Serialiser-1.01.tar.gz"; - sha256 = "104a7292pwwg57rswpkiaq1cgj7hcsrpf818azcy7l0l14xigizq"; - }; - propagatedBuildInputs = [ commonsense ]; - meta = { - }; + pname = "Types-Serialiser"; + version = "1.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Types-Serialiser-1.01.tar.gz"; + sha256 = "104a7292pwwg57rswpkiaq1cgj7hcsrpf818azcy7l0l14xigizq"; + }; + propagatedBuildInputs = [ commonsense ]; + meta = { + }; }; UNIVERSALcan = buildPerlPackage { @@ -24795,16 +24795,16 @@ let }; UserIdentity = buildPerlPackage { - pname = "User-Identity"; - version = "1.00"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-1.00.tar.gz"; - sha256 = "0jlzishg33848qvl5x7nsrnlpnx7lfg5hr4m1qrjddzy3hkv86cj"; - }; - meta = { - description = "Collect information about a user"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "User-Identity"; + version = "1.00"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-1.00.tar.gz"; + sha256 = "0jlzishg33848qvl5x7nsrnlpnx7lfg5hr4m1qrjddzy3hkv86cj"; + }; + meta = { + description = "Collect information about a user"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; URIIMAP = buildPerlPackage { @@ -25045,17 +25045,17 @@ let }; WWWFormUrlEncoded = buildPerlModule { - pname = "WWW-Form-UrlEncoded"; - version = "0.26"; - src = fetchurl { - url = "mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.26.tar.gz"; - sha256 = "1x4h5m5fkwaa0gbn6zp9mjrhr3r989w8wyrjxiii3dqm3xghnj60"; - }; - meta = { - description = "parser and builder for application/x-www-form-urlencoded"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - homepage = "https://github.com/kazeburo/WWW-Form-UrlEncoded"; - }; + pname = "WWW-Form-UrlEncoded"; + version = "0.26"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.26.tar.gz"; + sha256 = "1x4h5m5fkwaa0gbn6zp9mjrhr3r989w8wyrjxiii3dqm3xghnj60"; + }; + meta = { + description = "parser and builder for application/x-www-form-urlencoded"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/kazeburo/WWW-Form-UrlEncoded"; + }; }; WWWMechanize = buildPerlPackage { @@ -25610,19 +25610,19 @@ let }; XMLSAXExpat = buildPerlPackage { - pname = "XML-SAX-Expat"; - version = "0.51"; - src = fetchurl { - url = "mirror://cpan/authors/id/B/BJ/BJOERN/XML-SAX-Expat-0.51.tar.gz"; - sha256 = "0gy8h2bvvvlxychwsb99ikdh5cqpk6sqc073jk2b4zffs09n40ac"; - }; - propagatedBuildInputs = [ XMLParser XMLSAX ]; - # Avoid creating perllocal.pod, which contains a timestamp - installTargets = [ "pure_install" ]; - meta = { - description = "SAX Driver for Expat"; - license = with lib.licenses; [ artistic1 gpl1Plus ]; - }; + pname = "XML-SAX-Expat"; + version = "0.51"; + src = fetchurl { + url = "mirror://cpan/authors/id/B/BJ/BJOERN/XML-SAX-Expat-0.51.tar.gz"; + sha256 = "0gy8h2bvvvlxychwsb99ikdh5cqpk6sqc073jk2b4zffs09n40ac"; + }; + propagatedBuildInputs = [ XMLParser XMLSAX ]; + # Avoid creating perllocal.pod, which contains a timestamp + installTargets = [ "pure_install" ]; + meta = { + description = "SAX Driver for Expat"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; }; XMLSAXWriter = buildPerlPackage { From bf3cb6dec22b6fdc399c519221ba962ad1502908 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jun 2022 06:40:17 +0000 Subject: [PATCH 044/814] networkmanagerapplet: 1.26.0 -> 1.28.0 --- pkgs/tools/networking/networkmanager/applet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index cca96577ad4c..0cdd01247653 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "network-manager-applet"; - version = "1.26.0"; + version = "1.28.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-aWEbKQZK29Vzlf4+Uanr3h6nlGFfd2kARTorvj2M3f0="; + sha256 = "sha256-XANIWB3p5hkYWqdLdH8H9AMSQX45Wv4LKTzJVd8U5Jw="; }; mesonFlags = [ From 276699cdacc78392b6cd474ace837aec8ed55b46 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Wed, 8 Jun 2022 08:43:17 -0400 Subject: [PATCH 045/814] xplr: 0.18.0 -> 0.19.0 --- .../doc/manual/from_md/release-notes/rl-2211.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ pkgs/applications/misc/xplr/default.nix | 8 ++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 5c29f98b28df..0df17c0de2cb 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -113,6 +113,14 @@
Other Notable Changes + + + The xplr package has been updated from + 0.18.0 to 0.19.0, which brings some breaking changes. See the + upstream + release notes for more details. + + A new module was added for the Saleae Logic device family, diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 624bde2c83d7..f4fd895c494f 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -50,6 +50,8 @@ In addition to numerous new and upgraded packages, this release has the followin ## Other Notable Changes {#sec-release-22.11-notable-changes} +- The `xplr` package has been updated from 0.18.0 to 0.19.0, which brings some breaking changes. See the [upstream release notes](https://github.com/sayanarijit/xplr/releases/tag/v0.19.0) for more details. + - A new module was added for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`. - Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation. diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index a2a6ae1f84b4..d24345389cab 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,23 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L9eJd1ivFhAmjKVm+HFq9fNiA/UA/x2akEfa1CrUSBo="; + sha256 = "sha256-rvqx0s56VozG8M0m3uZsHuugx0BXucSFqLbq0L1KhAM="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-niH8gj49Wr20Lpa6UAczQ+YHgJlkvZYKJGFH6Spk9Ho="; + cargoSha256 = "sha256-CyHkjXZVISkQJEQx5vNBGBf6zZrVv/cLWIYeOq9Ac5k="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; homepage = "https://xplr.dev"; license = licenses.mit; - maintainers = with maintainers; [ sayanarijit suryasr007 ]; + maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g ]; }; } From 9b2005751229d7698a95211ce55bf72eecfa2df3 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Wed, 8 Jun 2022 15:24:33 +0200 Subject: [PATCH 046/814] prometheus: 2.35.0 -> 2.36.0 Signed-off-by: Julien Pivotto --- pkgs/servers/monitoring/prometheus/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 4b79103d7d50..84415e52ed89 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -13,6 +13,7 @@ , enableEureka ? true , enableGCE ? true , enableHetzner ? true +, enableIONOS ? true , enableKubernetes ? true , enableLinode ? true , enableMarathon ? true @@ -22,15 +23,16 @@ , enableScaleway ? true , enableTriton ? true , enableUyuni ? true +, enableVultr ? true , enableXDS ? true , enableZookeeper ? true }: let - version = "2.35.0"; + version = "2.36.0"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - sha256 = "sha256-66zWOjFTYwmspiKeklt3NAAT1uJJrZqeyQvWWsCN9fQ="; + sha256 = "sha256-C+Np2mqAYQ1RUqYmql0eudPD/SpWmxdMQLe85SenIA4="; }; in buildGoModule rec { @@ -41,10 +43,10 @@ buildGoModule rec { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "sha256-h0uBs3xMKpRH3A1VG5xrhjXVAT7GL5L3UZWb3HJ2Fz4="; + sha256 = "sha256-FJXNCGIVj1OVWXwbXY6k65lXJCe1MqiqK7tw8nGWrEg="; }; - vendorSha256 = "sha256-0I6hmjhdfB41rWOQ9FM9CMq5w5437ka/jLuFXcBQBlM="; + vendorSha256 = "sha256-kmAQGRFmGRJ3LuGLMcSc0bJuwMsKhYVUIqQ9vDSH0Cc="; excludedPackages = [ "documentation/prometheus-mixin" ]; @@ -70,6 +72,8 @@ buildGoModule rec { "echo - github.com/prometheus/prometheus/discovery/gce"} ${lib.optionalString (enableHetzner) "echo - github.com/prometheus/prometheus/discovery/hetzner"} + ${lib.optionalString (enableIONOS) + "echo - github.com/prometheus/prometheus/discovery/ionos"} ${lib.optionalString (enableKubernetes) "echo - github.com/prometheus/prometheus/discovery/kubernetes"} ${lib.optionalString (enableLinode) @@ -88,6 +92,8 @@ buildGoModule rec { "echo - github.com/prometheus/prometheus/discovery/triton"} ${lib.optionalString (enableUyuni) "echo - github.com/prometheus/prometheus/discovery/uyuni"} + ${lib.optionalString (enableVultr) + "echo - github.com/prometheus/prometheus/discovery/vultr"} ${lib.optionalString (enableXDS) "echo - github.com/prometheus/prometheus/discovery/xds"} ${lib.optionalString (enableZookeeper) From 46c025be1514723c8d477db8e45c7f3403500603 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Wed, 8 Jun 2022 21:16:43 +0200 Subject: [PATCH 047/814] olm: 3.2.11 -> 3.2.12 https://gitlab.matrix.org/matrix-org/olm/-/releases/3.2.12 This version bump introduces Python code which is no longer compatible with Python 2 in [0]. Thus, python-olm was limited to Python 3. [0] https://gitlab.matrix.org/matrix-org/olm/-/commit/86a3d958551ff4d170cf70c7dd85db1b2d6ebd01 --- pkgs/development/libraries/olm/default.nix | 4 ++-- pkgs/development/python-modules/python-olm/default.nix | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 21f5a83073fe..47a265687122 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.2.11"; + version = "3.2.12"; src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = pname; rev = version; - sha256 = "sha256-/ozMvcHDhYruhzp8xfskKOYCbe/vS4pEOPn1+1Pb+Q0="; + sha256 = "sha256-EvqQvg7khsJ2OrcoHBImd9fTgjA65pVRqbJuMV5MG80="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/python-modules/python-olm/default.nix b/pkgs/development/python-modules/python-olm/default.nix index d38c33df8c81..f430517be759 100644 --- a/pkgs/development/python-modules/python-olm/default.nix +++ b/pkgs/development/python-modules/python-olm/default.nix @@ -5,6 +5,8 @@ buildPythonPackage { pname = "python-olm"; inherit (olm) src version; + disabled = !isPy3k; + sourceRoot = "source/python"; buildInputs = [ olm ]; @@ -15,7 +17,8 @@ buildPythonPackage { propagatedBuildInputs = [ cffi future - ] ++ lib.optionals (!isPy3k) [ typing ]; + typing + ]; propagatedNativeBuildInputs = [ cffi From e8ce74879d88a35caa83a1a76b3f232bf777c60d Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sun, 5 Jun 2022 01:04:18 -0400 Subject: [PATCH 048/814] packwiz: unstable-2022-05-25 -> unstable-2022-06-08 --- pkgs/tools/games/minecraft/packwiz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/games/minecraft/packwiz/default.nix b/pkgs/tools/games/minecraft/packwiz/default.nix index 3be2798312e7..80feced2b701 100644 --- a/pkgs/tools/games/minecraft/packwiz/default.nix +++ b/pkgs/tools/games/minecraft/packwiz/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "packwiz"; - version = "unstable-2022-5-25"; + version = "unstable-2022-06-08"; src = fetchFromGitHub { owner = "packwiz"; repo = "packwiz"; - rev = "e71b63ea98283c8c1f0e03ee51ae40f452f22a61"; - sha256 = "sha256-XwGacEVfQAduDCSMQFRw7Xnx4bND2zaV7l27B+2u5xg="; + rev = "d051932bbbeb7b16cd21a1897019428e71f63bfd"; + sha256 = "sha256-H1v5pY9hJYGP0ZiE/GrsATf1ljw69085t6PQhPOfYCs="; }; vendorSha256 = "sha256-M9u7N4IrL0B4pPRQwQG5TlMaGT++w3ZKHZ0RdxEHPKk="; From a12e52541099e5239d645018daf26a02cc60dd5d Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 9 Jun 2022 21:05:16 +0200 Subject: [PATCH 049/814] nixos/bitlbee: allow writing to configDir --- nixos/modules/services/networking/bitlbee.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index 8bf04e3a1a23..f76cffc79bfa 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -174,6 +174,7 @@ in serviceConfig = { DynamicUser = true; StateDirectory = "bitlbee"; + ReadWritePaths = [ cfg.configDir ]; ExecStart = "${bitlbeePkg}/sbin/bitlbee -F -n -c ${bitlbeeConfig}"; }; }; From d4f419a1103d0e7ac31b19c8a9dd58f9bf9456f9 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Thu, 9 Jun 2022 19:11:56 -0500 Subject: [PATCH 050/814] maintainers: add devusb --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a28165c3e298..908d7bfb8d1b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3105,6 +3105,12 @@ githubId = 17111639; name = "Devin Singh"; }; + devusb = { + email = "mhelton@devusb.us"; + github = "devusb"; + githubId = 4951663; + name = "Morgan Helton"; + }; dezgeg = { email = "tuomas.tynkkynen@iki.fi"; github = "dezgeg"; From 8a56b32c663b4ff55f95bd2d9f965f6741532cf2 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Thu, 9 Jun 2022 19:16:13 -0500 Subject: [PATCH 051/814] aws-sso-cli: init at 1.9.2 --- pkgs/tools/admin/aws-sso-cli/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/admin/aws-sso-cli/default.nix diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix new file mode 100644 index 000000000000..96ee8959dba8 --- /dev/null +++ b/pkgs/tools/admin/aws-sso-cli/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule, fetchFromGitHub, lib }: + buildGoModule rec { + pname = "aws-sso-cli"; + version = "1.9.2"; + + src = fetchFromGitHub { + owner = "synfinatic"; + repo = pname; + rev = "v${version}"; + sha256 = "9/dZfRmFAyE5NEMmuiVsRvwgqQrTNhXkTR9N0d3zgfk="; + }; + vendorSha256 = "BlSCLvlrKiubMtfFSZ5ppMmL2ZhJcBXxJfeRgMADYB4="; + + postInstall = '' + mv $out/bin/cmd $out/bin/aws-sso + ''; + + meta = with lib; { + homepage = "https://github.com/synfinatic/aws-sso-cli"; + description = "AWS SSO CLI is a secure replacement for using the aws configure sso wizard"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ devusb ]; + mainProgram = "aws-sso"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2c3b14d2811..1047a1add010 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1886,6 +1886,8 @@ with pkgs; aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; + aws-sso-cli = callPackage ../tools/admin/aws-sso-cli { }; + aws-vault = callPackage ../tools/admin/aws-vault { }; aws-workspaces = callPackage ../applications/networking/remote/aws-workspaces { }; From 6080c1e20b258783afe6990ad96e6a66bbcd5a00 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 10 Jun 2022 13:38:35 +0300 Subject: [PATCH 052/814] =?UTF-8?q?josm:=2018427=20=E2=86=92=2018463?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/josm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 67807887ec61..d35a526dfdb3 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18427"; + version = "18463"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-SsoeKfpWi41sd77LfaQW0OcHnyf8iLolKWF74dhalpY="; + sha256 = "sha256-++8XtzAykJ+85Kvzy3xgaZoKaVlJwz+Ct1xb/QkC1Gc="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - sha256 = "sha256-cz3OT03StvJy9XYBiPxx+nz36O0cg+XrL/uc52/G/1c="; + sha256 = "sha256-n7GlUWYOAXw4G59SBsO8HZ1OaiUWwzOsiURPFBYq31E="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; From 2300d8312dc1b9d9bb2d7ad2f8007b3ca69f71c1 Mon Sep 17 00:00:00 2001 From: yuu Date: Fri, 10 Jun 2022 08:17:12 -0300 Subject: [PATCH 053/814] .gitignore: prepend slash to result and source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit so that it matches only in the repository root. Co-authored-by: Sandro Jäckel Co-authored-by: Milan Hauth --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1411ef7e1c7c..3bd5fe66df49 100644 --- a/.gitignore +++ b/.gitignore @@ -5,13 +5,13 @@ .idea/ .vscode/ outputs/ -result result-* -source/ /doc/NEWS.html /doc/NEWS.txt /doc/manual.html /doc/manual.pdf +/result +/source/ .version-suffix .DS_Store From 24ff314c9be729068ff1e0368bf2719325c7daf1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 6 Jan 2022 18:55:53 +0800 Subject: [PATCH 054/814] appimagekit: set TOOLS_PREFIX to fix cross compilation --- pkgs/tools/package-management/appimagekit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index 3118b784334b..151566ba8e8e 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -96,6 +96,7 @@ in stdenv.mkDerivation rec { "-DUSE_SYSTEM_LIBARCHIVE=ON" "-DUSE_SYSTEM_GTEST=ON" "-DUSE_SYSTEM_MKSQUASHFS=ON" + "-DTOOLS_PREFIX=${stdenv.cc.targetPrefix}" ]; postInstall = '' From 04a5460f05815736fb9bfe53332eb218453cbe9d Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 9 May 2022 22:08:55 +0200 Subject: [PATCH 055/814] ipfs-cluster: 1.0.0 -> 1.0.1 https://github.com/ipfs/ipfs-cluster/releases/tag/v1.0.1 --- pkgs/applications/networking/ipfs-cluster/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 85ad97f41b0b..459610feea74 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "1.0.0"; + version = "1.0.1"; - vendorSha256 = "sha256-b0k1V1+JikGemSQjyiKcH7cgyDEt0Nn5aVUf6nnE+/0="; + vendorSha256 = "sha256-V+fqyrol+hXjjaCBlAs6f7FeqBqa2jTmMO2bvb6HfgY="; src = fetchFromGitHub { owner = "ipfs"; repo = "ipfs-cluster"; rev = "v${version}"; - sha256 = "sha256-vwu+Fj7PegbK9pmnsNuEl/AQz2gejRiFAAAov5+VNMQ="; + sha256 = "sha256-dwV5fx52QS2QiBUV8gkJ47tBqT54tEOfSpdXF6hmeLQ="; }; meta = with lib; { From c8f918e0ef6b4fba6f1d311ae96349c7c0c2d7ab Mon Sep 17 00:00:00 2001 From: Julien Langlois Date: Sat, 11 Jun 2022 01:11:27 -0400 Subject: [PATCH 056/814] keybase: 5.9.3 -> 6.0.2 https://github.com/keybase/client/releases/tag/v6.0.2 --- pkgs/tools/security/keybase/default.nix | 6 +++--- pkgs/tools/security/keybase/gui.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 1f53dc2a8aec..afc2eadb63fc 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "keybase"; - version = "5.9.3"; + version = "6.0.2"; modRoot = "go"; subPackages = [ "kbnm" "keybase" ]; @@ -16,9 +16,9 @@ buildGoModule rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "sha256-vPQ1hBd33DwsW0b79kNH1yd7mrwkoftIYFgmMVxC+78="; + sha256 = "sha256-JiYufEsoj/98An2qKdm/Uu4YHJr6ttc/VHn4kMgkuwI="; }; - vendorSha256 = "sha256-ckAnSSSEF00gbgxnPAi2Pi8TNu3nmAahK7TP6HnfmNo="; + vendorSha256 = "sha256-D8b/pvmBGCnaRuf92FYgRcSSbN59Yu0CHKxAybdYjS4="; patches = [ (substituteAll { diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index f5147e17ac5e..c9269f5415a5 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20220216215910.c82d65a685"; + versionSuffix = "20220610191041.a459abf326"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.9.3"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "6.0.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - hash = "sha256-JY2DaqApv6K02y3B+JIXpV4SvvMQpBhw9eqr/5Sn0cg="; + hash = "sha256-FMhbMSuJHq5d5E0dTVAk02y85UXmhtKZYk4qcbnhRxI="; }; nativeBuildInputs = [ From 0045581c231ae96ccc1b14c62c465c8aafe6eb8d Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 10 Jun 2022 22:14:59 +0200 Subject: [PATCH 057/814] boinc: 7.18.1 -> 7.20.0 https://github.com/BOINC/boinc/releases/tag/client_release%2F7.20%2F7.20.0 --- pkgs/applications/science/misc/boinc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index d0955a4d70c4..702dd3242e64 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -3,8 +3,8 @@ libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: let - majorVersion = "7.18"; - minorVersion = "1"; + majorVersion = "7.20"; + minorVersion = "0"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "BOINC"; repo = "boinc"; rev = "client_release/${majorVersion}/${version}"; - sha256 = "sha256-ijkfWTFwwJXvh6f0P5hkzWODxU+Ugz6iQUK+5jEpWXQ="; + sha256 = "sha256-W8+ALVO2OHxxBi80ZFgc8RxXneGINCHYNeMXimp9TIw="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; From c078673f07aa272309bb6d26902c5d92d25be8eb Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sat, 11 Jun 2022 15:52:57 +0300 Subject: [PATCH 058/814] hyperledger-fabric: 1.3.0 -> 2.4.3 --- .../tools/misc/hyperledger-fabric/default.nix | 60 ++++++++++++------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix index c2c48bfa7d80..ba3c9495a43f 100644 --- a/pkgs/tools/misc/hyperledger-fabric/default.nix +++ b/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -1,35 +1,55 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "hyperledger-fabric"; - version = "1.3.0"; - - goPackagePath = "github.com/hyperledger/fabric"; - - # taken from https://github.com/hyperledger/fabric/blob/v1.3.0/Makefile#L108 - subPackages = [ - "common/tools/configtxgen" - "common/tools/configtxlator" - "common/tools/cryptogen" - "common/tools/idemixgen" - "cmd/discover" - "peer" - "orderer" - ]; + version = "2.4.3"; + commit = "9711fb5d0c16297584f5c53123f589110828736f"; src = fetchFromGitHub { owner = "hyperledger"; repo = "fabric"; rev = "v${version}"; - sha256 = "08qrrxzgkqg9v7n3y8f2vggyqx9j65wisxi17hrabz5mzaq299xs"; + sha256 = "sha256-gXVahzpuIUWAHq4gJ1rbq943zIuWrl/ojDMQDFfI14I="; }; - doCheck = true; + vendorSha256 = null; + + postPatch = '' + # Broken + rm cmd/peer/main_test.go + ''; + + subPackages = [ + "cmd/configtxgen" + "cmd/configtxlator" + "cmd/cryptogen" + "cmd/discover" + "cmd/ledgerutil" + "cmd/orderer" + "cmd/osnadmin" + "cmd/peer" + ]; + + ldflags = lib.mapAttrsToList + (n: v: "github.com/hyperledger/fabric/common/metadata.${n}=${v}") { + Version = version; + CommitSha = commit; + }; meta = with lib; { - description = "An implementation of blockchain technology, leveraging familiar and proven technologies"; + description = "High-performance, secure, permissioned blockchain network"; + longDescription = '' + Hyperledger Fabric is an enterprise-grade permissioned distributed ledger + framework for developing solutions and applications. Its modular and + versatile design satisfies a broad range of industry use cases. It offers + a unique approach to consensus that enables performance at scale while + preserving privacy. + ''; homepage = "https://wiki.hyperledger.org/display/fabric"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } From 6be823dd77ecd67bc335c272b6892bb5d7e24d7b Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sat, 11 Jun 2022 17:41:36 +0200 Subject: [PATCH 059/814] youtube-dl: fallback to throttled downloads instead of aborting --- pkgs/tools/misc/youtube-dl/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index faf4b558ad64..4d907094653b 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -25,8 +25,8 @@ buildPythonPackage rec { }; patches = [ - # Fixes throttling on youtube.com. Without the patch downloads are capped at - # about 80KiB/s. See, e.g., + # Fixes throttling on youtube.com by decoding a "n-parameter". Without the patch + # downloads are capped at about 80KiB/s. See, e.g., # # https://github.com/ytdl-org/youtube-dl/issues/29326 # @@ -37,6 +37,20 @@ buildPythonPackage rec { url = "https://github.com/ytdl-org/youtube-dl/compare/57044eacebc6f2f3cd83c345e1b6e659a22e4773...1e677567cd083d43f55daef0cc74e5fa24575ae3.diff"; sha256 = "11s0j3w60r75xx20p0x2j3yc4d3yvz99r0572si8b5qd93lqs4pr"; }) + # The above patch may fail to decode the n-parameter (if, say, YouTube is updated). Failure to decode + # it blocks the download instead of falling back to the throttled version. The patch below implements + # better fallback behaviour. + (fetchpatch { + name = "avoid-crashing-if-nsig-decode-fails.patch"; + url = "https://github.com/ytdl-org/youtube-dl/commit/41f0043983c831b7c0c3614340d2f66ec153087b.diff"; + sha256 = "sha256-a72gWhBXCLjuBBD36PpZ5F/AHBdiBv4W8Wf9g4P/aBY="; + }) + # YouTube changed the n-parameter format in April 2022, so decoder updates are required. + (fetchpatch { + name = "fix-n-descrambling.patch"; + url = "https://github.com/ytdl-org/youtube-dl/commit/a0068bd6bec16008bda7a39caecccbf84881c603.diff"; + sha256 = "sha256-tSuEns4jputa2nOOo6JsFXpK3hvJ/+z1/ymcLsd3A6w="; + }) ]; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 6095bc6eb2d3ee94f804d8f6385afe43757dbb77 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 11 Jun 2022 15:30:38 +0100 Subject: [PATCH 060/814] appimageTools.wrapAppImage: default produced derivations to sourceProvenance binaryNativeCode --- pkgs/build-support/appimage/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index d41ceba37c17..17d5bca65669 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -37,7 +37,13 @@ rec { extractType2 = extract; wrapType1 = wrapType2; - wrapAppImage = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs, ... }: buildFHSUserEnv + wrapAppImage = args@{ + name ? "${args.pname}-${args.version}", + src, + extraPkgs, + meta ? {}, + ... + }: buildFHSUserEnv (defaultFhsEnvArgs // { inherit name; @@ -45,6 +51,10 @@ rec { ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; runScript = "appimage-exec.sh -w ${src} --"; + + meta = { + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + } // meta; } // (removeAttrs args ([ "pname" "version" ] ++ (builtins.attrNames (builtins.functionArgs wrapAppImage))))); wrapType2 = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage From 4c05d15a08b4a600743287b742d3a88f256fdc5b Mon Sep 17 00:00:00 2001 From: papojari Date: Sat, 11 Jun 2022 21:02:49 +0200 Subject: [PATCH 061/814] colorpanes: init at 3.0.1 --- pkgs/tools/misc/colorpanes/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/misc/colorpanes/default.nix diff --git a/pkgs/tools/misc/colorpanes/default.nix b/pkgs/tools/misc/colorpanes/default.nix new file mode 100644 index 000000000000..7028232c367d --- /dev/null +++ b/pkgs/tools/misc/colorpanes/default.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchFromGitea }: + +rustPlatform.buildRustPackage rec { + pname = "colorpanes"; + version = "3.0.1"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "papojari"; + repo = pname; + rev = "v${version}"; + sha256 = "qaOH+LXNDq+utwyI1yzHWNt25AvdAXCTAziGV9ElroU="; + }; + + cargoSha256 = "eJne4OmV4xHxntTb8HE+2ghX1hZLE3WQ3QqsjVm9E4M="; + + postInstall = '' + ln -s $out/bin/colp $out/bin/colorpanes + ''; + + meta = with lib; { + description = "Panes in the 8 bright terminal colors with shadows of the respective darker color"; + homepage = "https://codeberg.org/papojari/colorpanes"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ papojari ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27e1d6058a54..7db7a65fddda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -348,6 +348,8 @@ with pkgs; colorz = callPackage ../tools/misc/colorz { }; + colorpanes = callPackage ../tools/misc/colorpanes { }; + colorpicker = callPackage ../tools/misc/colorpicker { }; comedilib = callPackage ../development/libraries/comedilib { }; From 5ed4944130468764f705fcc600bea923223252ec Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 2 May 2022 02:51:11 -0700 Subject: [PATCH 062/814] fetchgit: allow passing allowedRequisites through to stdenv.mkDerivation When maintainers override stages of `fetchgit' (e.g. `postPatch`) it is very easy for them to accidentally leak the outpath-hash of their current `stdenv` into `fetchgit''s output, and therefore into the value they paste into `sha256`. This is a problem, because the resulting expression will break whenever any change is made to `stdenv` or when anybody attempts to build the expression on a different platform than the one used by the original maintainer. Almost as much of a problem is the fact that CI **does not catch** these problems. The `fetchgit` is run only once, then its output goes into cachix, and all future builds (hydra, CI, ofborg) pull from cachix. Let's offer maintainers the option to check that they aren't making this mistake, by passing through `allowedRequisites`. The default value is `null`, but it might be worth changing that at some point in the future. It is also sometimes difficult to communicate to package maintainers why their expression is problematic. Having `allowedRequisites` passed through makes it easier to do this: "look, when I switch on `allowedRequisites` your package breaks; are you sure you meant to hardcode the hash today's `x86_64-linux.stdenv` into your expression?` For an example use case, see https://github.com/NixOS/nixpkgs/pull/171223 The issue above is part of a larger problem with nixpkgs infra: there large parts of cachix cannot be reproduced easily if they are lost. Once something ends goes into cachix, we never ever again reverify the procedure by which it was placed into cachix. --- pkgs/build-support/fetchgit/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 2ae1714e4af0..84f2278db299 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -28,6 +28,7 @@ in # needed for netrcPhase netrcImpureEnvVars ? [] , meta ? {} +, allowedRequisites ? null }: /* NOTE: @@ -91,7 +92,8 @@ stdenvNoCC.mkDerivation { "GIT_PROXY_COMMAND" "NIX_GIT_SSL_CAINFO" "SOCKS_SERVER" ]; - inherit preferLocalBuild meta; + + inherit preferLocalBuild meta allowedRequisites; passthru = { gitRepoUrl = url; From 515b36c0939b2fd96072eef7e58722900218897b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Jun 2022 19:56:12 +0200 Subject: [PATCH 063/814] nixos/i18n: don't build all supportedLocales by default --- .../manual/from_md/release-notes/rl-2211.section.xml | 10 ++++++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 4 ++++ nixos/modules/config/i18n.nix | 3 ++- nixos/modules/profiles/minimal.nix | 3 --- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 5219c1329e36..a00cb34b9c49 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -93,6 +93,16 @@ compatible. + + + i18n.supportedLocales is now by default + only generated with the default locale set in + i18n.defaultLocale. This got copied over + from the minimal profile and reduces the final system size by + 200MB. If you require all locales installed set the option to + [ "all" ]. + + The isPowerPC predicate, found on diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 0f04eff7c045..244c6f0901f8 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -43,6 +43,10 @@ In addition to numerous new and upgraded packages, this release has the followin `lib.systems.parse.isCompatible` still exists, but has changed semantically: Architectures with differing endianness modes are *no longer considered compatible*. +- `i18n.supportedLocales` is now by default only generated with the default locale set in `i18n.defaultLocale`. + This got copied over from the minimal profile and reduces the final system size by 200MB. + If you require all locales installed set the option to ``[ "all" ]``. + - The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`. - PHP 7.4 is no longer supported due to upstream not supporting this diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 5b8d5b214496..53dd325457e0 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -53,7 +53,8 @@ with lib; supportedLocales = mkOption { type = types.listOf types.str; - default = ["all"]; + default = [ (config.i18n.defaultLocale + "/UTF-8") ]; + defaultText = literalExpression "[ (config.i18n.defaultLocale + \"/UTF-8\") ]"; example = ["en_US.UTF-8/UTF-8" "nl_NL.UTF-8/UTF-8" "nl_NL/ISO-8859-1"]; description = '' List of locales that the system should support. The value diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index e79b92723841..0e65989214a1 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -8,9 +8,6 @@ with lib; { environment.noXlibs = mkDefault true; - # This isn't perfect, but let's expect the user specifies an UTF-8 defaultLocale - i18n.supportedLocales = [ (config.i18n.defaultLocale + "/UTF-8") ]; - documentation.enable = mkDefault false; documentation.nixos.enable = mkDefault false; From ae2cdd7ca482f1039349ab799a5aa8c2e6279ad0 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 02:19:46 +0300 Subject: [PATCH 064/814] brig: use buildGoModule --- pkgs/applications/networking/brig/default.nix | 52 +++++++++++++++---- 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix index 20b685a162fe..d049ed4e3893 100644 --- a/pkgs/applications/networking/brig/default.nix +++ b/pkgs/applications/networking/brig/default.nix @@ -1,25 +1,57 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: -buildGoPackage rec { +buildGoModule rec { pname = "brig"; version = "0.4.1"; - rev = "v${version}"; - - goPackagePath = "github.com/sahib/brig"; - subPackages = ["."]; src = fetchFromGitHub { owner = "sahib"; repo = "brig"; - inherit rev; + rev = "v${version}"; sha256 = "0gi39jmnzqrgj146yw8lcmgmvzx7ii1dgw4iqig7kx8c0jiqi600"; }; + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ "." ]; + + ldflags = [ "-s" "-w" ] ++ (with lib; + mapAttrsToList (n: v: "-X github.com/sahib/brig/version.${n}=${v}") + (with versions; { + Major = major version; + Minor = minor version; + Patch = patch version; + ReleaseType = ""; + BuildTime = "1970-01-01T00:00:00+0000"; + GitRev = src.rev; + })); + + postInstall = '' + installShellCompletion --cmd brig \ + --bash $src/autocomplete/bash_autocomplete \ + --zsh $src/autocomplete/zsh_autocomplete + ''; + + # There are no tests for the brig executable. + doCheck = false; + meta = with lib; { - description = "File synchronization on top of ipfs with git like interface and FUSE filesystem"; - homepage = "https://github.com/sahib/brig"; + description = "File synchronization on top of IPFS with a git-like interface and a FUSE filesystem"; + longDescription = '' + brig is a distributed and secure file synchronization tool with a version + control system. It is based on IPFS, written in Go and will feel familiar + to git users. Think of it as a swiss army knife for file synchronization + or as a peer to peer alternative to Dropbox. + ''; + homepage = "https://brig.readthedocs.io"; + changelog = "https://github.com/sahib/brig/releases/tag/${src.rev}"; license = licenses.agpl3; - platforms = platforms.unix; maintainers = with maintainers; [ offline ]; }; } From 08f841f03d45c9858789940ec9267cfc1df5f828 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 02:26:59 +0300 Subject: [PATCH 065/814] asmfmt: use buildGoModule --- pkgs/development/tools/asmfmt/default.nix | 21 ++++++++++++++------- pkgs/development/tools/asmfmt/deps.nix | 20 -------------------- 2 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 pkgs/development/tools/asmfmt/deps.nix diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix index 81f7aa764f27..953a5469ec51 100644 --- a/pkgs/development/tools/asmfmt/default.nix +++ b/pkgs/development/tools/asmfmt/default.nix @@ -1,14 +1,12 @@ -{ buildGoPackage +{ buildGoModule , lib , fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "asmfmt"; version = "1.3.2"; - goPackagePath = "github.com/klauspost/asmfmt"; - src = fetchFromGitHub { owner = "klauspost"; repo = "asmfmt"; @@ -16,17 +14,26 @@ buildGoPackage rec { sha256 = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; # This package comes with its own version of goimports, gofmt and goreturns # but these binaries are outdated and are offered by other packages. subPackages = [ "cmd/asmfmt" ]; + ldflags = [ "-s" "-w" ]; + + # There are no tests. + doCheck = false; + meta = with lib; { - description = "Go Assembler Formatter"; + description = "Go assembler formatter"; + longDescription = '' + This will format your assembler code in a similar way that gofmt formats + your Go code. + ''; homepage = "https://github.com/klauspost/asmfmt"; + changelog = "https://github.com/klauspost/asmfmt/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/asmfmt/deps.nix b/pkgs/development/tools/asmfmt/deps.nix deleted file mode 100644 index 0288fc206d49..000000000000 --- a/pkgs/development/tools/asmfmt/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "3a10b9bf0a52df7e992a8c3eb712a86d3c896c75"; - sha256 = "19f3dijcc54jnd7458jab2dgpd0gzccmv2qympd9wi8cc8jpnhws"; - }; - } - { - goPackagePath = "sourcegraph.com/sqs/goreturns"; - fetch = { - type = "git"; - url = "https://github.com/sqs/goreturns"; - rev = "538ac601451833c7c4449f8431d65d53c1c60e41"; - sha256 = "0gcplch8zmcgwl6xvcffxg50g3xnf60n7dlqxgn51179qcjr354p"; - }; - } -] From e90ede62f2fce749887f980fd2a99cff6e7e6ce7 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 02:30:28 +0300 Subject: [PATCH 066/814] go-check: 2018-09-12 -> unstable-2018-12-24 --- pkgs/development/tools/check/default.nix | 22 +++++++++------------- pkgs/development/tools/check/deps.nix | 11 ----------- 2 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 pkgs/development/tools/check/deps.nix diff --git a/pkgs/development/tools/check/default.nix b/pkgs/development/tools/check/default.nix index a28124828f90..f74578e25a0d 100644 --- a/pkgs/development/tools/check/default.nix +++ b/pkgs/development/tools/check/default.nix @@ -1,30 +1,26 @@ -{ buildGoPackage -, lib +{ lib +, buildGoModule , fetchFromGitLab }: -buildGoPackage rec { - pname = "check-unstable"; - version = "2018-09-12"; - rev = "88db195993f8e991ad402754accd0635490769f9"; - - goPackagePath = "gitlab.com/opennota/check"; +buildGoModule rec { + pname = "check"; + version = "unstable-2018-12-24"; + rev = "ccaba434e62accd51209476ad093810bd27ec150"; src = fetchFromGitLab { - inherit rev; - owner = "opennota"; repo = "check"; - sha256 = "1983xmdkgpqda4qz8ashc6xv1zg5jl4zly3w566grxc5sfxpgf0i"; + inherit rev; + sha256 = "sha256-u8U/62LZEn1ffwdGsUCGam4HAk7b2LetomCLZzHuuas="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-DyysiVYFpncmyCzlHIOEtWlCMpm90AC3gdItI9WinSo="; meta = with lib; { description = "A set of utilities for checking Go sources"; homepage = "https://gitlab.com/opennota/check"; license = licenses.gpl3; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/check/deps.nix b/pkgs/development/tools/check/deps.nix deleted file mode 100644 index b9c50d95d117..000000000000 --- a/pkgs/development/tools/check/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "677d2ff680c1"; - sha256 = "0vp1w1haqcjd82dxd6x9xrllbfwvm957rxwkpji96cgvhsli2bq5"; - }; - } -] From 7f0406a183c11e0c9ecf529627b13d3abb47893d Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 02:46:39 +0300 Subject: [PATCH 067/814] ineffassign: 2018-09-09 -> unstable-2021-09-04 --- .../development/tools/ineffassign/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix index 111048b562f3..16e392b6bbc4 100644 --- a/pkgs/development/tools/ineffassign/default.nix +++ b/pkgs/development/tools/ineffassign/default.nix @@ -1,28 +1,31 @@ -{ buildGoPackage -, lib +{ lib +, buildGoModule , fetchFromGitHub +, go }: -buildGoPackage rec { - pname = "ineffassign-unstable"; - version = "2018-09-09"; - rev = "1003c8bd00dc2869cb5ca5282e6ce33834fed514"; - - goPackagePath = "github.com/gordonklaus/ineffassign"; +buildGoModule rec { + pname = "ineffassign"; + version = "unstable-2021-09-04"; + rev = "4cc7213b9bc8b868b2990c372f6fa057fa88b91c"; src = fetchFromGitHub { - inherit rev; - owner = "gordonklaus"; repo = "ineffassign"; - sha256 = "1rkzqvd3z03vq8q8qi9cghvgggsf02ammj9wq8jvpnx6b2sd16nd"; + inherit rev; + sha256 = "sha256-XLXANN9TOmrNOixWtlqnIC27u+0TW2P3s9MyeyVUcAQ="; }; + vendorSha256 = "sha256-QTgWicN2m2ughtLsEBMaQWfpDbmbL0nS5qaIKF3mTJM="; + + allowGoReference = true; + + checkInputs = [ go ]; + meta = with lib; { description = "Detect ineffectual assignments in Go code"; homepage = "https://github.com/gordonklaus/ineffassign"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } From 9a373323142ad35737ab74fa7b29d4fa6ccf0542 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 02:51:34 +0300 Subject: [PATCH 068/814] maligned: 2018-07-07 -> unstable-2022-02-04 --- pkgs/development/tools/maligned/default.nix | 27 +++++++++++---------- pkgs/development/tools/maligned/deps.nix | 20 --------------- 2 files changed, 14 insertions(+), 33 deletions(-) delete mode 100644 pkgs/development/tools/maligned/deps.nix diff --git a/pkgs/development/tools/maligned/default.nix b/pkgs/development/tools/maligned/default.nix index 06cd23e40f4b..f39b83489f99 100644 --- a/pkgs/development/tools/maligned/default.nix +++ b/pkgs/development/tools/maligned/default.nix @@ -1,30 +1,31 @@ -{ buildGoPackage -, lib +{ lib +, buildGoModule , fetchFromGitHub +, go }: -buildGoPackage rec { - pname = "maligned-unstable"; - version = "2018-07-07"; - rev = "6e39bd26a8c8b58c5a22129593044655a9e25959"; - - goPackagePath = "github.com/mdempsky/maligned"; +buildGoModule rec { + pname = "maligned"; + version = "unstable-2022-02-04"; + rev = "d7cd9a96ae47d02b08234503b54709ad4ae82105"; src = fetchFromGitHub { - inherit rev; - owner = "mdempsky"; repo = "maligned"; - sha256 = "08inr5xjqv9flrlyhqd8ck1q26y5xb6iilz0xkb6bqa4dl5ialhi"; + inherit rev; + sha256 = "sha256-exljmDNtVhjJkvh0EomcbBXSsmQx4I59MHDfMWSQyKk="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-q/0lxZWk3a7brMsbLvZUSZ8XUHfWfx79qxjir1Vygx4="; + + allowGoReference = true; + + checkInputs = [ go ]; meta = with lib; { description = "Tool to detect Go structs that would take less memory if their fields were sorted"; homepage = "https://github.com/mdempsky/maligned"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/tools/maligned/deps.nix b/pkgs/development/tools/maligned/deps.nix deleted file mode 100644 index afe5e50e47bd..000000000000 --- a/pkgs/development/tools/maligned/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "80517062f582ea3340cd4baf70e86d539ae7d84d"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "96e9e165b75e735822645eff82850b08c377be36"; - sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg"; - }; - } -] From f6281356b46526e11c47ed3240ed733fdac81e59 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 02:55:48 +0300 Subject: [PATCH 069/814] elfinfo: use buildGoModule --- pkgs/development/tools/misc/elfinfo/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index e3ee51c58fdc..b9a6dc0c39b4 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -1,20 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "elfinfo"; version = "1.1.0"; - goPackagePath = "github.com/xyproto/elfinfo"; src = fetchFromGitHub { - rev = version; owner = "xyproto"; repo = "elfinfo"; + rev = version; sha256 = "1n8bg0rcq9fqa6rdnk6x9ngvm59hcayblkpjv9j5myn2vmm6fv8m"; }; + vendorSha256 = null; + meta = with lib; { description = "Small utility for showing information about ELF files"; homepage = "https://elfinfo.roboticoverlords.org/"; + changelog = "https://github.com/xyproto/elfinfo/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; From 320aa2a7910a71371204d672ff612cc9af5337da Mon Sep 17 00:00:00 2001 From: pennae Date: Fri, 3 Jun 2022 21:47:57 +0200 Subject: [PATCH 070/814] treewide: attempt at markdown option docs --- .../docbook-writer/rst-roles.lua | 4 + .../contributing-to-documentation.chapter.md | 20 ++- lib/default.nix | 3 +- lib/options.nix | 15 ++ .../option-declarations.section.md | 9 +- .../option-declarations.section.xml | 12 +- nixos/lib/make-options-doc/default.nix | 18 ++- nixos/lib/make-options-doc/mergeJSON.py | 146 +++++++++++++++++- nixos/modules/config/console.nix | 4 +- nixos/modules/config/debug-info.nix | 19 ++- nixos/modules/misc/documentation.nix | 31 ++-- nixos/modules/misc/man-db.nix | 8 +- .../modules/security/systemd-confinement.nix | 11 +- nixos/modules/services/matrix/synapse.nix | 18 +-- .../modules/services/networking/mosquitto.nix | 40 ++--- .../modules/services/networking/syncthing.nix | 108 ++++++------- nixos/modules/virtualisation/xen-dom0.nix | 6 +- 17 files changed, 329 insertions(+), 143 deletions(-) diff --git a/doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua b/doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua index 92dc6895750f..1c745393a04b 100644 --- a/doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua +++ b/doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua @@ -27,6 +27,10 @@ function Code(elem) content = '' .. title .. '' .. (volnum ~= nil and ('' .. volnum .. '') or '') elseif elem.attributes['role'] == 'file' then tag = 'filename' + elseif elem.attributes['role'] == 'command' then + tag = 'command' + elseif elem.attributes['role'] == 'option' then + tag = 'option' end if tag ~= nil then diff --git a/doc/contributing/contributing-to-documentation.chapter.md b/doc/contributing/contributing-to-documentation.chapter.md index 1384772ebb2b..db16f13b474b 100644 --- a/doc/contributing/contributing-to-documentation.chapter.md +++ b/doc/contributing/contributing-to-documentation.chapter.md @@ -27,7 +27,7 @@ If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual. As per [RFC 0072](https://github.com/NixOS/rfcs/pull/72), all new documentation content should be written in [CommonMark](https://commonmark.org/) Markdown dialect. -Additionally, the following syntax extensions are currently used: +Additional syntax extensions are available, though not all extensions can be used in NixOS option documentation. The following extensions are currently used: - []{#ssec-contributing-markup-anchors} Explicitly defined **anchors** on headings, to allow linking to sections. These should be always used, to ensure the anchors can be linked even when the heading text changes, and to prevent conflicts between [automatically assigned identifiers](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/auto_identifiers.md). @@ -53,12 +53,22 @@ Additionally, the following syntax extensions are currently used: This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/using/syntax.html#targets-and-cross-referencing). - []{#ssec-contributing-markup-inline-roles} - If you want to link to a man page, you can use `` {manpage}`nix.conf(5)` ``, which will turn into {manpage}`nix.conf(5)`. + If you want to link to a man page, you can use `` {manpage}`nix.conf(5)` ``, which will turn into {manpage}`nix.conf(5)`. The references will turn into links when a mapping exists in {file}`doc/build-aux/pandoc-filters/link-unix-man-references.lua`. - The references will turn into links when a mapping exists in {file}`doc/build-aux/pandoc-filters/link-unix-man-references.lua`. + A few markups for other kinds of literals are also available: + + - `` {command}`rm -rfi` `` turns into {command}`rm -rfi` + - `` {option}`networking.useDHCP` `` turns into {option}`networking.useDHCP` + - `` {file}`/etc/passwd` `` turns into {file}`/etc/passwd` + + These literal kinds are used mostly in NixOS option documentation. This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point). Though, the feature originates from [reStructuredText](https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-manpage) with slightly different syntax. + ::: {.note} + Inline roles are available for option documentation. + ::: + - []{#ssec-contributing-markup-admonitions} **Admonitions**, set off from the text to bring attention to something. @@ -84,6 +94,10 @@ Additionally, the following syntax extensions are currently used: - [`tip`](https://tdg.docbook.org/tdg/5.0/tip.html) - [`warning`](https://tdg.docbook.org/tdg/5.0/warning.html) + ::: {.note} + Admonitions are available for option documentation. + ::: + - []{#ssec-contributing-markup-definition-lists} [**Definition lists**](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/definition_lists.md), for defining a group of terms: diff --git a/lib/default.nix b/lib/default.nix index a0d3339ef08e..070c2a67cf07 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -131,7 +131,8 @@ let getValues getFiles optionAttrSetToDocList optionAttrSetToDocList' scrubOptionValue literalExpression literalExample literalDocBook - showOption showFiles unknownModule mkOption mkPackageOption; + showOption showFiles unknownModule mkOption mkPackageOption + mdDoc literalMD; inherit (self.types) isType setType defaultTypeMerge defaultFunctor isOptionType mkOptionType; inherit (self.asserts) diff --git a/lib/options.nix b/lib/options.nix index 8d82a809083b..50b19e483736 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -280,6 +280,21 @@ rec { if ! isString text then throw "literalDocBook expects a string." else { _type = "literalDocBook"; inherit text; }; + /* Transition marker for documentation that's already migrated to markdown + syntax. + */ + mdDoc = text: + if ! isString text then throw "mdDoc expects a string." + else { _type = "mdDoc"; inherit text; }; + + /* For use in the `defaultText` and `example` option attributes. Causes the + given MD text to be inserted verbatim in the documentation, for when + a `literalExpression` would be too hard to read. + */ + literalMD = text: + if ! isString text then throw "literalMD expects a string." + else { _type = "literalMD"; inherit text; }; + # Helper functions. /* Convert an option, described as a list of the option parts in to a diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index ef7255557a10..79914f2cb6ca 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -56,7 +56,14 @@ The function `mkOption` accepts the following arguments. `description` : A textual description of the option, in DocBook format, that will be - included in the NixOS manual. + included in the NixOS manual. During the migration process from DocBook + to CommonMark the description may also be written in CommonMark, but has + to be wrapped in `lib.mdDoc` to differentiate it from DocBook. See + the nixpkgs manual for [the list of CommonMark extensions]( + https://nixos.org/nixpkgs/manual/#sec-contributing-markup) + supported by NixOS documentation. + + New documentation should preferably be written as CommonMark. ## Utility functions for common option patterns {#sec-option-declarations-util} diff --git a/nixos/doc/manual/from_md/development/option-declarations.section.xml b/nixos/doc/manual/from_md/development/option-declarations.section.xml index 381163dd7c74..03ec48f35fd7 100644 --- a/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -94,7 +94,17 @@ options = { A textual description of the option, in DocBook format, that - will be included in the NixOS manual. + will be included in the NixOS manual. During the migration + process from DocBook to CommonMark the description may also be + written in CommonMark, but has to be wrapped in + lib.mdDoc to differentiate it from DocBook. + See the nixpkgs manual for + the + list of CommonMark extensions supported by NixOS + documentation. + + + New documentation should preferably be written as CommonMark. diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 3324ef7fcd6f..282b3e7397c4 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -112,7 +112,15 @@ in rec { optionsJSON = pkgs.runCommand "options.json" { meta.description = "List of NixOS options in JSON format"; - buildInputs = [ pkgs.brotli ]; + buildInputs = [ + pkgs.brotli + (let + self = (pkgs.python3Minimal.override { + inherit self; + includeSiteCustomize = true; + }); + in self.withPackages (p: [ p.mistune_2_0 ])) + ]; options = builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix)); } @@ -123,9 +131,13 @@ in rec { ${ if baseOptionsJSON == null - then "cp $options $dst/options.json" + then '' + # `cp $options $dst/options.json`, but with temporary + # markdown processing + python ${./mergeJSON.py} $options <(echo '{}') > $dst/options.json + '' else '' - ${pkgs.python3Minimal}/bin/python ${./mergeJSON.py} \ + python ${./mergeJSON.py} \ ${lib.optionalString warningsAreErrors "--warnings-are-errors"} \ ${baseOptionsJSON} $options \ > $dst/options.json diff --git a/nixos/lib/make-options-doc/mergeJSON.py b/nixos/lib/make-options-doc/mergeJSON.py index 44a188a08c99..9510b1e59a20 100644 --- a/nixos/lib/make-options-doc/mergeJSON.py +++ b/nixos/lib/make-options-doc/mergeJSON.py @@ -41,6 +41,150 @@ def unpivot(options: Dict[Key, Option]) -> Dict[str, JSON]: result[opt.name] = opt.value return result +# converts in-place! +def convertMD(options: Dict[str, Any]) -> str: + import mistune + import re + from xml.sax.saxutils import escape, quoteattr + + admonitions = { + '.warning': 'warning', + '.important': 'important', + '.note': 'note' + } + class Renderer(mistune.renderers.BaseRenderer): + def _get_method(self, name): + try: + return super(Renderer, self)._get_method(name) + except AttributeError: + def not_supported(children, **kwargs): + raise NotImplementedError("md node not supported yet", name, children, **kwargs) + return not_supported + + def text(self, text): + return escape(text) + def paragraph(self, text): + return text + "\n\n" + def codespan(self, text): + return f"{text}" + def block_code(self, text, info=None): + info = f" language={quoteattr(info)}" if info is not None else "" + return f"\n{text}" + def link(self, link, text=None, title=None): + if link[0:1] == '#': + attr = "linkend" + link = quoteattr(link[1:]) + else: + # try to faithfully reproduce links that were of the form + # in docbook format + if text == link: + text = "" + attr = "xlink:href" + link = quoteattr(link) + return f"{text}" + def list(self, text, ordered, level, start=None): + if ordered: + raise NotImplementedError("ordered lists not supported yet") + return f"\n{text}\n" + def list_item(self, text, level): + return f"{text}\n" + def block_text(self, text): + return text + def emphasis(self, text): + return f"{text}" + def strong(self, text): + return f"{text}" + def admonition(self, text, kind): + if kind not in admonitions: + raise NotImplementedError(f"admonition {kind} not supported yet") + tag = admonitions[kind] + # we don't keep whitespace here because usually we'll contain only + # a single paragraph and the original docbook string is no longer + # available to restore the trailer. + return f"<{tag}>{text.rstrip()}" + def command(self, text): + return f"{escape(text)}" + def option(self, text): + return f"" + def file(self, text): + return f"{escape(text)}" + def manpage(self, page, section): + title = f"{escape(page)}" + vol = f"{escape(section)}" + return f"{title}{vol}" + + def finalize(self, data): + return "".join(data) + + plugins = [] + + COMMAND_PATTERN = r'\{command\}`(.*?)`' + def command(md): + def parse(self, m, state): + return ('command', m.group(1)) + md.inline.register_rule('command', COMMAND_PATTERN, parse) + md.inline.rules.append('command') + plugins.append(command) + + FILE_PATTERN = r'\{file\}`(.*?)`' + def file(md): + def parse(self, m, state): + return ('file', m.group(1)) + md.inline.register_rule('file', FILE_PATTERN, parse) + md.inline.rules.append('file') + plugins.append(file) + + OPTION_PATTERN = r'\{option\}`(.*?)`' + def option(md): + def parse(self, m, state): + return ('option', m.group(1)) + md.inline.register_rule('option', OPTION_PATTERN, parse) + md.inline.rules.append('option') + plugins.append(option) + + MANPAGE_PATTERN = r'\{manpage\}`(.*?)\((.+?)\)`' + def manpage(md): + def parse(self, m, state): + return ('manpage', m.group(1), m.group(2)) + md.inline.register_rule('manpage', MANPAGE_PATTERN, parse) + md.inline.rules.append('manpage') + plugins.append(manpage) + + ADMONITION_PATTERN = re.compile(r'^::: \{([^\n]*?)\}\n(.*?)^:::\n', flags=re.MULTILINE|re.DOTALL) + def admonition(md): + def parse(self, m, state): + return { + 'type': 'admonition', + 'children': self.parse(m.group(2), state), + 'params': [ m.group(1) ], + } + md.block.register_rule('admonition', ADMONITION_PATTERN, parse) + md.block.rules.append('admonition') + plugins.append(admonition) + + def convertString(text: str) -> str: + rendered = mistune.markdown(text, renderer=Renderer(), plugins=plugins) + # keep trailing spaces so we can diff the generated XML to check for conversion bugs. + return rendered.rstrip() + text[len(text.rstrip()):] + + def optionIs(option: Dict[str, Any], key: str, typ: str) -> bool: + if key not in option: return False + if type(option[key]) != dict: return False + if '_type' not in option[key]: return False + return option[key]['_type'] == typ + + for (name, option) in options.items(): + if optionIs(option, 'description', 'mdDoc'): + option['description'] = convertString(option['description']['text']) + if optionIs(option, 'example', 'literalMD'): + docbook = convertString(option['example']['text']) + option['example'] = { '_type': 'literalDocBook', 'text': docbook } + if optionIs(option, 'default', 'literalMD'): + docbook = convertString(option['default']['text']) + option['default'] = { '_type': 'literalDocBook', 'text': docbook } + + return options + warningsAreErrors = sys.argv[1] == "--warnings-are-errors" optOffset = 1 if warningsAreErrors else 0 options = pivot(json.load(open(sys.argv[1 + optOffset], 'r'))) @@ -92,4 +236,4 @@ if hasWarnings and warningsAreErrors: file=sys.stderr) sys.exit(1) -json.dump(unpivot(options), fp=sys.stdout) +json.dump(convertMD(unpivot(options)), fp=sys.stdout) diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index b60fc55851da..97e6405db91e 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -46,9 +46,9 @@ in type = with types; either str path; default = "Lat2-Terminus16"; example = "LatArCyrHeb-16"; - description = '' + description = mdDoc '' The font used for the virtual consoles. Leave empty to use - whatever the setfont program considers the + whatever the {command}`setfont` program considers the default font. Can be either a font name or a path to a PSF font file. ''; diff --git a/nixos/modules/config/debug-info.nix b/nixos/modules/config/debug-info.nix index 2942ae5905d1..78de26fda440 100644 --- a/nixos/modules/config/debug-info.nix +++ b/nixos/modules/config/debug-info.nix @@ -9,21 +9,20 @@ with lib; environment.enableDebugInfo = mkOption { type = types.bool; default = false; - description = '' + description = mdDoc '' Some NixOS packages provide debug symbols. However, these are not included in the system closure by default to save disk space. Enabling this option causes the debug symbols to appear - in /run/current-system/sw/lib/debug/.build-id, - where tools such as gdb can find them. + in {file}`/run/current-system/sw/lib/debug/.build-id`, + where tools such as {command}`gdb` can find them. If you need debug symbols for a package that doesn't provide them by default, you can enable them as follows: - - nixpkgs.config.packageOverrides = pkgs: { - hello = pkgs.hello.overrideAttrs (oldAttrs: { - separateDebugInfo = true; - }); - }; - + + nixpkgs.config.packageOverrides = pkgs: { + hello = pkgs.hello.overrideAttrs (oldAttrs: { + separateDebugInfo = true; + }); + }; ''; }; diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix index 8e28d3336fa4..b031ff2f2be2 100644 --- a/nixos/modules/misc/documentation.nix +++ b/nixos/modules/misc/documentation.nix @@ -178,19 +178,12 @@ in man.generateCaches = mkOption { type = types.bool; default = false; - description = '' + description = mdDoc '' Whether to generate the manual page index caches. This allows searching for a page or - keyword using utilities like - - apropos - 1 - - and the -k option of - - man - 1 - . + keyword using utilities like {manpage}`apropos(1)` + and the `-k` option of + {manpage}`man(1)`. ''; }; @@ -216,16 +209,14 @@ in dev.enable = mkOption { type = types.bool; default = false; - description = '' + description = mdDoc '' Whether to install documentation targeted at developers. - - This includes man pages targeted at developers if is - set (this also includes "devman" outputs). - This includes info pages targeted at developers if - is set (this also includes "devinfo" outputs). - This includes other pages targeted at developers if - is set (this also includes "devdoc" outputs). - + * This includes man pages targeted at developers if {option}`documentation.man.enable` is + set (this also includes "devman" outputs). + * This includes info pages targeted at developers if {option}`documentation.info.enable` + is set (this also includes "devinfo" outputs). + * This includes other pages targeted at developers if {option}`documentation.doc.enable` + is set (this also includes "devdoc" outputs). ''; }; diff --git a/nixos/modules/misc/man-db.nix b/nixos/modules/misc/man-db.nix index 8bd329bc4e0c..7aeb02d883ac 100644 --- a/nixos/modules/misc/man-db.nix +++ b/nixos/modules/misc/man-db.nix @@ -23,11 +23,11 @@ in ++ lib.optionals config.documentation.dev.enable [ "devman" ]; ignoreCollisions = true; }; - defaultText = lib.literalDocBook "all man pages in "; - description = '' - The manual pages to generate caches for if + defaultText = lib.literalMD "all man pages in {option}`config.environment.systemPackages`"; + description = lib.mdDoc '' + The manual pages to generate caches for if {option}`documentation.man.generateCaches` is enabled. Must be a path to a directory with man pages under - /share/man; see the source for an example. + `/share/man`; see the source for an example. Advanced users can make this a content-addressed derivation to save a few rebuilds. ''; }; diff --git a/nixos/modules/security/systemd-confinement.nix b/nixos/modules/security/systemd-confinement.nix index f3a2de3bf87a..07b725effb7d 100644 --- a/nixos/modules/security/systemd-confinement.nix +++ b/nixos/modules/security/systemd-confinement.nix @@ -22,16 +22,17 @@ in { options.confinement.fullUnit = lib.mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to include the full closure of the systemd unit file into the chroot, instead of just the dependencies for the executables. - While it may be tempting to just enable this option to + ::: {.warning} + While it may be tempting to just enable this option to make things work quickly, please be aware that this might add paths to the closure of the chroot that you didn't anticipate. It's better - to use to explicitly add additional store paths to the - chroot. + to use {option}`confinement.packages` to **explicitly** add additional store paths to the + chroot. + ::: ''; }; diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix index b3108484fae1..3d5d10cdf070 100644 --- a/nixos/modules/services/matrix/synapse.nix +++ b/nixos/modules/services/matrix/synapse.nix @@ -191,12 +191,12 @@ in { settings = mkOption { default = {}; - description = '' + description = mdDoc '' The primary synapse configuration. See the - sample configuration + [sample configuration](https://github.com/matrix-org/synapse/blob/v${cfg.package.version}/docs/sample_config.yaml) for possible values. - Secrets should be passed in by using the extraConfigFiles option. + Secrets should be passed in by using the `extraConfigFiles` option. ''; type = with types; submodule { freeformType = format.type; @@ -230,23 +230,23 @@ in { registration_shared_secret = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = mdDoc '' If set, allows registration by anyone who also has the shared secret, even if registration is otherwise disabled. - Secrets should be passed in via extraConfigFiles! + Secrets should be passed in via `extraConfigFiles`! ''; }; macaroon_secret_key = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = mdDoc '' Secret key for authentication tokens. If none is specified, the registration_shared_secret is used, if one is given; otherwise, a secret key is derived from the signing key. - Secrets should be passed in via extraConfigFiles! + Secrets should be passed in via `extraConfigFiles`! ''; }; @@ -620,10 +620,10 @@ in { example = literalExpression '' config.services.coturn.static-auth-secret ''; - description = '' + description = mdDoc '' The shared secret used to compute passwords for the TURN server. - Secrets should be passed in via extraConfigFiles! + Secrets should be passed in via `extraConfigFiles`! ''; }; diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index 256d9457d396..70c6725d1035 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -54,10 +54,10 @@ let hashedPassword = mkOption { type = uniq (nullOr str); default = null; - description = '' + description = mdDoc '' Specifies the hashed password for the MQTT User. - To generate hashed password install mosquitto - package and use mosquitto_passwd. + To generate hashed password install `mosquitto` + package and use `mosquitto_passwd`. ''; }; @@ -65,11 +65,11 @@ let type = uniq (nullOr types.path); example = "/path/to/file"; default = null; - description = '' + description = mdDoc '' Specifies the path to a file containing the hashed password for the MQTT user. - To generate hashed password install mosquitto - package and use mosquitto_passwd. + To generate hashed password install `mosquitto` + package and use `mosquitto_passwd`. ''; }; @@ -155,24 +155,24 @@ let options = { plugin = mkOption { type = path; - description = '' - Plugin path to load, should be a .so file. + description = mdDoc '' + Plugin path to load, should be a `.so` file. ''; }; denySpecialChars = mkOption { type = bool; - description = '' - Automatically disallow all clients using # - or + in their name/id. + description = mdDoc '' + Automatically disallow all clients using `#` + or `+` in their name/id. ''; default = true; }; options = mkOption { type = attrsOf optionType; - description = '' - Options for the auth plugin. Each key turns into a auth_opt_* + description = mdDoc '' + Options for the auth plugin. Each key turns into a `auth_opt_*` line in the config. ''; default = {}; @@ -239,8 +239,8 @@ let address = mkOption { type = nullOr str; - description = '' - Address to listen on. Listen on 0.0.0.0/:: + description = mdDoc '' + Address to listen on. Listen on `0.0.0.0`/`::` when unset. ''; default = null; @@ -248,10 +248,10 @@ let authPlugins = mkOption { type = listOf authPluginOptions; - description = '' + description = mdDoc '' Authentication plugin to attach to this listener. - Refer to the - mosquitto.conf documentation for details on authentication plugins. + Refer to the [mosquitto.conf documentation](https://mosquitto.org/man/mosquitto-conf-5.html) + for details on authentication plugins. ''; default = []; }; @@ -472,10 +472,10 @@ let includeDirs = mkOption { type = listOf path; - description = '' + description = mdDoc '' Directories to be scanned for further config files to include. Directories will processed in the order given, - *.conf files in the directory will be + `*.conf` files in the directory will be read in case-sensistive alphabetical order. ''; default = []; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 3a3d4c80ecff..6a90f28dc5f7 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -72,39 +72,39 @@ in { cert = mkOption { type = types.nullOr types.str; default = null; - description = '' - Path to the cert.pem file, which will be copied into Syncthing's - configDir. + description = mdDoc '' + Path to the `cert.pem` file, which will be copied into Syncthing's + [configDir](#opt-services.syncthing.configDir). ''; }; key = mkOption { type = types.nullOr types.str; default = null; - description = '' - Path to the key.pem file, which will be copied into Syncthing's - configDir. + description = mdDoc '' + Path to the `key.pem` file, which will be copied into Syncthing's + [configDir](#opt-services.syncthing.configDir). ''; }; overrideDevices = mkOption { type = types.bool; default = true; - description = '' + description = mdDoc '' Whether to delete the devices which are not configured via the - devices option. - If set to false, devices added via the web + [devices](#opt-services.syncthing.devices) option. + If set to `false`, devices added via the web interface will persist and will have to be deleted manually. ''; }; devices = mkOption { default = {}; - description = '' + description = mdDoc '' Peers/devices which Syncthing should communicate with. Note that you can still add devices manually, but those changes - will be reverted on restart if overrideDevices + will be reverted on restart if [overrideDevices](#opt-services.syncthing.overrideDevices) is enabled. ''; example = { @@ -135,27 +135,27 @@ in { id = mkOption { type = types.str; - description = '' - The device ID. See . + description = mdDoc '' + The device ID. See . ''; }; introducer = mkOption { type = types.bool; default = false; - description = '' + description = mdDoc '' Whether the device should act as an introducer and be allowed to add folders on this computer. - See . + See . ''; }; autoAcceptFolders = mkOption { type = types.bool; default = false; - description = '' + description = mdDoc '' Automatically create or share folders that this device advertises at the default path. - See . + See . ''; }; @@ -166,21 +166,21 @@ in { overrideFolders = mkOption { type = types.bool; default = true; - description = '' + description = mdDoc '' Whether to delete the folders which are not configured via the - folders option. - If set to false, folders added via the web + [folders](#opt-services.syncthing.folders) option. + If set to `false`, folders added via the web interface will persist and will have to be deleted manually. ''; }; folders = mkOption { default = {}; - description = '' + description = mdDoc '' Folders which should be shared by Syncthing. Note that you can still add devices manually, but those changes - will be reverted on restart if overrideDevices + will be reverted on restart if [overrideDevices](#opt-services.syncthing.overrideDevices) is enabled. ''; example = literalExpression '' @@ -231,18 +231,18 @@ in { devices = mkOption { type = types.listOf types.str; default = []; - description = '' + description = mdDoc '' The devices this folder should be shared with. Each device must - be defined in the devices option. + be defined in the [devices](#opt-services.syncthing.devices) option. ''; }; versioning = mkOption { default = null; - description = '' + description = mdDoc '' How to keep changed/deleted files with Syncthing. There are 4 different types of versioning with different parameters. - See . + See . ''; example = literalExpression '' [ @@ -284,17 +284,17 @@ in { options = { type = mkOption { type = enum [ "external" "simple" "staggered" "trashcan" ]; - description = '' + description = mdDoc '' The type of versioning. - See . + See . ''; }; params = mkOption { type = attrsOf (either str path); - description = '' + description = mdDoc '' The parameters for versioning. Structure depends on - versioning.type. - See . + [versioning.type](#opt-services.syncthing.folders._name_.versioning.type). + See . ''; }; }; @@ -345,9 +345,9 @@ in { ignoreDelete = mkOption { type = types.bool; default = false; - description = '' + description = mdDoc '' Whether to skip deleting files that are deleted by peers. - See . + See . ''; }; }; @@ -357,9 +357,9 @@ in { extraOptions = mkOption { type = types.addCheck (pkgs.formats.json {}).type isAttrs; default = {}; - description = '' + description = mdDoc '' Extra configuration options for Syncthing. - See . + See . ''; example = { options.localAnnounceEnabled = false; @@ -387,9 +387,9 @@ in { type = types.str; default = defaultUser; example = "yourUser"; - description = '' + description = mdDoc '' The user to run Syncthing as. - By default, a user named ${defaultUser} will be created. + By default, a user named `${defaultUser}` will be created. ''; }; @@ -397,9 +397,9 @@ in { type = types.str; default = defaultGroup; example = "yourGroup"; - description = '' + description = mdDoc '' The group to run Syncthing under. - By default, a group named ${defaultGroup} will be created. + By default, a group named `${defaultGroup}` will be created. ''; }; @@ -407,11 +407,11 @@ in { type = with types; nullOr str; default = null; example = "socks5://address.com:1234"; - description = '' + description = mdDoc '' Overwrites the all_proxy environment variable for the Syncthing process to the given value. This is normally used to let Syncthing connect through a SOCKS5 proxy server. - See . + See . ''; }; @@ -432,25 +432,13 @@ in { The path where the settings and keys will exist. ''; default = cfg.dataDir + optionalString cond "/.config/syncthing"; - defaultText = literalDocBook '' - - - stateVersion >= 19.03 - - - config.${opt.dataDir} + "/.config/syncthing" - - - - - otherwise - - - config.${opt.dataDir} - - - - + defaultText = literalMD '' + * if `stateVersion >= 19.03`: + + config.${opt.dataDir} + "/.config/syncthing" + * otherwise: + + config.${opt.dataDir} ''; }; diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 975eed10cd26..a999efcb44e6 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -23,12 +23,12 @@ in default = false; type = types.bool; description = - '' + mdDoc '' Setting this option enables the Xen hypervisor, a virtualisation technology that allows multiple virtual - machines, known as domains, to run + machines, known as *domains*, to run concurrently on the physical machine. NixOS runs as the - privileged Domain 0. This option + privileged *Domain 0*. This option requires a reboot to take effect. ''; }; From 04bd3063744f9921ac65a2056f5e02913050c5f4 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 14:18:20 +0300 Subject: [PATCH 071/814] cayley: 0.7.5 -> 0.7.7 --- pkgs/servers/cayley/default.nix | 40 ++- pkgs/servers/cayley/deps.nix | 471 -------------------------------- 2 files changed, 25 insertions(+), 486 deletions(-) delete mode 100644 pkgs/servers/cayley/deps.nix diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index 97aac4272cea..ec94b19ae49c 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -1,29 +1,39 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "cayley"; - version = "0.7.5"; - - goPackagePath = "github.com/cayleygraph/cayley"; + version = "0.7.7"; + rev = "dcf764fef381f19ee49fad186b4e00024709f148"; src = fetchFromGitHub { owner = "cayleygraph"; repo = "cayley"; rev = "v${version}"; - sha256 = "1zfxa9z6spi6xw028mvbc7c3g517gn82g77ywr6picl47fr2blnd"; + sha256 = "sha256-jIX0v6ujiQvEAb/mKkrpNgsY0YLkJYHy2sUfQnooE48="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-SSjHGJoW3I7r8emh3IwmiZQIVzdilAsA2ULdAqld2fA="; - ldflags = [ - "-X=main.Version=${version}" + subPackages = [ "cmd/cayley" ]; + + ldflags = let basename = "github.com/cayleygraph/cayley/version"; in [ + "-s" + "-w" + "-X ${basename}.Version=${src.rev}" + "-X ${basename}.GitHash=${rev}" ]; - meta = { - homepage = "https://github.com/cayleygraph/cayley"; - description = "A graph database inspired by Freebase and Knowledge Graph"; - maintainers = with lib.maintainers; [ sigma ]; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; + meta = with lib; { + description = "Graph database designed for ease of use and storing complex data"; + longDescription = '' + Cayley is an open-source database for Linked Data. It is inspired by the + graph database behind Google's Knowledge Graph (formerly Freebase). + ''; + homepage = "https://cayley.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ sigma ]; }; } diff --git a/pkgs/servers/cayley/deps.nix b/pkgs/servers/cayley/deps.nix deleted file mode 100644 index d4ec2670365b..000000000000 --- a/pkgs/servers/cayley/deps.nix +++ /dev/null @@ -1,471 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/badgerodon/peg"; - fetch = { - type = "git"; - url = "https://github.com/badgerodon/peg"; - rev = "9e5f7f4d07ca576562618c23e8abadda278b684f"; - sha256 = "12vd7hzdgknn8byz77lmvcrz9m5lvmffdnz2wwk83304przkra11"; - }; - } - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd"; - sha256 = "1sjxzz88bw0y37mk3xvwb9j5v7bz3r80rwg79jml6liqk1arnl99"; - }; - } - { - goPackagePath = "github.com/cznic/mathutil"; - fetch = { - type = "git"; - url = "https://github.com/cznic/mathutil"; - rev = "1447ad269d64ca91aa8d7079baa40b6fc8b965e7"; - sha256 = "1r9c20k2h65g38yxf3vd46nbayx1cz5w4q4yr1xfggcs0mmrb87i"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/dennwc/graphql"; - fetch = { - type = "git"; - url = "https://github.com/dennwc/graphql"; - rev = "12cfed44bc5de083875506a36d30f9798f9bca47"; - sha256 = "1rfsxjjsik5618y2741lcyw56a4d4l6r04sbj1igrvcck9bz0k6a"; - }; - } - { - goPackagePath = "github.com/dlclark/regexp2"; - fetch = { - type = "git"; - url = "https://github.com/dlclark/regexp2"; - rev = "902a5ce7a7812e2ba9f73b9d96c09d5136df39cd"; - sha256 = "0ypmdayq50ilbmqa1wjq5nvs9igbxkzlc8phlknw244935wz3v15"; - }; - } - { - goPackagePath = "github.com/dop251/goja"; - fetch = { - type = "git"; - url = "https://github.com/dop251/goja"; - rev = "ef8c030e3c96c5054c2f10ef925e7041e0583c07"; - sha256 = "15419apwdpbl0lgnl9xj9wyl05vpiz6jqgj8zbcyxhzy0wycj445"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "4da3e2cfbabc9f751898f250b49f2439785783a1"; - sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3"; - }; - } - { - goPackagePath = "github.com/go-kivik/couchdb"; - fetch = { - type = "git"; - url = "https://github.com/go-kivik/couchdb"; - rev = "74d231fe43245e77840213724894264f0f61ffd3"; - sha256 = "0ga6d6y44wg8ync73wcyc7q7r3sr5vdj5qkn3yqn9yn4p0k2w89i"; - }; - } - { - goPackagePath = "github.com/go-kivik/kivik"; - fetch = { - type = "git"; - url = "https://github.com/go-kivik/kivik"; - rev = "2a1f6b9dd407886bc59c0c28faed28fbce3b0ece"; - sha256 = "0fpa62mriyiyl5dh5kg8858bqrwiwscpbkg9np69lk302znxalij"; - }; - } - { - goPackagePath = "github.com/go-kivik/pouchdb"; - fetch = { - type = "git"; - url = "https://github.com/go-kivik/pouchdb"; - rev = "bbd1ab79be17c809842e193b1f84e924b6b599ba"; - sha256 = "15kv6i94j73c8zzy5hnmf051d3i65wxc07hvass9lc4g5ad7f9vf"; - }; - } - { - goPackagePath = "github.com/go-sourcemap/sourcemap"; - fetch = { - type = "git"; - url = "https://github.com/go-sourcemap/sourcemap"; - rev = "b019cc30c1eaa584753491b0d8f8c1534bf1eb44"; - sha256 = "03k44fdrnknba05f7cd58lq4rzk7jdpiqksmc0wxrdzwschrbgw8"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "147bd02c2c516cf9a8878cb75898ee8a9eea0228"; - sha256 = "0s75nilz1jx0vgc69jgmys95lsq9j9nfdjcc8inc8mhzh3qpjb74"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "30433562cfbf487fe1df7cd26c7bab168d2f14d0"; - sha256 = "155iv0jqgh0d8cykghw3ifwk8pjyyq1w4gr9khhf78n01k6180hj"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "18c9bb3261723cd5401db4d0c9fbc5c3b6c70fe8"; - sha256 = "0fbf8ymrcb23imkhlrlyq6i0x5w8gxzilljjsgd4hnvjgpgp3r4v"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "553a641470496b2327abcac10b36396bd98e45c9"; - sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "558a9132744c22476178edf3126fd35a9754f565"; - sha256 = "13mn0li83amgm4fgsm6l3shs2r4kjddr10xn0ydnr9ymg1y887vi"; - }; - } - { - goPackagePath = "github.com/gopherjs/jsbuiltin"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/jsbuiltin"; - rev = "67703bfb044e3192fbcab025c3aeaeedafad1f2f"; - sha256 = "1k0df0z9fiyzbr1g1736zdp238j9z82q3gwkk060h2n84rg4c7lh"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "7fa7fff964d035e8a162cce3a164b3ad02ad651b"; - sha256 = "0p3dyhpc0ajakcww3a45n750z2030xqhlswzf51d5rzid27681wp"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "0d4b488675fdec1dde48751b05ab530cf0b630e1"; - sha256 = "071rram7aib70f3gk4ansgwns82w9i6m1px8mgc8x4rs9ana4qhf"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/jackc/pgx"; - fetch = { - type = "git"; - url = "https://github.com/jackc/pgx"; - rev = "606697ffdfe6603013560dbc171656de57b4f542"; - sha256 = "0818yb2vjjwwmscdab7wnxbyiabvy544icdczdlr5kswbqq5h25m"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "6f3f3919c8781ce5c0509c83fffc887a7830c938"; - sha256 = "1hmqdpv2zywwglmnjnxfn27mkac81n3nqs1wandlpybsww4vn4kx"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "2704adc878c21e1329f46f6e56a1c387d788ff94"; - sha256 = "160fmvi7bczxw3i3h5s821hv029ph5ld8x3c36b4cz2sr30wp110"; - }; - } - { - goPackagePath = "github.com/linkeddata/gojsonld"; - fetch = { - type = "git"; - url = "https://github.com/linkeddata/gojsonld"; - rev = "4f5db6791326b8962ede4edbba693edcf20fd1ad"; - sha256 = "11g1kygkn55whaf49q2bzxk0w8b3nhdhiaixsj2ik65j8bl9g2cq"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "51463bfca2576e06c62a8504b5c0f06d61312647"; - sha256 = "0d7hr78y8gg2mrm5z4jjgm2w3awkznz383b7wvyzk3l33jw6i288"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "cc8532a8e9a55ea36402aa21efdf403a60d34096"; - sha256 = "0705c0hq7b993sabnjy65yymvpy9w1j84bg9bjczh5607z16nw86"; - }; - } - { - goPackagePath = "github.com/pborman/uuid"; - fetch = { - type = "git"; - url = "https://github.com/pborman/uuid"; - rev = "1b00554d822231195d1babd97ff4a781231955c9"; - sha256 = "0rjkcf85sagdwzsycj1bbjyx5bgmrc1i8l5qf1f44z24rhbbkaan"; - }; - } - { - goPackagePath = "github.com/pelletier/go-buffruneio"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-buffruneio"; - rev = "c37440a7cf42ac63b919c752ca73a85067e05992"; - sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "fe206efb84b2bc8e8cfafe6b4c1826622be969e3"; - sha256 = "1dlabfpnlzvwf4i86idy8ilqpjsl8yqfgdv0nv5cccm8gkcans5w"; - }; - } - { - goPackagePath = "github.com/peterh/liner"; - fetch = { - type = "git"; - url = "https://github.com/peterh/liner"; - rev = "88609521dc4b6c858fd4c98b628147da928ce4ac"; - sha256 = "0jacb2fqgiccb98v1875j5xvj01l1z2laga1kgr8lhd0nl22r96k"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "e881fd58d78e04cf6d0de1217f8707c8cc2249bc"; - sha256 = "0vfhj598jp6dzy4pbyjdrqxzb5kppw8ggvfh78g80nz11r34xnzs"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; - sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "b253417e1cb644d645a0a3bb1fa5034c8030127c"; - sha256 = "1knj8vabymhmkg12cj3hnpqf3b74wwrvqib12yczcvpi52xaqi20"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "79c90efaf01eddc01945af5bc1797859189b830b"; - sha256 = "1dj8v91gv1ssw2j88gjzr1hw0n63qqxykjzfbvspyi529xn3ji3y"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "9be650865eab0c12963d8753212f4f9c66cdcf12"; - sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4"; - sha256 = "0w25s6gjbbwv47b9208hysyqqphd6pib3d2phg24mjy4wigkm050"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "7b1b6e8dc027253d45fc029bc269d1c019f83a34"; - sha256 = "1nhnlpmbqq1ggix7jaxmzr8awk1zrrzag4vzq1p5q5l25d6kih35"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66"; - sha256 = "0404b7bzx7cq1b2bgdb3gs7gjzm4vvg1hl2y9mcm4m6vz56vbcz8"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "f1d95a35e132e8a1868023a08932b14f0b8b8fcb"; - sha256 = "0fwvkyq36jvy2gid81031ll7qaj8jxr5g36fff7hhkp3hh4kz6zh"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "0967fc9aceab2ce9da34061253ac10fb99bba5b2"; - sha256 = "016syis0rvccp2indjqi1vnz3wk7c9dhkvkgam0j79sb019kl80f"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "87b1dfb5b2fa649f52695dd9eae19abe404a4308"; - sha256 = "1iyfxs3nxdn1fyfqv3gggxcxab66a3m6cmjkhqhcapxm3qvgbrlc"; - }; - } - { - goPackagePath = "github.com/syndtr/goleveldb"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/goleveldb"; - rev = "b89cc31ef7977104127d34c1bd31ebd1a9db2199"; - sha256 = "0pbmssaw7fsgspv0jr3hsd1208qqxcvy4faks9hypqgl5gwday4p"; - }; - } - { - goPackagePath = "github.com/tylertreat/BoomFilters"; - fetch = { - type = "git"; - url = "https://github.com/tylertreat/BoomFilters"; - rev = "37e169ae37ed529d93ecacb509c0dc80078478fc"; - sha256 = "15wwdsxxvkgxbxv3v0ywnwjwndpmps49n3a49z7bzjl7r2nsm7qv"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344"; - sha256 = "09xpndqc6a2r0lw42cyl1pkhfddl01sd9c3qqjjwp3vmxm004whv"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "9ccfe848b9db8435a24c424abbc07a921adf1df5"; - sha256 = "0wn3p7nrf9lx5svnya5mxy5b8cxqs2rp8lxc477szna313m1jhs4"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "470f45bf29f4147d6fbd7dfd0a02a848e49f5bf4"; - sha256 = "1yzh1qxwd0xkh0k04hwp7yii21i26b4ngxvm1g98qlji1g2wbjbc"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "170382fa85b10b94728989dfcf6cc818b335c952"; - sha256 = "0dqx24qc7h53p16xnkwn2jpk3wjjlvv48akqk74vx31pr2nn0g56"; - }; - } - { - goPackagePath = "gopkg.in/mgo.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-mgo/mgo"; - rev = "3f83fa5005286a7fe593b055f0d7771a7dce4655"; - sha256 = "19vwb6qlcyh3nh6pkk0bynwmr5cmi6mm4hdz01lwb4ybnkzxryc7"; - }; - } - { - goPackagePath = "gopkg.in/olivere/elastic.v5"; - fetch = { - type = "git"; - url = "https://github.com/olivere/elastic"; - rev = "79ff368708b3a2a9da641dc831d95fd0782bf4ef"; - sha256 = "1lq8nhjnkf246nl5h40ldh1qz2yx73yaqfmsh9ddvkwn4173c7jj"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; - sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; - }; - } -] From e9a86f48915f2ea7e2709210c82946b47544a808 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 15:09:56 +0300 Subject: [PATCH 072/814] boulder: release-2019-10-13 -> release-2022-05-31 --- pkgs/tools/admin/boulder/default.nix | 53 +++++++++++++++++++--------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/tools/admin/boulder/default.nix index 706ac84afb33..6de6ae6c0202 100644 --- a/pkgs/tools/admin/boulder/default.nix +++ b/pkgs/tools/admin/boulder/default.nix @@ -1,30 +1,51 @@ -{ buildGoPackage -, libtool +{ lib +, buildGoModule , fetchFromGitHub -, lib }: -buildGoPackage rec{ - +buildGoModule rec { pname = "boulder"; - version = "release-2019-10-13"; - - goPackagePath = "github.com/letsencrypt/boulder"; - - buildInputs = [ libtool ]; + version = "release-2022-05-31"; + rev = "99dcb9a5b31be576a55e33184581c942421bc172"; src = fetchFromGitHub { owner = "letsencrypt"; repo = "boulder"; rev = version; - sha256 = "0kis23dnjja6jp192rjpv2m9m2zmzfwhs93440nxg354k6fp8jdg"; + sha256 = "sha256-x1Vf8agwVTgSkDVEdAnG3div+MzRsMi96jKJRc2s8Ks="; }; - meta = { + vendorSha256 = null; + + subPackages = [ "cmd/boulder" ]; + + ldflags = with lib; + mapAttrsToList (n: v: ''"-X github.com/letsencrypt/boulder/core.Build${n}=${v}"'') { + ID = substring 0 8 rev; + Host = "nixbld@localhost"; + Time = "Thu 1 Jan 00:00:00 UTC 1970"; + }; + + postInstall = '' + for i in $($out/bin/boulder --list); do + ln -s $out/bin/boulder $out/bin/$i + done + ''; + + # There are no tests for cmd/boulder. + doCheck = false; + + meta = with lib; { homepage = "https://github.com/letsencrypt/boulder"; - description = "An ACME-based CA, written in Go"; - license = [ lib.licenses.mpl20 ]; - maintainers = [ ]; + description = "An ACME-based certificate authority, written in Go"; + longDescription = '' + This is an implementation of an ACME-based CA. The ACME protocol allows + the CA to automatically verify that an applicant for a certificate + actually controls an identifier, and allows domain holders to issue and + revoke certificates for their domains. Boulder is the software that runs + Let's Encrypt. + ''; + license = licenses.mpl20; + maintainers = with maintainers; [ azahi ]; }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57099552868d..051f10120f22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2047,7 +2047,9 @@ with pkgs; botamusique = callPackage ../tools/audio/botamusique { }; - boulder = callPackage ../tools/admin/boulder { }; + boulder = callPackage ../tools/admin/boulder { + buildGoModule = buildGo118Module; + }; btrfs-heatmap = callPackage ../tools/filesystems/btrfs-heatmap { }; From 34a898a06a0323726c885860897adc424c61f611 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 16:34:28 +0300 Subject: [PATCH 073/814] vegeta: use buildGoModule --- pkgs/tools/networking/vegeta/default.nix | 37 +++- pkgs/tools/networking/vegeta/deps.nix | 255 ----------------------- 2 files changed, 26 insertions(+), 266 deletions(-) delete mode 100644 pkgs/tools/networking/vegeta/deps.nix diff --git a/pkgs/tools/networking/vegeta/default.nix b/pkgs/tools/networking/vegeta/default.nix index 16abe8c60335..6e7bbaa8366b 100644 --- a/pkgs/tools/networking/vegeta/default.nix +++ b/pkgs/tools/networking/vegeta/default.nix @@ -1,25 +1,40 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib +, fetchFromGitHub +, buildGoModule +}: -buildGoPackage rec { +buildGoModule rec { pname = "vegeta"; version = "12.8.4"; + rev = "e04d9c0df8177e8633bff4afe7b39c2f3a9e7dea"; src = fetchFromGitHub { - owner = "tsenart"; - repo = pname; - rev = "v${version}"; - sha256 = "0sw10k4g370c544dgw2c1sqdnxryld8lf6c1wnyknrm3zsfzn1hl"; + owner = "tsenart"; + repo = "vegeta"; + rev = "v${version}"; + sha256 = "sha256-FAb7nf6jZju95YEZR1GjPnfbsA5M8NcIKQyc8cgEgWs="; }; - goPackagePath = "github.com/tsenart/${pname}"; + vendorSha256 = "sha256-v9Hu9eQJSmm4Glt49F7EN40rKjrg4acyll9Bfgey+Mw="; - goDeps = ./deps.nix; + subPackages = [ "." ]; + + ldflags = (lib.mapAttrsToList (n: v: "-X main.${n}=${v}") { + Version = version; + Commit = rev; + Date = "1970-01-01T00:00:00Z"; + }) ++ [ "-s" "-w" "-extldflags '-static'" ]; meta = with lib; { description = "Versatile HTTP load testing tool"; - license = licenses.mit; + longDescription = '' + Vegeta is a versatile HTTP load testing tool built out of a need to drill + HTTP services with a constant request rate. It can be used both as a + command line utility and a library. + ''; homepage = "https://github.com/tsenart/vegeta/"; - maintainers = [ maintainers.mmahut ]; + changelog = "https://github.com/tsenart/vegeta/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ mmahut ]; }; } - diff --git a/pkgs/tools/networking/vegeta/deps.nix b/pkgs/tools/networking/vegeta/deps.nix deleted file mode 100644 index 1a06ad178ec4..000000000000 --- a/pkgs/tools/networking/vegeta/deps.nix +++ /dev/null @@ -1,255 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/alecthomas/jsonschema"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/jsonschema"; - rev = "f2c93856175a"; - sha256 = "145w6zg453mbspfyixs71xfjwi3djq20lij1rcgrdcn5gmwj2cal"; - }; - } - { - goPackagePath = "github.com/bmizerany/perks"; - fetch = { - type = "git"; - url = "https://github.com/bmizerany/perks"; - rev = "d9a9656a3a4b"; - sha256 = "0f39b3zfm1zd6xcvlm6szgss026qs84n2j9y5bnb3zxzdkxb9w9n"; - }; - } - { - goPackagePath = "github.com/c2h5oh/datasize"; - fetch = { - type = "git"; - url = "https://github.com/c2h5oh/datasize"; - rev = "4eba002a5eae"; - sha256 = "02sxd659q7m7axfywiqfxk5rh6djh2m5240bin1makldj1nj16j3"; - }; - } - { - goPackagePath = "github.com/dgryski/go-gk"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-gk"; - rev = "201884a44051"; - sha256 = "17csmdlqibg5g2pjybh4522dis6nklyhjvly55pawy0vprd17agz"; - }; - } - { - goPackagePath = "github.com/dgryski/go-lttb"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-lttb"; - rev = "318fcdf10a77"; - sha256 = "0cs2rr2j6fbbpgmfxkq39pir4bibfzkfwxvd2cvw30q97cmfpiz3"; - }; - } - { - goPackagePath = "github.com/gonum/blas"; - fetch = { - type = "git"; - url = "https://github.com/gonum/blas"; - rev = "f22b278b28ac"; - sha256 = "0dh73akv4gazyhva9xbm9xbq786vij8iisivp3p65p6ahf502fs6"; - }; - } - { - goPackagePath = "github.com/gonum/diff"; - fetch = { - type = "git"; - url = "https://github.com/gonum/diff"; - rev = "500114f11e71"; - sha256 = "1bg4k3bxqb44nz1nmyigr5bx55859n55vvi45w2rq4y5djvpral8"; - }; - } - { - goPackagePath = "github.com/gonum/floats"; - fetch = { - type = "git"; - url = "https://github.com/gonum/floats"; - rev = "c233463c7e82"; - sha256 = "12m7pa64mk3am2i10agg6c1aqdfgx9i3f4bgf3w7wra8bnnjncp6"; - }; - } - { - goPackagePath = "github.com/gonum/integrate"; - fetch = { - type = "git"; - url = "https://github.com/gonum/integrate"; - rev = "a422b5c0fdf2"; - sha256 = "01wfav882h3bcp137cd2bsr91hkmmi4d6qwhdm0xv1p2z2qzs7iq"; - }; - } - { - goPackagePath = "github.com/gonum/internal"; - fetch = { - type = "git"; - url = "https://github.com/gonum/internal"; - rev = "f884aa714029"; - sha256 = "038w8pc82vxq773qg0mw472f3p8h5vkh3ggcdn09qd3s6myp2zq7"; - }; - } - { - goPackagePath = "github.com/gonum/lapack"; - fetch = { - type = "git"; - url = "https://github.com/gonum/lapack"; - rev = "e4cdc5a0bff9"; - sha256 = "046fffskysg0bmha16s5582bimpis0m6qd7c7k1n65a0qhrslli1"; - }; - } - { - goPackagePath = "github.com/gonum/mathext"; - fetch = { - type = "git"; - url = "https://github.com/gonum/mathext"; - rev = "8a4bf007ea55"; - sha256 = "044xy32mgcjc5948na6f6fgqqq17canw3z6sppidmj52s17p0k7i"; - }; - } - { - goPackagePath = "github.com/gonum/matrix"; - fetch = { - type = "git"; - url = "https://github.com/gonum/matrix"; - rev = "c518dec07be9"; - sha256 = "0i6pyxxhcy2s9as77g90dsj9xya48775dl5fxgvqal665cxc4l4i"; - }; - } - { - goPackagePath = "github.com/gonum/stat"; - fetch = { - type = "git"; - url = "https://github.com/gonum/stat"; - rev = "41a0da705a5b"; - sha256 = "0r9mqiy3ma0c15p57bz4xq2vf105s9g1lqysb7ff0nip4050cpvn"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.2.0"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } - { - goPackagePath = "github.com/influxdata/tdigest"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/tdigest"; - rev = "a7d76c6f093a"; - sha256 = "02jxrb2d1n6zflwa7jhgid5344l6zj4gxg4kis20v7xa6iqrj1ni"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "v0.7.0"; - sha256 = "13zv5fvjp3nr65lhqhiw6i6mlmqvyls882rlmcas0ab35alsxni8"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "v1.1.17"; - sha256 = "0x0375n7n1qmgyn7yvpr65z4ll4l39q2xagyfafw09h3kkrkpka8"; - }; - } - { - goPackagePath = "github.com/streadway/quantile"; - fetch = { - type = "git"; - url = "https://github.com/streadway/quantile"; - rev = "b0c588724d25"; - sha256 = "1y27nrg7wkyrvw07a5s7wl4lpwxshwyvhzc6i0rzn20dajah2vkh"; - }; - } - { - goPackagePath = "github.com/tsenart/go-tsz"; - fetch = { - type = "git"; - url = "https://github.com/tsenart/go-tsz"; - rev = "cdeb9e1e981e"; - sha256 = "1lgnllx810ly0203jn9vkimcwqv3302mnh9d7mip1yyq4cmvlj3b"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "9756ffdc2472"; - sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "ba9fcec4b297"; - sha256 = "1hbqvy6r0s5h0dpdqw8fynl3cq0acin3iyqki9xvl5r8h33yb9bx"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "749cb33beabd"; - sha256 = "0dm3257q3rv2kyn5lmqqim2fqg634v6rhrqq4glvbk4wx4l3v337"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "2ca718005c18"; - sha256 = "1nl4cw8vrfigab0hij86vl2mmhfmyim69r7vy5qk2v60g8frvgxg"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "a985d3407aa7"; - sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; - }; - } - { - goPackagePath = "pgregory.net/rapid"; - fetch = { - type = "git"; - url = "https://github.com/flyingmutant/rapid"; - rev = "v0.3.3"; - sha256 = "04w4dmx753b2xp5z5br5wxalgkkgag8qpbxics2gdcksqgi85vg3"; - }; - } -] From 3518e3309f24bb2454c8b09f9d9e80c2626f36f1 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 16:44:34 +0300 Subject: [PATCH 074/814] waitron: unstable-2020-01-24 -> unstable-2020-08-04 --- pkgs/tools/networking/waitron/default.nix | 33 ++++++++----- pkgs/tools/networking/waitron/deps.nix | 57 ----------------------- 2 files changed, 21 insertions(+), 69 deletions(-) delete mode 100644 pkgs/tools/networking/waitron/deps.nix diff --git a/pkgs/tools/networking/waitron/default.nix b/pkgs/tools/networking/waitron/default.nix index 4f2f634d4942..7ef984147a32 100644 --- a/pkgs/tools/networking/waitron/default.nix +++ b/pkgs/tools/networking/waitron/default.nix @@ -1,29 +1,38 @@ -{ lib, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "waitron"; - version = "unstable-2020-01-24"; - - goPackagePath = "github.com/ns1/waitron"; + version = "unstable-2020-08-04"; + rev = "2315857d94e3d1a1e79ac48f8f6a68d59d0ce300"; src = fetchFromGitHub { owner = "ns1"; repo = "waitron"; - rev = "c96833619cbb0cf2bc71b1d7b534101e139cc6e6"; + inherit rev; sha256 = "sha256-ZkGhEOckIOYGb6Yjr4I4e9cjAHDfksRwHW+zgOMZ/FE="; }; + vendorSha256 = "sha256-grQFLo0BIIa/kNKF4vPw/V1WN9sxOucz6+wET2PBU1I="; + + subPackages = [ "." ]; + patches = [ ./staticfiles-directory.patch ]; - goDeps = ./deps.nix; - - meta = { + meta = with lib; { description = "A tool to manage network booting of machines"; + longDescription = '' + Waitron is used to build machines (primarily bare-metal, but anything that + understands PXE booting will work) based on definitions from any number of + specified inventory sources. + ''; homepage = "https://github.com/ns1/waitron"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ guibert ]; - platforms = lib.platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ guibert ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/waitron/deps.nix b/pkgs/tools/networking/waitron/deps.nix deleted file mode 100644 index 46369c783184..000000000000 --- a/pkgs/tools/networking/waitron/deps.nix +++ /dev/null @@ -1,57 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/flosch/pongo2"; - fetch = { - type = "git"; - url = "https://github.com/flosch/pongo2"; - rev = "bbf5a6c351f4d4e883daa40046a404d7553e0a00"; - sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; - }; - } - { - goPackagePath = "github.com/gorilla/handlers"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/handlers"; - rev = "f08afc1876ad882db8074bcb8a4cc96107d3a5f4"; - sha256 = "1ysm6sw3jqa3h8pb5qpqgh44g91c23n3as277sh0vyp7282290jq"; - }; - } - { - goPackagePath = "github.com/juju/errors"; - fetch = { - type = "git"; - url = "https://github.com/juju/errors"; - rev = "d42613fe1ab9e303fc850e7a19fda2e8eeb6516e"; - sha256 = "0qggzzvh9lzlfk8ixlyw8bw645rh0lrjrd367505hhl6cg18v8yf"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "8c9f31f047a304abedb5614d4a18a843cd5f4a40"; - sha256 = "00f5ja1yslrjclx3sf29mzpcsrpfd15kkw5ygv7n4jsyb4v3xgj6"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "b2ce2384e17bbe0c6d34077efa39dbab3e09123b"; - sha256 = "1yz4cx02377ijlf8mnn84j1dcmlwh8ncx7y3kw1zg2qw0z4x119c"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "53403b58ad1b561927d19068c655246f2db79d48"; - sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; - }; - } -] From 7181e7bfa90331969c12448698b4a26bdcb13190 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 12 Jun 2022 16:59:56 +0300 Subject: [PATCH 075/814] certstrap: use buildGoModule --- pkgs/tools/security/certstrap/default.nix | 24 +++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/certstrap/default.nix b/pkgs/tools/security/certstrap/default.nix index ff6522f1d35f..9edd8b3884f8 100644 --- a/pkgs/tools/security/certstrap/default.nix +++ b/pkgs/tools/security/certstrap/default.nix @@ -1,21 +1,33 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "certstrap"; version = "1.2.0"; - goPackagePath = "github.com/square/certstrap"; - src = fetchFromGitHub { owner = "square"; repo = "certstrap"; rev = "v${version}"; - sha256 = "1ymchnn7c9g3pq7rw4lrwsd6z3wfjx90g7qgrw6r5hssl77mnscj"; + sha256 = "sha256-kmlbz6Faw5INzw+fB1KXjo9vmuaZEp4PvuMldqyFrPo="; }; + vendorSha256 = null; + + subPackages = [ "." ]; + + ldflags = [ "-X main.release=${version}" ]; + meta = with lib; { - inherit (src.meta) homepage; description = "Tools to bootstrap CAs, certificate requests, and signed certificates"; + longDescription = '' + A simple certificate manager written in Go, to bootstrap your own + certificate authority and public key infrastructure. Adapted from etcd-ca. + ''; + homepage = "https://github.com/square/certstrap"; + changelog = "https://github.com/square/certstrap/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ volth ]; }; From 97c98ab16bfd1fa1a524a8b03c73ef19d0afc00a Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Sun, 12 Jun 2022 23:20:16 +0300 Subject: [PATCH 076/814] ffmpeg-full: add opencl --- pkgs/development/libraries/ffmpeg-full/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 9d9a1a126cb2..408066f90cd0 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -103,7 +103,8 @@ , xz ? null # xz-utils , nvenc ? !stdenv.isDarwin && !stdenv.isAarch64, nv-codec-headers ? null # NVIDIA NVENC support , openal ? null # OpenAL 1.1 capture support -#, opencl ? null # OpenCL code +, ocl-icd ? null # OpenCL ICD +, opencl-headers ? null # OpenCL headers , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder #, opencv ? null # Video filtering , openglExtlib ? false, libGL ? null, libGLU ? null # OpenGL rendering @@ -164,7 +165,7 @@ * * Not packaged: * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 - * libnut libquvi nvenc opencl oss shine twolame + * libnut libquvi nvenc oss shine twolame * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * * Need fixes to support Darwin: @@ -377,7 +378,7 @@ stdenv.mkDerivation rec { (enableFeature (xz != null) "lzma") (enableFeature nvenc "nvenc") (enableFeature (openal != null) "openal") - #(enableFeature opencl "opencl") + (enableFeature (ocl-icd != null && opencl-headers != null) "opencl") (enableFeature (opencore-amr != null && version3Licensing) "libopencore-amrnb") #(enableFeature (opencv != null) "libopencv") (enableFeature openglExtlib "opengl") @@ -431,7 +432,7 @@ stdenv.mkDerivation rec { bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm libjack2 ladspaH lame libaom libass libbluray libbs2b libcaca libdc1394 libmodplug libmysofa libogg libopus librsvg libssh libtheora libvdpau libvorbis libvpx libwebp libX11 - libxcb libXv libXext libxml2 xz openal openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr + libxcb libXv libXext libxml2 xz openal ocl-icd opencl-headers openjpeg libpulseaudio rav1e svt-av1 rtmpdump opencore-amr samba SDL2 soxr speex srt vid-stab vo-amrwbenc x264 x265 xavs xvidcore zeromq4 zimg zlib openh264 ] ++ optionals openglExtlib [ libGL libGLU ] From 6c53004840e86dc789adf15cfd37e95bac4ac4af Mon Sep 17 00:00:00 2001 From: Winter Date: Wed, 8 Jun 2022 22:28:41 -0400 Subject: [PATCH 077/814] nixos/nginx: allow recommended proxy settings to be enabled per location --- nixos/modules/services/web-servers/nginx/default.nix | 4 ++-- .../services/web-servers/nginx/location-options.nix | 11 ++++++++++- .../services/web-servers/nginx/vhost-options.nix | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 160d76597c88..5ccbaf77481b 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -360,7 +360,7 @@ let ${optionalString (config.alias != null) "alias ${config.alias};"} ${optionalString (config.return != null) "return ${config.return};"} ${config.extraConfig} - ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"} + ${optionalString (config.proxyPass != null && config.recommendedProxySettings) "include ${recommendedProxyConfig};"} ${mkBasicAuth "sublocation" config} } '') (sortProperties (mapAttrsToList (k: v: v // { location = k; }) locations))); @@ -423,7 +423,7 @@ in default = false; type = types.bool; description = " - Enable recommended proxy settings. + Whether to enable recommended proxy settings if a vhost does not specify the option manually. "; }; diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix index 6fd00b386974..49dd8893015a 100644 --- a/nixos/modules/services/web-servers/nginx/location-options.nix +++ b/nixos/modules/services/web-servers/nginx/location-options.nix @@ -3,7 +3,7 @@ # has additional options that affect the web server as a whole, like # the user/group to run under.) -{ lib }: +{ lib, config }: with lib; @@ -128,5 +128,14 @@ with lib; a greater priority. ''; }; + + recommendedProxySettings = mkOption { + type = types.bool; + default = config.services.nginx.recommendedProxySettings; + defaultText = literalExpression "config.services.nginx.recommendedProxySettings"; + description = '' + Enable recommended proxy settings. + ''; + }; }; } diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 2c77d6ee8162..a9929297a248 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -281,7 +281,7 @@ with lib; locations = mkOption { type = types.attrsOf (types.submodule (import ./location-options.nix { - inherit lib; + inherit lib config; })); default = {}; example = literalExpression '' From 14dcb2c929304b1c6d9c36ea38f3b0ad72750f4f Mon Sep 17 00:00:00 2001 From: Yves-Stan Le Cornec Date: Mon, 13 Jun 2022 11:35:18 +0200 Subject: [PATCH 078/814] bazel_4: wraps bazel to add default runtime dependencies to PATH Bazel requires basic runtime dependencies in the PATH for repository rules and genrules. When `which` is missing in particular, it can lead to misleading error messages. --- pkgs/development/tools/build-managers/bazel/bazel_4/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 56a4d5b3b5a0..3b492848fc15 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -591,6 +591,7 @@ stdenv.mkDerivation rec { # The binary _must_ exist with this naming if your project contains a .bazelversion # file. cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel + wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath} mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} mkdir $out/share From aa06cc8b9a038e5913e49801442a2bd2fdf331ec Mon Sep 17 00:00:00 2001 From: Yves-Stan Le Cornec Date: Mon, 13 Jun 2022 11:35:54 +0200 Subject: [PATCH 079/814] bazel_5: wraps bazel to add default runtime dependencies to PATH Bazel requires basic runtime dependencies in the PATH for repository rules and genrules. When `which` is missing in particular, it can lead to misleading error messages. --- pkgs/development/tools/build-managers/bazel/bazel_5/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index d0b71f3760c8..9ca0098575be 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -586,6 +586,7 @@ stdenv.mkDerivation rec { # The binary _must_ exist with this naming if your project contains a .bazelversion # file. cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel + wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath} mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} mkdir $out/share @@ -662,4 +663,3 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; } - From c3c876462b1884d77e7b3d41740b07977a27c1e6 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 3 Jun 2022 09:03:45 +0000 Subject: [PATCH 080/814] traefik: 2.6.3 -> 2.7.1 --- nixos/tests/traefik.nix | 22 ++++++++++++++-------- pkgs/servers/traefik/default.nix | 29 +++++++++++++++-------------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/nixos/tests/traefik.nix b/nixos/tests/traefik.nix index 1d6c0a479ef6..989ec390c060 100644 --- a/nixos/tests/traefik.nix +++ b/nixos/tests/traefik.nix @@ -11,14 +11,20 @@ import ./make-test-python.nix ({ pkgs, ... }: { environment.systemPackages = [ pkgs.curl ]; }; traefik = { config, pkgs, ... }: { - virtualisation.oci-containers.containers.nginx = { - extraOptions = [ - "-l" "traefik.enable=true" - "-l" "traefik.http.routers.nginx.entrypoints=web" - "-l" "traefik.http.routers.nginx.rule=Host(`nginx.traefik.test`)" - ]; - image = "nginx-container"; - imageFile = pkgs.dockerTools.examples.nginx; + virtualisation.oci-containers = { + backend = "docker"; + containers.nginx = { + extraOptions = [ + "-l" + "traefik.enable=true" + "-l" + "traefik.http.routers.nginx.entrypoints=web" + "-l" + "traefik.http.routers.nginx.rule=Host(`nginx.traefik.test`)" + ]; + image = "nginx-container"; + imageFile = pkgs.dockerTools.examples.nginx; + }; }; networking.firewall.allowedTCPPorts = [ 80 ]; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 622662645c7e..d6a0f497da14 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -1,33 +1,34 @@ -{ lib, fetchzip, buildGoModule, go-bindata, nixosTests }: +{ lib, fetchFromGitHub, buildGoModule, nixosTests }: buildGoModule rec { pname = "traefik"; - version = "2.6.3"; + version = "2.7.1"; - src = fetchzip { - url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-OaKgX3qwiJM/EPprV1r3CbUnxOaWl7BTMcS5v+tmHoo="; - stripRoot = false; + src = fetchFromGitHub { + owner = "traefik"; + repo = "traefik"; + rev = "v${version}"; + sha256 = "sha256-uTE0Z7lgxKNq1wQSMUSp9dMfxV+aIm7cwYSkZBUdnug="; }; - vendorSha256 = "sha256-tqrfCpZ/fRYZBZ/SBAvvJebLBeD2M/AVJEPiseehJHY="; + vendorSha256 = "sha256-WlLntYrXs1kOu26yNeZI1xpb6FsHPiA/bNzaxCZTG4Y="; subPackages = [ "cmd/traefik" ]; - nativeBuildInputs = [ go-bindata ]; - - passthru.tests = { inherit (nixosTests) traefik; }; - preBuild = '' go generate CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary) - buildFlagsArray+=("-ldflags=\ - -X github.com/traefik/traefik/v2/pkg/version.Version=${version} \ - -X github.com/traefik/traefik/v2/pkg/version.Codename=$CODENAME") + buildFlagsArray+=("-ldflags= -s -w \ + -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Version=${version} \ + -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Codename=$CODENAME") ''; + doCheck = false; + + passthru.tests = { inherit (nixosTests) traefik; }; + meta = with lib; { homepage = "https://traefik.io"; description = "A modern reverse proxy"; From 82497b0e9f6ba961166bb8ccd970e43831549362 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Tue, 14 Jun 2022 01:50:58 +0300 Subject: [PATCH 081/814] trickster: 0.1.10 -> 1.1.5 --- .../modules/services/networking/trickster.nix | 20 +- pkgs/servers/trickster/trickster.nix | 53 +++- pkgs/servers/trickster/trickster_deps.nix | 237 ------------------ 3 files changed, 56 insertions(+), 254 deletions(-) delete mode 100644 pkgs/servers/trickster/trickster_deps.nix diff --git a/nixos/modules/services/networking/trickster.nix b/nixos/modules/services/networking/trickster.nix index e48bba8fa587..ac260a14d9a2 100644 --- a/nixos/modules/services/networking/trickster.nix +++ b/nixos/modules/services/networking/trickster.nix @@ -6,6 +6,9 @@ let cfg = config.services.trickster; in { + imports = [ + (mkRenamedOptionModule [ "services" "trickster" "origin" ] [ "services" "trickster" "origin-url" ]) + ]; options = { services.trickster = { @@ -58,11 +61,19 @@ in ''; }; - origin = mkOption { + origin-type = mkOption { + type = types.enum [ "prometheus" "influxdb" ]; + default = "prometheus"; + description = '' + Type of origin (prometheus, influxdb) + ''; + }; + + origin-url = mkOption { type = types.str; default = "http://prometheus:9090"; description = '' - URL to the Prometheus Origin. Enter it like you would in grafana, e.g., http://prometheus:9090 (default http://prometheus:9090). + URL to the Origin. Enter it like you would in grafana, e.g., http://prometheus:9090 (default http://prometheus:9090). ''; }; @@ -87,7 +98,7 @@ in config = mkIf cfg.enable { systemd.services.trickster = { - description = "Dashboard Accelerator for Prometheus"; + description = "Reverse proxy cache and time series dashboard accelerator"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { @@ -96,7 +107,8 @@ in ${cfg.package}/bin/trickster \ -log-level ${cfg.log-level} \ -metrics-port ${toString cfg.metrics-port} \ - -origin ${cfg.origin} \ + -origin-type ${cfg.origin-type} \ + -origin-url ${cfg.origin-url} \ -proxy-port ${toString cfg.proxy-port} \ ${optionalString (cfg.configFile != null) "-config ${cfg.configFile}"} \ ${optionalString (cfg.profiler-port != null) "-profiler-port ${cfg.profiler-port}"} \ diff --git a/pkgs/servers/trickster/trickster.nix b/pkgs/servers/trickster/trickster.nix index 5cf08ee6c3cf..a798e0ceff0d 100644 --- a/pkgs/servers/trickster/trickster.nix +++ b/pkgs/servers/trickster/trickster.nix @@ -1,26 +1,53 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "trickster"; - version = "0.1.10"; - - goPackagePath = "github.com/Comcast/trickster"; - - goDeps = ./trickster_deps.nix; + version = "1.1.5"; + rev = "4595bd6a1ae1165ef497251ad85c646dadc8a925"; src = fetchFromGitHub { - owner = "Comcast"; - repo = pname; + owner = "trickstercache"; + repo = "trickster"; rev = "v${version}"; - sha256 = "12z71rf03g2x8r7cgns0n4n46r0gjsfyig6z9r5xrn9kfghabfi8"; + sha256 = "sha256-BRD8IF3s9RaDorVtXRvbKLVVVXWiEQTQyKBR9jFo1eM="; }; - doCheck = true; + vendorSha256 = null; + + subPackages = [ "cmd/trickster" ]; + + preBuild = + let + ldflags = with lib; + concatStringsSep " " ( + [ "-extldflags '-static'" "-s" "-w" ] ++ + (mapAttrsToList (n: v: "-X main.application${n}=${v}") { + BuildTime = "1970-01-01T00:00:00+0000"; + GitCommitID = rev; + GoVersion = "$(go env GOVERSION)"; + GoArch = "$(go env GOARCH)"; + }) + ); + in + '' + buildFlagsArray+=("-ldflags=${ldflags}") + ''; + + # Tests are broken. + doCheck = false; meta = with lib; { - description = "Reverse proxy cache for the Prometheus HTTP APIv1"; - homepage = "https://github.com/Comcast/trickster"; + description = "Reverse proxy cache and time series dashboard accelerator"; + longDescription = '' + Trickster is a fully-featured HTTP Reverse Proxy Cache for HTTP + applications like static file servers and web APIs. + ''; + homepage = "https://trickstercache.org/"; license = licenses.asl20; maintainers = with maintainers; [ _1000101 ]; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/trickster/trickster_deps.nix b/pkgs/servers/trickster/trickster_deps.nix deleted file mode 100644 index ab100bed760e..000000000000 --- a/pkgs/servers/trickster/trickster_deps.nix +++ /dev/null @@ -1,237 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/alicebob/gopher-json"; - fetch = { - type = "git"; - url = "https://github.com/alicebob/gopher-json"; - rev = "5a6b3ba71ee6"; - sha256 = "0hx6n722zq51p852lv56k39yjy09lw6mnr2c3x0p23rfyyrakj2p"; - }; - } - { - goPackagePath = "github.com/alicebob/miniredis"; - fetch = { - type = "git"; - url = "https://github.com/alicebob/miniredis"; - rev = "cfad8aca71cc"; - sha256 = "0x2401nxyhdz037lj98c0sa77d8k49jfcq7is3ddiyim3csg5a0w"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "2972be24d48e"; - sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; - }; - } - { - goPackagePath = "github.com/coreos/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/coreos/bbolt"; - rev = "v1.3.0"; - sha256 = "0cp5v9iypg9ysiq40k3h3lg7aisxplnmxshha7nama6b170izyay"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.4.0"; - sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; - }; - } - { - goPackagePath = "github.com/go-redis/redis"; - fetch = { - type = "git"; - url = "https://github.com/go-redis/redis"; - rev = "v6.14.2"; - sha256 = "0s1if96r8xnadan7pz1j8hvzk9g4fm3phwmwzadwpq21pgni66d7"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "2e65f85255db"; - sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; - }; - } - { - goPackagePath = "github.com/gomodule/redigo"; - fetch = { - type = "git"; - url = "https://github.com/gomodule/redigo"; - rev = "v2.0.0"; - sha256 = "1kg7s8027b4g1sfw0v3nh30c15j407kv684s53gg281r807dnfpk"; - }; - } - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "v1.1.1"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; - }; - } - { - goPackagePath = "github.com/gorilla/handlers"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/handlers"; - rev = "v1.4.0"; - sha256 = "0mnw81ayjm4d8462qg8spmcwxmchn24158bf93zxjab51pg8n9gm"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "v1.6.2"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.9.1"; - sha256 = "01gnylazia30pcp069xcng482gwmm3xcx5zgrlwdkhic1lyb6i9l"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "4724e9255275"; - sha256 = "0pcx8hlnrxx5nnmpk786cn99rsgqk1jrd3c9f6fsx8qd8y5iwjy6"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "1dc9a6cbc91a"; - sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab"; - }; - } - { - goPackagePath = "github.com/yuin/gopher-lua"; - fetch = { - type = "git"; - url = "https://github.com/yuin/gopher-lua"; - rev = "a0dfe84f6227"; - sha256 = "13k2dphx4zv6fwgqsydsc0g0b0pf7qx3yb6i7hai6nnkh0db91nn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "a5c9d58dba9a"; - sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9"; - }; - } - { - goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/natefinch/lumberjack.v2"; - rev = "a96e63847dc3"; - sha256 = "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d"; - }; - } -] From 80ef1c69cd8187893ae72538c5b921c1e850b6cc Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 14 Jun 2022 01:13:18 +0200 Subject: [PATCH 082/814] libopenmpt-modplug: init at 0.8.9.0-openmpt1 --- .../audio/libopenmpt-modplug/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/libraries/audio/libopenmpt-modplug/default.nix diff --git a/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix b/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix new file mode 100644 index 000000000000..8d5ef86a8967 --- /dev/null +++ b/pkgs/development/libraries/audio/libopenmpt-modplug/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, lib +, fetchurl +, autoreconfHook +, pkg-config +, libopenmpt +}: + +stdenv.mkDerivation rec { + pname = "libopenmpt-modplug"; + version = "0.8.9.0-openmpt1"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "https://lib.openmpt.org/files/libopenmpt-modplug/libopenmpt-modplug-${version}.tar.gz"; + sha256 = "sha256-7M4aDuz9sLWCTKuJwnDc5ZWWKVosF8KwQyFez018T/c="; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libopenmpt + ]; + + configureFlags = [ + "--enable-libmodplug" + ]; + + meta = with lib; { + description = "A libmodplug emulation layer based on libopenmpt"; + homepage = "https://lib.openmpt.org/libopenmpt/"; + license = licenses.bsd3; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50f97085e478..edd4fe705500 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28918,6 +28918,8 @@ with pkgs; libopenmpt = callPackage ../development/libraries/audio/libopenmpt { }; + libopenmpt-modplug = callPackage ../development/libraries/audio/libopenmpt-modplug { }; + openrazer-daemon = with python3Packages; toPythonApplication openrazer-daemon; opusfile = callPackage ../applications/audio/opusfile { }; From 5e52fdf6f6751c0fc3a2bebe2adb0296f18fbcfd Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 14 Jun 2022 22:23:50 +0200 Subject: [PATCH 083/814] vengi-tools: 0.0.18 -> 0.0.20 --- nixos/tests/vengi-tools.nix | 2 +- pkgs/applications/graphics/vengi-tools/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/vengi-tools.nix b/nixos/tests/vengi-tools.nix index 8b80a13384e5..5bc8d72c7723 100644 --- a/nixos/tests/vengi-tools.nix +++ b/nixos/tests/vengi-tools.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { # OCR on voxedit's window is very expensive, so we avoid wasting a try # by letting the window load fully first machine.sleep(15) - machine.wait_for_text("Palette") + machine.wait_for_text("Solid") machine.screenshot("screen") ''; }) diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index eb5033a4a97c..fb44d36f62a6 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.18"; + version = "0.0.20"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - sha256 = "sha256-Ur1X5FhOa87jbjWBXievBfCHW+qP/8bqLiyKAC8+KU4="; + sha256 = "sha256-WsG6mjO90QQNsAarxdupZvXubdy06JjQmVYUzygl8l4="; }; nativeBuildInputs = [ From cee66a8cd5288493c001376e9bf22825777d5326 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 25 May 2022 11:49:17 +0200 Subject: [PATCH 084/814] make-options-doc: Support Nix-provided declaration links Previously, the location logic was hardcoded, supporting only Nixpkgs and NixOps properly, leaving other uses of the module system without good location support. --- .../lib/make-options-doc/options-to-docbook.xsl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/nixos/lib/make-options-doc/options-to-docbook.xsl b/nixos/lib/make-options-doc/options-to-docbook.xsl index 03e14365cda9..07d69649523f 100644 --- a/nixos/lib/make-options-doc/options-to-docbook.xsl +++ b/nixos/lib/make-options-doc/options-to-docbook.xsl @@ -213,6 +213,23 @@ + + + + + + + + + + + diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 96c6f57b019a..eec2d1ad04ab 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15 +, linuxPackages_5_18 ? pkgs.linuxKernel.packages.linux_5_18 }: let @@ -216,28 +216,28 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "5.18"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelOlder "5.19"; + latestCompatibleLinuxPackages = linuxPackages_5_18; # this package should point to the latest release. - version = "2.1.4"; + version = "2.1.5"; - sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4="; + sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE="; }; zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "5.18"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelOlder "5.19"; + latestCompatibleLinuxPackages = linuxPackages_5_18; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.4"; + version = "2.1.5"; # rev = "0000000000000000000000000000000000000000"; - sha256 = "sha256-pHz1N2j+d9p1xleEBwwrmK9mN5gEyM69Suy0dsrkZT4="; + sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE="; isUnstable = true; }; From 567738b1d410ead51c38eb64b940e4d57a869278 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 22:09:23 +0200 Subject: [PATCH 584/814] sslscan: 2.0.13 -> 2.0.14 --- pkgs/tools/security/sslscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index ae94b6e25470..6c112d6488da 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.0.13"; + version = "2.0.14"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = version; - sha256 = "sha256-boXp26f8jiw73lMLwUMuAuDBRIw8JzokYadbKx/VeSg="; + sha256 = "sha256-CqfxiTRIgrr4J6qThDFqohkxJj5Byf0vQzG+voAEzag="; }; buildInputs = [ openssl ]; From ef61c5e069409777e5d8226568401df09a94a018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Jun 2022 20:05:03 +0200 Subject: [PATCH 585/814] python310Packages.python-magic: 0.4.26 -> 0.4.27 --- pkgs/development/python-modules/python-magic/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 852b66b44e5f..3338fb6fa7d0 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, python , buildPythonPackage , fetchFromGitHub , substituteAll @@ -10,13 +9,13 @@ buildPythonPackage rec { pname = "python-magic"; - version = "0.4.26"; + version = "0.4.27"; src = fetchFromGitHub { owner = "ahupp"; repo = "python-magic"; rev = version; - sha256 = "sha256-RcKldMwSRroNZNEl0jwuJG9C+3OIPBzk+CjqkxKK/eY="; + sha256 = "sha256-fZ+5xJ3P0EYK+6rQ8VzXv2zckKfEH5VUdISIR6ybIfQ="; }; patches = [ From 2c4be24dcf483eaef14709dd3e212c18a237ba0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jun 2022 19:10:47 +0000 Subject: [PATCH 586/814] python310Packages.gsd: 2.5.1 -> 2.5.3 --- pkgs/development/python-modules/gsd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index f4f3a7eb13fa..0714352ed5ee 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -4,15 +4,15 @@ }: buildPythonPackage rec { - version = "2.5.1"; + version = "2.5.3"; pname = "gsd"; disabled = isPy27; src = fetchFromGitHub { owner = "glotzerlab"; repo = pname; - rev = "v${version}"; - sha256 = "00cy4lw7xnl2skfx7fg7cs1c8lrbaxvkym9j6zfi1dbvsdd0r103"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-3CJKpvgJuFC/2qQdy0H/kvLbtmfF22gBAQustK99uEE="; }; nativeBuildInputs = [ cython ]; From 0137050ca6ea14f7007e97eec4563ec14df2f9dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 23 Jun 2022 20:09:17 +0200 Subject: [PATCH 587/814] python310Packages.eth-typing: 3.0.0 -> 3.1.0 --- pkgs/development/python-modules/eth-typing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index a2f3103be47d..6c8bc6cb5707 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "3.0.0"; + version = "3.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-typing"; rev = "v${version}"; - sha256 = "sha256-9rrnDFPWAmrUkr2mVTVi/8DTJdg4hzGaU0UbpwG5mtY="; + sha256 = "sha256-Xk/IfW1zuNbGdYAxXTNL9kL+ZW1bWruZ21KFV9+lv/E="; }; checkInputs = [ From 2e16cc76042815c6eac344f872eb349ee439660a Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Tue, 21 Jun 2022 13:50:27 -0600 Subject: [PATCH 588/814] vscode-extensions.grapecity.gc-excelviewer: init at 4.2.55 --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ae65dc33d613..170f981ae533 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1041,6 +1041,22 @@ let }; }; + grapecity.gc-excelviewer = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "gc-excelviewer"; + publisher = "grapecity"; + version = "4.2.55"; + sha256 = "sha256-yHl6ZTGIKOEsqmyeYtgDUhNAN9uRpoFApA7FKkPWW3E="; + }; + meta = with lib; { + description = "Edit Excel spreadsheets and CSV files in Visual Studio Code and VS Code for the Web"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=grapecity.gc-excelviewer"; + homepage = "https://github.com/jjuback/gc-excelviewer"; + license = licenses.mit; + maintainers = with maintainers; [ kamadorueda ]; + }; + }; + humao.rest-client = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "humao"; From 2cb3b82e14a0d001e0260816e0724ebcf4276b6e Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Thu, 23 Jun 2022 12:06:29 -0600 Subject: [PATCH 589/814] vscode-extensions.mattn.lisp: init at 0.1.12 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 170f981ae533..d4a542bb99e4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1511,6 +1511,23 @@ let }; }; + mattn.lisp = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "lisp"; + publisher = "mattn"; + version = "0.1.12"; + sha256 = "sha256-x6aFrcX0YElEFEr0qA669/LPlab15npmXd5Q585pIEw="; + }; + meta = with lib; { + description = "Lisp syntax for vscode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mattn.lisp"; + homepage = "https://github.com/mattn/vscode-lisp"; + changelog = "https://marketplace.visualstudio.com/items/mattn.lisp/changelog"; + license = licenses.mit; + maintainers = with maintainers; [ kamadorueda ]; + }; + }; + mhutchie.git-graph = buildVscodeMarketplaceExtension { mktplcRef = { name = "git-graph"; From 14b4830da921820b4ef389bf337b1e14473871c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jun 2022 20:17:13 +0000 Subject: [PATCH 590/814] python310Packages.pulumi-aws: 5.9.0 -> 5.9.1 --- pkgs/development/python-modules/pulumi-aws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index b62f9b7eaaf5..838422a31a25 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.9.0"; + version = "5.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-QEOVI6PvFJ8gf02Hlh42grMt2cObTJsOSmrgmjEZ8Rw="; + hash = "sha256-LYWxdqortazhev73JSTItrEyZZYFmeXkAko/2aFKaSw="; }; sourceRoot = "${src.name}/sdk/python"; From 057c7b5938f2687269513af1c774414d44744c88 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 21 Jun 2022 00:05:21 +0100 Subject: [PATCH 591/814] gpm: pull patch pending upstream inclusion to fix parallel install Without the change when install parallelism is enabled it fails as: install -c gpm ../gpm-unstable-2020-06-17/sbin/gpm install: cannot create regular file '../gpm-unstable-2020-06-17/sbin/gpm': No such file or directory --- pkgs/servers/gpm/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index f132f98344a9..66c6607e6472 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -27,6 +27,14 @@ stdenv.mkDerivation rec { url = "https://github.com/kaction/gpm/commit/217b4fe4c9b62298a4e9a54c1f07e3b52b013a09.patch"; sha256 = "1f74h12iph4z1dldbxk9imcq11805c3ai2xhbsqvx8jpjrcfp19q"; }) + + # Pull fix pending upstream inclusion to fix parallel installation: + # https://github.com/telmich/gpm/pull/43 + (fetchpatch { + name = "parallel-install.patch"; + url = "https://github.com/telmich/gpm/commit/a88fb82a7afe96e872bb31c554e9ad5888f5a451.patch"; + sha256 = "0g1jhz9bjw7vqjv922xkhs8xkjxdqh11nj38jj3c8nv5lcil76nx"; + }) ]; preConfigure = '' ./autogen.sh @@ -38,6 +46,8 @@ stdenv.mkDerivation rec { (if ncurses == null then "--without-curses" else "--with-curses") ]; + enableParallelBuilding = true; + # Provide libgpm.so for compatability postInstall = '' ln -sv $out/lib/libgpm.so.2 $out/lib/libgpm.so From 8e530526dc5980f2f15fd96d61b8dee1055e5533 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Jun 2022 19:16:47 +0000 Subject: [PATCH 592/814] python310Packages.wandb: 0.12.18 -> 0.12.19 --- pkgs/development/python-modules/wandb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 830403293021..747f60bc21f8 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.12.18"; + version = "0.12.19"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -47,8 +47,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = "client"; - rev = "v${version}"; - hash = "sha256-9++CFoC8p3cACPyjRbb6i8MdJp8iD9GUh0uHpTiufdg="; + rev = "refs/tags/v${version}"; + hash = "sha256-eH65vk3Pnm6d4vDiaWbs1tXD0lCRkfOB2hqD9MGxuXY="; }; patches = [ From 57777e6d56235fe64620ac1605fc3a2009842ffa Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 28 May 2022 14:10:41 +0200 Subject: [PATCH 593/814] ocamlPackages.parmap: disable tests --- pkgs/development/ocaml-modules/parmap/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/parmap/default.nix b/pkgs/development/ocaml-modules/parmap/default.nix index 521c1c406714..18e1975b698d 100644 --- a/pkgs/development/ocaml-modules/parmap/default.nix +++ b/pkgs/development/ocaml-modules/parmap/default.nix @@ -10,13 +10,12 @@ buildDunePackage rec { }; minimalOCamlVersion = "4.03"; - useDune2 = true; buildInputs = [ dune-configurator ]; - doCheck = true; + doCheck = false; # prevent running slow benchmarks meta = with lib; { description = "Library for multicore parallel programming"; From 7d634c9f977e324ec228dc74da58df6464a9a20a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 18 Jun 2022 14:39:37 +0200 Subject: [PATCH 594/814] ocamlPackages.fmt: do not propagate `cmdliner` --- pkgs/development/ocaml-modules/fmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index 4816cab57cfd..bd5629816528 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = [ topkg ]; - propagatedBuildInputs = [ cmdliner seq stdlib-shims ]; + buildInputs = [ cmdliner topkg ]; + propagatedBuildInputs = [ seq stdlib-shims ]; strictDeps = true; From 8681aa0d6528b65dee31c6b8d42c97aaaee984de Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 20 Jun 2022 09:24:59 +0200 Subject: [PATCH 595/814] ocamlPackages.ocaml-r: mark as broken --- pkgs/development/ocaml-modules/ocaml-r/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix index fcee63de3b5d..ed22177bfaac 100644 --- a/pkgs/development/ocaml-modules/ocaml-r/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix @@ -37,6 +37,8 @@ buildDunePackage rec { checkInputs = [ alcotest ]; meta = { + # This has been broken by the update to R 4.2.0 (#171597) + broken = true; description = "OCaml bindings for the R interpreter"; inherit (src.meta) homepage; license = lib.licenses.gpl3; From 956560470bb5c6a7e3ffaa45557092656726b7b4 Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 23 Jun 2022 23:05:04 +0200 Subject: [PATCH 596/814] signal-desktop: 5.46.0 -> 5.47.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c8f57d20ec11..7d18a8d29252 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.46.0"; # Please backport all updates to the stable channel. + version = "5.47.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-zy9nETD82KguML0MXe8hlB4m+fBCMmJ1z/2Neq6QvEU="; + sha256 = "sha256-aQpylo4/pbHP2an1w6DEhRmU3uvntN/tnYhvaWtNGGg="; }; nativeBuildInputs = [ From eb72486d13038d992f58fcce94207279fe6f681a Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 23 Jun 2022 23:10:17 +0200 Subject: [PATCH 597/814] ocamlPackages.ffmpeg*: 1.1.3 -> 1.1.4 --- pkgs/development/ocaml-modules/ffmpeg/base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index 5dc5f612fd32..212ad686e356 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: rec { - version = "1.1.3"; + version = "1.1.4"; useDune2 = true; @@ -9,7 +9,7 @@ rec { owner = "savonet"; repo = "ocaml-ffmpeg"; rev = "v${version}"; - sha256 = "1l40dfc0v3wn2drfq0mclrc1lrlpycdjrkrw4knkwpsg0za68v4c"; + sha256 = "sha256-IM7bzOZAZQjLz4YjRTMU5fZgrA2QTZcSDMgclDo4sn0="; }; meta = with lib; { From 8a40b9f1e618879c02902a25f4b795e714f481b4 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Fri, 24 Jun 2022 00:13:04 +0300 Subject: [PATCH 598/814] zfsbackup: unstable-2020-09-30 -> unstable-2021-05-26 --- pkgs/tools/backup/zfsbackup/default.nix | 26 +- pkgs/tools/backup/zfsbackup/deps.nix | 1326 ----------------------- 2 files changed, 17 insertions(+), 1335 deletions(-) delete mode 100644 pkgs/tools/backup/zfsbackup/deps.nix diff --git a/pkgs/tools/backup/zfsbackup/default.nix b/pkgs/tools/backup/zfsbackup/default.nix index ff47ce47edef..332ad619a431 100644 --- a/pkgs/tools/backup/zfsbackup/default.nix +++ b/pkgs/tools/backup/zfsbackup/default.nix @@ -1,26 +1,34 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, zfs +}: -buildGoPackage rec { +buildGoModule rec { pname = "zfsbackup"; - version = "unstable-2020-09-30"; - rev = "092f80846b23e02f99d2aa72d9d889eabfdcb053"; - - goPackagePath = "github.com/someone1/zfsbackup-go"; + version = "unstable-2021-05-26"; + rev = "2d4534b920d3c57552667e1c6da9978b3a9278f0"; src = fetchFromGitHub { owner = "someone1"; repo = "zfsbackup-go"; inherit rev; - sha256 = "1xiacaf4r9jkx0m8wjfis14cq622yhljldwkflh9ni3khax7dlgi"; + sha256 = "sha256-slVwXXGLvq+eAlqzD8p1fnc17CGUBY0Z68SURBBuf2k="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-jpxp8RKDBrkBBaY89QnKYGWFI/DUURUVX8cPJ/qoLrg="; + + ldflags = [ "-w" "-s" ]; + + # Tests require loading the zfs kernel module. + doCheck = false; meta = with lib; { description = "Backup ZFS snapshots to cloud storage such as Google, Amazon, Azure, etc"; homepage = "https://github.com/someone1/zfsbackup-go"; license = licenses.mit; - maintainers = [ maintainers.xfix ]; + maintainers = with maintainers; [ xfix ]; + platforms = platforms.linux; mainProgram = "zfsbackup-go"; }; } diff --git a/pkgs/tools/backup/zfsbackup/deps.nix b/pkgs/tools/backup/zfsbackup/deps.nix deleted file mode 100644 index 28be9fa141cf..000000000000 --- a/pkgs/tools/backup/zfsbackup/deps.nix +++ /dev/null @@ -1,1326 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-cloud-go"; - rev = "v0.57.0"; - sha256 = "0lcq68h0x56qb14yx2df584ad0g9s1s19py813dy9nzqp0bmjig8"; - }; - } - { - goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; - fetch = { - type = "git"; - url = "https://dmitri.shuralyov.com/gpu/mtl"; - rev = "666a987793e9"; - sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; - }; - } - { - goPackagePath = "github.com/Azure/azure-pipeline-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-pipeline-go"; - rev = "v0.2.2"; - sha256 = "1agn2nzmm1dkwggm4w7h4bnrav4n5jrl0vqbqy2s49vqlr8zirn6"; - }; - } - { - goPackagePath = "github.com/Azure/azure-sdk-for-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-sdk-for-go"; - rev = "v42.3.0"; - sha256 = "1nqxpifrr8n17irkfzhx253b17cwd15x4vfqxx80l5y7dn0jqavq"; - }; - } - { - goPackagePath = "github.com/Azure/azure-storage-blob-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-storage-blob-go"; - rev = "v0.8.0"; - sha256 = "00gsnk9s1rlrakqvcm917hn4r47jannxwp7rkhrb71pamzm46752"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/BurntSushi/xgb"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/xgb"; - rev = "27f122750802"; - sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; - }; - } - { - goPackagePath = "github.com/OneOfOne/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/OneOfOne/xxhash"; - rev = "v1.2.2"; - sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/armon/consul-api"; - fetch = { - type = "git"; - url = "https://github.com/armon/consul-api"; - rev = "eb2c6b5be1b6"; - sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "v1.31.4"; - sha256 = "07ia78j6j2y139iq9x5gin0fwc77wv8x0zhg47kibykxn4iyx85y"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "v2.2.1"; - sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; - }; - } - { - goPackagePath = "github.com/census-instrumentation/opencensus-proto"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-proto"; - rev = "v0.2.1"; - sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; - }; - } - { - goPackagePath = "github.com/cespare/xxhash"; - fetch = { - type = "git"; - url = "https://github.com/cespare/xxhash"; - rev = "v1.1.0"; - sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; - }; - } - { - goPackagePath = "github.com/chzyer/logex"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/logex"; - rev = "v1.1.10"; - sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; - }; - } - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "2972be24d48e"; - sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; - }; - } - { - goPackagePath = "github.com/chzyer/test"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/test"; - rev = "a1ea475d72b1"; - sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; - }; - } - { - goPackagePath = "github.com/client9/misspell"; - fetch = { - type = "git"; - url = "https://github.com/client9/misspell"; - rev = "v0.3.4"; - sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; - }; - } - { - goPackagePath = "github.com/cncf/udpa"; - fetch = { - type = "git"; - url = "https://github.com/cncf/udpa"; - rev = "269d4d468f6f"; - sha256 = "0i1jiaw2k3hlwwmg4hap81vb4s1p25xp9kdfww37v0fbgjariccs"; - }; - } - { - goPackagePath = "github.com/coreos/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/coreos/bbolt"; - rev = "v1.3.2"; - sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "v3.3.10"; - sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "v0.2.0"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; - } - { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "95778dfbb74e"; - sha256 = "1s3bg9p78wkixn2bqb2p23wbsqfg949ml6crw2b498s71mwh8rcf"; - }; - } - { - goPackagePath = "github.com/coreos/pkg"; - fetch = { - type = "git"; - url = "https://github.com/coreos/pkg"; - rev = "399ea9e2e55f"; - sha256 = "0nxbn0m7lr4dg0yrwnvlkfiyg3ndv8vdpssjx7b714nivpc6ar0y"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v2.0.0"; - sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "v3.2.0"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/dgryski/go-sip13"; - fetch = { - type = "git"; - url = "https://github.com/dgryski/go-sip13"; - rev = "e10d5fee7954"; - sha256 = "15fyibfas209ljz3f7g07kdmfbl3hhyd9n5n7aq5n5p9m5mn41d6"; - }; - } - { - goPackagePath = "github.com/dnaeon/go-vcr"; - fetch = { - type = "git"; - url = "https://github.com/dnaeon/go-vcr"; - rev = "v1.0.1"; - sha256 = "1d0kpqr12qrqlamz5a47bp05mx49za2v6l1k7c6z71xahfmb7v2d"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "v1.0.0"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/envoyproxy/go-control-plane"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/go-control-plane"; - rev = "v0.9.4"; - sha256 = "0m0crzx70lp7vz13v20wxb1fcfdnzp7h3mkh3bn6a8mbfz6w5asj"; - }; - } - { - goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/protoc-gen-validate"; - rev = "v0.1.0"; - sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "v1.0.0"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - { - goPackagePath = "github.com/go-gl/glfw"; - fetch = { - type = "git"; - url = "https://github.com/go-gl/glfw"; - rev = "6f7a984d4dc4"; - sha256 = "1nyv7h08qf4dp8w9pmcnrc6vv9bkwj8fil6pz0mkbss5hf4i8xcq"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.4.0"; - sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "v1.5.0"; - sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.2.1"; - sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "8c9f03a8e57e"; - sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.4.3"; - sha256 = "1p37xnja1dgq5ykx24n7wincwz2gahjh71b95p8vpw7ss2g8j8wx"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.4.1"; - sha256 = "0w7ks4vffnnkp0miwgc3chrsnmya45lzvpahb2wmw0jwhdp5kdx7"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "v1.0.0"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.4.0"; - sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; - }; - } - { - goPackagePath = "github.com/google/martian"; - fetch = { - type = "git"; - url = "https://github.com/google/martian"; - rev = "v2.1.0"; - sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; - }; - } - { - goPackagePath = "github.com/google/pprof"; - fetch = { - type = "git"; - url = "https://github.com/google/pprof"; - rev = "fc25d7d30c6d"; - sha256 = "0ba28qx2i1bi6n6x5g670v8hmqavwj8lwl8psnc6vzagmdhjw0vg"; - }; - } - { - goPackagePath = "github.com/google/renameio"; - fetch = { - type = "git"; - url = "https://github.com/google/renameio"; - rev = "v0.1.0"; - sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "v2.0.5"; - sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.0"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-middleware"; - rev = "v1.0.0"; - sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; - rev = "v1.2.0"; - sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/grpc-gateway"; - rev = "v1.9.0"; - sha256 = "1r4y48c76yxc2hpqszfjirvh7zxjb6z72qmk95li12ar79dhv3dy"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.1"; - sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/ianlancetaylor/demangle"; - fetch = { - type = "git"; - url = "https://github.com/ianlancetaylor/demangle"; - rev = "5e5cf60278f6"; - sha256 = "1fhjk11cip9c3jyj1byz9z77n6n2rlxmyz0xjx1zpn1da3cvri75"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "v0.3.0"; - sha256 = "12qgp7yb7yfjxhd311kb820fcjmg7gd4hp2fc4v6x8s7121pwnjp"; - }; - } - { - goPackagePath = "github.com/jonboulle/clockwork"; - fetch = { - type = "git"; - url = "https://github.com/jonboulle/clockwork"; - rev = "v0.1.0"; - sha256 = "1pqxhsdavbp1n5grgyx2j6ylvql2fzn2cvpsgkc8li69dil7sibl"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "v0.9.1"; - sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; - }; - } - { - goPackagePath = "github.com/juju/ratelimit"; - fetch = { - type = "git"; - url = "https://github.com/juju/ratelimit"; - rev = "v1.0.1"; - sha256 = "0ppwvwbh9jdpdk4f9924vw373cpfz5g5ad10c707p22a984vanrz"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/kisielk/errcheck"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/errcheck"; - rev = "v1.1.0"; - sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/klauspost/compress"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/compress"; - rev = "v1.10.6"; - sha256 = "0jnm5mjazxkjwzb7z6sjlqm2l68z4h4xjhir2lgfkf04rj4l290s"; - }; - } - { - goPackagePath = "github.com/klauspost/pgzip"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/pgzip"; - rev = "v1.2.4"; - sha256 = "0mnhfdn0isbkra455jynqjbmrwymx09shlbzbyvgfycih3nbrif0"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/kurin/blazer"; - fetch = { - type = "git"; - url = "https://github.com/kurin/blazer"; - rev = "v0.5.3"; - sha256 = "18jsq7n31ycvaivpvyksbddj82spw4g29w6dx92x2wab2hzbc7ik"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "v1.8.0"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mattn/go-ieproxy"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-ieproxy"; - rev = "v0.0.1"; - sha256 = "0x1ijwwp22s20vjbca5ac7y7bx2jp6jizzqa38ks4943q7vi4w09"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/miolini/datacounter"; - fetch = { - type = "git"; - url = "https://github.com/miolini/datacounter"; - rev = "v1.0.2"; - sha256 = "0lqhdb9glx65ycjjrqqqpd28zi95qnr2sdz93y6fma0khss46c5f"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.1.2"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/nightlyone/lockfile"; - fetch = { - type = "git"; - url = "https://github.com/nightlyone/lockfile"; - rev = "v1.0.0"; - sha256 = "0jzlngank7yaq5pl5mipsfglmalv9x2b9yhqr78w5dmx4hikh7kr"; - }; - } - { - goPackagePath = "github.com/oklog/ulid"; - fetch = { - type = "git"; - url = "https://github.com/oklog/ulid"; - rev = "v1.3.1"; - sha256 = "0hybwyid820n80axrk863k2py93hbqlq6hxhf84ppmz0qd0ys0gq"; - }; - } - { - goPackagePath = "github.com/op/go-logging"; - fetch = { - type = "git"; - url = "https://github.com/op/go-logging"; - rev = "970db520ece7"; - sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.2.0"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.9.1"; - sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.9.3"; - sha256 = "1608rm1y2p3iv8k2x7wyc6hshvpbfkv2k77hy0x870syms1g3g1p"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "14fe0d1b01d4"; - sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.4.0"; - sha256 = "00008pczafy982m59n1j31pnp41f4grbc2c40jccp52xg3m5klmr"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "5867b95ac084"; - sha256 = "1rahdk62ajj4zpfb3mgzjqip773la9fb0m87m7s9a0b39l3fmzvr"; - }; - } - { - goPackagePath = "github.com/prometheus/tsdb"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/tsdb"; - rev = "v0.7.1"; - sha256 = "1c1da8i5byvhh4fp3vqjfb65aaksjskn3ggb8wg9hcfzjrhgpz04"; - }; - } - { - goPackagePath = "github.com/rogpeppe/fastuuid"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/fastuuid"; - rev = "6724a57986af"; - sha256 = "12s65phfx6hxj4v0b5kj8akgrbf5mxpa101fyzw03h6hld1f70cz"; - }; - } - { - goPackagePath = "github.com/rogpeppe/go-internal"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/go-internal"; - rev = "v1.3.0"; - sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v2.0.1"; - sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "v1.2.0"; - sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "v1.0.0"; - sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; - }; - } - { - goPackagePath = "github.com/soheilhy/cmux"; - fetch = { - type = "git"; - url = "https://github.com/soheilhy/cmux"; - rev = "v0.1.4"; - sha256 = "1f736g68d9vwlyfb6g0fxkr0r875369xafk30cz8kaq5niaqwv0h"; - }; - } - { - goPackagePath = "github.com/spaolacci/murmur3"; - fetch = { - type = "git"; - url = "https://github.com/spaolacci/murmur3"; - rev = "f09979ecbc72"; - sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "v1.3.0"; - sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v1.0.0"; - sha256 = "0vbppqqhby302a5ayn0296jqr71qkcd4c9am7wzsk6z71fwdsa7h"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "v1.0.0"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.5"; - sha256 = "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "v1.4.0"; - sha256 = "1zpzxvn13wpvbblbbn73svaq39zgxfjqhci9d68g3qf309pcfy19"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.5.1"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - }; - } - { - goPackagePath = "github.com/tmc/grpc-websocket-proxy"; - fetch = { - type = "git"; - url = "https://github.com/tmc/grpc-websocket-proxy"; - rev = "0ad062ec5ee5"; - sha256 = "1anw4v9wspnw9xf2z5r9w0sszwjklyanl0l85wgg6nxak9gnrqp4"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "v1.1.4"; - sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; - }; - } - { - goPackagePath = "github.com/xiang90/probing"; - fetch = { - type = "git"; - url = "https://github.com/xiang90/probing"; - rev = "43a291ad63a2"; - sha256 = "1z22ms16j5j42775mf31isanwx2pwr1d8wqw8006dczjv36qnz5i"; - }; - } - { - goPackagePath = "github.com/xordataexchange/crypt"; - fetch = { - type = "git"; - url = "https://github.com/xordataexchange/crypt"; - rev = "b2862e3d0a77"; - sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; - }; - } - { - goPackagePath = "github.com/yuin/goldmark"; - fetch = { - type = "git"; - url = "https://github.com/yuin/goldmark"; - rev = "v1.1.27"; - sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923"; - }; - } - { - goPackagePath = "go.etcd.io/bbolt"; - fetch = { - type = "git"; - url = "https://github.com/etcd-io/bbolt"; - rev = "v1.3.2"; - sha256 = "13d5l6p6c5wvkr6vn9hkhz9c593qifn7fgx0hg4d6jcvg1y0bnm2"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "v0.22.3"; - sha256 = "0xj16iq5jp26hi2py7lsd8cvqh651fgn39y05gzvjdi88d9xd3nw"; - }; - } - { - goPackagePath = "go.uber.org/atomic"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/atomic"; - rev = "v1.4.0"; - sha256 = "0c6yzx15c20719xii3dm0vyjd8i9jx45m0wh5yp1zf29b0gbljcy"; - }; - } - { - goPackagePath = "go.uber.org/multierr"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/multierr"; - rev = "v1.1.0"; - sha256 = "1slfc6syvw8cvr6rbrjsy6ja5w8gsx0f8aq8qm16rp2x5c2pj07w"; - }; - } - { - goPackagePath = "go.uber.org/zap"; - fetch = { - type = "git"; - url = "https://github.com/uber-go/zap"; - rev = "v1.10.0"; - sha256 = "10hdzr1rghwbsl6bbd30779dx44fh9mg9pq8d2cgqlknqxxpvpvr"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "06a226fb4e37"; - sha256 = "0fdig6jx81g7a44dnxggibl909wchsj4nakmmhhz7db36sl0d7m5"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "6cc2880d07d6"; - sha256 = "1iia6hiif6hcp0cg1i6nq63qg0pmvm2kq24pf2r2il3597rfmlgy"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "cff245a6509b"; - sha256 = "0hiznlkiaay30acwvvyq8g6bm32r7bc6gv47pygrcxqpapasbz84"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "738671d3881b"; - sha256 = "0jkiz4py59jjnkyxbxifpf7bsar11lbgmj5jiq2kic5k03shkn9c"; - }; - } - { - goPackagePath = "golang.org/x/mobile"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mobile"; - rev = "d2bd2a29d028"; - sha256 = "1nv6vvhnjr01nx9y06q46ww87dppdwpbqrlsfg1xf2587wxl8xiv"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "v0.2.0"; - sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "7e3656a0809f"; - sha256 = "1rmj59bd0hvf8cbp42c0y8y38prs5ill1zszhqp9i8m86cvkfqk9"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bf48bf16ab8d"; - sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "43a5402ce75a"; - sha256 = "0j6zrrb81qjr1926kkwmn0di9a0jn8qyjd9dw614rfkihxgq1vsm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "7e40ca221e25"; - sha256 = "1fkhs1sn6prfsqaj70kya2gn1sqqa85lmgff6j6s7027zc1yjvqa"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "555d28b269f0"; - sha256 = "1rhl4lyz030kwfsg63yk83yd3ivryv1afmzdz9sxbhcj84ym6h4r"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "2bc93b1c0c88"; - sha256 = "10sg7nvw40f2d6hxmsy4nvhmawbidk022v3arbh8acsjxglw84zs"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-api-go-client"; - rev = "v0.25.0"; - sha256 = "0bfpii160ns1pl3iqc38h5db258mv58igf2ifglds3dajgsj2qrr"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.6.6"; - sha256 = "15c38h6fbv06cnkr6yknygfrpibyms2mya4w0l29kaxf42jn1qi5"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/go-genproto"; - rev = "f5ebc3bea380"; - sha256 = "1v5dyp6g35rwjwx1ixjy7yh1hay4n7ya5aq5h4ckvd9h0j7rw5sz"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.29.1"; - sha256 = "1465947r6536si36cl2ppx7929la9zba1y6xfczfyp4kgf8988hf"; - }; - } - { - goPackagePath = "google.golang.org/protobuf"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/protobuf"; - rev = "v1.22.0"; - sha256 = "0n7lc4m7kfvj01glc0gnjy0zsnsic7cxnbvlajy0h14cxbab87pj"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/errgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/errgo.v2"; - rev = "v2.1.0"; - sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2"; - }; - } - { - goPackagePath = "gopkg.in/resty.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/resty.v1"; - rev = "v1.12.0"; - sha256 = "062mn735rqzhha5ag07z4gz08hxzrfm2yx067jfmaaxmb6797lmp"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "v0.0.1-2020.1.3"; - sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; - }; - } - { - goPackagePath = "rsc.io/binaryregexp"; - fetch = { - type = "git"; - url = "https://github.com/rsc/binaryregexp"; - rev = "v0.2.0"; - sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b"; - }; - } - { - goPackagePath = "rsc.io/quote"; - fetch = { - type = "git"; - url = "https://github.com/rsc/quote"; - rev = "v3.1.0"; - sha256 = "0nvv97hwwrl1mx5gzsbdm1ndnwpg3m7i2jb10ig9wily7zmvki0i"; - }; - } - { - goPackagePath = "rsc.io/sampler"; - fetch = { - type = "git"; - url = "https://github.com/rsc/sampler"; - rev = "v1.3.0"; - sha256 = "0byxk2ynba50py805kcvbvjzh59l1r308i1xgyzpw6lff4xx9xjh"; - }; - } -] From 9741b60e02497c507fa44f0a88e41de3170effa6 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Fri, 24 Jun 2022 00:23:06 +0300 Subject: [PATCH 599/814] serfdom: 0.8.1 -> 0.9.8 --- pkgs/servers/serf/default.nix | 42 ++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 8964796862ce..da1bf0770fd0 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -1,23 +1,43 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "serf"; - version = "0.8.1"; - rev = "v${version}"; - - goPackagePath = "github.com/hashicorp/serf"; + version = "0.9.8"; + rev = "a2bba5676d6e37953715ea10e583843793a0c507"; src = fetchFromGitHub { owner = "hashicorp"; repo = "serf"; - inherit rev; - sha256 = "1arakjvhyasrk52vhxas2ghlrby3i3wj59r7sjrkbpln2cdbqnlx"; + rev = "v${version}"; + sha256 = "sha256-UWCxzwV2bcT8Sfl296HpBThe+qYX19M7sNcEJHs/sXc="; }; + vendorSha256 = "sha256-DaPcCuj0KGpuOC6XynltMBE9wO7w5qKrTChC401249o="; + + subPackages = [ "cmd/serf" ]; + + # These values are expected by version/version.go + # https://github.com/hashicorp/serf/blob/7faa1b06262f70780c3c35ac25a4c96d754f06f3/version/version.go#L8-L22 + ldflags = lib.mapAttrsToList + (n: v: "-X github.com/hashicorp/serf/version.${n}=${v}") { + GitCommit = rev; + Version = version; + VersionPrerelease = ""; + }; + + # There are no tests for cmd/serf. + doCheck = false; + meta = with lib; { - description = "Tool for service orchestration and management"; - homepage = "https://www.serf.io/"; - platforms = platforms.linux ++ platforms.darwin; + description = "Service orchestration and management tool"; + longDescription = '' + Serf is a decentralized solution for service discovery and orchestration + that is lightweight, highly available, and fault tolerant. + ''; + homepage = "https://www.serf.io"; license = licenses.mpl20; maintainers = with maintainers; [ pradeepchhetri ]; }; From 251ca357bb1f5f9710a1c05784711622ffc824d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Thu, 23 Jun 2022 23:25:15 +0200 Subject: [PATCH 600/814] micromamba: build on all platforms --- pkgs/tools/package-management/micromamba/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index c1f8fc9c990b..6083a83872b3 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { description = "Reimplementation of the conda package manager"; homepage = "https://github.com/mamba-org/mamba"; license = licenses.bsd3; - platforms = platforms.linux; maintainers = with maintainers; [ mausch ]; }; } From 9a2dc5458587a829940156664f0e92c41879be5e Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Thu, 23 Jun 2022 15:25:43 -0600 Subject: [PATCH 601/814] binance: 1.35.0 -> 1.36.0 --- pkgs/applications/misc/binance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/binance/default.nix b/pkgs/applications/misc/binance/default.nix index 9aa6e9bb9dd4..15e3c51e9ad4 100644 --- a/pkgs/applications/misc/binance/default.nix +++ b/pkgs/applications/misc/binance/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "binance"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb"; - sha256 = "sha256-6c7nrdViunnvPqqbt5/LQp2iS4EgZOCQ9PLcG+bY1YQ="; + sha256 = "sha256-Q1cvEQ/yxytzrPfiyeTZSCPecnmSdhy+ds/gtie4vwo="; }; nativeBuildInputs = [ From 4ea3d5e65d0b9e1e3a3e87d415cc935ee4848756 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Fri, 24 Jun 2022 00:31:15 +0300 Subject: [PATCH 602/814] interlock: 2016.04.13 -> 2020.03.05 --- pkgs/servers/interlock/default.nix | 48 ++++++++++++++-------- pkgs/servers/interlock/deps.nix | 65 ------------------------------ 2 files changed, 32 insertions(+), 81 deletions(-) delete mode 100644 pkgs/servers/interlock/deps.nix diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index e151c9ec45e3..1fbe7444491c 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -1,27 +1,28 @@ -{ sudo, coreutils, systemd, cryptsetup -, mount, umount -, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, coreutils +, cryptsetup +, mount +, systemd +, umount +}: -buildGoPackage rec { +buildGoModule rec { pname = "interlock"; - version = "2016.04.13"; - rev = "v${version}"; - - goPackagePath = "github.com/inversepath/interlock"; - - subPackages = [ "./cmd/interlock" ]; + version = "2020.03.05"; src = fetchFromGitHub { - inherit rev; - owner = "inversepath"; + owner = "usbarmory"; repo = "interlock"; - sha256 = "06aqx3jy744yx29xyg8ips0dw16186hfqbxdv3hfrmwxmaxhl4lz"; + rev = "v${version}"; + sha256 = "sha256-YXa4vErt3YnomTKAXCv8yUVhcc0ST47n9waW5E8QZzY="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-OL6I95IpyTIc8wCwD9nWxVUTrmZH6COhsd/YwNTyvN0="; + + ldflags = [ "-s" "-w" ]; - nativeBuildInputs = [ sudo ]; - tags = [ "textsecure" ]; postPatch = '' grep -lr '/s\?bin/' | xargs sed -i \ -e 's|/bin/mount|${mount}/bin/mount|' \ @@ -34,4 +35,19 @@ buildGoPackage rec { -e 's|/usr/bin/sudo|/run/wrappers/bin/sudo|' \ -e 's|/sbin/cryptsetup|${cryptsetup}/bin/cryptsetup|' ''; + + postInstall = '' + mkdir -p $out/share + cp -R $src/static $out/share + ''; + + # Tests are broken due to an error during key generation. + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/usbarmory/interlock"; + description = "File encryption tool and an HSM frontend"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; } diff --git a/pkgs/servers/interlock/deps.nix b/pkgs/servers/interlock/deps.nix deleted file mode 100644 index be5c05295731..000000000000 --- a/pkgs/servers/interlock/deps.nix +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } - { - goPackagePath = "github.com/Sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/Sirupsen/logrus"; - rev = "be52937128b38f1d99787bb476c789e2af1147f1"; - sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"; - }; - } - { - goPackagePath = "github.com/agl/ed25519"; - fetch = { - type = "git"; - url = "https://github.com/agl/ed25519"; - rev = "278e1ec8e8a6e017cd07577924d6766039146ced"; - sha256 = "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/janimo/textsecure"; - fetch = { - type = "git"; - url = "https://github.com/janimo/textsecure"; - rev = "c38f429e48d6b2776d17b4171f216f132185b0f6"; - sha256 = "191pwgfgphr0x04dwpvniax4wilpv52l25bw7d3igvnw302y7i94"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; - }; - } -] From 710f6606659d803b9cd486f75ff70a00d58ad9dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 23 Jun 2022 23:40:21 +0200 Subject: [PATCH 603/814] checkov: 2.1.4 -> 2.1.5 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 06ba4fe762ef..6cb98bf10d4d 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,14 +32,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.1.4"; + version = "2.1.5"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-J8CpNeON2qOaU/U7LbIOaQ/DJ/7Q+kLzzw+jD1QLkik="; + hash = "sha256-bH7W+GZ4O32ty5YD4hfKz2R10v7zEJLU1kLzKvdx3E4="; }; nativeBuildInputs = with py.pkgs; [ From 6ec6afde81a1e521183bf2de9db14c21023b5a16 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Mon, 4 Apr 2022 17:32:07 -0500 Subject: [PATCH 604/814] nixel: init at 4.1.0 --- pkgs/tools/nix/nixel/default.nix | 36 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/nix/nixel/default.nix diff --git a/pkgs/tools/nix/nixel/default.nix b/pkgs/tools/nix/nixel/default.nix new file mode 100644 index 000000000000..5ce14a8d312f --- /dev/null +++ b/pkgs/tools/nix/nixel/default.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, testers +, nixel +}: + +rustPlatform.buildRustPackage rec { + pname = "nixel"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "kamadorueda"; + repo = pname; + rev = version; + sha256 = "sha256-dQ3wzBTjteqk9rju+FMAO+ydimnGu24Y2DEDLX/P+1A="; + }; + + cargoSha256 = "sha256-1OsHs0W3ji9Kgpv7nGY9XyGxJ4c0faN2VuFLsdwkgKY="; + + # Package requires a non reproducible submodule + # https://github.com/kamadorueda/nixel/blob/2873bd84bf4fc540d0ae8af062e109cc9ad40454/.gitmodules#L7 + doCheck = false; + # + # Let's test it runs + passthru.tests = { + version = testers.testVersion { package = nixel; }; + }; + + meta = with lib; { + description = "Lexer, Parser, Abstract Syntax Tree and Concrete Syntax Tree for the Nix Expressions Language"; + homepage = "https://github.com/kamadorueda/nixel"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ kamadorueda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 229a23d2349b..9050a4cb7c0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4095,6 +4095,8 @@ with pkgs; nix-direnv = callPackage ../tools/misc/nix-direnv { }; + nixel = callPackage ../tools/nix/nixel { }; + nix-output-monitor = callPackage ../tools/nix/nix-output-monitor { }; nix-template = callPackage ../tools/package-management/nix-template { From ccbf6438f1f0d8be4a92fc56ab5f432b13c822ea Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 23 Jun 2022 19:49:53 -0400 Subject: [PATCH 605/814] geos: backport patch to fix config paths Backport an upstream patch to fix the paths in geos-config and geos.pc when built with absolute CMAKE_INSTALL_*DIR. --- pkgs/development/libraries/geos/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index c067a705d0bf..32b3155b8c56 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , cmake }: stdenv.mkDerivation rec { @@ -12,13 +13,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-ULvFmaw4a0wrOWLcxBHwBAph8gSq7066ciXs3Qz0VxU="; }; - nativeBuildInputs = [ cmake ]; + patches = [ + # Fix paths with absolute CMAKE_INSTALL_*DIR + (fetchpatch { + url = "https://github.com/libgeos/geos/commit/11faa4db672ed61d64fd8a6f1a59114f5b5f2406.patch"; + hash = "sha256-oAArwGq91Z93C6hBPQD0AlY8Q4Nnn6tA40HUPoZ5ftc="; + }) + ]; - postPatch = '' - substituteInPlace tools/geos-config.in \ - --replace "@libdir@" "@prefix@/lib" \ - --replace "@includedir@" "@prefix@/include" - ''; + nativeBuildInputs = [ cmake ]; meta = with lib; { description = "C++ port of the Java Topology Suite (JTS)"; From f6770a9d96f0efeb95fc30b60182af679c5e22cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 01:55:30 +0000 Subject: [PATCH 606/814] python310Packages.django-debug-toolbar: 3.4 -> 3.5 --- .../python-modules/django-debug-toolbar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index 871b8bb852e6..b4409dc04d4c 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "3.4"; + version = "3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tXQZcQvdGEtcIAtER1s2HSVkGHW0sdrnC+i01+RuSXg="; + hash = "sha256-OZWO3tXZ+p+zKtQHCkj0kGSXpDFHFV+HqSgiJvLmMTg="; }; propagatedBuildInputs = [ From 0d655f39d82dc237f9e8b812904c649482d26d8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 03:18:47 +0000 Subject: [PATCH 607/814] deno: 1.23.0 -> 1.23.1 --- pkgs/development/web/deno/default.nix | 6 +++--- pkgs/development/web/deno/librusty_v8.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 3a62b1802b74..c433e2dfa671 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nPVghkLtXhd2/TeBeNDtA1ucgiqzZWmtxXf9bCrFh44="; + sha256 = "sha256-Z9dZrhH+zlYNuhFs+aicuepnUTSOfIHdLaz9sJp0LCA="; }; - cargoSha256 = "sha256-bCk6zgsfyI5Nk0AHPyr29KzgltobxfD6b72N0ZaQyOU="; + cargoSha256 = "sha256-VIpy5vRZinFvFhyyKQwi5ThrBNwqGy1TVg5tAoxxJyQ="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 581c2e88d9ca..793bc9cb1949 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.44.1"; + version = "0.44.2"; shas = { - x86_64-linux = "sha256-8aBjN9ukbH+lr3YPdngXxSjPjutBgWv4hEdhYmcvtO4="; - aarch64-linux = "sha256-h0mxzeA/wB+/zNz0ZKjSBH7lpYrCLRdTgeDGwZypuXE="; - x86_64-darwin = "sha256-4YXYHhYwCBnb1clxW1ziccHMWsUcGz8Rr8/anCvI1lY="; - aarch64-darwin = "sha256-3sBeL+YJB1HaEhM76GfABvN/6iWeST7Z6lVu3X8sRjk="; + x86_64-linux = "sha256-I1ad9a9FtJGGGW7Odc8HfysQyCEAb8xoEYmYti0pEkE="; + aarch64-linux = "sha256-KHjVMI9qiJ6q3D6t6iUKxbp1qthHSSl+2AfvL3Hvk6I="; + x86_64-darwin = "sha256-UO1NRpbCA5MtqeRLTGM3FIWdX/ECDW/JG52U756FIv8="; + aarch64-darwin = "sha256-FqakcG050m52/F6nWlS7VeW0r+77CCIzG1qvBP3Naik="; }; } From be558f02e5bf3db49b2f027a09abcbcaf7eee499 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 03:32:24 +0000 Subject: [PATCH 608/814] diffoscope: 216 -> 217 --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index ae0a38b6d316..2307dddf6cac 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -11,11 +11,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "216"; + version = "217"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-KSmC2mNNzsC2H5xOOQ/3gODsSvFQD95XGtrzbDud0W0="; + sha256 = "sha256-JS6lzxOsE3K4gH3VHsRY5Iucq5PBH3jFD5lSmNZWEG4="; }; outputs = [ "out" "man" ]; From a6ed92b0440128220e6c50ac65a0299996b7cdfb Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Wed, 22 Jun 2022 22:08:08 +0200 Subject: [PATCH 609/814] onedrive: 2.4.17 -> 2.14.19 --- pkgs/applications/networking/sync/onedrive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index a76be3d318c3..7b6316631e89 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.17"; + version = "2.4.19"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - hash = "sha256-+ADAPxAZNDqLKLz6rAProqSDINDiTZhc2trxJFFMQeA="; + hash = "sha256-7kX7gC/1jSZGgV3ZhfebMIn/Y5gXkz22GDP2zpiwUZ4="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; From 6fae48936bf1691c87893f89140c9e453127607b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 03:46:47 +0000 Subject: [PATCH 610/814] dsq: 0.20.1 -> 0.20.2 --- pkgs/tools/misc/dsq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index 1d6dde3c3cff..62a17142bde6 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "dsq"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "multiprocessio"; repo = "dsq"; rev = version; - hash = "sha256-zTrIs6Q/+PW6CKCx1L8VaXhc1ZAqbb+Od+LJNjPCOTs="; + hash = "sha256-dgx1rFdhEtvyH/N3AtQE89ASBoE3CLl+ZFWwWWYe0II="; }; vendorSha256 = "sha256-bLaBBWChK2RKXd/rX9m9UfHu8zt0j8TOm5S2M02U91A="; From 278934a4c8237b5dcd651ff007cc719abbd3feea Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 24 Jun 2022 04:20:00 +0000 Subject: [PATCH 611/814] ffsend: 0.2.74 -> 0.2.76 --- pkgs/tools/misc/ffsend/default.nix | 15 ++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index b6c7cefbccb2..42060e16d828 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitLab, rustPlatform, cmake, pkg-config, openssl +{ lib, stdenv, fetchFromGitLab, rustPlatform, pkg-config, openssl , installShellFiles -, CoreFoundation, CoreServices, Security, AppKit, libiconv +, Security, AppKit , x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD , xclip ? null, xsel ? null @@ -17,20 +17,21 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.74"; + version = "0.2.76"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "0ia9agh0h9hp06ijmlgnw63n3xz2jajjw1maz27sawqp342x9vn5"; + sha256 = "sha256-L1j1lXPxy9nWMeED9uzQHV5y7XTE6+DB57rDnXa4kMo="; }; - cargoSha256 = "0dl671sw3amny52a81bx7imh94dvi91dprwhcm1b0g40mjic45pw"; + cargoSha256 = "sha256-zNLU9QnBGna5qb+iu2imOUvCIw3ZWRFsQlpFo5ECtKo="; - nativeBuildInputs = [ cmake pkg-config installShellFiles ]; + nativeBuildInputs = [ installShellFiles ] + ++ lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = - if stdenv.isDarwin then [ libiconv CoreFoundation CoreServices Security AppKit ] + if stdenv.isDarwin then [ Security AppKit ] else [ openssl ]; preBuild = lib.optionalString (x11Support && usesX11) ( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da373b207d7a..8f7cfb158558 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5924,7 +5924,7 @@ with pkgs; }; ffsend = callPackage ../tools/misc/ffsend { - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security AppKit; + inherit (darwin.apple_sdk.frameworks) Security AppKit; }; fgallery = callPackage ../tools/graphics/fgallery { }; From b27085cfcce5432daeaee79118518a2c8c591f66 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 24 Jun 2022 04:20:00 +0000 Subject: [PATCH 612/814] lxd: 5.2 -> 5.3 https://github.com/lxc/lxd/releases/tag/lxd-5.3 --- pkgs/tools/admin/lxd/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 5198f79a7f18..d664cdd50860 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ lib, hwdata, pkg-config, lxc, buildGo118Package, fetchurl, fetchpatch +{ lib, hwdata, pkg-config, lxc, buildGo118Package, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, attr , squashfsTools, iproute2, iptables, libcap , dqlite, raft-canonical, sqlite-replication, udev @@ -11,7 +11,7 @@ buildGo118Package rec { pname = "lxd"; - version = "5.2"; + version = "5.3"; goPackagePath = "github.com/lxc/lxd"; @@ -20,7 +20,7 @@ buildGo118Package rec { "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz" "https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz" ]; - sha256 = "sha256-4i0rNKGEjTOyCAsrHII1WvttNv3+SeZ/RLN0ntvALkw="; + sha256 = "sha256-DRdKCfp0nL3lg5O/Wm7vX2grO/DBuyhHRi85XI5laZU="; }; postPatch = '' @@ -60,6 +60,7 @@ buildGo118Package rec { meta = with lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; homepage = "https://linuxcontainers.org/lxd/"; + changelog = "https://github.com/lxc/lxd/releases/tag/lxd-${version}"; license = licenses.asl20; maintainers = with maintainers; [ fpletz marsam ]; platforms = platforms.linux; From 7de33fa1fa3d9ddbbc12f6d63c5943a517318f10 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 24 Jun 2022 04:20:00 +0000 Subject: [PATCH 613/814] tflint: 0.37.0 -> 0.38.1 https://github.com/terraform-linters/tflint/releases/tag/v0.38.1 --- pkgs/development/tools/analysis/tflint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 2ed23f43a471..d37b51413803 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tflint"; - version = "0.37.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2fcrKwbYuCOZE++Sin0zNuGaBQQd0dNs1MRL/doOLOw="; + sha256 = "sha256-sBvfcAOkfZ5V7SrLBWrSQr5zXwqbwOBmYehujk0y6eg="; }; vendorSha256 = "sha256-2v070TwDWkN4HZ/EOu85lotA9qIKLgpwD9TrfH7pGY4="; From dbff0b876ae713a83f0dcc2ac0f84010386ea753 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 24 Jun 2022 04:20:00 +0000 Subject: [PATCH 614/814] libkqueue: 2.6.1 -> 2.6.2 https://github.com/mheily/libkqueue/raw/v2.6.2/ChangeLog --- pkgs/development/libraries/libkqueue/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libkqueue/default.nix b/pkgs/development/libraries/libkqueue/default.nix index 8a4bfdedd1e3..5f96353d9d69 100644 --- a/pkgs/development/libraries/libkqueue/default.nix +++ b/pkgs/development/libraries/libkqueue/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libkqueue"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "mheily"; repo = "libkqueue"; rev = "v${version}"; - sha256 = "sha256-YKKBHOxjUS7+/ib4gcR7EYjjVOwhHVksYasLhErdV8s="; + sha256 = "sha256-5Zds9sqHkFldJf3ThTPOiaGKohmFcIzY0ARDA0iswVk="; }; nativeBuildInputs = [ cmake ]; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "kqueue(2) compatibility library"; homepage = "https://github.com/mheily/libkqueue"; + changelog = "https://github.com/mheily/libkqueue/raw/v${version}/ChangeLog"; license = licenses.bsd2; maintainers = [ maintainers.marsam ]; platforms = platforms.linux; From 48134305bb9f1839542cd5b5de2dbb15a5d489d7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 24 Jun 2022 04:20:00 +0000 Subject: [PATCH 615/814] ffsend: add marsam to maintainers --- pkgs/tools/misc/ffsend/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 42060e16d828..1aedac7ca16f 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -57,7 +57,7 @@ buildRustPackage rec { ''; homepage = "https://gitlab.com/timvisee/ffsend"; license = licenses.gpl3Only; - maintainers = with maintainers; [ lilyball equirosa ]; + maintainers = with maintainers; [ lilyball equirosa marsam ]; platforms = platforms.unix; }; } From b9a9608e6b829e5953fc3a1f91130eca838c20dd Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Fri, 24 Jun 2022 09:53:45 +0530 Subject: [PATCH 616/814] terraform-ls: 0.26.0 -> 0.28.1 --- pkgs/development/tools/misc/terraform-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index e85e014368af..3e218523ed34 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.26.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xq9HojFjUrdThXvQ4M8o4LLmxopVErnN3WGUgI79BCw="; + sha256 = "sha256-6K4aOp5mjX+qhG/OS/Gs1kAOpDGUPdgRNx4zp3i/c2A="; }; - vendorSha256 = "sha256-iSgK+FOD9olVN4bR2jmtWndaRHrh9pfo/42COTiIh9c="; + vendorSha256 = "sha256-YouAdTo7huco35er84MRfI1gmq11VbFwRGSovs1XDYo="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; From 955567fba80fa11e06aab378087b911eae212443 Mon Sep 17 00:00:00 2001 From: Varun Madiath Date: Thu, 23 Jun 2022 17:29:52 -0400 Subject: [PATCH 617/814] {jesec,rakshasa}-rtorrent: allow passthrough of dependency. Previously it was not possible to access the libtorrent dependency --- pkgs/applications/networking/p2p/jesec-rtorrent/default.nix | 4 ++++ .../applications/networking/p2p/rakshasa-rtorrent/default.nix | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index a760a0f96c35..df314b6591c2 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { hash = "sha256-i7c1jSawHshj1kaXl8tdpelIKU24okeg9K5/+ht6t2k="; }; + passthru = { + inherit libtorrent; + }; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index f166f6d0e29f..fa459137f199 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { hash = "sha256-HTwAs8dfZVXfLRNiT6QpjKGnuahHfoMfYWqdKkedUL0="; }; + passthru = { + inherit libtorrent; + }; + nativeBuildInputs = [ autoconf-archive autoreconfHook From 0de6e1dfb07cf43b31ce72bd48ae54bc0254d0f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 05:56:20 +0000 Subject: [PATCH 618/814] python310Packages.youtube-search-python: 1.6.5 -> 1.6.6 --- .../python-modules/youtube-search-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/youtube-search-python/default.nix b/pkgs/development/python-modules/youtube-search-python/default.nix index 9383d4cb0598..11da850c992d 100644 --- a/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/pkgs/development/python-modules/youtube-search-python/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.6.5"; + version = "1.6.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-1B7rppa+s/oE8w91Ca7ogjkNHu5pFSnNmDyUopCWEY8="; + hash = "sha256-RWjR12ns1+tLuDZfBO7G42TF9w7sezdl9UPa67E1/PU="; }; propagatedBuildInputs = [ From ba29e6d5b4d60ad407c24d10a62474ebfcd26202 Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Fri, 24 Jun 2022 00:05:31 -0600 Subject: [PATCH 619/814] alejandra: 1.4.0 -> 1.5.0 --- pkgs/tools/nix/alejandra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/alejandra/default.nix b/pkgs/tools/nix/alejandra/default.nix index 0e7f5e133eaa..5cfacdb50bc0 100644 --- a/pkgs/tools/nix/alejandra/default.nix +++ b/pkgs/tools/nix/alejandra/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "alejandra"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "kamadorueda"; repo = "alejandra"; rev = version; - sha256 = "sha256-0AolxQtKj3Oek0WSbODDpPVO5Ih8PXHOA3qXEKPB4dQ="; + sha256 = "sha256-A0ruEdPeKIzGYxyXNACnzaKtQUVc30s2ExTUzdFTcWM="; }; - cargoSha256 = "sha256-USI98hozlTaTj07tMbCQEWDgRkHsd4PFW1HUpKsNZJA="; + cargoSha256 = "sha256-BmpFyVF2fxV3rExI7rpOQlVwHEJNlof44dnUshaO/no="; passthru.tests = { version = testers.testVersion { package = alejandra; }; From c889a0dd6a818f7ef5714ae4269d7daaea831b16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 06:14:53 +0000 Subject: [PATCH 620/814] python310Packages.mockito: 1.3.1 -> 1.3.3 --- pkgs/development/python-modules/mockito/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index 1d2509c4a75e..e9af134ba111 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: buildPythonPackage rec { - version = "1.3.1"; + version = "1.3.3"; pname = "mockito"; src = fetchPypi { inherit pname version; - sha256 = "sha256-o8Hg3UnxWbJITBu/IjsbWRHDiJ5smffKUNHAqG21170="; + sha256 = "sha256-mCRTdihXcyMHNPJkmGWLHcBFrTvhNCH1CMcaXHaVe8E="; }; propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ]; From 8204ddee62c72d77a2206639d4b41ec50a1ec8ac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Jun 2022 08:17:41 +0200 Subject: [PATCH 621/814] python310Packages.mitogen: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/mitogen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix index d99bdec4b0da..6b6f29e1d5f4 100644 --- a/pkgs/development/python-modules/mitogen/default.nix +++ b/pkgs/development/python-modules/mitogen/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "mitogen"; - version = "0.3.2"; + version = "0.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "mitogen-hq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ACd1z9h9RLu6Kho59L2YkXkLtBEywYbO+drUvoZaVlg="; + sha256 = "sha256-cx0q2Y9A6UzpdD1kuGBtXIs9oBGFpkIyvPfN2hj+A1g="; }; # Tests require network access and Docker support From 6c1f44b3f17fc2a4610d4565ea609b8cf5bfe8d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 24 Jun 2022 08:37:43 +0200 Subject: [PATCH 622/814] nixos/matrix-appservice-irc: wait for postgres to start Closes: #178692 --- nixos/modules/services/matrix/appservice-irc.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/matrix/appservice-irc.nix b/nixos/modules/services/matrix/appservice-irc.nix index b041c9c82c56..ff938527ed58 100644 --- a/nixos/modules/services/matrix/appservice-irc.nix +++ b/nixos/modules/services/matrix/appservice-irc.nix @@ -153,6 +153,9 @@ in { systemd.services.matrix-appservice-irc = { description = "Matrix-IRC bridge"; before = [ "matrix-synapse.service" ]; # So the registration can be used by Synapse + after = lib.optionals (cfg.settings.database.engine == "postgres") [ + "postgresql.service" + ]; wantedBy = [ "multi-user.target" ]; preStart = '' From d0fec03d31b5a7f9c81590928b2a44dea6e9801f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Jun 2022 08:42:52 +0200 Subject: [PATCH 623/814] python310Packages.pyroute2-core: 0.6.12 -> 0.6.13 --- pkgs/development/python-modules/pyroute2-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix index 085e0059a9d5..76fb24044556 100644 --- a/pkgs/development/python-modules/pyroute2-core/default.nix +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-core"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.core"; inherit version; - hash = "sha256-uzb8nlAOHNtNq205/sJPoJtvMoo7uCFfrRQas/rv8p8="; + hash = "sha256-In39nxmIjd0TQZZoIv/ViA2548iTdQlkGMZg/00aEdA="; }; # pyroute2 sub-modules have no tests From c1a85aad9f5d4633a8964b0076c4fe3584700afe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Jun 2022 08:43:06 +0200 Subject: [PATCH 624/814] python310Packages.pyroute2-ethtool: 0.6.12 -> 0.6.13 --- pkgs/development/python-modules/pyroute2-ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix index 93699e161b81..f163336028d1 100644 --- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ethtool"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ethtool"; inherit version; - hash = "sha256-MwIRm/DezL7yCN682Yckxd23+iri2V6HCokF4G36apU="; + hash = "sha256-Cmh/6g/Nd9kHTHwYujXZufcOQhfr5opofiAECEc6O9Q="; }; propagatedBuildInputs = [ From c834116496e3bc77cc725a4413fac5171474fd43 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Jun 2022 08:43:19 +0200 Subject: [PATCH 625/814] python310Packages.pyroute2-ipdb: 0.6.12 -> 0.6.13 --- pkgs/development/python-modules/pyroute2-ipdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix index 0c11d6f85ced..a991645d4ce2 100644 --- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipdb"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipdb"; inherit version; - hash = "sha256-hKh5SFFMdhECeMyA3Quzqp7h+iQMMmCYBJEuLEq5dVs="; + hash = "sha256-u7u3XRO+luRUnPcOuU/XCy4XNuowGsa2g/VqoazYTVo="; }; propagatedBuildInputs = [ From 556b038bcc0bf972daefc400d79a2d5bc92e7bae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Jun 2022 08:43:33 +0200 Subject: [PATCH 626/814] python310Packages.pyroute2-ndb: 0.6.12 -> 0.6.13 --- pkgs/development/python-modules/pyroute2-ndb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix index 6965dfaf8a5a..c43adc07647f 100644 --- a/pkgs/development/python-modules/pyroute2-ndb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ndb"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ndb"; inherit version; - hash = "sha256-Oc+uaqftRH6Dw3Sa2G1rZ3Mx2u81ErKIyz8xhnA1QgI="; + hash = "sha256-CbH1XyYEPOZMkz6CJP0IREpJjzgeXcSDvJ9CjLrwkBo="; }; propagatedBuildInputs = [ From daf6fa42dc8584fd93b4a22652063df959e467ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Jun 2022 08:43:46 +0200 Subject: [PATCH 627/814] python310Packages.pyroute2-nftables: 0.6.12 -> 0.6.13 --- pkgs/development/python-modules/pyroute2-nftables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix index 19850bb9f2fb..f6ac1b1f2247 100644 --- a/pkgs/development/python-modules/pyroute2-nftables/default.nix +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nftables"; - version = "0.6.12"; + version = "0.6.13"; src = fetchPypi { pname = "pyroute2.nftables"; inherit version; - sha256 = "sha256-jy04M73r49LxfbHAuDgSaoFWmkc0O/jPJwdDlW8YCSc="; + sha256 = "sha256-yUvXQNULA6Go2WVPdp53r8d6deBfxYh90FUeOXD4ZZI="; }; propagatedBuildInputs = [ From c3a942737018937722e6f57d8ece5c970bd211de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Jun 2022 08:44:00 +0200 Subject: [PATCH 628/814] python310Packages.pyroute2-nslink: 0.6.12 -> 0.6.13 --- pkgs/development/python-modules/pyroute2-nslink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix index 7213556ea950..59eba1b76a1e 100644 --- a/pkgs/development/python-modules/pyroute2-nslink/default.nix +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-nslink"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.nslink"; inherit version; - hash = "sha256-c66rD7CyHdyYACIiq1Nfu6rmUsIL9YmFp4Z1gxOFik4="; + hash = "sha256-hu1QbK3MsVTNJ667Pb9z67cjw5EQTn8PO8LEo5xiNmw="; }; propagatedBuildInputs = [ From d14f1652e7f4187a48f10dff341b7d859b9d1de6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Jun 2022 08:44:14 +0200 Subject: [PATCH 629/814] python310Packages.pyroute2-protocols: 0.6.12 -> 0.6.13 --- .../development/python-modules/pyroute2-protocols/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix index 700abb2266da..24758a91ca24 100644 --- a/pkgs/development/python-modules/pyroute2-protocols/default.nix +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-protocols"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.protocols"; inherit version; - hash = "sha256-j83UNlQVjxIyKhOqDsx6yhvMZEfAh54gRjniacCpSxY="; + hash = "sha256-bb7y0D7If2MAHabua9EzgEL2Ic+9BHVfYaMoxDCwAtY="; }; propagatedBuildInputs = [ From 21a409d068ff739baa5e1770e24d94056c11f3aa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Jun 2022 08:44:28 +0200 Subject: [PATCH 630/814] python310Packages.pyroute2: 0.6.12 -> 0.6.13 --- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 96835a1be1f8..632fadd3c266 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cnUvmx9R+4oUGgf6LpbMlAadVh/EYcNX1ep88gtPTn4="; + hash = "sha256-sD1JpYGUX+wrHsfR1RJcb0C6BO0Rr/yQxMrdwBniV5I="; }; propagatedBuildInputs = [ From b3076eb8fa78e53984828c3075e3980fa6cd0843 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Jun 2022 08:44:41 +0200 Subject: [PATCH 631/814] python310Packages.pyroute2-ipset: 0.6.12 -> 0.6.13 --- pkgs/development/python-modules/pyroute2-ipset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix index 6b21283aa907..28c806143808 100644 --- a/pkgs/development/python-modules/pyroute2-ipset/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipset"; - version = "0.6.12"; + version = "0.6.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipset"; inherit version; - hash = "sha256-nvj7b6HF/XhzqmFg6aOQKMFDEFwAcyOnoJXi/coNvG4="; + hash = "sha256-KKJU9iKhiXbQaDYD1a79pat8hSj6nja+uFvOUgJveGY="; }; propagatedBuildInputs = [ From e215af71134261d31d9ff175999bfa051847bb48 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 24 Jun 2022 08:52:46 +0200 Subject: [PATCH 632/814] nixos/tests/matrix-appservice-irc: fix typing mismatch --- nixos/tests/matrix/appservice-irc.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/matrix/appservice-irc.nix b/nixos/tests/matrix/appservice-irc.nix index 7dd44da8305e..78c53024ca6c 100644 --- a/nixos/tests/matrix/appservice-irc.nix +++ b/nixos/tests/matrix/appservice-irc.nix @@ -193,6 +193,7 @@ import ../make-test-python.nix ({ pkgs, ... }: testScript = '' import pathlib + import os start_all() @@ -206,7 +207,7 @@ import ../make-test-python.nix ({ pkgs, ... }: with subtest("copy the registration file"): appservice.copy_from_vm("/var/lib/matrix-appservice-irc/registration.yml") homeserver.copy_from_host( - pathlib.Path(os.environ.get("out", os.getcwd())) / "registration.yml", "/" + str(pathlib.Path(os.environ.get("out", os.getcwd())) / "registration.yml"), "/" ) homeserver.succeed("chmod 444 /registration.yml") From a60c23a214f76a1dc87b5f2e0bd661f8d3b95316 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 22 Jun 2022 07:54:27 +0100 Subject: [PATCH 633/814] uim: pull upstream fix for -fno-common toolchains Without the change build fails on upstream gcc-10 as: ld: .libs/mach_dep.o:sigscheme/libgcroots/include/private/gc_priv.h:2029: multiple definition of `GCROOTS_jmp_buf'; .libs/mark.o:sigscheme/libgcroots/include/private/gc_priv.h:2029: first defined here --- pkgs/tools/inputmethods/uim/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix index 9336d5429c12..e1daecbd10ff 100644 --- a/pkgs/tools/inputmethods/uim/default.nix +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, shared-mime-info +{ lib, stdenv, fetchFromGitHub, fetchpatch, shared-mime-info , autoconf, automake, intltool, libtool, pkg-config, cmake , ruby, librsvg , ncurses, m17n_lib, m17n_db, expat @@ -86,7 +86,21 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - patches = [ ./data-hook.patch ]; + patches = [ + ./data-hook.patch + + # Pull upstream fix for -fno-common toolchains + # https://github.com/uim/libgcroots/pull/4 + (fetchpatch { + name = "libgcroots-fno-common.patch"; + url = "https://github.com/uim/libgcroots/commit/7e39241344ad0663409e836560ae6b5eb231e1fc.patch"; + sha256 = "0iifcl5lk8bvl0cflm47gkymg88aiwzj0gxh2aj3mqlyhvyx78nz"; + # Patch comes from git submodule. Relocate as: + # a/include/private/gc_priv.h -> a/sigscheme/libgcroots/include/private/gc_priv.h + stripLen = 1; + extraPrefix = "sigscheme/libgcroots/"; + }) + ]; configureFlags = [ # configure in maintainer mode or else some pixmaps won't get autogenerated From 9f7b0d8f0c876d8a1d5da98397bf64c9ab964097 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 24 Jun 2022 09:58:40 +0200 Subject: [PATCH 634/814] nixos/systemd-networkd-vrf: check routing tables via `ip --json` The original implementation did a simple string-comparison against the output of `ip route`. This is problematic because * if the details in the string-output change, the test breaks. This is less likely with JSON because the relevant values (i.e. destination, interface etc) aren't supposed to be changed. * this is causing issues with formatters[1][2]. [1] #161703 [2] #154818 --- nixos/tests/systemd-networkd-vrf.nix | 50 ++++++++++++++++++---------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/nixos/tests/systemd-networkd-vrf.nix b/nixos/tests/systemd-networkd-vrf.nix index 3839a49375db..3c18f788e927 100644 --- a/nixos/tests/systemd-networkd-vrf.nix +++ b/nixos/tests/systemd-networkd-vrf.nix @@ -138,18 +138,18 @@ in { }; testScript = '' - def compare_tables(expected, actual): - assert ( - expected == actual - ), """ - Routing tables don't match! - Expected: - {} - Actual: - {} - """.format( - expected, actual - ) + import json + + def compare(raw_json, to_compare): + data = json.loads(raw_json) + assert len(raw_json) >= len(to_compare) + for i, row in enumerate(to_compare): + actual = data[i] + assert len(row.keys()) > 0 + for key, value in row.items(): + assert value == actual[key], f""" + In entry {i}, value {key}: got: {actual[key]}, expected {value} + """ start_all() @@ -178,14 +178,28 @@ in { # Check that networkd properly configures the main routing table # and the routing tables for the VRF. with subtest("check vrf routing tables"): - compare_tables( - client_ipv4_table, client.succeed("ip -4 route list | head -n2").strip() + compare( + client.succeed("ip --json -4 route list"), + [ + {"dst": "192.168.1.2", "dev": "vrf1", "metric": 100}, + {"dst": "192.168.2.3", "dev": "vrf2", "metric": 100} + ] ) - compare_tables( - vrf1_table, client.succeed("ip -4 route list table 23 | head -n4").strip() + compare( + client.succeed("ip --json -4 route list table 23"), + [ + {"dst": "192.168.1.0/24", "dev": "eth1", "prefsrc": "192.168.1.1"}, + {"type": "local", "dst": "192.168.1.1", "dev": "eth1", "prefsrc": "192.168.1.1"}, + {"type": "broadcast", "dev": "eth1", "prefsrc": "192.168.1.1", "dst": "192.168.1.255"} + ] ) - compare_tables( - vrf2_table, client.succeed("ip -4 route list table 42 | head -n4").strip() + compare( + client.succeed("ip --json -4 route list table 42"), + [ + {"dst": "192.168.2.0/24", "dev": "eth2", "prefsrc": "192.168.2.1"}, + {"type": "local", "dst": "192.168.2.1", "dev": "eth2", "prefsrc": "192.168.2.1"}, + {"type": "broadcast", "dev": "eth2", "prefsrc": "192.168.2.1", "dst": "192.168.2.255"} + ] ) # Ensure that other nodes are reachable via ICMP through the VRF. From c299e5c7da69f290cef6153122bcdd6e8e5704a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Jun 2022 10:25:03 +0200 Subject: [PATCH 635/814] skytemple: add missing runtime dependencies --- pkgs/applications/misc/skytemple/default.nix | 22 +++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 0f331ef6e2ce..2ec034e882e1 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -1,4 +1,12 @@ -{ lib, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3, webkitgtk, wrapGAppsHook, python3Packages }: +{ lib +, fetchFromGitHub +, gobject-introspection +, gtk3 +, gtksourceview3 +, webkitgtk +, wrapGAppsHook +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "skytemple"; @@ -8,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; + hash = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o="; }; buildInputs = [ @@ -20,9 +28,16 @@ python3Packages.buildPythonApplication rec { # any Pokemon, and clicking Stats and Moves tab. webkitgtk ]; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + propagatedBuildInputs = with python3Packages; [ + cairosvg natsort + ndspy packaging pycairo pygal @@ -36,6 +51,7 @@ python3Packages.buildPythonApplication rec { skytemple-files skytemple-icons skytemple-ssb-debugger + tilequant ]; doCheck = false; # there are no tests From de43d937f503940541275c4c4c7f1ce4fb5a1dfb Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 24 Jun 2022 16:29:01 +0800 Subject: [PATCH 636/814] v2ray-geoip: 202205260055 -> 202206230045 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index a6954100d547..e4ab5df75842 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202205260055"; + version = "202206230045"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "96f4639373709f7560ccaf374d1ff008781aa324"; - sha256 = "sha256-aFTLeYr+JishhJ2AhGMrD02fKxci2rREkh8HN9HtXLs="; + rev = "2e2aba7f3dfb4139e8a882f85350045f2ef522d1"; + sha256 = "sha256-WFvS51RmkAWivYj0HFAT6S3euJk+GSYLDTN3cmkcCNs="; }; installPhase = '' From 106bc570be5c088274117046eca53c3766aeb8c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 08:33:13 +0000 Subject: [PATCH 637/814] python310Packages.railroad-diagrams: 1.1.1 -> 2.0.3 --- pkgs/development/python-modules/railroad-diagrams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/railroad-diagrams/default.nix b/pkgs/development/python-modules/railroad-diagrams/default.nix index 57c07e0dc48b..6d1a9eea6140 100644 --- a/pkgs/development/python-modules/railroad-diagrams/default.nix +++ b/pkgs/development/python-modules/railroad-diagrams/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "railroad-diagrams"; - version = "1.1.1"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "8a1ec227666be2000e76794aa740f77987f1586077aae4d090d2633b3064c976"; + sha256 = "sha256-wRClrA4I/DWNw/hL5rowQMn0R61c6qiNg9Ho6nXqi+4="; }; # this is a dependency of pyparsing, which is a dependency of pytest From 5525e6a2026acc23036d85354b31d5339898404c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 24 Jun 2022 16:34:52 +0800 Subject: [PATCH 638/814] v2ray-domain-list-community: 20220528180904 -> 20220624025859 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 5e84f479d21b..a5bbb2b5c013 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20220528180904"; + version = "20220624025859"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-j1Q7B/U0OADOcgJRJ269Jx9Z5dmmT4T2eaOHeGmUjmc="; + sha256 = "sha256-/4wfTtRsBzOCbx3I3H28tB935xDZPPwHOFFmjiV7kEI="; }; vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo="; meta = with lib; { From 6eb44e6fce70ad67d6fb2534e7bd7cd78c90037b Mon Sep 17 00:00:00 2001 From: kilianar Date: Fri, 24 Jun 2022 10:50:56 +0200 Subject: [PATCH 639/814] nar-serve: 0.4.0 -> 0.6.1 --- pkgs/tools/nix/nar-serve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/nar-serve/default.nix b/pkgs/tools/nix/nar-serve/default.nix index 1d7fd6beb4a7..10ac797578f9 100644 --- a/pkgs/tools/nix/nar-serve/default.nix +++ b/pkgs/tools/nix/nar-serve/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "nar-serve"; - version = "0.4.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "numtide"; repo = "nar-serve"; rev = "v${version}"; - hash = "sha256-h/pzKRXgcGTpr1YUKppDa+iTLKak/PGhbYa8ZczWj1U="; + hash = "sha256-cSOYHYJJEGzFtkD4mjTmYBiM9CaWKt64xgV/JeNHpfM="; }; - vendorSha256 = "sha256-eW+cul/5qJocpKV/6azxj7HTmkezDw6dNubPtAOP5HU="; + vendorSha256 = "sha256-RpjLs4+9abbbysYAlPDUXBLe1cz4Lp+QmR1yv+LpYwQ="; doCheck = false; From 78ede9c299d9d8f3e437419bbdfb1bab452013ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 24 Jun 2022 11:05:02 +0200 Subject: [PATCH 640/814] python310Packages.railroad-diagrams: disable on older Python releases --- .../python-modules/railroad-diagrams/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/railroad-diagrams/default.nix b/pkgs/development/python-modules/railroad-diagrams/default.nix index 6d1a9eea6140..1af5a196250f 100644 --- a/pkgs/development/python-modules/railroad-diagrams/default.nix +++ b/pkgs/development/python-modules/railroad-diagrams/default.nix @@ -1,24 +1,30 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "railroad-diagrams"; version = "2.0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wRClrA4I/DWNw/hL5rowQMn0R61c6qiNg9Ho6nXqi+4="; + hash = "sha256-wRClrA4I/DWNw/hL5rowQMn0R61c6qiNg9Ho6nXqi+4="; }; - # this is a dependency of pyparsing, which is a dependency of pytest + # This is a dependency of pyparsing, which is a dependency of pytest doCheck = false; - pythonImportsCheck = [ "railroad" ]; + pythonImportsCheck = [ + "railroad" + ]; meta = with lib; { - description = "Generate SVG railroad syntax diagrams, like on JSON.org"; + description = "Module to generate SVG railroad syntax diagrams"; homepage = "https://github.com/tabatkins/railroad-diagrams"; license = licenses.cc0; maintainers = with maintainers; [ jonringer ]; From a331014990a5bd08aae31caeab94dbafd13a5498 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 09:45:52 +0000 Subject: [PATCH 641/814] python310Packages.django-oauth-toolkit: 1.7.0 -> 2.1.0 --- .../python-modules/django-oauth-toolkit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index eca67211671c..65bf5045a035 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "django-oauth-toolkit"; - version = "1.7.0"; + version = "2.1.0"; format = "setuptools"; src = fetchFromGitHub { owner = "jazzband"; repo = pname; - rev = version; - sha256 = "0rp7pjif54yvdxfxn0pnf8ha3fjxspnx1ijyr1f8npwk2x5vnvhb"; + rev = "refs/tags/${version}"; + sha256 = "sha256-c78QYlU/gB4Lt04TlQFjtsS6pyjDm/fURBMa9hXLpLI="; }; postPatch = '' From 7c0498e3cbab0825d2135d449e8800e4eb2700b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 10:03:55 +0000 Subject: [PATCH 642/814] plexRaw: 1.27.0.5897-3940636f2 -> 1.27.1.5916-6b0e31a64 --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index fd6adfe65a98..87e36134acbb 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.27.0.5897-3940636f2"; + version = "1.27.1.5916-6b0e31a64"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "1ibahbz276diji66m5w059a1h9crva92r83w6av1dfq44v298s77"; + sha256 = "0cyx83a64vdq68qknsscdnawx9lcyr5siiwys2gc9gnxm6sv8x82"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "119nmmjpca05d6vzhy3xipgca9k51ps8252vcgdsp080dh7nk2kp"; + sha256 = "0v5gkk0izqkma9m4gvqyx94mij4jvv8vdv6897r7v8xqg9wji24l"; }; outputs = [ "out" "basedb" ]; From a0622d69cf4660974a321a500b90a8512c95afea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jun 2022 10:38:16 +0000 Subject: [PATCH 643/814] python310Packages.aws-lambda-builders: 1.17.0 -> 1.18.0 --- .../python-modules/aws-lambda-builders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 1c750267695f..f2dd2c420527 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.17.0"; + version = "1.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-EkAtRqUHwmH0LG/bkXBbZ3TMgXDtcqLfUBySPbrgWmc="; + hash = "sha256-yAqGVZnnragi3+jaAGnkYNH/XtpH3bojXHmPCrANgJU="; }; propagatedBuildInputs = [ From fe77acb14152f51f926c8572b272646ca462382c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 24 Jun 2022 12:42:54 +0200 Subject: [PATCH 644/814] grafana: 9.0.0 -> 9.0.1 ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.0.1 --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 46c80120daa9..87430bda86d7 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.0.0"; + version = "9.0.1"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-vPPaOepx4uwOWOjeE+dWULxmJPk5To9UY3rnoEqeAJA="; + sha256 = "sha256-+03bfSpUT5sb0oFf9BomglcVb5bRqAwZ1MKCPmRtAss="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0xl5z31mkgbwkwcpvr0v0hmc0ynvxjn39w4sb1vc572kjbwqpvkr"; + sha256 = "1kw9l3gip4lqfrc0asgsd1lf5sxa7zj67isyvhb14qdsf9rs3b2d"; }; - vendorSha256 = "sha256-E3uSwdgoPgQPQ/uCIuTxcYeNRYbQR7q7SrUrh/ypENk="; + vendorSha256 = "sha256-eB0SswtqAb0xoLcq021KaH4CdgLbWmhODyifQDVl5XI="; nativeBuildInputs = [ wire ]; From f0bc9d6258dbfc5c0411b03a507d8d072b9cc680 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Fri, 24 Jun 2022 13:26:03 +0200 Subject: [PATCH 645/814] btop: 1.2.6 -> 1.2.7 --- pkgs/tools/system/btop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 86547d04e467..7b18f0ec604f 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.2.6"; - hash = "sha256-q1Dpdw7bVSG10xtoUpelRgMrWe71vCWajjsAHjAZzQ4="; + version = "1.2.7"; + hash = "sha256-zQpt/CEWW3oPqPo6SPuawyfLa50y6M4hL07uRO7YjLo="; src = fetchFromGitHub { owner = "aristocratos"; From fcda800ae2a95fb10c432ce715030d6a6e8fd402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Fri, 24 Jun 2022 14:01:02 +0200 Subject: [PATCH 646/814] add `platforms.all` --- pkgs/tools/package-management/micromamba/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index 6083a83872b3..1f95e41e6103 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { description = "Reimplementation of the conda package manager"; homepage = "https://github.com/mamba-org/mamba"; license = licenses.bsd3; + platforms = platforms.all; maintainers = with maintainers; [ mausch ]; }; } From 47db3772a731d48f30d6dc97120ef77f5240096c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 21 Jun 2022 18:38:36 +1000 Subject: [PATCH 647/814] kubernetes: switch to buildGoModule --- .../networking/cluster/kubernetes/default.nix | 31 +++++++++---------- .../networking/cluster/kubernetes/kubectl.nix | 13 ++++---- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 8ed8cd568913..5cbd307a3d73 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,11 +1,11 @@ -{ stdenv -, lib +{ lib +, buildGoModule , fetchFromGitHub , which -, go , makeWrapper , rsync , installShellFiles +, runtimeShell , kubectl , nixosTests @@ -19,7 +19,7 @@ ] }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "kubernetes"; version = "1.23.8"; @@ -30,23 +30,27 @@ stdenv.mkDerivation rec { sha256 = "sha256-mu+jBSypoMNxOugLbS3foH4C4AqSZnlic4Bf1v9dYc8="; }; - nativeBuildInputs = [ makeWrapper which go rsync installShellFiles ]; + vendorSha256 = null; + + doCheck = false; + + nativeBuildInputs = [ makeWrapper which rsync installShellFiles ]; outputs = [ "out" "man" "pause" ]; patches = [ ./fixup-addonmanager-lib-path.patch ]; - postPatch = '' - substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" - patchShebangs ./hack - ''; - WHAT = lib.concatStringsSep " " ([ "cmd/kubeadm" ] ++ components); - postBuild = '' + buildPhase = '' + runHook preBuild + substituteInPlace "hack/update-generated-docs.sh" --replace "make" "make SHELL=${runtimeShell}" + patchShebangs ./hack ./cluster/addons/addon-manager + make "SHELL=${runtimeShell}" "WHAT=$WHAT" ./hack/update-generated-docs.sh + runHook postBuild ''; installPhase = '' @@ -69,7 +73,6 @@ stdenv.mkDerivation rec { --subst-var out chmod +x $out/bin/kube-addons - patchShebangs $out/bin/kube-addons wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl" cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons-lib.sh @@ -80,10 +83,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - disallowedReferences = [ go ]; - - GOFLAGS = [ "-trimpath" ]; - meta = with lib; { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix index 6a6f9042124b..754bca32511c 100644 --- a/pkgs/applications/networking/cluster/kubernetes/kubectl.nix +++ b/pkgs/applications/networking/cluster/kubernetes/kubectl.nix @@ -1,15 +1,14 @@ -{ lib, stdenv, kubernetes }: +{ lib, buildGoModule, kubernetes }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "kubectl"; inherit (kubernetes) - disallowedReferences - GOFLAGS + buildPhase + doCheck nativeBuildInputs - postBuild - postPatch src + vendorSha256 version ; @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { WHAT = lib.concatStringsSep " " [ "cmd/kubectl" "cmd/kubectl-convert" - ]; + ]; installPhase = '' runHook preInstall From 67cd38b51954536f4c02e7f51503750795be33cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 24 Jun 2022 15:28:34 +0200 Subject: [PATCH 648/814] python3Packages.django-prometheus: fix 2.2.0 update --- .../python-modules/django-prometheus/default.nix | 4 ++-- .../drop-untestable-database-backends.patch | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-prometheus/default.nix b/pkgs/development/python-modules/django-prometheus/default.nix index 733a177d6a5e..209395ef6430 100644 --- a/pkgs/development/python-modules/django-prometheus/default.nix +++ b/pkgs/development/python-modules/django-prometheus/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "korfuri"; repo = pname; - rev = version; - sha256 = "1y1cmycc545xrys41jk8kia36hwnkwhkw26mlpfdjgb63vq30x1d"; + rev = "v${version}"; + hash = "sha256-NE0zHnGGSrtkBLrSyBcQuyGrSfSQbdpevokg3YZhwDw="; }; patches = [ diff --git a/pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch b/pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch index 1e9e65060849..41f1229c5e59 100644 --- a/pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch +++ b/pkgs/development/python-modules/django-prometheus/drop-untestable-database-backends.patch @@ -1,5 +1,5 @@ diff --git a/django_prometheus/tests/end2end/testapp/settings.py b/django_prometheus/tests/end2end/testapp/settings.py -index 0630721..bd2190a 100644 +index cdd167f..5c6073b 100644 --- a/django_prometheus/tests/end2end/testapp/settings.py +++ b/django_prometheus/tests/end2end/testapp/settings.py @@ -53,33 +53,6 @@ DATABASES = { @@ -28,9 +28,9 @@ index 0630721..bd2190a 100644 - "mysql": { - "ENGINE": "django_prometheus.db.backends.mysql", - "NAME": "django_prometheus_1", -- "USER": "travis", +- "USER": "root", - "PASSWORD": "", -- "HOST": "localhost", +- "HOST": "127.0.0.1", - "PORT": "3306", - }, # The following databases are used by test_db.py only From 203b454fc19b83e5e7ebe35185d2d23430341c8a Mon Sep 17 00:00:00 2001 From: wyndon Date: Fri, 24 Jun 2022 16:21:54 +0200 Subject: [PATCH 649/814] httm: 0.11.6 -> 0.12.1 --- pkgs/tools/filesystems/httm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index f4cfdc46e9b4..c68e692ed2d1 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.11.6"; + version = "0.12.1"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "5jeCENAas7i/eBySSBjwmdc3MEHVhWWH7/RZGS8g1Y4="; + sha256 = "2pShuWJns8VnxiRgj5GLv5Y7H5Qw/SfQ6lVo6VqyU/A="; }; - cargoSha256 = "x4qfi3Wm5r0HNqDgmJBXNvS1xQDU7MQ/H2+zNpHon+s="; + cargoSha256 = "x5JUwQxrZ5TBG8FAMlomTkZOCxV0c/7i5sx33BCUkKo="; nativeBuildInputs = [ installShellFiles ]; From 32aa830e1089bb676469bdc6a7100314e8e515bd Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 24 Jun 2022 16:32:29 +0200 Subject: [PATCH 650/814] woodpecker-{agent,cli,server}: init at 0.15.3 (#178441) * woodpecker-{agent,cli,server}: init at 0.15.3 * woodpecker-*: tweak packaging * Use 'callPackage' to import 'common.nix'. * Prefix the binaries with 'woodpecker-', removing the need for 'meta.mainProgram'. * Remove IFD in 'mkYarnPackage' by committing 'package.json'. * Simplify the server derivation, by not building it statically. * Expose 'woodpecker-frontend' as a package for overriding purposes. * Reduce package size for 'woodpecker-frontend' by just keeping the 'dist' folder. * Have common `ldflags` and `postBuild` values. * woodpecker-server: expose front-end with 'passthru' * woodpecker-server: add update script Co-authored-by: 06kellyjac --- .../woodpecker/agent.nix | 17 +++++ .../continuous-integration/woodpecker/cli.nix | 17 +++++ .../woodpecker/common.nix | 36 +++++++++++ .../woodpecker/frontend.nix | 40 ++++++++++++ .../woodpecker/server.nix | 27 ++++++++ .../woodpecker/update.sh | 50 +++++++++++++++ .../woodpecker/woodpecker-package.json | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 +++ 8 files changed, 258 insertions(+) create mode 100644 pkgs/development/tools/continuous-integration/woodpecker/agent.nix create mode 100644 pkgs/development/tools/continuous-integration/woodpecker/cli.nix create mode 100644 pkgs/development/tools/continuous-integration/woodpecker/common.nix create mode 100644 pkgs/development/tools/continuous-integration/woodpecker/frontend.nix create mode 100644 pkgs/development/tools/continuous-integration/woodpecker/server.nix create mode 100755 pkgs/development/tools/continuous-integration/woodpecker/update.sh create mode 100644 pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json diff --git a/pkgs/development/tools/continuous-integration/woodpecker/agent.nix b/pkgs/development/tools/continuous-integration/woodpecker/agent.nix new file mode 100644 index 000000000000..2865711d507c --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/agent.nix @@ -0,0 +1,17 @@ +{ lib, buildGoModule, callPackage, fetchFromGitHub }: +let + common = callPackage ./common.nix { }; +in +buildGoModule { + pname = "woodpecker-agent"; + inherit (common) version src ldflags postBuild; + vendorSha256 = null; + + subPackages = "cmd/agent"; + + CGO_ENABLED = 0; + + meta = common.meta // { + description = "Woodpecker Continuous Integration agent"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix new file mode 100644 index 000000000000..b5eda9efb917 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/cli.nix @@ -0,0 +1,17 @@ +{ lib, buildGoModule, callPackage, fetchFromGitHub }: +let + common = callPackage ./common.nix { }; +in +buildGoModule { + pname = "woodpecker-cli"; + inherit (common) version src ldflags postBuild; + vendorSha256 = null; + + subPackages = "cmd/cli"; + + CGO_ENABLED = 0; + + meta = common.meta // { + description = "Command line client for the Woodpecker Continuous Integration server"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix new file mode 100644 index 000000000000..932fa934b1bc --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -0,0 +1,36 @@ +{ lib, fetchFromGitHub }: +let + version = "0.15.3"; + srcSha256 = "sha256-HOOH3H2SXLcT2oW/xL80TO+ZSI+Haulnznpb4hlCQow="; + yarnSha256 = "sha256-x9g0vSoexfknqLejgcNIigmkFnqYsmhcQNTOStcj68o="; +in +{ + inherit version yarnSha256; + + src = fetchFromGitHub { + owner = "woodpecker-ci"; + repo = "woodpecker"; + rev = "v${version}"; + sha256 = srcSha256; + }; + + postBuild = '' + cd $GOPATH/bin + for f in *; do + mv -- "$f" "woodpecker-$f" + done + cd - + ''; + + ldflags = [ + "-s" + "-w" + "-X github.com/woodpecker-ci/woodpecker/version.Version=${version}" + ]; + + meta = with lib; { + homepage = "https://woodpecker-ci.org/"; + license = licenses.asl20; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/frontend.nix b/pkgs/development/tools/continuous-integration/woodpecker/frontend.nix new file mode 100644 index 000000000000..267fdc13985a --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/frontend.nix @@ -0,0 +1,40 @@ +{ lib, callPackage, fetchFromGitHub, fetchYarnDeps, mkYarnPackage }: +let + common = callPackage ./common.nix { }; +in +mkYarnPackage { + pname = "woodpecker-frontend"; + inherit (common) version; + + src = "${common.src}/web"; + + packageJSON = ./woodpecker-package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${common.src}/web/yarn.lock"; + sha256 = common.yarnSha256; + }; + + buildPhase = '' + runHook preBuild + + yarn build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -R deps/woodpecker-ci/dist $out + echo "${common.version}" > "$out/version" + + runHook postInstall + ''; + + # Do not attempt generating a tarball for woodpecker-frontend again. + doDist = false; + + meta = common.meta // { + description = "Woodpecker Continuous Integration server frontend"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/server.nix b/pkgs/development/tools/continuous-integration/woodpecker/server.nix new file mode 100644 index 000000000000..d97412649b5d --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/server.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, callPackage, fetchFromGitHub, woodpecker-frontend }: +let + common = callPackage ./common.nix { }; +in +buildGoModule { + pname = "woodpecker-server"; + inherit (common) version src ldflags postBuild; + vendorSha256 = null; + + postPatch = '' + cp -r ${woodpecker-frontend} web/dist + ''; + + subPackages = "cmd/server"; + + CGO_ENABLED = 1; + + passthru = { + inherit woodpecker-frontend; + + updateScript = ./update.sh; + }; + + meta = common.meta // { + description = "Woodpecker Continuous Integration server"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/woodpecker/update.sh b/pkgs/development/tools/continuous-integration/woodpecker/update.sh new file mode 100755 index 000000000000..3530ea6c46c6 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/update.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq + +# shellcheck shell=bash + +if [ -n "$GITHUB_TOKEN" ]; then + TOKEN_ARGS=(--header "Authorization: token $GITHUB_TOKEN") +fi + +if [[ $# -gt 1 || $1 == -* ]]; then + echo "Regenerates packaging data for the woodpecker packages." + echo "Usage: $0 [git release tag]" + exit 1 +fi + +set -x + +cd "$(dirname "$0")" +version="$1" + +set -euo pipefail + +if [ -z "$version" ]; then + version="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/woodpecker-ci/woodpecker/releases?per_page=1" | jq -r '.[0].tag_name')" +fi + +# strip leading "v" +version="${version#v}" + +# Woodpecker repository +src_hash=$(nix-prefetch-github woodpecker-ci woodpecker --rev "v${version}" | jq -r .sha256) + +# Front-end dependencies +woodpecker_src="https://raw.githubusercontent.com/woodpecker-ci/woodpecker/v$version" +wget "${TOKEN_ARGS[@]}" "$woodpecker_src/web/package.json" -O woodpecker-package.json + +web_tmpdir=$(mktemp -d) +trap 'rm -rf "$web_tmpdir"' EXIT +pushd "$web_tmpdir" +wget "${TOKEN_ARGS[@]}" "$woodpecker_src/web/yarn.lock" +yarn_hash=$(prefetch-yarn-deps yarn.lock) +popd + +# Use friendlier hashes +src_hash=$(nix hash to-sri --type sha256 "$src_hash") +yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash") + +sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix +sed -i -E -e "s#srcSha256 = \".*\"#srcSha256 = \"$src_hash\"#" common.nix +sed -i -E -e "s#yarnSha256 = \".*\"#yarnSha256 = \"$yarn_hash\"#" common.nix diff --git a/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json b/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json new file mode 100644 index 000000000000..eb29431a0566 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json @@ -0,0 +1,63 @@ +{ + "name": "woodpecker-ci", + "author": "Woodpecker CI", + "version": "0.0.0", + "license": "Apache-2.0", + "engines": { + "node": ">=14" + }, + "scripts": { + "start": "vite", + "build": "vite build", + "serve": "vite preview", + "lint": "eslint --max-warnings 0 --ext .js,.ts,.vue,.json .", + "formatcheck": "prettier -c .", + "format:fix": "prettier --write .", + "typecheck": "vue-tsc --noEmit", + "test": "echo 'No tests configured' && exit 0" + }, + "dependencies": { + "@kyvg/vue3-notification": "2.3.4", + "@meforma/vue-toaster": "1.2.2", + "ansi-to-html": "0.7.2", + "dayjs": "1.10.7", + "floating-vue": "2.0.0-beta.5", + "fuse.js": "6.4.6", + "humanize-duration": "3.27.0", + "javascript-time-ago": "2.3.10", + "node-emoji": "1.11.0", + "pinia": "2.0.0", + "vue": "v3.2.20", + "vue-router": "4.0.10" + }, + "devDependencies": { + "@iconify/json": "1.1.421", + "@types/humanize-duration": "3.27.0", + "@types/javascript-time-ago": "2.0.3", + "@types/node": "16.11.6", + "@types/node-emoji": "1.8.1", + "@typescript-eslint/eslint-plugin": "5.6.0", + "@typescript-eslint/parser": "5.6.0", + "@vitejs/plugin-vue": "1.9.4", + "@vue/compiler-sfc": "3.2.20", + "eslint": "7.32.0", + "eslint-config-airbnb-base": "15.0.0", + "eslint-config-airbnb-typescript": "16.1.0", + "eslint-config-prettier": "8.3.0", + "eslint-plugin-import": "2.25.3", + "eslint-plugin-prettier": "4.0.0", + "eslint-plugin-promise": "5.1.1", + "eslint-plugin-simple-import-sort": "7.0.0", + "eslint-plugin-vue": "7.18.0", + "eslint-plugin-vue-scoped-css": "1.3.0", + "prettier": "2.4.1", + "typescript": "4.4.4", + "unplugin-icons": "0.12.17", + "unplugin-vue-components": "0.17.0", + "vite": "2.6.13", + "vite-plugin-windicss": "1.4.12", + "vite-svg-loader": "3.0.0", + "vue-tsc": "0.28.10", + "windicss": "3.2.0" + } +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04377cb57dc5..dcf088595606 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11546,6 +11546,14 @@ with pkgs; woff2 = callPackage ../development/web/woff2 { }; + woodpecker-agent = callPackage ../development/tools/continuous-integration/woodpecker/agent.nix { }; + + woodpecker-cli = callPackage ../development/tools/continuous-integration/woodpecker/cli.nix { }; + + woodpecker-server = callPackage ../development/tools/continuous-integration/woodpecker/server.nix { + woodpecker-frontend = callPackage ../development/tools/continuous-integration/woodpecker/frontend.nix { }; + }; + woof = callPackage ../tools/misc/woof { }; wootility = callPackage ../tools/misc/wootility { From 637e117eea97f81a2aa8234411c2f1247edef0d0 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 24 Jun 2022 11:35:00 -0300 Subject: [PATCH 651/814] fluxcd: 0.31.1 -> 0.31.2 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 358803a3cf37..1afb2b7a5e1f 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.31.1"; - sha256 = "1dhs96r9yi37i5q9wqg7198f6kl59jlj3g1q76r0snqyl16g2jwf"; - manifestsSha256 = "0wwlwai1hhz69kgaccw3w8ad6bwdd46pm4ns8nqm04927b0b2dqb"; + version = "0.31.2"; + sha256 = "1w373gwxxvnqsfm5r63r1bcmlrii5wy6yhbs5li0bw2anhnb0iir"; + manifestsSha256 = "0lqfrry1kg52ikyhzgwg57zqzq24aspp2d7whyzir3dglvf999lb"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-sPyz6ISFLe+6CJoAcG17KSfo63vuTj30IWw+S2NCszY="; + vendorSha256 = "sha256-Z7O/ReEZwmK5KKAHzi4B3d31ynA51XzbTKsrzCXAFPo="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests From 6394fadb1da8cff8daba129cc122057a962f0bf3 Mon Sep 17 00:00:00 2001 From: Yury Bulka Date: Mon, 20 Jun 2022 12:24:37 +0300 Subject: [PATCH 652/814] maintainers: add yurkobb --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cd5023ceda7a..03a807f97444 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14042,6 +14042,12 @@ githubId = 687198; name = "Yuri Aisaka"; }; + yurkobb = { + name = "Yury Bulka"; + email = "setthemfree@privacyrequired.com"; + github = "yurkobb"; + githubId = 479389; + }; yurrriq = { email = "eric@ericb.me"; github = "yurrriq"; From 477578e8e318c9ebb164fa9a278b1343a4fa5edb Mon Sep 17 00:00:00 2001 From: Yury Bulka Date: Mon, 20 Jun 2022 12:39:24 +0300 Subject: [PATCH 653/814] pythonPackages.oscpy: init at 0.6.0 --- .../python-modules/oscpy/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/oscpy/default.nix diff --git a/pkgs/development/python-modules/oscpy/default.nix b/pkgs/development/python-modules/oscpy/default.nix new file mode 100644 index 000000000000..07991a0fac7e --- /dev/null +++ b/pkgs/development/python-modules/oscpy/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }: + +buildPythonPackage rec { + pname = "oscpy"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "kivy"; + repo = "oscpy"; + rev = "v${version}"; + hash = "sha256-Luj36JLgU9xbBMydeobyf98U5zs5VwWQOPGV7TPXQwA="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "oscpy" ]; + + meta = with lib; { + description = "A modern implementation of OSC for python2/3"; + license = licenses.mit; + homepage = "https://github.com/kivy/oscpy"; + maintainers = [ maintainers.yurkobb ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8970a1324ac4..8a7a4a410736 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6163,6 +6163,8 @@ in { oscrypto = callPackage ../development/python-modules/oscrypto { }; + oscpy = callPackage ../development/python-modules/oscpy { }; + oset = callPackage ../development/python-modules/oset { }; osmnx = callPackage ../development/python-modules/osmnx { }; From dc0380bb215ce001fcfccf4609d902115f87ddf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 24 Jun 2022 15:04:02 +0000 Subject: [PATCH 654/814] taskflow: 3.3.0 -> 3.4.0 (#178384) https://taskflow.github.io/taskflow/release-3-4-0.html --- pkgs/development/libraries/taskflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/taskflow/default.nix b/pkgs/development/libraries/taskflow/default.nix index 29760cdb94bd..dd2f8fb39144 100644 --- a/pkgs/development/libraries/taskflow/default.nix +++ b/pkgs/development/libraries/taskflow/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "taskflow"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; rev = "v${version}"; - hash = "sha256-UfXGupxgtowIt3BnIVWwim3rTE57TT1C9TCx9LVyN34="; + hash = "sha256-5bTTV/WAxslHQ+hvATtUUA1h3MuNzwVTlYMbD/sINRM="; }; patches = [ From 934ad0d729ba3fbec6cf4d78dc600510ded30fab Mon Sep 17 00:00:00 2001 From: Yves-Stan Le Cornec Date: Fri, 24 Jun 2022 17:23:11 +0200 Subject: [PATCH 655/814] bazel_4: remove unnecessary buildInputs from tests. Now that PATH dependencies are provided via a wrapper, these buildInputs become unnecessary --- pkgs/development/tools/build-managers/bazel/bazel_4/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 3b492848fc15..0737c71f01df 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -257,7 +257,7 @@ stdenv.mkDerivation rec { runLocal = name: attrs: script: let attrs' = removeAttrs attrs [ "buildInputs" ]; - buildInputs = [ python3 which ] ++ (attrs.buildInputs or []); + buildInputs = attrs.buildInputs or []; in runCommandCC name ({ inherit buildInputs; From ad5f4abb9c9782a4dc9dea01119c1f221f97d0fa Mon Sep 17 00:00:00 2001 From: Yves-Stan Le Cornec Date: Fri, 24 Jun 2022 17:26:05 +0200 Subject: [PATCH 656/814] bazel_5: remove unnecessary buildInputs from tests Now that PATH dependencies are provided via a wrapper, these buildInputs become unnecessary --- pkgs/development/tools/build-managers/bazel/bazel_5/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 9ca0098575be..b9364812bd3b 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -219,7 +219,7 @@ stdenv.mkDerivation rec { runLocal = name: attrs: script: let attrs' = removeAttrs attrs [ "buildInputs" ]; - buildInputs = [ python3 which ] ++ (attrs.buildInputs or []); + buildInputs = attrs.buildInputs or []; in runCommandCC name ({ inherit buildInputs; From 384035c4cfa09eadc8053fa69a6283752089402c Mon Sep 17 00:00:00 2001 From: Yves-Stan Le Cornec Date: Fri, 24 Jun 2022 17:34:47 +0200 Subject: [PATCH 657/814] bazel_4: use correct bazel version for tests `bazel_self` is the current package. If we do not specify it explicitly when defining tests then Bazel 3 is used by default. --- .../tools/build-managers/bazel/bazel_4/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 0737c71f01df..aa9794b5869c 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -323,13 +323,13 @@ stdenv.mkDerivation rec { in (if !stdenv.hostPlatform.isDarwin then { # `extracted` doesn’t work on darwin - shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self; }; } else {}) // { - bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; - cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; - pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; + bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; + cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self; }; + java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self; }; + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; From c6909daf0e014994c4cb2dd48e2cfc6772249385 Mon Sep 17 00:00:00 2001 From: Yves-Stan Le Cornec Date: Fri, 24 Jun 2022 17:37:20 +0200 Subject: [PATCH 658/814] bazel_5: use correct bazel version for tests `bazel_self` is the current package. If we do not specify it explicitly when defining tests then Bazel 3 is used by default. --- .../tools/build-managers/bazel/bazel_5/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index b9364812bd3b..c9c435a0b34d 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -285,13 +285,13 @@ stdenv.mkDerivation rec { in (if !stdenv.hostPlatform.isDarwin then { # `extracted` doesn’t work on darwin - shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; bazel = bazel_self;}; } else {}) // { - bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; - cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; - pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; + bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self;}; + cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self;}; + java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazel_self;}; + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self; }; + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazel_self;}; bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; From c110d8148b20691792e97621cfffb5fc12422b5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 Jun 2022 13:25:26 +0000 Subject: [PATCH 659/814] python310Packages.django-webpack-loader: 1.4.1 -> 1.6.0 --- .../python-modules/django-webpack-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 2656dd593c1c..ee51b0e7c8ec 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "1.4.1"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "7e34085b7fc4d352e482ff9cf7d09ae4524e730675e25432ab1d25a2dd94e583"; + sha256 = "sha256-opQY/0FpADW+ENLJSgZV2rCZAJxouJiDmBPWoQmxTXE="; }; # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) From eaebf07d5c5eaacaf8cff8a819fc3a6fcc962c97 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 24 Jun 2022 13:02:54 -0300 Subject: [PATCH 660/814] mongodb-4_0: fixed Co-authored-by: @bryanasdev000 --- .../mongodb/patches/mongodb-4.0-glibc-2.34.patch | 14 ++++++++++++++ pkgs/servers/nosql/mongodb/v4_0.nix | 14 +++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 pkgs/servers/nosql/mongodb/patches/mongodb-4.0-glibc-2.34.patch diff --git a/pkgs/servers/nosql/mongodb/patches/mongodb-4.0-glibc-2.34.patch b/pkgs/servers/nosql/mongodb/patches/mongodb-4.0-glibc-2.34.patch new file mode 100644 index 000000000000..f5c4a5c35408 --- /dev/null +++ b/pkgs/servers/nosql/mongodb/patches/mongodb-4.0-glibc-2.34.patch @@ -0,0 +1,14 @@ +--- a/src/mongo/stdx/thread.h ++++ b/src/mongo/stdx/thread.h +@@ -103,10 +103,7 @@ private: + // . N Y : 4,344 | 13,048 | 7,352 + // . Y Y : 4,424 | 13,672 | 8,392 + // ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt ) +- static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10; +- +- static constexpr std::size_t kStackSize = +- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ}); ++ static constexpr std::size_t kStackSize = std::size_t{64} << 10; + std::unique_ptr _stackStorage = std::make_unique(kStackSize); + + #else // !MONGO_HAS_SIGALTSTACK \ No newline at end of file diff --git a/pkgs/servers/nosql/mongodb/v4_0.nix b/pkgs/servers/nosql/mongodb/v4_0.nix index 24349686fbec..9d28a9185ba1 100644 --- a/pkgs/servers/nosql/mongodb/v4_0.nix +++ b/pkgs/servers/nosql/mongodb/v4_0.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: +{ stdenv, callPackage, fetchpatch, lib, sasl, boost, Security, CoreFoundation, cctools }: let buildMongoDB = callPackage ./mongodb.nix { @@ -11,7 +11,15 @@ let in buildMongoDB { version = "4.0.27"; sha256 = "sha256-ct33mnK4pszhYM4Is7j0GZQRyi8i8Qmy0wcklyq5LjM="; - patches = - [ ./forget-build-dependencies.patch ./mozjs-45_fix-3-byte-opcode.patch ] + patches = [ + ./forget-build-dependencies.patch + ./mozjs-45_fix-3-byte-opcode.patch + ./patches/mongodb-4.0-glibc-2.34.patch # https://github.com/NixOS/nixpkgs/issues/171928 + (fetchpatch { + name = "mongodb-4.4.1-gcc11.patch"; + url = "https://raw.githubusercontent.com/gentoo/gentoo/7168257cad6ea7c4856b01c5703d0ed5b764367c/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch"; + sha256 = "sha256-RvfCP462RG+ZVjcb23DgCuxCdfPl2/UgH8N7FgCghGI="; + }) + ] ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; } From ed0e7ad72ef9c88fc738f2d1a5e8cd2099970620 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 24 Jun 2022 13:08:05 -0300 Subject: [PATCH 661/814] mongodb-4_2: fixed Co-authored-by: @bryanasdev000 --- pkgs/servers/nosql/mongodb/v4_2.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/v4_2.nix b/pkgs/servers/nosql/mongodb/v4_2.nix index 3759cc1e6d58..53b73b510e3a 100644 --- a/pkgs/servers/nosql/mongodb/v4_2.nix +++ b/pkgs/servers/nosql/mongodb/v4_2.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: +{ stdenv, callPackage, fetchpatch, lib, sasl, boost, Security, CoreFoundation, cctools }: let buildMongoDB = callPackage ./mongodb.nix { @@ -11,7 +11,12 @@ let in buildMongoDB { version = "4.2.19"; sha256 = "sha256-fngTHd+fSdHqiqQYOYS7o6P5eHybeZy3iNKkGzFmjTw="; - patches = - [ ./forget-build-dependencies-4-2.patch ] - ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ]; + patches = [ + ./forget-build-dependencies-4-2.patch + (fetchpatch { + name = "mongodb-4.4.1-gcc11.patch"; + url = "https://raw.githubusercontent.com/gentoo/gentoo/7168257cad6ea7c4856b01c5703d0ed5b764367c/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch"; + sha256 = "sha256-RvfCP462RG+ZVjcb23DgCuxCdfPl2/UgH8N7FgCghGI="; + }) + ] ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ]; } From 5771e8fcddc1c71703a62abbdbb6536488d6aa32 Mon Sep 17 00:00:00 2001 From: midchildan Date: Fri, 24 Jun 2022 10:10:36 +0900 Subject: [PATCH 662/814] tmux: fix static build --- pkgs/tools/misc/tmux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index fd4361d27678..44cbe713f096 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -6,7 +6,7 @@ , libevent , ncurses , pkg-config -, systemd +, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd , utf8proc }: @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libevent - ] ++ lib.optionals stdenv.isLinux [ systemd ] + ] ++ lib.optionals withSystemd [ systemd ] ++ lib.optionals stdenv.isDarwin [ utf8proc ]; configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - ] ++ lib.optionals stdenv.isLinux [ "--enable-systemd" ] + ] ++ lib.optionals withSystemd [ "--enable-systemd" ] ++ lib.optionals stdenv.isDarwin [ "--enable-utf8proc" ]; enableParallelBuilding = true; From 2c135ab9c995df38c3a8e692c167469a1b705286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 24 Jun 2022 19:32:01 +0200 Subject: [PATCH 663/814] python310Packages.junos-eznc: update homepage --- pkgs/development/python-modules/junos-eznc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index d693c73130be..9830d29789b5 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "jnpr.junos" ]; meta = with lib; { - homepage = "http://www.github.com/Juniper/py-junos-eznc"; + homepage = "https://github.com/Juniper/py-junos-eznc"; description = "Junos 'EZ' automation for non-programmers"; license = licenses.asl20; maintainers = with maintainers; [ xnaveira ]; From 8d17794ac9d81282c5aa3d97416efe438b9b5473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 24 Jun 2022 19:32:29 +0200 Subject: [PATCH 664/814] python310Packages.napalm: fix dependencies --- pkgs/development/python-modules/napalm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix index 09d38875db8e..d7120085d632 100644 --- a/pkgs/development/python-modules/napalm/default.nix +++ b/pkgs/development/python-modules/napalm/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, fetchpatch, setuptools, cffi , paramiko, requests, future, textfsm, jinja2, netaddr, pyyaml, pyeapi, netmiko , junos-eznc, ciscoconfparse, scp, lxml, ncclient, pytestCheckHook, ddt, mock -, pythonOlder }: +, pythonOlder, invoke }: buildPythonPackage rec { pname = "napalm"; @@ -35,14 +35,13 @@ buildPythonPackage rec { --replace "netmiko>=3.3.0,<4.0.0" "netmiko" ''; - buildInputs = [ setuptools ]; - propagatedBuildInputs = [ cffi paramiko requests future textfsm + invoke jinja2 netaddr pyyaml @@ -51,6 +50,7 @@ buildPythonPackage rec { junos-eznc ciscoconfparse scp + setuptools lxml ncclient ]; From 7d2f0049576f4b75274b74ca01c6176d836f198f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 24 Jun 2022 19:32:36 +0200 Subject: [PATCH 665/814] python310Packages.napalm: move to c3d2 team --- pkgs/development/python-modules/napalm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix index d7120085d632..9625c8b55649 100644 --- a/pkgs/development/python-modules/napalm/default.nix +++ b/pkgs/development/python-modules/napalm/default.nix @@ -62,6 +62,6 @@ buildPythonPackage rec { "Network Automation and Programmability Abstraction Layer with Multivendor support"; homepage = "https://github.com/napalm-automation/napalm"; license = licenses.asl20; - maintainers = [ maintainers.astro ]; + maintainers = with maintainers; [ ] ++ teams.c3d2.members; }; } From 72ccc0db0cbd71542c349f422f09a495783a5e2c Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Fri, 24 Jun 2022 20:39:31 +0200 Subject: [PATCH 666/814] sngrep: 1.4.10 -> 1.5.0 --- pkgs/applications/networking/sniffers/sngrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/sngrep/default.nix b/pkgs/applications/networking/sniffers/sngrep/default.nix index 401d6dfa32cd..558c7ef86461 100644 --- a/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "sngrep"; - version = "1.4.10"; + version = "1.5.0"; src = fetchFromGitHub { owner = "irontec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P618QLk85W0oPisAGiRfpCgHCddKutUkGjwdfgsV4Es="; + sha256 = "sha256-GxC9+O72GHE8Tc6FReO7EdpZTSaqn9mBpZCYaKybJls="; }; nativeBuildInputs = [ From cf4ba94f427e8806d9b9ef8d95d48a7341874c2a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 27 Jan 2022 01:51:56 +0100 Subject: [PATCH 667/814] schleuder: init at 0.4.2 --- pkgs/tools/security/schleuder/Gemfile | 3 + pkgs/tools/security/schleuder/Gemfile.lock | 85 ++++++ pkgs/tools/security/schleuder/default.nix | 33 +++ pkgs/tools/security/schleuder/gemset.nix | 316 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 439 insertions(+) create mode 100644 pkgs/tools/security/schleuder/Gemfile create mode 100644 pkgs/tools/security/schleuder/Gemfile.lock create mode 100644 pkgs/tools/security/schleuder/default.nix create mode 100644 pkgs/tools/security/schleuder/gemset.nix diff --git a/pkgs/tools/security/schleuder/Gemfile b/pkgs/tools/security/schleuder/Gemfile new file mode 100644 index 000000000000..687c293bac91 --- /dev/null +++ b/pkgs/tools/security/schleuder/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' do + gem 'schleuder' +end diff --git a/pkgs/tools/security/schleuder/Gemfile.lock b/pkgs/tools/security/schleuder/Gemfile.lock new file mode 100644 index 000000000000..a5b7312901c2 --- /dev/null +++ b/pkgs/tools/security/schleuder/Gemfile.lock @@ -0,0 +1,85 @@ +GEM + specs: + +GEM + remote: https://rubygems.org/ + specs: + activemodel (6.1.4.4) + activesupport (= 6.1.4.4) + activerecord (6.1.4.4) + activemodel (= 6.1.4.4) + activesupport (= 6.1.4.4) + activesupport (6.1.4.4) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + bcrypt (3.1.16) + charlock_holmes (0.7.7) + concurrent-ruby (1.1.9) + daemons (1.4.1) + eventmachine (1.2.7) + gpgme (2.0.20) + mini_portile2 (~> 2.3) + i18n (1.8.11) + concurrent-ruby (~> 1.0) + mail (2.7.1) + mini_mime (>= 0.1.1) + mail-gpg (0.4.4) + gpgme (~> 2.0, >= 2.0.2) + mail (~> 2.5, >= 2.5.3) + mini_mime (1.1.2) + mini_portile2 (2.7.1) + minitest (5.15.0) + multi_json (1.15.0) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) + rack (2.2.3) + rack-protection (2.1.0) + rack + rake (13.0.6) + ruby2_keywords (0.0.5) + schleuder (4.0.2) + activerecord (~> 6.1.3) + bcrypt (~> 3.1.2) + charlock_holmes (~> 0.7.6) + gpgme (~> 2.0, >= 2.0.19) + mail (~> 2.7.1) + mail-gpg (~> 0.3) + rake (>= 10.5.0) + sinatra (~> 2) + sinatra-contrib (~> 2) + sqlite3 (~> 1.4.2) + thin (~> 1) + thor (~> 0) + sinatra (2.1.0) + mustermann (~> 1.0) + rack (~> 2.2) + rack-protection (= 2.1.0) + tilt (~> 2.0) + sinatra-contrib (2.1.0) + multi_json + mustermann (~> 1.0) + rack-protection (= 2.1.0) + sinatra (= 2.1.0) + tilt (~> 2.0) + sqlite3 (1.4.2) + thin (1.8.1) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) + thor (0.20.3) + tilt (2.0.10) + tzinfo (2.0.4) + concurrent-ruby (~> 1.0) + zeitwerk (2.5.3) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + schleuder! + +BUNDLED WITH + 2.2.24 diff --git a/pkgs/tools/security/schleuder/default.nix b/pkgs/tools/security/schleuder/default.nix new file mode 100644 index 000000000000..7fc320a7043c --- /dev/null +++ b/pkgs/tools/security/schleuder/default.nix @@ -0,0 +1,33 @@ +{ lib +, bundlerApp +, ruby +, bundlerUpdateScript +}: + +bundlerApp { + inherit ruby; + + pname = "schleuder"; + + gemdir = ./.; + + exes = [ + "schleuder" + "schleuder-api-daemon" + ]; + + passthru.updateScript = bundlerUpdateScript "schleuder"; + + meta = with lib; { + description = "Schleuder is an encrypting mailing list manager with remailing-capabilities"; + longDescription = '' + Schleuder is a group's email-gateway: subscribers can exchange + encrypted emails among themselves, receive emails from + non-subscribers and send emails to non-subscribers via the list. + ''; + homepage = "https://schleuder.org"; + changelog = "https://0xacab.org/schleuder/schleuder/blob/main/CHANGELOG.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexa lheckemann ]; + }; +} diff --git a/pkgs/tools/security/schleuder/gemset.nix b/pkgs/tools/security/schleuder/gemset.nix new file mode 100644 index 000000000000..9bd9cadbb883 --- /dev/null +++ b/pkgs/tools/security/schleuder/gemset.nix @@ -0,0 +1,316 @@ +{ + activemodel = { + dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g3qdz8dw6zkgz45jd13lwfdnm7rhgczv1pssw63g9k6qj3bkxjm"; + type = "gem"; + }; + version = "6.1.4.4"; + }; + activerecord = { + dependencies = ["activemodel" "activesupport"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "090d4wl1pq06m9mibpck0m5nm8h45fwhs3fjx27297kjmnv4gzik"; + type = "gem"; + }; + version = "6.1.4.4"; + }; + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rvnz9lsf9mrkpji748sf51f54m027snkw6rm8flyvf7fq18rm98"; + type = "gem"; + }; + version = "6.1.4.4"; + }; + bcrypt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb"; + type = "gem"; + }; + version = "3.1.16"; + }; + charlock_holmes = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; + type = "gem"; + }; + version = "0.7.7"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + type = "gem"; + }; + version = "1.1.9"; + }; + daemons = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07cszb0zl8mqmwhc8a2yfg36vi6lbgrp4pa5bvmryrpcz9v6viwg"; + type = "gem"; + }; + version = "1.4.1"; + }; + eventmachine = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; + type = "gem"; + }; + version = "1.2.7"; + }; + gpgme = { + dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xbgh9d8nbvsvyzqnd0mzhz0nr9hx4qn025kmz6d837lry4lc6gw"; + type = "gem"; + }; + version = "2.0.20"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; + type = "gem"; + }; + version = "1.8.11"; + }; + mail = { + dependencies = ["mini_mime"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; + type = "gem"; + }; + version = "2.7.1"; + }; + mail-gpg = { + dependencies = ["gpgme" "mail"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rz936m8nacy7agksvpvkf6b37d1h5qvh5xkrjqvv5wbdqs3cyfj"; + type = "gem"; + }; + version = "0.4.4"; + }; + mini_mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + type = "gem"; + }; + version = "1.1.2"; + }; + mini_portile2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z"; + type = "gem"; + }; + version = "2.7.1"; + }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + type = "gem"; + }; + version = "5.15.0"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + mustermann = { + dependencies = ["ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a"; + type = "gem"; + }; + version = "1.1.1"; + }; + rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + type = "gem"; + }; + version = "2.2.3"; + }; + rack-protection = { + dependencies = ["rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz"; + type = "gem"; + }; + version = "2.1.0"; + }; + rake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; + schleuder = { + dependencies = ["activerecord" "bcrypt" "charlock_holmes" "gpgme" "mail" "mail-gpg" "rake" "sinatra" "sinatra-contrib" "sqlite3" "thin" "thor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15j1rfkfvni82msamikynsg48s50hbsx1pxm3y967caq9s80ll6c"; + type = "gem"; + }; + version = "4.0.2"; + }; + sinatra = { + dependencies = ["mustermann" "rack" "rack-protection" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk"; + type = "gem"; + }; + version = "2.1.0"; + }; + sinatra-contrib = { + dependencies = ["multi_json" "mustermann" "rack-protection" "sinatra" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl1iiafz51yzjd0vchl2lni7lmwppjql6cn1fnfxbma707qlcja"; + type = "gem"; + }; + version = "2.1.0"; + }; + sqlite3 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; + type = "gem"; + }; + version = "1.4.2"; + }; + thin = { + dependencies = ["daemons" "eventmachine" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "123bh7qlv6shk8bg8cjc84ix8bhlfcilwnn3iy6zq3l57yaplm9l"; + type = "gem"; + }; + version = "1.8.1"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + type = "gem"; + }; + version = "0.20.3"; + }; + tilt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + type = "gem"; + }; + version = "2.0.10"; + }; + tzinfo = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; + type = "gem"; + }; + version = "2.0.4"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx"; + type = "gem"; + }; + version = "2.5.3"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed9894e4516b..8e48417a5df7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5490,6 +5490,8 @@ with pkgs; conf = config.schildichat-web.conf or {}; }; + schleuder = callPackage ../tools/security/schleuder { }; + tealdeer = callPackage ../tools/misc/tealdeer { inherit (darwin.apple_sdk.frameworks) Security; }; From 41d5a21d6a2b8dae1ea855cfab00da2f498c2064 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 27 Jan 2022 01:52:47 +0100 Subject: [PATCH 668/814] schleuder-cli: init 0.1.0 --- pkgs/tools/security/schleuder/cli/Gemfile | 4 +++ .../tools/security/schleuder/cli/Gemfile.lock | 21 ++++++++++++ pkgs/tools/security/schleuder/cli/default.nix | 34 +++++++++++++++++++ pkgs/tools/security/schleuder/cli/gemset.nix | 25 ++++++++++++++ pkgs/tools/security/schleuder/default.nix | 1 + pkgs/top-level/all-packages.nix | 2 ++ 6 files changed, 87 insertions(+) create mode 100644 pkgs/tools/security/schleuder/cli/Gemfile create mode 100644 pkgs/tools/security/schleuder/cli/Gemfile.lock create mode 100644 pkgs/tools/security/schleuder/cli/default.nix create mode 100644 pkgs/tools/security/schleuder/cli/gemset.nix diff --git a/pkgs/tools/security/schleuder/cli/Gemfile b/pkgs/tools/security/schleuder/cli/Gemfile new file mode 100644 index 000000000000..428e856aecc6 --- /dev/null +++ b/pkgs/tools/security/schleuder/cli/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem "schleuder-cli", git: "https://0xacab.org/schleuder/schleuder-cli", tag: "schleuder-cli-0.1.0" + diff --git a/pkgs/tools/security/schleuder/cli/Gemfile.lock b/pkgs/tools/security/schleuder/cli/Gemfile.lock new file mode 100644 index 000000000000..bd47b9df7f9a --- /dev/null +++ b/pkgs/tools/security/schleuder/cli/Gemfile.lock @@ -0,0 +1,21 @@ +GIT + remote: https://0xacab.org/schleuder/schleuder-cli + revision: 1de2548695d9a74f47b7868954561b48cbc966f9 + tag: schleuder-cli-0.1.0 + specs: + schleuder-cli (0.1.0) + thor (~> 0) + +GEM + remote: https://rubygems.org/ + specs: + thor (0.20.3) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + schleuder-cli! + +BUNDLED WITH + 2.3.6 diff --git a/pkgs/tools/security/schleuder/cli/default.nix b/pkgs/tools/security/schleuder/cli/default.nix new file mode 100644 index 000000000000..e34afa699f04 --- /dev/null +++ b/pkgs/tools/security/schleuder/cli/default.nix @@ -0,0 +1,34 @@ +{ lib +, bundlerApp +, ruby +, bundlerUpdateScript +}: + +bundlerApp { + inherit ruby; + + pname = "schleuder-cli"; + + gemdir = ./.; + + installManpages = false; + + exes = [ + "schleuder-cli" + ]; + + passthru.updateScript = bundlerUpdateScript "schleuder-cli"; + + meta = with lib; { + description = "A command line tool to create and manage schleuder-lists"; + longDescription = '' + Schleuder-cli enables creating, configuring, and deleting lists, + subscriptions, keys, etc. It uses the Schleuder API, provided by + schleuder-api-daemon (part of Schleuder). + ''; + homepage = "https://schleuder.org"; + changelog = "https://0xacab.org/schleuder/schleuder-cli/-/blob/main/CHANGELOG.md"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/tools/security/schleuder/cli/gemset.nix b/pkgs/tools/security/schleuder/cli/gemset.nix new file mode 100644 index 000000000000..45ff62f89137 --- /dev/null +++ b/pkgs/tools/security/schleuder/cli/gemset.nix @@ -0,0 +1,25 @@ +{ + schleuder-cli = { + dependencies = ["thor"]; + groups = ["default"]; + platforms = []; + source = { + fetchSubmodules = false; + rev = "1de2548695d9a74f47b7868954561b48cbc966f9"; + sha256 = "0k4i33w9a0bscw4wbs301vxca367g7pa89y6cr24i0014pbmhs9z"; + type = "git"; + url = "https://0xacab.org/schleuder/schleuder-cli"; + }; + version = "0.1.0"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + type = "gem"; + }; + version = "0.20.3"; + }; +} diff --git a/pkgs/tools/security/schleuder/default.nix b/pkgs/tools/security/schleuder/default.nix index 7fc320a7043c..8966dbd55b22 100644 --- a/pkgs/tools/security/schleuder/default.nix +++ b/pkgs/tools/security/schleuder/default.nix @@ -2,6 +2,7 @@ , bundlerApp , ruby , bundlerUpdateScript +, defaultGemConfig }: bundlerApp { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e48417a5df7..2bc4abf5c408 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5492,6 +5492,8 @@ with pkgs; schleuder = callPackage ../tools/security/schleuder { }; + schleuder-cli = callPackage ../tools/security/schleuder/cli { }; + tealdeer = callPackage ../tools/misc/tealdeer { inherit (darwin.apple_sdk.frameworks) Security; }; From 1dabedae3e41d2c64a754487e351fa3c19bdb0d5 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 31 May 2022 17:27:54 +0200 Subject: [PATCH 669/814] nixos/schleuder: init module and accompanying test Co-Authored-By: Martin Weinelt Co-Authored-By: Cole Helbling --- nixos/modules/module-list.nix | 1 + nixos/modules/services/mail/schleuder.nix | 162 ++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/schleuder.nix | 128 +++++++++++++++++ pkgs/tools/security/schleuder/default.nix | 4 + 5 files changed, 296 insertions(+) create mode 100644 nixos/modules/services/mail/schleuder.nix create mode 100644 nixos/tests/schleuder.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 43ae28ac02c5..3aae26f38543 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -516,6 +516,7 @@ ./services/mail/rspamd.nix ./services/mail/rss2email.nix ./services/mail/roundcube.nix + ./services/mail/schleuder.nix ./services/mail/sympa.nix ./services/mail/nullmailer.nix ./services/matrix/appservice-discord.nix diff --git a/nixos/modules/services/mail/schleuder.nix b/nixos/modules/services/mail/schleuder.nix new file mode 100644 index 000000000000..7ba15f1070bd --- /dev/null +++ b/nixos/modules/services/mail/schleuder.nix @@ -0,0 +1,162 @@ +{ config, pkgs, lib, ... }: +let + cfg = config.services.schleuder; + settingsFormat = pkgs.formats.yaml { }; + postfixMap = entries: lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "${name} ${value}") entries); + writePostfixMap = name: entries: pkgs.writeText name (postfixMap entries); + configScript = pkgs.writeScript "schleuder-cfg" '' + #!${pkgs.runtimeShell} + set -exuo pipefail + umask 0077 + ${pkgs.yq}/bin/yq \ + --slurpfile overrides <(${pkgs.yq}/bin/yq . <${lib.escapeShellArg cfg.extraSettingsFile}) \ + < ${settingsFormat.generate "schleuder.yml" cfg.settings} \ + '. * $overrides[0]' \ + > /etc/schleuder/schleuder.yml + chown schleuder: /etc/schleuder/schleuder.yml + ''; +in +{ + options.services.schleuder = { + enable = lib.mkEnableOption "Schleuder secure remailer"; + enablePostfix = lib.mkEnableOption "automatic postfix integration" // { default = true; }; + lists = lib.mkOption { + description = '' + List of list addresses that should be handled by Schleuder. + + Note that this is only handled by the postfix integration, and + the setup of the lists, their members and their keys has to be + performed separately via schleuder's API, using a tool such as + schleuder-cli. + ''; + type = lib.types.listOf lib.types.str; + default = [ ]; + example = [ "widget-team@example.com" "security@example.com" ]; + }; + /* maybe one day.... + domains = lib.mkOption { + description = "Domains for which all mail should be handled by Schleuder."; + type = lib.types.listOf lib.types.str; + default = []; + example = ["securelists.example.com"]; + }; + */ + settings = lib.mkOption { + description = '' + Settings for schleuder.yml. + + Check the example configuration for possible values. + ''; + type = lib.types.submodule { + freeformType = settingsFormat.type; + options.keyserver = lib.mkOption { + type = lib.types.str; + description = '' + Key server from which to fetch and update keys. + + Note that NixOS uses a different default from upstream, since the upstream default sks-keyservers.net is deprecated. + ''; + default = "keys.openpgp.org"; + }; + }; + default = { }; + }; + extraSettingsFile = lib.mkOption { + description = "YAML file to merge into the schleuder config at runtime. This can be used for secrets such as API keys."; + type = lib.types.nullOr lib.types.path; + default = null; + }; + listDefaults = lib.mkOption { + description = '' + Default settings for lists (list-defaults.yml). + + Check the example configuration for possible values. + ''; + type = settingsFormat.type; + default = { }; + }; + }; + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = !(cfg.settings.api ? valid_api_keys); + message = '' + services.schleuder.settings.api.valid_api_keys is set. Defining API keys via NixOS config results in them being copied to the world-readable Nix store. Please use the extraSettingsFile option to store API keys in a non-public location. + ''; + } + { + assertion = !(lib.any (db: db ? password) (lib.attrValues cfg.settings.database or {})); + message = '' + A password is defined for at least one database in services.schleuder.settings.database. Defining passwords via NixOS config results in them being copied to the world-readable Nix store. Please use the extraSettingsFile option to store database passwords in a non-public location. + ''; + } + ]; + users.users.schleuder.isSystemUser = true; + users.users.schleuder.group = "schleuder"; + users.groups.schleuder = {}; + environment.systemPackages = [ + pkgs.schleuder-cli + ]; + services.postfix = lib.mkIf cfg.enablePostfix { + extraMasterConf = '' + schleuder unix - n n - - pipe + flags=DRhu user=schleuder argv=/${pkgs.schleuder}/bin/schleuder work ''${recipient} + ''; + transport = lib.mkIf (cfg.lists != [ ]) (postfixMap (lib.genAttrs cfg.lists (_: "schleuder:"))); + extraConfig = '' + schleuder_destination_recipient_limit = 1 + ''; + # review: does this make sense? + localRecipients = lib.mkIf (cfg.lists != [ ]) cfg.lists; + }; + systemd.services = let commonServiceConfig = { + # We would have liked to use DynamicUser, but since the default + # database is SQLite and lives in StateDirectory, and that same + # database needs to be readable from the postfix service, this + # isn't trivial to do. + User = "schleuder"; + StateDirectory = "schleuder"; + StateDirectoryMode = "0700"; + }; in + { + schleuder-init = { + serviceConfig = commonServiceConfig // { + ExecStartPre = lib.mkIf (cfg.extraSettingsFile != null) [ + "+${configScript}" + ]; + ExecStart = [ "${pkgs.schleuder}/bin/schleuder install" ]; + Type = "oneshot"; + }; + }; + schleuder-api-daemon = { + after = [ "local-fs.target" "network.target" "schleuder-init.service" ]; + wantedBy = [ "multi-user.target" ]; + requires = [ "schleuder-init.service" ]; + serviceConfig = commonServiceConfig // { + ExecStart = [ "${pkgs.schleuder}/bin/schleuder-api-daemon" ]; + }; + }; + schleuder-weekly-key-maintenance = { + after = [ "local-fs.target" "network.target" ]; + startAt = "weekly"; + serviceConfig = commonServiceConfig // { + ExecStart = [ + "${pkgs.schleuder}/bin/schleuder refresh_keys" + "${pkgs.schleuder}/bin/schleuder check_keys" + ]; + }; + }; + }; + + environment.etc."schleuder/schleuder.yml" = lib.mkIf (cfg.extraSettingsFile == null) { + source = settingsFormat.generate "schleuder.yml" cfg.settings; + }; + environment.etc."schleuder/list-defaults.yml".source = settingsFormat.generate "list-defaults.yml" cfg.listDefaults; + + services.schleuder = { + #lists_dir = "/var/lib/schleuder.lists"; + settings.filters_dir = lib.mkDefault "/var/lib/schleuder/filters"; + settings.keyword_handlers_dir = lib.mkDefault "/var/lib/schleuder/keyword_handlers"; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 38c320886d1a..658c62b2a4e2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -485,6 +485,7 @@ in { samba = handleTest ./samba.nix {}; samba-wsdd = handleTest ./samba-wsdd.nix {}; sanoid = handleTest ./sanoid.nix {}; + schleuder = handleTest ./schleuder.nix {}; sddm = handleTest ./sddm.nix {}; seafile = handleTest ./seafile.nix {}; searx = handleTest ./searx.nix {}; diff --git a/nixos/tests/schleuder.nix b/nixos/tests/schleuder.nix new file mode 100644 index 000000000000..a9e4cc325bc7 --- /dev/null +++ b/nixos/tests/schleuder.nix @@ -0,0 +1,128 @@ +let + certs = import ./common/acme/server/snakeoil-certs.nix; + domain = certs.domain; +in +import ./make-test-python.nix { + name = "schleuder"; + nodes.machine = { pkgs, ... }: { + imports = [ ./common/user-account.nix ]; + services.postfix = { + enable = true; + enableSubmission = true; + tlsTrustedAuthorities = "${certs.ca.cert}"; + sslCert = "${certs.${domain}.cert}"; + sslKey = "${certs.${domain}.key}"; + inherit domain; + destination = [ domain ]; + localRecipients = [ "root" "alice" "bob" ]; + }; + services.schleuder = { + enable = true; + # Don't do it like this in production! The point of this setting + # is to allow loading secrets from _outside_ the world-readable + # Nix store. + extraSettingsFile = pkgs.writeText "schleuder-api-keys.yml" '' + api: + valid_api_keys: + - fnord + ''; + lists = [ "security@${domain}" ]; + settings.api = { + tls_cert_file = "${certs.${domain}.cert}"; + tls_key_file = "${certs.${domain}.key}"; + }; + }; + + environment.systemPackages = [ + pkgs.gnupg + pkgs.msmtp + (pkgs.writeScriptBin "do-test" '' + #!${pkgs.runtimeShell} + set -exuo pipefail + + # Generate a GPG key with no passphrase and export it + sudo -u alice gpg --passphrase-fd 0 --batch --yes --quick-generate-key 'alice@${domain}' rsa4096 sign,encr < <(echo) + sudo -u alice gpg --armor --export alice@${domain} > alice.asc + # Create a new mailing list with alice as the owner, and alice's key + schleuder-cli list new security@${domain} alice@${domain} alice.asc + + # Send an email from a non-member of the list. Use --auto-from so we don't have to specify who it's from twice. + msmtp --auto-from security@${domain} --host=${domain} --port=25 --tls --tls-starttls < list.asc + + # Import the key into alice's keyring, so we can verify it as well as decrypting + sudo -u alice gpg --import decrypted + # And check that the text matches. + grep "big security problem" decrypted + '') + + # For debugging: + # pkgs.vim pkgs.openssl pkgs.sqliteinteractive + ]; + + security.pki.certificateFiles = [ certs.ca.cert ]; + + # Since we don't have internet here, use dnsmasq to provide MX records from /etc/hosts + services.dnsmasq = { + enable = true; + extraConfig = '' + selfmx + ''; + }; + + networking.extraHosts = '' + 127.0.0.1 ${domain} + ''; + + # schleuder-cli's config is not quite optimal in several ways: + # - A fingerprint _must_ be pinned, it doesn't even have an option + # to trust the PKI + # - It compares certificate fingerprints rather than key + # fingerprints, so renewals break the pin (though that's not + # relevant for this test) + # - It compares them as strings, which means we need to match the + # expected format exactly. This means removing the :s and + # lowercasing it. + # Refs: + # https://0xacab.org/schleuder/schleuder-cli/-/issues/16 + # https://0xacab.org/schleuder/schleuder-cli/-/blob/f8895b9f47083d8c7b99a2797c93f170f3c6a3c0/lib/schleuder-cli/helper.rb#L230-238 + systemd.tmpfiles.rules = let cliconfig = pkgs.runCommand "schleuder-cli.yml" + { + nativeBuildInputs = [ pkgs.jq pkgs.openssl ]; + } '' + fp=$(openssl x509 -in ${certs.${domain}.cert} -noout -fingerprint -sha256 | cut -d = -f 2 | tr -d : | tr 'A-Z' 'a-z') + cat > $out < Date: Wed, 8 Jun 2022 16:16:28 +0200 Subject: [PATCH 670/814] bundler bin stubs: Squelch sudo warning @ruby maintainers: please feel free to revert this and let me know, should it cause any problems. Stuff that's in the store shouldn't be writable! So let's disable Bundler's requires_sudo? method, which checks if some files are writable and suggests using sudo if not, entirely. Previously, schleuder-cli would print to stderr when run: Following files may not be writable, so sudo is needed: /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0 /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/bin /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/bin /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/build_info /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/bundler /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/cache /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/doc /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/extensions /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/gems /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/plugins /nix/store/qg40x0ysrf9x6sag6qgb1klg87lskdp5-schleuder-cli-0.1.0/lib/ruby/gems/2.7.0/specifications --- .../ruby-modules/bundled-common/gen-bin-stubs.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb index 3106e9c24ca7..822996b7cbf6 100644 --- a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb +++ b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb @@ -41,6 +41,20 @@ Gem.paths = { 'GEM_HOME' => #{bundle_path.dump} } $LOAD_PATH.unshift #{File.join(bundler_path, "/lib").dump} require 'bundler' +# Monkey-patch out the check that Bundler performs to determine +# whether the bundler env is writable. It's not writable, even for +# root! And for this use of Bundler, it shouldn't be necessary since +# we're not trying to perform any package management operations, only +# produce a Gem path. Thus, we replace it with a method that will +# always return false, to squelch a warning from Bundler saying that +# sudo may be required. +module Bundler + class < Date: Fri, 24 Jun 2022 15:19:58 -0400 Subject: [PATCH 671/814] rl-2211: document schleuder addition --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ 2 files changed, 9 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 958000687810..b78cfad63b94 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -71,6 +71,13 @@ services.persistent-evdev. + + + schleuder, a + mailing list manager with PGP support. Enable using + services.schleuder. + + expressvpn, diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 1a14885ed8c3..436d590fb9a6 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -31,6 +31,8 @@ In addition to numerous new and upgraded packages, this release has the followin Available as [services.infnoise](options.html#opt-services.infnoise.enable). - [persistent-evdev](https://github.com/aiberia/persistent-evdev), a daemon to add virtual proxy devices that mirror a physical input device but persist even if the underlying hardware is hot-plugged. Available as [services.persistent-evdev](#opt-services.persistent-evdev.enable). +- [schleuder](https://schleuder.org/), a mailing list manager with PGP support. Enable using [services.schleuder](#opt-services.schleuder.enable). + - [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable). From 29d07eae100613b8932687cd2a5710e1c0b6eab3 Mon Sep 17 00:00:00 2001 From: Adam Cook Date: Fri, 24 Jun 2022 14:51:19 -0400 Subject: [PATCH 672/814] blocky: 0.18 -> 0.19 --- pkgs/applications/networking/blocky/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/blocky/default.nix b/pkgs/applications/networking/blocky/default.nix index 2f2a708455e1..0f25fd0a8ec9 100644 --- a/pkgs/applications/networking/blocky/default.nix +++ b/pkgs/applications/networking/blocky/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "blocky"; - version = "0.18"; + version = "0.19"; src = fetchFromGitHub { owner = "0xERR0R"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rFHDoNrEmMSNEc3RLdSeRk9mF05drUYfJFQKHAk5alE="; + sha256 = "sha256-jOOakRuiNbdCGmbaQFuHcLsHhV26jaQY+1GgDj9ocs0="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorSha256 = "sha256-rrqDjh5e3KX5+saYjnMPG0bhr5YEOPfz0QCRf6omNZI="; + vendorSha256 = "sha256-fsMBL9qyhIrV6eAsqpSaNniibMdYRVBnl2KCzStvMGQ="; meta = with lib; { description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features."; From fe2bcf1f17eb3c614208a988e19a4dbabc86b6eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 00:10:25 +0000 Subject: [PATCH 673/814] bazelisk: 1.11.0 -> 1.12.0 --- pkgs/development/tools/bazelisk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 2ba077fa9439..6eace485507a 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9J49+1fI3wmHQqYgdoGgaAuVMA9eG7wrFe7dQEectvI="; + sha256 = "sha256-RWVD6tngFE3i8JDB9b0JZz8Bd+u97b4ilmEF0N8Pm4Y="; }; - vendorSha256 = "sha256-+zJEB9FyVvxHdwR/dAn56jrMbgVBhlbziVFe2WCQFfE="; + vendorSha256 = "sha256-6rJa/c5uCnBQh0VVlzefXXPuJNFi+R8X2r+o7GBLIiE="; doCheck = false; From 8999fd199fd5bb3b4d897557c7bfadf9474cd776 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 00:19:04 +0000 Subject: [PATCH 674/814] anydesk: 6.1.1 -> 6.2.0 --- pkgs/applications/networking/remote/anydesk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index e13e2331323a..69276c229b3c 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -18,14 +18,14 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.1.1"; + version = "6.2.0"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" ]; - sha256 = "1ai58fsivb8al1279bayl800qavy0kfj40rjhf87g902ap3p4bhh"; + sha256 = "k85nQH2FWyEXDgB+Pd4yStfNCjkiIGE2vA/YTXLaK4o="; }; passthru = { From 17fc78ea58790e0f6616145149de74d171c10641 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Fri, 8 Apr 2022 15:00:27 -0300 Subject: [PATCH 675/814] nixos/argonone: init --- .../from_md/release-notes/rl-2205.section.xml | 8 +++ .../manual/release-notes/rl-2205.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/hardware/argonone.nix | 58 +++++++++++++++++++ 4 files changed, 69 insertions(+) create mode 100644 nixos/modules/services/hardware/argonone.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 5208671e4dab..8ef398e25fd0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -146,6 +146,14 @@ a kernel module for mounting the Apple File System (APFS). + + + argonone, + a replacement daemon for the Raspberry Pi Argon One power + button and cooler. Available at + services.hardware.argonone. + + ArchiSteamFarm, diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index faf941f56996..d83eb18f5141 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -61,6 +61,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [apfs](https://github.com/linux-apfs/linux-apfs-rw), a kernel module for mounting the Apple File System (APFS). +- [argonone](https://gitlab.com/DarkElvenAngel/argononed), a replacement daemon for the Raspberry Pi Argon One power button and cooler. Available at [services.hardware.argonone](options.html#opt-services.hardware.argonone.enable). + - [ArchiSteamFarm](https://github.com/JustArchiNET/ArchiSteamFarm), a C# application with primary purpose of idling Steam cards from multiple accounts simultaneously. Available as [services.archisteamfarm](#opt-services.archisteamfarm.enable). - [BaGet](https://loic-sharma.github.io/BaGet/), a lightweight NuGet and symbol server. Available at [services.baget](#opt-services.baget.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d59d7bfe40d9..a6e5e3054d48 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -428,6 +428,7 @@ ./services/games/terraria.nix ./services/hardware/acpid.nix ./services/hardware/actkbd.nix + ./services/hardware/argonone.nix ./services/hardware/auto-cpufreq.nix ./services/hardware/bluetooth.nix ./services/hardware/bolt.nix diff --git a/nixos/modules/services/hardware/argonone.nix b/nixos/modules/services/hardware/argonone.nix new file mode 100644 index 000000000000..638181b1b12e --- /dev/null +++ b/nixos/modules/services/hardware/argonone.nix @@ -0,0 +1,58 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.hardware.argonone; +in +{ + options.services.hardware.argonone = { + enable = lib.mkEnableOption "the driver for Argon One Raspberry Pi case fan and power button"; + package = lib.mkOption { + type = lib.types.package; + default = pkgs.argononed; + defaultText = "pkgs.argononed"; + description = '' + The package implementing the Argon One driver + ''; + }; + }; + + config = lib.mkIf cfg.enable { + hardware.i2c.enable = true; + hardware.deviceTree.overlays = [ + { + name = "argononed"; + dtboFile = "${cfg.package}/boot/overlays/argonone.dtbo"; + } + { + name = "i2c1-okay-overlay"; + dtsText = '' + /dts-v1/; + /plugin/; + / { + compatible = "brcm,bcm2711"; + fragment@0 { + target = <&i2c1>; + __overlay__ { + status = "okay"; + }; + }; + }; + ''; + } + ]; + environment.systemPackages = [ cfg.package ]; + systemd.services.argononed = { + description = "Argon One Raspberry Pi case Daemon Service"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "forking"; + ExecStart = "${cfg.package}/bin/argononed"; + PIDFile = "/run/argononed.pid"; + Restart = "on-failure"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ misterio77 ]; + +} From 172d2b8d2e729972b6b3340cfd8e53601b794d9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 00:39:59 +0000 Subject: [PATCH 676/814] python310Packages.sunpy: 4.0.1 -> 4.0.2 --- pkgs/development/python-modules/sunpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index b9fc0a652439..beb7c5b73ada 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "4.0.1"; + version = "4.0.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-TKOJcEg5A3zjuJbH/tugoX7A7vxSwcE20jJ5QuvWTu8="; + hash = "sha256-ZswUFdMRqEiMpTXAuVtEnsHJ4dgwcx2f4k1DwLl8pz8="; }; nativeBuildInputs = [ From 830b44fc0675a1b35dd4dbcee6a894d1d62e7350 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 01:44:58 +0000 Subject: [PATCH 677/814] atlantis: 0.19.3 -> 0.19.4 --- pkgs/applications/networking/cluster/atlantis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index d039b7bc3460..d7f685ee14f2 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atlantis"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-0/LrXdksljoTvhOWAyKzR/8fNqM6ZqCjfgTNUfZNdXw="; + sha256 = "sha256-OvUcSccSBLuWci0DZPd6+ztthnAf47CvuAxu2NnqRQ0="; }; - vendorSha256 = "sha256-HEMyJRNk7sii87cZBfuQy41n0sI+On4271bVVNVWXeg="; + vendorSha256 = "sha256-LActkTCZ7/KlvFmJ+58I8hTQWdxFxlRN09Jmj1vDa2U="; subPackages = [ "." ]; From b48d34c93338529eae0494a8b7d274acf763d57e Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 25 Jun 2022 01:57:43 +0000 Subject: [PATCH 678/814] temporal-cli: 1.16.1 -> 1.16.2 --- .../networking/cluster/temporal-cli/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index 49d64283ca0f..0d326d5ad458 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -1,26 +1,17 @@ -{ lib, fetchFromGitHub, fetchpatch, buildGoModule, testers, temporal-cli }: +{ lib, fetchFromGitHub, buildGoModule, testers, temporal-cli }: buildGoModule rec { pname = "temporal-cli"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "tctl"; rev = "v${version}"; - sha256 = "sha256-WNdu/62/VmxTmzAvzx3zIlcAAlEmpN0yKzQOSUtrL8s="; + sha256 = "sha256-KLcCFQJlFeioIhqrbkhgoNPcbAYvy1ESG8x9Y/I7+nw="; }; - patches = [ - # Fix tests - (fetchpatch { - name = "fix-tests.patch"; - url = "https://github.com/temporalio/tctl/pull/203/commits/2b113da137a3a925e8fbd7c18bdaaefc31397db4.patch"; - sha256 = "sha256-HFPwbmLZ2uPHzaHvYoB4MTZvMVyzvUKggA76/bh50DQ="; - }) - ]; - - vendorSha256 = "sha256-WF3T+HNisfR0JoKkHCC77kmHmsGZ9NfQ7UCwOmpCG/o="; + vendorSha256 = "sha256-kczmoP32/V0HHeC3Mr+giuMB+McVTNeC2F+t1ohY4/U="; ldflags = [ "-s" "-w" ]; From 7aa9ce8d2b09c24e97270c4be8fc358470384dc5 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 25 Jun 2022 02:09:42 +0000 Subject: [PATCH 679/814] buf: 1.5.0 -> 1.6.0 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 8fcc8bad2269..c853e361bae9 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Jcj1tpcG64mSVn444isGsK9AcITh171ibECukv3bXDI="; + sha256 = "sha256-sqByTrhtaytBMD8ULOP+xoacxMD6sw3n2XYVZ1hWIJ4="; }; - vendorSha256 = "sha256-aHGV8UfPn7xsySPXRSzsEpcaz1Ll49Mj1S9izvaIRWY="; + vendorSha256 = "sha256-H000xhqjSFXGW3Saa/ryYdVcDl2ieeSW3dq3DPVX+c0="; patches = [ # Skip a test that requires networking to be available to work. From bc7002316a16bb4eaf2533f6d05ffa8e7e0fe85c Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 31 May 2022 11:53:40 +0000 Subject: [PATCH 680/814] gcsfuse: 0.41.1 -> 0.41.4 --- pkgs/tools/filesystems/gcsfuse/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 0a621c5e034d..12447377ae93 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -1,32 +1,32 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gcsfuse"; - version = "0.41.1"; + version = "0.41.4"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "sha256-5Kfd033SG1ldF+2QCZ01aa7ts0mA8uPXiLmqZIr94YQ="; + sha256 = "sha256-8QzSvR/uelp9iBLK+DsUXsH6fBOIoeXePeN7Spht6SE="; }; - goPackagePath = "github.com/googlecloudplatform/gcsfuse"; + vendorSha256 = null; subPackages = [ "." "tools/mount_gcsfuse" ]; + ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ]; + postInstall = '' ln -s $out/bin/mount_gcsfuse $out/bin/mount.gcsfuse ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse ''; - ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ]; - meta = with lib;{ description = "A user-space file system for interacting with Google Cloud Storage"; homepage = "https://cloud.google.com/storage/docs/gcs-fuse"; license = licenses.asl20; platforms = platforms.unix; - maintainers = []; + maintainers = with maintainers; [ aaronjheng ]; }; } From eeb3e707ff42721675a535deb74ef11ce8f7c35f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 02:11:49 +0000 Subject: [PATCH 681/814] apko: 0.3.3 -> 0.4.0 --- pkgs/development/tools/apko/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix index 05342e7714e9..ee2d7f24a6b6 100644 --- a/pkgs/development/tools/apko/default.nix +++ b/pkgs/development/tools/apko/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "apko"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j/tfa9O10HSEwzuXE2mjV2TVYuwk9lpA0PgsKDm70uI="; + sha256 = "sha256-gmBcN1lxzkkRpiUUWv87ji/G4Uy3DA8a6+6Qs+p/2mg="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-jsNSYlTXUAUPG7vccjmonZUN1HAmULprCmJ1TYLYP00="; + vendorSha256 = "sha256-3gRECgKvGqkgBzB3SSxm6/LxZG8RxhjoC6Q7DZj/Has="; nativeBuildInputs = [ installShellFiles ]; From 75e972b763463f784b58a36df2328e917d56b463 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 02:49:40 +0000 Subject: [PATCH 682/814] atari800: 4.2.0 -> 5.0.0 --- pkgs/applications/emulators/atari800/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/atari800/default.nix b/pkgs/applications/emulators/atari800/default.nix index 37e0d83f1406..c1f685827047 100644 --- a/pkgs/applications/emulators/atari800/default.nix +++ b/pkgs/applications/emulators/atari800/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "atari800"; - version = "4.2.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "atari800"; repo = "atari800"; rev = "ATARI800_${replaceChars ["."] ["_"] version}"; - sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy"; + sha256 = "sha256-+eJXhqPyU0GhmzF7DbteTXzEnn5klCor9Io/UgXQfQg="; }; nativeBuildInputs = [ autoreconfHook ]; From 46116305b069804a2e83d0c61f95860c606bdb7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 02:55:28 +0000 Subject: [PATCH 683/814] bindfs: 1.15.1 -> 1.16.0 --- pkgs/tools/filesystems/bindfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 12052100db32..333157d829fb 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, fuse, pkg-config }: stdenv.mkDerivation rec { - version = "1.15.1"; + version = "1.16.0"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-BN01hKbN+a9DRNQDxiGFyp+rMc465aJdAQG8EJNsaKs="; + sha256 = "sha256-AuvvqqZOGwRPxcdDxYKarSHtb3FF9NsHI7zEXwhXgfY="; }; nativeBuildInputs = [ pkg-config ]; From 1cf5ac17372319dff98e1cf7d18e378ecf98d417 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 03:01:52 +0000 Subject: [PATCH 684/814] argocd: 2.4.0 -> 2.4.2 --- pkgs/applications/networking/cluster/argocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index f0c81ab5ca5f..212e024b9879 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.4.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-U3i3shXsItQQlkFl/DrGdSHY2AAhaYV5WX3B+6TlOPw="; + sha256 = "sha256-zc99YKh5hNa4oRoKJcGWqNrDb3LqIwXWzYOsmGKVsL8="; }; vendorSha256 = "sha256-j/35tvfUCcuFN8NGIjWgna1W0Q4CyhMLcOlepTAUl0w="; From 0345a96e13d0fa77f240afe1953df90d606971f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 03:02:14 +0000 Subject: [PATCH 685/814] flexget: 3.3.17 -> 3.3.18 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 0a4cea628815..071ac5b7aa27 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.17"; + version = "3.3.18"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-xVHk6fQBY8EQsZJDZYoQ+WXDpLGJrRTVR6xhF1DWv0I="; + hash = "sha256-vZOeWxCcrTRT28Bn2r/I7/ojQ6uUV3xZlAZLbrAH5tc="; }; postPatch = '' From bc61425f7136ed35681c54062cede078dc7c61c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 03:08:04 +0000 Subject: [PATCH 686/814] beancount-language-server: 1.1.1 -> 1.2.5 --- .../development/tools/beancount-language-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/beancount-language-server/default.nix b/pkgs/development/tools/beancount-language-server/default.nix index 1766f22ee180..b415906eead7 100644 --- a/pkgs/development/tools/beancount-language-server/default.nix +++ b/pkgs/development/tools/beancount-language-server/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "beancount-language-server"; - version = "1.1.1"; + version = "1.2.5"; src = fetchFromGitHub { owner = "polarmutex"; repo = "beancount-language-server"; rev = "v${version}"; - sha256 = "sha256-CkwNxamkErRo3svJNth2F8NSqlJNX+1S/srKu6Z+mX4="; + sha256 = "sha256-AbljduMz4mz5InsHKCq0K6i9F/lBgvdy0+W8aclr0R0="; }; - cargoSha256 = "sha256-NTUs9ADTn+KoE08FikRHrdptZkrUqnjVIlcr8RtDvic="; + cargoSha256 = "sha256-jrxVMGJk4o9aROtFZBc8G/HP5xm9MjVyewww1DzrRdM="; doInstallCheck = true; postInstallCheck = '' From 2ec10ad207f7a9fc6994c9d19e19729a06c40355 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 03:44:34 +0000 Subject: [PATCH 687/814] argo: 3.3.5 -> 3.3.8 --- pkgs/applications/networking/cluster/argo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index ffcfc8e9c177..624814c1bb65 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "3.3.5"; + version = "3.3.8"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-EeGpJliE38MroeScdmeMp36rEDld59zDEM5i4QqxYik="; + sha256 = "sha256-9RwUKLVf8ArDAE6ivbWqxDCCW4OjqQFEEoWHBIv/cww="; }; vendorSha256 = "sha256-cq452XEGMVbLvfJ/UiVyOvnUSJr196owB3SyBYnAmZ0="; From 4ba77240ace8ca5550ff917bb59b2ec721579af8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 04:01:02 +0000 Subject: [PATCH 688/814] antimicrox: 3.2.3 -> 3.2.4 --- pkgs/tools/misc/antimicrox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix index b39d9b17002f..73e430e54e34 100644 --- a/pkgs/tools/misc/antimicrox/default.nix +++ b/pkgs/tools/misc/antimicrox/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "antimicrox"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "AntiMicroX"; repo = pname; rev = version; - sha256 = "sha256-Qn2XT/l3zx0u3twKsQr1cHbaRiLTglQf0WNx8tqtKro="; + sha256 = "sha256-catgal3bpWJUcTo0x0V0X3VV87AHO2Dp58IpQ/ILsZ8="; }; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; From 5e95aa10505c473a283a0137bd349838ff60fe3a Mon Sep 17 00:00:00 2001 From: Tomislav Markovski Date: Sat, 25 Jun 2022 00:09:48 -0400 Subject: [PATCH 689/814] trinsic-cli: 1.4.0 -> 1.5.0 (#176567) Co-authored-by: Sandro --- pkgs/tools/admin/trinsic-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/trinsic-cli/default.nix b/pkgs/tools/admin/trinsic-cli/default.nix index d6e6d6f100c5..907516ce3655 100644 --- a/pkgs/tools/admin/trinsic-cli/default.nix +++ b/pkgs/tools/admin/trinsic-cli/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "trinsic-cli"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/trinsic-id/sdk/releases/download/v${version}/trinsic-cli-vendor-${version}.tar.gz"; - sha256 = "sha256-Dxmjbd1Q2JNeET22Fte7bygd+oH3ZfovRTJh5xforuw="; + sha256 = "sha256-Z9orGhxbu/ehyaYhY35lYWcZQWNVk+zLSoqwAZwnpLY="; }; cargoVendorDir = "vendor"; From 20429f3274072805d2ebc0820a1ab3b1af770a02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 05:04:45 +0000 Subject: [PATCH 690/814] _1password: 2.4.1 -> 2.5.1 --- pkgs/applications/misc/1password/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index afc8d114f005..0d18b3dd37a3 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.4.1"; + version = "2.5.1"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-ANRYE1BoezrcDxZrQYp/OPdtn4J+FmC/PLSIP5Amm18=" "zip"; - i686-linux = fetch "linux_386" "sha256-w3anr76uj/Z+ilZ+LUGOB1CoKkvxcD+v8c8lVADPwRY=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-axZ+XDIMJlAicnYTIXgcaoT+Zcg6xvHlchl/ng7V9GY=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-/DnrQ4fwbc2ELtsEClvzA9kTrse3pMgGLbhiKZ3gphA=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-HZ6AVheJrw9ZR9HGWbB6/kCzbrfYcwApa2z18tDBo1k=" "zip"; + i686-linux = fetch "linux_386" "sha256-aG6oW0epF+P9pSWMlTStSbBynBDkGX1B+0NHUnwLRhs=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-7GkBVcvXM/WZiXEiIbYh9lS0f4BS4Hc4RCVjr8FoW8A=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-XebD33fX15RsFUdbV+DvMRIi1MSyMfIRC3JOwcmi8kk=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; @@ -48,6 +48,7 @@ stdenv.mkDerivation { ''; postInstall = '' + HOME=$TMPDIR installShellCompletion --cmd ${mainProgram} \ --bash <($out/bin/${mainProgram} completion bash) \ --fish <($out/bin/${mainProgram} completion fish) \ From d08919a511d1938902e3b23427a6b7d461a61ec1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 05:05:09 +0000 Subject: [PATCH 691/814] heisenbridge: 1.13.0 -> 1.13.1 --- pkgs/servers/heisenbridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index 3d4ef94dda49..82599cdcbaa5 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, fetchpatch, python3 }: python3.pkgs.buildPythonApplication rec { pname = "heisenbridge"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "hifi"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-3YCYLhJqZAWIwpwOd8J1+uYsxw0q6jQy35Vp+ttVKhI="; + sha256 = "sha256-sgZql9373xKT7Hi8M5TIZTOkS2AOFoKA1DXYa2f2IkA="; }; postPatch = '' From 487319f568953990dfb4b52bfeef4a33e0046621 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 05:10:47 +0000 Subject: [PATCH 692/814] aliyun-cli: 3.0.121 -> 3.0.123 --- pkgs/tools/admin/aliyun-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index e2359bd5e117..b18b8a82088e 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.121"; + version = "3.0.123"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-1D1JZZ/KMC4oZRaYvWpUazTk7llvX5WHPBxWEGCiKrI="; + sha256 = "sha256-68u31s7SsRRT9OQpTqlhAs5Dx+ggbTTSeKYBByiqn6g="; }; - vendorSha256 = "sha256-f3GXkAvTe8rPFWCR5TM4mDK/VOQWt2lrZrfJ/Wvw8Uc="; + vendorSha256 = "sha256-X5r89aI7UdVlzEJi8zaOzwTETwb+XH8dKO6rVe//FNs="; subPackages = [ "main" ]; From 64725aac066c8f53b4b4a2ec9337eadfb0a2909b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 05:16:00 +0000 Subject: [PATCH 693/814] alsa-utils: 1.2.6 -> 1.2.7 --- pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix index e614be978c06..e8c6a2ae566f 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alsa-utils"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { url = "mirror://alsa/utils/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ah79ih8dnTjkiWM+rsH/+lwxVmOzFsq4BL5IaIfmFF0="; + sha256 = "sha256-6Qa/JAT/BMRI6qPSJtKDpiuaKD8S5P2EV/skusJ05ng="; }; nativeBuildInputs = [ gettext makeWrapper ]; From 22e2d3d6b4d975d2603bd1a6e1970bf1f32ad1bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 05:52:58 +0000 Subject: [PATCH 694/814] legendary-gl: 0.20.26 -> 0.20.27 --- pkgs/games/legendary-gl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix index 7025a9cb66eb..6b81593c8af1 100644 --- a/pkgs/games/legendary-gl/default.nix +++ b/pkgs/games/legendary-gl/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.20.26"; + version = "0.20.27"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; rev = "refs/tags/${version}"; - sha256 = "sha256-NqAdS5PN7Qj/HdZ2quemb0xJQsD3Ox1a/TVXj3QMq9c="; + sha256 = "sha256-h9WmeVONX19/pUBfE1T/OSMI/HkTKJiTfyyEJV/noB8="; }; propagatedBuildInputs = [ requests ]; From 42b60f2e41dd86ab606c034317844a3751fb8c92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 06:06:56 +0000 Subject: [PATCH 695/814] python310Packages.ropgadget: 6.7 -> 6.8 --- pkgs/development/python-modules/ropgadget/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix index 4d0a4aa94f11..65a80e399d1e 100644 --- a/pkgs/development/python-modules/ropgadget/default.nix +++ b/pkgs/development/python-modules/ropgadget/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ropgadget"; - version = "6.7"; + version = "6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JonathanSalwan"; repo = "ROPgadget"; - rev = "v${version}"; - hash = "sha256-zOTbncsOvmLQMZGpcRLviSZP/d1cQTQHXCLUKyEgVBk="; + rev = "refs/tags/v${version}"; + hash = "sha256-hnqjyZC3RJNQf8JdtaQ5L3PU+96p4cxdd+P4YlW9jjI="; }; propagatedBuildInputs = [ From 1beab1d36ebf1a0a0885dde57a6ea55462f0a218 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 06:07:09 +0000 Subject: [PATCH 696/814] checkstyle: 10.2 -> 10.3 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 31f022263b22..1f07c8ff030f 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "10.2"; + version = "10.3"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-jcu7KMeYbHZW4zswaV/cLkY4CLX9vJIcElXJq06EfRY="; + sha256 = "sha256-3n5gXGHznrLGL9hudk1nZs1GJ5V2qzqVPCtn1fqujB0="; }; nativeBuildInputs = [ makeWrapper ]; From deab8d654d050721848fa1049d2f30e72f74a38a Mon Sep 17 00:00:00 2001 From: Abin Simon Date: Sat, 25 Jun 2022 11:43:04 +0530 Subject: [PATCH 697/814] helm-docs: 1.8.1 -> 1.10.0 --- pkgs/applications/networking/cluster/helm-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix index 1d3c9f43e906..cdd6c68a76fb 100644 --- a/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helm-docs"; - version = "1.8.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "norwoodj"; repo = "helm-docs"; rev = "v${version}"; - sha256 = "sha256-OpS/CYBb2Ll6ktvEhqkw/bWMSrFa4duidK3Glu8EnPw="; + sha256 = "sha256-V7Qw20PPoAEXl/XAMj/WSM73fLdp/gH4G3ipx49p06o="; }; vendorSha256 = "sha256-FpmeOQ8nV+sEVu2+nY9o9aFbCpwSShQUFOmyzwEQ9Pw="; From 2f74b5358ce231ace5b50da335af1b9314623bb9 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 25 Jun 2022 08:28:26 +0200 Subject: [PATCH 698/814] tdesktop: 4.0.0 -> 4.0.2 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 0ee0bef5e233..212092d8a1ff 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -71,7 +71,7 @@ let in env.mkDerivation rec { pname = "telegram-desktop"; - version = "4.0.0"; + version = "4.0.2"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -80,7 +80,7 @@ env.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "16j5rvlqr2bb1dkc7cc920ylhw3sp4qnqvm1aznnnjzcimqb8xf0"; + sha256 = "07fhm36394171w0rvay1x9x1br3z36z4dlpi57bkq23dvi331pxj"; }; postPatch = '' From 4497c40989965005fc1a87de100422dc5dcfa3bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 06:28:50 +0000 Subject: [PATCH 699/814] clj-kondo: 2022.04.25 -> 2022.06.22 --- pkgs/development/tools/clj-kondo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 5ef65dde14d6..3fe90a3004c0 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2022.04.25"; + version = "2022.06.22"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-BqqeJQ7mBMofX6efJCSUr6qMZXubO9CuDiCNNNKT3DA="; + sha256 = "sha256-g+0BYwk9bws+c7CfLGf88r2nfcDBCdDKyqRS285oIQM="; }; extraNativeImageBuildArgs = [ From 43902236e09aefeb37cb30a9c6fb2508bb4711ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 06:55:36 +0000 Subject: [PATCH 700/814] cargo-llvm-lines: 0.4.15 -> 0.4.16 --- pkgs/development/tools/rust/cargo-llvm-lines/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index e523fb44bb99..417cdd676183 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.15"; + version = "0.4.16"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-pP1kMwxIrL2ADvj4AkbhqKH5vzGyQnfL7hjg3/QYIY8="; + sha256 = "sha256-MDRVNCfyObEaN0eNnaDBQCYQV2Y1Ck5/8zdpG4eZbaE="; }; - cargoSha256 = "sha256-V9mD9NAG7bB8uB/pjl0XGXmJqOUm4ZrFJV7nv569XOM="; + cargoSha256 = "sha256-oOUidCM3Xex8bqBVJmrigHZHMdjXBNDdKaPiA/+MR7s="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; From 9bc4144fa9134b455196b5b0039773cce453bf0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 07:04:56 +0000 Subject: [PATCH 701/814] brook: 20220515 -> 20220707 --- pkgs/tools/networking/brook/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index e0e37e99ac74..b4a5a30beeb3 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "brook"; - version = "20220515"; + version = "20220707"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-olYlAuIcK34nNXbfiPT4+u0L3xcxBMMty72FjSeuNqg="; + sha256 = "sha256-TlbVXfNUvCHHX0BReSVE6GNfmS+p6lWSdO0OtOC+I2U="; }; - vendorSha256 = "sha256-ic5QYRVElEuH4D29PXgTzMHU0KjrxDqcdfg7Kd37/YU="; + vendorSha256 = "sha256-MPLM1lBM1K55q6nsfmOekdFlSDmPsLLDv09mD1XqLNo="; meta = with lib; { homepage = "https://github.com/txthinking/brook"; From aff2dacede7672e0d087b655e7ec79994cf1225e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 07:36:18 +0000 Subject: [PATCH 702/814] python310Packages.railroad-diagrams: 2.0.3 -> 2.0.4 --- pkgs/development/python-modules/railroad-diagrams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/railroad-diagrams/default.nix b/pkgs/development/python-modules/railroad-diagrams/default.nix index 1af5a196250f..55b964fb6ad2 100644 --- a/pkgs/development/python-modules/railroad-diagrams/default.nix +++ b/pkgs/development/python-modules/railroad-diagrams/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "railroad-diagrams"; - version = "2.0.3"; + version = "2.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wRClrA4I/DWNw/hL5rowQMn0R61c6qiNg9Ho6nXqi+4="; + hash = "sha256-dBP/oZRYO9UQ78PkZo9h1aOL7soYa7fDbuptDW8D+0U="; }; # This is a dependency of pyparsing, which is a dependency of pytest From e26fca28ae5279112024d308bbc9d15fdd30dfa5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 08:13:40 +0000 Subject: [PATCH 703/814] chamber: 2.10.10 -> 2.10.12 --- pkgs/tools/admin/chamber/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index 25b304819951..fff2343cf21d 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "chamber"; - version = "2.10.10"; + version = "2.10.12"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W/yuCQ1kE300//if/H73ZEJh/r2vttJ0GotZkBZNM+4="; + sha256 = "sha256-KbKOaUwJEy/mT59yW0VhZ3MIWkXarCRY8cyNlaI51mQ="; }; CGO_ENABLED = 0; - vendorSha256 = "sha256-XpLLolxWu9aMp1cyG4dUQk4YtknbIRMmBUdSeyY4PNk="; + vendorSha256 = "sha256-ENsKm3D3URCrRUiqqebkgFS//2h9SlLbAQHdjisdGlE="; ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; From 112374cc6362c674ca6903d5da77be1896e05944 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 08:19:51 +0000 Subject: [PATCH 704/814] capnproto: 0.9.1 -> 0.10.1 --- pkgs/development/libraries/capnproto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index aeb9728af826..2a9b57fae637 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "capnproto"; - version = "0.9.1"; + version = "0.10.1"; # release tarballs are missing some ekam rules src = fetchFromGitHub { owner = "capnproto"; repo = "capnproto"; rev = "v${version}"; - sha256 = "0cbiwkmd29abih8rjjm35dfkrkr8c6axbzq3fkryay6jyvpi42c5"; + sha256 = "sha256-VdeoTU802kAqTdu8CJTIhy3xHM3ZCPqb5YNUS2k1x7E="; }; nativeBuildInputs = [ cmake ] @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) "-DEXTERNAL_CAPNP"; - # Upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c, modified to apply to v0.9.1. Drop on update. + # Upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c, modified to apply to v0.10.1. Drop on update. patches = lib.optional stdenv.hostPlatform.isMusl ./musl-no-fibers.patch; meta = with lib; { From 2af0db6d3ec5648495d0abb8e4434ad00295c021 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Jun 2022 08:20:00 +0000 Subject: [PATCH 705/814] capnproto: remove outdated patch The patch was integrated in the 0.10.0 release. --- .../libraries/capnproto/default.nix | 3 - .../libraries/capnproto/musl-no-fibers.patch | 244 ------------------ 2 files changed, 247 deletions(-) delete mode 100644 pkgs/development/libraries/capnproto/musl-no-fibers.patch diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index 2a9b57fae637..3f1d12198994 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -21,9 +21,6 @@ stdenv.mkDerivation rec { cmakeFlags = lib.optional (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) "-DEXTERNAL_CAPNP"; - # Upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c, modified to apply to v0.10.1. Drop on update. - patches = lib.optional stdenv.hostPlatform.isMusl ./musl-no-fibers.patch; - meta = with lib; { homepage = "https://capnproto.org/"; description = "Cap'n Proto cerealization protocol"; diff --git a/pkgs/development/libraries/capnproto/musl-no-fibers.patch b/pkgs/development/libraries/capnproto/musl-no-fibers.patch deleted file mode 100644 index bb7804fb0abb..000000000000 --- a/pkgs/development/libraries/capnproto/musl-no-fibers.patch +++ /dev/null @@ -1,244 +0,0 @@ -From 3d983eff304c28574c330a52d70a60145c9e157e Mon Sep 17 00:00:00 2001 -From: Jonas Vautherin -Date: Fri, 14 Jan 2022 00:14:26 +0100 -Subject: [PATCH] Add support for musl - ---- -Based on upstream 77ac9154440bcc216fda1092fd5bb51da62ae09c, -modified slightly by dtzWill to apply to v0.9.1. - -(drop whitespace change to a cmake "if (WITH_OPENSSL)", -leave the other instance of that change since it applies) ---- - -Co-authored-by: Guillaume Papin -(cherry picked from commit 77ac9154440bcc216fda1092fd5bb51da62ae09c) ---- - .github/workflows/quick-test.yml | 9 ++++++ - c++/CMakeLists.txt | 46 ++++++++++++++++++++++++++++- - c++/cmake/CapnProtoConfig.cmake.in | 32 ++++++++++++++++++++ - c++/configure.ac | 47 ++++++++++++++++++++++++++++-- - c++/src/kj/CMakeLists.txt | 11 ++++++- - 5 files changed, 141 insertions(+), 4 deletions(-) - -diff --git a/.github/workflows/quick-test.yml b/.github/workflows/quick-test.yml -index c18ef6a6..773ff043 100644 ---- a/.github/workflows/quick-test.yml -+++ b/.github/workflows/quick-test.yml -@@ -10,6 +10,15 @@ on: - - 'release-*' - - jobs: -+ Linux-musl: -+ runs-on: ubuntu-latest -+ container: alpine:latest -+ steps: -+ - uses: actions/checkout@v2 -+ - name: install dependencies -+ run: apk add autoconf automake build-base cmake libtool libucontext-dev linux-headers openssl-dev -+ - name: super-test -+ run: ./super-test.sh quick - Linux: - runs-on: ubuntu-latest - strategy: -diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt -index 548dfd1f..5de7ab26 100644 ---- a/c++/CMakeLists.txt -+++ b/c++/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.4) -+cmake_minimum_required(VERSION 3.6) - project("Cap'n Proto" CXX) - set(VERSION 0.9.1) - -@@ -64,6 +64,50 @@ elseif (WITH_OPENSSL) - find_package(OpenSSL REQUIRED COMPONENTS Crypto SSL) - endif() - -+set(WITH_FIBERS "AUTO" CACHE STRING -+ "Whether or not to build libkj-async with fibers") -+# define list of values GUI will offer for the variable -+set_property(CACHE WITH_FIBERS PROPERTY STRINGS AUTO ON OFF) -+ -+# CapnProtoConfig.cmake.in needs this variable. -+set(_WITH_LIBUCONTEXT OFF) -+ -+if (WITH_FIBERS OR WITH_FIBERS STREQUAL "AUTO") -+ set(_capnp_fibers_found OFF) -+ if (WIN32 OR CYGWIN) -+ set(_capnp_fibers_found ON) -+ else() -+ # Fibers need makecontext, setcontext, getcontext, swapcontext that may be in libc, -+ # or in libucontext (e.g. for musl). -+ # We assume that makecontext implies that the others are present. -+ include(CheckLibraryExists) -+ check_library_exists(c makecontext "" HAVE_UCONTEXT_LIBC) -+ if (HAVE_UCONTEXT_LIBC) -+ set(_capnp_fibers_found ON) -+ else() -+ # Try with libucontext -+ find_package(PkgConfig) -+ if (PKG_CONFIG_FOUND) -+ pkg_check_modules(libucontext IMPORTED_TARGET libucontext) -+ if (libucontext_FOUND) -+ set(_WITH_LIBUCONTEXT ON) -+ set(_capnp_fibers_found ON) -+ endif() -+ else() -+ set(_capnp_fibers_found OFF) -+ endif() -+ endif() -+ endif() -+ -+ if (_capnp_fibers_found) -+ set(WITH_FIBERS ON) -+ elseif(WITH_FIBERS STREQUAL "AUTO") -+ set(WITH_FIBERS OFF) -+ else() -+ message(FATAL_ERROR "Missing 'makecontext', 'getcontext', 'setcontext' or 'swapcontext' symbol in libc and no libucontext found: KJ won't be able to build with fibers. Disable fibers (-DWITH_FIBERS=OFF).") -+ endif() -+endif() -+ - if(MSVC) - # TODO(cleanup): Enable higher warning level in MSVC, but make sure to test - # build with that warning level and clean out false positives. -diff --git a/c++/cmake/CapnProtoConfig.cmake.in b/c++/cmake/CapnProtoConfig.cmake.in -index 667f502f..0580b11a 100644 ---- a/c++/cmake/CapnProtoConfig.cmake.in -+++ b/c++/cmake/CapnProtoConfig.cmake.in -@@ -62,6 +62,38 @@ if (@WITH_OPENSSL@) # WITH_OPENSSL - endif() - endif() - -+if (@_WITH_LIBUCONTEXT@) # _WITH_LIBUCONTEXT -+ set(forwarded_config_flags) -+ if(CapnProto_FIND_QUIETLY) -+ list(APPEND forwarded_config_flags QUIET) -+ endif() -+ if(CapnProto_FIND_REQUIRED) -+ list(APPEND forwarded_config_flags REQUIRED) -+ endif() -+ # If the consuming project called find_package(CapnProto) with the QUIET or REQUIRED flags, forward -+ # them to calls to find_package(PkgConfig) and pkg_check_modules(). Note that find_dependency() -+ # would do this for us in the former case, but there is no such forwarding wrapper for -+ # pkg_check_modules(). -+ -+ find_package(PkgConfig ${forwarded_config_flags}) -+ if(NOT ${PkgConfig_FOUND}) -+ # If we're here, the REQUIRED flag must not have been passed, else we would have had a fatal -+ # error. Nevertheless, a diagnostic for this case is probably nice. -+ if(NOT CapnProto_FIND_QUIETLY) -+ message(WARNING "pkg-config cannot be found") -+ endif() -+ set(CapnProto_FOUND OFF) -+ return() -+ endif() -+ -+ if (CMAKE_VERSION VERSION_LESS 3.6) -+ # CMake >= 3.6 required due to the use of IMPORTED_TARGET -+ message(SEND_ERROR "libucontext support requires CMake >= 3.6.") -+ endif() -+ -+ pkg_check_modules(libucontext IMPORTED_TARGET ${forwarded_config_flags} libucontext) -+endif() -+ - include("${CMAKE_CURRENT_LIST_DIR}/CapnProtoTargets.cmake") - include("${CMAKE_CURRENT_LIST_DIR}/CapnProtoMacros.cmake") - -diff --git a/c++/configure.ac b/c++/configure.ac -index 72fe8456..b627bec8 100644 ---- a/c++/configure.ac -+++ b/c++/configure.ac -@@ -32,6 +32,11 @@ AC_ARG_WITH([openssl], - [build libkj-tls by linking against openssl @<:@default=check@:>@])], - [],[with_openssl=check]) - -+AC_ARG_WITH([fibers], -+ [AS_HELP_STRING([--with-fibers], -+ [build libkj-async with fibers @<:@default=check@:>@])], -+ [],[with_fibers=check]) -+ - AC_ARG_ENABLE([reflection], [ - AS_HELP_STRING([--disable-reflection], [ - compile Cap'n Proto in "lite mode", in which all reflection APIs (schema.h, dynamic.h, etc.) -@@ -195,8 +200,46 @@ AS_IF([test "$with_openssl" != no], [ - ]) - AM_CONDITIONAL([BUILD_KJ_TLS], [test "$with_openssl" != no]) - --# CapnProtoConfig.cmake.in needs this variable. --AC_SUBST(WITH_OPENSSL, $with_openssl) -+# Fibers need the symbols getcontext, setcontext, swapcontext and makecontext. -+# We assume that makecontext implies the rest. -+AS_IF([test "$with_fibers" != no], [ -+ libc_supports_fibers=yes -+ AC_SEARCH_LIBS([makecontext], [], [], [ -+ libc_supports_fibers=no -+ ]) -+ -+ AS_IF([test "$libc_supports_fibers" = yes], [ -+ with_fibers=yes -+ ], [ -+ # If getcontext does not exist in libc, try with libucontext -+ ucontext_supports_fibers=yes -+ AC_CHECK_LIB(ucontext, [makecontext], [], [ -+ ucontext_supports_fibers=no -+ ]) -+ AS_IF([test "$ucontext_supports_fibers" = yes], [ -+ ASYNC_LIBS="$ASYNC_LIBS -lucontext" -+ with_fibers=yes -+ ], [ -+ AS_IF([test "$with_fibers" = yes], [ -+ AC_MSG_ERROR([Missing symbols required for fibers (makecontext, setcontext, ...). Disable fibers (--without-fibers) or install libucontext]) -+ ], [ -+ AC_MSG_WARN([could not find required symbols (makecontext, setcontext, ...) -- won't build with fibers]) -+ with_fibers=no -+ ]) -+ ]) -+ ]) -+]) -+AS_IF([test "$with_fibers" = yes], [ -+ CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS" -+], [ -+ CXXFLAGS="$CXXFLAGS -DKJ_USE_FIBERS=0" -+]) -+ -+# CapnProtoConfig.cmake.in needs these variables, -+# we force them to NO because we don't need the CMake dependency for them, -+# the dependencies are provided by the .pc files. -+AC_SUBST(WITH_OPENSSL, NO) -+AC_SUBST(_WITH_LIBUCONTEXT, NO) - - AM_CONDITIONAL([HAS_FUZZING_ENGINE], [test "x$LIB_FUZZING_ENGINE" != "x"]) - -diff --git a/c++/src/kj/CMakeLists.txt b/c++/src/kj/CMakeLists.txt -index 813fac4d..f7b4dddf 100644 ---- a/c++/src/kj/CMakeLists.txt -+++ b/c++/src/kj/CMakeLists.txt -@@ -136,6 +136,15 @@ if(NOT CAPNP_LITE) - add_library(kj-async ${kj-async_sources}) - add_library(CapnProto::kj-async ALIAS kj-async) - target_link_libraries(kj-async PUBLIC kj) -+ if(WITH_FIBERS) -+ target_compile_definitions(kj-async PUBLIC KJ_USE_FIBERS) -+ if(_WITH_LIBUCONTEXT) -+ target_link_libraries(kj-async PUBLIC PkgConfig::libucontext) -+ endif() -+ else() -+ target_compile_definitions(kj-async PUBLIC KJ_USE_FIBERS=0) -+ endif() -+ - if(UNIX) - # external clients of this library need to link to pthreads - target_compile_options(kj-async INTERFACE "-pthread") -@@ -181,7 +190,7 @@ if(NOT CAPNP_LITE) - add_library(kj-tls ${kj-tls_sources}) - add_library(CapnProto::kj-tls ALIAS kj-tls) - target_link_libraries(kj-tls PUBLIC kj-async) -- if (WITH_OPENSSL) -+ if(WITH_OPENSSL) - target_compile_definitions(kj-tls PRIVATE KJ_HAS_OPENSSL) - target_link_libraries(kj-tls PRIVATE OpenSSL::SSL OpenSSL::Crypto) - endif() --- -2.35.1 - From cca80fefc07d959fc34cbf16bdef67b50672f675 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jun 2022 10:38:23 +0200 Subject: [PATCH 706/814] confluencepot: init at 1.0.0 --- pkgs/servers/confluencepot/default.nix | 44 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/servers/confluencepot/default.nix diff --git a/pkgs/servers/confluencepot/default.nix b/pkgs/servers/confluencepot/default.nix new file mode 100644 index 000000000000..242e2b93d7ad --- /dev/null +++ b/pkgs/servers/confluencepot/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "confluencepot"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "SIFalcon"; + repo = "confluencePot"; + rev = "v${version}"; + hash = "sha256-jIbL6prOUII8o9FghIYa80BytJ9SSuyj/TZmAxwAbJk="; + }; + + vendorSha256 = "sha256-nzPHx+c369T4h9KETqMurxZK3LsJAhwBaunkcWIW3Ps="; + + postPatch = '' + substituteInPlace confluencePot.go \ + --replace "confluence.html" "$out/share/confluence.html" + ''; + + postInstall = lib.optionalString (!stdenv.isDarwin) '' + mv $out/bin/confluencePot $out/bin/${pname} + ''; + + preFixup = '' + # Install HTML file + install -vD confluence.html -t $out/share + ''; + + meta = with lib; { + description = "Honeypot for the Atlassian Confluence OGNL injection vulnerability"; + homepage = "https://github.com/SIFalcon/confluencePot"; + longDescription = '' + ConfluencePot is a simple honeypot for the Atlassian Confluence unauthenticated + and remote OGNL injection vulnerability (CVE-2022-26134). + ''; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76d16b9519df..10ca4fd036b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15308,6 +15308,8 @@ with pkgs; corundum = callPackage ../development/tools/corundum { }; + confluencepot = callPackage ../servers/confluencepot {}; + confluent-platform = callPackage ../servers/confluent-platform {}; ctags = callPackage ../development/tools/misc/ctags { }; From 985b6812d6ae6ae4772fd03cf303ad20d89e0138 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sat, 25 Jun 2022 10:40:41 +0200 Subject: [PATCH 707/814] nixos/nixpkgs.nix: Ignore the default system in check We might want to make this more strict at some point. --- nixos/modules/misc/nixpkgs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 132a9b68ceb4..ad017aff816c 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -69,9 +69,9 @@ let }''; legacyOptionsDefined = - optional opt.system.isDefined opt.system - ++ (optional (opt.localSystem.highestPrio < (mkOptionDefault {}).priority) opt.localSystem) - ++ (optional (opt.crossSystem.highestPrio < (mkOptionDefault {}).priority) opt.crossSystem) + optional (opt.localSystem.highestPrio < (mkDefault {}).priority) opt.system + ++ optional (opt.localSystem.highestPrio < (mkOptionDefault {}).priority) opt.localSystem + ++ optional (opt.crossSystem.highestPrio < (mkOptionDefault {}).priority) opt.crossSystem ; defaultPkgs = From 361b603d0287f88651d415518630d318979a1df8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 25 Jun 2022 11:41:51 +0300 Subject: [PATCH 708/814] gnuradio3_9: 3.9.6.0 -> 3.9.7.0 --- pkgs/applications/radio/gnuradio/3.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/3.9.nix b/pkgs/applications/radio/gnuradio/3.9.nix index 989722fdc3ec..d607823bfeec 100644 --- a/pkgs/applications/radio/gnuradio/3.9.nix +++ b/pkgs/applications/radio/gnuradio/3.9.nix @@ -46,13 +46,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "6"; + minor = "7"; patch = "0"; } }: let - sourceSha256 = "sha256-0JODgv9MNOkHDQYTVCZMzjr/G542+NvGP9wlH9iwLeg="; + sourceSha256 = "sha256-6HEvQsV2JCkgNvBYsy1jfSTUIwEnrKJTzXNIVcPeWFQ="; featuresInfo = { # Needed always basic = { From e984364d3337bdbcb3b6ef57eada6cd8f72fef83 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 25 Jun 2022 11:42:10 +0300 Subject: [PATCH 709/814] gnuradio: 3.10.2.0 -> 3.10.3.0 --- pkgs/applications/radio/gnuradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 14a4763259fa..8a9ca156ec1a 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -48,13 +48,13 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.10"; - minor = "2"; + minor = "3"; patch = "0"; } }: let - sourceSha256 = "sha256-WcfmW39wHhFdpbdBSjOfuDkxL8/fuMjjJoLUyCUud/o="; + sourceSha256 = "sha256-pH0nvZBUto9jXSN6fXD5vP1lIBwCMuFAvF2qT5dYsHU="; featuresInfo = { # Needed always basic = { From 9ce75f675ec8bf9a8398a7f401dc0dc1d15e2828 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 25 Jun 2022 11:58:44 +0300 Subject: [PATCH 710/814] nixos/doc: regenerate Fixes whatever happened there. --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index db3c9da60a96..c8634941cd18 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -190,6 +190,7 @@ + i18n.supportedLocales is now by default only generated with the default locale set in i18n.defaultLocale. This got copied over @@ -199,7 +200,6 @@ - The isPowerPC predicate, found on platform attrsets From ed7596a60d0acbd643afe07609f2d3a7a881206e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jun 2022 11:26:50 +0200 Subject: [PATCH 711/814] pip-audit: 2.3.3 -> 2.3.4 --- pkgs/development/tools/pip-audit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index 3f3d47cb75d3..09c954b199b6 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -25,14 +25,14 @@ with py.pkgs; buildPythonApplication rec { pname = "pip-audit"; - version = "2.3.3"; + version = "2.3.4"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "v${version}"; - hash = "sha256-pzcphJWRM1OTbytZ4jJyPSQ+961gmBTrfYuLrMGkBQk="; + hash = "sha256-11lcF+ITvZmB5UKgGWJdXJE45Kh5rD98UOg9a648dKc="; }; nativeBuildInputs = [ From d19ea9c22f0abbe42f61f37a9834e015176d964c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jun 2022 11:37:30 +0200 Subject: [PATCH 712/814] python310Packages.aiosteamist: 0.3.1 -> 0.3.2 --- pkgs/development/python-modules/aiosteamist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiosteamist/default.nix b/pkgs/development/python-modules/aiosteamist/default.nix index 785d0f610361..535594e3d28d 100644 --- a/pkgs/development/python-modules/aiosteamist/default.nix +++ b/pkgs/development/python-modules/aiosteamist/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiosteamist"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = version; - hash = "sha256-VoIJh3EDBPKmvEmM3gP2pyt/0oz4i6Y0zIkkprTcFLg="; + hash = "sha256-IKrAJ4QDcYJRO4hcomL9FRs8hJ3k7SgRgK4H1b8SxIM="; }; nativeBuildInputs = [ From 9135772075d8b114980fae5a2cd9031fef2f7cd4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jun 2022 11:42:16 +0200 Subject: [PATCH 713/814] python310Packages.time-machine: 2.7.0 -> 2.7.1 --- pkgs/development/python-modules/time-machine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index f840512c7d51..1b680dd6c1b1 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.7.0"; + version = "2.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = pname; rev = version; - sha256 = "sha256-d/jUyzqC4weWdY2x6lf85noE/6gNBFhhDfAaYcwB9XQ="; + sha256 = "sha256-bRqljS09IBp/uqbx9hrr1iEwqvAyOWyl4qjKhJqqGzc="; }; propagatedBuildInputs = [ From a86c78d0616a253d0b447a823d0fb00ccfa602a1 Mon Sep 17 00:00:00 2001 From: Alex Gherghisan Date: Thu, 2 Jun 2022 22:04:32 +0100 Subject: [PATCH 714/814] victor-mono: 1.5.2 -> 1.5.3 --- pkgs/data/fonts/victor-mono/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix index 45873e1b7f96..11d3f1d25bae 100644 --- a/pkgs/data/fonts/victor-mono/default.nix +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -1,10 +1,11 @@ { lib, fetchzip }: let - version = "1.5.2"; + version = "1.5.3"; in fetchzip { name = "victor-mono-${version}"; + stripRoot = false; # Upstream prefers we download from the website, # but we really insist on a more versioned resource. @@ -16,12 +17,15 @@ fetchzip { url = "https://github.com/rubjo/victor-mono/raw/v${version}/public/VictorMonoAll.zip"; postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + mkdir -p "$out/share/fonts/" + + mv $out/OTF $out/share/fonts/opentype + mv $out/TTF $out/share/fonts/truetype + + rm -r $out/{EOT,WOFF,WOFF2} ''; - sha256 = "sha256-cNDZh0P/enmoKL/6eHzkgl5ghtai2K9cTgWMVmm8GIA="; + sha256 = "sha256-3TGpUDBJ24NEJb00oaJAHEbjC58bSthohzqM1klVDGA="; meta = with lib; { description = "Free programming font with cursive italics and ligatures"; From fbd2b865eb2a1a8258ab42845a0da23f01338935 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jun 2022 11:44:14 +0200 Subject: [PATCH 715/814] metasploit: 6.2.3 -> 6.2.4 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 26 +++++++------- pkgs/tools/security/metasploit/default.nix | 4 +-- pkgs/tools/security/metasploit/gemset.nix | 38 ++++++++++----------- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index d2ae05738047..8350e202156e 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.3" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.4" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 5fa3d5863439..6dd9a21eaa9d 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: ef3f1dfb9c196e19174e59f5d75707fffb847073 - ref: refs/tags/6.2.3 + revision: ed772a23efa7e2a7d7ae6417939e900c66950fd9 + ref: refs/tags/6.2.4 specs: - metasploit-framework (6.2.3) + metasploit-framework (6.2.4) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -32,7 +32,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.93) + metasploit-payloads (= 2.0.94) metasploit_data_models metasploit_payloads-mettle (= 1.0.18) mqtt @@ -130,13 +130,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.600.0) - aws-sdk-core (3.131.1) + aws-partitions (1.601.0) + aws-sdk-core (3.131.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.318.0) + aws-sdk-ec2 (1.319.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.69.0) @@ -238,7 +238,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.93) + metasploit-payloads (2.0.94) metasploit_data_models (5.0.5) activerecord (~> 6.0) activesupport (~> 6.0) @@ -252,7 +252,7 @@ GEM metasploit_payloads-mettle (1.0.18) method_source (1.0.0) mini_portile2 (2.8.0) - minitest (5.16.0) + minitest (5.16.1) mqtt (0.5.0) msgpack (1.5.2) multi_json (1.15.0) @@ -290,7 +290,7 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.3.5) + pg (1.4.1) public_suffix (4.0.7) puma (5.6.4) nio4r (~> 2.0) @@ -298,8 +298,8 @@ GEM rack (2.2.3.1) rack-protection (2.2.0) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) + rack-test (2.0.0) + rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -371,7 +371,7 @@ GEM ruby-macho (3.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.1.3) + ruby_smb (3.1.4) bindata openssl-ccm openssl-cmac diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 126d21bc7d0b..ae3c75c630fe 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.2.3"; + version = "6.2.4"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-5G2xjzdZro01Es3oqnUFO9TrvBCku5QE7DjPgU0xlc8="; + sha256 = "sha256-9JzavB6VMEM7UFa30WlHdZ/hajOly+JX75I+3DECOqM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index baa4aea66721..98a026aaa9f2 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cx73zazv4jsh51b08jgf7pzn62wmfqlwwg2z8w4rcqbvn326n93"; + sha256 = "0ydlikjhhsiqk7v8k7q1f036fd7yrmimasw40rnwcj3f1747lygd"; type = "gem"; }; - version = "1.600.0"; + version = "1.601.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yiz3aaik62rxhxipwznb2bv8ywha13vdxg9nk6anq9bd0nn0728"; + sha256 = "164abp3cvmvfa2qsgzbxvkafbhwbgn3qwknp0amwmxw5nwvz8p3s"; type = "gem"; }; - version = "3.131.1"; + version = "3.131.2"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0airi3qgnjdxl3n459nxq6bjwq0i3jyvwa0pv8nivw6lnskl1jps"; + sha256 = "0b42j6hdw62qz02j1llqp4c4y0dx39x3wfk1nprxwl27sdvy1mgk"; type = "gem"; }; - version = "1.318.0"; + version = "1.319.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -614,12 +614,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "ef3f1dfb9c196e19174e59f5d75707fffb847073"; - sha256 = "1kwm656q3krqxh299fx422yfpm1v0mssms6d28sqvbjr6y7v2vg4"; + rev = "ed772a23efa7e2a7d7ae6417939e900c66950fd9"; + sha256 = "18rs08qxqgljxxby5jx56dmf37vm8xlx3dsna0xl6c4m3sydm77l"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.2.3"; + version = "6.2.4"; }; metasploit-model = { groups = ["default"]; @@ -636,10 +636,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y06rkm2zh13qz1b40srx7dd1f5yl669k01ji4ha41pqn7wcv32v"; + sha256 = "1azr70qfq14wpki61hnljqnxnxlx9ifa4p92wh29cnak8v697v69"; type = "gem"; }; - version = "2.0.93"; + version = "2.0.94"; }; metasploit_data_models = { groups = ["default"]; @@ -686,10 +686,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05ik7y422ylnv391w7lh812w43p1dirlvkzyq09v27ag683fvsbh"; + sha256 = "08z6rgs1jgbc032843mwg3fayvzn4hihz8bl2gp87pf7z02kw5f3"; type = "gem"; }; - version = "5.16.0"; + version = "5.16.1"; }; mqtt = { groups = ["default"]; @@ -917,10 +917,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6"; + sha256 = "11q4zw8n0lmff5k514ip30yizr38jb2x5nh3m7fy3k13sbxbysrq"; type = "gem"; }; - version = "1.3.5"; + version = "1.4.1"; }; public_suffix = { groups = ["default"]; @@ -977,10 +977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; + sha256 = "01igqmm7xqw6vg6x28phivl044n2crq0bcfjrxr4979kzxydgh8h"; type = "gem"; }; - version = "1.1.0"; + version = "2.0.0"; }; rails-dom-testing = { groups = ["default"]; @@ -1297,10 +1297,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vqj4lb41vkpv0dl65caw7w9h804vzbdw5q6wvkzqv1q0k8nbqbd"; + sha256 = "0cvavqvgwq2gcrg0gh8fdzyn9zzpkyh9g07jz6cn7zzxzgwxfn9v"; type = "gem"; }; - version = "3.1.3"; + version = "3.1.4"; }; rubyntlm = { groups = ["default"]; From 69fe5e35f7eb066cc289108584d30f0bed876d5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jun 2022 11:51:04 +0200 Subject: [PATCH 716/814] python310Packages.aioswitcher: disable failing test --- pkgs/development/python-modules/aioswitcher/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 68cc3150d9f6..d03cc22ab1eb 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { "test_schedule_parser_with_a_daily_recurring_enabled_schedule_data" "test_schedule_parser_with_a_partial_daily_recurring_enabled_schedule_data" "test_schedule_parser_with_a_non_recurring_enabled_schedule_data" + "test_hexadecimale_timestamp_to_localtime_with_the_current_timestamp_should_return_a_time_string" ]; pythonImportsCheck = [ "aioswitcher" ]; From 47d3acc8b0fa2f7f23a64e737922ad4662b7cf24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 09:58:46 +0000 Subject: [PATCH 717/814] cadvisor: 0.40.0 -> 0.44.1 --- pkgs/servers/monitoring/cadvisor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 760bed7b9371..73fe3ed1192d 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cadvisor"; - version = "0.40.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "sha256-8HOaKjdATVZpyx4yLf7xefz+jiOEqmkWiZnA3DOyT50="; + sha256 = "sha256-OVUKQGP9zzlzoC/25BHNbJuP6ELstBMaRFAzUnDSR0U="; }; modRoot = "./cmd"; - vendorSha256 = "sha256-+nrXD0hQ3zBwTTq9xoBqO3ho4s4tf8uZQz2wL1nYi/k="; + vendorSha256 = "sha256-LGMouB76GT/ZvG3kLoo/jmnHT0CEeND9pObTOKaS9T0="; ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ]; From 8650532598b77e3be4e287285862ef793aa526bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 10:21:33 +0000 Subject: [PATCH 718/814] cargo-bloat: 0.11.0 -> 0.11.1 --- pkgs/development/tools/rust/cargo-bloat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index 44e06696ae84..0742b6b904fb 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UzMo+IqoP3GpGu7tWlrkEU1YpVLgEL7UwIU1hPmoJNg="; + sha256 = "sha256-lCA7C1G2xu65jn3/wzj6prWSrjQz3EqqJyMlPR/HRFs="; }; - cargoSha256 = "sha256-w3+ypGuVRGwC94zj/OaDUUoUbBnepGHvqulY4IVIsfo="; + cargoSha256 = "sha256-fOenXn5gagFss9DRDXXsGxQlDqVXZ5LZcdM4WsXAyUU="; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; From 9e4cb79affe944fc01a70bf3929ced49f94a2b67 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Sat, 25 Jun 2022 07:41:03 -0300 Subject: [PATCH 719/814] cilium-cli: 0.11.7 -> 0.11.10 - bump version - add upstream ldflags - add myself as a maintainer - add subpackages per upstream - add install check --- .../networking/cluster/cilium/default.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 648b0048e3e2..076b7f2a94c7 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,22 +2,39 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.11.7"; + version = "0.11.10"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4+4E7v/b74DDekqymH8PR7/GfH3GGzSQFQk24VJisQ0="; + sha256 = "sha256-BkcnChxUceWGG5hBOHvzZokgcw8T/vvNwIEtHkLfUJA="; }; vendorSha256 = null; + subPackages = [ "cmd/cilium" ]; + + ldflags = [ + "-s" "-w" + "-X github.com/cilium/cilium-cli/internal/cli/cmd.Version=${version}" + ]; + + + # Required to workaround install check error: + # 2022/06/25 10:36:22 Unable to start gops: mkdir /homeless-shelter: permission denied + HOME = "$TMPDIR"; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/cilium version | grep ${version} > /dev/null + ''; + meta = with lib; { description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium"; license = licenses.asl20; homepage = "https://www.cilium.io/"; - maintainers = with maintainers; [ humancalico ]; + maintainers = with maintainers; [ humancalico bryanasdev000 ]; mainProgram = "cilium"; }; } From 1267c20698acf1a2739557c3371cf849a2cd1918 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 10:45:35 +0000 Subject: [PATCH 720/814] clapper: 0.4.1 -> 0.5.1 --- pkgs/applications/video/clapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index 0e97eab1773e..fa8dd2bd3900 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "clapper"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Rafostar"; repo = pname; rev = version; - sha256 = "sha256-ccvg8yxPCN7OYmJvq0SPY6iyiuFuWJyiu+mRoykEzqI="; + sha256 = "sha256-o68IdI20gSwWCPI0g/BhUGF5ro6srXMy0JD1EgmY5ck="; }; nativeBuildInputs = [ From 25600b7b838be1ffe589d5d42d241364a3be8110 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jun 2022 12:49:39 +0200 Subject: [PATCH 721/814] python310Packages.pysigma-backend-splunk: 0.3.3 -> 0.3.4 --- .../python-modules/pysigma-backend-splunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index b270fa79c88d..aa316a261753 100644 --- a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-splunk"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; rev = "v${version}"; - hash = "sha256-VRHrlcty3EpGnQkVJvsNWOJSW6rNE97Lqt36HmMR53A="; + hash = "sha256-zsX2lycqJKRASXio8s3Cvkt1yfnBm5cwQOFAFA891GI="; }; nativeBuildInputs = [ From a47d96ca1c55c11583acf907d844841c0290d979 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 10:52:02 +0000 Subject: [PATCH 722/814] python310Packages.snowflake-connector-python: 2.7.8 -> 2.7.9 --- .../python-modules/snowflake-connector-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 06474e645e47..304a1c36894f 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.7.8"; + version = "2.7.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nPsHsEi8sf5kbQP3SAzLaod+nEUGcwLpC8/3/XL2vC8="; + hash = "sha256-HQ/d7luqdG1BriuP8QXzZk5JZwwLJH1JQIN3BtEDpM4="; }; propagatedBuildInputs = [ From 208389a81efaf8d919aa0e562995ecffecfc6085 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 10:55:36 +0000 Subject: [PATCH 723/814] cloud-nuke: 0.11.6 -> 0.11.8 --- pkgs/development/tools/cloud-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 7f98d9ee3767..3354b6f69371 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.11.6"; + version = "0.11.8"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wsCe32Ui+czM0+qpMxgTahJ7FlcnFMkueEkrcwm1sdE="; + sha256 = "sha256-0GP7T/OspaJVATd0dYNVniDh0XAiL09dopNnOQrLpCs="; }; - vendorSha256 = "sha256-McCbogZvgm9pnVjay9O2CxAh+653JnDMcU4CHD0PTPI="; + vendorSha256 = "sha256-4BUKUDr0bcd4AcMGIDC7HIhDI7pdTu2efkLqRD7Piw0="; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; From 8424535d209a8220e8c81bc7bea482a8058d19ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Jun 2022 12:57:21 +0200 Subject: [PATCH 724/814] python310Packages.types-requests: 2.27.31 -> 2.28.0 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index b5b52a730fcd..b6b6f99f4d80 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.31"; + version = "2.28.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-b6uXuZ/qUrnHtGak3ZPga7MlvH50IEdeh4MQJqjdNcw="; + sha256 = "sha256-mGPRbfuz+lXc2mT6O5ieduiFkDOybB4WI+MEZc/ilNM="; }; propagatedBuildInputs = [ From 427c8e576cf7d83e069624d70dbf20e1f4589d90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 11:15:14 +0000 Subject: [PATCH 725/814] cargo-expand: 1.0.21 -> 1.0.27 --- pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index d448b9a88f86..ebca19b3cbb3 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.21"; + version = "1.0.27"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-hxG7e5JBDv79eA7IQEdU8kpvE0B69Gqc+aPdCoc6Uf4="; + sha256 = "sha256-lj6B+9AdKhHc71cyzp7TcHmHv3K2ZoXEzMn/d3H0bB4="; }; - cargoSha256 = "sha256-7CMNJb/HGHPP4CIBEYK+2HC/JAce25qGI86NkSvyxos="; + cargoSha256 = "sha256-j14l3E+vyeyEMYN+TEsuxlEdWa2Em0B6Y2LoTot2Np8="; buildInputs = lib.optional stdenv.isDarwin libiconv; From 6d877c3b43a7490962cc7deed97f0927224a7883 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sat, 25 Jun 2022 14:20:31 +0300 Subject: [PATCH 726/814] pmenu: init at 3.0.1 --- pkgs/tools/X11/pmenu/default.nix | 60 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 62 insertions(+) create mode 100644 pkgs/tools/X11/pmenu/default.nix diff --git a/pkgs/tools/X11/pmenu/default.nix b/pkgs/tools/X11/pmenu/default.nix new file mode 100644 index 000000000000..7de509a299c5 --- /dev/null +++ b/pkgs/tools/X11/pmenu/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, writeText +, fontconfig +, imlib2 +, libX11 +, libXext +, libXft +, libXinerama +, libXrender +, conf ? null +}: + +stdenv.mkDerivation rec { + pname = "pmenu"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "phillbush"; + repo = "pmenu"; + rev = "v${version}"; + sha256 = "sha256-xeOiJEOPz5QEMlWP6bWhTjmj4tfNqh3rsEVmnKvrKuM="; + }; + + buildInputs = [ + fontconfig + imlib2 + libX11 + libXext + libXft + libXinerama + libXrender + ]; + + postPatch = let + configFile = + if lib.isDerivation conf || builtins.isPath conf + then conf else writeText "config.h" conf; + in + lib.optionalString (conf != null) "mv ${configFile} config.h"; + + makeFlags = [ + "INSTALL=install" + "PREFIX=\${out}" + ]; + + meta = with lib; { + description = "A pie-menu tool"; + longDescription = '' + πmenu is a pie menu utility for X. πmenu receives a menu specification in + stdin, shows a menu for the user to select one of the options, and outputs + the option selected to stdout. + ''; + homepage = "https://github.com/phillbush/pmenu"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 229a23d2349b..8735d20e7fae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9540,6 +9540,8 @@ with pkgs; pm2 = nodePackages.pm2; + pmenu = callPackage ../tools/X11/pmenu { }; + pngcheck = callPackage ../tools/graphics/pngcheck { }; pngcrush = callPackage ../tools/graphics/pngcrush { }; From 4e7059cf4f6c83260a97f4ffb5d0cfa77bc2f714 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Fri, 24 Jun 2022 01:30:02 +0300 Subject: [PATCH 727/814] focus: init at unstable-2021-02-23 --- pkgs/tools/X11/focus/default.nix | 34 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/X11/focus/default.nix diff --git a/pkgs/tools/X11/focus/default.nix b/pkgs/tools/X11/focus/default.nix new file mode 100644 index 000000000000..20c7e2e25d90 --- /dev/null +++ b/pkgs/tools/X11/focus/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, libX11 +, libXinerama +}: + +stdenv.mkDerivation rec { + pname = "focus"; + version = "unstable-2021-02-23"; + + src = fetchFromGitHub { + owner = "phillbush"; + repo = "focus"; + rev = "fed2fdbd3f73b192882d97aeb5b1cea681bb7d85"; + sha256 = "sha256-IDiUXindzv5Ng5oCTyUlj2il/2kLvXG4YhgiYp7ZebQ="; + }; + + buildInputs = [ libX11 libXinerama ]; + + makeFlags = [ "PREFIX=\${out}" ]; + + meta = with lib; { + description = "Focus window, workspace or monitor by direction or cycle through them"; + longDescription = '' + A collection of utilities that change the focus of windows, workspaces or + monitors. + ''; + homepage = "https://github.com/phillbush/focus"; + license = licenses.publicDomain; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 229a23d2349b..636f64c69d10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26403,6 +26403,8 @@ with pkgs; fnc = callPackage ../applications/version-management/fnc { }; + focus = callPackage ../tools/X11/focus { }; + focuswriter = libsForQt5.callPackage ../applications/editors/focuswriter { }; foliate = callPackage ../applications/office/foliate { }; From f5d0c5152a9d6eaf411373702a813f99002583f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 11:48:38 +0000 Subject: [PATCH 728/814] clash: 1.10.6 -> 1.11.0 --- pkgs/tools/networking/clash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index d3125d13adab..0341e7e7f3d3 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.10.6"; + version = "1.11.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v9MUMgHIpHDUEmB5vXOIOkSriX+PCPtiiHHB4H5FeMw="; + sha256 = "sha256-8g5rrkRA31wHvwY3JDFIU+slU0cLHFpADyd897hVyw0="; }; - vendorSha256 = "sha256-egbXCRmC862tctapMUWTcNej1g6a9wCt2JIC9DSEP6k="; + vendorSha256 = "sha256-iW14KxtUY2nhpShcdrHLiCRZxsoXyLSPt01dB0Ds28Y="; # Do not build testing suit excludedPackages = [ "./test" ]; From 43cbf5ef36aab241e71614e65317eaf14c709745 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 12:10:05 +0000 Subject: [PATCH 729/814] python310Packages.bimmer-connected: 0.9.4 -> 0.9.6 --- pkgs/development/python-modules/bimmer-connected/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 63071d494624..3aa2733ce10f 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.9.4"; + version = "0.9.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-+K+RffQzbJiKld0AM41OlK0ma0aopJRaTz+ZcCcYzJk="; + hash = "sha256-R7QmxSUbVsvb+MRTYlihxuM05WLYASRSfUs09fl7l1k="; }; nativeBuildInputs = [ From db9758e4fe4692897bb19f3f043c142d528228fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 12:12:43 +0000 Subject: [PATCH 730/814] chart-testing: 3.5.1 -> 3.6.0 --- .../networking/cluster/helm/chart-testing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix index 127ee9c6895a..85971b8dfb10 100644 --- a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix +++ b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chart-testing"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "helm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LNCzz5me60R/moFfdJhGMgUToFxADiPL02G4QCv0DLg="; + sha256 = "sha256-WGoLj6IuhxARSB3vAnprW1UO2g142uKZVHI3ubJepRs="; }; - vendorSha256 = "sha256-38ufXHzGlZgEh6swD/GhWbIYdY5uYznKCQ9OaoyOEiY="; + vendorSha256 = "sha256-gXW1NarCo42d/awg22wr6bIQQFRVTVnRUUAtQU8zY4M="; postPatch = '' substituteInPlace pkg/config/config.go \ From 63c7dfcbfe688c7fb20c136073ff326d798cb8ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 12:22:02 +0000 Subject: [PATCH 731/814] cargo-crev: 0.23.1 -> 0.23.2 --- pkgs/development/tools/rust/cargo-crev/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 90ea16582713..0caa77e2bfd8 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.23.1"; + version = "0.23.2"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-XzjZEVyPVn+7VrjG4QsqVBFmuGC1TWTWLEoqFcwQhaI="; + sha256 = "sha256-q/GbEsGQip7+wXxbVFfm9l3tdCT2o4yhWVTY1qmnEic="; }; - cargoSha256 = "sha256-p87ZnOxaF9ytSUxp0P3QE3K1/jo7hz/N7BH1f2Lc0I0="; + cargoSha256 = "sha256-pqOVKLh+ovUy+rJIz0tjp56qhilZTno4t4dZyCY1r7c="; preCheck = '' export HOME=$(mktemp -d) From d06c9d47d17ecb57390947e6de5c24473ac17917 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 12:26:47 +0000 Subject: [PATCH 732/814] chezmoi: 2.16.0 -> 2.18.1 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 782efb24f48d..7fc8f0ad1458 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.16.0"; + version = "2.18.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-J5L4xFdRV8eOJgILQqK0DhvP5/AXAmr7spzokhd4kcg="; + sha256 = "sha256-eRlEhtpUBZBS3fNrkkXPiktPyGQ2K8MFwsDVo3DUb+o="; }; - vendorSha256 = "sha256-y+xPuW8l3XvpnlqdlNIWdweNXMsAOrwbXHq2cJQRcOY="; + vendorSha256 = "sha256-u+iFnBzlaa+7heQEI18WWD45TSxEpIY73ZrxjLx84Ic="; doCheck = false; From f062c02832df29751c7bb54ae2bec0f13210aca0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 12:31:35 +0000 Subject: [PATCH 733/814] cloudfoundry-cli: 8.3.0 -> 8.4.0 --- .../networking/cluster/cloudfoundry-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index ec9f45a83886..b7992e2c723d 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.3.0"; + version = "8.4.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-tC9U0yvuMEwO4mzWyUC+v+/H0EzgwTu02waTQrx19Bs="; + sha256 = "sha256-+UP1abTDYLn+lhMvo9G57X0nlColai7isNswog+3Y40="; }; - vendorSha256 = "sha256-aXq92SI4cgJrmo67SEfg8YKPEpO2UW2fcYnKq9TmAQg="; + vendorSha256 = "sha256-opVnj6dTtHrPYM1v+EFw39XDMF/fampAn7n+JvlBcJk="; subPackages = [ "." ]; From 8d353ae5fb8e005c460c3461b205fc48aa41de6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 12:46:25 +0000 Subject: [PATCH 734/814] cargo-insta: 1.14.0 -> 1.15.0 --- pkgs/development/tools/rust/cargo-insta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-insta/default.nix b/pkgs/development/tools/rust/cargo-insta/default.nix index aa70a576d37c..99a19d12405f 100644 --- a/pkgs/development/tools/rust/cargo-insta/default.nix +++ b/pkgs/development/tools/rust/cargo-insta/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-insta"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "insta"; rev = version; - sha256 = "sha256-kTICdLL3paJIj779w4i7QUzhdynzyjo+YjtBorJsms4="; + sha256 = "sha256-IwtAd8qhG7FgnC7esipwAbSssVKIirB6GCedgNRPabo="; }; sourceRoot = "source/cargo-insta"; - cargoSha256 = "sha256-Hfjz3arOvRbMIvV3o60zjRB2p4JbBUFPj66OpHZdIJg="; + cargoSha256 = "sha256-asWf+wIOpbZx9YOw5c4prg2D6FSRCTcc5FgWY93MNII="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; meta = with lib; { From 4f99ed85e7d88d432f4e4aee7b883963a10cbf59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 12:55:00 +0000 Subject: [PATCH 735/814] blueman: 2.2.4 -> 2.2.5 --- pkgs/tools/bluetooth/blueman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 74ebb04f7474..2f59d14902bb 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "blueman"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VdY5/u2gtDsYplnmWYUhOlS0fcsTSPO07/tSONskJgI="; + sha256 = "sha256-yfPAqU3HyAvTIwS7Jf3tIU/jC3AY6e9Gsvy9HYA8fHw="; }; nativeBuildInputs = [ From ccd3acfc30d6d5046200fd56e11e795a32c606a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 13:03:07 +0000 Subject: [PATCH 736/814] docker-credential-gcr: 2.1.4 -> 2.1.5 --- pkgs/tools/admin/docker-credential-gcr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index a3cd4b9b5149..02d75ac629c8 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-credential-gcr"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "sha256-1AUs8Gt2Qw8BJk2zwRcazVl+POkPSy9e1jW9Mk/0rx8="; + sha256 = "sha256-NUFSnegLVGNUc6f/WSyIk1U6UQorxRykqojhgE/maw8="; }; patches = [ From 42287fc8d6fc9567a502762c9c3ad9f0b35df233 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 25 Jun 2022 15:07:54 +0200 Subject: [PATCH 737/814] borgmatic: 1.6.3 -> 1.6.4 --- pkgs/tools/backup/borgmatic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 70ca704831e6..a63cdcda7cb8 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.6.3"; + version = "1.6.4"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-CLScfmv0Jp4nfKAQvaq3XdYxNl9pDfEi5hz1ybikWDc="; + sha256 = "sha256-2kQ+KO69RxpIQkrkD6n7l9ti9ITwdpHYK7LuXYUo3ck="; }; checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; From e36bf246271b83b5c601f810e21881bf2f4c15ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 13:19:59 +0000 Subject: [PATCH 738/814] dateutils: 0.4.9 -> 0.4.10 --- pkgs/tools/misc/dateutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index 20837d5ee3ec..ec8f9ca83d93 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }: stdenv.mkDerivation rec { - version = "0.4.9"; + version = "0.4.10"; pname = "dateutils"; src = fetchurl { url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz"; - sha256 = "1hy96h9imxdbg9y7305mgv4grr6x4qic9xy3vhgh15lvjkcmc0kr"; + sha256 = "sha256-PFCOKIm51a7Kt9WdcyWnAIlZMRGhIwpJbasPWtZ3zew="; }; nativeBuildInputs = [ autoreconfHook ]; From 03be8485b1b051dbd0b0ee19de94d8d181487338 Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Sat, 25 Jun 2022 17:21:30 +0400 Subject: [PATCH 739/814] syncthing-gtk: Remove leftovers Missed in 100b75a44b2c30e1bfe9d034cf72c256b11a8a1c. --- .../networking/syncthing-gtk/paths.patch | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 pkgs/applications/networking/syncthing-gtk/paths.patch diff --git a/pkgs/applications/networking/syncthing-gtk/paths.patch b/pkgs/applications/networking/syncthing-gtk/paths.patch deleted file mode 100644 index 0ba5a4f2db84..000000000000 --- a/pkgs/applications/networking/syncthing-gtk/paths.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/syncthing_gtk/configuration.py -+++ b/syncthing_gtk/configuration.py -@@ -30,7 +30,7 @@ - "autokill_daemon" : (int, 2), # 0 - never kill, 1 - always kill, 2 - ask - "daemon_priority" : (int, 0), # uses nice values - "max_cpus" : (int, 0), # 0 for all cpus -- "syncthing_binary" : (str, "/usr/bin/syncthing"), -+ "syncthing_binary" : (str, "@syncthing@"), - "syncthing_arguments" : (str, ""), - "minimize_on_start" : (bool, False), - "folder_as_path" : (bool, True), ---- a/syncthing_gtk/tools.py -+++ b/syncthing_gtk/tools.py -@@ -303,7 +303,7 @@ - return False - # signal 0 doesn't kill anything, but killall exits with 1 if - # named process is not found -- p = Popen(["killall", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"]) -+ p = Popen(["@killall@", "-u", os.environ["USER"], "-q", "-s", "0", "syncthing"]) - p.communicate() - return p.returncode == 0 - else: From 5b2a0e9049843f8a8e7823c34f9536e646f0b2c7 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sat, 25 Jun 2022 15:26:38 +0200 Subject: [PATCH 740/814] feat(logseq): ignore prereleases on update check --- pkgs/applications/misc/logseq/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/logseq/update.sh b/pkgs/applications/misc/logseq/update.sh index 9f83eefad191..eb81dc68e4eb 100755 --- a/pkgs/applications/misc/logseq/update.sh +++ b/pkgs/applications/misc/logseq/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts -version="$(curl -sL "https://api.github.com/repos/logseq/logseq/releases" | jq '.[0].tag_name' --raw-output)" +version="$(curl -sL "https://api.github.com/repos/logseq/logseq/releases" | jq 'map(select(.prerelease == false)) | .[0].tag_name' --raw-output)" update-source-version logseq "$version" From db2659669281f3a8c9b7418f4fbd640bc08cfbb6 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sat, 25 Jun 2022 15:27:34 +0200 Subject: [PATCH 741/814] update(logseq): 0.7.0 -> 0.7.5 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 70d21acc05b4..9c3313ba5f49 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.7.0"; + version = "0.7.5"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-oXNSd0ZU2ZsMK51tq8iq2sfuLg0ZHaiXhpJpWZkEmeY="; + sha256 = "sha256-uMlvpEEzanJ3zTEZKNE2zEfqvGC4IWL97b0AkTfwZeU="; name = "${pname}-${version}.AppImage"; }; From 73e0e7fe79cb244630e3697cd99335f276a9c07b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 13:32:08 +0000 Subject: [PATCH 742/814] doctl: 1.76.0 -> 1.77.0 --- pkgs/development/tools/doctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index fb602240bb32..926b1c75ee36 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.76.0"; + version = "1.77.0"; vendorSha256 = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-rascG0WXDsmParwzR8QZEayiQEARu8YXfU0JT2yhQrc="; + sha256 = "sha256-i+Z5xFO3e04c/CfOyPAjD1nwPvm5vmYLsvj6OblJuqg="; }; meta = with lib; { From 16d3546a4b6685ec72ac429dcc26dfc3bd471063 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 13:37:39 +0000 Subject: [PATCH 743/814] dos2unix: 7.4.2 -> 7.4.3 --- pkgs/tools/text/dos2unix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index f694b91762c5..6a0c5fc57ee9 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dos2unix"; - version = "7.4.2"; + version = "7.4.3"; src = fetchurl { url = "https://waterlan.home.xs4all.nl/dos2unix/${pname}-${version}.tar.gz"; - sha256 = "00dfsf4rfyjb5j12gan8xjiirm0asshdz6dmd3l34a7ays6wadb0"; + sha256 = "sha256-to20GVba+TOChCOqMFEOAMEtKe9ZFucV6NTmlP5mynI="; }; nativeBuildInputs = [ perl gettext ]; From 403250473e359d048833050f4a98abcafeef7c3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 13:45:41 +0000 Subject: [PATCH 744/814] python310Packages.manuel: 1.11.2 -> 1.12.4 --- pkgs/development/python-modules/manuel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index 27ec85a1f4d1..7bf02f03895b 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "manuel"; - version = "1.11.2"; + version = "1.12.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-nJt3WMQ66oa3VlW5InJCzOea96Wf7WwxSbBp9WIfzqc="; + sha256 = "sha256-A5Wq32mR+SSseVz61Z2l3AYYcyqMxYrQ9HSWWrco9/Q="; }; propagatedBuildInputs = [ six ]; From dbf01024e470d252fc7bee5ee688268cf517ef3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 13:51:15 +0000 Subject: [PATCH 745/814] cpp-utilities: 5.15.0 -> 5.16.0 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index f2f331eec687..7064964adc58 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.15.0"; + version = "5.16.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3D/5Bl5vANZrHtJGehoHwQ0mDrL8TJ7iK2GoViiuj6E="; + sha256 = "sha256-B/pWdfK3KddAIppJXQRohiIK8mouAQjXRHic75IzY/Q="; }; nativeBuildInputs = [ cmake ]; From 6f7bcb3671dc1a08cc3e7c47388a08149e427449 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 14:11:06 +0000 Subject: [PATCH 746/814] easyeffects: 6.2.5 -> 6.2.6 --- pkgs/applications/audio/easyeffects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index ff7cce36712d..46b801bba331 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.2.5"; + version = "6.2.6"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-LvTvNBo3aUGUD4vA04YtINFBjTplhmkxj3FlbTZDTA0="; + sha256 = "sha256-1kXYh2Qk0Wj0LgHTcRVAKro7LAPV/UM5i9VmHjmxTx0="; }; nativeBuildInputs = [ From 6b29acef6ee9b207d1ea4be31be38953c62aca4f Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 25 Jun 2022 16:31:08 +0200 Subject: [PATCH 747/814] mu: 1.6.11 -> 1.8.0 https://github.com/djcb/mu/blob/release/1.8/NEWS.org Also includes some cleanup of the dependencies. Guile support was deprecated, so that is removed as well. --- pkgs/tools/networking/mu/default.nix | 69 +++++++++++++--------------- 1 file changed, 31 insertions(+), 38 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index fd140bfe55ed..b218a19154a5 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,61 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, sqlite, pkg-config, autoreconfHook, pmccabe -, xapian, glib, gmime3, texinfo, emacs, guile -, gtk3, webkitgtk, libsoup, icu -, makeWrapper -, withMug ? false -, batchSize ? null }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, coreutils +, emacs +, glib +, gmime3 +, texinfo +, xapian +}: stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.11"; + version = "1.8.0"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; - rev = version; - sha256 = "E/6+vEwYXk65/ZoAtUeTjvg56g6gz+Qtcaz0qwEru6c="; + rev = "v${version}"; + sha256 = "rb8R04eU/rG7PXx/horYk0+/3AgbxYYZtxy4ACILOZ8="; }; - postPatch = lib.optionalString (batchSize != null) '' - sed -i lib/mu-store.cc --regexp-extended \ - -e 's@(constexpr auto BatchSize).*@\1 = ${toString batchSize};@' - ''; + postPatch = '' + # Fix mu4e-builddir (set it to $out) + substituteInPlace mu4e/mu4e-config.el.in \ + --replace "@abs_top_builddir@" "$out" + substituteInPlace lib/utils/mu-utils.cc \ + --replace "/bin/rm" "${coreutils}/bin/rm" + ''; - buildInputs = [ - sqlite xapian glib gmime3 texinfo emacs libsoup icu - ] - # Workaround for https://github.com/djcb/mu/issues/1641 - ++ lib.optional (!stdenv.isDarwin) guile - ++ lib.optionals withMug [ gtk3 webkitgtk ]; + buildInputs = [ emacs glib gmime3 texinfo xapian ]; - nativeBuildInputs = [ pkg-config autoreconfHook pmccabe makeWrapper ]; + mesonFlags = [ + "-Dguile=disabled" + "-Dreadline=disabled" + ]; + + nativeBuildInputs = [ pkg-config meson ninja ]; enableParallelBuilding = true; - preBuild = '' - # Fix mu4e-builddir (set it to $out) - substituteInPlace mu4e/mu4e-meta.el.in \ - --replace "@abs_top_builddir@" "$out" - ''; - - # Make sure included scripts can find their dependencies & optionally install mug - postInstall = '' - wrapProgram "$out/bin/mu" \ - --prefix LD_LIBRARY_PATH : "$out/lib" \ - --prefix GUILE_LOAD_PATH : "$out/share/guile/site/2.2" - '' + lib.optionalString withMug '' - for f in mug ; do - install -m755 toys/$f/$f $out/bin/$f - done - ''; - doCheck = true; meta = with lib; { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; homepage = "https://www.djcbsoftware.nl/code/mu/"; - changelog = "https://github.com/djcb/mu/releases/tag/${version}"; + changelog = "https://github.com/djcb/mu/releases/tag/v${version}"; maintainers = with maintainers; [ antono chvp peterhoeg ]; platforms = platforms.mesaPlatforms; }; From 2fc3f8df4958ac87b0959b26fc9bb655b88a7d14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 14:34:11 +0000 Subject: [PATCH 748/814] dar: 2.7.5 -> 2.7.6 --- pkgs/tools/backup/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 92642973d45b..f4f2a2630098 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -9,12 +9,12 @@ with lib; stdenv.mkDerivation rec { - version = "2.7.5"; + version = "2.7.6"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "sha256-lfpJOomadV/oTJsOloH1rYF5Wy3kVr+EBUvqZ+xaCWY="; + sha256 = "sha256-PV5ESJE1B2gQnX6QUeJgOb3rkG3jApTn4NcRBbh9bao="; }; outputs = [ "out" "dev" ]; From 43cb516e9efbfce750a4ae5d8c6aab505b0715e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 14:39:10 +0000 Subject: [PATCH 749/814] commonsDaemon: 1.3.0 -> 1.3.1 --- pkgs/development/libraries/java/commons/daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/commons/daemon/default.nix b/pkgs/development/libraries/java/commons/daemon/default.nix index 7b5be45e200c..e41c475c829d 100644 --- a/pkgs/development/libraries/java/commons/daemon/default.nix +++ b/pkgs/development/libraries/java/commons/daemon/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.3.0"; + version = "1.3.1"; pname = "commons-daemon"; src = fetchurl { url = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz"; - sha256 = "sha256-Fihsar8HR2adN2f9deo7bk8tRgeiD6BljVZ/mfkLUUA="; + sha256 = "sha256-EaQ4wy32GX1MGByCqo811WblqZgsNSw3psr94lrxEqw="; }; installPhase = '' From 2b3a93f65bb31cc1a82805256a48f26fff53d92d Mon Sep 17 00:00:00 2001 From: Jason Vigil Date: Sat, 25 Jun 2022 07:16:31 -0700 Subject: [PATCH 750/814] maintainers: add 0xC45 --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 80b7a3d261e8..0859c841c515 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -78,6 +78,13 @@ fingerprint = "2536 9E86 1AA5 9EB7 4C47 B138 6510 870A 77F4 9A99"; }]; }; + _0xC45 = { + email = "jason@0xc45.com"; + name = "Jason Vigil"; + github = "0xC45"; + githubId = 56617252; + matrix = "@oxc45:matrix.org"; + }; _1000101 = { email = "b1000101@pm.me"; github = "1000101"; From 48be43524e40deb6bd40abd657e46f063651a18d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 25 Jun 2022 17:55:21 +0300 Subject: [PATCH 751/814] =?UTF-8?q?git-credential-gopass:=201.12.0=20?= =?UTF-8?q?=E2=86=92=201.14.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/security/gopass/git-credential.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index 0b15e9b02353..9877131d0a34 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "git-credential-gopass"; - version = "1.12.0"; + version = "1.14.3"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IvYxpUMclDAKJ/EkRbNrX8eIFyhtY9Q0B0RipweieZA="; + sha256 = "sha256-ggdQL8BU56zE5figmbfHKlZ7WGZ7z5nKunXTy3kn170="; }; - vendorSha256 = "sha256-N6eU6KsnUrYBK90ydwUH8LNkR9KRjgc4ciGOGvy7pw8="; + vendorSha256 = "sha256-fwqkiPzrfo83NweuGONRx8+MOE4wQxg2Xk4/1kZwnCM="; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7829b4c0156..19fe4f89f79a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2497,7 +2497,9 @@ with pkgs; gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { }; - git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; + git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { + buildGoModule = buildGo118Module; + }; gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; From ee44dc0249285d6d7a4e69dd27344f6fbac3a48c Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 25 Jun 2022 17:57:26 +0300 Subject: [PATCH 752/814] =?UTF-8?q?gopass-jsonapi:=201.11.1=20=E2=86=92=20?= =?UTF-8?q?1.14.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/security/gopass/jsonapi.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index c138bde2cc3c..5f6dab2e9069 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.11.1"; + version = "1.14.3"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "03xhza7n92xg12z83as9qdvvc0yx1qy6q0c7i4njvng594f9a8x2"; + sha256 = "sha256-uLsKxx2Yr0g3vf2AQqRqRzNsBX2D4+6wwxM+czthL+I="; }; - vendorSha256 = "0d4fyppsdfzvmjb0qvpnfnw0vl6z256bly7hfb0whk6rldks60wr"; + vendorSha256 = "sha256-QEqtyHb+/tpbbHLCSBw7uafAtKzKkmxoFGqFVHSR03I="; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19fe4f89f79a..fcb82455992d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2495,7 +2495,9 @@ with pkgs; buildGoModule = buildGo118Module; }; - gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { }; + gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { + buildGoModule = buildGo118Module; + }; git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { buildGoModule = buildGo118Module; From 7d939658c548a7a2177eeda57b04b4840424a479 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 25 Jun 2022 17:58:36 +0300 Subject: [PATCH 753/814] =?UTF-8?q?gopass-summon-provider:=201.12.0=20?= =?UTF-8?q?=E2=86=92=201.14.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/security/gopass/summon.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix index c1be7c9eb081..f3968bb3ce2a 100644 --- a/pkgs/tools/security/gopass/summon.nix +++ b/pkgs/tools/security/gopass/summon.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-summon-provider"; - version = "1.12.0"; + version = "1.14.3"; src = fetchFromGitHub { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mRZXczIlW1s0VGZJ+KQue4Dz6XCXGfl56+g6iRv2lZg="; + sha256 = "sha256-Pbe5LMQioHDBHeEoT2brtsEBKq4oNROIlLccIjppRVo="; }; - vendorSha256 = "sha256-fiV4rtel2jOw6y/ukOZHeFuNVqxHS3rnYhXJ6JZ+a/8="; + vendorSha256 = "sha256-U0qniRHl4YgSy1GpsaYknMQpjpM8uKNtyLm6YblSd4U="; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcb82455992d..4dbe57b1e535 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2503,7 +2503,9 @@ with pkgs; buildGoModule = buildGo118Module; }; - gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; + gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { + buildGoModule = buildGo118Module; + }; gosca = callPackage ../development/tools/gosca { }; From c4a1e364ef4a6fabd5a9635742dedb97740428f0 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 25 Jun 2022 17:59:41 +0300 Subject: [PATCH 754/814] gopass-hibp: init at 1.14.3 --- pkgs/tools/security/gopass/hibp.nix | 39 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/security/gopass/hibp.nix diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix new file mode 100644 index 000000000000..49618c53aead --- /dev/null +++ b/pkgs/tools/security/gopass/hibp.nix @@ -0,0 +1,39 @@ +{ lib +, makeWrapper +, buildGoModule +, fetchFromGitHub +, gopass +}: + +buildGoModule rec { + pname = "gopass-hibp"; + version = "1.14.3"; + + src = fetchFromGitHub { + owner = "gopasspw"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-JwZZ2VaSD9xkLny5sFeku5rN4FitI1dyW56JSWPMagM="; + }; + + vendorSha256 = "sha256-YySkVWdfGIT5qz0jTGlLEHoO0vGY0iNZ/oG9IZCjwRE="; + + subPackages = [ "." ]; + + nativeBuildInputs = [ makeWrapper ]; + + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" + ]; + + postFixup = '' + wrapProgram $out/bin/gopass-hibp --prefix PATH : "${lib.makeBinPath [ gopass ]}" + ''; + + meta = with lib; { + description = "Gopass haveibeenpwnd.com integration"; + homepage = "https://www.gopass.pw/"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4dbe57b1e535..fa457c02bb49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2495,6 +2495,10 @@ with pkgs; buildGoModule = buildGo118Module; }; + gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { + buildGoModule = buildGo118Module; + }; + gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { buildGoModule = buildGo118Module; }; From 1af14a96a9e86060bac5f1a0fc221952d7a2d550 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 15:25:15 +0000 Subject: [PATCH 755/814] driftctl: 0.31.0 -> 0.34.1 --- pkgs/applications/networking/cluster/driftctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index a488f1d2f52d..0cde6d0090e7 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "driftctl"; - version = "0.31.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-2h7tasHxeEe65BpUXmHkMsNmjiG+QofyGVqXPuk4Ej8="; + sha256 = "sha256-/tdAmu/BurCFB82i9pT2+PNOsPtHdlL/brUt4B9Q/EA="; }; - vendorSha256 = "sha256-bsIPEjD/kCUvkRKP85CjW3JJf1Hyx9b2pMY9S4HlKrA="; + vendorSha256 = "sha256-KChEDFZj5zsZ/viOVWgC15WI8mp5cUC+SdNwkCjo6bI="; nativeBuildInputs = [ installShellFiles ]; From 34b7a4685f7c73ae1a8b9dcb7ca93606df0aaa74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 15:29:40 +0000 Subject: [PATCH 756/814] doctest: 2.4.8 -> 2.4.9 --- pkgs/development/libraries/doctest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index 360c643f5233..6c9281bda991 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "doctest"; - version = "2.4.8"; + version = "2.4.9"; src = fetchFromGitHub { owner = "doctest"; repo = "doctest"; rev = "v${version}"; - sha256 = "sha256-/4lyCQZHsa32ozes5MJ0JZpQ99MECRlgFeSzN/Zs/BQ="; + sha256 = "sha256-ugmkeX2PN4xzxAZpWgswl4zd2u125Q/ADSKzqTfnd94="; }; nativeBuildInputs = [ cmake ]; From cc35c6523f8484f7d4b6e41d15498b4e43e20806 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 16:25:19 +0000 Subject: [PATCH 757/814] dyff: 1.5.3 -> 1.5.4 --- pkgs/development/tools/dyff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/development/tools/dyff/default.nix index 33590f4a4e10..c2801422c0e0 100644 --- a/pkgs/development/tools/dyff/default.nix +++ b/pkgs/development/tools/dyff/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dyff"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${version}"; - sha256 = "sha256-On3n4qJUcGhJfh0B1ESE5zl1fb/RW12eFPxx5sTqfpw="; + sha256 = "sha256-6r7e35hJrrkBaDHMUJGVOP7b0OwekJzedTs/P5E8Ykc="; }; - vendorSha256 = "sha256-eI3E83bYSMfi7fInBsPflE3zUGHF6diSkXDy04+CeqQ="; + vendorSha256 = "sha256-nam/so7ylbGVhEjGKZzeYZyHz90rq5XEZelHkjcIeh8="; subPackages = [ "cmd/dyff" From 18f6ea9a12d0e520ae816125aa00269590dfa8b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 16:31:15 +0000 Subject: [PATCH 758/814] cmctl: 1.8.0 -> 1.8.1 --- pkgs/applications/networking/cluster/cmctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 86c7eddd7ab0..8a839d065ea2 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cmctl"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; rev = "v${version}"; - sha256 = "sha256-h7GyzjVrfyMHY7yuNmmsym6KGKCQr5R71gjPBTUeMCg="; + sha256 = "sha256-IR+z3+f9Pa7wQAP4EVya7fb7FnndaUY7F2ckTzpEuCA="; }; vendorSha256 = "sha256-UYw9WdQ6VwzuuiOsa1yovkLZG7NmLYSW51p8UhmQMeI="; From d6f9b499b2302759bb1283f1459ea7eb687ab911 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 16:33:04 +0000 Subject: [PATCH 759/814] python310Packages.gdown: 4.4.0 -> 4.5.0 --- pkgs/development/python-modules/gdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 7399d141a564..d18bcfe1f111 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "gdown"; - version = "4.4.0"; + version = "4.5.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GPw6TaSiJz3reqKcdIa+TfORnZBBWK1qaj4lyBFUcNc="; + sha256 = "sha256-rJ7CoZDOl+cW1FsPzkE7+AiBSpzDD9J8RkiQW25Xkno="; }; propagatedBuildInputs = [ From 103810f764828fbd42d4ccb6bf888c32947860a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 16:57:46 +0000 Subject: [PATCH 760/814] earthly: 0.6.14 -> 0.6.16 --- pkgs/development/tools/earthly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 5838f5e94b43..cca4b1589976 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.6.14"; + version = "0.6.16"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-1zJPtx+W+UuH+upun1o9f3ofieahTsb4bSuznPhIYnw="; + sha256 = "sha256-PKvF5dO7aFF3WOAWOxFTy1PpCr6o9s4QjQkgI7EO6Ss="; }; - vendorSha256 = "sha256-2bOaJdK12qGjjVtoBp3LeSyIiFwm4ZvxNI5yR0HriXI="; + vendorSha256 = "sha256-ESPi6ZjN2GkvzVidmBmuglL4Oh0EjyhGBdvjjiXB38s="; ldflags = [ "-s" "-w" From 5efa54db61ec1360c8998884bd08ff520d5790f8 Mon Sep 17 00:00:00 2001 From: Jason Vigil Date: Sat, 25 Jun 2022 07:16:50 -0700 Subject: [PATCH 761/814] regpg: init at 1.11 --- pkgs/tools/security/regpg/default.nix | 52 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 54 insertions(+) create mode 100644 pkgs/tools/security/regpg/default.nix diff --git a/pkgs/tools/security/regpg/default.nix b/pkgs/tools/security/regpg/default.nix new file mode 100644 index 000000000000..aaefbef227b8 --- /dev/null +++ b/pkgs/tools/security/regpg/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, gnupg +, perl +}: + +let + perlEnv = perl.withPackages (p: with p; [ TextMarkdown ]); +in +stdenv.mkDerivation rec { + pname = "regpg"; + version = "1.11"; + + src = fetchFromGitHub { + owner = "fanf2"; + repo = "regpg"; + rev = "regpg-${version}"; + sha256 = "2ea99950804078190e1cc2a76d4740e3fdd5395a9043db3f3fe86bf2477d3a7d"; + }; + + nativeBuildInputs = [ makeWrapper perlEnv ]; + + postPatch = '' + patchShebangs ./util/insert-here.pl ./util/markdown.pl + substituteInPlace ./Makefile \ + --replace 'util/insert-here.pl' 'perl util/insert-here.pl' + substituteInPlace ./Makefile \ + --replace 'util/markdown.pl' 'perl util/markdown.pl' + substituteInPlace util/insert-here.pl \ + --replace 'qx(git describe)' '"regpg-${version}"' + ''; + + dontConfigure = true; + + makeFlags = [ "prefix=$(out)" ]; + + postFixup = '' + patchShebangs $out/bin/regpg + wrapProgram $out/bin/regpg --prefix PATH ":" \ + "${lib.makeBinPath [ gnupg ]}" + ''; + + meta = with lib; { + description = "GPG wrapper utility for storing secrets in VCS"; + homepage = "https://dotat.at/prog/regpg"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ _0xC45 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 238e2537d2bf..da8ed65c70f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9977,6 +9977,8 @@ with pkgs; reftools = callPackage ../development/tools/reftools { }; + regpg = callPackage ../tools/security/regpg { }; + remote-touchpad = callPackage ../tools/inputmethods/remote-touchpad { }; reposurgeon = callPackage ../applications/version-management/reposurgeon { }; From c3d58e6f32aee3264b87c21af227afd52ae7a478 Mon Sep 17 00:00:00 2001 From: Samuel Tam Date: Sun, 26 Jun 2022 01:43:56 +0800 Subject: [PATCH 762/814] vlc: add libplacebo as dependency --- pkgs/applications/video/vlc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 700730a57fc9..770fe2cea3ee 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -34,6 +34,7 @@ , libmtp , liboggz , libopus +, libplacebo , libpulseaudio , libraw1394 , librsvg @@ -123,6 +124,7 @@ stdenv.mkDerivation rec { libmtp liboggz libopus + libplacebo libpulseaudio libraw1394 librsvg From 0cbcfe8c304948ed322da93fc9b314f2e6afc016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 25 Jun 2022 20:02:46 +0200 Subject: [PATCH 763/814] wezterm: 20220408-101518-b908e2dd -> 20220624-141144-bd1b7c5d --- pkgs/applications/terminal-emulators/wezterm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 8f15a38111c8..4fed03db0dd0 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -28,14 +28,14 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20220408-101518-b908e2dd"; + version = "20220624-141144-bd1b7c5d"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-kuuoD+hqgj7QXFRIxa112oc4idtcK0ptFACDpI0bzGY="; + sha256 = "sha256-7VuNOJ4xqTxumLft7wRj4zdN8Y2ZSYtXr/KuqaLNOgw="; }; postPatch = '' @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "sha256-iIb2zLUZpn23ooEiOP+yQMYUUmvef/KqvjzgLOFmjs0="; + cargoSha256 = "sha256-YvQ0APyPiYwISE/pDD2s+UgYFj4CKPdolb14FrNpocU="; nativeBuildInputs = [ pkg-config From b200beb1961ab91a969385ddfda129abefa386f5 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 25 Jun 2022 20:48:00 +0300 Subject: [PATCH 764/814] peertube: 4.2.0 -> 4.2.1 --- pkgs/servers/peertube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 1a8253d51d4a..f4a80cbe26f6 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -6,13 +6,13 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then "linux-x64" else throw "Unsupported architecture: ${stdenv.hostPlatform.system}"; - version = "4.2.0"; + version = "4.2.1"; source = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; rev = "v${version}"; - sha256 = "sha256-U/QJqYw1fFmUvtPDZ1VcYe1+clLj/I0Lkhhu8+FuK2U="; + sha256 = "sha256-bb22/GidSPaRtvbht6FzVqTGzzNDYgBdHqHGnzA1Iy0="; }; yarnOfflineCacheServer = fetchYarnDeps { From a610f830e031ac18e109aff278155b52b5d95938 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 18:14:59 +0000 Subject: [PATCH 765/814] eksctl: 0.99.0 -> 0.104.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index cc2cffa82b2a..8448b24e5991 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.99.0"; + version = "0.104.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-J2d3Uyc/gYciQaZJnOw0piO90ixtqgdnC0gprIoWmvs="; + sha256 = "sha256-s/7RoFVf7mejPsMz6lMBHDGG8+N1KBMzUesXu9MPrzo="; }; - vendorSha256 = "sha256-sRtFfJ7umVK8ruCpZ7TcTVcY9gr3Fldcf3KEdmbgkX4="; + vendorSha256 = "sha256-mwQahKRHR9cy2Yb4IGCIRtA0j38QJoPKNtpS/T4ndC4="; doCheck = false; From 07328220b6a1c49db261f5ea342f1a38d45f2662 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 25 Jun 2022 21:17:44 +0300 Subject: [PATCH 766/814] mathematica: set QT_QPA_PLATFORM to xcb (#178991) --- pkgs/applications/science/math/mathematica/generic.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix index 0f4819172cea..b081640c97d5 100644 --- a/pkgs/applications/science/math/mathematica/generic.nix +++ b/pkgs/applications/science/math/mathematica/generic.nix @@ -121,6 +121,8 @@ in stdenv.mkDerivation { "--set USE_WOLFRAM_LD_LIBRARY_PATH 1" # Fix xkeyboard config path for Qt "--set QT_XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb" + # wayland isn't supported + "--set QT_QPA_PLATFORM xcb" ] ++ lib.optionals cudaSupport [ "--set CUDA_PATH ${cudaEnv}" "--set NVIDIA_DRIVER_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libnvidia-tls.so" From 2d66c91a51b6000b8590e13736fdc28e00b630e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Sun, 19 Jun 2022 14:28:42 +0200 Subject: [PATCH 767/814] hollywood: init at 1.22 --- pkgs/applications/misc/hollywood/default.nix | 94 +++++++++++++++++++ .../misc/hollywood/nixos-paths.patch | 67 +++++++++++++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 165 insertions(+) create mode 100644 pkgs/applications/misc/hollywood/default.nix create mode 100644 pkgs/applications/misc/hollywood/nixos-paths.patch diff --git a/pkgs/applications/misc/hollywood/default.nix b/pkgs/applications/misc/hollywood/default.nix new file mode 100644 index 000000000000..f3b721bc4959 --- /dev/null +++ b/pkgs/applications/misc/hollywood/default.nix @@ -0,0 +1,94 @@ +{ stdenv +, fetchFromGitHub +, makeWrapper +, lib +, coreutils +, apg +, atop +, bmon +, cmatrix +, pygments +, moreutils +, util-linux +, jp2a +, man +, mplayer +, openssh +, tree +, mlocate +, findutils +, ccze +, ncurses +, python3 +, wget +, libcaca +, newsboat +, rsstail +, w3m +, ticker +, tmux +}: + +stdenv.mkDerivation { + pname = "hollywood"; + version = "1.22"; + + src = fetchFromGitHub { + owner = "dustinkirkland"; + repo = "hollywood"; + rev = "35275a68c37bbc39d8b2b0e4664a0c2f5451e5f6"; + sha256 = "sha256-faIm1uXERvIDZ6SK6uarVkWGNJskAroHgq5Cg7nUZc4="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + patches = [ ./nixos-paths.patch ]; + postPatch = '' + rm lib/hollywood/speedometer + rm bin/wallstreet + rm -r lib/wallstreet + ''; + + dontBuild = true; + + installPhase = + let pathDeps = [ + tmux + coreutils + ncurses + jp2a + mlocate + apg + atop + bmon + cmatrix + pygments + moreutils + util-linux + jp2a + man + mplayer + openssh + tree + findutils + ccze + ]; + in '' + runHook preInstall + + mkdir -p $out + cp -r bin $out/bin + cp -r lib $out/lib + cp -r share $out/share + wrapProgram $out/bin/hollywood --prefix PATH : ${lib.makeBinPath pathDeps} + + runHook postInstall + ''; + + meta = { + description = "Fill your console with Hollywood melodrama technobabble"; + homepage = "https://a.hollywood.computer/"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.anselmschueler ]; + }; +} diff --git a/pkgs/applications/misc/hollywood/nixos-paths.patch b/pkgs/applications/misc/hollywood/nixos-paths.patch new file mode 100644 index 000000000000..d280a6b003c1 --- /dev/null +++ b/pkgs/applications/misc/hollywood/nixos-paths.patch @@ -0,0 +1,67 @@ +diff --git a/bin/hollywood b/bin/hollywood +index 6f1ee68..09bc4ea 100755 +--- a/bin/hollywood ++++ b/bin/hollywood +@@ -74,7 +74,7 @@ if [ -z "$TMUX" ]; then + else + tmux_launcher=tmux + fi +- $tmux_launcher new-session -d -s $PKG "/bin/bash" ++ $tmux_launcher new-session -d -s $PKG "/usr/bin/env bash" + $tmux_launcher send-keys -t $PKG "$0 $1" + $tmux_launcher send-keys -t $PKG Enter + exec $tmux_launcher attach-session -t $PKG +diff --git a/lib/hollywood/code b/lib/hollywood/code +index 532ce73..3448447 100755 +--- a/lib/hollywood/code ++++ b/lib/hollywood/code +@@ -19,7 +19,7 @@ command -v view >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- FILES=$(locate -l 4096 "/usr/*.java" "/usr/*.c" "/usr/*.cpp" 2>/dev/null | sort -R) ++ FILES=$(locate -l 4096 "/usr/*.java" "/run/current-system/sw/*.java" "/usr/*.c" "/run/current-system/sw/*.c" "/usr/*.cpp" "/run/current-system/sw/*.cpp" 2>/dev/null | sort -R) + for f in $FILES; do + [ -r "$f" ] || continue + [ -s "$f" ] || continue +diff --git a/lib/hollywood/hexdump b/lib/hollywood/hexdump +index f2fb0bd..db059f5 100755 +--- a/lib/hollywood/hexdump ++++ b/lib/hollywood/hexdump +@@ -19,8 +19,8 @@ command -v ccze >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- for f in $(ls /usr/bin/ | sort -R); do +- head -c 4096 "/usr/bin/$f" | hexdump -C | ccze -A -c default=green -c dir="bold green" ++ for f in $(find /usr/bin/ /run/current-system/sw/bin/ | sort -R); do ++ head -c 4096 "$f" | hexdump -C | ccze -A -c default=green -c dir="bold green" + sleep 0.7 + done + done +diff --git a/lib/hollywood/jp2a b/lib/hollywood/jp2a +index e87b950..6541f80 100755 +--- a/lib/hollywood/jp2a ++++ b/lib/hollywood/jp2a +@@ -19,7 +19,7 @@ command -v jp2a >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- FILES=$(locate -l 4096 "/usr/*jpg" 2>/dev/null | sort -R) ++ FILES=$(locate -l 4096 "/usr/*jpg" "/run/current-system/sw/*jpg" 2>/dev/null | sort -R) + for f in $FILES; do + [ -r "$f" ] || continue + [ -s "$f" ] || continue +diff --git a/lib/hollywood/man b/lib/hollywood/man +index 2d42513..f4d8bbb 100755 +--- a/lib/hollywood/man ++++ b/lib/hollywood/man +@@ -19,7 +19,7 @@ command -v ccze >/dev/null 2>&1 || exit 1 + + trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT + while true; do +- FILES=$(ls /usr/share/man/man1/ | sort -R | sed "s/\.1\.gz.*$//" | head -n 4096) ++ FILES=$(ls /usr/share/man/man1/ /run/current-system/sw/share/man/man1/ | sort -R | sed "s/\.1\.gz.*$//" | head -n 4096) + for f in $FILES; do + man "$f" | ccze -A + sleep 0.2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50098392bb64..abfb042abb52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27011,6 +27011,10 @@ with pkgs; gtk = gtk3; }; + hollywood = callPackage ../applications/misc/hollywood { + inherit (python3Packages) pygments; + }; + hors = callPackage ../development/tools/hors { inherit (darwin.apple_sdk.frameworks) Security; }; From 3eeeeb283288d365c4d495a82b6e66c2b57d864b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 18:55:09 +0000 Subject: [PATCH 768/814] fn-cli: 0.6.17 -> 0.6.20 --- pkgs/applications/networking/cluster/fn-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index 22e596dabf26..c9895fccc9b7 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.17"; + version = "0.6.20"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - sha256 = "sha256-u/YISLlZFYlAUejSlaH7POA2WwKURPN8phFU86/caXU="; + sha256 = "sha256-HeyWMzxSga6T2/BRVwrmgb3utjnVTJk3zhhcVfq8/Cc="; }; vendorSha256 = null; From 092994ab7287233cef4e6f10dc175ebc95a520a3 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 25 Jun 2022 20:52:26 +0200 Subject: [PATCH 769/814] ts3: disable native wayland support --- .../networking/instant-messengers/teamspeak/client.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 80d04eabc824..83139c30075d 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -93,6 +93,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/ts3client \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" \ + '' /* wayland is currently broken, remove when TS3 fixes that */ + '' + --set QT_QPA_PLATFORM xcb \ --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb ''; From 0a4e9dfda2a239b86a2cc9e0ac57b874618102b8 Mon Sep 17 00:00:00 2001 From: Yaya Date: Sat, 25 Jun 2022 21:18:14 +0200 Subject: [PATCH 770/814] gitlab: 15.0.2 -> 15.1.0 (#178651) https://about.gitlab.com/releases/2022/06/22/gitlab-15-1-released/ --- .../gitlab/Remove-geo-from-database.yml.patch | 69 +++++ .../version-management/gitlab/data.json | 16 +- .../version-management/gitlab/default.nix | 14 +- .../gitlab/gitaly/Gemfile.lock | 4 +- .../gitlab/gitaly/default.nix | 8 +- .../gitlab/gitaly/gemset.nix | 4 +- .../gitlab/gitlab-shell/default.nix | 6 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 48 ++-- .../gitlab/rubyEnv/Gemfile.lock | 159 ++++++----- .../gitlab/rubyEnv/gemset.nix | 261 ++++++++++++------ 11 files changed, 406 insertions(+), 187 deletions(-) create mode 100644 pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch diff --git a/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch b/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch new file mode 100644 index 000000000000..968e618f3121 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/Remove-geo-from-database.yml.patch @@ -0,0 +1,69 @@ +From 7d833508e3bc4c737834e9edf1c429d36f67a38c Mon Sep 17 00:00:00 2001 +From: "M. A" +Date: Sat, 25 Jun 2022 13:34:42 +0000 +Subject: [PATCH] Remove geo from database.yml + +--- + config/database.yml.postgresql | 28 ---------------------------- + 1 file changed, 28 deletions(-) + +diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql +index 5329a8e9fd7..a4daab1fd0c 100644 +--- a/config/database.yml.postgresql ++++ b/config/database.yml.postgresql +@@ -18,13 +18,6 @@ production: + # port: 8600 + # record: secondary.postgresql.service.consul + # interval: 300 +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_production +- username: git +- password: "secure password" +- host: localhost + + # + # Development specific +@@ -39,13 +32,6 @@ development: + host: localhost + variables: + statement_timeout: 15s +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_development +- username: postgres +- password: "secure password" +- host: localhost + + # + # Staging specific +@@ -58,13 +44,6 @@ staging: + username: git + password: "secure password" + host: localhost +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_staging +- username: git +- password: "secure password" +- host: localhost + + # Warning: The database defined as "test" will be erased and + # re-generated from your development database when you run "rake". +@@ -80,10 +59,3 @@ test: &test + prepared_statements: false + variables: + statement_timeout: 15s +- geo: +- adapter: postgresql +- encoding: unicode +- database: gitlabhq_geo_test +- username: postgres +- password: +- host: localhost +-- +2.36.0 + diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index c2f3092a7fab..3cfdc2a11c77 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.0.2", - "repo_hash": "sha256-B5zD8yBY6d+jkIghuxShsR73+2X7Jd9mai1ouraEM44=", - "yarn_hash": "1a8k3x3b9sirzicqkwmr10m27n593iljfh8awdc9700akbj155lr", + "version": "15.1.0", + "repo_hash": "sha256-vOPI9kxdJlQNmI/DZueFcbvZPy2/0d+2CYM/RBAkIcU=", + "yarn_hash": "19df16gk0vpvdi1idqaakaglf11cic93i5njw0x4m2cnsznhpvz4", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.0.2-ee", + "rev": "v15.1.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.0.2", - "GITLAB_PAGES_VERSION": "1.58.0", - "GITLAB_SHELL_VERSION": "14.3.0", - "GITLAB_WORKHORSE_VERSION": "15.0.2" + "GITALY_SERVER_VERSION": "15.1.0", + "GITLAB_PAGES_VERSION": "1.59.0", + "GITLAB_SHELL_VERSION": "14.7.4", + "GITLAB_WORKHORSE_VERSION": "15.1.0" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index e5765bb78423..73a02673471f 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -59,9 +59,17 @@ let nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert ]; - # Since version 12.6.0, the rake tasks need the location of git, - # so we have to apply the location patches here too. - patches = [ ./remove-hardcoded-locations.patch ]; + patches = [ + # Since version 12.6.0, the rake tasks need the location of git, + # so we have to apply the location patches here too. + ./remove-hardcoded-locations.patch + + # Gitlab edited the default database config since [1] and the + # installer complains about valid keywords only being "main" and "ci". + # + # [1]: https://gitlab.com/gitlab-org/gitlab/-/commit/99c0fac52b10cd9df62bbe785db799352a2d9028 + ./Remove-geo-from-database.yml.patch + ]; # One of the patches uses this variable - if it's unset, execution # of rake tasks fails. GITLAB_LOG_PATH = "log"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index cc5344f8e87a..3616864ad7e6 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -115,7 +115,7 @@ GEM minitest (5.15.0) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.13.3) + nokogiri (1.13.6) mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.20.0) @@ -249,4 +249,4 @@ DEPENDENCIES timecop BUNDLED WITH - 2.1.4 + 2.3.15 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index e38a24213b0e..b8c1ecf6704e 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,8 +11,8 @@ let gemdir = ./.; }; - version = "15.0.2"; - package_version = "v14"; + version = "15.1.0"; + package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; in @@ -24,10 +24,10 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-jwPXar16FOq0xCg3xUXH72YPmoVa91ae3bgz95ZmYo4="; + sha256 = "sha256-rhMQRskum4c5bQL1sE7O4gMxIGX7q3bntuV1HkttA8M="; }; - vendorSha256 = "sha256-/tHKWo09ZV31TSIqlOk36V3y7gNikziUJHf+nS1gHEw="; + vendorSha256 = "sha256-0JWJ2mpf79gJdnNRdlQLi0oDvnj6VmibkW2XcPnaCww="; passthru = { inherit rubyEnv; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index ccf444330af3..1697a9f90200 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -493,10 +493,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi"; type = "gem"; }; - version = "1.13.3"; + version = "1.13.6"; }; octokit = { dependencies = ["faraday" "sawyer"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 3888b0ba1104..37d66c3a7f65 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.3.0"; + version = "14.7.4"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-SFoNtWcY0iJREsA+vZRsVJHmNb2vNvOiBJnochxA/Us="; + sha256 = "sha256-kLIjlMwoK1AlhvP38OspXnIWbdOcaLl4r05PiUmqnWw="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-eSzJon8o7ktV3rFuTE1A4tzdkBzWBZf1JxnrcMj5s00="; + vendorSha256 = "sha256-f2IkdkTZhve/cYKSH+N2Y5bXFSHuQ8t4hjfReyKTPUU="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 89d82cc8dd56..b59909dd041a 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.0.2"; + version = "15.1.0"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-7hNwBCDMdiiOliZa/lkYLo8gyAksAU0HanCSyaAMYLs="; + vendorSha256 = "sha256-cF2wVii/uBqlUQvrbDyPlv4tnfKA45deb/sE0c9U7Tk="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index cbb4d6f90c0f..9f5c0e4cbfd8 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gem 'rails', '~> 6.1.4.7' -gem 'bootsnap', '~> 1.9.4', require: false +gem 'bootsnap', '~> 1.12.0', require: false # Responders respond_to and respond_with gem 'responders', '~> 3.0' @@ -17,7 +17,7 @@ gem 'view_component', '~> 2.50.0' gem 'default_value_for', '~> 3.4.0' # Supported DBs -gem 'pg', '~> 1.1' +gem 'pg', '~> 1.3.0' gem 'rugged', '~> 1.2' gem 'grape-path-helpers', '~> 1.7.0' @@ -55,7 +55,7 @@ gem 'omniauth-authentiq', '~> 0.3.3' gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect' gem 'omniauth-salesforce', '~> 1.0.5' gem 'omniauth-atlassian-oauth2', '~> 0.2.0' -gem 'rack-oauth2', '~> 1.16.0' +gem 'rack-oauth2', '~> 1.19.0' gem 'jwt', '~> 2.1.0' # Kerberos authentication. EE-only @@ -97,10 +97,10 @@ gem 'net-ldap', '~> 0.16.3' # API gem 'grape', '~> 1.5.2' gem 'grape-entity', '~> 0.10.0' -gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' +gem 'rack-cors', '~> 1.1.0', require: 'rack/cors' # GraphQL API -gem 'graphql', '~> 1.11.10' +gem 'graphql', '~> 1.13.12' gem 'graphiql-rails', '~> 1.8' gem 'apollo_upload_server', '~> 2.1.0' gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] @@ -121,7 +121,7 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.10.1' # for backups -gem 'fog-aws', '~> 3.12' +gem 'fog-aws', '~> 3.14' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' @@ -130,7 +130,7 @@ gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.3' -gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: 'fog/azurerm' +gem 'gitlab-fog-azure-rm', '~> 1.3.0', require: 'fog/azurerm' # for Google storage gem 'google-api-client', '~> 0.33' @@ -167,10 +167,10 @@ gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' gem 'asciidoctor-kroki', '~> 0.5.0', require: false -gem 'rouge', '~> 3.27.0' +gem 'rouge', '~> 3.29.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.12' +gem 'nokogiri', '~> 1.13.6' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -181,9 +181,9 @@ gem 'diffy', '~> 3.3' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.2.3' -# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually -gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' +gem 'rack', '~> 2.2.3.0' +# https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually +gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base' group :puma do gem 'puma', '~> 5.6.2', require: false @@ -219,7 +219,7 @@ gem 'ruby-progressbar', '~> 1.10' gem 'settingslogic', '~> 2.0.9' # Linear-time regex library for untrusted regular expressions -gem 're2', '~> 1.2.0' +gem 're2', '~> 1.4.0' # Misc @@ -301,7 +301,7 @@ gem 'base32', '~> 0.3.0' gem 'gitlab-license', '~> 2.1.0' # Protect against bruteforcing -gem 'rack-attack', '~> 6.3.0' +gem 'rack-attack', '~> 6.6.0' # Sentry integration gem 'sentry-raven', '~> 3.1' @@ -311,12 +311,12 @@ gem 'sentry-sidekiq', '~> 5.1.1' # PostgreSQL query parsing # -gem 'pg_query', '~> 2.1' +gem 'pg_query', '~> 2.1.0' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.22.0' +gem 'gitlab-labkit', '~> 0.23.0' # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 gem 'thrift', '>= 0.14.0' @@ -344,7 +344,7 @@ gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client' gem 'warning', '~> 1.2.0' group :development do - gem 'lefthook', '~> 0.7.0', require: false + gem 'lefthook', '~> 0.8.0', require: false gem 'rubocop' gem 'solargraph', '~> 0.44.3', require: false @@ -381,7 +381,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 7.0.0', require: false + gem 'gitlab-styles', '~> 7.1.0', require: false gem 'haml_lint', '~> 0.36.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -402,10 +402,12 @@ group :development, :test do gem 'test_file_finder', '~> 0.1.3' gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' + + gem 'pact', '~> 1.12' end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.0', require: false + gem 'gitlab-dangerfiles', '~> 3.4.0', require: false end group :development, :test, :coverage do @@ -477,13 +479,13 @@ gem 'sys-filesystem', '~> 1.4.3' gem 'net-ntp' # SSH keys support -gem 'ssh_data', '~> 1.2' +gem 'ssh_data', '~> 1.3' # Spamcheck GRPC protocol definitions gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 14.10.0-rc1' +gem 'gitaly', '~> 15.1.0-rc1' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' @@ -503,7 +505,7 @@ gem 'gitlab-experiment', '~> 0.7.1' # Structured logging gem 'lograge', '~> 0.5' -gem 'grape_logging', '~> 1.7' +gem 'grape_logging', '~> 1.8' # DNS Lookup gem 'gitlab-net-dns', '~> 0.9.1' @@ -545,3 +547,5 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' gem 'ipynbdiff', '0.4.7' + +gem 'ed25519', '~> 1.3.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 4f5d0e36ab33..535e470372c6 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -143,8 +143,8 @@ GEM rack (>= 0.9.0) bindata (2.4.10) binding_ninja (0.2.3) - bootsnap (1.9.4) - msgpack (~> 1.0) + bootsnap (1.12.0) + msgpack (~> 1.2) bootstrap_form (4.2.0) actionpack (>= 5.0) activemodel (>= 5.0) @@ -214,10 +214,10 @@ GEM creole (0.5.0) crystalball (0.7.0) git - css_parser (1.7.0) + css_parser (1.11.0) addressable daemons (1.3.1) - danger (8.5.0) + danger (8.6.1) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -306,6 +306,7 @@ GEM e2mmap (0.1.0) ecma-re-validator (0.3.0) regexp_parser (~> 2.0) + ed25519 (1.3.0) elasticsearch (7.13.3) elasticsearch-api (= 7.13.3) elasticsearch-transport (= 7.13.3) @@ -360,7 +361,7 @@ GEM faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) - faraday-http-cache (2.2.0) + faraday-http-cache (2.4.0) faraday (>= 0.8) faraday-httpclient (1.0.1) faraday-multipart (1.0.3) @@ -387,6 +388,8 @@ GEM rake ffi-yajl (2.3.4) libyajl2 (~> 1.2) + filelock (1.1.1) + find_a_port (1.0.1) flipper (0.21.0) flipper-active_record (0.21.0) activerecord (>= 5.0, < 7) @@ -402,11 +405,10 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.12.0) + fog-aws (3.14.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) - ipaddress (~> 0.8) fog-core (2.1.0) builder excon (~> 0.58) @@ -458,7 +460,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (14.10.0.pre.rc1) + gitaly (15.1.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab (4.16.1) @@ -466,21 +468,21 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.0.0) + gitlab-dangerfiles (3.4.0) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake gitlab-experiment (0.7.1) activesupport (>= 3.0) request_store (>= 1.0) - gitlab-fog-azure-rm (1.2.0) + gitlab-fog-azure-rm (1.3.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) fog-core (= 2.1.0) fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.22.0) + gitlab-labkit (0.23.0) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) grpc (>= 1.37) @@ -505,7 +507,7 @@ GEM openid_connect (~> 1.2) gitlab-sidekiq-fetcher (0.8.0) sidekiq (~> 6.1) - gitlab-styles (7.0.0) + gitlab-styles (7.1.0) rubocop (~> 0.91, >= 0.91.1) rubocop-gitlab-security (~> 0.1.1) rubocop-graphql (~> 0.10) @@ -564,7 +566,7 @@ GEM grape (~> 1.3) rake (> 12) ruby2_keywords (~> 0.0.2) - grape_logging (1.8.3) + grape_logging (1.8.4) grape rack graphiql-rails (1.8.0) @@ -574,7 +576,7 @@ GEM faraday (>= 1.0) faraday_middleware graphql-client - graphql (1.11.10) + graphql (1.13.12) graphql-client (0.17.0) activesupport (>= 3.0) graphql (~> 1.10) @@ -715,7 +717,7 @@ GEM rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (0.7.5) + lefthook (0.8.0) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -777,7 +779,7 @@ GEM faraday (>= 0.9, < 2.0.0) faraday-cookie_jar (~> 0.0.6) ms_rest (~> 0.7.6) - msgpack (1.5.1) + msgpack (1.5.2) multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.1.1) @@ -798,7 +800,7 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.13.3) + nokogiri (1.13.6) mini_portile2 (~> 2.8.0) racc (~> 1.4) notiffany (0.1.3) @@ -852,8 +854,8 @@ GEM addressable (~> 2.3) nokogiri (~> 1.7, >= 1.7.1) omniauth (~> 1.2) - omniauth-dingtalk-oauth2 (1.0.0) - omniauth-oauth2 (~> 1.7.1) + omniauth-dingtalk-oauth2 (1.0.1) + omniauth-oauth2 (~> 1.7) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) omniauth-github (1.4.0) @@ -908,22 +910,45 @@ GEM rubypants (~> 0.2) orm_adapter (0.5.0) os (1.1.1) - parallel (1.20.1) - parser (3.0.3.2) + pact (1.59.0) + pact-mock_service (~> 3.0, >= 3.3.1) + pact-support (~> 1.15) + rack-test (>= 0.6.3, < 2.0.0) + rspec (~> 3.0) + term-ansicolor (~> 1.0) + thor (>= 0.20, < 2.0) + webrick (~> 1.3) + pact-mock_service (3.6.2) + filelock (~> 1.1) + find_a_port (~> 1.0.1) + json + pact-support (~> 1.12, >= 1.12.0) + rack (~> 2.0) + rspec (>= 2.14) + term-ansicolor (~> 1.0) + thor (>= 0.19, < 2.0) + webrick (~> 1.3) + pact-support (1.15.1) + awesome_print (~> 1.1) + randexp (~> 0.1.7) + rspec (>= 2.14) + term-ansicolor (~> 1.0) + parallel (1.22.1) + parser (3.1.2.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.2.3) - pg_query (2.1.1) - google-protobuf (>= 3.17.1) + pg (1.3.5) + pg_query (2.1.3) + google-protobuf (>= 3.19.2) plist (3.6.0) png_quantizator (0.2.1) po_to_json (1.0.1) json (>= 1.6.0) - premailer (1.11.1) + premailer (1.16.0) addressable css_parser (>= 1.6.0) htmlentities (>= 4.0.0) @@ -947,7 +972,7 @@ GEM pry (~> 0.13.0) tty-markdown tty-prompt - public_suffix (4.0.6) + public_suffix (4.0.7) puma (5.6.2) nio4r (~> 2.0) puma_worker_killer (0.3.1) @@ -956,14 +981,14 @@ GEM pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) racc (1.6.0) - rack (2.2.3) + rack (2.2.3.1) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (6.3.0) + rack-attack (6.6.1) rack (>= 1.0, < 3) - rack-cors (1.0.6) - rack (>= 1.6.0) - rack-oauth2 (1.16.0) + rack-cors (1.1.1) + rack (>= 2.0.0) + rack-oauth2 (1.19.0) activesupport attr_required httpclient @@ -973,7 +998,7 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rack-timeout (0.5.2) + rack-timeout (0.6.0) rails (6.1.4.7) actioncable (= 6.1.4.7) actionmailbox (= 6.1.4.7) @@ -1007,8 +1032,9 @@ GEM method_source rake (>= 0.13) thor (~> 1.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) + randexp (0.1.7) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -1019,7 +1045,7 @@ GEM rbtree (0.4.4) rchardet (1.8.0) rdoc (6.3.2) - re2 (1.2.0) + re2 (1.4.0) recaptcha (4.13.1) json recursive-open-struct (1.1.3) @@ -1035,7 +1061,7 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.9.0) redis (>= 4, < 5) - regexp_parser (2.2.1) + regexp_parser (2.5.0) regexp_property_values (1.0.0) representable (3.0.4) declarative (< 0.1.0) @@ -1057,7 +1083,7 @@ GEM rexml (3.2.5) rinku (2.0.0) rotp (6.2.0) - rouge (3.27.0) + rouge (3.29.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1112,11 +1138,11 @@ GEM rubocop-ast (>= 0.6.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.4.1) - parser (>= 2.7.1.5) + rubocop-ast (1.18.0) + parser (>= 3.1.1.0) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-graphql (0.13.0) + rubocop-graphql (0.14.3) rubocop (>= 0.87, < 2) rubocop-performance (1.9.2) rubocop (>= 0.90.0, < 2.0) @@ -1253,7 +1279,7 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sqlite3 (1.4.2) - ssh_data (1.2.0) + ssh_data (1.3.0) ssrf_filter (1.0.7) stackprof (0.2.15) state_machines (0.5.0) @@ -1272,11 +1298,14 @@ GEM activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) + sync (0.5.0) sys-filesystem (1.4.3) ffi (~> 1.1) sysexits (1.2.0) tanuki_emoji (0.6.0) temple (0.8.2) + term-ansicolor (1.7.1) + tins (~> 1.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) terser (1.0.2) @@ -1295,6 +1324,8 @@ GEM timecop (0.9.1) timeliness (0.3.10) timfel-krb5-auth (0.8.3) + tins (1.31.0) + sync toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) @@ -1341,7 +1372,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8) - unicode-display_width (1.7.0) + unicode-display_width (1.8.0) unicode_utils (1.4.0) uniform_notifier (1.13.0) unleash (3.2.2) @@ -1403,7 +1434,7 @@ GEM nokogiri (~> 1.8) yajl-ruby (1.4.1) yard (0.9.26) - zeitwerk (2.5.4) + zeitwerk (2.6.0) PLATFORMS ruby @@ -1435,7 +1466,7 @@ DEPENDENCIES benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) better_errors (~> 2.9.0) - bootsnap (~> 1.9.4) + bootsnap (~> 1.12.0) bootstrap_form (~> 4.2.0) browser (~> 4.2) bullet (~> 6.1.3) @@ -1464,6 +1495,7 @@ DEPENDENCIES discordrb-webhooks (~> 3.4) doorkeeper (~> 5.5.0.rc2) doorkeeper-openid_connect (~> 1.7.5) + ed25519 (~> 1.3.0) elasticsearch-api (= 7.13.3) elasticsearch-model (~> 7.2) elasticsearch-rails (~> 7.2) @@ -1481,7 +1513,7 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.21.0) flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.12) + fog-aws (~> 3.14) fog-core (= 2.1.0) fog-google (~> 1.15) fog-local (~> 0.6) @@ -1492,13 +1524,13 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 14.10.0.pre.rc1) + gitaly (~> 15.1.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.0) + gitlab-dangerfiles (~> 3.4.0) gitlab-experiment (~> 0.7.1) - gitlab-fog-azure-rm (~> 1.2.0) - gitlab-labkit (~> 0.22.0) + gitlab-fog-azure-rm (~> 1.3.0) + gitlab-labkit (~> 0.23.0) gitlab-license (~> 2.1.0) gitlab-license_finder (~> 6.0) gitlab-mail_room (~> 0.0.9) @@ -1506,7 +1538,7 @@ DEPENDENCIES gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.9.0) gitlab-sidekiq-fetcher (= 0.8.0) - gitlab-styles (~> 7.0.0) + gitlab-styles (~> 7.1.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.4.0) @@ -1516,10 +1548,10 @@ DEPENDENCIES grape (~> 1.5.2) grape-entity (~> 0.10.0) grape-path-helpers (~> 1.7.0) - grape_logging (~> 1.7) + grape_logging (~> 1.8) graphiql-rails (~> 1.8) graphlient (~> 0.5.0) - graphql (~> 1.11.10) + graphql (~> 1.13.12) graphql-docs (~> 1.6.0) grpc (~> 1.42.0) gssapi @@ -1547,7 +1579,7 @@ DEPENDENCIES knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.9.2) - lefthook (~> 0.7.0) + lefthook (~> 0.8.0) letter_opener_web (~> 2.0.0) licensee (~> 9.14.1) lockbox (~> 0.6.2) @@ -1563,7 +1595,7 @@ DEPENDENCIES multi_json (~> 1.14.1) net-ldap (~> 0.16.3) net-ntp - nokogiri (~> 1.12) + nokogiri (~> 1.13.6) oauth2 (~> 1.4) octokit (~> 4.15) ohai (~> 16.10) @@ -1588,11 +1620,12 @@ DEPENDENCIES omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0) org-ruby (~> 0.9.12) + pact (~> 1.12) parallel (~> 1.19) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.1) - pg_query (~> 2.1) + pg (~> 1.3.0) + pg_query (~> 2.1.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) prometheus-client-mmap (~> 0.15.0) @@ -1601,19 +1634,19 @@ DEPENDENCIES pry-shell (~> 0.5.0) puma (~> 5.6.2) puma_worker_killer (~> 0.3.1) - rack (~> 2.2.3) - rack-attack (~> 6.3.0) - rack-cors (~> 1.0.6) - rack-oauth2 (~> 1.16.0) + rack (~> 2.2.3.0) + rack-attack (~> 6.6.0) + rack-cors (~> 1.1.0) + rack-oauth2 (~> 1.19.0) rack-proxy (~> 0.7.2) - rack-timeout (~> 0.5.1) + rack-timeout (~> 0.6.0) rails (~> 6.1.4.7) rails-controller-testing rails-i18n (~> 6.0) rainbow (~> 3.0) rbtrace (~> 0.4) rdoc (~> 6.3.2) - re2 (~> 1.2.0) + re2 (~> 1.4.0) recaptcha (~> 4.11) redis (~> 4.4.0) redis-actionpack (~> 5.2.0) @@ -1622,7 +1655,7 @@ DEPENDENCIES responders (~> 3.0) retriable (~> 3.1.2) rexml (~> 3.2.5) - rouge (~> 3.27.0) + rouge (~> 3.29.0) rqrcode-rails3 (~> 0.1.7) rspec-benchmark (~> 0.6.0) rspec-parameterized @@ -1665,7 +1698,7 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) sprite-factory (~> 1.7) sprockets (~> 3.7.0) - ssh_data (~> 1.2) + ssh_data (~> 1.3) stackprof (~> 0.2.15) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 87791ff56753..5f11d6098785 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -577,10 +577,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19i4x2nascd74ahcvmrsnf03cygh1y4c9yf8rcv91fv0mcxpvb9n"; + sha256 = "0yza43f42v0ys81y6jzbqfkdykf40h6l3yyvadwq32fswrbpwvbc"; type = "gem"; }; - version = "1.9.4"; + version = "1.12.0"; }; bootstrap_form = { dependencies = ["actionpack" "activemodel"]; @@ -930,10 +930,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y4vc018b5mzp7winw4pbb22jk0dpxp22pzzxq7w0rgvfxzi89pd"; + sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; type = "gem"; }; - version = "1.7.0"; + version = "1.11.0"; }; daemons = { groups = ["default" "development"]; @@ -951,10 +951,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmckbl41v27x9ri6snrl01alsbwxcqsfc4a1nfhgx0py6y0dmjg"; + sha256 = "1n6zbkkinlv2hp4ig5c170d1ckbbdf8rgxmykfm3m3gn865vapnr"; type = "gem"; }; - version = "8.5.0"; + version = "8.6.1"; }; danger-gitlab = { dependencies = ["danger" "gitlab"]; @@ -1283,6 +1283,16 @@ }; version = "0.3.0"; }; + ed25519 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji"; + type = "gem"; + }; + version = "1.3.0"; + }; elasticsearch = { dependencies = ["elasticsearch-api" "elasticsearch-transport"]; groups = ["default"]; @@ -1537,14 +1547,14 @@ }; faraday-http-cache = { dependencies = ["faraday"]; - groups = ["default" "development"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lhfwlk4mhmw9pdlgdsl2bq4x45w7s51jkxjryf18wym8iiw36g7"; + sha256 = "143cpzdrnyqyfv1jasr0qjqgm57dhv46nsf5f2s06ndxccfr13rq"; type = "gem"; }; - version = "2.2.0"; + version = "2.4.0"; }; faraday-httpclient = { groups = ["danger" "default" "development" "test"]; @@ -1712,6 +1722,26 @@ }; version = "2.3.4"; }; + filelock = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "085vrb6wf243iqqnrrccwhjd4chphfdsybkvjbapa2ipfj1ja1sj"; + type = "gem"; + }; + version = "1.1.1"; + }; + find_a_port = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sswgpvn38yav4i21adrr7yy8c8299d7rj065gd3iwg6nn26lpb0"; + type = "gem"; + }; + version = "1.0.1"; + }; flipper = { groups = ["default"]; platforms = []; @@ -1767,15 +1797,15 @@ version = "0.3.3"; }; fog-aws = { - dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; + dependencies = ["fog-core" "fog-json" "fog-xml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cl9b93mwhzm9fp0lmac1vzz359g3sq52k06kn0a0vnvxrxnhzjm"; + sha256 = "1gsb26a1jp0k7hclry0dai2a9m77a9h6ybc17x0i98z2ivzjsi07"; type = "gem"; }; - version = "3.12.0"; + version = "3.14.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1967,10 +1997,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ls4x3h1c3axx9kqmvs1mpcmjqchl297sh1bzzl5zjgdz25w24di"; + sha256 = "0ygf5di1sl8b3gs7ascn3r9carf6v8d9c3damc10sh81sm7bwc0z"; type = "gem"; }; - version = "14.10.0.pre.rc1"; + version = "15.1.0.pre.rc1"; }; github-markup = { groups = ["default"]; @@ -2010,10 +2040,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kyp5kxp0jsk224y2nq4yg37wnn824ialdjvsf8fv3a20q9w4k7i"; + sha256 = "13c7k36xq042fbf7d9jwgfc30zq9dfziwvqfi88h2199v9dkylix"; type = "gem"; }; - version = "3.0.0"; + version = "3.4.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2032,10 +2062,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hi9v0zy863gnk17w0fp1ks2kr1s2z6q0bkx5wdbq6yawycjs94h"; + sha256 = "1d8plrl69q5mcsgz8ywhw7k9q0g31y3gm6h90gw9apsisqbm7vrg"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -2043,10 +2073,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vs5q1lfk5i953gv2xvz6h5x6ycllr8hdzg81zsrz7hy3aygxknj"; + sha256 = "0kiz2m3dw6ld2z6dsl8jh2ycw061wv8wiy34flymb5zqjiyyzw8l"; type = "gem"; }; - version = "0.22.0"; + version = "0.23.0"; }; gitlab-license = { groups = ["default"]; @@ -2127,10 +2157,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10fmvx2vx2v0mbwv5d4wcpc2iyp5y8lwxn9hjpzkk5bvxkk4c493"; + sha256 = "0xp2f1bbx8i7a89xjwy6b5rhxr9g1vnms68chcnxdd95csxhxpzp"; type = "gem"; }; - version = "7.0.0"; + version = "7.1.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2280,10 +2310,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x6cmmj0wi1m689r8d4yhyhpl8dwj5skn8b29igm4xvw3swkg94x"; + sha256 = "1lcjqwal3wc2r41wsi01d09cyhxhglxp6y7hd0564pdx5lr3xk7g"; type = "gem"; }; - version = "1.8.3"; + version = "1.8.4"; }; graphiql-rails = { dependencies = ["railties" "sprockets-rails"]; @@ -2312,10 +2342,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qb6bk8gflwid4qrk2i9ndzs5fxycdjvxmhy9w547lglzb5jx19b"; + sha256 = "1hvsv6ig6d8syr4vasa8vcc090kbawwflk5m1j6kl681y9n6d0hx"; type = "gem"; }; - version = "1.11.10"; + version = "1.13.12"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2899,10 +2929,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07r76qlzxcz9y4dmkqf8k4khkfq7s2v22dcq6b0w0v4cfiwqva3h"; + sha256 = "05ykgpj6cka9vprvrk37ixyhj2pdw7a9m6bq645yai6ihghahlf0"; type = "gem"; }; - version = "0.7.5"; + version = "0.8.0"; }; letter_opener = { dependencies = ["launchy"]; @@ -3226,10 +3256,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw"; + sha256 = "1hpj9mm31a5aw5qys2kglfl8jv74bkwkc5pfrpp3als89hgkznqy"; type = "gem"; }; - version = "1.5.1"; + version = "1.5.2"; }; multi_json = { groups = ["default"]; @@ -3401,10 +3431,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz"; + sha256 = "11w59ga9324yx6339dgsflz3dsqq2mky1qqdwcg6wi5s1bf2yldi"; type = "gem"; }; - version = "1.13.3"; + version = "1.13.6"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -3574,10 +3604,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sflfy1jvn9wqpral7gcfmbys7msvykp6rlnl33r8qgnbksn54y8"; + sha256 = "16qkd51f1ab1hw4az27qj3vk958aal67by8djsplwd1q3h7nfib5"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; omniauth-facebook = { dependencies = ["omniauth-oauth2"]; @@ -3803,15 +3833,48 @@ }; version = "1.1.1"; }; + pact = { + dependencies = ["pact-mock_service" "pact-support" "rack-test" "rspec" "term-ansicolor" "thor" "webrick"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ngwc4zrp6jxpb8s0y07xxic492a1n0akjxd7x4hks2fbsiwwwk2"; + type = "gem"; + }; + version = "1.59.0"; + }; + pact-mock_service = { + dependencies = ["filelock" "find_a_port" "json" "pact-support" "rack" "rspec" "term-ansicolor" "thor" "webrick"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0izmf5h0n1mcrfk6qlz61rhzdjs6h0bkqrx6ndp8nhmfhja254fc"; + type = "gem"; + }; + version = "3.6.2"; + }; + pact-support = { + dependencies = ["awesome_print" "randexp" "rspec" "term-ansicolor"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07qxvxy48im9vlswqspsh2k6fy6rsmi3409863ww8y7yx5pmjr63"; + type = "gem"; + }; + version = "1.15.1"; + }; parallel = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; + sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; type = "gem"; }; - version = "1.20.1"; + version = "1.22.1"; }; parser = { dependencies = ["ast"]; @@ -3819,10 +3882,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sszdl9mpzqzn9kxrp28sqmg47mjxcwypr4d60vbajqba4v885di"; + sha256 = "0xhfghgidj8cbdnqp01f7kvnrv1f60izpkd9dhxsvpdzkfsdg97d"; type = "gem"; }; - version = "3.0.3.2"; + version = "3.1.2.0"; }; parslet = { groups = ["default" "development" "test"]; @@ -3861,10 +3924,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; + sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.5"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -3872,10 +3935,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cf1b97nznl6adkx25j2x96sq8xx2b4fpic230fx65k3vqqn8a4r"; + sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.3"; }; plist = { groups = ["default"]; @@ -3914,10 +3977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xrhmialxn5vlp1nmf40a4db9gji4h2wbzd7f43sz64z8lvrjj6h"; + sha256 = "11j7d6abxivj15yax47z3f751wz4pnl02qszzc9swswf8hn41r03"; type = "gem"; }; - version = "1.11.1"; + version = "1.16.0"; }; premailer-rails = { dependencies = ["actionmailer" "premailer"]; @@ -4000,14 +4063,14 @@ version = "0.5.0"; }; public_suffix = { - groups = ["default" "development" "test"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; type = "gem"; }; - version = "4.0.6"; + version = "4.0.7"; }; puma = { dependencies = ["nio4r"]; @@ -4062,14 +4125,14 @@ version = "1.6.0"; }; rack = { - groups = ["default" "development" "kerberos" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "1b1qsg0yfargdhmpapp2d3mlxj82wyygs9nj74w0r03diyi8swlc"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.3.1"; }; rack-accept = { dependencies = ["rack"]; @@ -4088,10 +4151,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15b8lk54j2abqhpn588b1wvbzwmxwa7iql6241kxpjc0gyb51p0z"; + sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq"; type = "gem"; }; - version = "6.3.0"; + version = "6.6.1"; }; rack-cors = { dependencies = ["rack"]; @@ -4099,10 +4162,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07dppmm1ah1gs31sb5byrkkady9vqzwjmpd92c8425nc6yzwknik"; + sha256 = "0jvs0mq8jrsz86jva91mgql16daprpa3qaipzzfvngnnqr5680j7"; type = "gem"; }; - version = "1.0.6"; + version = "1.1.1"; }; rack-oauth2 = { dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; @@ -4110,10 +4173,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b0h0rlfl0p0drymwfc71g87fp66ck3205pl32z89xsgh0lzw25k"; + sha256 = "0gxxr209r8h3nxhc9h731khv6yswiv9hc6q2pg672v530xmknznw"; type = "gem"; }; - version = "1.16.0"; + version = "1.19.0"; }; rack-proxy = { dependencies = ["rack"]; @@ -4142,10 +4205,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d4dgbf8rgqx03lwsm8j6i20lzawk1bsvzfj5bhzrsycfyfk25aj"; + sha256 = "16ahj3qz3xhfrwvqb4nf6cfzvliigg0idfsp5jyr8qwk676d2f30"; type = "gem"; }; - version = "0.5.2"; + version = "0.6.0"; }; rails = { dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; @@ -4214,14 +4277,14 @@ version = "6.1.4.7"; }; rainbow = { - groups = ["default" "development" "test"]; + groups = ["coverage" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; type = "gem"; }; - version = "3.0.0"; + version = "3.1.1"; }; rake = { groups = ["default" "development" "test"]; @@ -4233,6 +4296,16 @@ }; version = "13.0.6"; }; + randexp = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j742j7g107jgkvpsfq2b10d5xhsni5s8vxrp518d3karw7529ih"; + type = "gem"; + }; + version = "0.1.7"; + }; rb-fsevent = { groups = ["default" "development" "test"]; platforms = []; @@ -4300,10 +4373,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16q71cc9wx342c697q18pkz19ym4ncjd97hcw4v6f1mgflkdv400"; + sha256 = "13za43xb5xfg1xb1vwlvwx14jlmnk7jal5dqw8q9a5g13csx41sw"; type = "gem"; }; - version = "1.2.0"; + version = "1.4.0"; }; recaptcha = { dependencies = ["json"]; @@ -4395,10 +4468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm"; + sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; type = "gem"; }; - version = "2.2.1"; + version = "2.5.0"; }; regexp_property_values = { groups = ["default"]; @@ -4510,10 +4583,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0530ri0p60km0bg0ib6swkhfnas427cva7vcdmnwl8df52a10y1k"; + sha256 = "17dhzc9hfzd8x18hfsvn9rsp4jg18wdfsdy3a5p99y5dhfh1321r"; type = "gem"; }; - version = "3.27.0"; + version = "3.29.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4674,10 +4747,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gkf1p8yal38nlvdb39qaiy0gr85fxfr09j5dxh8qvrgpncpnk78"; + sha256 = "1b3p4wy68jkyq8vhm5y568wlhsihy3ilnp2c6ig18xcw1slnkypl"; type = "gem"; }; - version = "1.4.1"; + version = "1.18.0"; }; rubocop-gitlab-security = { dependencies = ["rubocop"]; @@ -4696,10 +4769,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18md69dkz0s5xm93c4psmvy4c0nx3a7yi61vfjn46cw6yk54fm7b"; + sha256 = "1yam7fdm77y0x6b6i7v14iiji9020mvdd9h1ainvv88zbv8yd4wq"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.3"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -5330,10 +5403,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p3vaq2fbmlphphqr0yjc5cyzzxjizq4zbxbbw3j2vpgdcmpi6bs"; + sha256 = "1h5aiqqlk51z12kgvanhdvd0ajvv2i68z6a7450yxgmflfaiwz7c"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; ssrf_filter = { groups = ["default"]; @@ -5419,6 +5492,16 @@ }; version = "1.3.0"; }; + sync = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z9qlq4icyiv3hz1znvsq1wz2ccqjb1zwd6gkvnwg6n50z65d0v6"; + type = "gem"; + }; + version = "0.5.0"; + }; sys-filesystem = { dependencies = ["ffi"]; groups = ["default"]; @@ -5460,6 +5543,17 @@ }; version = "0.8.2"; }; + term-ansicolor = { + dependencies = ["tins"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xq5kci9215skdh27npyd3y55p812v4qb4x2hv3xsjvwqzz9ycwj"; + type = "gem"; + }; + version = "1.7.1"; + }; terminal-table = { dependencies = ["unicode-display_width"]; groups = ["default" "development"]; @@ -5584,6 +5678,17 @@ }; version = "0.8.3"; }; + tins = { + dependencies = ["sync"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153q7j2nj7y43iscbfcihmwlcydx6sbd65azs27kain0gncymd90"; + type = "gem"; + }; + version = "1.31.0"; + }; toml-rb = { dependencies = ["citrus"]; groups = ["default"]; @@ -5776,14 +5881,14 @@ version = "0.0.8"; }; unicode-display_width = { - groups = ["default" "development" "test"]; + groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.0"; }; unicode_utils = { groups = ["default"]; @@ -6084,9 +6189,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m"; + sha256 = "0xjdr2szxvn3zb1sb5l8nfd6k9jr3b4qqbbg1mj9grf68m3fxckc"; type = "gem"; }; - version = "2.5.4"; + version = "2.6.0"; }; } From 5710bac2b4bfece46ac10f08ada69f08c3831cab Mon Sep 17 00:00:00 2001 From: Kim Lindberger Date: Sat, 25 Jun 2022 21:22:53 +0200 Subject: [PATCH 771/814] nixos/gitlab: Use Git 2.35.x to work around git bug (#177776) Git 2.36.1 seemingly contains a commit-graph related bug which is easily triggered through GitLab, so let's downgrade it to 2.35.x until this issue is solved. See https://gitlab.com/gitlab-org/gitlab/-/issues/360783#note_992870101. --- nixos/modules/services/misc/gitlab.nix | 28 ++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 24eefb7bf302..0b8bd08a22bc 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -13,6 +13,22 @@ let else pkgs.postgresql_12; + # Git 2.36.1 seemingly contains a commit-graph related bug which is + # easily triggered through GitLab, so we downgrade it to 2.35.x + # until this issue is solved. See + # https://gitlab.com/gitlab-org/gitlab/-/issues/360783#note_992870101. + gitPackage = + let + version = "2.35.3"; + in + pkgs.git.overrideAttrs (oldAttrs: rec { + inherit version; + src = pkgs.fetchurl { + url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; + sha256 = "sha256-FenbT5vy7Z//MMtioAxcfAkBAV9asEjNtOiwTd7gD6I="; + }; + }); + gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket"; gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket"; pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url; @@ -41,7 +57,7 @@ let prometheus_listen_addr = "localhost:9236" [git] - bin_path = "${pkgs.git}/bin/git" + bin_path = "${gitPackage}/bin/git" [gitaly-ruby] dir = "${cfg.packages.gitaly.ruby}" @@ -137,7 +153,7 @@ let }; workhorse.secret_file = "${cfg.statePath}/.gitlab_workhorse_secret"; gitlab_kas.secret_file = "${cfg.statePath}/.gitlab_kas_secret"; - git.bin_path = "git"; + git.bin_path = "${gitPackage}/bin/git"; monitoring = { ip_whitelist = [ "127.0.0.0/8" "::1/128" ]; sidekiq_exporter = { @@ -1275,7 +1291,7 @@ in { }); path = with pkgs; [ postgresqlPackage - git + gitPackage ruby openssh nodejs @@ -1306,7 +1322,7 @@ in { path = with pkgs; [ openssh procps # See https://gitlab.com/gitlab-org/gitaly/issues/1562 - git + gitPackage cfg.packages.gitaly.rubyEnv cfg.packages.gitaly.rubyEnv.wrappedRuby gzip @@ -1351,7 +1367,7 @@ in { partOf = [ "gitlab.target" ]; path = with pkgs; [ exiftool - git + gitPackage gnutar gzip openssh @@ -1412,7 +1428,7 @@ in { environment = gitlabEnv; path = with pkgs; [ postgresqlPackage - git + gitPackage openssh nodejs procps From fc658c86f70e45d238c404e0686cf4ed905b8382 Mon Sep 17 00:00:00 2001 From: Thomas Depierre Date: Wed, 22 Jun 2022 14:14:08 +0200 Subject: [PATCH 772/814] riak, nixos/riak: remove Riak have been updated a lot since the version 2.2 (now 3.0.10) but has seen no updated to the package. This is at this point a problem forcing us to maintain old versions of erlang. We would be happy to re accept a newer version of Riak if someone want to spend the time to set it up. --- .../from_md/release-notes/rl-2211.section.xml | 7 + .../manual/release-notes/rl-2211.section.md | 2 + nixos/modules/misc/ids.nix | 4 +- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + nixos/modules/services/databases/riak.nix | 162 ------------------ nixos/tests/all-tests.nix | 1 - nixos/tests/riak.nix | 18 -- pkgs/servers/nosql/riak/2.2.0.nix | 106 ------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 11 files changed, 13 insertions(+), 294 deletions(-) delete mode 100644 nixos/modules/services/databases/riak.nix delete mode 100644 nixos/tests/riak.nix delete mode 100644 pkgs/servers/nosql/riak/2.2.0.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index c8634941cd18..53233754f000 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -233,6 +233,13 @@ this version for the entire lifecycle of the 22.11 release. + + + riak package removed along with + services.riak module, due to lack of + maintainer to update the package. + + (Neo)Vim can not be configured with diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 203f0f1791cb..abe0c7bdeaa6 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -93,6 +93,8 @@ In addition to numerous new and upgraded packages, this release has the followin - PHP 7.4 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 22.11 release. +- riak package removed along with `services.riak` module, due to lack of maintainer to update the package. + - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden. Use `configure.packages` instead. diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 7d1faa50f4bf..05d483af3c2e 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -236,7 +236,7 @@ in gitit = 202; riemanntools = 203; subsonic = 204; - riak = 205; + # riak = 205; # unused, remove 2022-07-22 #shout = 206; # dynamically allocated as of 2021-09-18 gateone = 207; namecoin = 208; @@ -553,7 +553,7 @@ in gitit = 202; riemanntools = 203; subsonic = 204; - riak = 205; + # riak = 205;#unused, removed 2022-06-22 #shout = 206; #unused gateone = 207; namecoin = 208; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8ba609e99834..c1e41c8951ca 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -365,7 +365,6 @@ ./services/databases/pgmanage.nix ./services/databases/postgresql.nix ./services/databases/redis.nix - ./services/databases/riak.nix ./services/databases/victoriametrics.nix ./services/desktops/accountsservice.nix ./services/desktops/bamf.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 1d2262764930..7a6a6b5ed30b 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -97,6 +97,7 @@ with lib; (mkRemovedOptionModule [ "services" "gogoclient" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "virtuoso" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "openfire" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "riak" ] "The corresponding package was removed from nixpkgs.") # Do NOT add any option renames here, see top of the file ]; diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix deleted file mode 100644 index cc4237d038cd..000000000000 --- a/nixos/modules/services/databases/riak.nix +++ /dev/null @@ -1,162 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.riak; - -in - -{ - - ###### interface - - options = { - - services.riak = { - - enable = mkEnableOption "riak"; - - package = mkOption { - type = types.package; - default = pkgs.riak; - defaultText = literalExpression "pkgs.riak"; - description = '' - Riak package to use. - ''; - }; - - nodeName = mkOption { - type = types.str; - default = "riak@127.0.0.1"; - description = '' - Name of the Erlang node. - ''; - }; - - distributedCookie = mkOption { - type = types.str; - default = "riak"; - description = '' - Cookie for distributed node communication. All nodes in the - same cluster should use the same cookie or they will not be able to - communicate. - ''; - }; - - dataDir = mkOption { - type = types.path; - default = "/var/db/riak"; - description = '' - Data directory for Riak. - ''; - }; - - logDir = mkOption { - type = types.path; - default = "/var/log/riak"; - description = '' - Log directory for Riak. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Additional text to be appended to riak.conf. - ''; - }; - - extraAdvancedConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Additional text to be appended to advanced.config. - ''; - }; - - }; - - }; - - ###### implementation - - config = mkIf cfg.enable { - - environment.systemPackages = [ cfg.package ]; - environment.etc."riak/riak.conf".text = '' - nodename = ${cfg.nodeName} - distributed_cookie = ${cfg.distributedCookie} - - platform_log_dir = ${cfg.logDir} - platform_etc_dir = /etc/riak - platform_data_dir = ${cfg.dataDir} - - ${cfg.extraConfig} - ''; - - environment.etc."riak/advanced.config".text = '' - ${cfg.extraAdvancedConfig} - ''; - - users.users.riak = { - name = "riak"; - uid = config.ids.uids.riak; - group = "riak"; - description = "Riak server user"; - }; - - users.groups.riak.gid = config.ids.gids.riak; - - systemd.services.riak = { - description = "Riak Server"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - path = [ - pkgs.util-linux # for `logger` - pkgs.bash - ]; - - environment.HOME = "${cfg.dataDir}"; - environment.RIAK_DATA_DIR = "${cfg.dataDir}"; - environment.RIAK_LOG_DIR = "${cfg.logDir}"; - environment.RIAK_ETC_DIR = "/etc/riak"; - - preStart = '' - if ! test -e ${cfg.logDir}; then - mkdir -m 0755 -p ${cfg.logDir} - chown -R riak ${cfg.logDir} - fi - - if ! test -e ${cfg.dataDir}; then - mkdir -m 0700 -p ${cfg.dataDir} - chown -R riak ${cfg.dataDir} - fi - ''; - - serviceConfig = { - ExecStart = "${cfg.package}/bin/riak console"; - ExecStop = "${cfg.package}/bin/riak stop"; - StandardInput = "tty"; - User = "riak"; - Group = "riak"; - PermissionsStartOnly = true; - # Give Riak a decent amount of time to clean up. - TimeoutStopSec = 120; - LimitNOFILE = 65536; - }; - - unitConfig.RequiresMountsFor = [ - "${cfg.dataDir}" - "${cfg.logDir}" - "/etc/riak" - ]; - }; - - }; - -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5e4325a1739f..87bed40eac9e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -472,7 +472,6 @@ in { restartByActivationScript = handleTest ./restart-by-activation-script.nix {}; restic = handleTest ./restic.nix {}; retroarch = handleTest ./retroarch.nix {}; - riak = handleTest ./riak.nix {}; robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; rspamd = handleTest ./rspamd.nix {}; diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix deleted file mode 100644 index e75d40fa2569..000000000000 --- a/nixos/tests/riak.nix +++ /dev/null @@ -1,18 +0,0 @@ -import ./make-test-python.nix ({ lib, pkgs, ... }: { - name = "riak"; - meta = with lib.maintainers; { - maintainers = [ Br1ght0ne ]; - }; - - nodes.machine = { - services.riak.enable = true; - services.riak.package = pkgs.riak; - }; - - testScript = '' - machine.start() - - machine.wait_for_unit("riak") - machine.wait_until_succeeds("riak ping 2>&1") - ''; -}) diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix deleted file mode 100644 index 102d69f82b40..000000000000 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ stdenv, lib, fetchurl, unzip, erlang, which, pam, nixosTests }: - -let - solrName = "solr-4.10.4-yz-2.tgz"; - yokozunaJarName = "yokozuna-3.jar"; - yzMonitorJarName = "yz_monitor-1.jar"; - - srcs = { - riak = fetchurl { - url = "https://s3.amazonaws.com/downloads.basho.com/riak/2.2/2.2.0/riak-2.2.0.tar.gz"; - sha256 = "0kl28bpyzajcllybili46jfr1schl45w5ysii187jr0ssgls2c9p"; - }; - solr = fetchurl { - url = "http://s3.amazonaws.com/files.basho.com/solr/${solrName}"; - sha256 = "0fy5slnldn628gmr2kilyx606ph0iykf7pz6j0xjcc3wqvrixa2a"; - }; - yokozunaJar = fetchurl { - url = "http://s3.amazonaws.com/files.basho.com/yokozuna/${yokozunaJarName}"; - sha256 = "17n6m100fz8affdcxsn4niw2lrpnswgfnd6aszgzipffwbg7v8v5"; - }; - yzMonitorJar = fetchurl { - url = "http://s3.amazonaws.com/files.basho.com/yokozuna/${yzMonitorJarName}"; - sha256 = "0kb97d1a43vw759j1h5qwbhx455pidn2pi7sfxijqic37h81ri1m"; - }; - }; -in - -stdenv.mkDerivation { - pname = "riak"; - version = "2.2.0"; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ - which erlang pam - ]; - - src = srcs.riak; - - hardeningDisable = [ "format" ]; - - postPatch = '' - sed -i deps/node_package/priv/base/env.sh \ - -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/riak}@' \ - -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \ - -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \ - -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/riak}@' \ - -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@' - ''; - - preBuild = '' - mkdir solr-pkg - cp ${srcs.solr} solr-pkg/${solrName} - export SOLR_PKG_DIR=$(readlink -f solr-pkg) - - mkdir -p deps/yokozuna/priv/java_lib - cp ${srcs.yokozunaJar} deps/yokozuna/priv/java_lib/${yokozunaJarName} - - mkdir -p deps/yokozuna/priv/solr/lib/ext - cp ${srcs.yzMonitorJar} deps/yokozuna/priv/solr/lib/ext/${yzMonitorJarName} - - patchShebangs . - ''; - - buildPhase = '' - runHook preBuild - - make locked-deps - make rel - - runHook postBuild - ''; - - doCheck = false; - - installPhase = '' - runHook preInstall - - mkdir $out - mv rel/riak/etc rel/riak/riak-etc - mkdir -p rel/riak/etc - mv rel/riak/riak-etc rel/riak/etc/riak - mv rel/riak/* $out - - for prog in $out/bin/*; do - substituteInPlace $prog \ - --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \ - ". $out/lib/env.sh" - done - - runHook postInstall - ''; - - passthru.tests = { inherit (nixosTests) riak; }; - - meta = with lib; { - maintainers = with maintainers; [ cstrahan mdaiter ]; - description = "Dynamo inspired NoSQL DB by Basho"; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # dependencies - ]; - license = licenses.asl20; - knownVulnerabilities = [ "CVE-2017-3163 - see https://github.com/NixOS/nixpkgs/issues/33876" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fdf0e40de72c..bd19a8d3059d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1218,6 +1218,7 @@ mapAliases ({ retroArchCores = throw "retroArchCores has been removed. Please use overrides instead, e.g.: `retroarch.override { cores = with libretro; [ ... ]; }`"; # Added 2021-11-19 retroshare06 = retroshare; rfkill = throw "rfkill has been removed, as it's included in util-linux"; # Added 2020-08-23 + riak = throw "riak has been removed due to lack of maintainer to update the package"; # Added 2022-06-22 riak-cs = throw "riak-cs is not maintained anymore"; # Added 2020-10-14 rimshot = throw "rimshot has been removed, because it is broken and no longer maintained upstream"; # Added 2022-01-15 ring-daemon = jami-daemon; # Added 2021-10-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0754c215de3a..aa3594dc975e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22445,10 +22445,6 @@ with pkgs; percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { stdenv = gcc10StdenvCompat; }; percona-server = percona-server56; - riak = callPackage ../servers/nosql/riak/2.2.0.nix { - erlang = erlang_basho_R16B02; - }; - influxdb = callPackage ../servers/nosql/influxdb { }; influxdb2-server = callPackage ../servers/nosql/influxdb2 { }; influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { }; From de4e1960d8c7d256a53af1475dd5f2704b9824cb Mon Sep 17 00:00:00 2001 From: wyndon Date: Sat, 25 Jun 2022 21:55:15 +0200 Subject: [PATCH 773/814] httm: 0.12.1 -> 0.12.2 --- pkgs/tools/filesystems/httm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index c68e692ed2d1..51f0e039df79 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "2pShuWJns8VnxiRgj5GLv5Y7H5Qw/SfQ6lVo6VqyU/A="; + sha256 = "gly3P4b6MlhJA/Qre6S0iFGBaY0Hi/u4hzlirdTdZoc="; }; - cargoSha256 = "x5JUwQxrZ5TBG8FAMlomTkZOCxV0c/7i5sx33BCUkKo="; + cargoSha256 = "fq4RVJT6u2ST4Nu9zAnfcXZQqWe8gdC4cFwrJzFums4="; nativeBuildInputs = [ installShellFiles ]; From 7d1a3b110f63b84da50b41776739e48b1d066c1a Mon Sep 17 00:00:00 2001 From: leo60228 Date: Sun, 15 May 2022 17:57:03 -0400 Subject: [PATCH 774/814] ferium: init at 4.1.1 --- pkgs/games/ferium/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/games/ferium/default.nix diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix new file mode 100644 index 000000000000..b542ae3451e7 --- /dev/null +++ b/pkgs/games/ferium/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: + +rustPlatform.buildRustPackage rec { + pname = "ferium"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "gorilla-devs"; + repo = pname; + rev = "v${version}"; + sha256 = "5DYdeK6JdA7oLBkjP3WkwLwlBitdf4Yt2dNP7P0INN0="; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + cargoSha256 = "7rpxHfe+pWarPJ72WSXjgr63YctZ5+RrsEgmw7o66VI="; + + buildNoDefaultFeatures = true; # by default pulls in GTK 3 just for its directory picker + + doCheck = false; # requires internet + + meta = with lib; { + description = "A CLI Minecraft mod manager for mods from Modrinth, CurseForge, and Github Releases"; + homepage = "https://github.com/theRookieCoder/ferium"; + license = licenses.mpl20; + maintainers = [ maintainers.leo60228 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa3594dc975e..75a5459f788a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31942,6 +31942,10 @@ with pkgs; fairymax = callPackage ../games/fairymax { }; + ferium = callPackage ../games/ferium { + inherit (darwin.apple_sdk.frameworks) Security; + }; + fheroes2 = callPackage ../games/fheroes2 { }; fish-fillets-ng = callPackage ../games/fish-fillets-ng { }; From 7ac6886d866b44a398aabfd6feb686e69535d214 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 17:17:12 +0000 Subject: [PATCH 775/814] fend: 1.0.1 -> 1.0.3 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 07880c4fbdc5..afdc719a5e44 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EV3uxoN6RuQ7grXLcFev1ZCfjVnVIDumQmHdpUm1Jbc="; + sha256 = "sha256-eYCFX3JVsTnmVzHQd9JU6BT80kS0LTjVwVcfNJink1M="; }; - cargoSha256 = "sha256-lNpFdrriAglLaiWjxVP4JoiBuU+zdLlerAIApIvHHZw="; + cargoSha256 = "sha256-+N8/ZKj1Ht2lkTYSEm/lrLtopBQqc82gIFiLzJ6NogU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; From 3c2ece4a307b517bede287c7ec8b1d6a7c0e9564 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 07:37:09 +0000 Subject: [PATCH 776/814] cargo-nextest: 0.9.20 -> 0.9.22 --- pkgs/development/tools/rust/cargo-nextest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 25c809079c11..ff694cd25758 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.20"; + version = "0.9.22"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-dsXjoXoFliaALA/tz8/QqC5FpapE/E9nNMJYgvkI+nw="; + sha256 = "sha256-so9h6bpQzGMVwXI4qGHOJGbX7hnd9tllPGJcRvtIiIU="; }; - cargoSha256 = "sha256-3aooeKfQtElWuGtdh0gYvdm62Cm7IhebsintQgOi1Mo="; + cargoSha256 = "sha256-rbrJPEMOFq37U+0uL5NIqithQAdjO8J6TDwr5vdfT50="; cargoTestFlags = [ # TODO: investigate some more why these tests fail in nix "--" From 21f75d65c5cb77f92e74d8eef87176ad787f006c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 20:01:05 +0000 Subject: [PATCH 777/814] python310Packages.param: 1.12.1 -> 1.12.2 --- pkgs/development/python-modules/param/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index 701c9db7962a..dc1e8c9ae517 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "param"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "holoviz"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-MehTz0qCpWe/11PZ5jmFxHE54TA+QX2KfqvKB8L79V4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-NrMsIDcpZc/R2j8VuXitbnIlhP3NtLxU/OkygXqYok8="; }; checkInputs = [ From 7fa173c938ef583841c3934356dfa9a367a18766 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 07:42:37 +0000 Subject: [PATCH 778/814] cargo-depgraph: 1.2.4 -> 1.2.5 --- pkgs/development/tools/rust/cargo-depgraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-depgraph/default.nix b/pkgs/development/tools/rust/cargo-depgraph/default.nix index 3ec0c110a69d..5d2d1206007e 100644 --- a/pkgs/development/tools/rust/cargo-depgraph/default.nix +++ b/pkgs/development/tools/rust/cargo-depgraph/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-depgraph"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromSourcehut { owner = "~jplatte"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EbAV2VM73K0KiEKcy9kkK1TQHFQ1jRmKG3Tn9GAsWIk="; + sha256 = "sha256-ewlrxxHnsXBWSMPAlxTfrHj23jMiThkDSJhEsChO/sM="; }; - cargoSha256 = "sha256-AAZlAYhl62c8nFvFtwwGniGbQqXu2vHTO4++O1VJ4LM="; + cargoSha256 = "sha256-Ce13vJ5zE63hHVkg/WFdz3LrASj7Xw6nqOO64uALOeQ="; meta = with lib; { description = "Create dependency graphs for cargo projects using `cargo metadata` and graphviz"; From dc4e352c7426491cd80c25b74db46df27d46e9ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 12:06:08 +0000 Subject: [PATCH 779/814] cargo-make: 0.35.12 -> 0.35.13 --- pkgs/development/tools/rust/cargo-make/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index d099bf5f8765..59ea51406ce0 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.35.12"; + version = "0.35.13"; src = fetchCrate { inherit pname version; - sha256 = "sha256-BBSZTbzT+8obY677Yfmf1VTwg0GtvMNY/FTlS6isJTE="; + sha256 = "sha256-rkE/GLFZP1C5C4s6ghbfsJY92Wu3ku27VRorU/ZGelA="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-Nsm6KnL72HjqGevXwg2qYagzMG5nEFuH9DblbcUv6Qg="; + cargoSha256 = "sha256-GSHbs8GUHqFrBN1Op6Uh4fPzXEjSkX+a6beBQxS19K8="; # Some tests fail because they need network access. # However, Travis ensures a proper build. From ef147f9a45c9872e48163f422364f5893f9712df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 15:51:35 +0000 Subject: [PATCH 780/814] dua: 2.17.5 -> 2.17.7 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 4a83d8147acb..526eb705e4cc 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.17.5"; + version = "2.17.7"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-dpkUbZz/bIiTMhZalXHGct77qMzYB6LATs7MPVyW1GY="; + sha256 = "sha256-FiTjN4coOJZ3Uu9LfaJxcpvVKS+5MVYWQPmwllBh1Jg="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-xBiabY0aGPxrAHypuSg3AF/EcChDgtIK9cJDCeTNkm0="; + cargoSha256 = "sha256-xCHbS+D7ss85hklv9xftJTsctvQlAjkKtuJbTt5R8nM="; doCheck = false; From e64e386589c5e9b43f9c61e6feef0dcac5c24902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 25 Jun 2022 22:30:01 +0200 Subject: [PATCH 781/814] zoxide: 0.8.1 -> 0.8.2 --- pkgs/tools/misc/zoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index 96c7c29a2d90..c83a3e9a8068 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "sha256-f6HzSnrOaAOnA9k6e3CnXioxCTOM0VSpTOpxnmz+Tyk="; + sha256 = "sha256-yueUpOU28IzQA/SI8YB9Lo3J4fiKDXze0MGDCUv0+jI="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-OAvE/KFoS4+18J+kOZTYa9zgnkWh/0bgy9iglGyZ8PQ="; + cargoSha256 = "sha256-toFfxDQcN6nSzSrvlW7aychikc6GeZ8eHjvH9e6dtHQ="; postInstall = '' installManPage man/man*/* From ce4ba2a0f5cab9546211f9bef39aea286e667126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Ho=C5=82ubowicz?= Date: Sat, 25 Jun 2022 22:34:16 +0200 Subject: [PATCH 782/814] tidal-hifi: 4.0.0 -> 4.0.1 --- pkgs/applications/audio/tidal-hifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix index 1befa966d351..09b5c3f410c1 100644 --- a/pkgs/applications/audio/tidal-hifi/default.nix +++ b/pkgs/applications/audio/tidal-hifi/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "tidal-hifi"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; - sha256 = "19gx9x3v5ywlvg5vyqgj6pghzwinby0i8isavfrix798pfr98j5z"; + sha256 = "1azxdr2m84ci6ppzy0j17wmza7prlnw055fks6s4i77sjw45rhlq"; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; From 8e29a6b45e2b9ad89ecbae198bc771ef275b0550 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 20:49:43 +0000 Subject: [PATCH 783/814] esbuild: 0.14.39 -> 0.14.47 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index ce8ade8d6b3b..a7a4ea51aa8a 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.14.39"; + version = "0.14.47"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-li8uVs7SZ3KX0AbzyTDUesiqm8dQecrzyLjYKnQncj8="; + sha256 = "sha256-4T+kH8aDIN18lGkduHUTg+kXjU3JZRvmzXsT2gVNar4="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; From a6a9b537e7d4472307c51bf0a9dbdded7f2087cc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Jun 2022 20:50:00 +0000 Subject: [PATCH 784/814] esbuild: add ldflags --- pkgs/development/tools/esbuild/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index a7a4ea51aa8a..b90dae1f3796 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "An extremely fast JavaScript bundler"; homepage = "https://esbuild.github.io"; From 5ae3d0e495e7edbb31b3fce84a2fbd7ec2962e8b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Jun 2022 20:50:00 +0000 Subject: [PATCH 785/814] esbuild: add marsam to maintainers --- pkgs/development/tools/esbuild/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index b90dae1f3796..a1989084ad52 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { description = "An extremely fast JavaScript bundler"; homepage = "https://esbuild.github.io"; license = licenses.mit; - maintainers = with maintainers; [ lucus16 ]; + maintainers = with maintainers; [ lucus16 marsam ]; }; } From d8caea9adae9959b49107de22228d65c7fd06b4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 20:51:00 +0000 Subject: [PATCH 786/814] python310Packages.xmlschema: 1.11.2 -> 1.11.3 --- pkgs/development/python-modules/xmlschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 07001eb49f8b..3dcfe8d7d026 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "1.11.2"; + version = "1.11.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-coQbO5XrFjU9rAN5Vw/BlMHpkQzQy6t0dNfFsMeO2+o="; + hash = "sha256-z6VgLRDp5PHaYstdV30gt6xGVd4uifz4LkYQ2z3ayk4="; }; propagatedBuildInputs = [ From ad09dacadb82fc425b00fbf867b9bd79c03c6827 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 25 Jun 2022 16:18:57 -0400 Subject: [PATCH 787/814] cargo-nextest: fix darwin build --- pkgs/development/tools/rust/cargo-nextest/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index ff694cd25758..8220b8a72666 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, stdenv, libiconv }: +{ lib, fetchFromGitHub, rustPlatform, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-rbrJPEMOFq37U+0uL5NIqithQAdjO8J6TDwr5vdfT50="; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + cargoTestFlags = [ # TODO: investigate some more why these tests fail in nix "--" "--skip=tests_integration::test_relocated_run" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75a5459f788a..4694c54a65b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13961,7 +13961,9 @@ with pkgs; cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { }; + cargo-nextest = callPackage ../development/tools/rust/cargo-nextest { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; From b86d7fc99b4c6fde61e8c31f5ce9ef99c81ae40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Jun 2022 20:13:13 +0000 Subject: [PATCH 788/814] jarowinkler-cpp: 1.0.1 -> 1.0.2 https://github.com/maxbachmann/jarowinkler-cpp/releases/tag/v1.0.2 --- pkgs/development/libraries/jarowinkler-cpp/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jarowinkler-cpp/default.nix b/pkgs/development/libraries/jarowinkler-cpp/default.nix index 6ddb86299365..0cbfdcea6447 100644 --- a/pkgs/development/libraries/jarowinkler-cpp/default.nix +++ b/pkgs/development/libraries/jarowinkler-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "jarowinkler-cpp"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "jarowinkler-cpp"; rev = "v${version}"; - hash = "sha256-3/x0fyaDJTouBKbif0ALgMzht6HMEGHNw8g8zQlUcNk="; + hash = "sha256-GuwDSCYTfSwqTnzZSft3ufVSKL7255lVvbJhBxKxjJw="; }; nativeBuildInputs = [ @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast Jaro and Jaro-Winkler distance"; homepage = "https://github.com/maxbachmann/jarowinkler-cpp"; + changelog = "https://github.com/maxbachmann/jarowinkler-cpp/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; platforms = lib.platforms.unix; From a27fe8a92f628e5cdc35375b8662df65ab71adb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Jun 2022 20:14:45 +0000 Subject: [PATCH 789/814] python310Packages.jarowinkler: 1.0.2 -> 1.0.4 https://github.com/maxbachmann/JaroWinkler/blob/v1.0.4/CHANGELOG.md --- .../python-modules/jarowinkler/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jarowinkler/default.nix b/pkgs/development/python-modules/jarowinkler/default.nix index 3985a22d5bcb..de20ac26550e 100644 --- a/pkgs/development/python-modules/jarowinkler/default.nix +++ b/pkgs/development/python-modules/jarowinkler/default.nix @@ -3,32 +3,42 @@ , pythonOlder , fetchFromGitHub , cmake +, ninja , cython , rapidfuzz-capi , scikit-build +, setuptools +, jarowinkler-cpp , hypothesis , pytestCheckHook }: buildPythonPackage rec { pname = "jarowinkler"; - version = "1.0.2"; + version = "1.0.4"; disabled = pythonOlder "3.6"; + format = "pyproject"; + src = fetchFromGitHub { owner = "maxbachmann"; repo = "JaroWinkler"; rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-zVAcV6xxqyfXRUcyWo9PcOdagcexJc/D5k4g5ag3hbY="; + hash = "sha256-2bhKl7l3ByfrtkXnXifQd/AhWVFGSMzULkzJftd1mVE="; }; nativeBuildInputs = [ cmake cython + ninja rapidfuzz-capi scikit-build + setuptools + ]; + + buildInputs = [ + jarowinkler-cpp ]; dontUseCmakeConfigure = true; @@ -48,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for fast approximate string matching using Jaro and Jaro-Winkler similarity"; homepage = "https://github.com/maxbachmann/JaroWinkler"; + changelog = "https://github.com/maxbachmann/JaroWinkler/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; From 5f4f5c7c2d8010b32eb0037087b18c7d56fc5393 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 21:05:11 +0000 Subject: [PATCH 790/814] flyctl: 0.0.330 -> 0.0.335 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 4a2ed0a33f4e..c9d36dd679ad 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.330"; + version = "0.0.335"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-lgyr2NgurOZPqJv8ZUD8ut7ELxMZqLZ+rXYTjZauv8Y="; + sha256 = "sha256-da7fKtByg3zwtRmsObs5SV6E9bVBe9KyVzn1eE3PcV8="; }; - vendorSha256 = "sha256-T1E2VJiaGKhk/rDVKYEju3AyDPEUMGFNvj/KrMjLKEc="; + vendorSha256 = "sha256-Hn4uB9HYHVS3p9zBpOzOiyTHMmjN8YmVxHZAj1V7y2I="; subPackages = [ "." ]; From 378a8a69065b029f0128ec86540d4de2ab5e4d5b Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 25 Jun 2022 15:47:26 +0200 Subject: [PATCH 791/814] synfigstudio: 1.0.2 -> 1.5.1, unbreak --- .../graphics/synfigstudio/default.nix | 181 +++++++++--------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 96 insertions(+), 89 deletions(-) diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 57f356023360..b239c907fbd9 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,119 +1,128 @@ -{ lib, stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 -, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkg-config -, imagemagick, intltool, autoreconfHook, which, gnome +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, autoreconfHook +, wrapGAppsHook + +, boost +, cairo +, gettext +, glibmm +, gtk3 +, gtkmm3 +, libjack2 +, libsigcxx +, libxmlxx +, mlt +, pango +, imagemagick +, intltool +, gnome +, harfbuzz +, freetype +, fribidi +, openexr +, fftw }: let - version = "1.0.2"; + version = "1.5.1"; + src = fetchFromGitHub { + owner = "synfig"; + repo = "synfig"; + rev = "v${version}"; + hash = "sha256-9vBYESaSgW/1FWH2uFBvPiYvxLlX0LLNnd4S7ACJcwI="; + }; ETL = stdenv.mkDerivation { - name = "ETL-0.04.19"; + pname = "ETL"; + inherit version src; - src = fetchFromGitHub { - repo = "synfig"; - owner = "synfig"; - rev = version; - sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc"; - }; + sourceRoot = "source/ETL"; - postUnpack = "sourceRoot=\${sourceRoot}/ETL/"; - - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + buildInputs = [ + glibmm + ]; }; synfig = stdenv.mkDerivation { pname = "synfig"; - inherit version; + inherit version src; - src = fetchFromGitHub { - repo = "synfig"; - owner = "synfig"; - rev = version; - sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc"; - }; - - postUnpack = "sourceRoot=\${sourceRoot}/synfig-core/"; + sourceRoot = "source/synfig-core"; configureFlags = [ "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.out}/lib" ]; - nativeBuildInputs = [ pkg-config autoreconfHook gettext ]; - buildInputs = [ - ETL boost cairo glibmm mlt-qt5 libsigcxx libxmlxx pango + nativeBuildInputs = [ + pkg-config + autoreconfHook + gettext + intltool + ]; + buildInputs = [ + ETL + boost + cairo + glibmm + mlt + libsigcxx + libxmlxx + pango + imagemagick + harfbuzz + freetype + fribidi + openexr + fftw ]; - - meta.broken = true; }; in stdenv.mkDerivation { pname = "synfigstudio"; - inherit version; + inherit version src; - src = fetchFromGitHub { - repo = "synfig"; - owner = "synfig"; - rev = version; - sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc"; - }; - - postUnpack = "sourceRoot=\${sourceRoot}/synfig-studio/"; + sourceRoot = "source/synfig-studio"; postPatch = '' - for i in \ - brushlib/brushlib.hpp \ - gui/canvasview.cpp \ - gui/compview.cpp \ - gui/docks/dock_canvasspecific.cpp \ - gui/docks/dock_children.cpp \ - gui/docks/dock_curves.cpp \ - gui/docks/dock_history.cpp \ - gui/docks/dock_keyframes.cpp \ - gui/docks/dock_layergroups.cpp \ - gui/docks/dock_layers.cpp \ - gui/docks/dock_metadata.cpp \ - gui/docks/dock_params.cpp \ - gui/docks/dock_timetrack.cpp \ - gui/docks/dock_toolbox.cpp \ - gui/docks/dockable.cpp \ - gui/docks/dockdialog.cpp \ - gui/docks/dockmanager.h \ - gui/duck.h \ - gui/duckmatic.cpp \ - gui/duckmatic.h \ - gui/instance.cpp \ - gui/instance.h \ - gui/states/state_stroke.h \ - gui/states/state_zoom.cpp \ - gui/widgets/widget_curves.cpp \ - gui/workarea.cpp \ - gui/workarearenderer/workarearenderer.h \ - synfigapp/action_system.h \ - synfigapp/canvasinterface.h \ - synfigapp/instance.h \ - synfigapp/main.h \ - synfigapp/uimanager.h - do - substituteInPlace src/"$i" --replace '#include ' '#include ' - substituteInPlace src/"$i" --replace '#include ' '#include ' - substituteInPlace src/"$i" --replace '#include ' '#include ' - done + patchShebangs images/splash_screen_development.sh ''; - preConfigure = "./bootstrap.sh"; + preConfigure = '' + ./bootstrap.sh + ''; - nativeBuildInputs = [ pkg-config autoreconfHook gettext makeWrapper ]; - buildInputs = [ - ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool - libjack2 libsigcxx libxmlxx mlt-qt5 - synfig which gnome.adwaita-icon-theme + nativeBuildInputs = [ + pkg-config + autoreconfHook + gettext + wrapGAppsHook + ]; + buildInputs = [ + ETL + synfig + boost + cairo + glibmm + gtk3 + gtkmm3 + imagemagick + intltool + libjack2 + libsigcxx + libxmlxx + mlt + gnome.adwaita-icon-theme + openexr + fftw ]; - - postInstall = '' - wrapProgram "$out/bin/synfigstudio" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43903c555e54..9e7548b2f305 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28738,9 +28738,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; - synfigstudio = callPackage ../applications/graphics/synfigstudio { - mlt-qt5 = libsForQt514.mlt; - }; + synfigstudio = callPackage ../applications/graphics/synfigstudio { }; taxi = callPackage ../applications/networking/ftp/taxi { }; From 8f2e02bee70660df0a1827cc4142502ab5a37fb8 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 25 Jun 2022 15:48:03 +0200 Subject: [PATCH 792/814] synfigstudio.synfig,synfigstudio.ETL: expose --- pkgs/applications/graphics/synfigstudio/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index b239c907fbd9..a77a0313223b 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -126,6 +126,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; + passthru = { + # Expose libraries and cli tools + inherit ETL synfig; + }; + meta = with lib; { description = "A 2D animation program"; homepage = "http://www.synfig.org"; From d828f4dbf14df7af990dcbdf4490385deb2792cb Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Jun 2022 07:47:36 +1000 Subject: [PATCH 793/814] jless: remove maintainer --- pkgs/development/tools/jless/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/jless/default.nix b/pkgs/development/tools/jless/default.nix index 558c9e019e19..306a271936bf 100644 --- a/pkgs/development/tools/jless/default.nix +++ b/pkgs/development/tools/jless/default.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec { description = "A command-line pager for JSON data"; homepage = "https://jless.io"; license = licenses.mit; - maintainers = with maintainers; [ jfchevrette zowoq ]; + maintainers = with maintainers; [ jfchevrette ]; }; } From ade62d2d44d2d722f9cfdd5aa7ba4f253e372a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Jun 2022 20:15:03 +0000 Subject: [PATCH 794/814] rapidfuzz-cpp: 1.0.2 -> 1.0.3 https://github.com/maxbachmann/rapidfuzz-cpp/releases/tag/v1.0.3 --- pkgs/development/libraries/rapidfuzz-cpp/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 99c3059c7a51..0831539dd570 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,24 +7,19 @@ stdenv.mkDerivation rec { pname = "rapidfuzz-cpp"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${version}"; - hash = "sha256-Tf7nEMXiem21cvQHPnYnCvOOLg0KBBnNQDaYIcHcm2g="; + hash = "sha256-8SJU+ERFRGkbGBmGJa5Ypetc3LPeytg5pR4S29RkvR8="; }; - patches = lib.optionals doCheck [ + patches = [ ./dont-fetch-project-options.patch ]; - postPatch = '' - substituteInPlace test/CMakeLists.txt \ - --replace WARNINGS_AS_ERRORS "" - ''; - nativeBuildInputs = [ cmake ]; @@ -42,6 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance"; homepage = "https://github.com/maxbachmann/rapidfuzz-cpp"; + changelog = "https://github.com/maxbachmann/rapidfuzz-cpp/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; platforms = lib.platforms.unix; From b3449fddb39c39dcd96f9dc0235a344092bd6052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 25 Jun 2022 20:16:28 +0000 Subject: [PATCH 795/814] python310Packages.rapidfuzz: 2.0.11 -> 2.0.15 https://github.com/maxbachmann/RapidFuzz/blob/v2.0.15/CHANGELOG.md --- pkgs/development/python-modules/rapidfuzz/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 9012473f0645..f3c4b77a7095 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -7,6 +7,7 @@ , ninja , rapidfuzz-capi , scikit-build +, setuptools , jarowinkler , numpy , hypothesis @@ -19,15 +20,17 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "2.0.11"; + version = "2.0.15"; disabled = pythonOlder "3.6"; + format = "pyproject"; + src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "v${version}"; - hash = "sha256-npmdnUMrmbHgUgqMxKBytgtL1weWw6BjVNmBkYSKNMw="; + hash = "sha256-wn77gA6UCgsdDf3FZgjrA5gSWpWJg3YoUhx88X7aVcM="; }; nativeBuildInputs = [ @@ -36,6 +39,7 @@ buildPythonPackage rec { ninja rapidfuzz-capi scikit-build + setuptools ]; dontUseCmakeConfigure = true; @@ -72,6 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "Rapid fuzzy string matching"; homepage = "https://github.com/maxbachmann/RapidFuzz"; + changelog = "https://github.com/maxbachmann/RapidFuzz/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; From 9ebc1097aad0175ff04420969f2484deda6eea79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 22:27:23 +0000 Subject: [PATCH 796/814] flyway: 8.5.11 -> 8.5.13 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 02c6c6ae9437..4cf9efb964ab 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "8.5.11"; + version = "8.5.13"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-qmDvubyWWBRTbspVDSACiklC6a8l5n4y88vz3VZFnV0="; + sha256 = "sha256-9MEsZ5lc9cF7MKD+dYdZGR9cnMHFxELACp4gsC0gzRc="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From 3c38d1b016b49572690086059e9b7e037dccd882 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 22:32:31 +0000 Subject: [PATCH 797/814] fluxctl: 1.25.1 -> 1.25.2 --- pkgs/applications/networking/cluster/fluxctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index d1f06ce333bc..dd9875929258 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.25.1"; + version = "1.25.2"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-l/BPnqa0j0yAdrl9BxFUKt94JwiNyPq1gKYuhGj/c8w="; + sha256 = "sha256-OZLTT54InDPF+m5e4xtuAL311wCD16Ne/T0PbgiSaN4="; }; - vendorSha256 = "sha256-PZriaKbgRKm7ssHOBmbzbma5LrRt0TsQiphSrtcT83k="; + vendorSha256 = "sha256-Q9THG76/B/gdfhf5wLxVXoAAzXeOjaaAyYaGKy9LeF0="; nativeBuildInputs = [ installShellFiles ]; From cdc32ee5125925a055bfd7165096094ef83373d4 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Wed, 15 Jun 2022 12:58:07 -0700 Subject: [PATCH 798/814] witness: 0.1.8 -> 0.1.10 Signed-off-by: Frederick F. Kautz IV --- pkgs/tools/security/witness/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/tools/security/witness/default.nix index f443d765b571..c3334875d2f0 100644 --- a/pkgs/tools/security/witness/default.nix +++ b/pkgs/tools/security/witness/default.nix @@ -2,25 +2,25 @@ buildGoModule rec { pname = "witness"; - version = "0.1.8"; + version = "0.1.10"; src = fetchFromGitHub { owner = "testifysec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i76sw5ysWDZwuNt7CYtpVy9mEV643i4YaMxksglyPWw="; + sha256 = "sha256-BRYp8gp3TNZrl6fRNHOIgdhCVCN+N2lReFk+0FxCUxY="; }; - vendorSha256 = "sha256-A3fnAWEJ7SeUnDfIIOkbHIhUBRB8INcqMleOLL3LHF0="; + vendorSha256 = "sha256-/NniYty50dO44VUTfVq9b8dbT3le4uZ2ZoDN4IjLBto="; nativeBuildInputs = [ installShellFiles ]; # We only want the witness binary, not the helper utilities for generating docs. - subPackages = [ "cmd/witness" ]; + subPackages = [ "." ]; ldflags = [ "-s" "-w" - "-X github.com/testifysec/witness/cmd/witness/cmd.Version=v${version}" + "-X github.com/testifysec/witness/cmd.Version=v${version}" ]; # Feed in all tests for testing From 2c1c79dce66571f97ba5c2a2b1c1175745ec7d79 Mon Sep 17 00:00:00 2001 From: cid-chan <76440879+cid-chan@users.noreply.github.com> Date: Sun, 26 Jun 2022 01:00:23 +0200 Subject: [PATCH 799/814] vapoursynth: Add to pythonPackages (#175770) Co-authored-by: Sandro --- .../python-modules/vapoursynth/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/vapoursynth/default.nix diff --git a/pkgs/development/python-modules/vapoursynth/default.nix b/pkgs/development/python-modules/vapoursynth/default.nix new file mode 100644 index 000000000000..bfd5e1ca8b2b --- /dev/null +++ b/pkgs/development/python-modules/vapoursynth/default.nix @@ -0,0 +1,22 @@ +{ vapoursynth, cython, buildPythonPackage, python }: + +buildPythonPackage { + pname = "vapoursynth"; + + inherit (vapoursynth) version src; + + nativeBuildInputs = [ + cython + ]; + + buildInputs = [ + vapoursynth + ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover -s $src/test -p "*test.py" + ''; + + inherit (vapoursynth) meta; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a652fa48d6d..bc513f4410d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11000,6 +11000,10 @@ in { vallox-websocket-api = callPackage ../development/python-modules/vallox-websocket-api { }; + vapoursynth = callPackage ../development/python-modules/vapoursynth { + inherit (pkgs) vapoursynth; + }; + variants = callPackage ../development/python-modules/variants { }; varint = callPackage ../development/python-modules/varint { }; From b8607556565c9da484c833b88cc3a77bd21e3a7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 23:19:16 +0000 Subject: [PATCH 800/814] ghostunnel: 1.6.0 -> 1.6.1 --- pkgs/tools/networking/ghostunnel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix index f6986a1516b3..16350850163e 100644 --- a/pkgs/tools/networking/ghostunnel/default.nix +++ b/pkgs/tools/networking/ghostunnel/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "ghostunnel"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "ghostunnel"; repo = "ghostunnel"; rev = "v${version}"; - sha256 = "sha256-EE8gCm/gOp3lmCx1q4PahulipLoBZnEatNAVUXzHIVw="; + sha256 = "sha256-VameENcHZ6AttV0D8ekPGGFoMHTiTXAY2FxK/Nxwjmk="; }; - vendorSha256 = "sha256-XgmvqB1PCfL2gSDqwqauSixk8vlINHRmX6U0h9EXXdU="; + vendorSha256 = null; deleteVendor = true; From 4202fe6805c0e1ab325fce16676d07c6ef167ded Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 23:36:49 +0000 Subject: [PATCH 801/814] folly: 2022.05.23.00 -> 2022.06.13.00 --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index a3626feca9de..fdda2b3a6205 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.05.23.00"; + version = "2022.06.13.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-ti/aqVg6b3ZPEI72AZNo/4NrtlI/mKQb39tlTw+3VG4="; + sha256 = "sha256-30Fzk97wVK0JR/6YllyBjW9KlYrFj+GJpuV+V2bKXL8="; }; nativeBuildInputs = [ From cb808f498fd72af96ae3dfe87da5593d17ea4dc2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 Jun 2022 23:48:43 +0000 Subject: [PATCH 802/814] fswatch: 1.16.0 -> 1.17.0 --- pkgs/development/tools/misc/fswatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 5eb252a9c0e4..bf1784e08a02 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fswatch"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "sha256-EKbo5gkrWuijLJgYsNBDtxy0ioXu/yHxnPPeOpk620g="; + sha256 = "sha256-9xCp/SaqdUsVhOYr/QfAN/7RcRxsybCmfiO91vf3j40="; }; nativeBuildInputs = [ autoreconfHook makeWrapper ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; From 2a04d4cb5e053569e3b901178bf2c30c0f36e7ca Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 25 Jun 2022 17:44:03 -0400 Subject: [PATCH 803/814] lnx: init at unstable 2022-06-25 --- pkgs/servers/search/lnx/default.nix | 31 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/servers/search/lnx/default.nix diff --git a/pkgs/servers/search/lnx/default.nix b/pkgs/servers/search/lnx/default.nix new file mode 100644 index 000000000000..cda779ee2632 --- /dev/null +++ b/pkgs/servers/search/lnx/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, DiskArbitration +, Foundation +}: + +# unstable was chosen because of an added Cargo.lock +# revert to stable for the version after 0.9.0 +let version = "unstable-2022-06-25"; +in +rustPlatform.buildRustPackage { + pname = "lnx"; + inherit version; + src = fetchFromGitHub { + owner = "lnx-search"; + repo = "lnx"; + rev = "2cb80f344c558bfe37f21ccfb83265bf351419d9"; + sha256 = "sha256-iwoZ6xRzEDArmhWYxIrbIXRTQjOizyTsXCvMdnUrs2g="; + }; + cargoSha256 = "sha256-JpsZ37u3+4+X8knTxoGmJisopTsPR221rv3Bu4DMZZI="; + buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; + meta = with lib; { + description = "Insanely fast, Feature-rich searching. lnx is the adaptable, typo tollerant deployment of the tantivy search engine. Standing on the shoulders of giants. "; + homepage = "https://lnx.rs/"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f668ce3f8281..349eee9c2ec9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7709,6 +7709,10 @@ with pkgs; lnch = callPackage ../tools/misc/lnch { }; + lnx = callPackage ../servers/search/lnx { + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; + }; + loadlibrary = callPackage ../tools/misc/loadlibrary { }; loc = callPackage ../development/misc/loc { }; From 9cbb09f58f88201fdb1bbc9a2c11f70b869b19e5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 26 Jun 2022 09:52:27 +0800 Subject: [PATCH 804/814] opensbi: 1.0 -> 1.1 --- pkgs/misc/opensbi/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/opensbi/default.nix b/pkgs/misc/opensbi/default.nix index 3a3e9edf93a2..558f5c487ae1 100644 --- a/pkgs/misc/opensbi/default.nix +++ b/pkgs/misc/opensbi/default.nix @@ -6,15 +6,19 @@ stdenv.mkDerivation rec { pname = "opensbi"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "riscv-software-src"; repo = "opensbi"; rev = "v${version}"; - sha256 = "sha256-OgzcH+RLU680qF3+lUiWFFbif6YtjIknJriGlRqcOGs="; + sha256 = "sha256-k6f4/lWY/f7qqk0AFY4tdEi4cDilSv/jngaJYhKFlnY="; }; + postPatch = '' + patchShebangs ./scripts + ''; + installFlags = [ "I=$(out)" ]; From f89ccf732b1f0072f33f2e4217b956e06cd12b35 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Sat, 25 Jun 2022 22:08:20 -0400 Subject: [PATCH 805/814] pyserial: only disable on actually-unsupported versions --- pkgs/development/python-modules/pyserial/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix index 92ef636932fd..e6b8edb784aa 100644 --- a/pkgs/development/python-modules/pyserial/default.nix +++ b/pkgs/development/python-modules/pyserial/default.nix @@ -4,6 +4,7 @@ , fetchPypi , python , pythonOlder +, isPy3k }: buildPythonPackage rec { @@ -11,7 +12,8 @@ buildPythonPackage rec { version = "3.5"; format = "setuptools"; - disabled = pythonOlder "3.7"; + # Supports Python 2.7 and 3.4+ + disabled = isPy3k && pythonOlder "3.4"; src = fetchPypi { inherit pname version; From db524d11fdb0f885301ef966b3e52c54d704aebe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jun 2022 03:46:15 +0000 Subject: [PATCH 806/814] python310Packages.authcaptureproxy: 1.1.3 -> 1.1.4 --- .../development/python-modules/authcaptureproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index 11e1f444cb0b..d4a71d639c73 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "authcaptureproxy"; - version = "1.1.3"; + version = "1.1.4"; format = "pyproject"; src = fetchFromGitHub { owner = "alandtse"; repo = "auth_capture_proxy"; - rev = "v${version}"; - sha256 = "sha256-RD/8v3IQb50iGkU6zj5QfHXakjHdcCBWWAkXhCIF6qo="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-4IPBulzRoAAplyM/1MPE40IW4IXBIGYLydzpY64Gl0c="; }; postPatch = '' From ad116b8f6f8f4ba1bf3c2e863f943421573c8cab Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Jun 2022 13:53:59 +1000 Subject: [PATCH 807/814] mandown: remove maintainer --- pkgs/tools/misc/mandown/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/mandown/default.nix b/pkgs/tools/misc/mandown/default.nix index 08755ede14db..4851c764d0eb 100644 --- a/pkgs/tools/misc/mandown/default.nix +++ b/pkgs/tools/misc/mandown/default.nix @@ -15,6 +15,6 @@ rustPlatform.buildRustPackage rec { description = "Markdown to groff (man page) converter"; homepage = "https://gitlab.com/kornelski/mandown"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ zowoq ]; + maintainers = with maintainers; [ ]; }; } From d873c7c5d906c6bcbd05142cca536eceff007cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 26 Jun 2022 04:14:24 +0000 Subject: [PATCH 808/814] bzip3: 1.1.3 -> 1.1.4 --- pkgs/tools/compression/bzip3/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix index fa9b5d0845df..c265a54a9813 100644 --- a/pkgs/tools/compression/bzip3/default.nix +++ b/pkgs/tools/compression/bzip3/default.nix @@ -2,11 +2,12 @@ , stdenv , fetchFromGitHub , autoreconfHook +, pkg-config }: stdenv.mkDerivation rec { pname = "bzip3"; - version = "1.1.3"; + version = "1.1.4"; outputs = [ "bin" "dev" "out" ]; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { owner = "kspalaiologos"; repo = "bzip3"; rev = version; - hash = "sha256-puGtaL76p4BzSiTPf3qFgXN4pz90CDU9dziGIszk3to="; + hash = "sha256-rbJUvFm8WYgQLNpbX6kcXb5qAGAJfylTo4HgOvZVCu8="; }; postPatch = '' @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook + pkg-config ]; configureFlags = [ From ccde57bd8ae6fe85356c76f571a11febb9d45e7f Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Sat, 25 Jun 2022 10:24:17 +0800 Subject: [PATCH 809/814] python310Packages.cocotb: unbreak on Darwin - Disable lto, see issue #19098 - Replace `-bundle` in LDCXXSHARED env --- ...SHARED-for-macOS-along-with-LDSHARED.patch | 26 +++++++++++++++++++ .../python-modules/cocotb/default.nix | 10 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch diff --git a/pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch b/pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch new file mode 100644 index 000000000000..38ca864add3b --- /dev/null +++ b/pkgs/development/python-modules/cocotb/0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch @@ -0,0 +1,26 @@ +From 94c4768cd69b026e498d92133dd6c7d8589cf911 Mon Sep 17 00:00:00 2001 +From: Jiajie Chen +Date: Sat, 25 Jun 2022 10:19:44 +0800 +Subject: [PATCH] Patch LDCXXSHARED for macOS along with LDSHARED + +In Nixpkgs, we patched distutils to respect LDCXXSHARED environment, so +the replacement should be taken on LDCXXSHARED as well. +--- + cocotb_build_libs.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cocotb_build_libs.py b/cocotb_build_libs.py +index 66097ec2..d5555b36 100755 +--- a/cocotb_build_libs.py ++++ b/cocotb_build_libs.py +@@ -583,6 +583,7 @@ def get_ext(): + + if sys.platform == "darwin": + cfg_vars["LDSHARED"] = cfg_vars["LDSHARED"].replace("-bundle", "-dynamiclib") ++ cfg_vars["LDCXXSHARED"] = cfg_vars["LDCXXSHARED"].replace("-bundle", "-dynamiclib") + + share_lib_dir = os.path.relpath(os.path.join(cocotb_share_dir, "lib")) + include_dir = os.path.relpath(os.path.join(cocotb_share_dir, "include")) +-- +2.36.1 + diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index d24d3bc79822..83ed76ac8669 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -40,8 +40,17 @@ buildPythonPackage rec { # remove circular dependency cocotb-bus from setup.py substituteInPlace setup.py --replace "'cocotb-bus<1.0'" "" + '' + lib.optionalString stdenv.isDarwin '' + # disable lto on darwin + # https://github.com/NixOS/nixpkgs/issues/19098 + substituteInPlace cocotb_build_libs.py --replace "-flto" "" ''; + patches = [ + # Fix "can't link with bundle (MH_BUNDLE) only dylibs (MH_DYLIB) file" error + ./0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch + ]; + checkInputs = [ cocotb-bus pytestCheckHook swig verilog ]; checkPhase = '' @@ -53,6 +62,5 @@ buildPythonPackage rec { homepage = "https://github.com/cocotb/cocotb"; license = licenses.bsd3; maintainers = with maintainers; [ matthuszagh ]; - broken = stdenv.isDarwin; }; } From 63a221790f3f15aee8d1c19c1272b4c5ba27f8d9 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sun, 26 Jun 2022 15:20:28 +1000 Subject: [PATCH 810/814] clapper: remove workaround for undeclared gio-unix-2.0 As of upstream's commit "Fix missing gio-unix-2.0 dep" https://github.com/Rafostar/clapper/commit/2500a422860887d9d165af26731fe6199c3baa14 we no longer need to specify this ourselves. See https://github.com/NixOS/nixpkgs/issues/36468 for the NixOS-wide tracking of undeclared gio-unix-2.0 workarounds. --- pkgs/applications/video/clapper/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/applications/video/clapper/default.nix b/pkgs/applications/video/clapper/default.nix index fa8dd2bd3900..1600b1b4d8bb 100644 --- a/pkgs/applications/video/clapper/default.nix +++ b/pkgs/applications/video/clapper/default.nix @@ -65,11 +65,6 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/postinstall.py ''; - mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" - ]; - postInstall = '' cp ${src}/data/icons/*.svg $out/share/icons/hicolor/scalable/apps/ cp ${src}/data/icons/*.svg $out/share/icons/hicolor/symbolic/apps/ From dc08c93d54f4f49cb73b33913bde75ccda54b32c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Jun 2022 17:26:21 +1000 Subject: [PATCH 811/814] terraform: remove outdated aliases --- pkgs/top-level/aliases.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bd19a8d3059d..ba811bbcc3e1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1370,12 +1370,6 @@ mapAliases ({ telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22 telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22 terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21 - terraform-provider-ibm = throw "'terraform-provider-ibm' has been renamed to/replaced by 'terraform-providers.ibm'"; # Converted to throw 2022-02-22 - terraform-provider-libvirt = throw "'terraform-provider-libvirt' has been renamed to/replaced by 'terraform-providers.libvirt'"; # Converted to throw 2022-02-22 - terraform-provider-lxd = terraform-providers.lxd; # Added 2020-03-16 - terraform_0_12 = throw "terraform_0_12 has been removed from nixpkgs on 2021/01"; - terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # Added 2021-12-08 - terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # Added 2021-06-15 tesseract_4 = throw "'tesseract_4' has been renamed to/replaced by 'tesseract4'"; # Converted to throw 2022-02-22 testVersion = testers.testVersion; # Added 2022-04-20 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 From 584db216dba55ec77ffb469f4efc0cb25dc824f0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Jun 2022 17:25:38 +1000 Subject: [PATCH 812/814] terraform: remove 0_13, 0_14, 0_15 --- .../networking/cluster/terraform/default.nix | 23 ------------------- .../cluster/terraform/provider-path.patch | 16 ------------- pkgs/top-level/aliases.nix | 3 +++ pkgs/top-level/all-packages.nix | 3 --- 4 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform/provider-path.patch diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index a281505e0ec6..9bc29755ddb9 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,29 +168,6 @@ rec { # Constructor for other terraform versions mkTerraform = attrs: pluggable (generic attrs); - terraform_0_13 = mkTerraform { - version = "0.13.7"; - sha256 = "1cahnmp66dk21g7ga6454yfhaqrxff7hpwpdgc87cswyq823fgjn"; - patches = [ ./provider-path.patch ]; - passthru = { inherit plugins; }; - }; - - terraform_0_14 = mkTerraform { - version = "0.14.11"; - sha256 = "1yi1jj3n61g1kn8klw6l78shd23q79llb7qqwigqrx3ki2mp279j"; - vendorSha256 = "sha256-tWrSr6JCS9s+I0T1o3jgZ395u8IBmh73XGrnJidWI7U="; - patches = [ ./provider-path.patch ]; - passthru = { inherit plugins; }; - }; - - terraform_0_15 = mkTerraform { - version = "0.15.5"; - sha256 = "18f4a6l24s3cym7gk40agxikd90i56q84wziskw1spy9rgv2yx6d"; - vendorSha256 = "sha256-oFvoEsDunJR4IULdGwS6nHBKWEgUehgT+nNM41W/GYo="; - patches = [ ./provider-path-0_15.patch ]; - passthru = { inherit plugins; }; - }; - terraform_1 = mkTerraform { version = "1.2.3"; sha256 = "sha256-hkPlufjlvmI5tKz1VTY5RztuDKEsgjrLR+f7HRrJmkA="; diff --git a/pkgs/applications/networking/cluster/terraform/provider-path.patch b/pkgs/applications/networking/cluster/terraform/provider-path.patch deleted file mode 100644 index 39a69e4a389f..000000000000 --- a/pkgs/applications/networking/cluster/terraform/provider-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/command/init.go b/command/init.go -index 403ca245b..05d98329a 100644 ---- a/command/init.go -+++ b/command/init.go -@@ -64,6 +64,11 @@ func (c *InitCommand) Run(args []string) int { - return 1 - } - -+ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR") -+ if ok { -+ flagPluginPath = append(flagPluginPath, val) -+ } -+ - if len(flagPluginPath) > 0 { - c.pluginPath = flagPluginPath - c.getPlugins = false diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ba811bbcc3e1..11aa7b335e53 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1370,6 +1370,9 @@ mapAliases ({ telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22 telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22 terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21 + terraform_0_13 = throw "terraform_0_13 has been removed from nixpkgs"; # Added 2022-06-26 + terraform_0_14 = throw "terraform_0_14 has been removed from nixpkgs"; # Added 2022-06-26 + terraform_0_15 = throw "terraform_0_15 has been removed from nixpkgs"; # Added 2022-06-26 tesseract_4 = throw "'tesseract_4' has been renamed to/replaced by 'tesseract4'"; # Converted to throw 2022-02-22 testVersion = testers.testVersion; # Added 2022-04-20 invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45a89043efa6..b0cb9592462f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34956,9 +34956,6 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform { }) mkTerraform - terraform_0_13 - terraform_0_14 - terraform_0_15 terraform_1 terraform_plugins_test ; From 5fb0d258ea9db65345006fb33c2ea191c3014656 Mon Sep 17 00:00:00 2001 From: Bill Ewanick Date: Sun, 26 Jun 2022 00:08:11 -0400 Subject: [PATCH 813/814] lemmy: 0.15.1 -> 0.16.4 --- pkgs/servers/web-apps/lemmy/package.json | 70 ++++++++++++------------ pkgs/servers/web-apps/lemmy/pin.json | 10 ++-- pkgs/servers/web-apps/lemmy/server.nix | 4 +- 3 files changed, 43 insertions(+), 41 deletions(-) diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json index bb7dc863d5bb..934cccd205f7 100644 --- a/pkgs/servers/web-apps/lemmy/package.json +++ b/pkgs/servers/web-apps/lemmy/package.json @@ -1,7 +1,7 @@ { "name": "lemmy-ui", "description": "An isomorphic UI for lemmy", - "version": "0.15.1", + "version": "0.16.4", "author": "Dessalines ", "license": "AGPL-3.0", "scripts": { @@ -17,14 +17,14 @@ }, "repository": "https://github.com/LemmyNet/lemmy-ui", "dependencies": { - "@typescript-eslint/parser": "^5.6.0", + "@typescript-eslint/parser": "^5.21.0", "autosize": "^5.0.1", - "check-password-strength": "^2.0.3", - "choices.js": "^10.0.0", + "check-password-strength": "^2.0.5", + "choices.js": "^10.1.0", "classnames": "^2.3.1", - "emoji-short-name": "^1.0.0", - "express": "~4.17.1", - "i18next": "^21.5.4", + "emoji-short-name": "^2.0.0", + "express": "~4.18.0", + "i18next": "^21.6.16", "inferno": "^7.4.11", "inferno-create-element": "^7.4.11", "inferno-helmet": "^5.2.1", @@ -34,15 +34,16 @@ "inferno-server": "^7.4.11", "isomorphic-cookie": "^1.2.4", "jwt-decode": "^3.1.2", - "markdown-it": "^12.1.0", + "markdown-it": "^13.0.0", "markdown-it-container": "^3.0.0", + "markdown-it-footnote": "^3.0.3", "markdown-it-html5-embed": "^1.0.0", "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", - "moment": "^2.29.1", + "moment": "^2.29.3", "register-service-worker": "^1.7.2", - "rxjs": "^7.4.0", - "sass": "^1.47.0", + "rxjs": "^7.5.5", + "sass": "^1.51.0", "serialize-javascript": "^6.0.0", "tippy.js": "^6.3.7", "toastify-js": "^1.11.2", @@ -50,48 +51,47 @@ "websocket-ts": "^1.1.1" }, "devDependencies": { - "@babel/core": "^7.16.0", - "@babel/plugin-transform-runtime": "^7.16.4", + "@babel/core": "^7.17.9", + "@babel/plugin-transform-runtime": "^7.17.0", "@babel/plugin-transform-typescript": "^7.16.1", - "@babel/preset-env": "7.16.8", + "@babel/preset-env": "7.16.11", "@babel/preset-typescript": "^7.16.0", - "@babel/runtime": "^7.16.3", + "@babel/runtime": "^7.17.9", "@types/autosize": "^4.0.0", "@types/express": "^4.17.13", - "@types/node": "^17.0.8", - "@types/node-fetch": "^2.5.11", + "@types/node": "^17.0.29", + "@types/node-fetch": "^2.6.1", "@types/serialize-javascript": "^5.0.1", - "@typescript-eslint/eslint-plugin": "^5.6.0", - "babel-loader": "^8.2.3", - "babel-plugin-inferno": "^6.3.0", + "@typescript-eslint/eslint-plugin": "^5.21.0", + "babel-loader": "^8.2.5", + "babel-plugin-inferno": "^6.4.0", "bootstrap": "^5.1.3", "bootswatch": "^5.1.3", "clean-webpack-plugin": "^4.0.0", - "copy-webpack-plugin": "^10.0.0", - "css-loader": "^6.5.1", - "eslint": "^8.4.0", + "copy-webpack-plugin": "^10.2.4", + "css-loader": "^6.7.1", + "eslint": "^8.14.0", "eslint-plugin-prettier": "^4.0.0", "husky": "^7.0.4", "import-sort-style-module": "^6.0.0", - "iso-639-1": "^2.1.10", - "lemmy-js-client": "0.15.0", - "lint-staged": "^12.1.2", - "mini-css-extract-plugin": "^2.4.5", + "lemmy-js-client": "0.16.4", + "lint-staged": "^12.4.1", + "mini-css-extract-plugin": "^2.6.0", "node-fetch": "^2.6.1", - "prettier": "^2.5.1", + "prettier": "^2.6.2", "prettier-plugin-import-sort": "^0.0.7", "prettier-plugin-organize-imports": "^2.3.4", - "prettier-plugin-packagejson": "^2.2.15", + "prettier-plugin-packagejson": "^2.2.17", "rimraf": "^3.0.2", "run-node-webpack-plugin": "^1.3.0", - "sass-loader": "^12.3.0", + "sass-loader": "^12.6.0", "sortpack": "^2.2.0", "style-loader": "^3.3.1", - "terser": "^5.10.0", - "typescript": "^4.5.2", - "webpack": "5.66.0", - "webpack-cli": "^4.9.1", - "webpack-dev-server": "4.7.3", + "terser": "^5.13.0", + "typescript": "^4.6.3", + "webpack": "5.72.0", + "webpack-cli": "^4.9.2", + "webpack-dev-server": "4.8.1", "webpack-node-externals": "^3.0.0" }, "engines": { diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index 9a588b54da99..c22c821f5db3 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,7 +1,7 @@ { - "version": "0.15.1", - "serverSha256": "sha256-HHr9mG0AuI/86+EjODE/GT9lhl5DeNkzQ4k077b7ICU=", - "serverCargoSha256": "sha256-ErMNsyHfBiYZA4gjaxPHO+fQseUVIKy/928oGqw+Adg=", - "uiSha256": "sha256-Al6Q1xXkjqIb2v2S4JbmlQAAFCKwzkAW924uolC0tu8=", - "uiYarnDepsSha256": "sha256-Zadp74ZHmbxCHxpDAYOa6Ot2kWujIj8ZzrSaIEsYgMY=" + "version": "0.16.4", + "serverSha256": "sha256-xbxavlmRm7QTbrAjw6IMgQq8rEgyEHdcj11EhsOY+j0=", + "serverCargoSha256": "sha256-vDIaLpw0C6fnv0quH20qRN0I38Br338+MS9YzVfNizU=", + "uiSha256": "sha256-GZH/fSYLbxwigrr5LwAzxH4ElDVjTs8Tqqq+xYDFNCU", + "uiYarnDepsSha256": "sha256-BQs9UXUT/CcxJ7CdLksYGvGPGAaW7FLUAShLsbPC0jw=" } diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 5526d8fe31f3..52dddc8183c0 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -7,6 +7,7 @@ , libiconv , Security , protobuf +, rustfmt }: let pinData = lib.importJSON ./pin.json; @@ -21,6 +22,7 @@ rustPlatform.buildRustPackage rec { repo = "lemmy"; rev = version; sha256 = pinData.serverSha256; + fetchSubmodules = true; }; cargoSha256 = pinData.serverCargoSha256; @@ -37,7 +39,7 @@ rustPlatform.buildRustPackage rec { PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; - nativeBuildInputs = [ protobuf ]; + nativeBuildInputs = [ protobuf rustfmt ]; passthru.updateScript = ./update.sh; From 659096dd89da4419200b917567f97906805b3131 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 26 Jun 2022 12:03:01 +0100 Subject: [PATCH 814/814] nixos/fontconfig: add fonts.fontconfig.hinting.style option --- nixos/modules/config/fonts/fontconfig.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 1e68fef7ce74..a10a8c6428a1 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -65,7 +65,7 @@ let ${fcBool cfg.hinting.autohint} - hintslight + ${cfg.hinting.style} ${fcBool cfg.antialias} @@ -226,7 +226,6 @@ in (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ]) (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ]) (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ]) - (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "dpi" ] "Use display server-specific options") @@ -349,6 +348,20 @@ in fonts, but better than unhinted fonts. ''; }; + + style = mkOption { + type = types.enum [ "hintnone" "hintslight" "hintmedium" "hintfull" ]; + default = "hintslight"; + description = '' + Hintstyle is the amount of font reshaping done to line up + to the grid. + + hintslight will make the font more fuzzy to line up to the grid + but will be better in retaining font shape, while hintfull will + be a crisp font that aligns well to the pixel grid but will lose + a greater amount of font shape. + ''; + }; }; includeUserConf = mkOption {