From 3dd348cca9f60717cee2568b1cd83b11901e9777 Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Sat, 28 May 2022 04:45:42 +0300 Subject: [PATCH 001/173] footswitch: 20201-03-17 -> 2022-04-12 --- pkgs/tools/inputmethods/footswitch/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/inputmethods/footswitch/default.nix b/pkgs/tools/inputmethods/footswitch/default.nix index 9cfdbd393bd9..a01069c9284f 100644 --- a/pkgs/tools/inputmethods/footswitch/default.nix +++ b/pkgs/tools/inputmethods/footswitch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "footswitch"; - version = "unstable-20201-03-17"; + version = "unstable-2022-04-12"; src = fetchFromGitHub { owner = "rgerganov"; repo = "footswitch"; - rev = "aa0b10f00d3e76dac27b55b88c8d44c0c406f7f0"; - sha256 = "sha256-SikYiBN7jbH5I1x5wPCF+buwFp1dt35cVxAN6lWkTN0="; + rev = "1cf63643e18e688e4ebe96451db24edf52338cc0"; + sha256 = "0gfvi2wgrljndyz889cjjh2q13994fnaf11n7hpdd82c4wgg06kj"; }; nativeBuildInputs = [ pkg-config ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation { substituteInPlace Makefile \ --replace /usr/local $out \ --replace /usr/bin/install install \ - --replace /etc/udev/rules.d $out/lib/udev/rules.d + --replace /etc/udev $out/lib/udev ''; preInstall = '' From c15d568d0bb61747ca038c2aee0ae829f31386cd Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Mon, 30 May 2022 10:53:40 +0200 Subject: [PATCH 002/173] iqtree: init at 2.2.0.4 --- .../science/biology/iqtree/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/science/biology/iqtree/default.nix diff --git a/pkgs/applications/science/biology/iqtree/default.nix b/pkgs/applications/science/biology/iqtree/default.nix new file mode 100644 index 000000000000..0d567733f923 --- /dev/null +++ b/pkgs/applications/science/biology/iqtree/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, eigen +, zlib +}: + +stdenv.mkDerivation rec { + pname = "iqtree"; + version = "2.2.0.4"; + + src = fetchFromGitHub { + owner = "iqtree"; + repo = "iqtree2"; + rev = "v${version}"; + sha256 = "sha256:0ickw1ldpvv2m66yzbvqfhn8k07qdkhbjrlqjs6vcf3s42j5c6pq"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boost eigen zlib ]; + + meta = with lib; { + homepage = "http://www.iqtree.org/"; + description = "Efficient and versatile phylogenomic software by maximum likelihood"; + license = licenses.lgpl2; + maintainers = with maintainers; [ bzizou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97e824dbd049..63b7f1a3f650 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32805,6 +32805,8 @@ with pkgs; inormalize = callPackage ../applications/science/biology/inormalize { }; + iqtree = callPackage ../applications/science/biology/iqtree { }; + itsx = callPackage ../applications/science/biology/itsx { }; iv = callPackage ../applications/science/biology/iv { From b391f5ff2a59e59bba578c896bcef38585271367 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Jun 2022 08:23:00 +0000 Subject: [PATCH 003/173] manuskript: 0.13.1 -> 0.14.0 --- pkgs/applications/editors/manuskript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index d0733eb5aa80..55f58ebf5c69 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -2,15 +2,15 @@ python3Packages.buildPythonApplication rec { pname = "manuskript"; - version = "0.13.1"; + version = "0.14.0"; format = "other"; src = fetchFromGitHub { repo = pname; owner = "olivierkes"; - rev = version; - hash = "sha256-TEmAamNdqBK7bu62tLtJl05wBI6hga84PQSrWiMPROY="; + rev = "refs/tags/${version}"; + hash = "sha256-mWLkah4eO1i5sp79xGLCIkr26TpbXxuVxIJ6gudKGWI="; }; nativeBuildInputs = [ wrapQtAppsHook ]; From 930c2f308e074258702b357d28489bcc9cff48c7 Mon Sep 17 00:00:00 2001 From: Joel Date: Sat, 11 Jun 2022 08:30:54 +1000 Subject: [PATCH 004/173] lunar-client: 2.10.0 -> 2.10.1 --- pkgs/games/lunar-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix index 17df2565b866..8bb2e0d0a6fa 100644 --- a/pkgs/games/lunar-client/default.nix +++ b/pkgs/games/lunar-client/default.nix @@ -2,7 +2,7 @@ let name = "lunar-client"; - version = "2.10.0"; + version = "2.10.1"; desktopItem = makeDesktopItem { name = "lunar-client"; @@ -21,7 +21,7 @@ let src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; name = "lunar-client.AppImage"; - sha256 = "1kfi3rgy401ll3gn9k30j0a1zds1ghl5g2ibfwlsnr826nckfmzw"; + hash = "sha256-3h2FFpIIRta6hEsa/H0xo8+DUvhdQyBv9dqdd/vlwZ4="; }; in appimageTools.wrapType1 rec { From d678accdf871a0ec007953af177ee46ee8674edc Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 19 Jun 2022 15:04:28 -0400 Subject: [PATCH 005/173] ufiformat: init at 0.9.9 --- pkgs/tools/system/ufiformat/default.nix | 29 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/system/ufiformat/default.nix diff --git a/pkgs/tools/system/ufiformat/default.nix b/pkgs/tools/system/ufiformat/default.nix new file mode 100644 index 000000000000..5b778c5230e3 --- /dev/null +++ b/pkgs/tools/system/ufiformat/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, e2fsprogs +, fetchFromGitHub +, lib +}: + +stdenv.mkDerivation rec { + pname = "ufiformat"; + version = "0.9.9"; + + buildInputs = [ + e2fsprogs + ]; + + src = fetchFromGitHub { + owner = "tedigh"; + repo = "ufiformat"; + rev = "v${version}"; + sha256 = "heFETZj9migz2s9kvmw0ZQ1ieNpU4V4Lwfp91ek2cS4="; + }; + + meta = with lib; { + homepage = "https://github.com/tedigh/ufiformat"; + description = "Low-level disk formatting utility for USB floppy drives"; + maintainers = [ maintainers.amarshall ]; + platforms = platforms.linux; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f32d5264aebb..07f0fcadc679 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34943,6 +34943,8 @@ with pkgs; uacme = callPackage ../tools/admin/uacme { }; + ufiformat = callPackage ../tools/system/ufiformat { }; + ums = callPackage ../servers/ums { }; unityhub = callPackage ../development/tools/unityhub { }; From e43319d045acf4a4f2f9bb12b5d41393c1a18ebb Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 23 Jun 2022 17:09:25 +0200 Subject: [PATCH 006/173] avizo: 1.2 -> 1.2.1 https://github.com/misterdanb/avizo/releases/tag/1.2.1 --- pkgs/applications/misc/avizo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/avizo/default.nix b/pkgs/applications/misc/avizo/default.nix index d4808829586b..eefb3514d2e0 100644 --- a/pkgs/applications/misc/avizo/default.nix +++ b/pkgs/applications/misc/avizo/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "avizo"; - version = "1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "misterdanb"; repo = "avizo"; rev = version; - sha256 = "sha256-BRtdCOBFsKkJif/AlnF7N9ZDcmA+878M9lDQld+SAgo="; + sha256 = "sha256-ainU4nXWFp1udVujPHZUeWIfJE4RrjU1hn9J17UuuzU="; }; nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook ]; From 4936e482aca2f5d56da98e3bb8b1378837b07a85 Mon Sep 17 00:00:00 2001 From: CactiChameleon9 <51231053+CactiChameleon9@users.noreply.github.com> Date: Sat, 25 Jun 2022 08:34:35 +0100 Subject: [PATCH 007/173] maintainers: add CactiChameleon9 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 377777993059..c793af1c35f5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1964,6 +1964,12 @@ githubId = 1516457; name = "Christian Albrecht"; }; + CactiChameleon9 = { + email = "h19xjkkp@duck.com"; + github = "CactiChameleon9"; + githubId = 51231053; + name = "Daniel"; + }; callahad = { email = "dan.callahan@gmail.com"; github = "callahad"; From 8be83b166332bcbb9256ac5407145eb9a9bfe9eb Mon Sep 17 00:00:00 2001 From: CactiChameleon9 <51231053+CactiChameleon9@users.noreply.github.com> Date: Sat, 25 Jun 2022 09:36:56 +0100 Subject: [PATCH 008/173] pingu: init at 0.0.3 --- pkgs/tools/networking/pingu/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/networking/pingu/default.nix diff --git a/pkgs/tools/networking/pingu/default.nix b/pkgs/tools/networking/pingu/default.nix new file mode 100644 index 000000000000..87b20daf9795 --- /dev/null +++ b/pkgs/tools/networking/pingu/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pingu"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "sheepla"; + repo = "pingu"; + rev = "v${version}"; + sha256 = "sha256-KYCG3L5x0ZdcyseffB0GoKpLZ/VG/qjMDh10qrLn62Y="; + }; + + vendorSha256 = "sha256-HkESF/aADGPixOeh+osFnjzhpz+/4NIsJOjpyyFF9Eg="; + + meta = with lib; { + description = "Ping command implementation in Go but with colorful output and pingu ascii art"; + homepage = "https://github.com/sheepla/pingu/"; + license = licenses.mit; + maintainers = with maintainers; [ CactiChameleon9 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da373b207d7a..f07eaf16c359 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9469,6 +9469,8 @@ with pkgs; pingtcp = callPackage ../tools/networking/pingtcp { }; + pingu = callPackage ../tools/networking/pingu { }; + pinnwand = callPackage ../servers/pinnwand { }; pinsel = callPackage ../tools/misc/pinsel { }; From 1639e10d340d638bda0f14dd69060d8470c4da02 Mon Sep 17 00:00:00 2001 From: Giacomo Date: Sun, 26 Jun 2022 23:35:42 +0200 Subject: [PATCH 009/173] Update perseus new url --> http://people.maths.ox.ac.uk/nanda/perseus/index.html add NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; # Otherwise it does not compile --- pkgs/applications/science/math/perseus/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index 4545203dacca..a9cf6e1b018d 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation { hardeningDisable = [ "stackprotector" ]; src = fetchurl { - url = "http://www.sas.upenn.edu/~vnanda/source/perseus_4_beta.zip"; - sha256 = "09brijnqabhgfjlj5wny0bqm5dwqcfkp1x5wif6yzdmqh080jybj"; + url = "http://people.maths.ox.ac.uk/nanda/source/perseus_4_beta.zip"; + sha256 = "sha256-cnkJEIC4tu+Ni7z0cKdjmLdS8QLe8iKpdA8uha2MeSU="; }; sourceRoot = "."; - + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; # Otherwise it does not compile buildPhase = '' g++ Pers.cpp -O3 -fpermissive -o perseus ''; @@ -32,9 +32,9 @@ stdenv.mkDerivation { around datasets arising from point samples, images, distance matrices and so forth. ''; - homepage = "http://www.sas.upenn.edu/~vnanda/perseus/index.html"; + homepage = "http://people.maths.ox.ac.uk/nanda/perseus/index.html"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ erikryb ]; + maintainers = with lib.maintainers; [ erikryb mrbitt ]; platforms = lib.platforms.linux; }; } From 923e4415d26da2db76229c1ab10c5a4be5752746 Mon Sep 17 00:00:00 2001 From: Giacomo Date: Sun, 26 Jun 2022 23:50:03 +0200 Subject: [PATCH 010/173] Update perseus add space in line 17 --- pkgs/applications/science/math/perseus/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index a9cf6e1b018d..353d6691a9c9 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation { }; sourceRoot = "."; + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; # Otherwise it does not compile + buildPhase = '' g++ Pers.cpp -O3 -fpermissive -o perseus ''; From cd52b6d893c50f464d618a079e37253572fda102 Mon Sep 17 00:00:00 2001 From: Giacomo Date: Mon, 27 Jun 2022 00:27:46 +0200 Subject: [PATCH 011/173] Update delete mrbitt maintainers --- pkgs/applications/science/math/perseus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index 353d6691a9c9..5c1ed3e0a939 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; homepage = "http://people.maths.ox.ac.uk/nanda/perseus/index.html"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ erikryb mrbitt ]; + maintainers = with lib.maintainers; [ erikryb ]; platforms = lib.platforms.linux; }; } From 22bccbcd9780c39ab08f4791e1de401b306a3923 Mon Sep 17 00:00:00 2001 From: Giacomo Date: Mon, 27 Jun 2022 10:08:55 +0200 Subject: [PATCH 012/173] Update perseus delete space --- pkgs/applications/science/math/perseus/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index 5c1ed3e0a939..d9921e68edb1 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -13,9 +13,7 @@ stdenv.mkDerivation { }; sourceRoot = "."; - - NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; # Otherwise it does not compile - + NIX_CFLAGS_COMPILE = [ "-std=c++14" ]; buildPhase = '' g++ Pers.cpp -O3 -fpermissive -o perseus ''; From cddb7a9d3b7b5de1f101ab859ed86a06c8ffc5c4 Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Wed, 29 Jun 2022 14:20:35 +0100 Subject: [PATCH 013/173] freesweep: 1.0.1 -> 1.0.2 --- pkgs/games/freesweep/default.nix | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix index b0d556914fa7..b94b1fda062b 100644 --- a/pkgs/games/freesweep/default.nix +++ b/pkgs/games/freesweep/default.nix @@ -3,34 +3,15 @@ stdenv.mkDerivation rec { pname = "freesweep"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "rwestlund"; repo = "freesweep"; rev = "v${version}"; - sha256 = "0grkwmz9whg1vlnk6gbr0vv9i2zgbd036182pk0xj4cavaj9rpjb"; + hash = "sha256-iuu81yHbNrjdPsimBrPK58PJ0d8i3ySM7rFUG/d8NJM"; }; - patches = [ - # Pull fix pending upstream inclusion for -fno-common toolchains - # like upstream gcc-10+ or clang-13: - # https://github.com/rwestlund/freesweep/pull/8 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/rwestlund/freesweep/commit/a86245df4f3ff276a393f799d737d28a5cb0a5a8.patch"; - sha256 = "13gs3bjb68ixyn9micza7gjd489rd2f5pdrv6sip9fsa6ya29xky"; - }) - - # Pull fix pending upstream inclusion for ncurses-6.3: - # https://github.com/rwestlund/freesweep/pull/10 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/rwestlund/freesweep/commit/b0aef2bd0b2409d1e859af7d29bf2d86fc7bcea7.patch"; - sha256 = "1nzvmvxhjxgm8228h1zz16w62iy6lak5sibif1s1f6p1ssn659jp"; - }) - ]; - nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; buildInputs = [ ncurses ]; From b1b7d683c602af1cefa71c7fb60c05376c0539d9 Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Wed, 29 Jun 2022 14:35:07 +0100 Subject: [PATCH 014/173] freesweep: enable parallel build --- pkgs/games/freesweep/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix index b94b1fda062b..7fe48d1baf00 100644 --- a/pkgs/games/freesweep/default.nix +++ b/pkgs/games/freesweep/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { configureFlags="$configureFlags --with-prefsdir=$out/share" ''; + enableParallelBuilding = true; + installPhase = '' runHook preInstall install -D -m 0555 freesweep $out/bin/freesweep From fb609df70883e1612aacc618e8a96586f62da307 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Jul 2022 20:34:30 +0000 Subject: [PATCH 015/173] python310Packages.sphinxcontrib-plantuml: 0.23 -> 0.24 --- .../python-modules/sphinxcontrib-plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index df05cd27364b..20f182b55baf 100644 --- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.23"; + version = "0.24"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HVVRjwqG7NbJa6j/jIhK3KBbrD5Y52ppKjzRmqf0Ks8="; + sha256 = "sha256-z2Xbc1j3haZJjuA+cZi2aAxiXSjlWzNHX8P2yUNRRR0="; }; # No tests included. From bd3e665a6f59d1afdcf76a38a2b9a886121bdc37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 05:35:23 +0000 Subject: [PATCH 016/173] cherrytree: 0.99.47 -> 0.99.48 --- pkgs/applications/misc/cherrytree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 23bf35a30b39..7975ee16698a 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.47"; + version = "0.99.48"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "sha256-qKBf/7DBIpK1o/xlDlWeVXkSSV5a3y9hoWsAzeTIsf4="; + sha256 = "sha256-mNWep+ZMQzb2PBHgzUKRpfMhP0ok1RZiuIoyH3P7+TI="; }; nativeBuildInputs = [ From 41bb9c6d6d2c2c9222b213a026820b8c7bae8855 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 07:26:53 +0000 Subject: [PATCH 017/173] dapper: 0.5.8 -> 0.6.0 --- pkgs/development/tools/dapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/dapper/default.nix b/pkgs/development/tools/dapper/default.nix index 8e3160b4cddc..d2b36efdaedc 100644 --- a/pkgs/development/tools/dapper/default.nix +++ b/pkgs/development/tools/dapper/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dapper"; - version = "0.5.8"; + version = "0.6.0"; src = fetchFromGitHub { owner = "rancher"; repo = "dapper"; rev = "v${version}"; - sha256 = "sha256-t1w8bhwCjZHmvgBG6Tv8kgqTbC7v5P5QOvJGuTJUC04="; + sha256 = "sha256-V+lHnOmIWjI1qmoJ7+pp+cGmJAtSeY+r2I9zykswQzM="; }; vendorSha256 = null; From 1456316b1567e14722e37965d03ad4afe4c930cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Jul 2022 01:21:53 +0000 Subject: [PATCH 018/173] catcli: 0.8.1 -> 0.8.2 --- pkgs/tools/filesystems/catcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index dbce4cb7c8c1..663aecfcbb16 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "catcli"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-fnnioUMZZZOydpZixiTOHAL2fSA6TOE4AO9Gff5SDxY="; + sha256 = "sha256-IHHlxF/7U7C+wO6YicesZPFV6BSBmdkPWaZn7awplNk="; }; propagatedBuildInputs = [ docopt anytree ]; From 6f3abbd21df1a7d139d25cfba11be7dba0d0d418 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 17 Jul 2022 20:48:52 +0200 Subject: [PATCH 019/173] python3Packages.pdoc: init at 12.0.2 --- .../python-modules/pdoc/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/pdoc/default.nix diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix new file mode 100644 index 000000000000..2572b8c04611 --- /dev/null +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchPypi +, fetchFromGitHub +, jinja2 +, pygments +, markupsafe +, astunparse +, pytestCheckHook +, hypothesis +}: + +buildPythonPackage rec { + pname = "pdoc"; + version = "12.0.2"; + disabled = pythonOlder "3.7"; + + # the Pypi version does not include tests + src = fetchFromGitHub { + owner = "mitmproxy"; + repo = "pdoc"; + rev = "v${version}"; + sha256 = "FVfPO/QoHQQqg7QU05GMrrad0CbRR5AQVYUpBhZoRi0="; + }; + + propagatedBuildInputs = [ + jinja2 + pygments + markupsafe + ] ++ lib.optional (pythonOlder "3.9") astunparse; + + checkInputs = [ + pytestCheckHook + hypothesis + ]; + disabledTests = [ + # Failing "test_snapshots" parametrization: Output does not match the stored snapshot + # This test seems to be sensitive to ordering of dictionary items and the version of dependencies. + # the only difference between the stored snapshot and the produced documentation is a debug javascript comment + "html-demopackage_dir" + ]; + pytestFlagsArray = [ + ''-m "not slow"'' # skip tests marked slow + ]; + + pythonImportsCheck = [ "pdoc" ]; + + meta = with lib; { + homepage = "https://pdoc.dev/"; + description = "API Documentation for Python Projects"; + license = licenses.unlicense; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34cced4ec221..48112b1033cb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6406,6 +6406,8 @@ in { pdm-pep517 = callPackage ../development/python-modules/pdm-pep517 { }; + pdoc = callPackage ../development/python-modules/pdoc { }; + pdoc3 = callPackage ../development/python-modules/pdoc3 { }; peaqevcore = callPackage ../development/python-modules/peaqevcore { }; From b6739f8ebd6fd09daef8e2ad6133e23209286233 Mon Sep 17 00:00:00 2001 From: Serhii Zhuravel Date: Mon, 4 Jul 2022 22:21:06 +0300 Subject: [PATCH 020/173] termius: 7.42.1 -> 7.45.3 --- pkgs/applications/networking/termius/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 6a8960367be7..e349cf0db141 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "7.42.1"; + version = "7.45.3"; src = fetchurl { # find the latest version with @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r - url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_117.snap"; - sha512 = "1e9a6e14a7046a8297c9f067211257cfbbe4dc121ddf4123271ddb96eccbfa504b6e0d05de2077326127ae1d0b2e571c232125e51bfaa1ef82d6cbf9355f13e6"; + url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_123.snap"; + sha512 = "1a43ece6ccb0f5a7b29a3ff0c41f27b0d82bd90214cc3d0b88dbd57ecaf2f59c092906e7ed377e3d04f2fc418027f7a0cb7f2e4458ef619663b84b080581c375"; }; desktopItem = makeDesktopItem { From fd20ff8a464c7ee6ccaa9984f5a38b32864605ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Jul 2022 03:00:03 +0000 Subject: [PATCH 021/173] tagainijisho: 1.2.0 -> 1.2.1 --- pkgs/applications/office/tagainijisho/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 7211d4f9e562..0c913cd7df20 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -1,11 +1,11 @@ { lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }: mkDerivation rec { pname = "tagainijisho"; - version = "1.2.0"; + version = "1.2.1"; src = fetchzip { url = "https://github.com/Gnurou/tagainijisho/releases/download/${version}/tagainijisho-${version}.tar.gz"; - hash = "sha256-fLq4Wfpa7Wr62KvHztgLiXE8eopCq+wipgabFm2bq6w="; + hash = "sha256-NYmvkjGl+lgFh4PPWGxitupYJ2DOyCBAYlITGb3FMj8="; }; nativeBuildInputs = [ cmake ]; From 424911a03efd255e6a8c87d418831410746665dc Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 2 Aug 2022 15:37:48 +0200 Subject: [PATCH 022/173] dokuwiki: 2020-07-29 -> 2022-07-31 --- pkgs/servers/web-apps/dokuwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix index 7126c5b096e8..439576ed8100 100644 --- a/pkgs/servers/web-apps/dokuwiki/default.nix +++ b/pkgs/servers/web-apps/dokuwiki/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dokuwiki"; - version = "2020-07-29"; + version = "2022-07-31"; src = fetchFromGitHub { owner = "splitbrain"; repo = pname; rev = "release_stable_${version}"; - sha256 = "09swcqyd06l3481k190gmlr3b33dlv1lw1kk9nyh5b4sa5p3k7kk"; + sha256 = "sha256-FreJsajdfoefQHo6rBzkImDUvR3Zb7rBQTYhYvyRJC4="; }; preload = writeText "preload.php" '' From 4c258245ec559edf6cf72e657a225acbcb3352e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Aug 2022 22:33:13 +0000 Subject: [PATCH 023/173] precice: 2.4.0 -> 2.5.0 --- pkgs/development/libraries/precice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index 60c026b36004..bc6a9359e614 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "precice"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "precice"; repo = pname; rev = "v${version}"; - sha256 = "0qmwdxpbmy4dvjxav3dls18qns734j0yfvxvjrh1nnkk36qhfp3q"; + sha256 = "sha256-n/UuiVHw1zwlhwR/HDaKgoMnPy6fm9HWZ5FmAr7F/GE="; }; cmakeFlags = [ From fce6d3c3be9693cbd6fa7622b2789b30105407ca Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Mon, 11 Jul 2022 04:05:53 +0100 Subject: [PATCH 024/173] runescape-launcher: add .desktop file --- pkgs/games/runescape-launcher/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index e671e5589b82..75ed66c01e00 100644 --- a/pkgs/games/runescape-launcher/default.nix +++ b/pkgs/games/runescape-launcher/default.nix @@ -103,6 +103,13 @@ in ]; multiPkgs = pkgs: [ libGL ]; runScript = "runescape-launcher"; + extraInstallCommands = '' + mkdir -p "$out/share/applications" + cp ${runescape}/share/applications/runescape-launcher.desktop "$out/share/applications" + cp -r ${runescape}/share/icons "$out/share/icons" + substituteInPlace "$out/share/applications/runescape-launcher.desktop" \ + --replace "/usr/bin/runescape-launcher" "RuneScape" + ''; meta = with lib; { description = "RuneScape Game Client (NXT) - Launcher for RuneScape 3"; From c4ed73fabd7f8bb2822afc50fe9fc2deea724464 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 16 Aug 2022 03:01:40 -0700 Subject: [PATCH 025/173] qt4: Remove overzealous and obsolete patch. This patch is replaced by gcc11-ptr-cmp.patch, which works on both clang and gcc. --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index e581bdf5f88e..2ff8644e32e4 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -50,9 +50,6 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.cc.isClang '' substituteInPlace src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp \ --replace 'optionalHeight > 0' 'optionalHeight != NULL' - - substituteInPlace ./tools/linguist/linguist/messagemodel.cpp \ - --replace 'm->comment()) >= 0' 'm->comment()) != NULL' ''; patches = From 0bab8f164ca3efd360299065e9d75a27304798de Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 16 Aug 2022 03:09:24 -0700 Subject: [PATCH 026/173] qt4: add aarch64-darwin to list of bad platforms I am not sure how to make Qt4 work on aarch64-darwin. It appears to be nontrivial, and I didn't find patches anywhere. --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 2ff8644e32e4..816b75039612 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -234,6 +234,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; # or gpl3 maintainers = with lib.maintainers; [ orivej lovek323 sander ]; platforms = lib.platforms.unix; - badPlatforms = [ "x86_64-darwin" ]; + badPlatforms = [ "x86_64-darwin" "aarch64-darwin" ]; }; } From d5130db7cf002738ce329d57732c0f354f12da92 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Thu, 18 Aug 2022 11:48:29 +0200 Subject: [PATCH 027/173] itch: fix icons location --- pkgs/games/itch/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/games/itch/default.nix b/pkgs/games/itch/default.nix index 6f6dbde15d63..7aed72dd531d 100644 --- a/pkgs/games/itch/default.nix +++ b/pkgs/games/itch/default.nix @@ -35,13 +35,14 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-5MP6X33Jfu97o5R1n6Og64Bv4ZMxVM0A8lXeQug+bNA="; }; - icons = fetchFromGitHub { - owner = "itchio"; - repo = pname; - rev = "v${version}"; - hash = "sha256-DZBmf8fe0zw5uiQjNKXw8g/vU2hjNDa87z/7XuhyXog="; - sparseCheckout = "release/images/itch-icons"; - }; + icons = let sparseCheckout = "/release/images/itch-icons"; in + fetchFromGitHub { + owner = "itchio"; + repo = pname; + rev = "v${version}"; + hash = "sha256-DZBmf8fe0zw5uiQjNKXw8g/vU2hjNDa87z/7XuhyXog="; + inherit sparseCheckout; + } + sparseCheckout; nativeBuildInputs = [ copyDesktopItems makeWrapper ]; @@ -68,7 +69,7 @@ stdenvNoCC.mkDerivation rec { install -Dm644 LICENSE -t "$out/share/licenses/$pkgname/" install -Dm644 LICENSES.chromium.html -t "$out/share/licenses/$pkgname/" - for icon in $icons/release/images/itch-icons/icon*.png + for icon in $icons/icon*.png do iconsize="''${icon#$icons/icon}" iconsize="''${iconsize%.png}" From 3ffcb4a7d8106d7648fce81719ba6dd23ae46f26 Mon Sep 17 00:00:00 2001 From: kilianar Date: Fri, 19 Aug 2022 07:56:42 +0200 Subject: [PATCH 028/173] catppuccin-gtk: unstable-2022-08-01 -> 0.2.7 https://github.com/catppuccin/gtk/releases/tag/v-0.2.7 Fix logic for detecting incompatible tweaks. --- pkgs/data/themes/catppuccin-gtk/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/data/themes/catppuccin-gtk/default.nix b/pkgs/data/themes/catppuccin-gtk/default.nix index b9bc042dd09c..4158d4384d47 100644 --- a/pkgs/data/themes/catppuccin-gtk/default.nix +++ b/pkgs/data/themes/catppuccin-gtk/default.nix @@ -5,7 +5,6 @@ , gnome-themes-extra , gtk-engine-murrine , sassc -, which , tweaks ? [ ] , size ? "standard" }: @@ -14,9 +13,9 @@ let validTweaks = [ "nord" "dracula" "black" "rimless" "normal" ]; unknownTweaks = lib.subtractLists validTweaks tweaks; - illegalMix = !(lib.elem "nord" tweaks) && !(lib.elem "dracula" tweaks); + illegalMix = (lib.elem "nord" tweaks) && (lib.elem "dracula" tweaks); - assertIllegal = lib.assertMsg illegalMix '' + assertIllegal = lib.assertMsg (!illegalMix) '' Tweaks "nord" and "dracula" cannot be mixed. Tweaks: ${toString tweaks} ''; @@ -37,16 +36,16 @@ assert assertUnknown; stdenvNoCC.mkDerivation rec { pname = "catppuccin-gtk"; - version = "unstable-2022-08-01"; + version = "0.2.7"; src = fetchFromGitHub { repo = "gtk"; owner = "catppuccin"; - rev = "87a79fd2bf07accc694455df30a32a82b1b31f4f"; - sha256 = "sha256-dKHTQva0BYkO6VPNfY/pzRn/V1ghX+tYqbnM9hTAMeE="; + rev = "v-${version}"; + sha256 = "sha256-oTAfURHMWqlKHk4CNz5cn6vO/7GmQJM2rXXGDz2e+0w="; }; - nativeBuildInputs = [ gtk3 sassc which ]; + nativeBuildInputs = [ gtk3 sassc ]; buildInputs = [ gnome-themes-extra ]; @@ -61,7 +60,6 @@ stdenvNoCC.mkDerivation rec { export HOME=$(mktemp -d) - mkdir -p $out/share/themes bash install.sh -d $out/share/themes -t all \ ${lib.optionalString (size != "") "-s ${size}"} \ ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} From e3336e99ea3d9dc1be73ad39eaaa7983cbc8388b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Aug 2022 18:56:59 +0000 Subject: [PATCH 029/173] libsForQt5.kpmcore: 22.04.3 -> 22.08.0 --- pkgs/development/libraries/kpmcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index b4ebf5708dce..7b7794d3647a 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "kpmcore"; # NOTE: When changing this version, also change the version of `partition-manager`. - version = "22.04.3"; + version = "22.08.0"; src = fetchurl { url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-LmKglUgXhLOBLSpzfXvK/UXFqY3L+p/EoHbZTSKlGhM="; + hash = "sha256-Ws20hKX2iDdke5yBBKXukVUD4OnLf1OmwlhW+jUXL24="; }; nativeBuildInputs = [ extra-cmake-modules ]; From f0d35d87956ea418636a8bdd5b5851cde2b0ad62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Aug 2022 19:48:46 +0000 Subject: [PATCH 030/173] bluejeans-gui: 2.29.1.3 -> 2.30.0.89 --- .../networking/instant-messengers/bluejeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 3779624aaa77..5e8aef5f594d 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.29.1.3"; + version = "2.30.0.89"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; - sha256 = "sha256-vWViSJXRPZ4B40LNnoKRZNbxB1YKnaW2ay6GCjnFLGY="; + sha256 = "sha256-ALydB6bTxaYsBk0BrTKG8Yan4n/jvxT8T7fSMFel+CQ="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; From ca780fa58e564bca1d4923c665ed23906fc562f3 Mon Sep 17 00:00:00 2001 From: Heinz Deinhart Date: Mon, 22 Aug 2022 00:13:22 +0200 Subject: [PATCH 031/173] ddnet: 16.2.2 -> 16.3 --- pkgs/games/ddnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 33b8ca4f0e9d..915e48686dfd 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "16.2.2"; + version = "16.3"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-MrCPMtWdEsWUuvKaPWZK4Mh6nhPcKpsxkFKkWugdz8A="; + sha256 = "sha256-3CmPqb+x2ouPT3AmSiIj/fCyQLfGrFNwZIi+Ayr5Qr4="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; From 411a0f1fb8703af547f1fc478e3c08154e1a1b35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Aug 2022 03:33:00 +0000 Subject: [PATCH 032/173] python310Packages.rpy2: 3.5.3 -> 3.5.4 --- pkgs/development/python-modules/rpy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index ac5eb3a90e75..492b0f5434b7 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.5.3"; + version = "3.5.4"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "sha256-U6CS1ItE9GQo+zDLMVVmTW0vevCOvExF35jfTEWkLMs="; + sha256 = "sha256-ugqHeyuW4n0gkTg9RlK4KqInHP9KUFJD1F2kMLcSqvU="; }; patches = [ From b383b5d386d86603c9838abe523568a42f21f0d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Aug 2022 16:17:57 +0000 Subject: [PATCH 033/173] python310Packages.mautrix: 0.17.3 -> 0.17.8 --- pkgs/development/python-modules/mautrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 7b85a17a31a3..a17c2c9c079a 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.17.3"; + version = "0.17.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-j49NrZJMDw8m5ZGP4DXxk7uzF+0BxDjs4coEkMDUP+0="; + sha256 = "sha256-DFajAD5mnXLQmJGRv4j2mWhtIj77nZNSQhbesX4qMys="; }; propagatedBuildInputs = [ From e005217333d5d6a43b56d3e1234accaaaf233904 Mon Sep 17 00:00:00 2001 From: Heinz Deinhart Date: Mon, 22 Aug 2022 22:24:15 +0200 Subject: [PATCH 034/173] ddnet: 16.3 -> 16.3.1 --- pkgs/games/ddnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 915e48686dfd..ba2050e41b84 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "16.3"; + version = "16.3.1"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-3CmPqb+x2ouPT3AmSiIj/fCyQLfGrFNwZIi+Ayr5Qr4="; + sha256 = "sha256-0SkTIpCnoEbu1sOagYjHBHj1I3EgLwJ8sYxWqnJGYLc="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; From 59d92ec2d1b47c6dd345b74373e42c68541f271c Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Tue, 23 Aug 2022 07:24:08 +0200 Subject: [PATCH 035/173] belr: 5.1.12 -> 5.1.55 Signed-off-by: Felix Singer --- pkgs/development/libraries/belr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index 91f1c91e220c..13d20d36bd5c 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "belr"; - version = "5.1.12"; + version = "5.1.55"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; From 2d92da3f830f2a44199b64ac19333e23ab5bea82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Aug 2022 06:12:13 +0000 Subject: [PATCH 036/173] cargo-udeps: 0.1.30 -> 0.1.32 --- pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index f6eecb224824..d54e46adc5e0 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.30"; + version = "0.1.32"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CTP8ENvaryZsoSp+9wx5SoWYXqMpwWfzjMn5kvL+gxk="; + sha256 = "sha256-Ev7hLtE5/PqeM39nyWaMyIhFsEZnXbdyU8Q5PET98lQ="; }; - cargoSha256 = "sha256-Dzbogu/VqaASz7FEACavvrOIGZK2vn84IjQlCIx/Ey4="; + cargoSha256 = "sha256-3+6hZCYiyG6fgyJpjCcY1dzDK0kwVjsyckPIq/8Zfm0="; nativeBuildInputs = [ pkg-config ]; From b21d26541fe785a54376cf5377db9851bc0a5719 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Tue, 23 Aug 2022 16:15:07 -0400 Subject: [PATCH 037/173] pwsafe: 1.14.0 -> 1.15.0 --- pkgs/applications/misc/pwsafe/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index fb12bcad3441..28c089060aa8 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -2,19 +2,18 @@ , cmake, pkg-config, zip, gettext, perl , wxGTK30, libXext, libXi, libXt, libXtst, xercesc , qrencode, libuuid, libyubikey, yubikey-personalization -, curl, openssl, file +, curl, openssl, file, gitUpdater }: stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.14.0"; # do NOT update to 3.x Windows releases - # nixpkgs-update: no auto update + version = "1.15.0"; # do NOT update to 3.x Windows releases src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-s3IXe4gTwUOzQslNfWrcN/srrG9Jv02zfkGgiZN3C1s="; + hash = "sha256-EyyQHp2MlGgUnikClgvP7I313Bh6H3yVPXel8Z/U6gQ="; }; nativeBuildInputs = [ @@ -53,6 +52,12 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=${placeholder "out"}" ]; + passthru.updateScript = gitUpdater { + inherit pname version; + ignoredVersions = "^([^1]|1[^.])"; # ignore anything other than 1.x + url = src.gitRepoUrl; + }; + meta = with lib; { description = "A password database utility"; longDescription = '' From 88d684142210185f17d3a525f0a75b9a1f94aca9 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Tue, 16 Aug 2022 13:53:14 +0200 Subject: [PATCH 038/173] ycmd: unstable-2020-02-22 -> unstable-2022-08-15 Resolves autocompletion error 'ValueError: The given version is not in the right format. Use something like "3.8" or "3".' when YouCompleteMe vim plugin is used with current python3. Signed-off-by: Sirio Balmelli --- pkgs/development/tools/misc/ycmd/default.nix | 27 ++++++++++---------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 5853d40eceb1..3abcfabad779 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -1,33 +1,35 @@ -{ stdenv, lib, fetchFromGitHub, cmake, llvmPackages, boost, python +{ stdenv, lib, fetchFromGitHub, cmake, ninja, python , withGocode ? true, gocode , withGodef ? true, godef , withGotools? true, gotools , withTypescript ? true, nodePackages +, abseil-cpp, boost, llvmPackages , fixDarwinDylibNames, Cocoa }: stdenv.mkDerivation { pname = "ycmd"; - version = "unstable-2020-02-22"; + version = "unstable-2022-08-15"; disabled = !python.isPy3k; # required for third_party directory creation src = fetchFromGitHub { - owner = "Valloric"; + owner = "ycm-core"; repo = "ycmd"; - rev = "9a6b86e3a156066335b678c328f226229746bae5"; - sha256 = "sha256-xzLELjp4DsG6mkzaFqpuquSa0uoaZWrYLrKr/mzrqrA="; + rev = "323d4b60f077bd07945f25a60c4584843ca851fb"; + sha256 = "sha256-5IpXMQc3QIkKJkUrOPSRzciLvL1nhQw6wlP+pVnIucE="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake ] + nativeBuildInputs = [ cmake ninja ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ boost llvmPackages.libclang ] + buildInputs = with python.pkgs; with llvmPackages; [ abseil-cpp boost libllvm.all libclang.all ] + ++ [ jedi jedi-language-server pybind11 ] ++ lib.optional stdenv.isDarwin Cocoa; buildPhase = '' - export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} - ${python.interpreter} build.py --system-libclang --clang-completer --system-boost + export EXTRA_CMAKE_ARGS="-DPATH_TO_LLVM_ROOT=${llvmPackages.libllvm} -DUSE_SYSTEM_ABSEIL=true" + ${python.interpreter} build.py --system-libclang --clang-completer --ninja ''; dontConfigure = true; @@ -50,7 +52,7 @@ stdenv.mkDerivation { " ycmd/__main__.py mkdir -p $out/lib/ycmd - cp -r ycmd/ CORE_VERSION libclang.so.* libclang.dylib* ycm_core.so $out/lib/ycmd/ + cp -r ycmd/ CORE_VERSION *.so* *.dylib* $out/lib/ycmd/ mkdir -p $out/bin ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd @@ -82,15 +84,14 @@ stdenv.mkDerivation { # python won't be thrown off by argv[0] postFixup = '' substituteInPlace $out/lib/ycmd/ycmd/__main__.py \ - --replace $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd \ --replace __file__ "'$out/lib/ycmd/ycmd/__main__.py'" ''; meta = with lib; { description = "A code-completion and comprehension server"; - homepage = "https://github.com/Valloric/ycmd"; + homepage = "https://github.com/ycm-core/ycmd"; license = licenses.gpl3; - maintainers = with maintainers; [ rasendubi cstrahan lnl7 ]; + maintainers = with maintainers; [ rasendubi cstrahan lnl7 siriobalmelli ]; platforms = platforms.all; }; } From 6f8f90e056b93cf7efddf59aa45b906a8a573ab9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Aug 2022 09:47:48 +0000 Subject: [PATCH 039/173] crawl: 0.28.0 -> 0.29.0 --- pkgs/games/crawl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 064e1d623a5f..fa409987ff81 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "crawl${lib.optionalString tileMode "-tiles"}"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "sha256-pVEE3g+NDwpsrakyj4YIk53aE+LCiIaRhOqos4huh9A="; + sha256 = "sha256-SM8dSDV+88QGMqoFkITop1PHh9EakdgiV4tkXCw9pjM="; }; # Patch hard-coded paths and remove force library builds From 249dfd092cfcfe2dc991a433750ab5f5ae94a7e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 24 Aug 2022 09:48:35 +0000 Subject: [PATCH 040/173] crawlTiles: 0.28.0 -> 0.29.0 --- pkgs/games/crawl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 064e1d623a5f..fa409987ff81 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "crawl${lib.optionalString tileMode "-tiles"}"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "sha256-pVEE3g+NDwpsrakyj4YIk53aE+LCiIaRhOqos4huh9A="; + sha256 = "sha256-SM8dSDV+88QGMqoFkITop1PHh9EakdgiV4tkXCw9pjM="; }; # Patch hard-coded paths and remove force library builds From b3f68591e1a80130f1619cfd74d98422d579559c Mon Sep 17 00:00:00 2001 From: usertam Date: Wed, 24 Aug 2022 19:04:57 +0800 Subject: [PATCH 041/173] lilypond-unstable: 2.23.11 -> 2.23.12 --- pkgs/misc/lilypond/unstable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index dc137ccd7e9e..a8472b66f1fa 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -3,9 +3,9 @@ (lilypond.override { inherit guile; }).overrideAttrs (oldAttrs: rec { - version = "2.23.11"; + version = "2.23.12"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-4VjcuZvRmpPmiZ42zyk9xYPlsSN6kEsBSRe30P+raQ8="; + sha256 = "sha256-SLZ9/Jybltd8+1HANk8pTGHRb7MuZSJJDDY/S4Kwz/k="; }; }) From d3d99c715f57deec29000c626f458f8c0be0964a Mon Sep 17 00:00:00 2001 From: Marek Generowicz Date: Wed, 24 Aug 2022 15:00:17 +0300 Subject: [PATCH 042/173] binance: 1.36.0 -> 1.39.0 binance: 1.36.0 -> 1.39.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 15e3c51e9ad4..4d7789f033b5 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.36.0"; + version = "1.39.0"; src = fetchurl { url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb"; - sha256 = "sha256-Q1cvEQ/yxytzrPfiyeTZSCPecnmSdhy+ds/gtie4vwo="; + sha256 = "sha256-6VQerIzX2u8QGUsa8kvu6Qud3OEn9lrZkQddfkZ1X0g="; }; nativeBuildInputs = [ From d8bb7ec120d2472caf84785cc5271ed899a67517 Mon Sep 17 00:00:00 2001 From: Curtis Jiang Date: Wed, 26 Jan 2022 04:40:09 +0000 Subject: [PATCH 043/173] prometheus-v2ray-exporter: init at 0.6.0 --- maintainers/maintainer-list.nix | 6 ++ .../monitoring/prometheus/exporters.nix | 1 + .../monitoring/prometheus/exporters/v2ray.nix | 29 +++++++++ nixos/tests/prometheus-exporters.nix | 61 +++++++++++++++++++ .../monitoring/prometheus/v2ray-exporter.nix | 22 +++++++ pkgs/top-level/all-packages.nix | 1 + 6 files changed, 120 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix create mode 100644 pkgs/servers/monitoring/prometheus/v2ray-exporter.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6e677fe04b7d..5fda9284d6f6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6462,6 +6462,12 @@ githubId = 752510; name = "Martin Potier"; }; + jqqqqqqqqqq = { + email = "jqqqqqqqqqq@gmail.com"; + github = "jqqqqqqqqqq"; + githubId = 12872927; + name = "Curtis Jiang"; + }; jqueiroz = { email = "nixos@johnjq.com"; github = "jqueiroz"; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 47c30a0f24bb..68c766be63ec 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -72,6 +72,7 @@ let "unbound" "unifi" "unifi-poller" + "v2ray" "varnish" "wireguard" "flow" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix b/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix new file mode 100644 index 000000000000..185506cfc2b7 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix @@ -0,0 +1,29 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.v2ray; +in +{ + port = 9299; + extraOpts = { + v2rayEndpoint = mkOption { + type = types.str; + default = "127.0.0.1:54321"; + description = '' + v2ray grpc api endpoint + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-v2ray-exporter}/bin/v2ray-exporter \ + --v2ray-endpoint ${cfg.v2rayEndpoint} \ + --listen ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 4fdff7dbdab8..3b9ca4f0aa6a 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -1256,6 +1256,67 @@ let ''; }; + v2ray = { + exporterConfig = { + enable = true; + }; + + metricProvider = { + systemd.services.prometheus-nginx-exporter.after = [ "v2ray.service" ]; + services.v2ray = { + enable = true; + config = { + stats = {}; + api = { + tag = "api"; + services = [ "StatsService" ]; + }; + inbounds = [ + { + port = 1080; + listen = "127.0.0.1"; + protocol = "http"; + } + { + listen = "127.0.0.1"; + port = 54321; + protocol = "dokodemo-door"; + settings = { address = "127.0.0.1"; }; + tag = "api"; + } + ]; + outbounds = [ + { + protocol = "freedom"; + } + { + protocol = "freedom"; + settings = {}; + tag = "api"; + } + ]; + routing = { + strategy = "rules"; + settings = { + rules = [ + { + inboundTag = [ "api" ]; + outboundTag = "api"; + type = "field"; + } + ]; + }; + }; + }; + }; + }; + exporterTest = '' + wait_for_unit("prometheus-v2ray-exporter.service") + wait_for_open_port(9299) + succeed("curl -sSf localhost:9299/scrape | grep 'v2ray_up 1'") + ''; + }; + varnish = { exporterConfig = { enable = true; diff --git a/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix b/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix new file mode 100644 index 000000000000..c8732e85315f --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "v2ray-exporter"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "wi1dcard"; + repo = "v2ray-exporter"; + rev = "v${version}"; + sha256 = "12mzng3cw24fyyh8zjfi26gh853k5blzg3zbxcccnv5lryh2r0yi"; + }; + + vendorSha256 = "sha256-+jrD+QatTrMaAdbxy5mpCm8lF37XDIy1GFyEiUibA2k="; + + meta = with lib; { + description = "Prometheus exporter for V2Ray daemon"; + homepage = "https://github.com/wi1dcard/v2ray-exporter"; + license = licenses.mit; + maintainers = with maintainers; [ jqqqqqqqqqq ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7a26c02ae4d..ef757f00b331 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23319,6 +23319,7 @@ with pkgs; prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; }; + prometheus-v2ray-exporter = callPackage ../servers/monitoring/prometheus/v2ray-exporter.nix { }; prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; From b71a9802d7ac89718f4d465c320e32299f3beda5 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 25 Aug 2022 19:19:42 -0700 Subject: [PATCH 044/173] arpack: reenable stackprotector on aarch64-darwin The original error that required disabling the stack protector on aarch64-darwin has been fixed in GCC --- pkgs/development/libraries/science/math/arpack/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 2413a0a25cfe..9d96368a4cda 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -45,10 +45,6 @@ stdenv.mkDerivation rec { install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib ''; - # disable stackprotector on aarch64-darwin for now - # https://github.com/NixOS/nixpkgs/issues/127608 - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - meta = { homepage = "https://github.com/opencollab/arpack-ng"; description = '' From 56486fab3bb89832ed91968ce385295015fa7b27 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 25 Aug 2022 21:13:07 -0700 Subject: [PATCH 045/173] sundials: reenable stackprotector on aarch64-darwin The original error that required disabling the stack protector on aarch64-darwin has been fixed in GCC. --- pkgs/development/libraries/sundials/default.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 3093c5330a88..867d109d71b2 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -61,21 +61,6 @@ stdenv.mkDerivation rec { )] ; - # disable stackprotector on aarch64-darwin for now - # https://github.com/NixOS/nixpkgs/issues/127608 - # - # build error: - # - # /private/tmp/nix-build-sundials-6.3.0.drv-0/ccD2dUtR.s:21:15: error: index must be an integer in range [-256, 255]. - # ldr x0, [x0, ___stack_chk_guard];momd - # ^ - # /private/tmp/nix-build-sundials-6.3.0.drv-0/ccD2dUtR.s:46:15: error: index must be an integer in range [-256, 255]. - # ldr x0, [x0, ___stack_chk_guard];momd - # - # See also a proposed solution: https://github.com/NixOS/nixpkgs/pull/151983 - - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - doCheck = true; checkTarget = "test"; From 2b948ee0a4fb4a607e3667900305ae25137b434d Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Sat, 27 Aug 2022 21:33:29 +0200 Subject: [PATCH 046/173] uefitool.new-engine: A59 -> A60 --- pkgs/tools/system/uefitool/variants.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/uefitool/variants.nix b/pkgs/tools/system/uefitool/variants.nix index adf4884e2af1..9437f6b40f72 100644 --- a/pkgs/tools/system/uefitool/variants.nix +++ b/pkgs/tools/system/uefitool/variants.nix @@ -3,8 +3,8 @@ let common = opts: libsForQt5.callPackage (import ./common.nix opts) {}; in rec { new-engine = common rec { - version = "A59"; - sha256 = "0m6hkj33vr75mrpjpdc0l38xv64kq73ph2mr2v9bs3wx4qlvg606"; + version = "A60"; + sha256 = "sha256-E99Mf2T6Bg4NsFXzFn4kNf602DmtiyBk6Vcj6JfOPR0="; installFiles = [ "UEFITool/UEFITool" "UEFIFind/UEFIFind" "UEFIExtract/UEFIExtract" ]; }; old-engine = common rec { From a9ec42c41bcf536deec16123a992baec87ba09d0 Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Fri, 22 Jul 2022 10:42:09 +0530 Subject: [PATCH 047/173] waylevel: init at 1.0.0 use patchelf instead of wrapProgram for libpath --- pkgs/tools/misc/waylevel/default.nix | 31 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/waylevel/default.nix diff --git a/pkgs/tools/misc/waylevel/default.nix b/pkgs/tools/misc/waylevel/default.nix new file mode 100644 index 000000000000..f02ada3ab864 --- /dev/null +++ b/pkgs/tools/misc/waylevel/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromSourcehut +, makeWrapper +, rustPlatform +, wayland +}: +rustPlatform.buildRustPackage rec { + pname = "waylevel"; + version = "1.0.0"; + + src = fetchFromSourcehut { + owner = "~shinyzenith"; + repo = pname; + rev = version; + hash = "sha256-T2gqiRcKrKsvwGNnWrxR1Ga/VX4AyllYn1H25aIKt5s="; + }; + + cargoHash = "sha256-gw5m1/btJ5zZP04C7BCnHqEOUBoeu0whK8W7xA+xSQo="; + + postFixup = '' + patchelf --set-rpath ${lib.makeLibraryPath [wayland]} $out/bin/waylevel + ''; + + meta = with lib; { + description = "A tool to print wayland toplevels and other compositor info"; + homepage = "https://git.sr.ht/~shinyzenith/waylevel"; + license = licenses.bsd2; + maintainers = with maintainers; [ dit7ya ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97690ce0b1f3..0d989fec399d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28127,6 +28127,8 @@ with pkgs; wayshot = callPackage ../tools/misc/wayshot { }; + waylevel = callPackage ../tools/misc/waylevel { }; + wbg = callPackage ../applications/misc/wbg { }; hikari = callPackage ../applications/window-managers/hikari { From a2001ac0ff9d8bcbd257ab970922e42eb1fa6d38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Aug 2022 19:30:41 +0000 Subject: [PATCH 048/173] kuma-cp: 1.7.1 -> 1.8.0 --- pkgs/applications/networking/cluster/kuma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 6986af1d3d5b..1fa66767931c 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -16,15 +16,15 @@ buildGoModule rec { inherit pname ; - version = "1.7.1"; + version = "1.8.0"; tags = lib.optionals enableGateway ["gateway"]; - vendorSha256 = "sha256-0YmWmGuzyES7BoHKWxzF2K1rDW7PO2DRdNmY3eJkUAM="; + vendorSha256 = "sha256-69uXHvpQMeFwQbejMpfQPS8DDXJyVsnn59WUEJpSeng="; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - sha256 = "sha256-U8fWDXJ0ztod6r0qz63jbgYA06ItxA76BjSliniYnIQ="; + sha256 = "sha256-5459Fl7AbzuNGIOfDpVYlhvzLzfLT2Ckhr5omxZr76w="; }; doCheck = false; From 0e0a74465bb368f62385db59dce44e6ef00a16a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Aug 2022 00:03:39 +0000 Subject: [PATCH 049/173] python310Packages.mkdocs-redirects: 1.0.4 -> 1.1.0 --- .../development/python-modules/mkdocs-redirects/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-redirects/default.nix b/pkgs/development/python-modules/mkdocs-redirects/default.nix index 44d3ac83a67c..b9da3acd479b 100644 --- a/pkgs/development/python-modules/mkdocs-redirects/default.nix +++ b/pkgs/development/python-modules/mkdocs-redirects/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "mkdocs-redirects"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "mkdocs"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-hdMfl8j+kZzePkSd/bBHKuVXAVA1sAt7DvPZj9x5i0c="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-iJmNh81VVqaPWHL3d8u+hESlW3AhlCr/Ax9n5nOTd0o="; }; propagatedBuildInputs = [ From 289ace3de1ec233ba5adfa0077ce0cbddbf40e8e Mon Sep 17 00:00:00 2001 From: quasigod-io Date: Sun, 28 Aug 2022 22:15:37 -0400 Subject: [PATCH 050/173] grapejuice: 5.2.2 -> 5.5.4 --- pkgs/games/grapejuice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/grapejuice/default.nix b/pkgs/games/grapejuice/default.nix index 24835f604ae3..8f621ff7fe48 100644 --- a/pkgs/games/grapejuice/default.nix +++ b/pkgs/games/grapejuice/default.nix @@ -18,13 +18,13 @@ python3Packages.buildPythonApplication rec { pname = "grapejuice"; - version = "5.2.2"; + version = "5.5.4"; src = fetchFromGitLab { owner = "BrinkerVII"; repo = "grapejuice"; rev = "v${version}"; - sha256 = "sha256-YEAYoZF1Lf0ykB13cuRf5sOR1HIxwdcibyJLgP3g4Jk="; + sha256 = "sha256-y4J0589FgNahRmoPkVtHYtc6/OIfUi9bhz6BZrSeWVI="; }; nativeBuildInputs = [ From 29d9c256267deb6d5b1f8146f85733932834136e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 29 Aug 2022 19:41:17 +0100 Subject: [PATCH 051/173] hal-hardware-analyzer: use overridden fmt 8.0.1 for spdlog --- .../hal-hardware-analyzer/default.nix | 40 ++++++++++++++++--- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 6b5f04fe7349..cf073d89be7a 100644 --- a/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,9 +1,39 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config, python3Packages -, boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook -, graphviz, llvmPackages, z3 +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, ninja +, pkg-config +, python3Packages +, boost +, rapidjson +, qtbase +, qtsvg +, igraph +, spdlog +, wrapQtAppsHook +, graphviz +, llvmPackages +, z3 +, fmt_8 }: -stdenv.mkDerivation rec { +let + # no stable hal release yet with recent spdlog/fmt support, remove + # once 4.0.0 is released - see https://github.com/emsec/hal/issues/452 + spdlog' = spdlog.override { + fmt_8 = fmt_8.overrideAttrs (_: rec { + version = "8.0.1"; + src = fetchFromGitHub { + owner = "fmtlib"; + repo = "fmt"; + rev = version; + sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw"; + }; + }); + }; +in stdenv.mkDerivation rec { version = "3.3.0"; pname = "hal-hardware-analyzer"; @@ -34,7 +64,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog graphviz wrapQtAppsHook z3 ] + buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog' graphviz wrapQtAppsHook z3 ] ++ (with python3Packages; [ python pybind11 ]) ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; From 661844351c6ab02c8deff596298cebdd752f83fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Aug 2022 19:26:52 +0000 Subject: [PATCH 052/173] flycast: 1.3 -> 2.0 --- pkgs/applications/emulators/flycast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/applications/emulators/flycast/default.nix index fd5123d05fa2..3243c333a335 100644 --- a/pkgs/applications/emulators/flycast/default.nix +++ b/pkgs/applications/emulators/flycast/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "flycast"; - version = "1.3"; + version = "2.0"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; rev = "v${version}"; - sha256 = "sha256-FAHm8Fu/yv2rJvWCY+g50TYH4zOT6rO7F+jTL2T6EOU="; + sha256 = "sha256-vSyLg2lAJBV7crKVbGRbi1PUuCwHF9GB/8pjMTlaigA="; fetchSubmodules = true; }; From 5ecb51bc7957aca8b1f95c2dbaeb2ef85366e66a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Aug 2022 01:25:16 +0000 Subject: [PATCH 053/173] speechd: 0.11.1 -> 0.11.2 --- pkgs/development/libraries/speechd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index 270894c3e554..d27eabecf465 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -27,11 +27,11 @@ let inherit (python3Packages) python pyxdg wrapPython; in stdenv.mkDerivation rec { pname = "speech-dispatcher"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-0doS7T2shPE3mbai7Dm6LTyiGoST9E3BhVvQupbC3cY="; + sha256 = "sha256-i0ZJkl5oy+GntMCge7BBznc4s1yQamAr+CmG2xqg82Q="; }; patches = [ From 550c5b19477363907678915e9b9d4e8c2ed51eff Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Tue, 30 Aug 2022 11:27:06 +0800 Subject: [PATCH 054/173] pacman: 5.2.2 -> 6.0.1 Co-authored-by: Renaud --- maintainers/maintainer-list.nix | 6 + .../package-management/pacman/default.nix | 105 ++++++++++++++---- .../pacman/dont-create-empty-dirs.patch | 20 ++++ 3 files changed, 109 insertions(+), 22 deletions(-) create mode 100644 pkgs/tools/package-management/pacman/dont-create-empty-dirs.patch diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f11209c11b56..d5c7f9d8570c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11542,6 +11542,12 @@ fingerprint = "AE8C 0836 FDF6 3FFC 9580 C588 B156 8953 B193 9F1C"; }]; }; + samlukeyes123 = { + email = "samlukeyes123@gmail.com"; + github = "SamLukeYes"; + githubId = 12882091; + name = "Sam L. Yes"; + }; samrose = { email = "samuel.rose@gmail.com"; github = "samrose"; diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index 48fa91c7966b..44a90769477b 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -1,41 +1,102 @@ -{ stdenv, lib, fetchurl, pkg-config, m4, perl, libarchive, openssl, zlib, bzip2, -xz, curl, runtimeShell }: +{ lib +, stdenv +, fetchpatch +, fetchurl +, asciidoc +, binutils +, bzip2 +, coreutils +, curl +, gnupg +, gpgme +, installShellFiles +, libarchive +, makeWrapper +, meson +, ninja +, openssl +, perl +, pkg-config +, xz +, zlib + +# Tells pacman where to find ALPM hooks provided by packages. +# This path is very likely to be used in an Arch-like root. +, sysHookDir ? "/usr/share/libalpm/hooks/" +}: stdenv.mkDerivation rec { pname = "pacman"; - version = "5.2.2"; + version = "6.0.1"; src = fetchurl { - url = "https://sources.archlinux.org/other/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1829jcc300fxidr3cahx5kpnxkpg500daqgn2782hg5m5ygil85v"; + url = "https://sources.archlinux.org/other/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-DbYUVuVqpJ4mDokcCwJb4hAxnmKxVSHynT6TsA079zE="; }; - enableParallelBuilding = true; - - configureFlags = [ - # trying to build docs fails with a2x errors, unable to fix through asciidoc - "--disable-doc" - - "--sysconfdir=/etc" - "--localstatedir=/var" - "--with-scriptlet-shell=${runtimeShell}" + nativeBuildInputs = [ + asciidoc + installShellFiles + makeWrapper + meson + ninja + pkg-config ]; - installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; + buildInputs = [ + bzip2 + curl + gpgme + libarchive + openssl + perl + xz + zlib + ]; - nativeBuildInputs = [ pkg-config m4 ]; - buildInputs = [ curl perl libarchive openssl zlib bzip2 xz ]; + patches = [ + ./dont-create-empty-dirs.patch + # Add keyringdir meson option to configure the keyring directory + (fetchpatch { + url = "https://gitlab.archlinux.org/pacman/pacman/-/commit/79bd512181af12ec80fd8f79486fc9508fa4a1b3.patch"; + hash = "sha256-ivTPwWe06Q5shn++R6EY0x3GC0P4X0SuC+F5sndfAtM="; + }) + ]; - postFixup = '' - substituteInPlace $out/bin/repo-add \ + postPatch = '' + substituteInPlace meson.build \ + --replace "install_dir : SYSCONFDIR" "install_dir : '$out/etc'" \ + --replace "join_paths(DATAROOTDIR, 'libalpm/hooks/')" "'${sysHookDir}'" \ + --replace "join_paths(PREFIX, DATAROOTDIR, get_option('keyringdir'))" "'\$KEYRING_IMPORT_DIR'" + substituteInPlace doc/meson.build \ + --replace "/bin/true" "${coreutils}/bin/true" + substituteInPlace scripts/repo-add.sh.in \ --replace bsdtar "${libarchive}/bin/bsdtar" + substituteInPlace scripts/pacman-key.sh.in \ + --replace "local KEYRING_IMPORT_DIR='@keyringdir@'" "" \ + --subst-var-by keyringdir '\$KEYRING_IMPORT_DIR' \ + --replace "--batch --check-trustdb" "--batch --check-trustdb --allow-weak-key-signatures" + ''; # the line above should be removed once Arch migrates to gnupg 2.3.x + + mesonFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + postInstall = '' + installShellCompletion --bash scripts/pacman --zsh scripts/_pacman + wrapProgram $out/bin/makepkg \ + --prefix PATH : ${lib.makeBinPath [ binutils ]} + wrapProgram $out/bin/pacman-key \ + --prefix PATH : ${lib.makeBinPath [ gnupg ]} ''; meta = with lib; { description = "A simple library-based package manager"; - homepage = "https://www.archlinux.org/pacman/"; - license = licenses.gpl2; + homepage = "https://archlinux.org/pacman/"; + changelog = "https://gitlab.archlinux.org/pacman/pacman/-/raw/v${version}/NEWS"; + license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ mt-caret ]; + maintainers = with maintainers; [ samlukeyes123 ]; }; } diff --git a/pkgs/tools/package-management/pacman/dont-create-empty-dirs.patch b/pkgs/tools/package-management/pacman/dont-create-empty-dirs.patch new file mode 100644 index 000000000000..59deb947bb5d --- /dev/null +++ b/pkgs/tools/package-management/pacman/dont-create-empty-dirs.patch @@ -0,0 +1,20 @@ +diff --git a/meson.build b/meson.build +index c8ee42fd..610401ca 100644 +--- a/meson.build ++++ b/meson.build +@@ -414,15 +414,6 @@ install_data( + 'proto/proto.install', + install_dir : join_paths(DATAROOTDIR, 'pacman')) + +-foreach path : [ +- join_paths(LOCALSTATEDIR, 'lib/pacman/'), +- join_paths(LOCALSTATEDIR, 'cache/pacman/pkg/'), +- join_paths(DATAROOTDIR, 'makepkg-template/'), +- join_paths(DATAROOTDIR, 'libalpm/hooks/'), +- ] +- meson.add_install_script('sh', '-c', 'mkdir -p "$DESTDIR/@0@"'.format(path)) +-endforeach +- + TEST_ENV = environment() + TEST_ENV.set('PMTEST_SCRIPTLIB_DIR', join_paths(meson.project_source_root(), 'scripts/library/')) + TEST_ENV.set('PMTEST_LIBMAKEPKG_DIR', join_paths(meson.project_build_root(), 'scripts/libmakepkg/')) From 8949a6c91e3aa0ef88d9fb9211279c8aca8b6475 Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Mon, 22 Aug 2022 11:16:53 +0530 Subject: [PATCH 055/173] google-cloud-sdk: 397.0.0 -> 400.0.0 --- .../admin/google-cloud-sdk/components.json | 674 ++++++++---------- pkgs/tools/admin/google-cloud-sdk/data.nix | 22 +- pkgs/tools/admin/google-cloud-sdk/update.sh | 4 +- 3 files changed, 302 insertions(+), 398 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/components.json b/pkgs/tools/admin/google-cloud-sdk/components.json index f1c51c68d2f0..114f7ac9832e 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.json +++ b/pkgs/tools/admin/google-cloud-sdk/components.json @@ -5,7 +5,7 @@ "checksum": "5a65179c291bc480696ca323d2f8c4874985458303eff8f233e16cdca4e88e6f", "contents_checksum": "038c999c7a7d70d5133eab7dc5868c4c3d0358431dad250f9833306af63016c8", "size": 800, - "source": "components/google-cloud-sdk-alpha-20220805142045.tar.gz", + "source": "components/google-cloud-sdk-alpha-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -22,8 +22,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "2022.08.05" + "build_number": 20220826172526, + "version_string": "2022.08.26" } }, { @@ -258,15 +258,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.2.28" + "version_string": "0.2.29" } }, { "data": { - "checksum": "9e6a78c4747f425c93933e61635a2caf7685ae750adc065bf1ddd70f018e3f29", - "contents_checksum": "bc2e1ce26d099e6b384b732e452e3c784cfc234a96292c446bd6856bce555337", - "size": 48898452, - "source": "components/google-cloud-sdk-anthoscli-darwin-arm-20220617150114.tar.gz", + "checksum": "fabc991c7062d5ed4a6a47b07d3d0df48d73ce9cb735669bff61ac47978a83bf", + "contents_checksum": "b1745cda5487946233037c255be45772359cb4528c6e377572f272d54690ad07", + "size": 38384521, + "source": "components/google-cloud-sdk-anthoscli-darwin-arm-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -290,8 +290,8 @@ }, "platform_required": false, "version": { - "build_number": 20220617150114, - "version_string": "0.2.28" + "build_number": 20220826172526, + "version_string": "0.2.29" } }, { @@ -329,10 +329,10 @@ }, { "data": { - "checksum": "d4c9ff15fac4fa8ad75c3dd972b0271b073999ead2ddd8f5881a6e2cf271f1a5", - "contents_checksum": "50a63d70cb7ee41503ee66649ab65d1a18eea756a67a674a0ea1eae54b1240dc", - "size": 50295536, - "source": "components/google-cloud-sdk-anthoscli-darwin-x86_64-20220617150114.tar.gz", + "checksum": "7cd59b072d20ded27f23de1aed2099166545a70d842bd64b9a9eec0334f2f77f", + "contents_checksum": "a081aa483ed258458731925ce16ac05986d096d820ff788efbc365b51aea9c72", + "size": 39732026, + "source": "components/google-cloud-sdk-anthoscli-darwin-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -356,16 +356,16 @@ }, "platform_required": false, "version": { - "build_number": 20220617150114, - "version_string": "0.2.28" + "build_number": 20220826172526, + "version_string": "0.2.29" } }, { "data": { - "checksum": "95410d27b5d587ba3388b9f38c328a358b292df154008480189a3e21a542f204", - "contents_checksum": "654021667b0b0be6df14e3df31f57c5374b2291670172bd9dd83c05606fce1d5", - "size": 46826425, - "source": "components/google-cloud-sdk-anthoscli-linux-arm-20220617150114.tar.gz", + "checksum": "f32237a7cb8c23e20e6f5152528cd3a360922e65c1faded775ce7d07d41eb83e", + "contents_checksum": "7ad664a7d166c4c9a78900a4bffdcc2a6be896dc43fe6c8497b959dde839052e", + "size": 36753991, + "source": "components/google-cloud-sdk-anthoscli-linux-arm-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -389,16 +389,16 @@ }, "platform_required": false, "version": { - "build_number": 20220617150114, - "version_string": "0.2.28" + "build_number": 20220826172526, + "version_string": "0.2.29" } }, { "data": { - "checksum": "4aa7db2210073b098e96a550a2fd8148ca57d7ec9f9f4d6290faffee52390d5f", - "contents_checksum": "1dc52de4cfd28caa1218869a997759f5f7e3a41b5fab7802155cec397b914125", - "size": 47889870, - "source": "components/google-cloud-sdk-anthoscli-linux-x86-20220617150114.tar.gz", + "checksum": "baedcbb10fdb6ad12b71272baba20b1d9fff1919a564a00c5996702d107d85f7", + "contents_checksum": "91210a441053a1f728f797a7b194b783409386c201ab0d4523f7930c9df2d31c", + "size": 37605769, + "source": "components/google-cloud-sdk-anthoscli-linux-x86-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -422,16 +422,16 @@ }, "platform_required": false, "version": { - "build_number": 20220617150114, - "version_string": "0.2.28" + "build_number": 20220826172526, + "version_string": "0.2.29" } }, { "data": { - "checksum": "3f51ff8c11103daa5e771ca5152ac77c3243d24cbb7157807d13b4b4b07308d7", - "contents_checksum": "2c5e0483a0e2d2f54563b4fb37f10499c0fcd0197c62b2e62be03be2109c7874", - "size": 49978629, - "source": "components/google-cloud-sdk-anthoscli-linux-x86_64-20220617150114.tar.gz", + "checksum": "df9cddc4e8910e15814d39b3d115fe81f643fc60ea94ca95dee4a4a0edaf6380", + "contents_checksum": "5417f9a7a3d8d7eba246eb53b0e1dab267e024595e6c8d06614ee31f113865d2", + "size": 39436637, + "source": "components/google-cloud-sdk-anthoscli-linux-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -455,16 +455,16 @@ }, "platform_required": false, "version": { - "build_number": 20220617150114, - "version_string": "0.2.28" + "build_number": 20220826172526, + "version_string": "0.2.29" } }, { "data": { - "checksum": "a343d442a43feb9f9500b3cd9d4f57a7a1e7bf32e8d6505316a6cc0982d37ba3", - "contents_checksum": "cacbe5eb27fd9383ff8c7db63ae089f2b2cb5480102066043cf8cdcb61483dff", - "size": 48905650, - "source": "components/google-cloud-sdk-anthoscli-windows-x86-20220617150114.tar.gz", + "checksum": "e8960aac697fbd2778870abb8ba49e793c17c65bf1a402df2405f1a26874bfdc", + "contents_checksum": "4544b4b3c1cd6198dd738b353401fee9cbb07a3020037a7723653dc60a075417", + "size": 38474753, + "source": "components/google-cloud-sdk-anthoscli-windows-x86-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -488,16 +488,16 @@ }, "platform_required": false, "version": { - "build_number": 20220617150114, - "version_string": "0.2.28" + "build_number": 20220826172526, + "version_string": "0.2.29" } }, { "data": { - "checksum": "d012a903e88f92e6a1638f396d05cfb7ae592f79c388d84d2ac559fa9fd8b74c", - "contents_checksum": "d0d54c5ac6c2f1b6109a28b6ae29e327082d35259db4d84aed9ca90605841b81", - "size": 49983739, - "source": "components/google-cloud-sdk-anthoscli-windows-x86_64-20220617150114.tar.gz", + "checksum": "604b6baea3ee3c77e1efbfdd11b22fb19db6bf5f947fe382bbbda3cab7550a10", + "contents_checksum": "87a3f95a200facfcc936c1f2a404800a9187acdc6392d1a44800414ef61b2eb3", + "size": 39482646, + "source": "components/google-cloud-sdk-anthoscli-windows-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -521,8 +521,8 @@ }, "platform_required": false, "version": { - "build_number": 20220617150114, - "version_string": "0.2.28" + "build_number": 20220826172526, + "version_string": "0.2.29" } }, { @@ -1020,10 +1020,10 @@ }, { "data": { - "checksum": "975bcefab33d4e48823a743fbfd727033e47635639768354bc3151ffa962b49b", - "contents_checksum": "1b13d5c165be0138d5c94024129d36373442ae1f86a8f0745a43375fd3ef9ad3", - "size": 53824926, - "source": "components/google-cloud-sdk-app-engine-java-20220722145557.tar.gz", + "checksum": "e650804080d747f02c46b8b96d7e47aaa1aeed762da10725a558a3c9226f57b4", + "contents_checksum": "6c4ec2d67682d146f06aaddaafd1f568b3aacba413f0fd42b83cf41e1c8616ed", + "size": 53827944, + "source": "components/google-cloud-sdk-app-engine-java-20220819155753.tar.gz", "type": "tar" }, "dependencies": [ @@ -1041,8 +1041,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220722145557, - "version_string": "1.9.98" + "build_number": 20220819155753, + "version_string": "1.9.98.1" } }, { @@ -1142,10 +1142,10 @@ }, { "data": { - "checksum": "bfff4dc45ced105e5010076dfea392f3d6a5e14a8c5289a8b2af77db2fe9632f", - "contents_checksum": "0438831ce5792c465cc5e704862dbe55d29cf2c529ca656070854d6c7f945f8c", - "size": 8153872, - "source": "components/google-cloud-sdk-app-engine-python-20220401142023.tar.gz", + "checksum": "c6b1aeadabd28412ae830a18a06d23dbb3478cab8a3910d7b6eee6d6510e8d9c", + "contents_checksum": "405f37fbacbc8e2d9f5b0c88378b927cd62fcd6a6eb6d165478eb73821aea935", + "size": 9044876, + "source": "components/google-cloud-sdk-app-engine-python-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -1164,8 +1164,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220401142023, - "version_string": "1.9.100" + "build_number": 20220826172526, + "version_string": "1.9.101" } }, { @@ -1432,7 +1432,7 @@ "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760", "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d", "size": 797, - "source": "components/google-cloud-sdk-beta-20220805142045.tar.gz", + "source": "components/google-cloud-sdk-beta-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -1449,8 +1449,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "2022.08.05" + "build_number": 20220826172526, + "version_string": "2022.08.26" } }, { @@ -1765,10 +1765,10 @@ }, { "data": { - "checksum": "00ee91abb4d06c1bd3e61b621a5139dbc0358629223010503b8513ae720f83c9", - "contents_checksum": "4e9be9dfb23ff2071f8a51128a4e84cad77fb0ce5befa1ffd875ea0aa2a1bea0", - "size": 1630286, - "source": "components/google-cloud-sdk-bq-20220610143733.tar.gz", + "checksum": "81e8b301e5f04c691ccc32b422bd5b515f58a83c61ffcc02eb0f727368ab74af", + "contents_checksum": "de1b4b7eb575cc2af80471030289edae18d4fbdda140df61864c4f85ec97f656", + "size": 1649904, + "source": "components/google-cloud-sdk-bq-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -1787,7 +1787,7 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220610143733, + "build_number": 20220826172526, "version_string": "2.0.75" } }, @@ -3152,15 +3152,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.91.0" + "version_string": "1.92.0" } }, { "data": { - "checksum": "8a5c84aaa997c0fce5abc3080b49d0385f20d17b72d7467d7718eb1de291e172", - "contents_checksum": "f5b1d75e99ddf0cd2d2700e140bb9a8725bb5353ddd57dfed46528edfa82352a", - "size": 58043186, - "source": "components/google-cloud-sdk-config-connector-darwin-arm-20220805142045.tar.gz", + "checksum": "e69ad0ad6158e75c1a5e50cbd6e47712ae1333466e98fa0e38360388a7741397", + "contents_checksum": "887b9e9f94fb330ce38b71e63563b43a2b3625090ca97df01c395f1a170f1f0b", + "size": 58031942, + "source": "components/google-cloud-sdk-config-connector-darwin-arm-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -3184,16 +3184,16 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "1.91.0" + "build_number": 20220826172526, + "version_string": "1.92.0" } }, { "data": { - "checksum": "26d1826db0040b76e6143a3c3a85092b64ce3634c55bac41513a16fbc75db1bb", - "contents_checksum": "4b4067694172d9c85f722fa75f2c449cd4d67aad192514993c3108cf4d5d8739", - "size": 59625932, - "source": "components/google-cloud-sdk-config-connector-darwin-x86_64-20220805142045.tar.gz", + "checksum": "9bd57dfb4397c571345f275ade22db8bfbf0c7ce1f0766be04033a8d5108d129", + "contents_checksum": "e03b352e55adc4f2e70452569f3513e8661cb309cffd804f670c42c8d11b90e7", + "size": 59628145, + "source": "components/google-cloud-sdk-config-connector-darwin-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -3217,16 +3217,16 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "1.91.0" + "build_number": 20220826172526, + "version_string": "1.92.0" } }, { "data": { - "checksum": "974604a14f8ab9d4146cbf3c70b974a7b45eb9f3060de98a3647926ecd675359", - "contents_checksum": "31f6186d634e8e7541d1b9a157bb865a6fb259b83b5ada22f6cb6828b871c973", - "size": 54420510, - "source": "components/google-cloud-sdk-config-connector-linux-arm-20220805142045.tar.gz", + "checksum": "6819e1c06d7cee23dee7f278908a2ade370fd3c862c0c3f975d368e6e4face8d", + "contents_checksum": "b4f2a75282db97fd5a04fee33d770588ec86e914bb1ac7ef65cabc33c48b028f", + "size": 54427844, + "source": "components/google-cloud-sdk-config-connector-linux-arm-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -3250,16 +3250,16 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "1.91.0" + "build_number": 20220826172526, + "version_string": "1.92.0" } }, { "data": { - "checksum": "b1a296624de7ced067375268c0796aba27c7250102526e98cf6ef7bd095d80c6", - "contents_checksum": "1ad0f7c85b4738ce88dc44020714da73379d45e87079e623ac47ac861f168d94", - "size": 59194241, - "source": "components/google-cloud-sdk-config-connector-linux-x86_64-20220805142045.tar.gz", + "checksum": "16fbc19aa9b3b8d8d9ddffc346f6d7ffe7d20d1ea8a6e3f3f9bab43b2d6e0a11", + "contents_checksum": "d40df11cbe34f661b57f9743c7c9bef8a43232ea3b37568debe1fdc5a3c4ab51", + "size": 59183027, + "source": "components/google-cloud-sdk-config-connector-linux-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -3283,16 +3283,16 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "1.91.0" + "build_number": 20220826172526, + "version_string": "1.92.0" } }, { "data": { - "checksum": "2feefddab47150f6bb9a10ad6799f865bc1e1ddaa59b8585b0251e2345b199b4", - "contents_checksum": "9493d18fbaadd734d35116b20419e7bbb55c949d1ece5d760ff0d5924ba980d3", - "size": 59353671, - "source": "components/google-cloud-sdk-config-connector-windows-x86_64-20220805142045.tar.gz", + "checksum": "fe8328a8e56d137d50b2db1ddadb5db24fa1b2ce940373556f98d918f2e94f57", + "contents_checksum": "1ab0f32fc5cb49579dcd8fa5cdfd525fada6f67817d364a277908c3bac80c963", + "size": 59356188, + "source": "components/google-cloud-sdk-config-connector-windows-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -3316,16 +3316,16 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "1.91.0" + "build_number": 20220826172526, + "version_string": "1.92.0" } }, { "data": { - "checksum": "21664b6bffac84c8239b217e70217850e33331980b62e2531e93c9e737589071", - "contents_checksum": "fa7efddd74122403cee90c15c0f6bf4801f3e11b16197b8c79c040a7a28a8cc7", - "size": 25447400, - "source": "components/google-cloud-sdk-core-20220805142045.tar.gz", + "checksum": "67ea11d36e9538cab9ca073ba009e4f4d8bdc74e27417b0833ce49042a268b31", + "contents_checksum": "513f4f9f2de029c8056b85991065c9cc55a94244d54dab53427ab86d782a22ed", + "size": 25728101, + "source": "components/google-cloud-sdk-core-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -3345,8 +3345,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "2022.08.05" + "build_number": 20220826172526, + "version_string": "2022.08.26" } }, { @@ -3416,102 +3416,6 @@ "version_string": "2021.04.30" } }, - { - "data": { - "checksum": "be642bd7b9efb920807c74e98fbce1510734f6f125177e18d97e4e64bf9d97e6", - "contents_checksum": "a0c6cef6ae50c3f9f756a478a837497a6e33ec0ea7c7c01ee73de308263d87f9", - "size": 101325922, - "source": "components/google-cloud-sdk-dataflow-sql-20180716155816.tar.gz", - "type": "tar" - }, - "dependencies": [ - "alpha", - "core", - "dataflow-sql-nix", - "dataflow-sql-win" - ], - "details": { - "description": "Dataflow SQL Shell", - "display_name": "Dataflow SQL Shell" - }, - "id": "dataflow-sql", - "is_configuration": false, - "is_hidden": true, - "is_required": false, - "platform": {}, - "platform_required": false, - "version": { - "build_number": 20180716155816, - "version_string": "20180711" - } - }, - { - "data": { - "checksum": "85315f1aa4992df190762349d735080dfa74cbb4ba3a9e0e24104df164d6482e", - "contents_checksum": "f75bd0240fa748e3f779b7ea4bd19fc7f35ed47fb9eb62705a244c920efd0690", - "size": 1839, - "source": "components/google-cloud-sdk-dataflow-sql-nix-20220805142045.tar.gz", - "type": "tar" - }, - "dependencies": [ - "alpha", - "core", - "dataflow-sql" - ], - "details": { - "description": "Dataflow SQL Shell", - "display_name": "Dataflow SQL Shell (Platform Specific)" - }, - "id": "dataflow-sql-nix", - "is_configuration": false, - "is_hidden": true, - "is_required": false, - "platform": { - "operating_systems": [ - "CYGWIN", - "LINUX", - "MACOSX", - "MSYS" - ] - }, - "platform_required": false, - "version": { - "build_number": 20220805142045, - "version_string": "20180711" - } - }, - { - "data": { - "checksum": "6379500528f324f547d502fe17054f7ee11f4e34fe8cd5e11649a109dfaaf7d9", - "contents_checksum": "2822a81f487d4db182c830642336381ec043109ac38cf085fad6b49abeeafc52", - "size": 2598, - "source": "components/google-cloud-sdk-dataflow-sql-win-20210430141114.tar.gz", - "type": "tar" - }, - "dependencies": [ - "alpha", - "core", - "dataflow-sql" - ], - "details": { - "description": "Dataflow SQL Shell", - "display_name": "Dataflow SQL Shell (Platform Specific)" - }, - "id": "dataflow-sql-win", - "is_configuration": false, - "is_hidden": true, - "is_required": false, - "platform": { - "operating_systems": [ - "WINDOWS" - ] - }, - "platform_required": false, - "version": { - "build_number": 20210430141114, - "version_string": "20180711" - } - }, { "data": { "checksum": "14a35a0d77ace272dc527d47da52e8179d108896e0c4ae26fc53ad7823d0ce80", @@ -4203,10 +4107,10 @@ }, { "data": { - "checksum": "50db9a088c2db1a16fdbe3d293a321e4e79d17c680476abc1b6946b6261ebfd2", - "contents_checksum": "ffdaad055d9f57c6b991133fb0bfa0e5a8c55ee937fd7cf4cffae7d8d3e833c2", - "size": 11787747, - "source": "components/google-cloud-sdk-gcloud-deps-20220729144039.tar.gz", + "checksum": "ecc87f105076886c96fa5c3fa0a585c02dad5fc1ee7b3057c77d7734345a89ed", + "contents_checksum": "70e95c8c5184e7f15e8806f70d450dec7f5dd34b93254128a3505e78fdaeb0d5", + "size": 11787976, + "source": "components/google-cloud-sdk-gcloud-deps-20220819155753.tar.gz", "type": "tar" }, "dependencies": [ @@ -4229,8 +4133,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220729144039, - "version_string": "2022.07.29" + "build_number": 20220819155753, + "version_string": "2022.08.19" } }, { @@ -4466,10 +4370,10 @@ }, { "data": { - "checksum": "24f72a91f2b4588cad97cfd35534021b920319360fa9f9634ef4479b64312a5f", - "contents_checksum": "9ea399de12fab3b13f1ce70b292e08613eb6a862a4380a4ab9f96b4763b87fc6", - "size": 5057361, - "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20220805142045.tar.gz", + "checksum": "51bdccd26675d35f001e8cc4559ce94d37c0d40533a3f7510efbbb8a45f3d033", + "contents_checksum": "fae4b5a2357238e46e5fb51f936bbc351a7af6871d0c40dfd6138d12c72f6535", + "size": 5092288, + "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -4494,7 +4398,7 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, + "build_number": 20220826172526, "version_string": "" } }, @@ -4531,15 +4435,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.2.0" + "version_string": "0.3.0" } }, { "data": { - "checksum": "671c488a87f4901023e8d53c6a48b2e95feccf29d1205218a896a297b3c697d3", - "contents_checksum": "b354a76976c829c807953730cdb506e01ea591bdd5d4d515879bc0f743e7249c", - "size": 3926436, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-arm-20220415194303.tar.gz", + "checksum": "f66c589ba9f2e611c5c77b4ea21ba41eb4a07ca2aabdef7af4201eb637feff4d", + "contents_checksum": "2c73b10435db08f57f7ddf911bb101d3974ec9fed3a57ae13d50ab75a5cf1ebb", + "size": 3889680, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-arm-20220812141601.tar.gz", "type": "tar" }, "dependencies": [ @@ -4563,16 +4467,16 @@ }, "platform_required": false, "version": { - "build_number": 20220415194303, - "version_string": "0.2.0" + "build_number": 20220812141601, + "version_string": "0.3.0" } }, { "data": { - "checksum": "13246b33bc9a08cba1e351188c132fec130dbb9699b69b4867dbfde61742809a", - "contents_checksum": "cb1344e446dc64eb0d7cad0e8193fb46fd6724de6fabc9e782ffe4b93c9a84e3", - "size": 4005591, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-x86_64-20220415194303.tar.gz", + "checksum": "49c5f49d271b451ed9eb939b442f88fc28c567076d8b7a9b6e8d2fe80081a405", + "contents_checksum": "ce90b98142b6653c887f20173730a1c8858b7831aa621cb61e379c7cf1dda76d", + "size": 3966386, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-darwin-x86_64-20220812141601.tar.gz", "type": "tar" }, "dependencies": [ @@ -4596,16 +4500,16 @@ }, "platform_required": false, "version": { - "build_number": 20220415194303, - "version_string": "0.2.0" + "build_number": 20220812141601, + "version_string": "0.3.0" } }, { "data": { - "checksum": "d11927a60ab40d5af8c2f350dbf4743234e02396e6700b32bbbfee35713b78d7", - "contents_checksum": "abbc8837093fa9c44ba8d8650267311a00b3c177ab008348c923093bf37eba57", - "size": 3680423, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-arm-20220415194303.tar.gz", + "checksum": "ec442a059ed3bbc214fc28eef3e67970c8c57537afe5583fb783df31450e03ce", + "contents_checksum": "2e627bae955f9fd04f838d05c80f01f1e0ccbe41c12a58032710a1881a7c637e", + "size": 3647239, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-arm-20220812141601.tar.gz", "type": "tar" }, "dependencies": [ @@ -4629,16 +4533,16 @@ }, "platform_required": false, "version": { - "build_number": 20220415194303, - "version_string": "0.2.0" + "build_number": 20220812141601, + "version_string": "0.3.0" } }, { "data": { - "checksum": "61432985d9b2fff2715b0c6b5d4322b886f5e090edc9bec9fc7e1c4524172104", - "contents_checksum": "8793c98cda22c6d50af6030058adabf21a5a69bd1ef309a9aaaea8f82a9cc941", - "size": 3760097, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86-20220415194303.tar.gz", + "checksum": "b9c24a6412285576eea5df768ad6c3f1b7379d361b25a0006a091ab80ecd11e7", + "contents_checksum": "c86a99c78078966369fc5882553abb6c66d00994f6c3c002b7c0ad2451afc7f9", + "size": 3723418, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86-20220812141601.tar.gz", "type": "tar" }, "dependencies": [ @@ -4662,16 +4566,16 @@ }, "platform_required": false, "version": { - "build_number": 20220415194303, - "version_string": "0.2.0" + "build_number": 20220812141601, + "version_string": "0.3.0" } }, { "data": { - "checksum": "77f398eaedda9d6ae7f33a91495f3728089b2e540ea350bac78eee7c894fab69", - "contents_checksum": "b8695b9133a150e05b963f7859135ca8ce39d47fbc68f6524f05606e0902ae8a", - "size": 4030889, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86_64-20220415194303.tar.gz", + "checksum": "3918d66ceea4f1db7070c301a8a285ed6933608240193742d8138b347bee49c5", + "contents_checksum": "4a1ad649ae7d6921a719e5d6d9143ba38d1d6a2d68d607e465208aa2ad4dc66a", + "size": 3991342, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-linux-x86_64-20220812141601.tar.gz", "type": "tar" }, "dependencies": [ @@ -4695,16 +4599,16 @@ }, "platform_required": false, "version": { - "build_number": 20220415194303, - "version_string": "0.2.0" + "build_number": 20220812141601, + "version_string": "0.3.0" } }, { "data": { - "checksum": "aefb869aa6b77a45f811ea3ae73a79df23c701e8ed2d80e65b86e438c2bc21b2", - "contents_checksum": "9fcb071624de3ed495b03b999df73b74a80b37d2d04ff8635d67d770285c7e3d", - "size": 3747135, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86-20220415194303.tar.gz", + "checksum": "53b3d71b89d867c8dfbb8f5bfe3cace6604dfa7e3a0e59bc31716abd28ec2f84", + "contents_checksum": "c900aaddc03420b5d851007dfdd8eab66613c6c0602c53c3d6071cf052b162e7", + "size": 3708822, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86-20220812141601.tar.gz", "type": "tar" }, "dependencies": [ @@ -4728,16 +4632,16 @@ }, "platform_required": false, "version": { - "build_number": 20220415194303, - "version_string": "0.2.0" + "build_number": 20220812141601, + "version_string": "0.3.0" } }, { "data": { - "checksum": "e1dd018badb1e13a94fb288fea9a3c8759e72a2958d45850da12cb8c5efa2393", - "contents_checksum": "d750e5aa521dea77b9eb73566a8e4defcaf00f9de35c36a179941cd2c0207486", - "size": 4035265, - "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86_64-20220415194303.tar.gz", + "checksum": "ca87b474857f983f7fd58860a6a9f1116309a804da391aec625bf7bd435d2ed4", + "contents_checksum": "e84a197d32faf3199d5aaf1badb295725cb5e6ef54bb6df85c6d9a7a219f8f84", + "size": 3995999, + "source": "components/google-cloud-sdk-gke-gcloud-auth-plugin-windows-x86_64-20220812141601.tar.gz", "type": "tar" }, "dependencies": [ @@ -4761,16 +4665,16 @@ }, "platform_required": false, "version": { - "build_number": 20220415194303, - "version_string": "0.2.0" + "build_number": 20220812141601, + "version_string": "0.3.0" } }, { "data": { - "checksum": "75402f8c37812b0c918e2203ada4354a59dbcf7ff21a090fded513e51e6d6e62", - "contents_checksum": "f75df7e60be8c0325cc510393e896b1006e4adad99687d9d9d486bc1dc84030b", - "size": 16233224, - "source": "components/google-cloud-sdk-gsutil-20220719210002.tar.gz", + "checksum": "0d5a788c9a2ce8afa11df39ca92395b896c75abc6613aeaa5bf26f11cf500000", + "contents_checksum": "c018a70eda52d4d450c0df6d4d0a85cc63b356c6459d0e75ae3154118d0bcda7", + "size": 16238934, + "source": "components/google-cloud-sdk-gsutil-20220812141601.tar.gz", "type": "tar" }, "dependencies": [ @@ -4789,8 +4693,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220719210002, - "version_string": "5.11" + "build_number": 20220812141601, + "version_string": "5.12" } }, { @@ -5082,10 +4986,10 @@ }, { "data": { - "checksum": "53aae2e2d03d7593bd1737217c1f7ab0d4fd983fb834ec0ceb2c8a47ed4afe3e", - "contents_checksum": "04f1f05cc75156a6240a0e8d3e56bab4a6e1e73b80ba4449ad317f5361749a75", + "checksum": "9de67dcca25d9fe988f7bb50d51f469f15f94a18448baf324836e967ab33f00a", + "contents_checksum": "727cf52bb3893c60b77edd5989e9febe5445381d1a5ffeb4f9dbdbf3d1ca33ca", "size": 48204, - "source": "components/google-cloud-sdk-kubectl-20220722145557.tar.gz", + "source": "components/google-cloud-sdk-kubectl-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -5109,7 +5013,7 @@ "platform": {}, "platform_required": true, "version": { - "build_number": 20220722145557, + "build_number": 20220826172526, "version_string": "1.22.12" } }, @@ -5744,15 +5648,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.5.3" + "version_string": "1.5.4" } }, { "data": { - "checksum": "a6a9d97bbd8f47f60c931b4afa61e604d1dfd55bb82192ab32d9eb2d295b36b5", - "contents_checksum": "8306b904f95f187528c7d1a9357ca1122aebb87f738449edd3b4f608773c3ba2", - "size": 11400102, - "source": "components/google-cloud-sdk-local-extract-darwin-arm-20220527165258.tar.gz", + "checksum": "74e2a3c6fae41d212dc3350673812ee072217cef5f7c75c970bd0919c3c8827a", + "contents_checksum": "ca6077dc79a1ddbe0fc3a1f0efb44c176fe3f1f988c9f07a3c916bd157d99f82", + "size": 11628968, + "source": "components/google-cloud-sdk-local-extract-darwin-arm-20220819155753.tar.gz", "type": "tar" }, "dependencies": [ @@ -5776,16 +5680,16 @@ }, "platform_required": false, "version": { - "build_number": 20220527165258, - "version_string": "1.5.3" + "build_number": 20220819155753, + "version_string": "1.5.4" } }, { "data": { - "checksum": "3744e613cd9c218a8ad0c713cea4c30c8bd4d34bddc2a4c1bff1208f8a6dcd2f", - "contents_checksum": "ae929c4c03575117c4c36d00fad3f9f417b54e03765091865ef2b449725dcc0c", - "size": 11814678, - "source": "components/google-cloud-sdk-local-extract-darwin-x86_64-20220527165258.tar.gz", + "checksum": "48d21d02fedd465b7e4c02a8e8eb5deefa747cca4b27495ff493eea987cd5650", + "contents_checksum": "b396466a8b76fbe681c7668a74f259d1c85b87dd1d16815607a6e71b7269c610", + "size": 12090208, + "source": "components/google-cloud-sdk-local-extract-darwin-x86_64-20220819155753.tar.gz", "type": "tar" }, "dependencies": [ @@ -5809,16 +5713,16 @@ }, "platform_required": false, "version": { - "build_number": 20220527165258, - "version_string": "1.5.3" + "build_number": 20220819155753, + "version_string": "1.5.4" } }, { "data": { - "checksum": "86d0e6748dad80a1268b8e2835065e5982ebddc3a8048d55bbf301337a632e82", - "contents_checksum": "eff9cd2906e8c3b751b3c435e8ead1daf01aa68acb81f226a26da8404bc8fc6a", - "size": 11256244, - "source": "components/google-cloud-sdk-local-extract-linux-arm-20220527165258.tar.gz", + "checksum": "143af8b71ff10c26a6545334d83e1d400db8ba53b6795abafa51459254754758", + "contents_checksum": "0218d2321ec642b9c390bfd865b041a9dc823fc50eabb9fe6fff9275b4e8549b", + "size": 11498507, + "source": "components/google-cloud-sdk-local-extract-linux-arm-20220819155753.tar.gz", "type": "tar" }, "dependencies": [ @@ -5842,16 +5746,16 @@ }, "platform_required": false, "version": { - "build_number": 20220527165258, - "version_string": "1.5.3" + "build_number": 20220819155753, + "version_string": "1.5.4" } }, { "data": { - "checksum": "c6ea29aebff7fc85fe5359111e7de402fb782e0a030676f978b897d335f1025b", - "contents_checksum": "b6cc9c0ff16c99643373b4c98f7956008fe31fe3a8762d2809848f372846a619", - "size": 13350856, - "source": "components/google-cloud-sdk-local-extract-linux-x86_64-20220527165258.tar.gz", + "checksum": "af0a9cf6453242db80c3e284e5dd7be5ae60693302e0d2b5e1dcf2f6a9f3b3b8", + "contents_checksum": "6361f67c833e6c20ce8c09af3f7004746edb5fd2be9c72c65b150245d386cfa5", + "size": 13663568, + "source": "components/google-cloud-sdk-local-extract-linux-x86_64-20220819155753.tar.gz", "type": "tar" }, "dependencies": [ @@ -5875,8 +5779,8 @@ }, "platform_required": false, "version": { - "build_number": 20220527165258, - "version_string": "1.5.3" + "build_number": 20220819155753, + "version_string": "1.5.4" } }, { @@ -6102,15 +6006,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.12.1-rc.3" + "version_string": "1.12.2-rc.2" } }, { "data": { - "checksum": "94b193a4a7acffd284c5feb704cc32ae452bb67cf98f70cd856d05f7e7f358bf", - "contents_checksum": "0d7d9a897459caf53567691cf1d746a6e43501afa673bea83d4112af919527ff", - "size": 25577150, - "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20220722145557.tar.gz", + "checksum": "3d68d8a604dcf4123f7e52b839ab67909956cbee8bef9f592ae31173a0c77e59", + "contents_checksum": "72b328cc2cd63d282976b31e57b9391789a45e629d114c5bfa701fb1b20bc6df", + "size": 25577195, + "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -6134,16 +6038,16 @@ }, "platform_required": false, "version": { - "build_number": 20220722145557, - "version_string": "1.12.1-rc.3" + "build_number": 20220826172526, + "version_string": "1.12.2-rc.2" } }, { "data": { - "checksum": "e5195285ab44143b5953b2364d91ab09e1390780a27879b463e3956069867fc9", - "contents_checksum": "deef246aecb75a2157c43d2211be9c60732ffccacc0c0848a2bb521f665521af", - "size": 26179386, - "source": "components/google-cloud-sdk-nomos-linux-x86_64-20220722145557.tar.gz", + "checksum": "6ffb0aaa5b7d76ce29a8460da26014eef438d077bfecf440198df041c17cedfe", + "contents_checksum": "bb0711b94470949df670ebedd6dccad98334276aab1547750be9b73ba31f9079", + "size": 26179434, + "source": "components/google-cloud-sdk-nomos-linux-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -6167,8 +6071,8 @@ }, "platform_required": false, "version": { - "build_number": 20220722145557, - "version_string": "1.12.1-rc.3" + "build_number": 20220826172526, + "version_string": "1.12.2-rc.2" } }, { @@ -6198,15 +6102,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.2.0" + "version_string": "0.3.0" } }, { "data": { - "checksum": "9f29cc600b38245897cbcc5e3bb8d2e9519fcb7e534b476d9eb5543bab6b4ee3", - "contents_checksum": "88bcd25ebaece120c436e76e59bc7036d03b16269056b5f5303bd590cfbb8ec4", - "size": 834432, - "source": "components/google-cloud-sdk-package-go-module-darwin-x86_64-20220624143124.tar.gz", + "checksum": "3e42f27fb89439fc841e2081b0f95e39ccee4ab40a50310d6b878fc90d136c68", + "contents_checksum": "425ac490a55f1a497eb48990542b2dd80f1f9476e129da7470f658483af4b30b", + "size": 840902, + "source": "components/google-cloud-sdk-package-go-module-darwin-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -6230,16 +6134,16 @@ }, "platform_required": false, "version": { - "build_number": 20220624143124, - "version_string": "0.2.0" + "build_number": 20220826172526, + "version_string": "0.3.0" } }, { "data": { - "checksum": "b76e2ad34599a5ca779dcfde906b98ce54f84b48fb9e8341b8a0a366fe141646", - "contents_checksum": "f6bb7e482d6a1cd2cc8ac541a7a7d3c447ba1e35f158e98f6dc5855dd7178ccf", - "size": 835647, - "source": "components/google-cloud-sdk-package-go-module-linux-x86_64-20220624143124.tar.gz", + "checksum": "7ea38fa933af77df34b47611bea069f00747a285aa25f64302b1fb5b7aa78598", + "contents_checksum": "89890af46a25dcb37c9ab6e7d3a90f182b252565bbf0d55e6663e3f1539bf175", + "size": 842011, + "source": "components/google-cloud-sdk-package-go-module-linux-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -6263,16 +6167,16 @@ }, "platform_required": false, "version": { - "build_number": 20220624143124, - "version_string": "0.2.0" + "build_number": 20220826172526, + "version_string": "0.3.0" } }, { "data": { - "checksum": "b523eb4afbe2332941a5c983ababf1719b18137c479c27fb316b53774d12ddd3", - "contents_checksum": "1e9e5b4c5711a741356616939b9d82029668ba91bf14a3446d29012dce805d84", - "size": 841003, - "source": "components/google-cloud-sdk-package-go-module-windows-x86_64-20220624143124.tar.gz", + "checksum": "98898c89fa374db2b42d5833605f49dc4701ee352720d5f2971900e50d551173", + "contents_checksum": "7eb95df0b6f53db8843a772d27259b2e6e5e0ead95ca9c8ba18f6bc1041b61c9", + "size": 847290, + "source": "components/google-cloud-sdk-package-go-module-windows-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -6296,8 +6200,8 @@ }, "platform_required": false, "version": { - "build_number": 20220624143124, - "version_string": "0.2.0" + "build_number": 20220826172526, + "version_string": "0.3.0" } }, { @@ -6434,15 +6338,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.39.1" + "version_string": "1.39.2" } }, { "data": { - "checksum": "c83173b24bdb4f78e7950a1593f73c49eec5dfc6ccdb332212e7932bed832245", - "contents_checksum": "6a4be275b2f87e0b703db49a582ae26cbd19e2fdaebb57220d826a7df00f4ad9", - "size": 20226684, - "source": "components/google-cloud-sdk-skaffold-darwin-arm-20220708145531.tar.gz", + "checksum": "e899765e4380599af9bd4894d48896290b615fa8a1445bd5d16d5a3f1bcd0fad", + "contents_checksum": "22a0fb78e2d5eefec2c4850e82412c4778510f1234e1d7d3fa87cf03670cfb38", + "size": 20226817, + "source": "components/google-cloud-sdk-skaffold-darwin-arm-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -6467,16 +6371,16 @@ }, "platform_required": false, "version": { - "build_number": 20220708145531, - "version_string": "1.39.1" + "build_number": 20220826172526, + "version_string": "1.39.2" } }, { "data": { - "checksum": "fcc5c4cd1f287eb246ee8249bff3c48e4ff4c716e7082674905a644abd4d15d1", - "contents_checksum": "704148fa5cf9538397a9e502f9d6ff384e1e2b0ac998da8ff41baa521947c609", - "size": 21900843, - "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20220708145531.tar.gz", + "checksum": "14f3f51835a36a0db6abe71517c81bda944abe5427b16dcaf2deae41ffe2aa10", + "contents_checksum": "61f35dce02f4aa7185a840edc6e46ddb890c222a3724ad5dbda8c69bcd6ef64d", + "size": 21901265, + "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -6501,16 +6405,16 @@ }, "platform_required": false, "version": { - "build_number": 20220708145531, - "version_string": "1.39.1" + "build_number": 20220826172526, + "version_string": "1.39.2" } }, { "data": { - "checksum": "f56936cce7576225d286db11fe085ae47ca6676d462306319d30b079a04f7909", - "contents_checksum": "90b59d90dc9af7c243e75a678bd5b7e4a2a79e3102ccf4316c57a817d0d3fcbe", - "size": 18444524, - "source": "components/google-cloud-sdk-skaffold-linux-arm-20220708145531.tar.gz", + "checksum": "d17c942661610cfefeb70246367e47dda3d53cfa159f3cdeee88291f96ee8743", + "contents_checksum": "0ec70a45c6531cdecd80d4bf27964ba2bb8b28727fc969ae449c0605c977a474", + "size": 18444703, + "source": "components/google-cloud-sdk-skaffold-linux-arm-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -6535,16 +6439,16 @@ }, "platform_required": false, "version": { - "build_number": 20220708145531, - "version_string": "1.39.1" + "build_number": 20220826172526, + "version_string": "1.39.2" } }, { "data": { - "checksum": "0e59595854af5e6155764988534936671ec904fe512b3acaefa5616c199b27bb", - "contents_checksum": "4d48dbb52dc3b968043cdd39743fbf11e25e67c51cc972a147aafa49d284820e", - "size": 20095248, - "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20220708145531.tar.gz", + "checksum": "03e77aab6192daf99ea8e4287784e26f38c7a9a53f94a47423b0c620914164ff", + "contents_checksum": "11a59052b307e9158369965a3906d011746054ec3e51003d424139a9d859f17f", + "size": 20095599, + "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -6569,16 +6473,16 @@ }, "platform_required": false, "version": { - "build_number": 20220708145531, - "version_string": "1.39.1" + "build_number": 20220826172526, + "version_string": "1.39.2" } }, { "data": { - "checksum": "88d815602c3edbc552bc31fbef5c9808b6a500ecef5d17dc094b9cb746c46ee5", - "contents_checksum": "956bc2c21a1bc72e0f34e83ed952e57aed02409025a706fc9762e85b11e6c736", - "size": 20272472, - "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20220708145531.tar.gz", + "checksum": "9957ced81a76ae854518fc57bbc0b63296d8d24dc397fbcca9d75cf4bc389233", + "contents_checksum": "78a03581dc7cfa2e21db9c7d965d4ade8227d47746b9893c43b341ab4658cce1", + "size": 20272661, + "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -6603,8 +6507,8 @@ }, "platform_required": false, "version": { - "build_number": 20220708145531, - "version_string": "1.39.1" + "build_number": 20220826172526, + "version_string": "1.39.2" } }, { @@ -6690,15 +6594,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.6.2" + "version_string": "0.7.0" } }, { "data": { - "checksum": "2db0f4ccc632952976a8c675915d04e388e5288f1bded0004aa0b4548e5e2f2c", - "contents_checksum": "2bf5561e40bf578793db54c3bbd1ab3cccb1a530867b0dcd01fa8006f902e440", - "size": 52257884, - "source": "components/google-cloud-sdk-terraform-tools-darwin-arm-20220805142045.tar.gz", + "checksum": "df4969bf88bcde124ccf58e3ea4f6c2856c3628a531e6873715dde4be033eed4", + "contents_checksum": "9e328cb6ada661dfb677c6e0568ae2298f0e59f21abbc63af33c30f569173245", + "size": 53471027, + "source": "components/google-cloud-sdk-terraform-tools-darwin-arm-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -6722,16 +6626,16 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "0.6.2" + "build_number": 20220826172526, + "version_string": "0.7.0" } }, { "data": { - "checksum": "ff940b3f7f91e63644da8a8fda134fe13ae65ed9f7f286382005ef762c55eb8d", - "contents_checksum": "e9d997f7dda1a5c7dd0de150573872d096e9ec807106205bd95b95b754ac19ee", - "size": 54400276, - "source": "components/google-cloud-sdk-terraform-tools-darwin-x86_64-20220805142045.tar.gz", + "checksum": "086f3d5c07cd656955422e74991555cc05e275d6e28f05f653ce16eeea81efd9", + "contents_checksum": "b4602929326859a98701b70ee6c9ba7d71b3af98fbdf02a881e1e983c1d377dd", + "size": 55622301, + "source": "components/google-cloud-sdk-terraform-tools-darwin-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -6755,8 +6659,8 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "0.6.2" + "build_number": 20220826172526, + "version_string": "0.7.0" } }, { @@ -6794,10 +6698,10 @@ }, { "data": { - "checksum": "c068789f390d63b85fa827c1925b873d7915668afc3f9d1a8206c6b6b033be4d", - "contents_checksum": "4ee8d2c3524ed33a1b182632737bdce9c4bb4388f3687dd9efb73e26ad088ed0", - "size": 54026742, - "source": "components/google-cloud-sdk-terraform-tools-linux-x86_64-20220805142045.tar.gz", + "checksum": "c78defd4007e3b3a1a87a5779b39d71145f6fc8fa86de5eec158caa28bb2607a", + "contents_checksum": "4298021866825f156ea46eb5db6dda3a2046fb3553c68a1813fd430e1126b4fc", + "size": 55278996, + "source": "components/google-cloud-sdk-terraform-tools-linux-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -6821,16 +6725,16 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "0.6.2" + "build_number": 20220826172526, + "version_string": "0.7.0" } }, { "data": { - "checksum": "c0a861db3267e3031484f56cb57a79b788e8c6dd1ae54e7ae641ae57199c5f0a", - "contents_checksum": "347ce25567f86f1b4c1ddea26309960f5f16fe6b4880881f11805a5502e1c615", - "size": 54067583, - "source": "components/google-cloud-sdk-terraform-tools-windows-x86_64-20220805142045.tar.gz", + "checksum": "49f3e027472ae1ce14955e7a03847900a5fa25a75ec6dac9728aefa17441b0ef", + "contents_checksum": "986d2f4894422b26c9932507e91c656b7f264c55a544f7c1656e9a4a75ef4bd8", + "size": 55295288, + "source": "components/google-cloud-sdk-terraform-tools-windows-x86_64-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -6854,16 +6758,16 @@ }, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "0.6.2" + "build_number": 20220826172526, + "version_string": "0.7.0" } }, { "data": { - "checksum": "976b46cc3e4533ddaa6f9f08960a33e49298ef59a362ad0acf6e7bd4998dc2e6", - "contents_checksum": "655fcf038c69bc6f661d32b9a7c59b6eb5e5a76259924dfbf127aac56311dde2", - "size": 36186213, - "source": "components/google-cloud-sdk-tests-20220805142045.tar.gz", + "checksum": "a070114060f948bdfd1ed7f1947098b042aa260d5123f0d60fa0e145795619c9", + "contents_checksum": "2089133ad95150f0c960621fbd43ce19e12550bf9fc1e83af6f53e08ba99807b", + "size": 36344281, + "source": "components/google-cloud-sdk-tests-20220826172526.tar.gz", "type": "tar" }, "dependencies": [ @@ -6880,8 +6784,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20220805142045, - "version_string": "2022.08.05" + "build_number": 20220826172526, + "version_string": "2022.08.26" } } ], @@ -6900,11 +6804,11 @@ ], "post_processing_command": "components post-process", "release_notes_url": "RELEASE_NOTES", - "revision": 20220805142045, + "revision": 20220826172526, "schema_version": { "no_update": false, "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz", "version": 3 }, - "version": "397.0.0" -} \ No newline at end of file + "version": "400.0.0" +} diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix index f4992b63d5d5..5c634ff61e01 100644 --- a/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -1,32 +1,32 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "397.0.0"; + version = "400.0.0"; googleCloudSdkPkgs = { x86_64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-x86_64.tar.gz"; - sha256 = "1b7ggqc43xyszb583paky4gvph4ncvvwpdy1037dj1ckrd53bg00"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-linux-x86_64.tar.gz"; + sha256 = "0i9xvg26d4rl3nas49rmxbmbwq127nwvgp0di7rszddj63wj7py9"; }; x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-darwin-x86_64.tar.gz"; - sha256 = "0iiyga7b4axkprif5gyqnr8sjkv9nap5lvabgfx5845br7hzr5ps"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-darwin-x86_64.tar.gz"; + sha256 = "0ajywp16105yhxs5hv4cz7vg3jr9wqggb0fcimb23qpvn3xqh6xw"; }; aarch64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-arm.tar.gz"; - sha256 = "102vw2f2q28c54hvn4hlp2da3zsib16z6hkz41079c1pmiybysi1"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-linux-arm.tar.gz"; + sha256 = "0dpl7cd1z05q0mgp5qxn23jjsvjhbfxhpjbd4pmhl62qp8x4m5mm"; }; aarch64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-darwin-arm.tar.gz"; - sha256 = "0hp60fpmsvhn046sp0wb52xszkmin5v235khbxb82wr0vsgnqd7z"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-darwin-arm.tar.gz"; + sha256 = "16lxw3vrydzn36zwvl74akfgxx6m7mrjfd3dc8kvl1wvbbdqqz3j"; }; i686-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-x86.tar.gz"; - sha256 = "1xw4jzl85didin26q9sg7j1pip4bmap5d0ac9ywbj0vni71mqx26"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-400.0.0-linux-x86.tar.gz"; + sha256 = "09mn21ii17h8rfcmkwgmm3wpkiykgw9kc1dxjpaazxvxbmx0bi2y"; }; }; } diff --git a/pkgs/tools/admin/google-cloud-sdk/update.sh b/pkgs/tools/admin/google-cloud-sdk/update.sh index 2630df9bcec1..ce19ef1a6e30 100755 --- a/pkgs/tools/admin/google-cloud-sdk/update.sh +++ b/pkgs/tools/admin/google-cloud-sdk/update.sh @@ -6,7 +6,7 @@ BASE_URL="$CHANNEL_URL/downloads/google-cloud-sdk" # Version of Google Cloud SDK from # https://cloud.google.com/sdk/docs/release-notes -VERSION="397.0.0" +VERSION="400.0.0" function genMainSrc() { local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz" @@ -47,4 +47,4 @@ EOF } >data.nix -curl "${CHANNEL_URL}/components-v${VERSION}.json" > components.json +curl "${CHANNEL_URL}/components-v${VERSION}.json" -w "\n" > components.json From cc0f5950c29950e84a06eb7e9c92aa9b313acd1c Mon Sep 17 00:00:00 2001 From: "M. Ian Graham" Date: Wed, 31 Aug 2022 01:04:01 +0900 Subject: [PATCH 056/173] swayest-workstyle: init at 1.3.0 Add swayest-workstyle, a sway-enhanced workspace name iconifier. --- .../sway/swayest-workstyle/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/window-managers/sway/swayest-workstyle/default.nix diff --git a/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix b/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix new file mode 100644 index 000000000000..1aa3dace7852 --- /dev/null +++ b/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix @@ -0,0 +1,29 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "swayest-workstyle"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "Lyr-7D1h"; + repo = "swayest_workstyle"; + rev = version; + sha256 = "sha256-LciTrYbmJV0y0H6QH88vTBXbDdDSx6FQtO4J/CFLjtY="; + }; + + cargoSha256 = "sha256-34Ij3Hd1JI6d1vhv1XomFc9SFoB/6pbS39upLk+NeQM="; + + doCheck = false; # No tests + + meta = with lib; { + description = "Map sway workspace names to icons defined depending on the windows inside of the workspace"; + homepage = "https://github.com/Lyr-7D1h/swayest_workstyle"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ miangraham ]; + mainProgram = "sworkstyle"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a077ad5cced..a0c918d66103 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28293,6 +28293,8 @@ with pkgs; swaynag-battery = callPackage ../applications/misc/swaynag-battery {}; + swayest-workstyle = callPackage ../applications/window-managers/sway/swayest-workstyle { }; + tiramisu = callPackage ../applications/misc/tiramisu { }; rlaunch = callPackage ../applications/misc/rlaunch { From cfc7e6ddc38e1f757317660dfab8e007ba334340 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Wed, 31 Aug 2022 18:14:54 +0200 Subject: [PATCH 057/173] swiftbar: init at 1.4.3 --- pkgs/os-specific/darwin/swiftbar/default.nix | 46 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/os-specific/darwin/swiftbar/default.nix diff --git a/pkgs/os-specific/darwin/swiftbar/default.nix b/pkgs/os-specific/darwin/swiftbar/default.nix new file mode 100644 index 000000000000..f2cd30fd6f16 --- /dev/null +++ b/pkgs/os-specific/darwin/swiftbar/default.nix @@ -0,0 +1,46 @@ +{ lib +, fetchzip +, stdenvNoCC +, makeWrapper +}: + +stdenvNoCC.mkDerivation rec { + pname = "swiftbar"; + version = "1.4.3"; + + src = fetchzip { + url = "https://github.com/swiftbar/SwiftBar/releases/download/v${version}/SwiftBar.zip"; + sha256 = "sha256-Ut+lr1E7bMp8Uz1aL7EV0ZsfdTh9t7zUjDU/DScRpHY="; + stripRoot = false; + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{Applications,bin} + cp -r ./SwiftBar.app $out/Applications + + # Symlinking doesnt work; The auto-updater will fail to start which renders the app useless + makeWrapper $out/Applications/SwiftBar.app/Contents/MacOS/SwiftBar $out/bin/SwiftBar + + runHook postInstall + ''; + + meta = with lib; { + description = "Powerful macOS menu bar customization tool"; + homepage = "https://swiftbar.app"; + changelog = "https://github.com/swiftbar/SwiftBar/releases/tag/v${version}"; + mainProgram = "SwiftBar"; + license = licenses.mit; + platforms = platforms.darwin; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ ivar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a077ad5cced..35b1666d62da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11269,6 +11269,8 @@ with pkgs; swaks = callPackage ../tools/networking/swaks { }; + swiftbar = callPackage ../os-specific/darwin/swiftbar { }; + swiften = callPackage ../development/libraries/swiften { }; squeekboard = callPackage ../applications/accessibility/squeekboard { }; From ff223193cbf32f75a666f778b090f58bdb8f34f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Sep 2022 01:51:22 +0000 Subject: [PATCH 058/173] python310Packages.gspread: 5.4.0 -> 5.5.0 --- pkgs/development/python-modules/gspread/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 894af68a5537..8af802b25621 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "5.4.0"; + version = "5.5.0"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "sha256-thcrYvqJnj5BmdLQ6hAItkMFVUugjT06lukSOCT97Eg="; + sha256 = "sha256-hiDph+U0AxXyuNjSbPl+RzaoSzMloXx9m8/3BSXcMAM="; }; propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ]; From 3b80d3febbdd35cadf1a204f274ceb583df84b4f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 1 Sep 2022 05:26:23 +0200 Subject: [PATCH 059/173] python310Packages.gspread: add pythonImportsCheck - disable on older Python releases --- .../python-modules/gspread/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 8af802b25621..6bbc951ec9f9 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -4,26 +4,38 @@ , requests , google-auth , google-auth-oauthlib +, pythonOlder }: buildPythonPackage rec { - version = "5.5.0"; pname = "gspread"; + version = "5.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hiDph+U0AxXyuNjSbPl+RzaoSzMloXx9m8/3BSXcMAM="; + hash = "sha256-hiDph+U0AxXyuNjSbPl+RzaoSzMloXx9m8/3BSXcMAM="; }; - propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ]; + propagatedBuildInputs = [ + requests + google-auth + google-auth-oauthlib + ]; + + # No tests included + doCheck = false; + + pythonImportsCheck = [ + "gspread" + ]; meta = with lib; { description = "Google Spreadsheets client library"; homepage = "https://github.com/burnash/gspread"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - - # No tests included - doCheck = false; - } From 51d264ca85b9de57126ccbb6d5c59a3b90087483 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Sep 2022 03:44:51 +0000 Subject: [PATCH 060/173] python310Packages.nibabel: 4.0.1 -> 4.0.2 --- pkgs/development/python-modules/nibabel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index af7564921695..f30f3f56f224 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "nibabel"; - version = "4.0.1"; + version = "4.0.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ih83OjgAWpEcViOWBw1ngu3zTuNsVguWrj/m3Q7VxGI="; + sha256 = "sha256-RcSbU0k1G0X2wEWpGqArTw02dob/MoRjLvlaxluTB4Y="; }; propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ]; From 1790e2514692960c107e2e19d3a3673f6a673126 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 1 Sep 2022 15:53:23 +0300 Subject: [PATCH 061/173] =?UTF-8?q?libharu:=202.3.0=20=E2=86=92=202.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libharu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 7b8a5ac02c89..5860d557407e 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libharu"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "libharu"; repo = pname; - rev = "RELEASE_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q"; + rev = "v${version}"; + hash = "sha256-85o9pb2zJVYbM0SHxCNgJuDkcsHuFuwFe6B6xivoUUg="; }; nativeBuildInputs = [ cmake ]; From 4c41e952a6bf316657eadaee387cd2e0083142e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Sep 2022 20:06:39 +0000 Subject: [PATCH 062/173] libjaylink: 0.3.0 -> 0.3.1 --- pkgs/development/libraries/libjaylink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjaylink/default.nix b/pkgs/development/libraries/libjaylink/default.nix index bf42624f7651..84ce6e9f2599 100644 --- a/pkgs/development/libraries/libjaylink/default.nix +++ b/pkgs/development/libraries/libjaylink/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libjaylink"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitLab { domain = "gitlab.zapb.de"; owner = "libjaylink"; repo = "libjaylink"; rev = version; - sha256 = "sha256-90obLaSE3oxrocyJWZ4+j4U4GuPIZEiiIQqenu4vsJg="; + sha256 = "sha256-odJDE1A0WZ9vBXPxaUdthjTgmbmbdHjbyY1PkaM4+vI="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 5e7a8b1d601b1eeefa7720a9fcafced30cea1aa2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Sep 2022 22:19:06 +0000 Subject: [PATCH 063/173] oil: 0.12.3 -> 0.12.4 --- pkgs/shells/oil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 8702e83cae90..8e82b9df5d14 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.12.3"; + version = "0.12.4"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - hash = "sha256-M8gklc9crdVkQk9vzxO4tG809O0uHOPvvq1l1tzoPt8="; + hash = "sha256-g/j8WePzE23pixhq7w6E6PfoGLGLB9Rp9atThMlxkW8="; }; postPatch = '' From fe7ebd2506d40e3c3a847200e3d3b18ce1ee4921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 2 Sep 2022 00:22:06 +0200 Subject: [PATCH 064/173] vimPlugins: update all --- .../editors/vim/plugins/deprecated.json | 2 +- .../editors/vim/plugins/generated.nix | 244 +++++++++--------- 2 files changed, 123 insertions(+), 123 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index 9bc81a31693e..c2579f6a2a99 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -1,6 +1,6 @@ { "TrueZen-nvim": { - "date": "2022-08-31", + "date": "2022-09-02", "new": "true-zen-nvim" }, "compe-tmux": { diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index da1aa12dabb6..3085fa7ff73c 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -161,12 +161,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-07-20"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "aef58eaa7f328d6f5713a04198c80590bbc4ecba"; - sha256 = "08xacx5n5di51929yiqz51z57ph8scvk4z9pa02r69iq4wa9grzr"; + rev = "1137327cf3b3e357c308ee7a459599f7ccfcb4eb"; + sha256 = "16w4069zwpws9a2fvl9nzlfzxn6sp1cays2r9d3xlk5b0q4v21qd"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-08-30"; + version = "2022-08-31"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "ccc3bab1507427648a0eb99eb8f3e5948027e9ef"; - sha256 = "0svnq4vvb5s4yq20ilpsfki25g8d47zc57h3ddiqibkc1lsyzhmn"; + rev = "18f46aca5cb6265e1468353cf782c1fda28fb9ea"; + sha256 = "0w5xj8qzs9m057ms6q70h8r44lbdvag9q6ldr8xy0a8fnpd5ickl"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -454,7 +454,7 @@ final: prev: owner = "ycm-core"; repo = "YouCompleteMe"; rev = "d4343e8384ffb25d70a9ebc966bbf1277735567c"; - sha256 = "12pgal13zxdmdb6vqbnllxjdk68p9p1c9wvwhqrrwa1jriwijap0"; + sha256 = "0gmc9mnbi4g0vzw911ybkw5q2ph2jhv8hs4a126q1jk2swbc5wkk"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -582,12 +582,12 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2022-07-23"; + version = "2022-08-24"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "411d81776d996f3d6afee07469ebe58248fe9e36"; - sha256 = "0a1a241c2ldkrxyil8d3x67v6f3vqqjnihh6qx8mswg6qdyv60jl"; + rev = "9892a40d4cf970a2916a984544b7f984fc12f55c"; + sha256 = "1dbhvbaiabc8f9p3vfch3pkail2zx234g048mywl005s90d339kz"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -714,12 +714,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2022-08-24"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "5ffd920e9f377f69d956cb8e4e22c90093872e19"; - sha256 = "1a600an1mi31jx9q83lrr0l09q9dl9a8cibwm75kw84svlvirra2"; + rev = "9595471ec75ac26c575e46b3d93e1812df393ee9"; + sha256 = "09nizsrc1wakwxaxwhjbg1qz7wxps2d111v0ldr3m05nkb8h8nrm"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -798,12 +798,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-08-10"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "8c6a2e6e472ff9b7dc0a53d9a3bd88f1fbc7da6d"; - sha256 = "1nc45lp9lszxqjknrhqhjmyialfv6nqb60087snx212wm9igy661"; + rev = "c41ad6e3f68c2c9f6aa268c6232cdef885107303"; + sha256 = "0mdimwsiclpjn2df75lc92ryyjyql4m1x0bvpl629z33hvhlcvs0"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -930,12 +930,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-08-25"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "fb7b17362eb6eedc57c37bdfd364f8e7d8149e31"; - sha256 = "1q0g99099qvl9s9k4vrrb99hg8qpps7k1pzgba5m6ibiqmzny70f"; + rev = "938908fc8db120d907bda23f6744202f534f63e4"; + sha256 = "1wvd7k7xn3lb7fzqhag0mgyjjg50v31qfcdlmbn54dwbf684ra98"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1038,12 +1038,12 @@ final: prev: clang_complete = buildVimPluginFrom2Nix { pname = "clang_complete"; - version = "2022-07-08"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "xavierd"; repo = "clang_complete"; - rev = "813aa270bd390bf64f03dc34f98834fb726a707d"; - sha256 = "1kjr2qb431xqr8bzmb5bzd98mym4s4azr0h2qlgm7cqqpmh19i0m"; + rev = "e25b6a54e5cf648eb36d5be5b82c1bbb22260fde"; + sha256 = "0ik55akiyivq70a0jds35f8jqvs78mzxq3b302vhyq07w44mk7vx"; }; meta.homepage = "https://github.com/xavierd/clang_complete/"; }; @@ -1242,12 +1242,12 @@ final: prev: cmp-fish = buildVimPluginFrom2Nix { pname = "cmp-fish"; - version = "2022-06-23"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "mtoohey31"; repo = "cmp-fish"; - rev = "8ce7517d74c11a55bf2d0e52e4649e49cea6c7a1"; - sha256 = "0nlcx39hycl15bw1vn35lcw0lmgckn396m2pwfk22lyijdqdgnlk"; + rev = "8ae7bfb1b3251d433c4adf4e64396ef929fbd91f"; + sha256 = "02yvzj7n8j20x6hxbgj7jy2ddhfqbccg6bg9hfl2yg67prqmz7p5"; }; meta.homepage = "https://github.com/mtoohey31/cmp-fish/"; }; @@ -1506,12 +1506,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-08-21"; + version = "2022-08-30"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "14e287b5b1434cef322de9cc1ec6fda13b913f45"; - sha256 = "1mvydmhwx240wpbvfmm8lrb2iny08sxz18zx9z8g9bvmhi4mp1ww"; + rev = "f2ea9c0824d389d588966c64c146d324138a443c"; + sha256 = "0d80lyjpsxn3cny66l280q20pkljh9h92wpa3iyyhj8g49zcihmw"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1710,12 +1710,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-08-30"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "16973b9cc6e4e29a713f8556f8603585730d58db"; - sha256 = "1v4061g51s67rd1kw5nvglkyy6jgpv578kqf5s1nxlrrm49fa4f5"; + rev = "19c0fbd07ec559fd7bfacb7b6d99aa04b984e4da"; + sha256 = "0kicvgz75178mcy5922ggrfrfdkyyjpwzcx6k5mlvw38fvccazf0"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1782,12 +1782,12 @@ final: prev: command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2022-08-30"; + version = "2022-08-31"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "f862693a674fec84617b3bc86e8b71d4df1c05e2"; - sha256 = "0xz5gzq7vxs80pgxx63bnpcs0b24xs9zg001dxphb219lqad8cii"; + rev = "a61574dabc9076bac869b56c1819fa47e4d64cf0"; + sha256 = "0lsimnn8ppaxq0w0sypzj20jrsfxb984q2mdxycclczp8p0hsawc"; }; meta.homepage = "https://github.com/wincent/command-t/"; }; @@ -1938,12 +1938,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2022-08-07"; + version = "2022-08-31"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "08236a13164a948fe403f34fe1f593ead0a3c6fe"; - sha256 = "13iqzsj4x5fyzd40119jcng5vlz35y3ylrndiqwl62qj4pk4xqjb"; + rev = "a8686aa6f8760bd3cd4f219a8a4101af037c9d9b"; + sha256 = "0w74571l9hnds4f57fbs0p0snfbdavy052304yazjfxlmyppfrwf"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1986,24 +1986,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-08-31"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "828d8bfe5b95814de538fb36db9765c5a83fa1b2"; - sha256 = "0bjpbd4larz41jxy3bwww58vvf2fqvw8siph8kw2nd06mlkb96qn"; + rev = "446f10b15a3df79d0dd2e03af9aa51efa5202db1"; + sha256 = "03wcdjar3g8ajf0bsp24fg6qnqpxqw87djg9bjc6q811kk2y9rqi"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-08-31"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "a6694b983faa626075e0fa9588d85b147c1e4071"; - sha256 = "09armjhxqyhwhgl63r2dqqwm1xl05820da2wrwrafwr211dgjqr4"; + rev = "6e91fceca1addcbda590eaefe79b40dae3390f60"; + sha256 = "1yaxnnyywm0770sj6vm3ffbqyyqq9lfmfkwnn37ldjrnd1a4nb0z"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2022,12 +2022,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-08-31"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "699619de6b964700b89967d20b539ffe4f4abeec"; - sha256 = "0ap4npxkmrx9r87qrkf10xpmmha8bw4p1chdx3wq273rmigccp1n"; + rev = "ba5e0b14fa29e1eadcd527638d68231f25cd0c6a"; + sha256 = "0lg6a0h4k94ipy3da5h1pfckdsw99fmc5fdddzg1wxvbbs6vfsvz"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2516,12 +2516,12 @@ final: prev: diaglist-nvim = buildVimPluginFrom2Nix { pname = "diaglist.nvim"; - version = "2022-01-11"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "onsails"; repo = "diaglist.nvim"; - rev = "6c43beac1ff07f6ef00f063090b5a6c9ed11b800"; - sha256 = "1a10hmz38g3lpf1xxsk3b62vr16iaz5z5yqvk21m9bpai871fv1r"; + rev = "afc124a0976d56db43cc840e62757193ccab7856"; + sha256 = "04virm388yi2lrq8bi6331m7q7lj46wrlh8pd8js6q7ylkvz6qfq"; }; meta.homepage = "https://github.com/onsails/diaglist.nvim/"; }; @@ -2540,12 +2540,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-08-29"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "f4931669d2cfe16c2bff6443fd7b12c9aa8687a5"; - sha256 = "1h9ld41kf1l8j5wwics19ym1h2aivdmdawi81arfam7s6qg1n154"; + rev = "adc3250d65a5a12c3ebf8f85ff483a4cb8609c41"; + sha256 = "10lsi4ms24zhhx9dfxfihz656fkjjkrxj77h9nnhggsxsjpqp9nb"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2576,12 +2576,12 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-08-28"; + version = "2022-08-31"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "f38eb335729162905687becdd4e200a294772ff5"; - sha256 = "0bnr7m807knl0b7wx3cyvxlv7hk1pws7d1rbhfdvr8kjs5vd6p32"; + rev = "9cdb3e0f0973447b940b35d3175dc780301de427"; + sha256 = "159kh9g6hm51blqi5g23w463jz2hnnskppm352s8ic9h239dm3ak"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2617,7 +2617,7 @@ final: prev: owner = "editorconfig"; repo = "editorconfig-vim"; rev = "d354117b72b3b43b75a29b8e816c0f91af10efe9"; - sha256 = "12qvximadgb9z2i0hgvj4p4nxaqk0aqbnaqpafpma73xyb23hx5v"; + sha256 = "1kgxz82lkssxflylylk9z10aq6qps45z27k24i8kf29wzpf5b3lr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2686,12 +2686,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2022-08-30"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "902196bf48b085ca8036f4d3009dfd4944f9d56e"; - sha256 = "1p4zlnyzi1dyynjh63173xh7sfqyzvz9hra8ysfjs7j0s1fx8499"; + rev = "c60a594cc4adbfb863d3186f730765b0e1cb85eb"; + sha256 = "1b2jhm9yksmkri894sfzrqhsms06vhg3acr98qaqs9y30mabcb88"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2823,7 +2823,7 @@ final: prev: owner = "andviro"; repo = "flake8-vim"; rev = "5bc93f7f26ceb18ccbe116830eaf8ff2baa63994"; - sha256 = "142pgasl0b64a0zxmspdsi636axrgvdx6rh3hwjrb1zlsck19y1a"; + sha256 = "1s7rb2ygky1jjjqpwhzp5lsf7js1g0yhnbf6x5lfwygz6646xpy3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/andviro/flake8-vim/"; @@ -3071,12 +3071,12 @@ final: prev: ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2022-03-26"; + version = "2022-08-31"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "f48626bf5b64067a84b644bcc56afac686046966"; - sha256 = "0v2m05980r5zq77b11nghjgz0yr70a88gd7jv0d0iy2z6ah63sxv"; + rev = "2ee828d864ea81900b38c375d4bc4cd3657fe6fd"; + sha256 = "1sgskxl6yf6c4bls6wf3hlqww48h53m3a9wyypy6mx303k2qcl2c"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -3167,12 +3167,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-08-22"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "1e107c91c0c5e3ae72c37df8ffdd50f87fb3ebfa"; - sha256 = "0qg2y796mkkisyab6br4p0d6blx8ispglpphpdlmf14hp9si56bp"; + rev = "d7e0bcbe45bd9d5d106a7b2e11dc15917d272c7a"; + sha256 = "1h4gxyamynwygxpqfib2a7sd1xbi6sh8ixg85j6qiaqqpahr0a4k"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3755,12 +3755,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-08-24"; + version = "2022-08-31"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "ec3b133414388b0bfea3f33ca0bff10538aef8ac"; - sha256 = "0d04vkias6vlxjjvlf16f8znviwgym83b2bp2rrfhdp3i7q4gmyx"; + rev = "5f1203f4606e3208f6dd156c03f498d9fadcf1a8"; + sha256 = "07jl5vf9mbz2bi1w6xm4kvxd18g3diq5ay2yrcc1m5nfki82r3si"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -4234,12 +4234,12 @@ final: prev: lua-dev-nvim = buildVimPluginFrom2Nix { pname = "lua-dev.nvim"; - version = "2022-05-12"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "folke"; repo = "lua-dev.nvim"; - rev = "f5c31936fe06fcbeb59b98f69f74f9c2f91abaec"; - sha256 = "0vwpi3cg0gv17w3bm2vlzspsms1rn2yjrzkq2zvf2f4slqq3rfpw"; + rev = "d8b800ee7376c9299f14544325a1e76f220fce3d"; + sha256 = "05m6zr4v6xr6pbwigcb7lfxx1167d7nailf8w04sscjr8w2mpv8l"; }; meta.homepage = "https://github.com/folke/lua-dev.nvim/"; }; @@ -4727,12 +4727,12 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-08-23"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "b3976412a63b44a171824ac9e1b4595354d99d98"; - sha256 = "006h02bvlffb6z5m7b2nxlb3rbqd32xjdkckkgzfrbyvsjviflq1"; + rev = "0ae951121da29a157d80db70c32679b428afffdc"; + sha256 = "1nslf2wfj0z4qq7zgqcx62gb31px6sqqb8rk1a10j3ply5bc7r67"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -4799,12 +4799,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-08-30"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "4b8c20d083e49a4464424e6363dba9349c44b7d3"; - sha256 = "1w8fcvg2ig1ajaz9x4mmi92jgzc33rnqxscahcccl4h67870xsgj"; + rev = "d4e771d574af2633a59496440161c0196e1c71d7"; + sha256 = "0d3jki67bybyccmpb73f0m660wav69g9xzaxqzskaycmg7x4jrbn"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5699,12 +5699,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-08-31"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "501db1459a7a46cb0766b3c56e9a6904bbcbcc97"; - sha256 = "1m46jmk3wflsfqpdkiczlfplyfvmxnvrak59rmf0cmkqsq16ysrh"; + rev = "7845f31839b844653736eed6dd284c862156d679"; + sha256 = "11biavpv32xh3ziw5wifav7imibq2m149fsrmhgg4l3ymspkyl0q"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -5747,12 +5747,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-08-30"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "6dcd228384be6fa95199db57cccf27dbd4c743a5"; - sha256 = "0l2l7r4kl2j9mvjiij419hdpghv410d5jqfqrp52l74vw703j294"; + rev = "b2ba68ee777fc1926fc66d533f61071ddba05ee2"; + sha256 = "15bgqk8nqdb69jvccmnlhdyqzhzv46zg2y267qx55as0mcf8pxgn"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -5843,12 +5843,12 @@ final: prev: nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2022-08-25"; + version = "2022-08-31"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "51982c916aae738b50321e23c286235f9c9fe9b9"; - sha256 = "15g3823igm1k8wpkkn4mkk4xic4vrw74wpm8smm36gmy0pd04wlw"; + rev = "23bfd686ccc71c0b0082c06be90e4513c21f6488"; + sha256 = "1fffdyy9ypfipy7n9mab8bc7ndal145m02a664smi853zkxwh2k7"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -6023,12 +6023,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-08-31"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "b32b982d52664a0a6c5a43a5f9934f001d722d4e"; - sha256 = "122rpg6611k2yi8gycxnn3ylqblqkmbi5w3jnkgin4vnspn8hd0a"; + rev = "b356e3836cfaf27e19874f1b5b81eb227ef161f4"; + sha256 = "0fkx8gc2h9fh172if4x7cq0baizr098g1yzyygf462wfr5ds2anf"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -6269,7 +6269,7 @@ final: prev: owner = "python-mode"; repo = "python-mode"; rev = "85d2cd1a196ac1def79d4599b5be69395ed5b603"; - sha256 = "0jk8pssliyar4qs42x9m1jgri446cr4yc7iv8l9wc9xn6r3qnm29"; + sha256 = "0gr4ag5qymdpx0mlfvx743y4s8bjd7v4a0yzd02jvmz3dyylvavw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/python-mode/python-mode/"; @@ -6589,12 +6589,12 @@ final: prev: satellite-nvim = buildVimPluginFrom2Nix { pname = "satellite.nvim"; - version = "2022-06-26"; + version = "2022-08-31"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "320e3c54b507486e3ed0c9dacc656fdf54b40057"; - sha256 = "1qkx0mcrmqgvpx9gmncblkm7km4ap3hvkcp65dqc9nn2h4w63hvy"; + rev = "25d0c59edab4892363c3cec47fc5f34769e5a242"; + sha256 = "1frnkh6ny4dxia793jkmv95wvvivmyp5296sg68vbf043hwny4a3"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -7149,7 +7149,7 @@ final: prev: owner = "codota"; repo = "tabnine-vim"; rev = "e27face391a4d9a3e43ff251010f77deddf0c88d"; - sha256 = "1y5haygvixnav9cck49yvvm14afyy5gyq8rwiybqvkd6vfxlv99f"; + sha256 = "1204ibnsdksihyvnql22sarn2xgqajwvr0d975bnp35n593chymq"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -7675,24 +7675,24 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-08-30"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "cd3b4d67112fbc8bee01ea44ba5ad1eea3894714"; - sha256 = "015f8qy7s0lkhcqh4jy14m2vhxhcz9vnn7h76lbqhzrq37l2lkya"; + rev = "b402342665ee06e127c304e245f03143357a58c4"; + sha256 = "1q9pw0sp5qg596571yfcbq4mfrylrsrr968s35yvbgnsw4fw1d2w"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2021-12-31"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "8223c970677e4d88c9b6b6d81bda23daf11062bb"; - sha256 = "1rzg0h0ab3jsfrimdawh8vlxa6y3j3rmk57zyapnmzpzllcswj0i"; + rev = "791c2a219a9425a5817fafc2dd2dcf65c4a0abde"; + sha256 = "0hp95fsh0ld6icw5dmj45w1a9f1j39z64bzshw3vqj7w2d86q87m"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -10606,12 +10606,12 @@ final: prev: vim-nixhash = buildVimPluginFrom2Nix { pname = "vim-nixhash"; - version = "2022-02-06"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "symphorien"; repo = "vim-nixhash"; - rev = "d6e3c5161ef2e3fbc4a4b68a785d958d97e25b7e"; - sha256 = "1mrprl6mqapjzcya643nzvwaf01r38knjg9xnfbpvlidfq38d3cw"; + rev = "e03af8d0c1bae3c015ffdb45ce79556c0561e59d"; + sha256 = "1kdg84666gf1d3qiwwqmk7nwshspr2kpb8hjyh2m0nx0zmjji2ij"; }; meta.homepage = "https://github.com/symphorien/vim-nixhash/"; }; @@ -10774,12 +10774,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2022-06-20"; + version = "2022-08-31"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "360ccdc01b18cd434588c34e15e5ea382b436de8"; - sha256 = "14phavx432h16bdm7m99a21xz2gb1s47fd5g8v2b5ig12l4yss92"; + rev = "849c67adf24a86935b8be62860ad9acb00cf4572"; + sha256 = "1f23accmz82835kxvfsksjp77w9khkbcp4064c646p90ck194lji"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -11578,12 +11578,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-08-30"; + version = "2022-08-31"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "569c72257910b5b6f5e915b46d0978f73dbfa90a"; - sha256 = "0scarxqsbi91qvfi5vzn0wgbxpx4i50mq63byly4jn74pgdsha00"; + rev = "a6d2976f05cf31da5f4ebceb4b6f9fe2e0ec7c34"; + sha256 = "0rnqm7l264h6x6jf9644jk168bphnhpb3dbfymgpz8613psh7fza"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -11819,12 +11819,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-08-25"; + version = "2022-08-31"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "2da8d59fdc46d1af7b7105a578d1ace3924d1a7b"; - sha256 = "06csh1a6kq7744gaigkahdqvlwqjga7w672cm0aw6yylwpwz27nn"; + rev = "7401804603e074ae65f19d16daf312369b153028"; + sha256 = "0kf67vayak8xqy0fykqxx9zkavf54vf4y7bsm42zf9ad1havhacy"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -12504,12 +12504,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-08-28"; + version = "2022-08-31"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "d8f507b83d65ef1686233da18e91f16819e84beb"; - sha256 = "123l773jrqy28mi03m8k1kvqf0y2yhdhs22dl7iwcr14s71qq234"; + rev = "aa52fa6b2711347a8d3b364d2e64f608207d8710"; + sha256 = "00gih8v5f2mjmzmsns0prw00b4izx0pl08h47hln7ljjfq5v8npn"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -12829,12 +12829,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-08-28"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "d4aa577d07197c4ca32f3bafb0aebb5b4b7dec9f"; - sha256 = "1kvm7xgi3jdgn0xqcd1ynjysmbzdg2xmfzqmkpn87f7lyi4ihb9s"; + rev = "ddae70a80590dc3ee1c2605010abd82c615c1172"; + sha256 = "1jh9h18bgxy68wd2fw3q9vxjgnlh8653528qbwzdwrjlvwsz0qdf"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -12853,12 +12853,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-08-31"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "27e5f9708c1347a3e9e6abb20eff0354f008544b"; - sha256 = "1cn8swfhmp8pw0pwpwlf7hwji3f5nwzl0wv2mr0yn9bnpc1857b8"; + rev = "75d9335bd79bf9de6fdde974083ae7edb16d8190"; + sha256 = "1d92vj2vmnz881gqn10za5jbs47rlslkpfvbz6a5nmyjphz8fx06"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; From 4a046ce1c57e188b72e0762b2b021565e56a475a Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 1 Sep 2022 20:34:59 -0400 Subject: [PATCH 065/173] mercurial: 6.2.1 -> 6.2.2 --- pkgs/applications/version-management/mercurial/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 7e69bab2f122..4f3fa12b9a45 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-isXXog0cKtVNTCY9E0FkZG3DSo46a+1pz76rr404gto="; + sha256 = "sha256-nvqdpfSXqHUKycSPpDHEq3IgnxNgGAxdSSDRMRsEIN8="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-shmeTQSCpQLrRUbL5bu9nAiPideZUe31YNCrClLM1eI="; + sha256 = "sha256-hvjp45Iv+fjs8R5Q+k96chY5j0S2Vs6+VrXzMuc2Cwg="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; From 6a66bbf1b9ec4cdc4e4ee49bb8bf8508aa205289 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Sep 2022 00:40:50 +0000 Subject: [PATCH 066/173] python310Packages.aliyun-python-sdk-cdn: 3.7.1 -> 3.7.2 --- .../python-modules/aliyun-python-sdk-cdn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix index 7a34db334fab..9303f985022a 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-cdn"; - version = "3.7.1"; + version = "3.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GAY4o9lr+1m8g1T7EhL5jLjEdfMWC/1vJ3UC4PQzvjI="; + hash = "sha256-wbVkoNu9ffMpuivUGg+PAya099xMbU0Ehvl0++ud+WE="; }; propagatedBuildInputs = [ From 136923de17eb7b5503dc66a9bc45b76b3dc63524 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Sep 2022 00:46:18 +0000 Subject: [PATCH 067/173] python310Packages.bincopy: 17.10.2 -> 17.10.3 --- pkgs/development/python-modules/bincopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bincopy/default.nix b/pkgs/development/python-modules/bincopy/default.nix index d5ec4774010c..df6f31450d6f 100644 --- a/pkgs/development/python-modules/bincopy/default.nix +++ b/pkgs/development/python-modules/bincopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bincopy"; - version = "17.10.2"; + version = "17.10.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-d1l+kqyGkBvctfKRHxCpve/8mLa7nTfDwXzxgJznce4="; + sha256 = "sha256-HDSqwrCXf2U0uzfa4Vb9Euu9ZSm6eFD9bcMf6eieicY="; }; propagatedBuildInputs = [ From 66d3ecbc5b6e83e1c5145805e5805e817a85cb2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Sep 2022 01:04:22 +0000 Subject: [PATCH 068/173] python310Packages.bids-validator: 1.9.7 -> 1.9.8 --- pkgs/development/python-modules/bids-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index e59c8baa511f..69c0d605c59a 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.9.7"; + version = "1.9.8"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "sha256-q8dnOSoN9Gu9yl/UJNRXeTBBKTnfJhHwqN6+QVTlexI="; + sha256 = "sha256-/zl5m7IF+S1vLDIvC47/DRwCiPQpGgsY/OYa+k39fz4="; }; # needs packages which are not available in nixpkgs From 84714ab62fa9dc1d17b2cafbf53297ca53ce1afb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Sep 2022 01:05:26 +0000 Subject: [PATCH 069/173] python310Packages.django-configurations: 2.3.2 -> 2.4 --- .../python-modules/django-configurations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index 4bddb62bdd1a..a57308dcfb4f 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "django-configurations"; - version = "2.3.2"; + version = "2.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "bd1a77a60735839b7d105912cc3977735fa005ea06544c632fbd322d1e021677"; + sha256 = "sha256-IrmWTmtlfa/Ho1QQoRXSDxRRFJqCc3rcbDMew2WIgZY="; }; buildInputs = [ From 22725789d7ba0ef2f9789a248c2e27cd3acdf2e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Sep 2022 01:16:23 +0000 Subject: [PATCH 070/173] python310Packages.google-cloud-compute: 1.4.0 -> 1.5.1 --- .../python-modules/google-cloud-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index 6607dde52553..6e4e2d283f6f 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.4.0"; + version = "1.5.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0sgp0xa9cfmgyb1dwdy1f4q9dfr3lgsgm7vbiks9xmiaf0fr221m"; + sha256 = "sha256-1crkhcf56U6DAx9xVG2e9hCxQ04OjQq2QgLs434cCv0="; }; propagatedBuildInputs = [ From 817c66617087752bcbb75a5defcdb7519d2fd12c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Sep 2022 01:47:08 +0000 Subject: [PATCH 071/173] python310Packages.mkdocs-swagger-ui-tag: 0.4.0 -> 0.4.3 --- .../python-modules/mkdocs-swagger-ui-tag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix index df7ecd71697f..2997e93ce0b9 100644 --- a/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix +++ b/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "mkdocs-swagger-ui-tag"; - version = "0.4.0"; + version = "0.4.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-4fPn+WDHMAo3cywrMs/EoSFoBEnMYdofAeAkgwOIAb4="; + sha256 = "sha256-N/7JhVX3STsUAz7O6yWkvKz72+3RZA5CNb3Z6FTrdRs="; }; propagatedBuildInputs = [ mkdocs beautifulsoup4 ]; From 4805a9413b9ffc6ecfde61d8da1e9cd67e8b165e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Sep 2022 04:26:19 +0000 Subject: [PATCH 072/173] python310Packages.sphinxcontrib-confluencebuilder: 1.8.0 -> 1.9.0 --- .../sphinxcontrib-confluencebuilder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index 9a8c65377b3d..d8bb9db6e841 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-confluencebuilder"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - hash = "sha256-u+sjhj/2fu8fLGRb2zgnNI+y7wIIUYTMJhRekrdtMeU="; + hash = "sha256-aj+8/ZOWpT1zBdCTit6Zo/XhnzFisLk/rrg5l6sPmkw="; }; propagatedBuildInputs = [ From ac25645adcc794bb57b7714ca1adf777153adc2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Sep 2022 07:28:24 +0000 Subject: [PATCH 073/173] arkade: 0.8.38 -> 0.8.39 --- pkgs/applications/networking/cluster/arkade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 80c067c14a8f..a36620382430 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.38"; + version = "0.8.39"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-8C7aQCQ6kqHCGSktYS3djTlEuPyRnzb9LrXkqgfzDyY="; + sha256 = "sha256-ucM4Dl4ZeeZ6pCQ3qdf3Z88CWJIoreZWeo6ehKqXxI8="; }; CGO_ENABLED = 0; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-ok8NuqVFZtzjSLpgxQI03ISojfKdHPHWyikqwtceMlo="; + vendorSha256 = "sha256-TUaCqHbPEwhB2xS8RSoF7RCSkKFJzQKbuV1PbxApyMQ="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ From 18d20b5598bcd237b1714c31e4b948ab06629bae Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Fri, 2 Sep 2022 11:28:51 +0400 Subject: [PATCH 074/173] netbeans: 14 -> 15 --- pkgs/applications/editors/netbeans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 1fd1e2cbf565..a004598fe846 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "14"; + version = "15"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - hash = "sha512-AEuUOiVCvZh4SjghQR2j8LBIubEBzEaZqWsb93icZU9K1sc6ddUanLD0NsQhzjK6oK1EDv5GG9PmqOXo6Sf1xg=="; + hash = "sha512-WxqAQiPKdMfQCw9Hxaa7K2VIGTJj+Hu9WO2ehG4yQUkHBd+l0f0siLKk/i2xqLE1ZA522rxKud6iwXDuAsjjDg=="; }; buildCommand = '' From 10461fa3160c271867416816cfc69b76c02a5fe0 Mon Sep 17 00:00:00 2001 From: kilianar Date: Fri, 2 Sep 2022 11:45:36 +0200 Subject: [PATCH 075/173] cadical: 1.4.1 -> 1.5.0 https://github.com/arminbiere/cadical/releases/tag/rel-1.5.0 --- pkgs/applications/science/logic/cadical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix index c6b1f6652451..7052d3fce0df 100644 --- a/pkgs/applications/science/logic/cadical/default.nix +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cadical"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "arminbiere"; repo = "cadical"; rev = "rel-${version}"; - sha256 = "0y44z3np4gssgdh4aj5qila7pshrbphycdxn2083i8ayyyjbxshp"; + sha256 = "sha256-Po+pGoUwk1gtBqz4Sc/QQ52rRGbA2pATebX+KPYII5o="; }; outputs = [ "out" "dev" "lib" ]; From 35657ce4a667e00bc1e837aadf9c023877dcab69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Sep 2022 10:22:16 +0000 Subject: [PATCH 076/173] cbmc: 5.64.0 -> 5.65.0 --- pkgs/applications/science/logic/cbmc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index 53a0330030cd..d05db5db2cc1 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.64.0"; + version = "5.65.0"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-FQoUNJV5eq/qGc6fdNlMHQADGipx9dxkb4EFRNX7h6w="; + sha256 = "sha256-A2xMbRblDXyhUXGDVxNBxFbs9npQJpMUBCPAloF33M8="; }; nativeBuildInputs = [ From 0311e1acfdec25d0b7e39a1239a7dbc2054b9dbf Mon Sep 17 00:00:00 2001 From: zendo Date: Sat, 16 Jul 2022 12:47:37 +0800 Subject: [PATCH 077/173] mangareader: init at 2.0.4 --- .../graphics/mangareader/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/graphics/mangareader/default.nix diff --git a/pkgs/applications/graphics/mangareader/default.nix b/pkgs/applications/graphics/mangareader/default.nix new file mode 100644 index 000000000000..5ae270cca8c1 --- /dev/null +++ b/pkgs/applications/graphics/mangareader/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, wrapQtAppsHook +, extra-cmake-modules +, cmake +, kio +, ki18n +, kxmlgui +, kconfig +, karchive +, kcoreaddons +, kconfigwidgets +, nix-update-script +}: + +stdenv.mkDerivation rec { + pname = "mangareader"; + version = "2.0.4"; + + src = fetchFromGitHub { + owner = "g-fb"; + repo = pname; + rev = version; + hash = "sha256-j5b2O5OgDRaaxNssknTTgVscudk1+mFlGQN5KE6CwcU="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + wrapQtAppsHook + ]; + + buildInputs = [ + kio + ki18n + kxmlgui + kconfig + karchive + kcoreaddons + kconfigwidgets + ]; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + + meta = with lib; { + description = "Qt manga reader for local files"; + homepage = "https://github.com/g-fb/mangareader"; + changelog = "https://github.com/g-fb/mangareader/releases/tag/${src.rev}"; + platforms = platforms.linux; + license = with licenses; [ gpl3Plus cc-by-nc-sa-40 ]; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62fe8ba56ae4..0eb91050a0ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8489,6 +8489,8 @@ with pkgs; mandoc = callPackage ../tools/misc/mandoc { }; + mangareader = libsForQt5.callPackage ../applications/graphics/mangareader { }; + mangohud = callPackage ../tools/graphics/mangohud { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; mangohud32 = pkgsi686Linux.mangohud; From f5a0e53bfdd07e5889563852ae33c25460cc7a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 2 Sep 2022 12:32:00 +0200 Subject: [PATCH 078/173] gojq: 0.12.8 -> 0.12.9 --- pkgs/development/tools/gojq/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gojq/default.nix b/pkgs/development/tools/gojq/default.nix index ab9dc5270d8c..14ec4ca792b7 100644 --- a/pkgs/development/tools/gojq/default.nix +++ b/pkgs/development/tools/gojq/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "gojq"; - version = "0.12.8"; + version = "0.12.9"; src = fetchFromGitHub { owner = "itchyny"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WcPvsThYgXwYXwXyylOqopTZOfsXmDU4wbhEdS3neA8="; + sha256 = "sha256-AII3mC+JWOP0x4zf8FQdRhOmckPgY7BDRoKICCFkn9Q="; }; - vendorSha256 = "sha256-fFW+gWdGMxDApcyR6dy0491WvQcVMAJ5dgMQqgNmOkw="; + proxyVendor = true; + + vendorSha256 = "sha256-kq9vfmST8M69yiWqzsM/ORG7F7ERtEv9dyfy8u3sWYk="; ldflags = [ "-s" "-w" ]; From 6bc4b4a5414c5e0bffd07fc5c175667ac422ccfc Mon Sep 17 00:00:00 2001 From: devhell Date: Fri, 2 Sep 2022 14:05:37 +0100 Subject: [PATCH 079/173] tuifeed: 0.2.1 -> 0.3.2 --- .../applications/networking/feedreaders/tuifeed/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/tuifeed/default.nix b/pkgs/applications/networking/feedreaders/tuifeed/default.nix index 300bb84c79f1..89494bb6d017 100644 --- a/pkgs/applications/networking/feedreaders/tuifeed/default.nix +++ b/pkgs/applications/networking/feedreaders/tuifeed/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "tuifeed"; - version = "0.2.1"; + version = "0.3.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-QMjMJVr+OI/5QQTwNVpUQdnYSWpWmZMuEcg5UgPpcAk="; + sha256 = "sha256-JG/l6NfN5RqBpz9NVcVY3mP/iE31TXvw+Vjq8N8rNIY="; }; - cargoHash = "sha256-NPrROFV2Yx4p4CocVMY2dPAlgcdZrZQfa779beLAbcI="; + cargoHash = "sha256-QKSNbpVRtSKp2q1jVPYTS8XCMtQAyg3AWvD/6+OjI7Y="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 4cb85d54890f8cfc8c652dbb1392eb695cdb245f Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Sun, 28 Aug 2022 21:34:25 -0600 Subject: [PATCH 080/173] git-sync: only include inotify-tools on linux --- .../version-management/git-and-tools/git-sync/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index 83314802ca91..9180db63a813 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -21,13 +21,12 @@ stdenv.mkDerivation rec { cp -a contrib/git-* $out/bin/ ''; - wrapperPath = with lib; makeBinPath [ - inotify-tools + wrapperPath = with lib; makeBinPath ([ coreutils git gnugrep gnused - ]; + ] ++ lib.optionals stdenv.isLinux [ inotify-tools ]); postFixup = '' wrap_path="${wrapperPath}":$out/bin From e1dbd6e7c5a4040a72c1598e4d59eda42db3733d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Sep 2022 15:10:32 +0000 Subject: [PATCH 081/173] intel-compute-runtime: 22.34.24023 -> 22.35.24055 --- pkgs/os-specific/linux/intel-compute-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 3908d0056b9c..177a9d58e2d4 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "22.34.24023"; + version = "22.35.24055"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "sha256-stiFH1eNi+SlgL/Y2p5p+zLN8XeES/77yaG5fFpJges="; + sha256 = "sha256-MOWlhzhEGYyHGk6N+H7O2BLho4YFyvcCbj/zafhzLEw="; }; nativeBuildInputs = [ cmake pkg-config ]; From ce0d078683feea90245525943a3d9b678fb421f6 Mon Sep 17 00:00:00 2001 From: kilianar Date: Fri, 2 Sep 2022 17:12:23 +0200 Subject: [PATCH 082/173] super-productivity: 7.11.6 -> 7.12.0 https://github.com/johannesjo/super-productivity/releases/tag/v7.12.0 --- pkgs/applications/office/super-productivity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index 5836dba54c12..18091b82afaf 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.11.6"; + version = "7.12.0"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-BXRnc6c/PpFdF4gPemU6IzVQvr+Tl5Fbxz7mY6Z5u7o="; + sha256 = "sha256-Ms7wt79iZz0xnrp+yrFs/FzVqINe6BSOEmYG9Oiz5JU="; name = "${pname}-${version}.AppImage"; }; From 589ddec5746d751d5a65539e5d45e73351a49679 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 2 Sep 2022 18:50:10 +0200 Subject: [PATCH 083/173] nixos/dokuwiki: Update module --- nixos/modules/services/web-apps/dokuwiki.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index d8fc978774e4..bd251a43779f 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -318,6 +318,7 @@ in "d ${stateDir hostName}/cache 0750 ${user} ${webserver.group} - -" "d ${stateDir hostName}/index 0750 ${user} ${webserver.group} - -" "d ${stateDir hostName}/locks 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/log 0750 ${user} ${webserver.group} - -" "d ${stateDir hostName}/media 0750 ${user} ${webserver.group} - -" "d ${stateDir hostName}/media_attic 0750 ${user} ${webserver.group} - -" "d ${stateDir hostName}/media_meta 0750 ${user} ${webserver.group} - -" From 1e54121c6415ce22e853ed0c8b6cf05400cd1c61 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sat, 3 Sep 2022 02:44:02 +0300 Subject: [PATCH 084/173] boulder: 2022-07-11 -> 2022-08-29 --- pkgs/tools/admin/boulder/default.nix | 59 +++++++++++++++---- .../admin/boulder/no-build-id-test.patch | 15 +++++ 2 files changed, 62 insertions(+), 12 deletions(-) create mode 100644 pkgs/tools/admin/boulder/no-build-id-test.patch diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/tools/admin/boulder/default.nix index b22e3559a8c5..7629cafec187 100644 --- a/pkgs/tools/admin/boulder/default.nix +++ b/pkgs/tools/admin/boulder/default.nix @@ -1,30 +1,33 @@ { lib , fetchFromGitHub , buildGoModule -, gitUpdater +, testers +, boulder }: buildGoModule rec { pname = "boulder"; - version = "2022-07-11"; + version = "2022-08-29"; src = fetchFromGitHub { owner = "letsencrypt"; repo = "boulder"; rev = "release-${version}"; - sha256 = "sha256-fDKB7q2e+qdHt+t/BQWX7LkpyiZQtZSHp/x5uv0/c7c="; leaveDotGit = true; postFetch = '' cd $out - git rev-parse HEAD > $out/COMMIT + git rev-parse --short=8 HEAD 2>/dev/null >$out/COMMIT find "$out" -name .git -print0 | xargs -0 rm -rf ''; + hash = "sha256-DiO7sOcTd8aOld4Pqd0D7yTPrRh/Mhg25I63Vb/gHhM="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "cmd/boulder" ]; + patches = [ ./no-build-id-test.patch ]; + ldflags = [ "-s" "-w" @@ -32,22 +35,54 @@ buildGoModule rec { ]; preBuild = '' - ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildID=$(cat COMMIT)\"" + ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildID=${src.rev} +$(cat COMMIT)\"" ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildTime=$(date -u -d @0)\"" ''; + preCheck = '' + # Test all targets. + unset subPackages + + # Disable tests that require additional services. + rm -rf \ + cmd/admin-revoker/main_test.go \ + cmd/bad-key-revoker/main_test.go \ + cmd/cert-checker/main_test.go \ + cmd/contact-auditor/main_test.go \ + cmd/expiration-mailer/main_test.go \ + cmd/expiration-mailer/send_test.go \ + cmd/id-exporter/main_test.go \ + cmd/rocsp-tool/client_test.go \ + db/map_test.go \ + db/multi_test.go \ + db/rollback_test.go \ + log/log_test.go \ + ocsp/updater/updater_test.go \ + ra/ra_test.go \ + rocsp/rocsp_test.go \ + sa/database_test.go \ + sa/model_test.go \ + sa/precertificates_test.go \ + sa/rate_limits_test.go \ + sa/sa_test.go \ + test/load-generator/acme/directory_test.go \ + va/caa_test.go \ + va/dns_test.go \ + va/http_test.go \ + va/tlsalpn_test.go \ + va/va_test.go + ''; + 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; - - passthru.updateScript = gitUpdater { - inherit pname version; - rev-prefix = "release-"; + passthru.tests.version = testers.testVersion { + package = boulder; + command = "boulder --version"; + inherit version; }; meta = with lib; { diff --git a/pkgs/tools/admin/boulder/no-build-id-test.patch b/pkgs/tools/admin/boulder/no-build-id-test.patch new file mode 100644 index 000000000000..661ed2b4a5f2 --- /dev/null +++ b/pkgs/tools/admin/boulder/no-build-id-test.patch @@ -0,0 +1,15 @@ +diff --git i/core/util_test.go w/core/util_test.go +index 8979edff..cfae13a4 100644 +--- i/core/util_test.go ++++ w/core/util_test.go +@@ -56,10 +56,6 @@ func TestSerialUtils(t *testing.T) { + fmt.Println(badSerial) + } + +-func TestBuildID(t *testing.T) { +- test.AssertEquals(t, "Unspecified", GetBuildID()) +-} +- + const JWK1JSON = `{ + "kty": "RSA", + "n": "vuc785P8lBj3fUxyZchF_uZw6WtbxcorqgTyq-qapF5lrO1U82Tp93rpXlmctj6fyFHBVVB5aXnUHJ7LZeVPod7Wnfl8p5OyhlHQHC8BnzdzCqCMKmWZNX5DtETDId0qzU7dPzh0LP0idt5buU7L9QNaabChw3nnaL47iu_1Di5Wp264p2TwACeedv2hfRDjDlJmaQXuS8Rtv9GnRWyC9JBu7XmGvGDziumnJH7Hyzh3VNu-kSPQD3vuAFgMZS6uUzOztCkT0fpOalZI6hqxtWLvXUMj-crXrn-Maavz8qRhpAyp5kcYk3jiHGgQIi7QSK2JIdRJ8APyX9HlmTN5AQ", From 3a7276571220becaa9bfcbfd40d8f9e6d2adc519 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Fri, 2 Sep 2022 17:15:17 -0700 Subject: [PATCH 085/173] swiftdefaultapps: init at 2.0.1 --- .../darwin/swiftdefaultapps/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/os-specific/darwin/swiftdefaultapps/default.nix diff --git a/pkgs/os-specific/darwin/swiftdefaultapps/default.nix b/pkgs/os-specific/darwin/swiftdefaultapps/default.nix new file mode 100644 index 000000000000..44a40e8c8a70 --- /dev/null +++ b/pkgs/os-specific/darwin/swiftdefaultapps/default.nix @@ -0,0 +1,29 @@ +{ fetchzip, lib, stdenvNoCC }: + +stdenvNoCC.mkDerivation rec { + pname = "swiftdefaultapps"; + version = "2.0.1"; + + # Fetch the release which includes the prebuild binary since this is a Swift project and nixpkgs + # doesn't currently have the ability to build Swift projects. + src = fetchzip { + url = "https://github.com/Lord-Kamina/SwiftDefaultApps/releases/download/v${version}/SwiftDefaultApps-v${version}.zip"; + stripRoot = false; + sha256 = "sha256-0HsHjZBPUzmdvHy7E9EdZj6zwaXjSX2u5aj8pij0u3E="; + }; + + installPhase = '' + runHook preInstall + install -D './swda' "$out/bin/swda" + runHook postInstall + ''; + + meta = with lib; { + description = "View and change the default application for url schemes and UTIs"; + homepage = "https://github.com/Lord-Kamina/SwiftDefaultApps"; + license = licenses.beerware; + maintainers = [ maintainers.malo ]; + platforms = platforms.darwin; + mainProgram = "swda"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c85ae5413403..d5a1b71f0721 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24773,6 +24773,8 @@ with pkgs; statifier = callPackage ../os-specific/linux/statifier { }; + swiftdefaultapps = callPackage ../os-specific/darwin/swiftdefaultapps { }; + sysdig = callPackage ../os-specific/linux/sysdig { kernel = null; }; # sysdig is a client, for a driver look at linuxPackagesFor From 09f9d35c06ea51a08dde6b8af591ea633cc35ef2 Mon Sep 17 00:00:00 2001 From: huantian Date: Fri, 2 Sep 2022 18:07:48 -0700 Subject: [PATCH 086/173] libinput-gestures: fix systemd service binary path --- pkgs/tools/inputmethods/libinput-gestures/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix index fe74a68630c5..d36f20511613 100644 --- a/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { postFixup = '' rm "$out/bin/libinput-gestures-setup" + substituteInPlace "$out/share/systemd/user/libinput-gestures.service" --replace "/usr" "$out" substituteInPlace "$out/share/applications/libinput-gestures.desktop" --replace "/usr" "$out" chmod +x "$out/share/applications/libinput-gestures.desktop" wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${lib.makeBinPath ([coreutils] ++ extraUtilsPath)}" From 760a13b9abfb07ac32d12035a05ce310de73617f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 Sep 2022 09:32:24 +0200 Subject: [PATCH 087/173] python310Packages.zwave-me-ws: 0.2.4 -> 0.2.5.1 --- pkgs/development/python-modules/zwave-me-ws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-me-ws/default.nix b/pkgs/development/python-modules/zwave-me-ws/default.nix index 479b2d5193ed..d6241b593abe 100644 --- a/pkgs/development/python-modules/zwave-me-ws/default.nix +++ b/pkgs/development/python-modules/zwave-me-ws/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zwave-me-ws"; - version = "0.2.4"; + version = "0.2.5.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Z-Wave-Me"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x7P6fOYTe/u0GKUsO62cNVz2i/hVjUb8t8Bigijxgk0="; + sha256 = "sha256-BcUUDn7PCpFRtQ3QDx0W3qXB4JmvRxMFoWoCeA8bS6o="; }; nativeBuildInputs = [ From abc18d67b1deafa37af559bc34965b4794b13a05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Sep 2022 09:40:28 +0000 Subject: [PATCH 088/173] ergo: 4.0.38 -> 4.0.42 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 4bd870fc5d46..966cbb7e4a19 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.38"; + version = "4.0.42"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-FdgF2xxqk9n1la6Lu4g6n+3O5pgIUKSYC3KzH0yM2Ok="; + sha256 = "sha256-ZcNV6qgD736KlKz4h6xHAl3ByYzca77YXoETonRaWP8="; }; nativeBuildInputs = [ makeWrapper ]; From 4462216716e9533ddf2efd6f598e3c3391d55631 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Sep 2022 09:48:20 +0000 Subject: [PATCH 089/173] python310Packages.keyrings-google-artifactregistry-auth: 1.0.0 -> 1.1.1 --- .../keyrings-google-artifactregistry-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix b/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix index d77dc444f80d..c55bbf7a8d5c 100644 --- a/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix +++ b/pkgs/development/python-modules/keyrings-google-artifactregistry-auth/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "keyrings.google-artifactregistry-auth"; - version = "1.0.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gvoX5SP0A39Ke0VRlplETJF8gIP+QzK6xNReRxM8UnA="; + sha256 = "sha256-vrA3+/awws4R2BAxn9wYDKuIZdqioWsQnDr3MYL/5E0="; }; buildInputs = [ From 9edcaf36f23e46beaa41a5e9238591d268eabe12 Mon Sep 17 00:00:00 2001 From: rewine <1758075541@qq.com> Date: Sat, 3 Sep 2022 21:10:39 +0800 Subject: [PATCH 090/173] pineapple-pictures: 0.6.2 - 0.6.3 --- pkgs/applications/graphics/pineapple-pictures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index 04677a3982ac..d6e072438376 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "pineapple-pictures"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = version; - sha256 = "sha256-1fsEHyepmoZfNOFEnW6RQJyccOlQr5LTp8TjRqyXkcw"; + sha256 = "sha256-9Nlrei3TxZr3tv0BtlfsKAvDJhQHgd21FzLnzitYF3U="; }; nativeBuildInputs = [ From 92354582ddf5040015a785aba867ed92c65afdea Mon Sep 17 00:00:00 2001 From: ash Date: Sat, 3 Sep 2022 15:22:49 +0100 Subject: [PATCH 091/173] xivlauncher: 1.0.0.9 -> 1.0.1.0 --- pkgs/games/xivlauncher/default.nix | 8 ++++---- pkgs/games/xivlauncher/deps.nix | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/games/xivlauncher/default.nix b/pkgs/games/xivlauncher/default.nix index 1da8e4838956..e9f399e95a62 100644 --- a/pkgs/games/xivlauncher/default.nix +++ b/pkgs/games/xivlauncher/default.nix @@ -3,23 +3,23 @@ , useSteamRun ? true }: let - rev = "6a1a59f687ac7b98698e2ebb97d82a94865e50f6"; + rev = "6246fde6b54f8c7e340057fe2d940287c437153f"; in buildDotnetModule rec { pname = "XIVLauncher"; - version = "1.0.0.9"; + version = "1.0.1.0"; src = fetchFromGitHub { owner = "goatcorp"; repo = "FFXIVQuickLauncher"; inherit rev; - sha256 = "sha256-jRyYeTg73W58OH2fWmuVkjxEdyPNqDGRbEZwxBMfdCo="; + sha256 = "sha256-sM909/ysrlwsiVSBrMo4cOZUWxjRA3ZSwlloGythOAY="; }; nativeBuildInputs = [ copyDesktopItems ]; projectFile = "src/XIVLauncher.Core/XIVLauncher.Core.csproj"; - nugetDeps = ./deps.nix; # File generated with `nuget-to-nix path/to/src > deps.nix` + nugetDeps = ./deps.nix; # File generated with `nix-build -A xivlauncher.passthru.fetch-deps` dotnetFlags = [ "--runtime linux-x64" diff --git a/pkgs/games/xivlauncher/deps.nix b/pkgs/games/xivlauncher/deps.nix index 9e1f7f17c2ff..0cbfccff0c78 100644 --- a/pkgs/games/xivlauncher/deps.nix +++ b/pkgs/games/xivlauncher/deps.nix @@ -3,8 +3,8 @@ (fetchNuGet { pname = "CheapLoc"; version = "1.1.6"; sha256 = "1m6cgx9yh7h3vrq2d4f99xyvsxc9jvz8zjq1q14qgylfmyq4hx4l"; }) (fetchNuGet { pname = "Config.Net"; version = "4.19.0"; sha256 = "17iv0vy0693s6d8626lbz3w1ppn5abn77aaki7h4qi4izysizgim"; }) (fetchNuGet { pname = "Downloader"; version = "2.2.8"; sha256 = "0farwh3pc6m8hsgqywigdpcb4gr2m9myyxm2idzjmhhkzfqghj28"; }) - (fetchNuGet { pname = "Facepunch.Steamworks"; version = "2.3.3"; sha256 = "1r3m7cyzfy8ms9xxfa13xcwha02yk22givkaamw166im89m8wqyc"; }) (fetchNuGet { pname = "goaaats.NativeLibraryLoader"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "1bjjgsw4ry9cz8dzsgwx428hn06wms194pqz8nclwrqcwfx7gmxk"; }) + (fetchNuGet { pname = "goaaats.Steamworks"; version = "2.3.4"; sha256 = "1khxkkjvh6af60rxc13bacxn85amdfzr8z0b9a6gfg6m1fnmlkss"; }) (fetchNuGet { pname = "goaaats.Veldrid"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "0b35bn4190hxbvrwsygpbpg00gnrj6crxyk8b0d7ian611v4jj0m"; }) (fetchNuGet { pname = "goaaats.Veldrid.ImageSharp"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "1zihi2n9qz18kfkz4qnj3412bfsqvx49809hqkknixdrgn8323i2"; }) (fetchNuGet { pname = "goaaats.Veldrid.MetalBindings"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "13cs5jr8bpkrkzziz8b71l3npr14shxryrpsiw0zm7jcx69vg2qf"; }) @@ -13,13 +13,11 @@ (fetchNuGet { pname = "goaaats.Veldrid.StartupUtilities"; version = "4.9.0-beta1-g70f642e82e"; sha256 = "03r3x9h0fyb07d6d28ny6r5s688m50xc0lgc6zf2cy684kfnvmp5"; }) (fetchNuGet { pname = "ImGui.NET"; version = "1.87.2"; sha256 = "0rv0n18fvz1gbh45crhzn1f8xw8zkc8qyiyj91vajjcry8mq1x7q"; }) (fetchNuGet { pname = "KeySharp"; version = "1.0.5"; sha256 = "1ic10v0a174fw6w89iyg4yzji36bsj15573y676cj5n09n6s75d4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.3"; sha256 = "1z6x0d8lpcfjr3sxy25493i17vvcg5bsay6c03qan6mnj5aqzw2k"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.0.1"; sha256 = "0axjv1nhk1z9d4c51d9yxdp09l8yqqnqaifhqcwnxnv0r4y5cka9"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.0.1"; sha256 = "1h6jfifg7pw2vacpdds4v4jqnaydg9b108irf315wzx6rh8yv9cb"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "6.0.0"; sha256 = "06zy947m5lrbwb684g42ijb07r5jsqycvfnphc6cqfdrfnzqv6k9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0fjbjh7yxqc9h47ix37y963xi9f9y99jvl26cw3x3kvjlb8x0bgj"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) @@ -169,6 +167,7 @@ (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "6.0.0-preview.5.21301.5"; sha256 = "1q3iikvjcfrm5p89p1j7qlw1szvryq680qypk023wgy9phmlwi57"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) From c0f4241f2dd74987d97a769a82214d9b64e0d746 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Sep 2022 15:45:33 +0000 Subject: [PATCH 092/173] pocketbase: 0.5.2 -> 0.6.0 --- pkgs/servers/pocketbase/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index eae2f98d77c9..8b5d876dcadc 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ykjk2OJ1AFG4S8vQi5yb7JzQRh3hSbFm/6XqzqXNmt8="; + sha256 = "sha256-sDq8i79Ndwi5hLidukqnuuShCRCE7kxaiOQy29bJQCw="; }; - vendorSha256 = "sha256-OGbfcKvPTSM9DGJ+u2fXBmHq0Sv/n8oMbHNoPZy854Q="; + vendorSha256 = "sha256-Ty06TegTT4BILgH0MpnxINxBQMW0zi0ItptHmDqKW1k="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; From 97783d5f3ca6a6507c96e2861212b133ae00f9ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Sep 2022 16:00:55 +0000 Subject: [PATCH 093/173] praat: 6.2.17 -> 6.2.22 --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 38240d69f7c6..377dc4d2975c 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.2.17"; + version = "6.2.22"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-368Dq4UU1+NTlskQQ5t/nEmyjLvSfdW3rhqzwKoKjzE="; + sha256 = "sha256-RE4QDK5x9xG1RsAWB6dgviu3V1ay/+r0vyHCPCu/qCU="; }; configurePhase = '' From 584a628df43d33b53389c0e40b22360cf89076ab Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Thu, 18 Aug 2022 17:42:09 -0700 Subject: [PATCH 094/173] orbuculum: init at 2.0.0 --- .../embedded/orbuculum/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/embedded/orbuculum/default.nix diff --git a/pkgs/development/embedded/orbuculum/default.nix b/pkgs/development/embedded/orbuculum/default.nix new file mode 100644 index 000000000000..0a5711822afe --- /dev/null +++ b/pkgs/development/embedded/orbuculum/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, czmq +, libusb1 +, ncurses +}: + +stdenv.mkDerivation rec { + pname = "orbuculum"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "orbcode"; + repo = pname; + rev = "V${version}"; + sha256 = "sha256-aMMXfrBQQ9oOx17MUKmqe5vdTpxhBGM5mVfAel0y0a0="; + }; + + buildInputs = [ + czmq + libusb1 + ncurses + ]; + + installFlags = [ + "INSTALL_ROOT=$(out)/" + ]; + + postInstall = '' + mkdir -p $out/etc/udev/rules.d/ + cp $src/Support/60-orbcode.rules $out/etc/udev/rules.d/ + ''; + + meta = with lib; { + description = "Cortex M SWO SWV Demux and Postprocess for the ORBTrace"; + homepage = "https://orbcode.org"; + changelog = "https://github.com/orbcode/orbuculum/blob/V${version}/CHANGES.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ newam ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd4dda36f736..0023fe49818c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25692,6 +25692,8 @@ with pkgs; orbitron = callPackage ../data/fonts/orbitron { }; + orbuculum = callPackage ../development/embedded/orbuculum { }; + orchis-theme = callPackage ../data/themes/orchis-theme { }; orion = callPackage ../data/themes/orion {}; From 324aa113e7ea679d11db047914f81724c5dc8c73 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 3 Sep 2022 12:46:59 -0700 Subject: [PATCH 095/173] saleae-logic-2: 2.3.58 -> 2.3.59 --- pkgs/development/tools/misc/saleae-logic-2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index 9203eb622897..142f66f1dea0 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools }: let name = "saleae-logic-2"; - version = "2.3.58"; + version = "2.3.59"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - sha256 = "sha256-WQa9J+rK71+T2IFUVpPLjkYfHy9GmZ9DZTBo+U4JKfo="; + sha256 = "sha256-jIu/ODVD/x+TjcVSGlOw6/JWESJYDKZQrJGMAix9wTY="; }; desktopItem = makeDesktopItem { inherit name; From 30a59652168bb1a2222f0b6b9504137fbf6c71c1 Mon Sep 17 00:00:00 2001 From: Ian Macalinao Date: Sat, 3 Sep 2022 15:45:21 -0500 Subject: [PATCH 096/173] doc/languages-frameworks/rust: fix typo --- doc/languages-frameworks/rust.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index e19783e29e6a..0d4d5a1e83e1 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -458,7 +458,7 @@ you of the correct hash. `maturinBuildFlags`. * `cargoCheckHook`: run tests using Cargo. The build type for checks can be set using `cargoCheckType`. Features can be specified with - `cargoCheckNoDefaultFeaatures` and `cargoCheckFeatures`. Additional + `cargoCheckNoDefaultFeatures` and `cargoCheckFeatures`. Additional flags can be passed to the tests using `checkFlags` and `checkFlagsArray`. By default, tests are run in parallel. This can be disabled by setting `dontUseCargoParallelTests`. From d4cbef6968c6e7a8d1ead165fd9a78b21d751a3d Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 4 Sep 2022 01:22:11 +0300 Subject: [PATCH 097/173] openspades: fix build --- pkgs/games/openspades/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 488301a1b555..3ec209d22b25 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, cmake, unzip, zip, file , curl, glew , libGL, SDL2, SDL2_image, zlib, freetype, imagemagick , openal , opusfile, libogg -, Cocoa +, Cocoa, libXext }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake imagemagick unzip zip file ]; buildInputs = [ - freetype SDL2 SDL2_image libGL zlib curl glew opusfile openal libogg + freetype SDL2 SDL2_image libGL zlib curl glew opusfile openal libogg libXext ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; @@ -63,6 +63,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/yvt/openspades/"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar azahi ]; }; } From 87e2ecf4481369dff0fe4125df6412a73c9e5c3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Sep 2022 22:59:18 +0000 Subject: [PATCH 098/173] python310Packages.pymavlink: 2.4.34 -> 2.4.35 --- pkgs/development/python-modules/pymavlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index 2e71e58e7c30..baa31b40e342 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.34"; + version = "2.4.35"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2JPBjEXiJWDJJPwS7SjNr3L4Ct+U44QaJiiv8MtSnEk="; + sha256 = "sha256-P2pqcxI6w9cw4b26g5ad5CeW9Sf1fNN0FGiIzOWfOCU="; }; propagatedBuildInputs = [ future lxml ]; From d1a61c79d4e84fb1ddd569c3c08a7d6776663fcc Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 3 Sep 2022 20:09:27 -0300 Subject: [PATCH 099/173] spicetify-cli: 2.11.1 -> 2.13.0 --- pkgs/applications/misc/spicetify-cli/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index ab6d61f7dd26..f1016cd8cdbc 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -1,18 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, spicetify-cli }: buildGoModule rec { pname = "spicetify-cli"; - version = "2.11.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "spicetify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NX3qbnnbV2mLxBQCjfl7xNicyir6usi2uYGw6Yij/ho="; + sha256 = "sha256-XsYZoJDSaAp+oMTy5YWM9aM+TCNkqF5WXBhU/axcEVk="; }; vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng="; + ldflags = [ + "-s -w" + "-X 'main.version=${version}'" + ]; + # used at runtime, but not installed by default postInstall = '' cp -r ${src}/jsHelper $out/bin/jsHelper @@ -23,6 +28,11 @@ buildGoModule rec { $out/bin/spicetify-cli --help > /dev/null ''; + passthru.tests.version = testers.testVersion { + package = spicetify-cli; + command = "spicetify-cli -v"; + }; + meta = with lib; { description = "Command-line tool to customize Spotify client"; homepage = "https://github.com/spicetify/spicetify-cli/"; From 60a3cd81418ea6953b5118e6d7f524506d140bed Mon Sep 17 00:00:00 2001 From: Mostly Void Date: Sun, 4 Sep 2022 05:45:41 +0530 Subject: [PATCH 100/173] brev-cli: init at 0.6.95 (#187744) Co-authored-by: Sandro --- pkgs/development/misc/brev-cli/default.nix | 38 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/misc/brev-cli/default.nix diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix new file mode 100644 index 000000000000..762caa27a011 --- /dev/null +++ b/pkgs/development/misc/brev-cli/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "brev-cli"; + version = "0.6.95"; + + src = fetchFromGitHub { + owner = "brevdev"; + repo = pname; + rev = "v${version}"; + sha256 = "09qhc38ycqs6vdyy1rxaxbihq0q59g2ffkmmlk6ipdlv2b3ywz0f"; + }; + + vendorSha256 = "sha256-5P9oodntXn7RMpjKLoCXlnEZeW4/W0hfYPt7I3hjvGw="; + + CGO_ENABLED = 0; + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/brevdev/brev-cli/pkg/cmd/version.Version=${src.rev}" + ]; + + postInstall = '' + mv $out/bin/brev-cli $out/bin/brev + ''; + + meta = with lib; { + description = "Connect your laptop to cloud computers"; + homepage = "https://github.com/brevdev/brev-cli"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 784f435b5179..2e551ea3cef4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -304,6 +304,8 @@ with pkgs; breakpad = callPackage ../development/misc/breakpad { }; + brev-cli = callPackage ../development/misc/brev-cli { }; + buf = callPackage ../development/tools/buf { }; buf-language-server = callPackage ../development/tools/buf-language-server { }; From 6952cab0299a21091f387f21acf904a2a5e97f56 Mon Sep 17 00:00:00 2001 From: Souvik Sen <88038050+invokes-su@users.noreply.github.com> Date: Sun, 4 Sep 2022 01:16:34 +0100 Subject: [PATCH 101/173] javacc: 7.0.10 -> 7.0.12 (#187867) Co-authored-by: R. Ryantm Co-authored-by: Souvik Sen --- pkgs/development/tools/parsing/javacc/default.nix | 15 +++++++++++---- pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/parsing/javacc/default.nix b/pkgs/development/tools/parsing/javacc/default.nix index a3adad076cf0..0279ef8f89df 100644 --- a/pkgs/development/tools/parsing/javacc/default.nix +++ b/pkgs/development/tools/parsing/javacc/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, ant, jdk }: +{ stdenv, lib, fetchFromGitHub, ant, jdk, jre, makeWrapper }: stdenv.mkDerivation rec { pname = "javacc"; - version = "7.0.10"; + version = "7.0.12"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${version}"; - sha256 = "120jva4sw1kylkwgqf869zxddss01mcn1nmimx9vmd4xaadz7cf2"; + sha256 = "sha256-tDtstF3ivKjG01vOZ8Ga1zTjIZFSTWt5QPY1VQvyFMU="; }; - nativeBuildInputs = [ ant jdk ]; + nativeBuildInputs = [ ant jdk makeWrapper ]; buildPhase = '' ant jar @@ -21,8 +21,15 @@ stdenv.mkDerivation rec { mkdir -p $out/target mv scripts $out/bin mv target/javacc.jar $out/target/ + find -L "$out/bin" -type f -executable -print0 \ + | while IFS= read -r -d ''' file; do + wrapProgram "$file" --suffix PATH : ${jre}/bin + done ''; + doCheck = true; + checkPhase = "ant test"; + meta = with lib; { homepage = "https://javacc.github.io/javacc"; description = "A parser generator for building parsers from grammars"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e551ea3cef4..e934b4e32a80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16472,7 +16472,10 @@ with pkgs; ftjam = callPackage ../development/tools/build-managers/jam/ftjam.nix { }; javacc = callPackage ../development/tools/parsing/javacc { + # Upstream doesn't support anything newer than Java 8. + # https://github.com/javacc/javacc/blob/c708628423b71ce8bc3b70143fa5b6a2b7362b3a/README.md#building-javacc-from-source jdk = jdk8; + jre = jre8; }; jbake = callPackage ../development/tools/jbake { }; From a7c2c726fbadac66535cd62bdc94e51aa9099760 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 3 Sep 2022 21:07:09 -0300 Subject: [PATCH 102/173] kubeone: fix version * Add version test * Add upstream flags --- .../networking/cluster/kubeone/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 60fc4847aa56..22e2f4764ac1 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -2,6 +2,8 @@ , buildGoModule , fetchFromGitHub , installShellFiles +, kubeone +, testers }: buildGoModule rec { @@ -17,6 +19,12 @@ buildGoModule rec { vendorSha256 = "sha256-w/uLR7wi28Ub7Nouxxg39NlD1OzyIE2oEP4D88Xbwu0="; + ldflags = [ + "-s -w" + "-X k8c.io/kubeone/pkg/cmd.version=${version}" + "-X k8c.io/kubeone/pkg/cmd.date=unknown" + ]; + nativeBuildInputs = [ installShellFiles ]; @@ -27,6 +35,11 @@ buildGoModule rec { --zsh <($out/bin/kubeone completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = kubeone; + command = "kubeone version"; + }; + meta = { description = "Automate cluster operations on all your cloud, on-prem, edge, and IoT environments."; homepage = "https://kubeone.io/"; From d9acf90371863959f67fb555068cdb6cdcded644 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Mon, 29 Aug 2022 09:27:38 +1000 Subject: [PATCH 103/173] last: 1406 -> 1409 --- pkgs/applications/science/biology/last/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 031e59619005..f3c145ec7f45 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1406"; + version = "1409"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = version; - sha256 = "sha256-N1B9W++4SiMRMUjDi8ZexOWF/HQpN8BBPuDKYh4bCS8="; + sha256 = "sha256-AFK0va1HonSWJdzJLdLraiu4LhUCJFgq6qajbbPmHuY="; }; nativeBuildInputs = [ unzip ]; From 30cd71f1c9960f486a3762166e02daf444d40245 Mon Sep 17 00:00:00 2001 From: Jacob Birkett Date: Sat, 3 Sep 2022 19:04:35 -0700 Subject: [PATCH 104/173] swaylock-effects: add meta.mainProgram --- pkgs/applications/window-managers/sway/lock-effects.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index 6f1f337d23ee..b3bb8f772f7a 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { longDescription = '' Swaylock, with fancy effects ''; + mainProgram = "swaylock"; inherit (src.meta) homepage; license = licenses.mit; platforms = platforms.linux; From 6f17598c50544ab898a8183984a7e9cdab2a65f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 03:08:44 +0000 Subject: [PATCH 105/173] python310Packages.trimesh: 3.13.5 -> 3.14.1 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 38587c3f2261..187b913147fe 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.13.5"; + version = "3.14.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1+BycZ1fFEfbqoHs/TDnGZXc8IRzWzy2pZ2YkTOPMaA="; + sha256 = "sha256-T+pjf2KmHabbu8poV6dxAvau5C6h89Fp2uYAuO+34/Y="; }; propagatedBuildInputs = [ numpy ]; From 0af80a799581388500c905c7a04f11d27477774a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 03:15:38 +0000 Subject: [PATCH 106/173] python310Packages.types-redis: 4.3.19 -> 4.3.20 --- pkgs/development/python-modules/types-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index d05080bfabda..146dc6cf8919 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.3.19"; + version = "4.3.20"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yIH/uUvUfcoh7VAzKFRKVrsxWFFXXuuyf7Nxv/c1hEo="; + sha256 = "sha256-dO0ClFRw3eot0hRHwYXauzFp5aUyjSayXPNUfZSbjgQ="; }; # Module doesn't have tests From ac52fbb3baf3209da40b27629c9ef3be63bdb270 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 14 Aug 2022 10:02:46 -0400 Subject: [PATCH 107/173] dolibarr: init at 15.0.3 --- pkgs/servers/web-apps/dolibarr/default.nix | 39 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/servers/web-apps/dolibarr/default.nix diff --git a/pkgs/servers/web-apps/dolibarr/default.nix b/pkgs/servers/web-apps/dolibarr/default.nix new file mode 100644 index 000000000000..b697fb18b116 --- /dev/null +++ b/pkgs/servers/web-apps/dolibarr/default.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchFromGitHub, stateDir ? "/var/lib/dolibarr" }: + +stdenv.mkDerivation rec { + pname = "dolibarr"; + version = "15.0.3"; + + src = fetchFromGitHub { + owner = "Dolibarr"; + repo = "dolibarr"; + rev = version; + sha256 = "sha256-HMOYj93ZvqM0FQjt313yuGj/r9ELqQlnNkg/CxrBjRM="; + }; + + dontBuild = true; + + postPatch = '' + find . -type f -name "*.php" -print0 | xargs -0 sed -i 's|/etc/dolibarr|${stateDir}|g' + + substituteInPlace htdocs/filefunc.inc.php \ + --replace '//$conffile = ' '$conffile = ' \ + --replace '//$conffiletoshow = ' '$conffiletoshow = ' + + substituteInPlace htdocs/install/inc.php \ + --replace '//$conffile = ' '$conffile = ' \ + --replace '//$conffiletoshow = ' '$conffiletoshow = ' + ''; + + installPhase = '' + mkdir -p "$out" + cp -r * $out + ''; + + meta = with lib; { + description = "A enterprise resource planning (ERP) and customer relationship manager (CRM) server"; + homepage = "https://dolibarr.org/"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.raitobezarius ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab743a3ff934..77bdd78ea092 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3578,6 +3578,8 @@ with pkgs; dokuwiki = callPackage ../servers/web-apps/dokuwiki { }; + dolibarr = callPackage ../servers/web-apps/dolibarr { }; + doppler = callPackage ../tools/security/doppler {}; dosage = callPackage ../applications/graphics/dosage { }; From c2563fe47629b32fd3d2505030d6b44ac2f07736 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 14 Aug 2022 10:03:42 -0400 Subject: [PATCH 108/173] nixos/dolibarr: init Co-authored: Ryan Lahfa --- .../from_md/release-notes/rl-2211.section.xml | 8 + .../manual/release-notes/rl-2211.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/dolibarr.nix | 320 ++++++++++++++++++ nixos/tests/dolibarr.nix | 59 ++++ pkgs/servers/web-apps/dolibarr/default.nix | 4 +- 6 files changed, 393 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/web-apps/dolibarr.nix create mode 100644 nixos/tests/dolibarr.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 882eea3c4a4a..e90b5e0e80ef 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 @@ -157,6 +157,14 @@ services.schleuder. + + + Dolibarr, + an enterprise resource planning and customer relationship + manager. Enable using + services.dolibarr. + + expressvpn, diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index a2757d67e89c..738a0305809e 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -66,6 +66,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [schleuder](https://schleuder.org/), a mailing list manager with PGP support. Enable using [services.schleuder](#opt-services.schleuder.enable). +- [Dolibarr](https://www.dolibarr.org/), an enterprise resource planning and customer relationship manager. Enable using [services.dolibarr](#opt-services.dolibarr.enable). + - [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable). - [Grafana Tempo](https://www.grafana.com/oss/tempo/), a distributed tracing store. Available as [services.tempo](#opt-services.tempo.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 616f357663ca..0cce885e7fcb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1056,6 +1056,7 @@ ./services/web-apps/discourse.nix ./services/web-apps/documize.nix ./services/web-apps/dokuwiki.nix + ./services/web-apps/dolibarr.nix ./services/web-apps/engelsystem.nix ./services/web-apps/ethercalc.nix ./services/web-apps/fluidd.nix diff --git a/nixos/modules/services/web-apps/dolibarr.nix b/nixos/modules/services/web-apps/dolibarr.nix new file mode 100644 index 000000000000..2b2e2a6214dc --- /dev/null +++ b/nixos/modules/services/web-apps/dolibarr.nix @@ -0,0 +1,320 @@ +{ config, pkgs, lib, ... }: +let + inherit (lib) any boolToString concatStringsSep isBool isString literalExpression mapAttrsToList mkDefault mkEnableOption mkIf mkOption optionalAttrs types; + + package = pkgs.dolibarr.override { inherit (cfg) stateDir; }; + + cfg = config.services.dolibarr; + vhostCfg = config.services.nginx.virtualHosts."${cfg.domain}"; + + mkConfigFile = filename: settings: + let + # hack in special logic for secrets so we read them from a separate file avoiding the nix store + secretKeys = [ "force_install_databasepass" "dolibarr_main_db_pass" "dolibarr_main_instance_unique_id" ]; + + toStr = k: v: + if (any (str: k == str) secretKeys) then v + else if isString v then "'${v}'" + else if isBool v then boolToString v + else if isNull v then "null" + else toString v + ; + in + pkgs.writeText filename '' + + If left as the default value this user will automatically be created + on system activation, otherwise you are responsible for + ensuring the user exists before the dolibarr application starts. + + ''; + }; + + group = mkOption { + type = types.str; + default = "dolibarr"; + description = '' + Group account under which dolibarr runs. + + + If left as the default value this group will automatically be created + on system activation, otherwise you are responsible for + ensuring the group exists before the dolibarr application starts. + + ''; + }; + + stateDir = mkOption { + type = types.str; + default = "/var/lib/dolibarr"; + description = '' + State and configuration directory dolibarr will use. + ''; + }; + + database = { + host = mkOption { + type = types.str; + default = "localhost"; + description = "Database host address."; + }; + port = mkOption { + type = types.port; + default = 3306; + description = "Database host port."; + }; + name = mkOption { + type = types.str; + default = "dolibarr"; + description = "Database name."; + }; + user = mkOption { + type = types.str; + default = "dolibarr"; + description = "Database username."; + }; + passwordFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/run/keys/dolibarr-dbpassword"; + description = "Database password file."; + }; + createLocally = mkOption { + type = types.bool; + default = true; + description = "Create the database and database user locally."; + }; + }; + + settings = mkOption { + type = with types; (attrsOf (oneOf [ bool int str ])); + default = { }; + description = lib.mdDoc "Dolibarr settings, see for details."; + }; + + nginx = mkOption { + type = types.nullOr (types.submodule ( + lib.recursiveUpdate + (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) + { + # enable encryption by default, + # as sensitive login and Dolibarr (ERP) data should not be transmitted in clear text. + options.forceSSL.default = true; + options.enableACME.default = true; + } + )); + default = null; + example = lib.literalExpression '' + { + serverAliases = [ + "dolibarr.''${config.networking.domain}" + "erp.''${config.networking.domain}" + ]; + enableACME = false; + } + ''; + description = lib.mdDoc '' + With this option, you can customize an nginx virtual host which already has sensible defaults for Dolibarr. + Set to {} if you do not need any customization to the virtual host. + If enabled, then by default, the {option}`serverName` is + `''${domain}`, + SSL is active, and certificates are acquired via ACME. + If this is set to null (the default), no nginx virtualHost will be configured. + ''; + }; + + poolConfig = mkOption { + type = with types; attrsOf (oneOf [ str int bool ]); + default = { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + }; + description = lib.mdDoc '' + Options for the Dolibarr PHP pool. See the documentation on [`php-fpm.conf`](https://www.php.net/manual/en/install.fpm.configuration.php) + for details on configuration directives. + ''; + }; + }; + + # implementation + config = mkIf cfg.enable { + + assertions = [ + { assertion = cfg.database.createLocally -> cfg.database.user == cfg.user; + message = "services.dolibarr.database.user must match services.dolibarr.user if the database is to be automatically provisioned"; + } + ]; + + services.dolibarr.settings = { + dolibarr_main_url_root = "https://${cfg.domain}"; + dolibarr_main_document_root = "${package}/htdocs"; + dolibarr_main_url_root_alt = "/custom"; + dolibarr_main_data_root = "${cfg.stateDir}/documents"; + + dolibarr_main_db_host = cfg.database.host; + dolibarr_main_db_port = toString cfg.database.port; + dolibarr_main_db_name = cfg.database.name; + dolibarr_main_db_prefix = "llx_"; + dolibarr_main_db_user = cfg.database.user; + dolibarr_main_db_pass = mkIf (cfg.database.passwordFile != null) '' + file_get_contents("${cfg.database.passwordFile}") + ''; + dolibarr_main_db_type = "mysqli"; + dolibarr_main_db_character_set = mkDefault "utf8"; + dolibarr_main_db_collation = mkDefault "utf8_unicode_ci"; + + # Authentication settings + dolibarr_main_authentication = mkDefault "dolibarr"; + + # Security settings + dolibarr_main_prod = true; + dolibarr_main_force_https = vhostCfg.forceSSL; + dolibarr_main_restrict_os_commands = "${pkgs.mariadb}/bin/mysqldump, ${pkgs.mariadb}/bin/mysql"; + dolibarr_nocsrfcheck = false; + dolibarr_main_instance_unique_id = '' + file_get_contents("${cfg.stateDir}/dolibarr_main_instance_unique_id") + ''; + dolibarr_mailing_limit_sendbyweb = false; + }; + + systemd.tmpfiles.rules = [ + "d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group}" + "d '${cfg.stateDir}/documents' 0750 ${cfg.user} ${cfg.group}" + "f '${cfg.stateDir}/conf.php' 0660 ${cfg.user} ${cfg.group}" + "L '${cfg.stateDir}/install.forced.php' - ${cfg.user} ${cfg.group} - ${mkConfigFile "install.forced.php" install}" + ]; + + services.mysql = mkIf cfg.database.createLocally { + enable = mkDefault true; + package = mkDefault pkgs.mariadb; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { name = cfg.database.user; + ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; + } + ]; + }; + + services.nginx.enable = mkIf (cfg.nginx != null) true; + services.nginx.virtualHosts."${cfg.domain}" = mkIf (cfg.nginx != null) (lib.mkMerge [ + cfg.nginx + ({ + root = lib.mkForce "${package}/htdocs"; + locations."/".index = "index.php"; + locations."~ [^/]\\.php(/|$)" = { + extraConfig = '' + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + fastcgi_pass unix:${config.services.phpfpm.pools.dolibarr.socket}; + ''; + }; + }) + ]); + + systemd.services."phpfpm-dolibarr".after = mkIf cfg.database.createLocally [ "mysql.service" ]; + services.phpfpm.pools.dolibarr = { + inherit (cfg) user group; + phpPackage = pkgs.php.buildEnv { + extensions = { enabled, all }: enabled ++ [ all.calendar ]; + # recommended by dolibarr web application + extraConfig = '' + session.use_strict_mode = 1 + session.cookie_samesite = "Lax" + ; open_basedir = "${package}/htdocs, ${cfg.stateDir}" + allow_url_fopen = 0 + disable_functions = "pcntl_alarm, pcntl_fork, pcntl_waitpid, pcntl_wait, pcntl_wifexited, pcntl_wifstopped, pcntl_wifsignaled, pcntl_wifcontinued, pcntl_wexitstatus, pcntl_wtermsig, pcntl_wstopsig, pcntl_signal, pcntl_signal_get_handler, pcntl_signal_dispatch, pcntl_get_last_error, pcntl_strerror, pcntl_sigprocmask, pcntl_sigwaitinfo, pcntl_sigtimedwait, pcntl_exec, pcntl_getpriority, pcntl_setpriority, pcntl_async_signals" + ''; + }; + + settings = { + "listen.mode" = "0660"; + "listen.owner" = cfg.user; + "listen.group" = cfg.group; + } // cfg.poolConfig; + }; + + # there are several challenges with dolibarr and NixOS which we can address here + # - the dolibarr installer cannot be entirely automated, though it can partially be by including a file called install.forced.php + # - the dolibarr installer requires write access to its config file during installation, though not afterwards + # - the dolibarr config file generally holds secrets generated by the installer, though the config file is a php file so we can read and write these secrets from an external file + systemd.services.dolibarr-config = { + description = "dolibarr configuration file management via NixOS"; + wantedBy = [ "multi-user.target" ]; + + script = '' + # extract the 'main instance unique id' secret that the dolibarr installer generated for us, store it in a file for use by our own NixOS generated configuration file + ${pkgs.php}/bin/php -r "include '${cfg.stateDir}/conf.php'; file_put_contents('${cfg.stateDir}/dolibarr_main_instance_unique_id', \$dolibarr_main_instance_unique_id);" + + # replace configuration file generated by installer with the NixOS generated configuration file + install -m 644 ${mkConfigFile "conf.php" cfg.settings} '${cfg.stateDir}/conf.php' + ''; + + serviceConfig = { + Type = "oneshot"; + User = cfg.user; + Group = cfg.group; + RemainAfterExit = "yes"; + }; + + unitConfig = { + ConditionFileNotEmpty = "${cfg.stateDir}/conf.php"; + }; + }; + + users.users.dolibarr = mkIf (cfg.user == "dolibarr" ) { + isSystemUser = true; + group = cfg.group; + }; + + users.groups = optionalAttrs (cfg.group == "dolibarr") { + dolibarr = { }; + }; + + users.users."${config.services.nginx.group}".extraGroups = [ cfg.group ]; + }; +} diff --git a/nixos/tests/dolibarr.nix b/nixos/tests/dolibarr.nix new file mode 100644 index 000000000000..2f012a0c67da --- /dev/null +++ b/nixos/tests/dolibarr.nix @@ -0,0 +1,59 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "dolibarr"; + meta.maintainers = [ lib.maintainers.raitobezarius ]; + + nodes.machine = + { ... }: + { + services.dolibarr = { + enable = true; + domain = "localhost"; + nginx = { + forceSSL = false; + enableACME = false; + }; + }; + + networking.firewall.allowedTCPPorts = [ 80 ]; + }; + + testScript = '' + from html.parser import HTMLParser + start_all() + + csrf_token = None + class TokenParser(HTMLParser): + def handle_starttag(self, tag, attrs): + attrs = dict(attrs) # attrs is an assoc list originally + if tag == 'input' and attrs.get('name') == 'token': + csrf_token = attrs.get('value') + print(f'[+] Caught CSRF token: {csrf_token}') + def handle_endtag(self, tag): pass + def handle_data(self, data): pass + + machine.wait_for_unit("phpfpm-dolibarr.service") + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(80) + # Sanity checks on URLs. + # machine.succeed("curl -fL http://localhost/index.php") + # machine.succeed("curl -fL http://localhost/") + # Perform installation. + machine.succeed('curl -fL -X POST http://localhost/install/check.php -F selectlang=auto') + machine.succeed('curl -fL -X POST http://localhost/install/fileconf.php -F selectlang=auto') + # First time is to write the configuration file correctly. + machine.succeed('curl -fL -X POST http://localhost/install/step1.php -F "testpost=ok" -F "action=set" -F "selectlang=auto"') + # Now, we have a proper conf.php in $stateDir. + assert 'nixos' in machine.succeed("cat /var/lib/dolibarr/conf.php") + machine.succeed('curl -fL -X POST http://localhost/install/step2.php --data "testpost=ok&action=set&dolibarr_main_db_character_set=utf8&dolibarr_main_db_collation=utf8_unicode_ci&selectlang=auto"') + machine.succeed('curl -fL -X POST http://localhost/install/step4.php --data "testpost=ok&action=set&selectlang=auto"') + machine.succeed('curl -fL -X POST http://localhost/install/step5.php --data "testpost=ok&action=set&login=root&pass=hunter2&pass_verif=hunter2&selectlang=auto"') + # Now, we have installed the machine, let's verify we still have the right configuration. + assert 'nixos' in machine.succeed("cat /var/lib/dolibarr/conf.php") + # We do not want any redirect now as we have installed the machine. + machine.succeed('curl -f -X POST http://localhost') + # Test authentication to the webservice. + parser = TokenParser() + parser.feed(machine.succeed('curl -f -X GET http://localhost/index.php?mainmenu=login&username=root')) + machine.succeed(f'curl -f -X POST http://localhost/index.php?mainmenu=login&token={csrf_token}&username=root&password=hunter2') + ''; +}) diff --git a/pkgs/servers/web-apps/dolibarr/default.nix b/pkgs/servers/web-apps/dolibarr/default.nix index b697fb18b116..5c4256155ddc 100644 --- a/pkgs/servers/web-apps/dolibarr/default.nix +++ b/pkgs/servers/web-apps/dolibarr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, stateDir ? "/var/lib/dolibarr" }: +{ stdenv, lib, fetchFromGitHub, nixosTests, stateDir ? "/var/lib/dolibarr" }: stdenv.mkDerivation rec { pname = "dolibarr"; @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { cp -r * $out ''; + passthru.tests = { inherit (nixosTests) dolibarr; }; + meta = with lib; { description = "A enterprise resource planning (ERP) and customer relationship manager (CRM) server"; homepage = "https://dolibarr.org/"; From be86afa5ecaec955da4889e724d23ab8d9e6b813 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 03:30:28 +0000 Subject: [PATCH 109/173] python310Packages.versioneer: 0.24 -> 0.25 --- pkgs/development/python-modules/versioneer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index d4847cf4363f..486f02966b23 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "versioneer"; - version = "0.24"; + version = "0.25"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-G426nlHi8OBMfoVFIW7s3qLWPhvVVpRI7mbFSffneC8="; + hash = "sha256-mo1axyDGbgmawguk+8LPAKXyuxYU3on0TIKTWsUQuuE="; }; # Couldn't get tests to work because, for instance, they used virtualenv and From 40f7da2e5ecd64e93b5607ea1691d74c2141e508 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 4 Sep 2022 06:28:42 +0200 Subject: [PATCH 110/173] mumble,murmur: 1.4.231 -> 1.4.274 Signed-off-by: Felix Singer --- pkgs/applications/networking/mumble/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 1604188773d1..d3a02cacfb60 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -98,14 +98,14 @@ let } source; source = rec { - version = "unstable-1.4.231"; + version = "1.4.274"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; - rev = "9e0e274d6a9d8a9919267e747d05d0500d150560"; - sha256 = "0whvb4nlf7gjf2v7wsaq0ir18mshhw5wi8c9q9qz43wnh42nn2qi"; + rev = "cc73c7679b08158f91b02272efbb0e3e5dd9c9e4"; + sha256 = "sha256-QXczSLDhWLE4CDvBJ7NtqfL52bZJDisFo04AMHnMuN8="; fetchSubmodules = true; }; }; From 28f79f415c29a19b20b18c275a2fb6e24d2b5ccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sun, 4 Sep 2022 14:30:10 +1000 Subject: [PATCH 111/173] vapoursynth: comment with darwin fix attempt --- pkgs/development/libraries/vapoursynth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index b0f8f5edd30b..7c7987478b80 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.isDarwin; # see https://github.com/NixOS/nixpkgs/pull/189446 for partial fix description = "A video processing framework with the future in mind"; homepage = "http://www.vapoursynth.com/"; license = licenses.lgpl21; From 5b02da27359f23d37f30ee448f1fded3d2b9610f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 4 Sep 2022 04:16:24 +0000 Subject: [PATCH 112/173] terraform-providers: update 2022-09-04 --- .../terraform-providers/providers.json | 220 +++++++++--------- 1 file changed, 110 insertions(+), 110 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5eeb204a5b6e..b121b5a06758 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -32,10 +32,10 @@ "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v3.5.1", - "sha256": "sha256-EJPf8jDANrjg+XPhFn6L7GPUya2WbrSUX8/hQldQmnQ=", + "rev": "v3.6.0", + "sha256": "sha256-FjCcUC06iDeKaHSlQPNuKdqEhA8ft4MQ+sY3YPlNY6E=", "vendorSha256": "sha256-X9AJM4OsJ2/zl2Mm6gaz5wA6hk9AfOlUFYYN9Ojirrc=", - "version": "3.5.1" + "version": "3.6.0" }, "akamai": { "owner": "akamai", @@ -51,10 +51,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.182.0", - "sha256": "sha256-syxmCEvNRUsVl4B9OuClKztlr9hqKIHTpeppcNPUJog=", + "rev": "v1.183.0", + "sha256": "sha256-+bjDSRsQ407um35Qz/xfCtEd4jAjzjROh4T4iYsapmM=", "vendorSha256": "sha256-kjr93pVmMZgeJgeG8hG86CDWr95gCIAhf93OQ4tJ9kw=", - "version": "1.182.0" + "version": "1.183.0" }, "ansible": { "owner": "nbering", @@ -78,10 +78,10 @@ "owner": "auth0", "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.36.0", - "sha256": "sha256-nKF5K+62Fc6MIrF7GagzLyp15aBpMKox6ZTS5csBfAU=", - "vendorSha256": "sha256-HNHW6ePs1qbwPiU0Xc2AwWmsSqr7mWI7xtMvL9GW7L8=", - "version": "0.36.0" + "rev": "v0.37.0", + "sha256": "sha256-2C5OHkRzYjhOH/snZ3CDWILaxusvG/7GYRtjpGUJljM=", + "vendorSha256": "sha256-yV6gO0Hv7zYs+0Lxy4mAMRkHoVDSMG+D5d2ZWH6TqW8=", + "version": "0.37.0" }, "avi": { "owner": "vmware", @@ -105,28 +105,28 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.28.0", - "sha256": "sha256-35z4a2pOoL78wGgfiKBjUXa4NORQNgPNgirHLX0N4gY=", - "vendorSha256": "sha256-XlTrAj7LRFWse80KgMRGUnGNi0ri6XwAi1cuEqKqrBg=", - "version": "4.28.0" + "rev": "v4.29.0", + "sha256": "sha256-hFvDQHiSr+UTSy2ikWM1BzRy139YZ5ulrbv738WQFrs=", + "vendorSha256": "sha256-PiOBkvIQ3X921HDPjUcfy1hcePh8mVVc3np17BnjdhI=", + "version": "4.29.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.28.0", - "sha256": "sha256-4GEoJJoMi1gCdhrqb5IsPb2haht4vH1hyJx7Z4rin00=", + "rev": "v2.28.1", + "sha256": "sha256-r7trdPrlvZ5rW75L7AEkG1baQaLMXnZ48Axi552nPIM=", "vendorSha256": null, - "version": "2.28.0" + "version": "2.28.1" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.20.0", - "sha256": "sha256-CaiEFJrtcro3taVXpsHoe5vvXjUaLn+7d72V+5UmNtg=", + "rev": "v3.21.1", + "sha256": "sha256-Rsj1DGN3v6rwjSBVRa4bvXP67ZYkJMDoz5ANyYCgf/4=", "vendorSha256": null, - "version": "3.20.0" + "version": "3.21.1" }, "azurestack": { "owner": "hashicorp", @@ -142,10 +142,10 @@ "owner": "baidubce", "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", - "rev": "v1.15.0", - "sha256": "sha256-U5EvN13fKzpeWHSEwgxiESrXCQ0KS9R2HZ7XTrj10pc=", + "rev": "v1.15.2", + "sha256": "sha256-RQTb1bIDpD5jvAJTOWG+aEVpMrSnJAqG6ZRQ/dOLZ4I=", "vendorSha256": "sha256-dgcYdfManE48sYaRRMfYMxQ4qX4uqas0yx+bn60kPWU=", - "version": "1.15.0" + "version": "1.15.2" }, "bigip": { "owner": "F5Networks", @@ -307,10 +307,10 @@ "owner": "digitalocean", "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.22.1", - "sha256": "sha256-Sc2altZo/8Y1UYpZjT8beq3VUljJAdzyXexB9Yi5WQI=", + "rev": "v2.22.2", + "sha256": "sha256-aIfx/dtVgNoLCFz8rXJBQTsmZ6SPA1hm6uMbeQmWkKM=", "vendorSha256": null, - "version": "2.22.1" + "version": "2.22.2" }, "dme": { "owner": "DNSMadeEasy", @@ -343,10 +343,10 @@ "owner": "kreuzwerker", "provider-source-address": "registry.terraform.io/kreuzwerker/docker", "repo": "terraform-provider-docker", - "rev": "v2.20.2", - "sha256": "sha256-5xQRUHga83sIIyBiWhXLWkjsBuk/1n4cZg/Y+zYz7+o=", - "vendorSha256": "sha256-aPt1y7UEL+Y4aRm0rfHr/yJ393NP2oAqgz7+fo/msQo=", - "version": "2.20.2" + "rev": "v2.20.3", + "sha256": "sha256-9zYqZ1bKOz2B4INrJqSklztNAl2ol3NGYW2IjPJfFkM=", + "vendorSha256": "sha256-G8gnEd7hT6XAC7cLOw711KsSFKjKvdd1BX/iaYV8a+U=", + "version": "2.20.3" }, "elasticsearch": { "owner": "phillbaker", @@ -370,10 +370,10 @@ "owner": "exoscale", "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.40.0", - "sha256": "sha256-CQd/wYY4XRmWPV77uwTQgqZOGqWVdtAgsG8sUNB7y4A=", + "rev": "v0.40.1", + "sha256": "sha256-K5Rj3DoT4TAXF6MGOXgLw30qZmHyUYSMf1Cn4TTmxQk=", "vendorSha256": null, - "version": "0.40.0" + "version": "0.40.1" }, "external": { "owner": "hashicorp", @@ -426,10 +426,10 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.30.0", - "sha256": "sha256-yLEh0RLDStle7K4hXYgsKIEYuZ5nwrY5dR574yRjRLw=", + "rev": "v4.31.0", + "sha256": "sha256-BKLY+ROxB35EQ37hlYGaNDdsAEggpGuRP7Uxoo7wFRc=", "vendorSha256": null, - "version": "4.30.0" + "version": "4.31.0" }, "gitlab": { "owner": "gitlabhq", @@ -445,20 +445,20 @@ "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.33.0", - "sha256": "sha256-6mWSlTIVvbz7lid2+2T//vQf45ZNAEvD30qYG2Wd9yg=", - "vendorSha256": "sha256-LvWKVuHWOsMwucCQtrRMQ3wRnbGMid7jBG47wvBCvmY=", - "version": "4.33.0" + "rev": "v4.34.0", + "sha256": "sha256-pyp12UM42+dubwbPx7L4qIOYW0OulZ1D5OSgbdOUJQU=", + "vendorSha256": "sha256-ItetuU8tAzuMcShpS0C5BNmav4+cOrWxbyFvWS2zM9o=", + "version": "4.34.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.33.0", - "sha256": "sha256-PoNacRcv+w7ydIPkuvfOhSjvdgYAahdKOI5yBoD9tu0=", - "vendorSha256": "sha256-LvWKVuHWOsMwucCQtrRMQ3wRnbGMid7jBG47wvBCvmY=", - "version": "4.33.0" + "rev": "v4.34.0", + "sha256": "sha256-1Ia2seissoXc98pGj4uvJcMP41eme1K/Tmnmtp8owLA=", + "vendorSha256": "sha256-ItetuU8tAzuMcShpS0C5BNmav4+cOrWxbyFvWS2zM9o=", + "version": "4.34.0" }, "googleworkspace": { "owner": "hashicorp", @@ -473,10 +473,10 @@ "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.27.0", - "sha256": "sha256-ED97aYj71Zw89QCn19u4XP5pvfElKrQhFl3ESCYcafg=", - "vendorSha256": "sha256-UFtjicPL8Dg5dxi5vjCmvD1egZnODmsXSUCx0q5TyZw=", - "version": "1.27.0" + "rev": "v1.28.0", + "sha256": "sha256-j5kLmzPqEQkbn8ikjWs28gt8AXBW5/DAbnMZag0aP+Q=", + "vendorSha256": "sha256-NkGMblM6JB0JLTQJkNQqV90LXI8bEbULcgwwytwCwW4=", + "version": "1.28.0" }, "gridscale": { "owner": "gridscale", @@ -536,19 +536,19 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/http", "repo": "terraform-provider-http", - "rev": "v3.0.1", - "sha256": "sha256-oeHWuXiLQF4cnC2QKWmqfNS5abItAxpYCV9BAId1Ld0=", - "vendorSha256": "sha256-fROMSbnav8BiUWD6qdwKi/fGEn4a2lmOuAXsnFTT3fQ=", - "version": "3.0.1" + "rev": "v3.1.0", + "sha256": "sha256-ZIV4OrfwUtWuQyp9Uw/sA7tW7JlG2+bAUu8TamyTPbs=", + "vendorSha256": "sha256-LPd5TQbuauXKMXraHsJd5uIdn357CveRyaLmavtMHSA=", + "version": "3.1.0" }, "huaweicloud": { "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.40.0", - "sha256": "sha256-2wwwEWChYJNbeonxBg/M6fSVcoHKup3z/sQ93iZd2hc=", + "rev": "v1.40.1", + "sha256": "sha256-ejzyyliMyOjwQAQCx07ysEO0FMlE9jZDcuS2Bcz8Dvs=", "vendorSha256": null, - "version": "1.40.0" + "version": "1.40.1" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -644,19 +644,19 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.13.0", - "sha256": "sha256-QBuYxfuH4Fd/B3CBa6Rp7TujwgyfVaausctAYlEnJ1U=", + "rev": "v2.13.1", + "sha256": "sha256-2/7sSgLt/t5e9YWi9D5hOfirHDrfHnuK3w684KjKIWI=", "vendorSha256": null, - "version": "2.13.0" + "version": "2.13.1" }, "launchdarkly": { "owner": "launchdarkly", "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.9.1", - "sha256": "sha256-y6rikCql7zt/Dwo6FLHR/MdnhdA/ZDEVdsYRza4+daE=", + "rev": "v2.9.2", + "sha256": "sha256-XseHo/PVNGV+TKR+DBOmNlwYozFPWDolQR6/mE/XwVQ=", "vendorSha256": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=", - "version": "2.9.1" + "version": "2.9.2" }, "libvirt": { "owner": "dmacvicar", @@ -753,10 +753,10 @@ "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", "proxyVendor": true, "repo": "terraform-provider-mongodbatlas", - "rev": "v1.4.4", - "sha256": "sha256-QFiaFxCg4pYgMkC2+HAxlyWv2DL1Riqk3nRZqI6ie1k=", - "vendorSha256": "sha256-nBBr6Uqa2VHSaEWfvFVotlF9DvTApgztS/wAgbj9OL0=", - "version": "1.4.4" + "rev": "v1.4.5", + "sha256": "sha256-uDpbsHJY6BXd1N/maHWfEpZy4tl81P0oI4F2rcJxvH8=", + "vendorSha256": "sha256-2ChyCuFJQASobUZBOlbsw7nI4APYE+mdcfIvkr2EEN0=", + "version": "1.4.5" }, "namecheap": { "owner": "namecheap", @@ -780,19 +780,19 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.0.0", - "sha256": "sha256-u2wOmdk9QH1husFTW1Fb3VW2+gFrjerqBL7sOwFUKkw=", + "rev": "v3.1.0", + "sha256": "sha256-pcY4SsElHVKHw8rh/ZYMsSqPOZ4XDlzLgwxgF9ivZmw=", "vendorSha256": "sha256-PxMw2qjQP+dW1TAb8NxbtmHk/9yXAfM8aMIm4Qw5M1c=", - "version": "3.0.0" + "version": "3.1.0" }, "nomad": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/nomad", "repo": "terraform-provider-nomad", - "rev": "v1.4.17", - "sha256": "sha256-xP0E2rJbsthLIzN0zxDo1eGMb8xBetT+uuCcegVvJUU=", - "vendorSha256": "sha256-p+SCagP8Niuc4h1s8l1c7Dao78wnHPRz9vNbFH10BaA=", - "version": "1.4.17" + "rev": "v1.4.18", + "sha256": "sha256-HhocWB3ZCFdeYgmA64hv1CYwqIf4EB/Q+vNrFKVB31I=", + "vendorSha256": "sha256-jS0soOe8kVnsC8Aum1zuiqHColOZmKEpu7jP74AnXmM=", + "version": "1.4.18" }, "ns1": { "owner": "ns1-terraform", @@ -826,19 +826,19 @@ "owner": "nutanix", "provider-source-address": "registry.terraform.io/nutanix/nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.7.0", - "sha256": "sha256-UWK5QGc/7IETQ+IBQA9uaCV1IBpgwSO24UKFflUw3CU=", + "rev": "v1.7.1", + "sha256": "sha256-UOny3UfrSrw/h9U9r1qlro4we03lOnUcZBL/bPwDESE=", "vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=", - "version": "1.7.0" + "version": "1.7.1" }, "oci": { "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.90.0", - "sha256": "sha256-IbYldkApgE+wuSEpDnF7YeRfonjWQfBNskd++bPvPeA=", + "rev": "v4.91.0", + "sha256": "sha256-WLmY/vL0r2fQD4OPcWc9Pqs6hV2Fc2dbuTg7ssvwyu0=", "vendorSha256": null, - "version": "4.90.0" + "version": "4.91.0" }, "okta": { "owner": "okta", @@ -880,10 +880,10 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.31.1", - "sha256": "sha256-88xh0cXAhne8ruVy+Ak7HmMEOjRQ2H/RXNyyEkEGb40=", - "vendorSha256": "sha256-mLroGI3X9nLufz4LT4KCbVoPUZimtMaQ3rI108SKURE=", - "version": "1.31.1" + "rev": "v1.31.2", + "sha256": "sha256-wACJpaCQ/FeKFUVvzZGxe5BGogGSZFBI5CGWN456CdY=", + "vendorSha256": "sha256-loqQELA5zeLs2860ui4klSkxPzquIQbybQ+MHEUAWAY=", + "version": "1.31.2" }, "opsgenie": { "owner": "opsgenie", @@ -970,10 +970,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/random", "repo": "terraform-provider-random", - "rev": "v3.3.2", - "sha256": "sha256-izTx/uxe/SAsWSlN5husEWK64c9ugdg8BS7lScnWSX4=", - "vendorSha256": "sha256-ofU1zZb/C2LFaRCt0NULi+9dQY02lKBlz3jV1/ZhfWU=", - "version": "3.3.2" + "rev": "v3.4.2", + "sha256": "sha256-wLppAWv/pgsBUe4tEcP6CB4vHvYYAuugeF0Z+eKyEw8=", + "vendorSha256": "sha256-FBjwsOMtpKk0UhvWam9+7vQB6pIRwEOPD0A9fdiuDN4=", + "version": "3.4.2" }, "remote": { "owner": "tenstad", @@ -997,10 +997,10 @@ "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.8", - "sha256": "sha256-UzgXZhVlPel6CQpMAQP2ca7/ur+y8ADkcF2q7pN+sfM=", + "rev": "v2.2.9", + "sha256": "sha256-bYy3bTn5mFbu0Y7hy7KY2ZkU2xMC0HgBRRh7cxT/A9s=", "vendorSha256": "sha256-Jg1FalV+WsKYOZpszeNYydP4Qtf2cdaZt7xz4O699wc=", - "version": "2.2.8" + "version": "2.2.9" }, "secret": { "owner": "numtide", @@ -1060,10 +1060,10 @@ "owner": "Snowflake-Labs", "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.42.1", - "sha256": "sha256-/qQSMSF4Uxs5ZJj3S1LATs1Uima/FmXVMf41x8K2bQ8=", + "rev": "v0.43.0", + "sha256": "sha256-OTJRcFdudwO15GmciAtlz6/Z7JqOpfjbaANJXvP6Jxw=", "vendorSha256": "sha256-43q1SrV7tEt0x7iRUAgBFg1oh8+B9i1i59nlR8kbLIY=", - "version": "0.42.1" + "version": "0.43.0" }, "sops": { "owner": "carlpett", @@ -1105,19 +1105,19 @@ "owner": "SumoLogic", "provider-source-address": "registry.terraform.io/SumoLogic/sumologic", "repo": "terraform-provider-sumologic", - "rev": "v2.18.0", - "sha256": "sha256-Ahj+twdryRx9EovytxEbm9e/s67/0YXBHdRkD8q3jnY=", + "rev": "v2.18.2", + "sha256": "sha256-d0g0iSPyQrMlll7DW09+9krTi7lkeszxE786vKtr6aQ=", "vendorSha256": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=", - "version": "2.18.0" + "version": "2.18.2" }, "tencentcloud": { "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.77.4", - "sha256": "sha256-RkrWJ16fouiINR8+6wW0BBV7lpGu/s32UYPSOUgVLl4=", + "rev": "v1.77.6", + "sha256": "sha256-1mdgrYbWy/PRIQ+o3UmTnSWhnP5p8k1D61Wz4U4N32A=", "vendorSha256": null, - "version": "1.77.4" + "version": "1.77.6" }, "tfe": { "owner": "hashicorp", @@ -1150,10 +1150,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tls", "repo": "terraform-provider-tls", - "rev": "v4.0.1", - "sha256": "sha256-/yfSai1huhk+1OYN6DKspWBdfSDql53lxHWjALD5AV4=", - "vendorSha256": "sha256-Uk20wDu2qIs9Ez/H6NyHMS7i34Il0ReuDzC3MnKdHSk=", - "version": "4.0.1" + "rev": "v4.0.2", + "sha256": "sha256-PerRBYTEY6ITLZ5cWifEQ+FAUvsqC6wUzslI/fa96Hc=", + "vendorSha256": "sha256-7io1fQRX8+QABY0VRKex6W7fP5kDbij0qXrhzPbr/CY=", + "version": "4.0.2" }, "triton": { "deleteVendor": true, @@ -1268,18 +1268,18 @@ "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/wavefront", "repo": "terraform-provider-wavefront", - "rev": "v3.1.0", - "sha256": "sha256-Q9ikBBlqprdu4BheItrWBoWqODgMXLgbtSg9RHtejBE=", - "vendorSha256": "sha256-sUzlDapp1smQ4lbgvsz22y3/fGkfJdHBlK7HNfihYpI=", - "version": "3.1.0" + "rev": "v3.2.0", + "sha256": "sha256-6hqVAg3YwkEDBpkgPQZQyrjHfKfRc8+iTZqMg2vBwJI=", + "vendorSha256": "sha256-0N2YWVnbGvD4YLdEtfdvAjhLY4zkj07GoXtFFPSD5Zk=", + "version": "3.2.0" }, "yandex": { "owner": "yandex-cloud", "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", "repo": "terraform-provider-yandex", - "rev": "v0.77.0", - "sha256": "sha256-jkFWEUHqsR//IqgFIyFyJBm5EoclD5ri23QrZ3tRG/w=", - "vendorSha256": "sha256-08/Av6lrFdhTI0cH5cFbcHKOcDPrchC5wSWW83xHrfU=", - "version": "0.77.0" + "rev": "v0.78.0", + "sha256": "sha256-Llp0o/+CtyoWhymgWxVMPncl4C+XT2/5mhXAN4hYDLY=", + "vendorSha256": "sha256-QcFmk/kmhdhvO2HqpnLGDRIkOYu23A1g/mYKjzapIvc=", + "version": "0.78.0" } } From 4689d513de6c24a3d048358a290d302b9c8b9bbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 05:25:36 +0000 Subject: [PATCH 113/173] baresip: 2.6.0 -> 2.7.0 --- .../networking/instant-messengers/baresip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 79c929401185..a795d0b5ab05 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -24,13 +24,13 @@ , libvpx }: stdenv.mkDerivation rec { - version = "2.6.0"; + version = "2.7.0"; pname = "baresip"; src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${version}"; - sha256 = "sha256-YcXLRhW7PyvK0R1+7DOjmtxg+Ajq9u7fvZFQO7DJapQ="; + sha256 = "sha256-ouevompKkWn5CXuDcPuKiTE9GrIXBs/NFsNu6GHgReE="; }; postPatch = '' patchShebangs modules/ctrl_dbus/gen.sh From af36eb86c5a14886a682feac0cc1c7460bbdbede Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 08:09:33 +0000 Subject: [PATCH 114/173] cimg: 3.1.4 -> 3.1.6 --- pkgs/development/libraries/cimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index c22d819b3be0..3fd1016994e4 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "3.1.4"; + version = "3.1.6"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-nHYRs8X8I0B76SlgqWez3qubrsG7iBfa0I/G78v7H8g="; + hash = "sha256-NZwivsTYgirZXuS25buGHL3uk75shRGMH4c3YdS7Mgg="; }; outputs = [ "out" "doc" ]; From 34bfe4fe1ff0115c9010fa1d0c1150330215f746 Mon Sep 17 00:00:00 2001 From: kraem Date: Sun, 4 Sep 2022 10:17:16 +0200 Subject: [PATCH 115/173] wofi-emoji: fix postPatch --- pkgs/applications/misc/wofi-emoji/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/wofi-emoji/default.nix b/pkgs/applications/misc/wofi-emoji/default.nix index cef747d554f9..eab1baedcac7 100644 --- a/pkgs/applications/misc/wofi-emoji/default.nix +++ b/pkgs/applications/misc/wofi-emoji/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace build.sh \ - --replace 'curl ${emojiJSON.url}' 'cat emoji-en-US.json' + --replace 'curl ${emojiJSON.url}' 'cat ${emojiJSON}' ''; buildPhase = '' From 415cf5edadf353358d66ecd59428f1691157ad99 Mon Sep 17 00:00:00 2001 From: Alias Gram Date: Sat, 3 Sep 2022 00:52:31 +0200 Subject: [PATCH 116/173] obs-hyperion: init at 1.0.1 --- .../video/obs-studio/plugins/default.nix | 1 + .../plugins/obs-hyperion/default.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index a6a4ea572143..34246f13b0c5 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -14,4 +14,5 @@ obs-vkcapture32 = pkgsi686Linux.obs-studio-plugins.obs-vkcapture; }; obs-backgroundremoval = callPackage ./obs-backgroundremoval.nix {}; + obs-hyperion = callPackage ./obs-hyperion/default.nix {}; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix new file mode 100644 index 000000000000..a35824908070 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromGitLab, meson, ninja, pkg-config, obs-studio, libGL +, qtbase }: + +stdenv.mkDerivation rec { + pname = "obs-hyperion"; + version = "1.0.1"; + + src = fetchFromGitLab { + owner = "hyperion-project"; + repo = "hyperion-obs-plugin"; + rev = "v${version}"; + sha256 = "sha256-Si+TGYWpNPtUUFT+M571lCYslPyeYX92MdYV2EGgcyQ="; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + buildInputs = [ obs-studio libGL qtbase ]; + + meta = with lib; { + description = "OBS Studio plugin to connect to a Hyperion.ng server"; + license = licenses.mit; + maintainers = with maintainers; [ algram ]; + platforms = [ "x86_64-linux" ]; + }; +} From 97a8e05ae5d28b98478187391937ed837a829c46 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Sep 2022 20:00:23 +0000 Subject: [PATCH 117/173] nixos/no-x-libs: realphabetize This list was very nearly alphabetized, so let's restore the order before it gets out of hand. --- nixos/modules/config/no-x-libs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 42e68c2eadc1..a11bd8ad9086 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -27,9 +27,10 @@ with lib; fonts.fontconfig.enable = false; nixpkgs.overlays = singleton (const (super: { + beam = super.beam_nox; cairo = super.cairo.override { x11Support = false; }; dbus = super.dbus.override { x11Support = false; }; - beam = super.beam_nox; + gobject-introspection = super.gobject-introspection.override { x11Support = false; }; networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; }; @@ -37,7 +38,6 @@ with lib; networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; }; networkmanager-sstp = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; - gobject-introspection = super.gobject-introspection.override { x11Support = false; }; qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; })); }; From 46b6619cb39e7e4d68c61aab724157ba27a8f94d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Sep 2022 20:02:48 +0000 Subject: [PATCH 118/173] nixos/no-x-libs: use libva-minimal The primary difference between the standard and minimal variants of this package is that all the X libraries are removed from the minimal variant. I had to switch the order of the definitions in all-packages.nix to avoid an infinite recursion after the overlay was applied. --- nixos/modules/config/no-x-libs.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index a11bd8ad9086..96bec4f8d2eb 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -31,6 +31,7 @@ with lib; cairo = super.cairo.override { x11Support = false; }; dbus = super.dbus.override { x11Support = false; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; + libva = super.libva-minimal; networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; networkmanager-iodine = super.networkmanager-iodine.override { withGnome = false; }; networkmanager-l2tp = super.networkmanager-l2tp.override { withGnome = false; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e934b4e32a80..7edd4ed6a686 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20160,8 +20160,8 @@ with pkgs; withUtils = false; }); - libva = callPackage ../development/libraries/libva { }; - libva-minimal = libva.override { minimal = true; }; + libva-minimal = callPackage ../development/libraries/libva { minimal = true; }; + libva = libva-minimal.override { minimal = false; }; libva-utils = callPackage ../development/libraries/libva/utils.nix { }; libva1 = callPackage ../development/libraries/libva/1.nix { }; From 16591184b42917969cf1d03afba950dbc571d1cb Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 2 Sep 2022 20:18:38 +0000 Subject: [PATCH 119/173] nixos/no-x-libs: remove X libs from ffmpeg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prior to this change, ffmpeg couldn't be built for an environment.noXlibs system, because it would fail in: ffmpeg → SDL2 → libdecor ffmpeg certainly does not need support for SDL2 windowing on a noXlibs system. This fix is important because the minidlna NixOS test, which uses the minimal profile (and therefore environment.noXlibs) and ffmpeg, can't currently build. --- nixos/modules/config/no-x-libs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 96bec4f8d2eb..946c9bf38c47 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -30,6 +30,8 @@ with lib; beam = super.beam_nox; cairo = super.cairo.override { x11Support = false; }; dbus = super.dbus.override { x11Support = false; }; + ffmpeg_4 = super.ffmpeg_4.override { sdlSupport = false; vdpauSupport = false; }; + ffmpeg_5 = super.ffmpeg_5.override { sdlSupport = false; vdpauSupport = false; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; libva = super.libva-minimal; networkmanager-fortisslvpn = super.networkmanager-fortisslvpn.override { withGnome = false; }; From 16013ac6c48392135ce59e629e78b56a8f4e09b0 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 16 Aug 2022 12:10:16 +0200 Subject: [PATCH 120/173] dataexplorer: init at 3.6.2 --- .../electronics/dataexplorer/default.nix | 67 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/applications/science/electronics/dataexplorer/default.nix diff --git a/pkgs/applications/science/electronics/dataexplorer/default.nix b/pkgs/applications/science/electronics/dataexplorer/default.nix new file mode 100644 index 000000000000..5745a43df26c --- /dev/null +++ b/pkgs/applications/science/electronics/dataexplorer/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchurl +, jdk +, jre +, ant +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "dataexplorer"; + version = "3.6.2"; + + src = fetchurl { + url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz"; + sha256 = "sha256-2e8qeoJh7z/RIowMtAd8PGcMPck5H8iHqel6bW7EQ0E="; + }; + + nativeBuildInputs = [ ant makeWrapper ]; + + buildInputs = [ jdk ]; + + buildPhase = '' + ant -f build/build.xml dist + ''; + + doCheck = false; + # Missing dependencies (e.g. junit). Does not work. + #checkPhase = '' + # ant -f build/build.xml check + #''; + + installPhase = '' + ant -Dprefix=$out/share/ -f build/build.xml install + + # The sources contain a wrapper script in $out/share/DataExplorer/DataExplorer + # but it hardcodes bash shebang and does not pin the java path. + # So we create our own wrapper, using similar cmdline args as upstream. + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/DataExplorer \ + --add-flags "-Dfile.encoding=UTF-8 -Xms64m -Xmx3092m -jar $out/share/DataExplorer/DataExplorer.jar" \ + --set SWT_GTK3 0 + + makeWrapper ${jre}/bin/java $out/bin/DevicePropertiesEditor \ + --add-flags "-Dfile.encoding=UTF-8 -Xms32m -Xmx512m -classpath $out/share/DataExplorer/DataExplorer.jar gde.ui.dialog.edit.DevicePropertiesEditor" \ + --set SWT_GTK3 0 \ + --set LIBOVERLAY_SCROLLBAR 0 + + install -Dvm644 build/misc/GNU_LINUX_JUNSI_ICHARER_DUO_UDEV_RULE/50-Junsi-iCharger-DUO.rules \ + $out/etc/udev/rules.d/50-Junsi-iCharger-DUO.rules + install -Dvm644 build/misc/GNU_LINUX_SKYRC_UDEV_RULE/50-SkyRC-Charger.rules \ + $out/etc/udev/rules.d/50-SkyRC-Charger.rules + ''; + + meta = with lib; { + description = "Graphical tool to analyze data, gathered from various hardware devices"; + homepage = "https://www.nongnu.org/dataexplorer/index.html"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ panicgh ]; + platforms = jdk.meta.platforms; + sourceProvenance = with sourceTypes; [ + fromSource + binaryNativeCode # contains RXTXcomm (JNI library with *.so files) + binaryBytecode # contains thirdparty jar files, e.g. javax.json, org.glassfish.json + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cea0fd514050..b9151ac4cfb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34541,6 +34541,8 @@ with pkgs; csxcad = callPackage ../applications/science/electronics/csxcad { }; + dataexplorer = callPackage ../applications/science/electronics/dataexplorer { }; + diylc = callPackage ../applications/science/electronics/diylc { }; flatcam = callPackage ../applications/science/electronics/flatcam { }; From 88441f3e44d3ed8c2425a3259be546d2e5fc283a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 4 Sep 2022 08:29:44 +0000 Subject: [PATCH 121/173] unstableGitUpdater: fix inaccurate comments It used to use src.url, but when that was changed the comments weren't updated. Fixes: 7aae279ad9a ("unstableGitUpdater: fix updating fetchzip-based sources") --- pkgs/common-updater/unstable-updater.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/common-updater/unstable-updater.nix b/pkgs/common-updater/unstable-updater.nix index 2be065f410e7..f8944222a8d5 100644 --- a/pkgs/common-updater/unstable-updater.nix +++ b/pkgs/common-updater/unstable-updater.nix @@ -8,7 +8,7 @@ # This is an updater for unstable packages that should always use the latest # commit. -{ url ? null # The git url, if empty it will be set to src.url +{ url ? null # The git url, if empty it will be set to src.gitRepoUrl , branch ? null , stableVersion ? false # Use version format according to RFC 107 (i.e. LAST_TAG+date=YYYY-MM-DD) , tagPrefix ? "" # strip this prefix from a tag name when using stable version @@ -46,7 +46,7 @@ let esac done - # By default we set url to src.url + # By default we set url to src.gitRepoUrl if [[ -z "$url" ]]; then url="$(${nix}/bin/nix-instantiate $systemArg --eval -E \ "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.gitRepoUrl" \ From ce609256fbada1969c5b9e499b2b233d49afc0ee Mon Sep 17 00:00:00 2001 From: bb2020 Date: Tue, 2 Aug 2022 00:26:23 +0300 Subject: [PATCH 122/173] nixos/minidlna: update documentation --- .../modules/services/networking/minidlna.nix | 29 ++++++------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix index 0cac41f58da3..549f1fe5de30 100644 --- a/nixos/modules/services/networking/minidlna.nix +++ b/nixos/modules/services/networking/minidlna.nix @@ -1,6 +1,5 @@ # Module for MiniDLNA, a simple DLNA server. { config, lib, pkgs, ... }: - with lib; let @@ -34,8 +33,7 @@ in default = {}; description = lib.mdDoc '' The contents of MiniDLNA's configuration file. - When the service is activated, a basic template is generated - from the current options opened here. + When the service is activated, a basic template is generated from the current options opened here. ''; type = types.submodule { freeformType = settingsFormat.type; @@ -46,10 +44,8 @@ in example = [ "/data/media" "V,/home/alice/video" ]; description = lib.mdDoc '' Directories to be scanned for media files. - The prefixes `A,`,`V,` and - `P,` restrict a directory to audio, video - or image files. The directories must be accessible to the - `minidlna` user account. + The `A,` `V,` `P,` prefixes restrict a directory to audio, video or image files. + The directories must be accessible to the `minidlna` user account. ''; }; options.notify_interval = mkOption { @@ -57,18 +53,11 @@ in default = 90000; description = lib.mdDoc '' The interval between announces (in seconds). - Instead of waiting on announces, one can open port UDP 1900 or - set `openFirewall` option to use SSDP discovery. - Furthermore announce interval has now been set as 90000 in order - to prevent disconnects with certain clients and to rely solely - on the SSDP method. - - Lower values (e.g. 60 seconds) should be used if one does not - want to utilize SSDP. By default miniDLNA will announce its - presence on the network approximately every 15 minutes. Many - people prefer shorter announce intervals on their home networks, - especially when DLNA clients are started on demand. + Instead of waiting for announces, you should set `openFirewall` option to use SSDP discovery. + Furthermore, this option has been set to 90000 in order to prevent disconnects with certain + clients and relies solely on the discovery. + Lower values (e.g. 30 seconds) should be used if you can't use the discovery. Some relevant information can be found here: https://sourceforge.net/p/minidlna/discussion/879957/thread/1389d197/ ''; @@ -86,7 +75,7 @@ in }; options.friendly_name = mkOption { type = types.str; - default = "${config.networking.hostName} MiniDLNA"; + default = config.networking.hostName; defaultText = literalExpression "config.networking.hostName"; example = "rpi3"; description = lib.mdDoc "Name that the DLNA server presents to clients."; @@ -116,7 +105,7 @@ in options.wide_links = mkOption { type = types.enum [ "yes" "no" ]; default = "no"; - description = lib.mdDoc "Set this to yes to allow symlinks that point outside user-defined media_dirs."; + description = lib.mdDoc "Set this to yes to allow symlinks that point outside user-defined `media_dir`."; }; }; }; From ccd367ae4fcaa65975a140482fa411ffbf85cbe3 Mon Sep 17 00:00:00 2001 From: bb2020 Date: Fri, 2 Sep 2022 22:40:45 +0300 Subject: [PATCH 123/173] nixos/minidlna: fix tests --- nixos/tests/minidlna.nix | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/nixos/tests/minidlna.nix b/nixos/tests/minidlna.nix index 76039b0bb42c..32721819634e 100644 --- a/nixos/tests/minidlna.nix +++ b/nixos/tests/minidlna.nix @@ -6,25 +6,24 @@ import ./make-test-python.nix ({ pkgs, ... }: { { ... }: { imports = [ ../modules/profiles/minimal.nix ]; - networking.firewall.allowedTCPPorts = [ 8200 ]; - services.minidlna = { - enable = true; - loglevel = "error"; - mediaDirs = [ - "PV,/tmp/stuff" + services.minidlna.enable = true; + services.minidlna.openFirewall = true; + services.minidlna.settings = { + log_level = "error"; + media_dir = [ + "PV,/tmp/stuff" + ]; + friendly_name = "rpi3"; + root_container = "B"; + notify_interval = 60; + album_art_names = [ + "Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg" + "AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg" + "Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg" ]; - friendlyName = "rpi3"; - rootContainer = "B"; - extraConfig = - '' - album_art_names=Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg - album_art_names=AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg - album_art_names=Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg - notify_interval=60 - ''; }; }; - client = { ... }: { }; + client = { ... }: { }; }; testScript = From ba843121ab69f068b42b97bc29694a61bf7614fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 09:18:39 +0000 Subject: [PATCH 124/173] fcitx5-lua: 5.0.9 -> 5.0.10 --- pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index f367ccd7a935..4f76a1e770a7 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-lua"; - version = "5.0.9"; + version = "5.0.10"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-XeRMPbatXUudxo1EICL7z8V3slxkzo27f+D4xLjRtU4="; + sha256 = "sha256-0ESgQv8kyc+zv/tDZtBZ+QhFFswD80ApwswFlJs8tOU="; }; nativeBuildInputs = [ From f4a7022c853ecc453a91f87431039306047b86da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 09:22:36 +0000 Subject: [PATCH 125/173] libsForQt5.fcitx5-qt: 5.0.14 -> 5.0.15 --- pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 79a0e7310336..0b0b3cad39d4 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "fcitx5-qt"; - version = "5.0.14"; + version = "5.0.15"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-LmE6HgNLoJmgJtJmubAIjFi8Xpnmw3hgqJh6HUcakzg="; + sha256 = "sha256-yQFYol4rEXmQBJWoc96yWJkJc3RVP6U964tdJdkGelU="; }; preConfigure = '' From 786bf7b78b8621b896ea7edcb5db92e86ae87aa3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 09:24:24 +0000 Subject: [PATCH 126/173] fcitx5-configtool: 5.0.14 -> 5.0.15 --- pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index 85ec938645f2..cdab88c9c6f5 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.0.14"; + version = "5.0.15"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-nfVdYW//ehjTFvb5ciu7ajoUB5NPZ/BkLkChJiBJPWY="; + sha256 = "sha256-VTvJpQrACZ6xoXkfTqhVK2MUy9i7Snn9zVCK3dayVz0="; }; cmakeFlags = [ From db48e5175ffdbd77dc671a13a9bb1b4acca965aa Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 28 Aug 2022 02:04:25 +0200 Subject: [PATCH 127/173] cppreference-doc: init at 2022.07.30 --- .../misc/cppreference-doc/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/misc/cppreference-doc/default.nix diff --git a/pkgs/development/misc/cppreference-doc/default.nix b/pkgs/development/misc/cppreference-doc/default.nix new file mode 100644 index 000000000000..690ceb4276f0 --- /dev/null +++ b/pkgs/development/misc/cppreference-doc/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchzip }: + +let + pname = "cppreference-doc"; + version = "2022.07.30"; + ver = builtins.replaceStrings ["."] [""] version; + +in fetchzip { + name = pname + "-" + version; + + url = "https://github.com/PeterFeicht/${pname}/releases/download/v${ver}/html-book-${ver}.tar.xz"; + sha256 = "sha256-gsYNpdxbWnmwcC9IJV1g+e0/s4Hoo5ig1MGoYPIHspw="; + + stripRoot = false; + + postFetch = '' + rm $out/cppreference-doxygen-local.tag.xml $out/cppreference-doxygen-web.tag.xml + mkdir -p $out/share/cppreference/doc + mv $out/reference $out/share/cppreference/doc/html + ''; + + passthru = { inherit pname version; }; + + meta = with lib; { + description = "C++ standard library reference"; + homepage = "https://en.cppreference.com"; + license = licenses.cc-by-sa-30; + maintainers = with maintainers; [ panicgh ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd67e676fbb7..cf34c2ca3b36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15360,6 +15360,8 @@ with pkgs; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; + cppreference-doc = callPackage ../development/misc/cppreference-doc { }; + sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {}; jruby = callPackage ../development/interpreters/jruby { }; From f17ee04608c69e707132f320e9bcd2b0b1e59eeb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 4 Sep 2022 10:16:50 +0200 Subject: [PATCH 128/173] =?UTF-8?q?ocamlPackages.index:=201.6.0=20?= =?UTF-8?q?=E2=86=92=201.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/index/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index 3dc4a9856f93..04373cbcce8d 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -6,15 +6,14 @@ buildDunePackage rec { pname = "index"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "sha256:150mcsh8vj2hapfnxbjmacanjy4avrv8yk1lyaxmqj3fpmn1y32y"; + sha256 = "sha256-rPwNzqkWqDak2mDTDIBqIvachY1vfOIzFmwaXjZea+4="; }; minimalOCamlVersion = "4.08"; - useDune2 = true; buildInputs = [ stdlib-shims From f4e5b50fe2bb4d429d419c00eabae2fc965caf7d Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 4 Sep 2022 12:22:33 +0200 Subject: [PATCH 129/173] chocolateDoom: build man pages Closes #189632 --- pkgs/games/chocolate-doom/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index fabb12fa71fa..30fe2010b022 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, autoreconfHook, pkg-config, SDL2, SDL2_mixer, SDL2_net +, fetchFromGitHub, fetchpatch, python3 }: stdenv.mkDerivation rec { pname = "chocolate-doom"; @@ -21,11 +22,19 @@ stdenv.mkDerivation rec { }) ]; + outputs = [ "out" "man" ]; + postPatch = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am + patchShebangs --build man/{simplecpp,docgen} ''; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + # for documentation + python3 + ]; buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; enableParallelBuilding = true; From 0ddc9fa30903c8f2be53a028f68b48c335ebf7ea Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 7 Aug 2022 10:07:47 +0800 Subject: [PATCH 130/173] python3Packages.mautrix: 0.17.3 -> 0.17.8 --- pkgs/development/python-modules/mautrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 7b85a17a31a3..a17c2c9c079a 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.17.3"; + version = "0.17.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-j49NrZJMDw8m5ZGP4DXxk7uzF+0BxDjs4coEkMDUP+0="; + sha256 = "sha256-DFajAD5mnXLQmJGRv4j2mWhtIj77nZNSQhbesX4qMys="; }; propagatedBuildInputs = [ From cb46b008b62665613b6e1c65a68ebdcf807e7aa0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 28 Jul 2022 19:57:16 +0800 Subject: [PATCH 131/173] python3Packages.cryptg: init at 0.3.1 --- .../python-modules/cryptg/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/cryptg/default.nix diff --git a/pkgs/development/python-modules/cryptg/default.nix b/pkgs/development/python-modules/cryptg/default.nix new file mode 100644 index 000000000000..2ebc1f0e3626 --- /dev/null +++ b/pkgs/development/python-modules/cryptg/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, rustPlatform +, setuptools-rust +}: + +buildPythonPackage rec { + pname = "cryptg"; + version = "0.3.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "cher-nov"; + repo = pname; + rev = "v${version}"; + hash = "sha256-IhzwQrWu8k308ZZhWz4Z3FHAkSLTXiCydyiy0MPN8NI="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-M2ySVqfgpgHktLh4t5Sh1UTBCzajlQiDku4O9azHJwk="; + }; + + nativeBuildInputs = with rustPlatform;[ + setuptools-rust + cargoSetupHook + rust.rustc + rust.cargo + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "cryptg" ]; + + meta = with lib; { + description = "Official Telethon extension to provide much faster cryptography for Telegram API requests"; + homepage = "https://github.com/cher-nov/cryptg"; + license = licenses.cc0; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec711739e657..c92bf5e2a3a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2115,6 +2115,8 @@ in { cryptacular = callPackage ../development/python-modules/cryptacular { }; + cryptg = callPackage ../development/python-modules/cryptg { }; + cryptography = callPackage ../development/python-modules/cryptography { inherit (pkgs.darwin) libiconv; inherit (pkgs.darwin.apple_sdk.frameworks) Security; From 899bb872983c3fea9ae224898548c7281640c259 Mon Sep 17 00:00:00 2001 From: victor Date: Mon, 29 Aug 2022 10:44:42 +0200 Subject: [PATCH 132/173] vscode-extensions.catppuccin.catppuccin-vsc: init at 2.1.0 --- .../editors/vscode/extensions/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 4e5807e80191..e6a53f183cfc 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -538,6 +538,21 @@ let }; }; + catppuccin.catppuccin-vsc = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "catppuccin-vsc"; + publisher = "catppuccin"; + version = "2.1.0"; + sha256 = "sha256-1pX9NQxW2Rm9p912Pn7QmLmXPI7EmiXTnCLWsIQNFhY="; + }; + meta = with lib; { + description = "Soothing pastel theme for VSCode"; + license = licenses.mit; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Catppuccin.catppuccin-vsc"; + maintainers = with maintainers; [ nullx76 ]; + }; + }; + chenglou92.rescript-vscode = callPackage ./rescript { }; christian-kohler.path-intellisense = buildVscodeMarketplaceExtension { From 2dd6b94234392d685c5d66b9ed13e51c235654e6 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 2 Sep 2022 10:18:02 +0300 Subject: [PATCH 133/173] =?UTF-8?q?libspatialindex:=201.8.5=20=E2=86=92=20?= =?UTF-8?q?1.9.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/libspatialindex/default.nix | 41 +++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 2081650f90a9..455d42c3bb45 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -1,20 +1,37 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libspatialindex"; - version = "1.8.5"; + version = "1.9.3"; - src = fetchurl { - url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; - sha256 = "1vxzm7kczwnb6qdmc0hb00z8ykx11zk3sb68gc7rch4vrfi4dakw"; + src = fetchFromGitHub { + owner = "libspatialindex"; + repo = "libspatialindex"; + rev = finalAttrs.version; + hash = "sha256-zsvS0IkCXyuNLCQpccKdAsFKoq0l+y66ifXlTHLNTkc="; }; - enableParallelBuilding = true; + patches = [ + # Allow building static libs + (fetchpatch { + name = "fix-static-lib-build.patch"; + url = "https://github.com/libspatialindex/libspatialindex/commit/caee28d84685071da3ff3a4ea57ff0b6ae64fc87.patch"; + hash = "sha256-nvTW/t9tw1ZLeycJY8nj7rQgZogxQb765Ca2b9NDvRo="; + }) + ]; - meta = { + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DSIDX_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" + ]; + + doCheck = true; + + meta = with lib; { description = "Extensible spatial index library in C++"; - homepage = "http://libspatialindex.github.io/"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; + homepage = "https://libspatialindex.org"; + license = licenses.mit; + platforms = platforms.unix; }; -} +}) From 9997578fae6965ec8244b294e285dc81c03944ea Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 28 Jul 2022 17:10:27 +0800 Subject: [PATCH 134/173] mautrix-telegram: 0.11.3 -> 0.12.0 and rework packaging --- pkgs/servers/mautrix-telegram/default.nix | 65 ++++++++++------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index eb6372b12037..5b021cd80985 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -1,5 +1,8 @@ -{ lib, python3, mautrix-telegram, fetchFromGitHub +{ lib +, python3 +, fetchFromGitHub , withE2BE ? true +, withHQthumbnails ? false }: let @@ -21,75 +24,65 @@ let }; }); tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { - version = "1.25.0a7"; + version = "1.25.0a20"; pname = "tulir-telethon"; src = oldAttrs.src.override { inherit pname version; - sha256 = "sha256-+wHRrBluM0ejdHjIvSk28wOIfCfIyibBcmwG/ksbiac="; + sha256 = "sha256-X9oo+YCNMqQrJvQa/PIi9dFgaeQxbrlnwUJnwjRb6Jc="; }; }); }; }; - - # officially supported database drivers - dbDrivers = with python.pkgs; [ - psycopg2 - aiosqlite - # sqlite driver is already shipped with python by default - ]; - in python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.11.3"; + version = "0.12.0"; disabled = python.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mautrix"; repo = "telegram"; rev = "v${version}"; - sha256 = "sha256-PfER/wqJ607w0xVrFZadzmxYyj72O10c2lIvCW7LT8Y="; + sha256 = "sha256-SUwiRrTY8NgOGQ643prsm3ZklOlwX/59m/u1aewFuik="; }; patches = [ ./0001-Re-add-entrypoint.patch ]; propagatedBuildInputs = with python.pkgs; ([ - Mako - aiohttp - mautrix - sqlalchemy - CommonMark ruamel-yaml python-magic + CommonMark + aiohttp + yarl + mautrix tulir-telethon - telethon-session-sqlalchemy - pillow - lxml - setuptools - prometheus-client - ] ++ lib.optionals withE2BE [ asyncpg + Mako + # optional + cryptg + cchardet + aiodns + brotli + pillow + qrcode + phonenumbers + prometheus-client + aiosqlite + ] ++ lib.optionals withHQthumbnails [ + moviepy + ] ++ lib.optionals withE2BE [ python-olm pycryptodome unpaddedbase64 - ]) ++ dbDrivers; + ]); - # Tests are broken and throw the following for every test: - # TypeError: 'Mock' object is not subscriptable - # - # The tests were touched the last time in 2019 and upstream CI doesn't even build - # those, so it's safe to assume that this part of the software is abandoned. + # has no tests doCheck = false; - checkInputs = with python.pkgs; [ - pytest - pytest-mock - pytest-asyncio - ]; meta = with lib; { homepage = "https://github.com/mautrix/telegram"; description = "A Matrix-Telegram hybrid puppeting/relaybot bridge"; license = licenses.agpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nyanloutre ma27 ]; + maintainers = with maintainers; [ nyanloutre ma27 nickcao ]; }; } From 5fd39c263ef267ad399e8fabc431f269c541658d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 30 Jul 2022 10:12:04 +0800 Subject: [PATCH 135/173] Revert "mautrix-telegram: override mautrix and asyncpg dependencies" This reverts commit 811fcda8271074aa6a4e64990c49479ef5616bb5. --- pkgs/servers/mautrix-telegram/default.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 5b021cd80985..7e31c22ebd3b 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -8,21 +8,6 @@ let python = python3.override { packageOverrides = self: super: { - asyncpg = super.asyncpg.overridePythonAttrs (oldAttrs: rec { - version = "0.25.0"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-Y/jmppczsoVJfChVRko03mV/LMzSWurutQcYcuk4JUA="; - }; - }); - mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec { - version = "0.16.3"; - src = oldAttrs.src.override { - inherit (oldAttrs) pname; - inherit version; - sha256 = "sha256-OpHLh5pCzGooQ5yxAa0+85m/szAafV+l+OfipQcfLtU="; - }; - }); tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { version = "1.25.0a20"; pname = "tulir-telethon"; From ebafad7e76a58f4af0549b97d32bb781fd8a5233 Mon Sep 17 00:00:00 2001 From: ash Date: Sun, 4 Sep 2022 12:29:59 +0100 Subject: [PATCH 136/173] xivlauncher: add sersorrel to maintainers --- pkgs/games/xivlauncher/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/xivlauncher/default.nix b/pkgs/games/xivlauncher/default.nix index e9f399e95a62..caba0beb3547 100644 --- a/pkgs/games/xivlauncher/default.nix +++ b/pkgs/games/xivlauncher/default.nix @@ -64,7 +64,7 @@ in description = "Custom launcher for FFXIV"; homepage = "https://github.com/goatcorp/FFXIVQuickLauncher"; license = licenses.gpl3; - maintainers = with maintainers; [ ashkitten ]; + maintainers = with maintainers; [ ashkitten sersorrel ]; platforms = [ "x86_64-linux" ]; }; } From f7c832466edd3aecc56020781def99cb78c55e97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 11:50:36 +0000 Subject: [PATCH 137/173] cirrus-cli: 0.84.0 -> 0.85.0 --- .../tools/continuous-integration/cirrus-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 59af3340bad7..4df160fff301 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.84.0"; + version = "0.85.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-14S0Y1ax0bg7nD4iCEujwLIZSjpWYaLWidpYVwQB0dw="; + sha256 = "sha256-hFL7ImtaQrNeoxNLE/RL79SHRBHSit1dQ6Wn8gq8dns="; }; - vendorSha256 = "sha256-XVGFJv9TYjuwVubTcFVI2b+M2ZDE1Jv4u/dxowcLL2s="; + vendorSha256 = "sha256-GRCcKIUimPFdeAhnz6RC5arZ0E+z+SpaAC1uDaxpJkI="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" From 66fdc40068aca4776466e910283ae0aad256825b Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Sun, 4 Sep 2022 19:56:43 +0800 Subject: [PATCH 138/173] arch-install-scripts: 24 -> 26 --- .../misc/arch-install-scripts/default.nix | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/misc/arch-install-scripts/default.nix b/pkgs/tools/misc/arch-install-scripts/default.nix index c89e575e8eb0..ae447896eb6c 100644 --- a/pkgs/tools/misc/arch-install-scripts/default.nix +++ b/pkgs/tools/misc/arch-install-scripts/default.nix @@ -5,30 +5,42 @@ , bash , coreutils , gawk +, gnugrep , gnum4 +, makeWrapper +, pacman , util-linux +, chrootPath ? [ + "/usr/local/sbin" + "/usr/local/bin" + "/usr/bin" + "/usr/bin/site_perl" + "/usr/bin/vendor_perl" + "/usr/bin/core_perl" + ] }: resholve.mkDerivation rec { pname = "arch-install-scripts"; - version = "24"; + version = "26"; src = fetchFromGitHub { owner = "archlinux"; repo = "arch-install-scripts"; rev = "v${version}"; - sha256 = "06rydiliis34lbz5fsayhbczs1xqi1a80jnhxafpjf6k3rfji6iq"; + hash = "sha256-TRo1ANKSt3njw4HdBMUymMJDpTkL/i5/hdSqxHZnuYw="; }; nativeBuildInputs = [ asciidoc gnum4 ]; - preBuild = '' + postPatch = '' substituteInPlace ./Makefile \ --replace "PREFIX = /usr/local" "PREFIX ?= /usr/local" - - # https://github.com/archlinux/arch-install-scripts/pull/10 - substituteInPlace ./common \ - --replace "print '%s' \"\$1\"" "printf '%s' \"\$1\"" + substituteInPlace ./pacstrap.in \ + --replace "cp -a" "cp -LR --no-preserve=mode" \ + --replace "unshare pacman" "unshare ${pacman}/bin/pacman" \ + --replace 'gnupg "$newroot/etc/pacman.d/"' 'gnupg "$newroot/etc/pacman.d/" && chmod 700 "$newroot/etc/pacman.d/gnupg"' + echo "export PATH=${lib.strings.makeSearchPath "" chrootPath}:\$PATH" >> ./common ''; installFlags = [ "PREFIX=$(out)" ]; @@ -50,7 +62,7 @@ resholve.mkDerivation rec { interpreter = "${bash}/bin/bash"; # packages resholve should resolve executables from - inputs = [ coreutils gawk util-linux ]; + inputs = [ coreutils gawk gnugrep pacman util-linux ]; # TODO: no good way to resolve mount/umount in Nix builds for now # see https://github.com/abathur/resholve/issues/29 @@ -58,11 +70,7 @@ resholve.mkDerivation rec { external = [ "mount" "umount" ]; }; - # TODO: remove the execer lore override below after - # https://github.com/abathur/binlore/issues/1 - execer = [ - "cannot:${util-linux}/bin/unshare" - ]; + keep = [ "$setup" "$pid_unshare" "$mount_unshare" "${pacman}/bin/pacman" ]; }; }; @@ -73,7 +81,7 @@ resholve.mkDerivation rec { ''; homepage = "https://github.com/archlinux/arch-install-scripts"; license = licenses.gpl2Only; - maintainers = with maintainers; [ yayayayaka ]; + maintainers = with maintainers; [ samlukeyes123 ]; platforms = platforms.linux; }; } From e5b52ee3e27886d6997da79d09f1b7aff3cd54cf Mon Sep 17 00:00:00 2001 From: Niko Strijbol Date: Sun, 4 Sep 2022 14:02:59 +0200 Subject: [PATCH 139/173] kwalletcli: fix kwalletcli_getpin command (#188818) Co-authored-by: Sandro --- pkgs/tools/security/kwalletcli/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix index d18d5c1ef8b5..3b01e4a2fb50 100644 --- a/pkgs/tools/security/kwalletcli/default.nix +++ b/pkgs/tools/security/kwalletcli/default.nix @@ -22,6 +22,9 @@ mkDerivation rec { substituteInPlace pinentry-kwallet \ --replace '/usr/bin/env mksh' ${mksh}/bin/mksh + + substituteInPlace kwalletcli_getpin \ + --replace '/usr/bin/env mksh' ${mksh}/bin/mksh ''; makeFlags = [ "KDE_VER=5" ]; @@ -35,9 +38,11 @@ mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/pinentry-kwallet \ - --prefix PATH : $out/bin:${lib.makeBinPath [ pinentry-qt ]} \ - --set-default PINENTRY pinentry-qt + for program in pinentry-kwallet kwalletcli_getpin; do + wrapProgram $out/bin/$program \ + --prefix PATH : $out/bin:${lib.makeBinPath [ pinentry-qt ]} \ + --set-default PINENTRY pinentry-qt + done ''; meta = with lib; { From 200677a03dd4dc6efc9a62138310648b56c51637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 31 Aug 2022 17:56:52 +0200 Subject: [PATCH 140/173] python310Packages.geventhttpclient: 2.0 -> 2.0.2 --- .../development/python-modules/geventhttpclient/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 47aaeb37c033..4904a84c2f34 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "geventhttpclient"; - version = "2.0"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-SegzLaon80HeCNk4h4KJs7dzaVzblvIpZRjC1uPr7JI="; + hash = "sha256-gTWoUgCxcN73KT0B3RVXkx/NG+wax4xSrXzt0iNoubo="; }; propagatedBuildInputs = [ @@ -36,6 +36,8 @@ buildPythonPackage rec { urllib3 ]; + __darwinAllowLocalNetworking = true; + disabledTests = [ # socket.gaierror: [Errno -3] Temporary failure in name resolution "test_client_simple" From 376fcb9dce53dadf5ae4d042339b13477cf5c478 Mon Sep 17 00:00:00 2001 From: nviets Date: Sun, 4 Sep 2022 07:29:04 -0500 Subject: [PATCH 141/173] nng: added tls and mbedtls support (#188668) --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/development/libraries/nng/default.nix | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f2697542783d..a217f72b46c6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9686,6 +9686,12 @@ github = "numkem"; githubId = 332423; }; + nviets = { + email = "nathan.g.viets@gmail.com"; + github = "nviets"; + githubId = 16027994; + name = "Nathan Viets"; + }; nyanloutre = { email = "paul@nyanlout.re"; github = "nyanloutre"; diff --git a/pkgs/development/libraries/nng/default.nix b/pkgs/development/libraries/nng/default.nix index 69fde25bb5c9..9acc64fea642 100644 --- a/pkgs/development/libraries/nng/default.nix +++ b/pkgs/development/libraries/nng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja }: +{ lib, stdenv, fetchFromGitHub, cmake, ninja, mbedtlsSupport ? true, mbedtls }: stdenv.mkDerivation rec { pname = "nng"; @@ -11,9 +11,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-qbjMLpPk5FxH710Mf8AIraY0mERbaxVVhTT94W0EV+k="; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ cmake ninja ] + ++ lib.optionals mbedtlsSupport [ mbedtls ]; - cmakeFlags = [ "-G Ninja" ]; + buildInputs = lib.optional mbedtlsSupport [ mbedtls ]; + + cmakeFlags = [ "-G Ninja" "-DNNG_ENABLE_TLS=ON" ] + ++ lib.optionals mbedtlsSupport [ "-DMBEDTLS_ROOT_DIR=${mbedtls}" ]; meta = with lib; { homepage = "https://nng.nanomsg.org/"; @@ -21,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.mit; mainProgram = "nngcat"; platforms = platforms.unix; + maintainers = with maintainers; [ nviets ]; }; } From 0d44562788af06ba6a34f7ada5a0a48a4cbb89f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 4 Sep 2022 12:39:21 +0200 Subject: [PATCH 142/173] nixos/gnupg: void error messages when using nix remote builders --- nixos/modules/programs/gnupg.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index 1a9006aad14e..828f24f99111 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -135,7 +135,7 @@ in # The SSH agent protocol doesn't have support for changing TTYs; however we # can simulate this with the `exec` feature of openssh (see ssh_config(5)) # that hooks a command to the shell currently running the ssh program. - Match host * exec "${cfg.package}/bin/gpg-connect-agent --quiet updatestartuptty /bye > /dev/null" + Match host * exec "${cfg.package}/bin/gpg-connect-agent --quiet updatestartuptty /bye >/dev/null 2>&1" ''; environment.extraInit = mkIf cfg.agent.enableSSHSupport '' From 8c35bc9e14c01f40890aff62178fb683f7a02d22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanpe=20Bol=C3=ADvar?= Date: Sun, 4 Sep 2022 14:39:18 +0200 Subject: [PATCH 143/173] amuled: add option to only build web, add top-level amule-web (#176775) --- pkgs/tools/networking/p2p/amule/default.nix | 16 +++++++++++++--- pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index 9431da7cf468..7538bb941260 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -21,10 +21,11 @@ }: # daemon and client are not build monolithic -assert monolithic || (!monolithic && (enableDaemon || client)); +assert monolithic || (!monolithic && (enableDaemon || client || httpServer)); stdenv.mkDerivation rec { pname = "amule" + + lib.optionalString httpServer "-web" + lib.optionalString enableDaemon "-daemon" + lib.optionalString client "-gui"; version = "2.3.3"; @@ -53,8 +54,18 @@ stdenv.mkDerivation rec { "-DBUILD_DAEMON=${if enableDaemon then "ON" else "OFF"}" "-DBUILD_REMOTEGUI=${if client then "ON" else "OFF"}" "-DBUILD_WEBSERVER=${if httpServer then "ON" else "OFF"}" + # building only the daemon fails when these are not set... this is + # due to mistakes in the Amule cmake code, but it does not cause + # extra code to be built... + "-Dwx_NEED_GUI=ON" + "-Dwx_NEED_ADV=ON" + "-Dwx_NEED_NET=ON" ]; + postPatch = '' + echo "find_package(Threads)" >> cmake/options.cmake + ''; + # aMule will try to `dlopen' libupnp and libixml, so help it # find them. postInstall = lib.optionalString monolithic '' @@ -79,7 +90,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.unix; - # cmake fails: Cannot specify link libraries for target "wxWidgets::ADV" which is not built by this project. - broken = enableDaemon || stdenv.isDarwin; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25f4acb9b6c1..54bc4eb21a8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2211,6 +2211,11 @@ with pkgs; client = true; }; + amule-web = amule.override { + monolithic = false; + httpServer = true; + }; + antennas = nodePackages.antennas; apg = callPackage ../tools/security/apg { }; From af482381f67e89fb92a6e6dc829c1496cab77fba Mon Sep 17 00:00:00 2001 From: Iztok Fister Jr Date: Sun, 4 Sep 2022 14:44:43 +0200 Subject: [PATCH 144/173] uarmsolver: init at 0.2.4 (#188274) Co-authored-by: Sandro --- maintainers/maintainer-list.nix | 6 ++++ .../machine-learning/uarmsolver/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/applications/science/machine-learning/uarmsolver/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e5aa18445485..d7790e1c3ff3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4340,6 +4340,12 @@ githubId = 415760; name = "Jonas Höglund"; }; + firefly-cpp = { + email = "iztok@iztok-jr-fister.eu"; + github = "firefly-cpp"; + githubId = 1633361; + name = "Iztok Fister Jr."; + }; fishi0x01 = { email = "fishi0x01@gmail.com"; github = "fishi0x01"; diff --git a/pkgs/applications/science/machine-learning/uarmsolver/default.nix b/pkgs/applications/science/machine-learning/uarmsolver/default.nix new file mode 100644 index 000000000000..b04d4a010783 --- /dev/null +++ b/pkgs/applications/science/machine-learning/uarmsolver/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "uarmsolver"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "firefly-cpp"; + repo = "uARMSolver"; + rev = version; + sha256 = "17px69z0kw0z6cip41c45i6srbw56b0md92i9vbqyzinx8b75mzw"; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + install -D -t $out/bin uARMSolver + ''; + + meta = with lib; { + description = "universal Association Rule Mining Solver"; + homepage = "https://github.com/firefly-cpp/uARMSolver"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ firefly-cpp ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54bc4eb21a8e..e04004bf8858 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34236,6 +34236,8 @@ with pkgs; sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { }; + uarmsolver = callPackage ../applications/science/machine-learning/uarmsolver { }; + ### SCIENCE/MATH _4ti2 = callPackage ../applications/science/math/4ti2 { }; From 2c4c52179c4490cb88c9ca16074a75c03382c13c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 4 Sep 2022 15:18:32 +0200 Subject: [PATCH 145/173] muse: remove unecessary chmod u+w over all files (#189690) --- pkgs/applications/audio/muse/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index f5a6bafe792c..89ccf00c6d38 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -16,10 +16,6 @@ stdenv.mkDerivation rec { sourceRoot = "source/muse3"; - prePatch = '' - chmod u+w $NIX_BUILD_TOP - ''; - patches = [ ./fix-parallel-building.patch ]; nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; From 4da99f7371cb4a9c83c091a3ca88940312ae7e5b Mon Sep 17 00:00:00 2001 From: Stephane <8668915+haskelious@users.noreply.github.com> Date: Sun, 4 Sep 2022 15:40:47 +0200 Subject: [PATCH 146/173] roundcubePlugins.carddav: 4.3.0 -> 4.4.3 (#188089) --- pkgs/servers/roundcube/plugins/carddav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/plugins/carddav/default.nix b/pkgs/servers/roundcube/plugins/carddav/default.nix index b26cfce67721..04f7dbbd0bf4 100644 --- a/pkgs/servers/roundcube/plugins/carddav/default.nix +++ b/pkgs/servers/roundcube/plugins/carddav/default.nix @@ -2,10 +2,10 @@ roundcubePlugin rec { pname = "carddav"; - version = "4.3.0"; + version = "4.4.3"; src = fetchzip { url = "https://github.com/mstilkerich/rcmcarddav/releases/download/v${version}/carddav-v${version}.tar.gz"; - sha256 = "1jk1whx155svfalf1kq8vavn7jsswmzx4ax5zbj01783rqyxkkd5"; + sha256 = "0xm2x6r0j8dpkybxq28lbwpbmxaa52z8jnw3yaszvmx04zsr5mn8"; }; } From 5518e6aba11f50f0953fa21c7ad6a283c4741b95 Mon Sep 17 00:00:00 2001 From: Mostly Void Date: Sun, 4 Sep 2022 19:23:06 +0530 Subject: [PATCH 147/173] ferretdb: init at 0.5.2 (#188584) Co-authored-by: Sandro --- pkgs/servers/nosql/ferretdb/default.nix | 33 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/servers/nosql/ferretdb/default.nix diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix new file mode 100644 index 000000000000..01105ffd0b19 --- /dev/null +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ferretdb"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "FerretDB"; + repo = "FerretDB"; + rev = "v${version}"; + sha256 = "sha256-WSdscZ1/Dix83RE95Iv61rdaSBWx1GMi6qOIPNus+ZI="; + }; + + postPatch = '' + echo ${version} > internal/util/version/gen/version.txt + ''; + + vendorSha256 = "sha256-fGmGE08w9w2QnBVdMZ2IKo8Zq3euJGCBVTTHNKYFY3U="; + + CGO_ENABLED = 0; + + subPackages = [ "cmd/ferretdb" ]; + + meta = with lib; { + description = "A truly Open Source MongoDB alternative"; + homepage = "https://github.com/FerretDB/FerretDB"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e04004bf8858..8635bb41ce72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22675,6 +22675,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + ferretdb = callPackage ../servers/nosql/ferretdb { }; + felix = callPackage ../servers/felix { }; felix_remoteshell = callPackage ../servers/felix/remoteshell.nix { }; From 4b28470af6d3a0728c149325c957615384dc3066 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 05:25:46 +0000 Subject: [PATCH 148/173] aws-c-event-stream: 0.2.12 -> 0.2.14 --- .../libraries/aws-c-event-stream/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index 64b91ca3a1df..e23e316a39f8 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, s2n-tls, libexecinfo }: +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, aws-c-io, aws-checksums, nix, s2n-tls, libexecinfo }: stdenv.mkDerivation rec { pname = "aws-c-event-stream"; - version = "0.2.12"; + version = "0.2.14"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I4DqsPmHsZsReoqAH0WMU5/XlM4LiaxpJrVVYdXnMZY="; + sha256 = "sha256-QUrDIeQjsmf8TKu4UoSZi0eNw7Yg/2HIvXo7Y0FLY6w="; }; nativeBuildInputs = [ cmake ]; @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS:BOOL=ON" ]; + passthru.tests = { + inherit nix; + }; + meta = with lib; { description = "C99 implementation of the vnd.amazon.eventstream content-type"; homepage = "https://github.com/awslabs/aws-c-event-stream"; From 94f00041f0cd3916be55bc90367a3e160717533f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Sep 2022 13:46:35 +0200 Subject: [PATCH 149/173] nixos/paperless: Allow mbind syscall in paperless-web.services After uploading a document through the webinterface I started seeing it killed through the SYSBUS signal. Inspecting the call trace led me to liblapack's memory allocator, that uses the mbind syscall on Linux. --- nixos/modules/services/misc/paperless.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index fbf1338a0dff..c17bde0da33c 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -287,8 +287,8 @@ in AmbientCapabilities = "CAP_NET_BIND_SERVICE"; CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; - # gunicorn needs setuid - SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "@setuid" ]; + # gunicorn needs setuid, liblapack needs mbind + SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "@setuid mbind" ]; # Needs to serve web page PrivateNetwork = false; }; From 81a17f7352bd7acc438c298f317c190d2fbdcc35 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Sep 2022 13:50:17 +0200 Subject: [PATCH 150/173] nixos/paperless: Use system timezone by default, if set --- nixos/modules/services/misc/paperless.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index c17bde0da33c..8750770cea20 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -17,9 +17,11 @@ let GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}"; } // ( lib.mapAttrs (_: toString) cfg.extraConfig - ) // (optionalAttrs enableRedis { + ) // optionalAttrs (config.time.timeZone != null) { + PAPERLESS_TIME_ZONE = lib.mkDefault config.time.timeZone; + } // optionalAttrs enableRedis { PAPERLESS_REDIS = "unix://${redisServer.unixSocket}"; - }); + }; manage = let setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env); From 2d257f81019e6a9ee255a92810be771d753b8ba5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Sep 2022 13:52:14 +0200 Subject: [PATCH 151/173] nixos/paperless: Add pgsql via unix socket example Finding out how to connect paperless to a PostgreSQL database via unix sockets and peer authentication took me a few minutes, so leaving a hint in the extraConfig example seems like a good idea to me. Also remove unnecessary use of literalExpression for attribute set, it is only required for complex values like functions or values that depend on other values or packages. --- nixos/modules/services/misc/paperless.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 8750770cea20..9e554b93fc82 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -176,11 +176,10 @@ in See [the documentation](https://paperless-ngx.readthedocs.io/en/latest/configuration.html) for available options. ''; - example = literalExpression '' - { - PAPERLESS_OCR_LANGUAGE = "deu+eng"; - } - ''; + example = { + PAPERLESS_OCR_LANGUAGE = "deu+eng"; + PAPERLESS_DBHOST = "/run/postgresql"; + }; }; user = mkOption { From 73e10d9d5a150c2dbaac705389b9ca41fcc0626d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Sep 2022 16:01:45 +0200 Subject: [PATCH 152/173] paperless: Expose python environment in passthru This allows adding more python dependencies through overrides. --- pkgs/applications/office/paperless-ngx/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 679a732c2d67..a42ec844d115 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -16,7 +16,7 @@ let # Use specific package versions required by paperless-ngx - py = python3.override { + python = python3.override { packageOverrides = self: super: { django = super.django_4; @@ -51,7 +51,7 @@ let path = lib.makeBinPath [ ghostscript imagemagick jbig2enc optipng pngquant qpdf tesseract4 unpaper ]; in -py.pkgs.pythonPackages.buildPythonApplication rec { +python.pkgs.pythonPackages.buildPythonApplication rec { pname = "paperless-ngx"; version = "1.8.0"; @@ -63,7 +63,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { format = "other"; - propagatedBuildInputs = with py.pkgs.pythonPackages; [ + propagatedBuildInputs = with python.pkgs.pythonPackages; [ aioredis arrow asgiref @@ -169,7 +169,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { # Compile manually because `pythonRecompileBytecodeHook` only works for # files in `python.sitePackages` postBuild = '' - ${py.interpreter} -OO -m compileall src + ${python.interpreter} -OO -m compileall src ''; installPhase = '' @@ -181,7 +181,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { --prefix PATH : "${path}" ''; - checkInputs = with py.pkgs.pythonPackages; [ + checkInputs = with python.pkgs.pythonPackages; [ pytest-django pytest-env pytest-sugar @@ -207,6 +207,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { ''; passthru = { + inherit python; # PYTHONPATH of all dependencies used by the package pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; inherit path; From f2d57bac7686de5e1d9c43f47677e64a8ea8eccb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 05:28:56 +0000 Subject: [PATCH 153/173] aws-c-cal: 0.5.18 -> 0.5.19 --- pkgs/development/libraries/aws-c-cal/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 0fa050a08f31..ec22b6c5af1b 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, openssl, Security }: +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, nix, openssl, Security }: stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.5.18"; + version = "0.5.19"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sT5ahf8MuIhqDV6RrRU+RgsLdwVUDEFWRZJpzQJOPGA="; + sha256 = "sha256-VEjefo+y8bizCxvJmzx+dZ1BE9eT1cR3Tkfn1eVQI/0="; }; nativeBuildInputs = [ cmake ]; @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" ]; + passthru.tests = { + inherit nix; + }; + meta = with lib; { description = "AWS Crypto Abstraction Layer "; homepage = "https://github.com/awslabs/aws-c-cal"; From 0644bf43617a97f691c7f2b7bf14f4f01441f753 Mon Sep 17 00:00:00 2001 From: Mel Bourgeois Date: Sun, 4 Sep 2022 09:21:01 -0500 Subject: [PATCH 154/173] aws-sam-cli: fix local command for Werkzeug>=2.1.0 (#182750) --- .../development/tools/aws-sam-cli/default.nix | 4 ++++ ...use_forward_compatible_log_silencing.patch | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/tools/aws-sam-cli/use_forward_compatible_log_silencing.patch diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 3c9c81a625c9..3802e2ee1c74 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -41,6 +41,10 @@ python3.pkgs.buildPythonApplication rec { # `shutil.get_terminal_size` instead. # (https://github.com/pallets/click/pull/2130) ./support-click-8-1.patch + # Werkzeug >= 2.1.0 breaks the `sam local start-lambda` command because + # aws-sam-cli uses a "WERKZEUG_RUN_MAIN" hack to suppress flask output. + # (https://github.com/cs01/gdbgui/issues/425) + ./use_forward_compatible_log_silencing.patch ]; # fix over-restrictive version bounds diff --git a/pkgs/development/tools/aws-sam-cli/use_forward_compatible_log_silencing.patch b/pkgs/development/tools/aws-sam-cli/use_forward_compatible_log_silencing.patch new file mode 100644 index 000000000000..76297875f36a --- /dev/null +++ b/pkgs/development/tools/aws-sam-cli/use_forward_compatible_log_silencing.patch @@ -0,0 +1,19 @@ +diff --git a/samcli/local/services/base_local_service.py b/samcli/local/services/base_local_service.py +index 7b1ab95895d1..76812f02e00a 100644 +--- a/samcli/local/services/base_local_service.py ++++ b/samcli/local/services/base_local_service.py +@@ -56,9 +56,11 @@ class BaseLocalService: + + LOG.debug("Localhost server is starting up. Multi-threading = %s", multi_threaded) + +- # This environ signifies we are running a main function for Flask. This is true, since we are using it within +- # our cli and not on a production server. +- os.environ["WERKZEUG_RUN_MAIN"] = "true" ++ # Suppress flask dev server output in a forward-compatible way ++ # Source: https://github.com/cs01/gdbgui/issues/425#issuecomment-1119836533 ++ import flask.cli ++ ++ flask.cli.show_server_banner = lambda *args: None + + self._app.run(threaded=multi_threaded, host=self.host, port=self.port) + From f98011803ebbe7e68e2133a3405d4928f3c274c7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Sep 2022 16:14:17 +0200 Subject: [PATCH 155/173] nixos/paperless: Restrict CAP_NET_BIND_SERVICE Handing CAP_NET_BIND_SERVICE to the `paperless-web.service` only makes sense when it actually wants to bind to a port < 1024. Don't hand it out if that is not the case. --- nixos/modules/services/misc/paperless.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 9e554b93fc82..b1cf72258d17 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -286,12 +286,13 @@ in ''; Restart = "on-failure"; - AmbientCapabilities = "CAP_NET_BIND_SERVICE"; - CapabilityBoundingSet = "CAP_NET_BIND_SERVICE"; # gunicorn needs setuid, liblapack needs mbind SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "@setuid mbind" ]; # Needs to serve web page PrivateNetwork = false; + } // lib.optionalAttrs (cfg.port < 1024) { + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; }; environment = env // { PATH = mkForce cfg.package.path; From ff3256aec66c9a3a65f925b6e9804601d7387c61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 06:40:37 +0000 Subject: [PATCH 156/173] aws-c-io: 0.11.2 -> 0.13.3 --- pkgs/development/libraries/aws-c-io/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 3365d0e32505..6199b50a530a 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, s2n-tls, Security }: +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-cal, aws-c-common, nix, s2n-tls, Security }: stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.11.2"; + version = "0.13.3"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HMsCFvwWgWwU3YBuZsmOSsMnEvzAVV9jEZyEEBwRcYg="; + sha256 = "sha256-lrSAWw5T4RAbk0JaNi5Vmh7qcjxOS8a1jdFMpaItrhI="; }; nativeBuildInputs = [ cmake ]; @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" ]; + passthru.tests = { + inherit nix; + }; + meta = with lib; { description = "AWS SDK for C module for IO and TLS"; homepage = "https://github.com/awslabs/aws-c-io"; From 3ba074ce07b5ae07a4d03e0cbb1c2e2fcaf2426a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Sep 2022 23:47:57 +0000 Subject: [PATCH 157/173] aws-c-s3: 0.1.43 -> 0.1.46 --- pkgs/development/libraries/aws-c-s3/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 9d1706bff0a9..3b1eea540d54 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -8,18 +8,19 @@ , aws-c-io , aws-checksums , cmake +, nix , s2n-tls }: stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.1.43"; + version = "0.1.46"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-I4pPNjaRNHPzVZVgY0qm8S+Tdvtklx/N3EKu0SAm5c8="; + sha256 = "sha256-OUrMdIWWnk+yAJTVJ/UlUNFABLlTkmYac5g125Zq+fQ="; }; nativeBuildInputs = [ @@ -41,6 +42,10 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" ]; + passthru.tests = { + inherit nix; + }; + meta = with lib; { description = "C99 library implementation for communicating with the S3 service"; homepage = "https://github.com/awslabs/aws-c-s3"; From 2239d49539a3ba93b24cd5a557b37067865b66dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 Sep 2022 23:48:33 +0000 Subject: [PATCH 158/173] aws-c-http: 0.6.19 -> 0.6.20 --- pkgs/development/libraries/aws-c-http/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index 110d0e661391..e4482f63abfd 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -5,18 +5,19 @@ , aws-c-compression , aws-c-io , cmake +, nix , s2n-tls }: stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.6.19"; + version = "0.6.20"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-ErwsRYz0D5ktlDaXIDvTXkxO7MM0N4RAA5IBqPbNfAc="; + sha256 = "sha256-eHsk/ME/kVGm8gxkR9NcJUkfbvI+4u5S4y4Tw29hEnY="; }; nativeBuildInputs = [ @@ -35,6 +36,10 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" ]; + passthru.tests = { + inherit nix; + }; + meta = with lib; { description = "C99 implementation of the HTTP/1.1 and HTTP/2 specifications"; homepage = "https://github.com/awslabs/aws-c-http"; From 373e5a969e9eea0fc819e40af9ddcbb6ff2e0473 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 Sep 2022 03:10:21 +0000 Subject: [PATCH 159/173] aws-c-mqtt: 0.7.11 -> 0.7.12 --- pkgs/development/libraries/aws-c-mqtt/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aws-c-mqtt/default.nix b/pkgs/development/libraries/aws-c-mqtt/default.nix index c77f1f1b92d6..52aa129f944e 100644 --- a/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , aws-c-cal , aws-c-common @@ -6,18 +7,19 @@ , aws-c-http , aws-c-io , cmake +, nix , s2n-tls }: stdenv.mkDerivation rec { pname = "aws-c-mqtt"; - version = "0.7.11"; + version = "0.7.12"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-mqtt"; rev = "v${version}"; - sha256 = "sha256-+vxn9Fq8eZ53cRR31hnLf1cxZ2zY03lt2RuEop+ciu0="; + sha256 = "sha256-0u3t0m5GQ7wxxLI8rY7j9AMliPzrAR9J/c/7DcT43WU="; }; nativeBuildInputs = [ @@ -37,6 +39,10 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" ]; + passthru.tests = { + inherit nix; + }; + meta = with lib; { description = "C99 implementation of the MQTT 3.1.1 specification"; homepage = "https://github.com/awslabs/aws-c-mqtt"; From 404cd8a167bf7b6b9f37c3f0cfdf8fc860a507a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 14:33:29 +0000 Subject: [PATCH 160/173] matrix-synapse-tools.synadm: 0.35 -> 0.36 --- pkgs/servers/matrix-synapse/tools/synadm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/tools/synadm.nix b/pkgs/servers/matrix-synapse/tools/synadm.nix index a31544d0e3e6..5075e42e710b 100644 --- a/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -4,12 +4,12 @@ with python3Packages; buildPythonApplication rec { pname = "synadm"; - version = "0.35"; + version = "0.36"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fZAlQF2n93w69I1+dwfLnoh1O+uNHYNe0/1dRQgIpX4="; + sha256 = "sha256-OMXUbfAC927qJw0B5sq1lGJQRkFAUdohIOkCYUbZumI="; }; postPatch = '' From b860e79e34dc59ce406cad841b0abaf4a0d75038 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 06:28:16 +0000 Subject: [PATCH 161/173] aws-c-auth: 0.6.14 -> 0.6.16 --- pkgs/development/libraries/aws-c-auth/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index 9045944ad193..ebf95805987f 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , aws-c-cal , aws-c-common @@ -7,18 +8,19 @@ , aws-c-io , aws-c-sdkutils , cmake +, nix , s2n-tls }: stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.6.14"; + version = "0.6.16"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - sha256 = "sha256-Wi1vW0EYgtOltPI5FMhY5je2ZMF9R5ch4nIjENva+FU="; + sha256 = "sha256-JUCnrnJnXDCsdw9UcmujoxZ+cE9PDmqQNHYyvjSVBpw="; }; nativeBuildInputs = [ @@ -42,6 +44,10 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" ]; + passthru.tests = { + inherit nix; + }; + meta = with lib; { description = "C99 library implementation of AWS client-side authentication"; homepage = "https://github.com/awslabs/aws-c-auth"; From b36cd65ad16698e58d5a1a76d44237e903c8b262 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Sep 2022 16:38:07 +0200 Subject: [PATCH 162/173] rl-2211: Mention new paperless timezone default --- 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 252f727b7fc1..fe5a4f34a9e4 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 @@ -445,6 +445,13 @@ "wine64". + + + The paperless module now defaults + PAPERLESS_TIME_ZONE to your configured + system timezone. + + (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 2e7b734b348e..e5b4ffb7938e 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -155,6 +155,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - The `meta.mainProgram` attribute of packages in `wineWowPackages` now defaults to `"wine64"`. +- The `paperless` module now defaults `PAPERLESS_TIME_ZONE` to your configured system timezone. + - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden. Use `configure.packages` instead. From e03ad68debdeeec1cdc62e086273be5770d54692 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 4 Sep 2022 16:06:21 +0100 Subject: [PATCH 163/173] baresip: add platforms --- .../networking/instant-messengers/baresip/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index a795d0b5ab05..0644b431cc87 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -116,5 +116,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/baresip/baresip"; maintainers = with lib.maintainers; [ elohmeier raskin ]; license = lib.licenses.bsd3; + platforms = lib.platforms.unix; }; } From c9b52906eb067df7cce1c51cf81ebe0e1f50508c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 4 Sep 2022 19:07:15 +0200 Subject: [PATCH 164/173] =?UTF-8?q?python3Packages.nbxmpp:=203.1.0=20?= =?UTF-8?q?=E2=86=92=203.2.1=20(#189496)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/nbxmpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 1c4cc473bf47..69b8599db5d7 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "3.1.0"; + version = "3.2.1"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = version; - sha256 = "sha256-QnvV/sAxdl8V5nV1hk8sRrL6nn015dAy6cXAiy2Tmbs="; + sha256 = "sha256-BBDCk/vWm9Y2oGw0aujqlueaB+ww7F2YP2cw5VqIzfQ="; }; nativeBuildInputs = [ From 215b0ce94959b2defca4c9204082a98b9f22e75c Mon Sep 17 00:00:00 2001 From: Sebastian Blunt <47431204+sebastianblunt@users.noreply.github.com> Date: Sun, 4 Sep 2022 17:20:03 +0000 Subject: [PATCH 165/173] cyberchef: init at 9.46.0 (#189242) Co-authored-by: Sandro --- pkgs/tools/misc/cyberchef/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/cyberchef/default.nix diff --git a/pkgs/tools/misc/cyberchef/default.nix b/pkgs/tools/misc/cyberchef/default.nix new file mode 100644 index 000000000000..62fc97171a3c --- /dev/null +++ b/pkgs/tools/misc/cyberchef/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchzip, stdenv }: + +stdenv.mkDerivation rec { + pname = "cyberchef"; + version = "9.46.0"; + + src = fetchzip { + url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; + sha256 = "sha256-4IqXp7fYgXwIuciUklrQoRD2XagatdhQ3l6ghjgTCR8="; + stripRoot = false; + }; + + installPhase = '' + mkdir -p "$out/share/cyberchef" + mv "CyberChef_v${version}.html" index.html + mv * "$out/share/cyberchef" + ''; + + meta = with lib; { + description = "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis."; + homepage = "https://gchq.github.io/CyberChef"; + maintainers = with maintainers; [ sebastianblunt ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cba81ac06ac..45c9df1592e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2185,6 +2185,8 @@ with pkgs; crystfel-headless = callPackage ../applications/science/physics/crystfel { withGui = false; }; + cyberchef = callPackage ../tools/misc/cyberchef { }; + cw = callPackage ../tools/admin/cw { }; ec2-api-tools = callPackage ../tools/virtualization/ec2-api-tools { }; From eb5b565bae5e288c819513ce8b295944ceafb413 Mon Sep 17 00:00:00 2001 From: Chris Pattison Date: Fri, 2 Sep 2022 12:00:59 -0700 Subject: [PATCH 166/173] pythonPackages.galois: 0.0.32 -> 0.1.1 --- .../python-modules/galois/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index b4d66188e312..3c0ba94d3ab4 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, setuptools-scm , pythonOlder , fetchFromGitHub , pytestCheckHook @@ -11,8 +12,8 @@ buildPythonPackage rec { pname = "galois"; - version = "0.0.32"; - format = "setuptools"; + version = "0.1.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,9 +21,15 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - sha256 = "sha256-+cxRLrfqk3N9pWKCVsTxruZwMYZ5dQyKJRnrb8y+ECM="; + sha256 = "sha256-ekbebwsdGkINdOFI+LLdwTRBN6d8mlNmftkj5SNRKNI="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ numpy numba @@ -35,8 +42,9 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.cfg \ - --replace "numpy >= 1.18.4, < 1.23" "numpy >= 1.18.4" + substituteInPlace pyproject.toml \ + --replace "numpy >= 1.18.4, < 1.24" "numpy >= 1.18.4" \ + --replace "numba >= 0.53, < 0.57" "numba >= 0.53" \ ''; pythonImportsCheck = [ "galois" ]; From c79187f635edf075b42100f0597b652760cfbf17 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 4 Sep 2022 18:38:24 +0000 Subject: [PATCH 167/173] virglrenderer: 0.9.1 -> 0.10.0 --- pkgs/development/libraries/virglrenderer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 1fbf94452f76..26be3d85f3ab 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "virglrenderer"; - version = "0.9.1"; + version = "0.10.0"; src = fetchurl { url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2"; - sha256 = "1h76a1ylhh4niq33sa5knx033sr4k2816vibh4m58j54y7qc6346"; + sha256 = "tMLD6lu1NnKeoQQIzwhMypKdrW5alULod2cdb8+76iM="; }; buildInputs = [ libGLU libepoxy libX11 libdrm mesa ]; From cb10a5406c9c73274434603c1c18e176051d448d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 4 Sep 2022 18:45:55 +0000 Subject: [PATCH 168/173] crosvm: switch back to upstream virglrenderer We now have virglrenderer 0.10.0, which includes everything crosvm needs that wasn't in 0.9.1. --- .../virtualization/crosvm/default.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index bd2c8badce54..a4de1433ae73 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -3,7 +3,10 @@ , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols }: -let +rustPlatform.buildRustPackage rec { + pname = "crosvm"; + version = "104.0"; + src = fetchgit { url = "https://chromium.googlesource.com/crosvm/crosvm"; rev = "265aab613b1eb31598ea0826f04810d9f010a2c6"; @@ -11,18 +14,6 @@ let fetchSubmodules = true; }; - # use vendored virglrenderer - virglrenderer' = virglrenderer.overrideAttrs (oa: { - src = "${src}/third_party/virglrenderer"; - }); -in - -rustPlatform.buildRustPackage rec { - pname = "crosvm"; - version = "104.0"; - - inherit src; - separateDebugInfo = true; patches = [ @@ -34,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ minijail-tools pkg-config protobuf wayland-scanner ]; buildInputs = [ - libcap libdrm libepoxy minijail virglrenderer' wayland wayland-protocols + libcap libdrm libepoxy minijail virglrenderer wayland wayland-protocols ]; arch = stdenv.hostPlatform.parsed.cpu.name; From c9418d5a1135df8886b2b78c8637c64882b1bfcd Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 4 Sep 2022 19:57:09 +0100 Subject: [PATCH 169/173] mercurial: blocklist some tests that fail under Python 3.10 --- .../version-management/mercurial/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 4f3fa12b9a45..261368272b3f 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -148,6 +148,17 @@ let # doesn't like the extra setlocale warnings emitted by our bash wrappers test-locale.t + + # Python 3.10 error message change https://bz.mercurial-scm.org/show_bug.cgi?id=6643 + test-http-bad-server.t + + # Python 3.10-3.12 deprecation warning: distutils + # https://bz.mercurial-scm.org/show_bug.cgi?id=6729 + test-hghave.t + + # Python 3.10-3.12 deprecation warning: asyncore + # https://bz.mercurial-scm.org/show_bug.cgi?id=6727 + test-patchbomb-tls.t EOF export HGTEST_REAL_HG="${mercurial}/bin/hg" From cb406199968f9ee676a7e2cd889f34186764a2a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 4 Sep 2022 19:29:49 +0200 Subject: [PATCH 170/173] nixos/console: add format check to `console.colors` --- nixos/modules/config/console.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index 493411d61836..89b75184c5d6 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -73,8 +73,8 @@ in }; colors = mkOption { - type = types.listOf types.str; - default = []; + type = with types; listOf (strMatching "[[:xdigit:]]{6}"); + default = [ ]; example = [ "002b36" "dc322f" "859900" "b58900" "268bd2" "d33682" "2aa198" "eee8d5" From ba76dba80102e516f8808ba77b73a8db2e3e1387 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 22 Aug 2022 23:21:25 +0200 Subject: [PATCH 171/173] raylib: 4.0.0 -> 4.2.0 This also enables `-DCUSTOMIZE_BUILD` in order for the `-DINCLUDE_EVERYTHING` to have an effect. --- pkgs/development/libraries/raylib/default.nix | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix index 3843cea9d98d..b25fd269d968 100644 --- a/pkgs/development/libraries/raylib/default.nix +++ b/pkgs/development/libraries/raylib/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, cmake, - mesa, libGLU, glfw, - libX11, libXi, libXcursor, libXrandr, libXinerama, - alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib, - pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio, - sharedLib ? true, - includeEverything ? true +{ stdenv, lib, fetchFromGitHub, cmake, fetchpatch +, mesa, libGLU, glfw +, libX11, libXi, libXcursor, libXrandr, libXinerama +, alsaSupport ? stdenv.hostPlatform.isLinux, alsa-lib +, pulseSupport ? stdenv.hostPlatform.isLinux, libpulseaudio +, sharedLib ? true +, includeEverything ? true }: stdenv.mkDerivation rec { pname = "raylib"; - version = "4.0.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "raysan5"; repo = pname; rev = version; - sha256 = "1mszf5v7qy38cv1fisq6xd9smb765hylhkv1ms9y7shmdl2ni6b7"; + sha256 = "sha256-aMIjywcQxki0cKlNznPAMfvrtGj3qcR95D4/BDuPZZM="; }; nativeBuildInputs = [ cmake ]; @@ -24,10 +24,21 @@ stdenv.mkDerivation rec { ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio; + patches = [ + # fixes glfw compile error; + # remove with next raylib version > 4.2.0 or when glfw 3.4.0 is released. + (fetchpatch { + url = "https://github.com/raysan5/raylib/commit/2ad7967db80644a25ca123536cf2f6efcb869684.patch"; + sha256 = "sha256-/xgzox1ITeoZ91QWdwnJJ+jJ5nJsMHcEgbIEdNYh4NY="; + name = "raylib-glfw-fix.patch"; + }) + ]; + # https://github.com/raysan5/raylib/wiki/CMake-Build-Options cmakeFlags = [ "-DUSE_EXTERNAL_GLFW=ON" "-DBUILD_EXAMPLES=OFF" + "-DCUSTOMIZE_BUILD=1" ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON" ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON"; From 0acdbd8c6b617d8c6f65dece034f5633920d0331 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 4 Sep 2022 22:12:18 +0200 Subject: [PATCH 172/173] python3Packages.domeneshop: init at 0.4.2 --- .../python-modules/domeneshop/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/domeneshop/default.nix diff --git a/pkgs/development/python-modules/domeneshop/default.nix b/pkgs/development/python-modules/domeneshop/default.nix new file mode 100644 index 000000000000..5c55f5adfc38 --- /dev/null +++ b/pkgs/development/python-modules/domeneshop/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, urllib3 +, pyopenssl +, cryptography +, idna +, certifi +}: + +buildPythonPackage rec { + pname = "domeneshop"; + version = "0.4.2"; + format = "setuptools"; + + disabled = pythonOlder "3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "tr3wsrscIU66kTz3nlvDHj2EXoEHCH3grD0yD7BU3Fc="; + }; + + propagatedBuildInputs = [ + certifi + urllib3 + ] ++ urllib3.optional-dependencies.secure; + + # There are none + doCheck = false; + + pythonImportsCheck = [ "domeneshop" ]; + + meta = with lib; { + description = "Python library for working with the Domeneshop API"; + homepage = "https://api.domeneshop.no/docs/"; + license = licenses.mit; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index adff64a1fb4d..e7bde46a41e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2667,6 +2667,8 @@ in { doit-py = callPackage ../development/python-modules/doit-py { }; + domeneshop = callPackage ../development/python-modules/domeneshop { }; + dominate = callPackage ../development/python-modules/dominate { }; doorbirdpy = callPackage ../development/python-modules/doorbirdpy { }; From c9752932dfbcaccbc582c80f2293d32112371399 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 30 Aug 2022 17:07:45 +1000 Subject: [PATCH 173/173] docker-buildx: add $out/bin symlink --- pkgs/applications/virtualization/docker/buildx.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 8c3546f8e306..d703f39bed77 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -20,11 +20,17 @@ buildGoModule rec { ]; installPhase = '' + runHook preInstall install -D $GOPATH/bin/buildx $out/libexec/docker/cli-plugins/docker-buildx + + mkdir -p $out/bin + ln -s $out/libexec/docker/cli-plugins/docker-buildx $out/bin/docker-buildx + runHook postInstall ''; meta = with lib; { description = "Docker CLI plugin for extended build capabilities with BuildKit"; + homepage = "https://github.com/docker/buildx"; license = licenses.asl20; maintainers = [ maintainers.ivan-babrou ]; };