From 7c7d89b4163ba808c8ad9372d06b40284916ddc3 Mon Sep 17 00:00:00 2001 From: Georges Date: Wed, 17 Aug 2022 21:03:00 +0200 Subject: [PATCH 001/269] doggo: init at 0.5.4 --- pkgs/tools/networking/doggo/default.nix | 48 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/tools/networking/doggo/default.nix diff --git a/pkgs/tools/networking/doggo/default.nix b/pkgs/tools/networking/doggo/default.nix new file mode 100644 index 000000000000..713cc38edf1e --- /dev/null +++ b/pkgs/tools/networking/doggo/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + runCommand, + installShellFiles, +}: let + buildDate = "2022-08-15T21:36:49"; + buildCommit = "2cf9e7b"; +in + with lib; + buildGoModule rec { + pname = "doggo"; + version = "0.5.4"; + vendorSha256 = "sha256-pyzu89HDFrMQqYJZC2vdqzOc6PiAbqhaTgYakmN0qj8="; + src = fetchFromGitHub { + owner = "mr-karan"; + repo = "doggo"; + rev = "v0.5.4"; + sha256 = "sha256-6jNs8vigrwKk47Voe42J9QYMTP7KnNAtJ5vFZTUW680="; + }; + + nativeBuildInputs = [installShellFiles]; + subPackages = ["cmd/doggo"]; + + ldflags = [ + "-w -s" + "-X main.buildVersion=${buildCommit}" + "-X main.buildDate=${buildDate}" + ]; + + postInstall = '' + installShellCompletion --cmd doggo --fish --name doggo.fish completions/doggo.fish + installShellCompletion --cmd doggo --zsh --name _doggo completions/doggo.zsh + ''; + + meta = { + homepage = "https://github.com/mr-karan/doggo"; + description = "Command-line DNS Client for Humans. Written in Golang"; + longDescription = '' + doggo is a modern command-line DNS client (like dig) written in Golang. + It outputs information in a neat concise manner and supports protocols like DoH, DoT, DoQ, and DNSCrypt as well + ''; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [georgesalkhouri]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7524e08d3ea..7319d220411c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5602,6 +5602,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + doggo = callPackage ../tools/networking/doggo { }; + dosfstools = callPackage ../tools/filesystems/dosfstools { }; dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { }; From bf177162aeb98b71c30d784a90fb2e718d4df398 Mon Sep 17 00:00:00 2001 From: Georges Date: Wed, 17 Aug 2022 21:04:51 +0200 Subject: [PATCH 002/269] maintainers: add georgesalkhouri --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8ef00b74cc26..466149e0f8d5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4682,6 +4682,15 @@ fingerprint = "386E D1BF 848A BB4A 6B4A 3C45 FC83 907C 125B C2BC"; }]; }; + georgesalkhouri = { + name = "Georges Alkhouri"; + email = "incense.stitch_0w@icloud.com"; + github = "GeorgesAlkhouri"; + githubId = 6077574; + keys = [{ + fingerprint = "1608 9E8D 7C59 54F2 6A7A 7BD0 8BD2 09DC C54F D339"; + }]; + }; georgewhewell = { email = "georgerw@gmail.com"; github = "georgewhewell"; From 6e6f8af7927069fc268bf0e0ff1a7225916a5dbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Aug 2022 03:45:38 +0000 Subject: [PATCH 003/269] sfeed: 1.5 -> 1.6 --- pkgs/tools/misc/sfeed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/sfeed/default.nix b/pkgs/tools/misc/sfeed/default.nix index 9493636a0db4..57bcd98b89d7 100644 --- a/pkgs/tools/misc/sfeed/default.nix +++ b/pkgs/tools/misc/sfeed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "sfeed"; - version = "1.5"; + version = "1.6"; src = fetchgit { url = "git://git.codemadness.org/sfeed"; rev = version; - sha256 = "sha256-OF6xVzvTMbe8Yo64MIg7Cs91XtTBD5GtwAKUbQGYffA="; + sha256 = "sha256-GfRy/kzlFonje2Z/g7qNkbrDHBBIReN+fHVz1vsApqs="; }; buildInputs = [ ncurses ]; From 9136910f1e95407c9763cb97ba122169d238a7d5 Mon Sep 17 00:00:00 2001 From: Alain Zscheile Date: Sun, 4 Sep 2022 02:37:27 +0200 Subject: [PATCH 004/269] libzbc: init at 5.12.0 --- pkgs/os-specific/linux/libzbc/default.nix | 40 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/os-specific/linux/libzbc/default.nix diff --git a/pkgs/os-specific/linux/libzbc/default.nix b/pkgs/os-specific/linux/libzbc/default.nix new file mode 100644 index 000000000000..5fa981a767f2 --- /dev/null +++ b/pkgs/os-specific/linux/libzbc/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, autoconf-archive +, autoreconfHook +, fetchFromGitHub +, gtk3 +, libtool +, pkg-config +, guiSupport ? false +}: + +stdenv.mkDerivation rec { + pname = "libzbc"; + version = "5.12.0"; + + src = fetchFromGitHub { + owner = "westerndigitalcorporation"; + repo = "libzbc"; + rev = "v${version}"; + sha256 = "qI09dkMCwMym3j1ELrFDNbNB5hW/CzwmFmZhUNDXsfI="; + }; + + nativeBuildInputs = [ + autoconf-archive # this can be removed with the next release + autoreconfHook + libtool + ] ++ lib.optionals guiSupport [ pkg-config ]; + + buildInputs = lib.optionals guiSupport [ gtk3 ]; + + configureFlags = lib.optional guiSupport "--enable-gui"; + + meta = with lib; { + description = "ZBC device manipulation library"; + homepage = "https://github.com/westerndigitalcorporation/libzbc"; + maintainers = with maintainers; [ zseri ]; + license = with licenses; [ bsd2 lgpl3Plus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8635bb41ce72..575467cdc783 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4206,6 +4206,8 @@ with pkgs; libxnd = callPackage ../development/libraries/libxnd { }; + libzbc = callPackage ../os-specific/linux/libzbc { }; + lifeograph = callPackage ../applications/editors/lifeograph { }; limitcpu = callPackage ../tools/misc/limitcpu { }; From 8a773bd46aa618bdd3552af9e973924f1c685789 Mon Sep 17 00:00:00 2001 From: Alain Zscheile Date: Sun, 4 Sep 2022 02:44:38 +0200 Subject: [PATCH 005/269] libzbd: init at 2.0.3 --- pkgs/os-specific/linux/libzbd/default.nix | 40 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/os-specific/linux/libzbd/default.nix diff --git a/pkgs/os-specific/linux/libzbd/default.nix b/pkgs/os-specific/linux/libzbd/default.nix new file mode 100644 index 000000000000..f058e09bbd2c --- /dev/null +++ b/pkgs/os-specific/linux/libzbd/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, autoconf-archive +, autoreconfHook +, fetchFromGitHub +, gtk3 +, libtool +, pkg-config +, guiSupport ? false +}: + +stdenv.mkDerivation rec { + pname = "libzbd"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "westerndigitalcorporation"; + repo = "libzbd"; + rev = "v${version}"; + sha256 = "GoCHwuR4ylyaN/FskIqKyAPe2A2O3iFVcI3UxPlqvtk="; + }; + + nativeBuildInputs = [ + autoconf-archive # this can be removed with the next release + autoreconfHook + libtool + ] ++ lib.optionals guiSupport [ pkg-config ]; + + buildInputs = lib.optionals guiSupport [ gtk3 ]; + + configureFlags = lib.optional guiSupport "--enable-gui"; + + meta = with lib; { + description = "Zoned block device manipulation library and tools"; + homepage = "https://github.com/westerndigitalcorporation/libzbd"; + maintainers = with maintainers; [ zseri ]; + license = with licenses; [ lgpl3Plus gpl3Plus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 575467cdc783..caf25432d2f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4208,6 +4208,8 @@ with pkgs; libzbc = callPackage ../os-specific/linux/libzbc { }; + libzbd = callPackage ../os-specific/linux/libzbd { }; + lifeograph = callPackage ../applications/editors/lifeograph { }; limitcpu = callPackage ../tools/misc/limitcpu { }; From fc653b0ad67839a2c267690f725af06c856052f2 Mon Sep 17 00:00:00 2001 From: Alain Zscheile Date: Sun, 4 Sep 2022 03:33:54 +0200 Subject: [PATCH 006/269] libnvme: init at 1.1 --- pkgs/os-specific/linux/libnvme/default.nix | 63 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/os-specific/linux/libnvme/default.nix diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/os-specific/linux/libnvme/default.nix new file mode 100644 index 000000000000..6c2ece4b8cb1 --- /dev/null +++ b/pkgs/os-specific/linux/libnvme/default.nix @@ -0,0 +1,63 @@ +{ fetchFromGitHub +, json_c +, lib +, libuuid +, meson +, ninja +, openssl +, perl +, pkg-config +, python3 +, stdenv +, systemd +}: + +stdenv.mkDerivation rec { + pname = "libnvme"; + version = "1.1"; + + outputs = [ "out" "man" ]; + + src = fetchFromGitHub { + owner = "linux-nvme"; + repo = "libnvme"; + rev = "v${version}"; + sha256 = "EPAPWY6/Bh8I1eLslKJAofLn0IAizmGn00Q5PJPtdRw="; + }; + + postPatch = '' + patchShebangs meson-vcs-tag.sh + chmod +x doc/kernel-doc-check + patchShebangs doc/kernel-doc doc/kernel-doc-check doc/list-man-pages.sh + ''; + + nativeBuildInputs = [ + meson + ninja + perl # for kernel-doc + pkg-config + ]; + + buildInputs = [ + json_c + libuuid + openssl + python3 + systemd + ]; + + mesonFlags = [ + "-Ddocs=man" + "-Ddocs-build=true" + ]; + + doCheck = true; + + meta = with lib; { + description = "C Library for NVM Express on Linux"; + homepage = "https://github.com/linux-nvme/libnvme"; + maintainers = with maintainers; [ zseri ]; + license = with licenses; [ lgpl21Plus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index caf25432d2f9..2c0bd64aa1e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4204,6 +4204,8 @@ with pkgs; libnss-mysql = callPackage ../os-specific/linux/libnss-mysql { }; + libnvme = callPackage ../os-specific/linux/libnvme { }; + libxnd = callPackage ../development/libraries/libxnd { }; libzbc = callPackage ../os-specific/linux/libzbc { }; From 2e0daa61b50ac4b7ce639d711a35bc4cf1c8d739 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Wed, 31 Aug 2022 22:37:20 +0300 Subject: [PATCH 007/269] discocss: add discordAlias option --- pkgs/tools/misc/discocss/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/discocss/default.nix b/pkgs/tools/misc/discocss/default.nix index f847f615756a..c44d37505155 100644 --- a/pkgs/tools/misc/discocss/default.nix +++ b/pkgs/tools/misc/discocss/default.nix @@ -1,4 +1,10 @@ -{ stdenvNoCC, lib, fetchFromGitHub }: +{ stdenvNoCC +, lib +, fetchFromGitHub +, discordAlias ? false +, discord +, makeWrapper +}: stdenvNoCC.mkDerivation rec { pname = "discocss"; @@ -13,8 +19,16 @@ stdenvNoCC.mkDerivation rec { dontBuild = true; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' - install -Dm755 ./discocss $out/bin/discocss + install -Dm755 discocss $out/bin/discocss + '' + lib.optionalString discordAlias '' + wrapProgram $out/bin/discocss --set DISCOCSS_DISCORD_BIN ${discord}/bin/Discord + ln -s $out/bin/discocss $out/bin/Discord + ln -s $out/bin/discocss $out/bin/discord + mkdir -p $out/share + ln -s ${discord}/share/* $out/share ''; meta = with lib; { From 73ffb2d003bb816c41e308e4f27a033478fb62c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Sep 2022 18:48:40 +0000 Subject: [PATCH 008/269] mycorrhiza: 1.11.0 -> 1.12.1 --- pkgs/servers/mycorrhiza/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mycorrhiza/default.nix b/pkgs/servers/mycorrhiza/default.nix index 9185e719d47d..bbe136eb94c8 100644 --- a/pkgs/servers/mycorrhiza/default.nix +++ b/pkgs/servers/mycorrhiza/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "mycorrhiza"; - version = "1.11.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "bouncepaw"; repo = "mycorrhiza"; rev = "v${version}"; - sha256 = "sha256-uPnIp4Fc2vXwZnr19jQf39rReutzUqXO9EsXhjt1TuA="; + sha256 = "sha256-Fh3BZTDBLaus5ytnHzvknFMrKVssc6+d85mGHv6EmLo="; }; - vendorSha256 = "sha256-be9Et2hAW3xntt9AHN9xfc9dBW/MCvpdl0XdTJKRIy4="; + vendorSha256 = "sha256-Z6pQwUMMgHLMrRN4Fpu1QyG7WCHGWuvBc2UBTY6jncU="; subPackages = [ "." ]; From adcd8c81efc7669e7742666ffc51a32c68012778 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 8 Sep 2022 14:20:54 +0200 Subject: [PATCH 009/269] xinetd: 2.3.15 -> 2.3.15.4, switch to openSUSE fork The original project is no longer maintained. Most distributions already switched to the openSUSE fork. --- pkgs/servers/xinetd/default.nix | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index e296112045d4..e1323b084fc1 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -1,31 +1,31 @@ -{ fetchurl, fetchpatch, lib, stdenv, libtirpc }: +{ lib +, stdenv +, fetchurl +, pkg-config +, libtirpc +}: stdenv.mkDerivation rec { pname = "xinetd"; - version = "2.3.15"; + version = "2.3.15.4"; src = fetchurl { - url = "http://www.xinetd.org/xinetd-${version}.tar.gz"; - sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz"; + url = "https://github.com/openSUSE/xinetd/releases/download/${version}/xinetd-${version}.tar.xz"; + hash = "sha256-K6pYEBC8cDYavfo38SHpKuucXOZ/mnGRPOvWk1nMllQ="; }; - patches = [ - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch?id=426002bfe2789fb6213fba832c8bfee634d68d02"; - name = "CVE-2013-4342.patch"; - sha256 = "1iqcrqzgisz4b6vamprzg2y6chai7qpifqcihisrwbjwbc4wzj8v"; - }) + nativeBuildInputs = [ + pkg-config ]; - buildInputs = [ libtirpc ]; - - NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; - NIX_LDFLAGS = [ "-ltirpc" ]; + buildInputs = [ + libtirpc + ]; meta = { description = "Secure replacement for inetd"; platforms = lib.platforms.linux; - homepage = "http://xinetd.org"; + homepage = "https://github.com/openSUSE/xinetd"; license = lib.licenses.free; }; } From 9b2015979d15415327a526a20e4c43b2f0f0e5a4 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 8 Sep 2022 14:23:10 +0200 Subject: [PATCH 010/269] xinetd: add fgaz to maintainers --- pkgs/servers/xinetd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index e1323b084fc1..d7d1c94d9de2 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; homepage = "https://github.com/openSUSE/xinetd"; license = lib.licenses.free; + maintainers = with lib.maintainers; [ fgaz ]; }; } From 3e02e3e723d365a3aa18a129f6763882144782c8 Mon Sep 17 00:00:00 2001 From: oluceps Date: Mon, 12 Sep 2022 00:04:36 +0800 Subject: [PATCH 011/269] hysteria: 1.2.0 -> 1.2.1 --- pkgs/tools/networking/hysteria/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index d0178698775f..695c580917c4 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/pkgs/tools/networking/hysteria/default.nix @@ -4,18 +4,29 @@ }: buildGoModule rec { pname = "hysteria"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "HyNetwork"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aHIb79P1a+91hIcK1toHZqqXIZ0rwfGXDQc42rQQmX4="; + sha256 = "sha256-xL8xRVJdCyaP39TO+cJLAPbdc7WHxgBQMEyxkyhWlA8="; }; - vendorSha256 = "sha256-yAQpyz4pDXOfGF4hho/2Pt9yD3VdWYAmIvaXJjDMjis="; + vendorSha256 = "sha256-DxbH0vtNnuOycvUp2TBN2TS9sF6RYVqwfUbVH11HDN8="; proxyVendor = true; + ldflags = [ + "-s" + "-w" + "-X main.appVersion=${version}" + "-X main.appCommit=${version}" + ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/hysteria + ''; + # Network required doCheck = false; From de1dbd7a02196390d849c1d1b07065b8de3b5d06 Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Fri, 2 Sep 2022 16:51:45 +0530 Subject: [PATCH 012/269] replibyte: init at 0.9.7 --- .../tools/database/replibyte/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/tools/database/replibyte/default.nix diff --git a/pkgs/development/tools/database/replibyte/default.nix b/pkgs/development/tools/database/replibyte/default.nix new file mode 100644 index 000000000000..ed47d29cffe3 --- /dev/null +++ b/pkgs/development/tools/database/replibyte/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, fetchpatch +, pkg-config +, openssl +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "replibyte"; + version = "0.9.7"; + + src = fetchFromGitHub { + owner = "Qovery"; + repo = pname; + rev = "v${version}"; + sha256 = "02bdz0464d6gbkgbvn67sgn6cc6p6pjqacblh8nimy0r8b13x2ki"; + }; + + # Lockfile was updated in a commit after the release + cargoPatches = [ + (fetchpatch { + url = "https://github.com/Qovery/Replibyte/commit/15f122cc83fff03ae410be705779ab964fa7b375.patch"; + sha256 = "sha256-v95V4pl/2WN2do2SLVTJIO+5J7esqhC2BZaGBEtDhe0="; + }) + ]; + + cargoSha256 = "sha256-Y9CXpJTY/uszAVAbafa2+FumWKWFGaOLhK1FY+Nc+EU="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + + cargoBuildFlags = [ "--all-features" ]; + + doCheck = false; # requires multiple dbs to be installed + + meta = with lib; { + description = "Seed your development database with real data"; + homepage = "https://github.com/Qovery/replibyte"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5c39a8405e1..5932e7a45adb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14272,6 +14272,10 @@ with pkgs; rasm = callPackage ../development/compilers/rasm { }; + replibyte = callPackage ../development/tools/database/replibyte { + inherit (darwin.apple_sdk.frameworks) Security; + }; + rgbds = callPackage ../development/compilers/rgbds { }; rgxg = callPackage ../tools/text/rgxg { }; From 4eb213c3308439fcbc562491b805dc8bae1dd1e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 12 Sep 2022 21:52:02 +0200 Subject: [PATCH 013/269] xfstests: 2019-09-08 -> 2022-09-04 --- pkgs/tools/misc/xfstests/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index a35b57626110..aec0bd62addd 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -3,14 +3,14 @@ , libuuid, libxfs, lvm2, openssl, perl, procps, quota , time, util-linux, which, writeScript, xfsprogs, runtimeShell }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xfstests"; - version = "unstable-2019-09-08"; + version = "2022.09.04"; src = fetchgit { url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; - rev = "0837e907988a5f410cae0ae714f42f9c4242e072"; - sha256 = "1f5cv0vwc1g9difzp69k49rc5nfd08y72vdg318j25nv3rwv7wc9"; + rev = "v${version}"; + sha256 = "sha256-hPFoqNmB8pewvBN1nzVMkTrMHCo0xc8tmmIODaiDeRw="; }; nativeBuildInputs = [ From 60cf98b0677b080109fd4affa8b965a24d1a5ac4 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 25 Aug 2022 09:40:34 +0200 Subject: [PATCH 014/269] lib.licenses: add CAL-1.0 --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 6eeba6588be1..6e3154b8a21e 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -169,6 +169,11 @@ in mkLicense lset) ({ free = false; }; + cal10 = { + fullName = "Cryptographic Autonomy License version 1.0 (CAL-1.0)"; + url = "https://opensource.org/licenses/CAL-1.0"; + }; + capec = { fullName = "Common Attack Pattern Enumeration and Classification"; url = "https://capec.mitre.org/about/termsofuse.html"; From 11f978d53355759a47d60d688709921f2e0fb158 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Thu, 25 Aug 2022 09:40:52 +0200 Subject: [PATCH 015/269] holochain-launcher: init at v0.6.0 --- .../misc/holochain-launcher/default.nix | 52 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/applications/misc/holochain-launcher/default.nix diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix new file mode 100644 index 000000000000..5a9c5122acc3 --- /dev/null +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, pkg-config +, dpkg +, openssl +, webkitgtk +, libappindicator +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + name = "holochain-launcher"; + version = "0.6.0"; + + src = fetchurl { + url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb"; + sha256 = "sha256-o9cUFtq5XUkbC3yFRFiV2k4uWjb+szlE8qV+G9Gve5E="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + wrapGAppsHook # required for FileChooser + ]; + + buildInputs = [ + openssl + webkitgtk + libappindicator + ]; + + unpackCmd = "dpkg-deb -x $curSrc source"; + + installPhase = '' + mv usr $out + ''; + + preFixup = '' + patchelf --add-needed "libappindicator3.so" "$out/bin/holochain-launcher" + ''; + + meta = with lib; { + description = "A cross-platform executable that launches a local Holochain conductor, and installs and opens apps"; + homepage = "https://github.com/holochain/launcher"; + maintainers = [ maintainers.steveej ]; + license = licenses.cal10; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 888bb8dcb75c..c72a3a5ca4c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7505,6 +7505,8 @@ with pkgs; hockeypuck-web = callPackage ../servers/hockeypuck/web.nix { }; + holochain-launcher = callPackage ../applications/misc/holochain-launcher { }; + homesick = callPackage ../tools/misc/homesick { }; honcho = callPackage ../tools/system/honcho { }; From d8750d7e0d0b41c695acb61a1f57c289601fa663 Mon Sep 17 00:00:00 2001 From: Kristoffer Ellersgaard Koch Date: Thu, 15 Sep 2022 13:50:38 +0200 Subject: [PATCH 016/269] nxpmicro-mfgtools: 1.4.165 -> 1.4.243 --- pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index 9041d1f8c589..2106a649775c 100644 --- a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -7,22 +7,23 @@ , libusb1 , libzip , openssl +, zstd }: stdenv.mkDerivation rec { pname = "nxpmicro-mfgtools"; - version = "1.4.165"; + version = "1.4.243"; src = fetchFromGitHub { owner = "NXPmicro"; repo = "mfgtools"; rev = "uuu_${version}"; - sha256 = "0k309lp27d4k6x4qq0badbk8i47xsc6f3fffz73650iyfs4hcniw"; + hash = "sha256-gyy9D6y1y+9GlT3wfW+huoWaZP1e8YzZnc7EbJftppI="; }; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; - buildInputs = [ bzip2 libusb1 libzip openssl ]; + buildInputs = [ bzip2 libusb1 libzip openssl zstd ]; preConfigure = "echo ${version} > .tarball-version"; From db29c11af5ff8c5ab3cd5b1cec7942c3d3fa0681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Thu, 21 Jul 2022 21:02:02 +0300 Subject: [PATCH 017/269] tinygo: 0.23.0 -> 0.25.0 --- .../compilers/tinygo/0001-Makefile.patch | 31 +++++++--- .../tinygo/0002-Add-clang-header-path.patch | 14 ++--- ...3-Use-out-path-as-build-id-on-darwin.patch | 56 +++++++++++++++++++ pkgs/development/compilers/tinygo/default.nix | 48 +++++++++++----- 4 files changed, 118 insertions(+), 31 deletions(-) create mode 100644 pkgs/development/compilers/tinygo/0003-Use-out-path-as-build-id-on-darwin.patch diff --git a/pkgs/development/compilers/tinygo/0001-Makefile.patch b/pkgs/development/compilers/tinygo/0001-Makefile.patch index 81774b6e0d6f..342cce788ba3 100644 --- a/pkgs/development/compilers/tinygo/0001-Makefile.patch +++ b/pkgs/development/compilers/tinygo/0001-Makefile.patch @@ -1,11 +1,11 @@ -From fcae473c4b6ac2120ec75c321d6db850d8ecd6a9 Mon Sep 17 00:00:00 2001 +From ef066db7f5cb7f551f88fb218c82fc947e464425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= -Date: Sat, 30 Apr 2022 16:37:44 +0300 +Date: Sun, 3 Jul 2022 14:30:51 +0300 Subject: [PATCH 1/3] Makefile diff --git a/Makefile b/Makefile -index dc388c21..7efc9901 100644 +index 60a5a574..904d2db5 100644 --- a/Makefile +++ b/Makefile @@ -14,11 +14,6 @@ LLVM_VERSIONS = 14 13 12 11 @@ -20,7 +20,7 @@ index dc388c21..7efc9901 100644 # First search for a custom built copy, then move on to explicitly version-tagged binaries, then just see if the tool is in path with its normal name. findLLVMTool = $(call detect,$(1),$(abspath llvm-build/bin/$(1)) $(foreach ver,$(LLVM_VERSIONS),$(call toolSearchPathsVersion,$(1),$(ver))) $(1)) CLANG ?= $(call findLLVMTool,clang) -@@ -644,9 +639,8 @@ endif +@@ -707,9 +702,8 @@ endif wasmtest: $(GO) test ./tests/wasm @@ -31,8 +31,13 @@ index dc388c21..7efc9901 100644 @mkdir -p build/release/tinygo/lib/CMSIS/CMSIS @mkdir -p build/release/tinygo/lib/macos-minimal-sdk @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common -@@ -663,10 +657,6 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN - @mkdir -p build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4 +@@ -721,15 +715,8 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN + @mkdir -p build/release/tinygo/lib/picolibc/newlib/libc + @mkdir -p build/release/tinygo/lib/picolibc/newlib/libm + @mkdir -p build/release/tinygo/lib/wasi-libc +- @mkdir -p build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0 +- @mkdir -p build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus +- @mkdir -p build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4 @echo copying source files @cp -p build/tinygo$(EXE) build/release/tinygo/bin -ifneq ($(USE_SYSTEM_BINARYEN),1) @@ -42,7 +47,7 @@ index dc388c21..7efc9901 100644 @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS @cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk -@@ -705,8 +695,7 @@ endif +@@ -768,16 +755,9 @@ endif @cp -rp lib/picolibc/newlib/libm/common build/release/tinygo/lib/picolibc/newlib/libm @cp -rp lib/picolibc-stdio.c build/release/tinygo/lib @cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot @@ -51,7 +56,15 @@ index dc388c21..7efc9901 100644 + @cp -rp lib/compiler-rt-builtins build/release/tinygo/lib/compiler-rt-builtins @cp -rp src build/release/tinygo/src @cp -rp targets build/release/tinygo/targets - ./build/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/compiler-rt compiler-rt +- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/compiler-rt compiler-rt +- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0plus -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus/compiler-rt compiler-rt +- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m4 -o build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4/compiler-rt compiler-rt +- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/picolibc picolibc +- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0plus -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus/picolibc picolibc +- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m4 -o build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4/picolibc picolibc + + release: + tar -czf build/release.tar.gz -C build/release tinygo -- -2.36.0 +2.37.2 diff --git a/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch b/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch index 875a2521a923..54e389fe1401 100644 --- a/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch +++ b/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch @@ -1,14 +1,14 @@ -From 4ee942ccc7cdb06ee51490e9cb44ecb36b25378a Mon Sep 17 00:00:00 2001 +From 301b2d82cdbfaffe4dfba1d2cfed068a4115f730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Sat, 30 Apr 2022 16:18:31 +0300 Subject: [PATCH 2/3] Add clang header path diff --git a/builder/builtins.go b/builder/builtins.go -index 479b541d..b35283c6 100644 +index 121398fa..a589988b 100644 --- a/builder/builtins.go +++ b/builder/builtins.go -@@ -164,7 +164,7 @@ var aeabiBuiltins = []string{ +@@ -170,7 +170,7 @@ var aeabiBuiltins = []string{ var CompilerRT = Library{ name: "compiler-rt", cflags: func(target, headerPath string) []string { @@ -31,10 +31,10 @@ index f1b061ae..159f90cf 100644 "-I" + picolibcDir + "/tinystdio", "-I" + headerPath, diff --git a/compileopts/config.go b/compileopts/config.go -index b30e653e..7561b3f2 100644 +index a006b673..3a105b49 100644 --- a/compileopts/config.go +++ b/compileopts/config.go -@@ -288,6 +288,7 @@ func (c *Config) CFlags() []string { +@@ -279,6 +279,7 @@ func (c *Config) CFlags() []string { path, _ := c.LibcPath("picolibc") cflags = append(cflags, "--sysroot="+path, @@ -42,7 +42,7 @@ index b30e653e..7561b3f2 100644 "-isystem", filepath.Join(path, "include"), // necessary for Xtensa "-isystem", filepath.Join(picolibcDir, "include"), "-isystem", filepath.Join(picolibcDir, "tinystdio"), -@@ -297,7 +298,6 @@ func (c *Config) CFlags() []string { +@@ -288,7 +289,6 @@ func (c *Config) CFlags() []string { path, _ := c.LibcPath("musl") arch := MuslArchitecture(c.Triple()) cflags = append(cflags, @@ -51,5 +51,5 @@ index b30e653e..7561b3f2 100644 "-isystem", filepath.Join(root, "lib", "musl", "arch", arch), "-isystem", filepath.Join(root, "lib", "musl", "include"), -- -2.36.0 +2.37.2 diff --git a/pkgs/development/compilers/tinygo/0003-Use-out-path-as-build-id-on-darwin.patch b/pkgs/development/compilers/tinygo/0003-Use-out-path-as-build-id-on-darwin.patch new file mode 100644 index 000000000000..a151c4ff880f --- /dev/null +++ b/pkgs/development/compilers/tinygo/0003-Use-out-path-as-build-id-on-darwin.patch @@ -0,0 +1,56 @@ +From e7357c383188dd735592bd9f2202d2afcfffa39d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= +Date: Sun, 11 Sep 2022 17:08:33 +0300 +Subject: [PATCH 3/3] Use out path as build id on darwin + + +diff --git a/builder/buildid.go b/builder/buildid.go +index e6527700..65cb08e8 100644 +--- a/builder/buildid.go ++++ b/builder/buildid.go +@@ -3,8 +3,6 @@ package builder + import ( + "bytes" + "debug/elf" +- "debug/macho" +- "encoding/binary" + "fmt" + "io" + "os" +@@ -53,30 +51,9 @@ func ReadBuildID() ([]byte, error) { + return goID, nil + } + case "darwin": +- // Read the LC_UUID load command, which contains the equivalent of a +- // build ID. +- file, err := macho.NewFile(f) +- if err != nil { +- return nil, err +- } +- for _, load := range file.Loads { +- // Unfortunately, the debug/macho package doesn't support the +- // LC_UUID command directly. So we have to read it from +- // macho.LoadBytes. +- load, ok := load.(macho.LoadBytes) +- if !ok { +- continue +- } +- raw := load.Raw() +- command := binary.LittleEndian.Uint32(raw) +- if command != 0x1b { +- // Looking for the LC_UUID load command. +- // LC_UUID is defined here as 0x1b: +- // https://opensource.apple.com/source/xnu/xnu-4570.71.2/EXTERNAL_HEADERS/mach-o/loader.h.auto.html +- continue +- } +- return raw[4:], nil +- } ++ // On darwin, os.Executable() returns broken path in nix build environment ++ // So we are using $out path as build id since its also unique ++ return []byte("OUT_PATH"), nil + default: + // On other platforms (such as Windows) there isn't such a convenient + // build ID. Luckily, Go does have an equivalent of the build ID, which +-- +2.37.2 + diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index b335df487c86..43b981ffd068 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -18,6 +18,7 @@ , avrdude , gdb , openocd +, tinygoTests ? [ "smoketest" ] }: let @@ -27,17 +28,17 @@ in buildGoModule rec { pname = "tinygo"; - version = "0.23.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - sha256 = "sha256-YgQGAQJw9Xyw5BF2d9uZTQHfjHsu2evZGo4RV9DtStE="; + sha256 = "sha256-Rxdxum1UIaz8tpEAGqpLvKd25nHdj4Se+IoN29EJEHg="; fetchSubmodules = true; }; - vendorSha256 = "sha256-fK8BlCh+1NtHW6MwW68iSIB+Sw6AK+g3y4lMyMYrXkk="; + vendorSha256 = "sha256-QxLY4KT05PtA/W7d1vKxsq5w35YZ6MJL3Lh726b+E9w="; patches = [ ./0001-Makefile.patch @@ -46,17 +47,22 @@ buildGoModule rec { src = ./0002-Add-clang-header-path.patch; clang_include = "${clang.cc.lib}/lib/clang/${clang.cc.version}/include"; }) + + #TODO(muscaln): Find a better way to fix build ID on darwin + ./0003-Use-out-path-as-build-id-on-darwin.patch ]; checkInputs = [ avrgcc binaryen ]; - nativeBuildInputs = [ go makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ llvm clang.cc ] ++ lib.optionals stdenv.isDarwin [ zlib ncurses libffi libxml2 xar ]; - doCheck = stdenv.buildPlatform == stdenv.hostPlatform; + doCheck = (stdenv.buildPlatform.canExecute stdenv.hostPlatform); + inherit tinygoTests; allowGoReference = true; tags = [ "llvm${llvmMajor}" ]; + ldflags = [ "-X github.com/tinygo-org/tinygo/goenv.TINYGOROOT=${placeholder "out"}/share/tinygo" ]; subPackages = [ "." ]; # Output contains static libraries for different arm cpus @@ -83,9 +89,13 @@ buildGoModule rec { substituteInPlace Makefile \ --replace "\$(TINYGO)" "$(pwd)/build/tinygo" \ + --replace "@\$(MD5SUM)" "md5sum" \ --replace "build/release/tinygo/bin" "$out/bin" \ --replace "build/release/" "$out/share/" + substituteInPlace builder/buildid.go \ + --replace "OUT_PATH" "$out" + # TODO: Fix mingw and darwin # Disable windows and darwin cross-compile tests sed -i "/GOOS=windows/d" Makefile @@ -103,24 +113,34 @@ buildGoModule rec { ''; preBuild = '' - export HOME=$TMPDIR - export GOCACHE=$TMPDIR/go-cache - export GOPATH=$TMPDIR/go export PATH=$out/libexec/tinygo:$PATH + export HOME=$TMPDIR ''; - postBuild = '' + postBuild = let + tinygoForBuild = if (stdenv.buildPlatform.canExecute stdenv.hostPlatform) + then "build/tinygo" + else "${buildPackages.tinygo}/bin/tinygo"; + in '' # Move binary mkdir -p build mv $GOPATH/bin/tinygo build/tinygo make gen-device + + export TINYGOROOT=$(pwd) + finalRoot=$out/share/tinygo + + for target in thumbv6m-unknown-unknown-eabi-cortex-m0 thumbv6m-unknown-unknown-eabi-cortex-m0plus thumbv7em-unknown-unknown-eabi-cortex-m4; do + mkdir -p $finalRoot/pkg/$target + for lib in compiler-rt picolibc; do + ${tinygoForBuild} build-library -target=''${target#*eabi-} -o $finalRoot/pkg/$target/$lib $lib + done + done ''; - checkPhase = '' - runHook preCheck - make smoketest XTENSA=0 - runHook postCheck + checkPhase = lib.optionalString (tinygoTests != [ ] && tinygoTests != null) '' + make ''${tinygoTests[@]} XTENSA=0 ${lib.optionalString stdenv.isDarwin "AVR=0"} ''; installPhase = '' @@ -129,7 +149,6 @@ buildGoModule rec { make build/release wrapProgram $out/bin/tinygo \ - --set TINYGOROOT $out/share/tinygo \ --prefix PATH : ${lib.makeBinPath [ go avrdude openocd avrgcc binaryen ]}:$out/libexec/tinygo runHook postInstall @@ -142,6 +161,5 @@ buildGoModule rec { description = "Go compiler for small places"; license = licenses.bsd3; maintainers = with maintainers; [ Madouura muscaln ]; - broken = stdenv.isDarwin; }; } From 3588521718c3869aec53458e68776672ce0dba16 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Mon, 12 Sep 2022 23:50:26 +0200 Subject: [PATCH 018/269] kodiPlugins.waveform-visualization: init at 19.0.2 Signed-off-by: Florian Brandes Co-authored-by: Sandro --- .../addons/visualization-waveform/default.nix | 25 +++++++++++++++++++ pkgs/top-level/kodi-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/video/kodi/addons/visualization-waveform/default.nix diff --git a/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix new file mode 100644 index 000000000000..851289bc06d4 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/visualization-waveform/default.nix @@ -0,0 +1,25 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, pkg-config, glm, libGL }: + +buildKodiBinaryAddon rec { + pname = "visualization-waveform"; + namespace = "visualization.waveform"; + version = "19.0.2"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + hash = "sha256-IQLW4CDNtt/ptE679hnoXbharq61Ru9S2m7QbJLtNSI="; + }; + + extraBuildInputs = [ pkg-config libGL ]; + + propagatedBuildInputs = [ glm ]; + meta = with lib; { + homepage = "https://github.com/xbmc/visualization.waveform"; + description = "Waveform visualization for kodi"; + platforms = platforms.all; + license = licenses.gpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 11dd5270e63d..7891669e0fce 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -100,6 +100,8 @@ let self = rec { vfs-libarchive = callPackage ../applications/video/kodi/addons/vfs-libarchive { }; + visualization-waveform = callPackage ../applications/video/kodi/addons/visualization-waveform { }; + youtube = callPackage ../applications/video/kodi/addons/youtube { }; # addon packages (dependencies) From 61834938fdcc8985405b32929daee909ac375e87 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 19 Jul 2022 00:46:44 +0200 Subject: [PATCH 019/269] python3Packages.catboost: 0.24.4 -> 1.0.5 --- .../python-modules/catboost/default.nix | 22 ++-- .../python-modules/catboost/nix-support.patch | 108 ++++++++---------- 2 files changed, 61 insertions(+), 69 deletions(-) diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix index 6cda5a23aee9..02e107f27e19 100644 --- a/pkgs/development/python-modules/catboost/default.nix +++ b/pkgs/development/python-modules/catboost/default.nix @@ -1,11 +1,11 @@ -{ buildPythonPackage, fetchFromGitHub, fetchpatch, lib, pythonOlder -, clang_7, python2 +{ buildPythonPackage, fetchFromGitHub, lib, pythonOlder +, clang_12, python2, python , graphviz, matplotlib, numpy, pandas, plotly, scipy, six , withCuda ? false, cudatoolkit }: buildPythonPackage rec { pname = "catboost"; - version = "0.24.4"; + version = "1.0.5"; disabled = pythonOlder "3.4"; @@ -13,26 +13,26 @@ buildPythonPackage rec { owner = "catboost"; repo = "catboost"; rev = "v${version}"; - sha256 = "sha256-pzmwEiKziB4ldnKgeCsP2HdnisX8sOkLssAzNfcSEx8="; + sha256 = "ILemeZUBI9jPb9G6F7QX/T1HaVhQ+g6y7YmsT6DFCJk="; }; - nativeBuildInputs = [ clang_7 python2 ]; + nativeBuildInputs = [ clang_12 python2 ]; propagatedBuildInputs = [ graphviz matplotlib numpy pandas scipy plotly six ] ++ lib.optional withCuda [ cudatoolkit ]; patches = [ ./nix-support.patch - (fetchpatch { - name = "format.patch"; - url = "https://github.com/catboost/catboost/pull/1528/commits/a692ba42e5c0f62e5da82b2f6fccfa77deb3419c.patch"; - sha256 = "sha256-fNGucHxsSDFRLk3hFH7rm+zzTdDpY9/QjRs8K+AzVvo="; - }) ]; + postPatch = '' + # substituteInPlace is too slow for these large files, and the target has lots of numbers in it that change often. + sed -e 's|\$(YMAKE_PYTHON3-.*)/python3|${python.interpreter}|' -i make/*.makefile + ''; + preBuild = '' cd catboost/python-package - ''; + ''; setupPyBuildFlags = [ "--with-ymake=no" ]; CUDA_ROOT = lib.optional withCuda cudatoolkit; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/catboost/nix-support.patch b/pkgs/development/python-modules/catboost/nix-support.patch index feaf97d57070..b8294420e09c 100644 --- a/pkgs/development/python-modules/catboost/nix-support.patch +++ b/pkgs/development/python-modules/catboost/nix-support.patch @@ -1,5 +1,5 @@ diff --git a/catboost/python-package/setup.py b/catboost/python-package/setup.py -index 17f1d8ff14..07da618cd1 100644 +index fe9251a21f..86b880c5d0 100644 --- a/catboost/python-package/setup.py +++ b/catboost/python-package/setup.py @@ -80,7 +80,7 @@ class Helper(object): @@ -15,23 +15,23 @@ index 17f1d8ff14..07da618cd1 100644 def build_with_make(self, topsrc_dir, build_dir, catboost_ext, put_dir, verbose, dry_run): logging.info('Buildling {} with gnu make'.format(catboost_ext)) -- makefile = 'python{}.{}CLANG50-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '') -+ makefile = 'python{}.{}CLANG7-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '') +- makefile = 'python{}.{}CLANG11-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '') ++ makefile = 'python{}.{}CLANG12-LINUX-X86_64.makefile'.format(python_version()[0], 'CUDA.' if self.with_cuda else '') make_cmd = [ 'make', '-f', '../../make/' + makefile, -- 'CC=clang-5.0', -- 'CXX=clang++-5.0', +- 'CC=clang-11', +- 'CXX=clang++-11', + 'CC=clang', + 'CXX=clang++', -+ 'PYTHON=python2', ++ 'PYTHON=python{}'.format(python_version()[0]), 'BUILD_ROOT=' + build_dir, 'SOURCE_ROOT=' + topsrc_dir, ] -diff --git a/make/python2.CLANG7-LINUX-X86_64.makefile b/make/python2.CLANG7-LINUX-X86_64.makefile -index e54b7078e8..fb7b208af9 100644 ---- a/make/python2.CLANG7-LINUX-X86_64.makefile -+++ b/make/python2.CLANG7-LINUX-X86_64.makefile -@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) +diff --git a/make/python2.CLANG12-LINUX-X86_64.makefile b/make/python2.CLANG12-LINUX-X86_64.makefile +index b49a36fb3f..33996af995 100644 +--- a/make/python2.CLANG12-LINUX-X86_64.makefile ++++ b/make/python2.CLANG12-LINUX-X86_64.makefile +@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) SOURCE_ROOT = $(shell pwd) PYTHON = $(shell which python) @@ -43,8 +43,8 @@ index e54b7078e8..fb7b208af9 100644 -_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) -$(info _CC_VERSION = '$(_CC_VERSION)') - --ifneq '$(_CC_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CC_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif - @@ -56,20 +56,18 @@ index e54b7078e8..fb7b208af9 100644 -_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) -$(info _CXX_VERSION = '$(_CXX_VERSION)') - --ifneq '$(_CXX_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CXX_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif -- -- + + all\ - ::\ - $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ -diff --git a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile -index 2a22a79b25..522fb54a7c 100644 ---- a/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile -+++ b/make/python2.CUDA.CLANG7-LINUX-X86_64.makefile -@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) +diff --git a/make/python2.CUDA.CLANG12-LINUX-X86_64.makefile b/make/python2.CUDA.CLANG12-LINUX-X86_64.makefile +index 82935b297e..093cc86532 100644 +--- a/make/python2.CUDA.CLANG12-LINUX-X86_64.makefile ++++ b/make/python2.CUDA.CLANG12-LINUX-X86_64.makefile +@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) SOURCE_ROOT = $(shell pwd) PYTHON = $(shell which python) @@ -81,8 +79,8 @@ index 2a22a79b25..522fb54a7c 100644 -_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) -$(info _CC_VERSION = '$(_CC_VERSION)') - --ifneq '$(_CC_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CC_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif - @@ -94,20 +92,18 @@ index 2a22a79b25..522fb54a7c 100644 -_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) -$(info _CXX_VERSION = '$(_CXX_VERSION)') - --ifneq '$(_CXX_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CXX_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif -- -- + + all\ - ::\ - $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ -diff --git a/make/python3.CLANG7-LINUX-X86_64.makefile b/make/python3.CLANG7-LINUX-X86_64.makefile -index fee6750bcb..dc55908371 100644 ---- a/make/python3.CLANG7-LINUX-X86_64.makefile -+++ b/make/python3.CLANG7-LINUX-X86_64.makefile -@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) +diff --git a/make/python3.CLANG12-LINUX-X86_64.makefile b/make/python3.CLANG12-LINUX-X86_64.makefile +index 1c5d646ae4..6c091fbe17 100644 +--- a/make/python3.CLANG12-LINUX-X86_64.makefile ++++ b/make/python3.CLANG12-LINUX-X86_64.makefile +@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) SOURCE_ROOT = $(shell pwd) PYTHON = $(shell which python) @@ -119,8 +115,8 @@ index fee6750bcb..dc55908371 100644 -_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) -$(info _CC_VERSION = '$(_CC_VERSION)') - --ifneq '$(_CC_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CC_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif - @@ -132,20 +128,18 @@ index fee6750bcb..dc55908371 100644 -_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) -$(info _CXX_VERSION = '$(_CXX_VERSION)') - --ifneq '$(_CXX_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CXX_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif -- -- + + all\ - ::\ - $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ -diff --git a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile -index 5146830476..ff8535b03e 100644 ---- a/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile -+++ b/make/python3.CUDA.CLANG7-LINUX-X86_64.makefile -@@ -4,33 +4,6 @@ BUILD_ROOT = $(shell pwd) +diff --git a/make/python3.CUDA.CLANG12-LINUX-X86_64.makefile b/make/python3.CUDA.CLANG12-LINUX-X86_64.makefile +index fcdb75a719..4e1dbc3cd7 100644 +--- a/make/python3.CUDA.CLANG12-LINUX-X86_64.makefile ++++ b/make/python3.CUDA.CLANG12-LINUX-X86_64.makefile +@@ -4,31 +4,6 @@ BUILD_ROOT = $(shell pwd) SOURCE_ROOT = $(shell pwd) PYTHON = $(shell which python) @@ -157,8 +151,8 @@ index 5146830476..ff8535b03e 100644 -_CC_VERSION = $(shell echo '$(_CC_TEST)' | $(CC) -E -P -) -$(info _CC_VERSION = '$(_CC_VERSION)') - --ifneq '$(_CC_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CC_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif - @@ -170,12 +164,10 @@ index 5146830476..ff8535b03e 100644 -_CXX_VERSION = $(shell echo '$(_CXX_TEST)' | $(CXX) -E -P -) -$(info _CXX_VERSION = '$(_CXX_VERSION)') - --ifneq '$(_CXX_VERSION)' '7 0' -- $(error clang 7.0 is required) +-ifneq '$(_CXX_VERSION)' '12 0' +- $(error clang 12.0 is required) -endif -endif -- -- + + all\ - ::\ - $(BUILD_ROOT)/catboost/python-package/catboost/_catboost.so\ From d8323e21aab198e456029ac9d6223e0e25443d1c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 4 Jul 2022 21:13:39 +0200 Subject: [PATCH 020/269] python3Packages.shap: fix broken package, improve tests Increases us from ~40 to ~58 successfull tests. Tests failing due to requiring network will are now marked as expected fails and skipped. Conflicts with #158984 (draft at the time of committing) --- .../python-modules/shap/default.nix | 117 +++++++++++++++--- 1 file changed, 99 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index 3041a7d92a74..661c6622195f 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -1,17 +1,27 @@ { lib , buildPythonPackage , fetchFromGitHub +, writeText , isPy27 , pytestCheckHook +, pytest-mpl , numpy , scipy , scikit-learn , pandas +, transformers +, opencv4 +, lightgbm +, catboost +, pyspark +, sentencepiece , tqdm , slicer , numba , matplotlib , nose +, lime +, cloudpickle , ipython }: @@ -35,29 +45,102 @@ buildPythonPackage rec { tqdm slicer numba + cloudpickle ]; - preCheck = '' + passthru.optional-dependencies = { + plots = [ matplotlib ipython ]; + others = [ lime ]; + }; + + preCheck = let + # This pytest hook mocks and catches attempts at accessing the network + # tests that try to access the network will raise, get caught, be marked as skipped and tagged as xfailed. + conftestSkipNetworkErrors = writeText "conftest.py" '' + from _pytest.runner import pytest_runtest_makereport as orig_pytest_runtest_makereport + import urllib, requests + + class NetworkAccessDeniedError(RuntimeError): pass + def deny_network_access(*a, **kw): + raise NetworkAccessDeniedError + + requests.head = deny_network_access + requests.get = deny_network_access + urllib.request.urlopen = deny_network_access + urllib.request.Request = deny_network_access + + def pytest_runtest_makereport(item, call): + tr = orig_pytest_runtest_makereport(item, call) + if call.excinfo is not None and call.excinfo.type is NetworkAccessDeniedError: + tr.outcome = 'skipped' + tr.wasxfail = "reason: Requires network access." + return tr + ''; + in '' export HOME=$TMPDIR # when importing the local copy the extension is not found rm -r shap + + # coverage testing is a waste considering how much we have to skip + substituteInPlace pytest.ini \ + --replace "--cov=shap --cov-report=term-missing" "" + + # Add pytest hook skipping tests that access network. + # These tests are marked as "Expected fail" (xfail) + cat ${conftestSkipNetworkErrors} >> tests/conftest.py ''; - checkInputs = [ pytestCheckHook matplotlib nose ipython ]; - # Those tests access the network + checkInputs = [ + pytestCheckHook + pytest-mpl + matplotlib + nose + ipython + # optional dependencies, which only serve to enable more tests: + opencv4 + #pytorch # we already skip all its tests due to slowness, adding it does nothing + transformers + #xgboost # numerically unstable? xgboost tests randomly fails pending on nixpkgs revision + lightgbm + catboost + pyspark + sentencepiece + ]; + disabledTestPaths = [ + # takes forever without GPU acceleration + "tests/explainers/test_deep.py" + "tests/explainers/test_gradient.py" + # requires GPU. We skip here instead of having pytest repeatedly check for GPU + "tests/explainers/test_gpu_tree.py" + # The resulting plots look sane, but does not match pixel-perfectly with the baseline. + # Likely due to a matplotlib version mismatch, different backend, or due to missing fonts. + "tests/plots/test_summary.py" # FIXME: enable + # 100% of the tests in these paths require network + "tests/explainers/test_explainer.py" + "tests/explainers/test_exact.py" + "tests/explainers/test_partition.py" + "tests/maskers/test_fixed_composite.py" + "tests/maskers/test_text.py" + "tests/models/test_teacher_forcing_logits.py" + "tests/models/test_text_generation.py" + ]; disabledTests = [ - "test_kernel_shap_with_a1a_sparse_zero_background" - "test_kernel_shap_with_a1a_sparse_nonzero_background" - "test_kernel_shap_with_high_dim_sparse" - "test_sklearn_random_forest_newsgroups" - "test_sum_match_random_forest" - "test_sum_match_extra_trees" - "test_single_row_random_forest" - "test_sum_match_gradient_boosting_classifier" - "test_single_row_gradient_boosting_classifier" - "test_HistGradientBoostingClassifier_proba" - "test_HistGradientBoostingClassifier_multidim" - "test_sum_match_gradient_boosting_regressor" - "test_single_row_gradient_boosting_regressor" + # unstable. A xgboost-enabled test. possibly related: https://github.com/slundberg/shap/issues/2480 + "test_provided_background_tree_path_dependent" + ]; + + #pytestFlagsArray = ["-x" "-W" "ignore"]; # uncomment this to debug + + pythonImportCheck = [ + "shap" + "shap.explainers" + "shap.explainers.other" + "shap.plots" + "shap.plots.colors" + "shap.benchmark" + "shap.maskers" + "shap.utils" + "shap.actions" + "shap.models" ]; meta = with lib; { @@ -66,7 +149,5 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ evax ]; platforms = platforms.unix; - # ModuleNotFoundError: No module named 'sklearn.ensemble.iforest' - broken = true; }; } From 024010b18d0f30b381cec67efc5537775c7c6217 Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 1 Sep 2022 17:04:28 +0200 Subject: [PATCH 021/269] gtkradiant: init at unstable-2022-07-31 --- pkgs/applications/misc/gtkradiant/default.nix | 163 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 165 insertions(+) create mode 100644 pkgs/applications/misc/gtkradiant/default.nix diff --git a/pkgs/applications/misc/gtkradiant/default.nix b/pkgs/applications/misc/gtkradiant/default.nix new file mode 100644 index 000000000000..a8f5c91d1eb8 --- /dev/null +++ b/pkgs/applications/misc/gtkradiant/default.nix @@ -0,0 +1,163 @@ +{ lib, stdenv, fetchFromGitHub, fetchsvn +, scons, pkg-config, python3 +, glib, libxml2, gtk2, libGLU, gnome2 +, runCommand, writeScriptBin, runtimeShell +, makeDesktopItem, copyDesktopItems +}: + +let + q3Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q3Pack/trunk"; + rev = 144; + sha256 = "sha256-U1GtMv775JEOAJ1W2kSaRNPDCnW39W+KqVDTTG2yISY="; + }; + urtPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/UrTPack/trunk"; + rev = 144; + sha256 = "sha256-DQjENyQa1kEieU3ZWyMt2e4oEN0X2K3lxP79sBI91iI="; + }; + etPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/ETPack/trunk"; + rev = 144; + sha256 = "sha256-mqaWOYfF/F6ABh7nKA36YvsywZIdwJ9IitFi2Xp5rgk="; + }; + qlPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/QLPack/trunk"; + rev = 144; + sha256 = "sha256-lrn4nu3JI7j+t9jYd+UFE55GOCbc6+Sh2fZfVlEr1WM="; + }; + q2Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q2Pack/trunk"; + rev = 144; + sha256 = "sha256-ad8dRV+28Zz5yQsJU7hvteSIn9wWpehuqxMspw3yvvU="; + }; + quetooPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/QuetooPack/trunk"; + rev = 144; + sha256 = "sha256-SOblPJgdVEZrTYtvDlcF7paIm3UitSVFQ9+RahXkO64="; + }; + jaPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/JAPack/trunk"; + rev = 144; + sha256 = "sha256-P6lI+nNrPwoWJl5ThUHIA3Iw1nWVo2djaaWHAF5HuDo="; + }; + stvefPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/STVEFPack/trunk"; + rev = 144; + sha256 = "sha256-quNyVC6fg1FIBsLWx0LzRK2JfxKMNJeUEIkWGhGJHhI="; + }; + wolfPack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/WolfPack/trunk"; + rev = 144; + sha256 = "sha256-693k6KiIchQddVGBhRJf7ikv6ut5L9rcLt0FTZ7pSvw="; + }; + unvanquishedPack = fetchsvn { + url = "https://github.com/Unvanquished/unvanquished-mapeditor-support.git/trunk/build/gtkradiant/"; + rev = 212; + sha256 = "sha256-weBlnSBezPppbhsMOT66vubioTxpDC+AcKIOC2Xitdo="; + }; + q1Pack = fetchsvn { + url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q1Pack/trunk"; + rev = 144; + sha256 = "sha256-JfmDIUoDY7dYdMgwwUMgcwNhWxuxsdkv1taw8DXhPY4="; + }; + packs = runCommand "gtkradiant-packs" {} '' + mkdir -p $out + ln -s ${q3Pack} $out/Q3Pack + ln -s ${urtPack} $out/UrTPack + ln -s ${etPack} $out/ETPack + ln -s ${qlPack} $out/QLPack + ln -s ${q2Pack} $out/Q2Pack + ln -s ${quetooPack} $out/QuetooPack + ln -s ${jaPack} $out/JAPack + ln -s ${stvefPack} $out/STVEFPack + ln -s ${wolfPack} $out/WolfPack + ln -s ${unvanquishedPack} $out/UnvanquishedPack + ln -s ${q1Pack} $out/Q1Pack + ''; + +in +stdenv.mkDerivation rec { + pname = "gtkradiant"; + + version = "unstable-2022-07-31"; + + src = fetchFromGitHub { + owner = "TTimo"; + repo = "GtkRadiant"; + rev = "5b498bfa01bde6c2c9eb60fb94cf04666e52d22d"; + sha256 = "sha256-407faeQnhxqbWgOUunQKj2JhHeqIzPPgrhz2K5O4CaM="; + }; + + # patch paths so that .game settings are put into the user's home instead of the read-only /nix/store + postPatch = '' + substituteInPlace radiant/preferences.cpp \ + --replace 'gameFilePath += "games/";' 'gameFilePath = g_get_home_dir(); gameFilePath += "/.cache/radiant/games/";printf("gameFilePath: %s\\n", gameFilePath);' \ + --replace 'radCreateDirectory( gameFilePath );' 'if (g_mkdir_with_parents( gameFilePath, 0777 ) == -1) {radCreateDirectory( gameFilePath );};' \ + --replace 'strGamesPath = g_strAppPath.GetBuffer();' 'strGamesPath = g_get_home_dir();' \ + --replace 'strGamesPath += "games";' 'strGamesPath += "/.cache/radiant/games";' + ''; + + nativeBuildInputs = + let + python = python3.withPackages (ps: with ps; [ + urllib3 + ]); + svn = writeScriptBin "svn" '' + #!${runtimeShell} -e + if [ "$1" = checkout ]; then + # link predownloaded pack to destination + mkdir -p $(dirname $3) + ln -s ${packs}/$(basename $3) $3 + # verify existence + test -e $(readlink $3) + elif [ "$1" = update ]; then + # verify existence + test -e $(readlink $3) + else + echo "$@" + exit 1 + fi + ''; + in [ + scons + pkg-config + python + svn + copyDesktopItems + ]; + + buildInputs = [ glib libxml2 gtk2 libGLU gnome2.gtkglext ]; + + enableParallelBuilding = true; + + desktopItems = [ (makeDesktopItem { + name = "gtkradiant"; + exec = "gtkradiant"; + desktopName = "GtkRadiant"; + comment = meta.description; + categories = [ "Development" ]; + icon = "gtkradiant"; + # includes its own splash screen + startupNotify = false; + }) ]; + + postInstall = '' + mkdir -p $out/{bin,lib} + cp -ar install $out/lib/gtkradiant + + ln -s ../lib/gtkradiant/radiant.bin $out/bin/gtkradiant + ln -s ../lib/gtkradiant/{q3map2,q3map2_urt,q3data} $out/bin/ + + mkdir -p $out/share/pixmaps + ln -s ../../lib/gtkradiant/bitmaps/icon.png $out/share/pixmaps/gtkradiant.png + ''; + + meta = with lib; { + description = "Level editor for idTech games"; + homepage = "https://icculus.org/gtkradiant/"; + license = with licenses; [ gpl2Only bsdOriginal lgpl21Only ]; + maintainers = with maintainers; [ astro ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 519144426cbf..8dbdddeaa072 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7320,6 +7320,8 @@ with pkgs; gtkperf = callPackage ../development/tools/misc/gtkperf { }; + gtkradiant = callPackage ../applications/misc/gtkradiant { }; + gtk-frdp = callPackage ../development/libraries/gtk-frdp {}; gtk-vnc = callPackage ../tools/admin/gtk-vnc {}; From eef137b649c691d6df7ca9b91feea7e341285d8b Mon Sep 17 00:00:00 2001 From: Wesley Jr Date: Sat, 17 Sep 2022 16:08:19 -0300 Subject: [PATCH 022/269] maintainers: add wesleyjrz --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 691d95e31f53..68ebd67a58cd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14820,6 +14820,12 @@ github = "jali-clarke"; githubId = 17733984; }; + wesleyjrz = { + email = "wesleyjr2002@gmail.com"; + name = "Wesley V. Santos Jr."; + github = "wesleyjrz"; + githubId = 60184588; + }; npatsakula = { email = "nikita.patsakula@gmail.com"; name = "Patsakula Nikita"; From 08e983e720d6adee670b9f171ee71a07e8d428c2 Mon Sep 17 00:00:00 2001 From: Wesley Jr Date: Sat, 17 Sep 2022 16:08:46 -0300 Subject: [PATCH 023/269] tym: init at 3.3.0 --- .../terminal-emulators/tym/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/terminal-emulators/tym/default.nix diff --git a/pkgs/applications/terminal-emulators/tym/default.nix b/pkgs/applications/terminal-emulators/tym/default.nix new file mode 100644 index 000000000000..b85133e7aecb --- /dev/null +++ b/pkgs/applications/terminal-emulators/tym/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, gtk3, vte, lua5_3, pcre2 }: + +stdenv.mkDerivation rec { + pname = "tym"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "endaaman"; + repo = "${pname}"; + rev = "${version}"; + sha256 = "sha256-ufIYJgbHmSJJbnx4hyDx0DmIjaGCxKXtiekcXcyka14="; + }; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + buildInputs = [ + gtk3 + vte + lua5_3 + pcre2 + ]; + + meta = with lib; { + description = "Lua-configurable terminal emulator"; + homepage = "https://github.com/endaaman/tym"; + license = licenses.mit; + maintainers = [ maintainers.wesleyjrz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 280a79821a39..344b738487e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1643,6 +1643,8 @@ with pkgs; tilix = callPackage ../applications/terminal-emulators/tilix { }; + tym = callPackage ../applications/terminal-emulators/tym { }; + wayst = callPackage ../applications/terminal-emulators/wayst { }; wezterm = callPackage ../applications/terminal-emulators/wezterm { From d77e00f5003aee22e2891541e0d770eac1b82720 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 18 Sep 2022 14:49:33 +0200 Subject: [PATCH 024/269] pkgsCross.armv7l-hf-multiplatform.ubootClearfog: fix build Adds ncurses to nativeBuildInputs as well to fix cross-compilation --- pkgs/misc/uboot/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 579ef6a30dd5..8f16f943d740 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -60,6 +60,7 @@ let ''; nativeBuildInputs = [ + ncurses # tools/kwboot bc bison dtc From 1faa21674513e76622775e972fdf11b0bcf08dd7 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Mon, 19 Sep 2022 09:27:43 +0800 Subject: [PATCH 025/269] darwin.iproute2mac: 1.4.0 -> 1.4.1 --- pkgs/os-specific/darwin/iproute2mac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix index f542f2c5221b..a7f1f0b773d8 100644 --- a/pkgs/os-specific/darwin/iproute2mac/default.nix +++ b/pkgs/os-specific/darwin/iproute2mac/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, darwin, python3 }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.4.1"; pname = "iproute2mac"; src = fetchFromGitHub { owner = "brona"; repo = "iproute2mac"; rev = "v${version}"; - sha256 = "sha256-xakCNjmZpdVY7MMxk38EZatrakgkEeDhvljhl+aMmGg="; + sha256 = "sha256-MaL8eb9UOZ71BL4Jvc6Od+EJ+F6j96n9a+vRnHeveIU="; }; buildInputs = [ python3 ]; From ffea2d42c0e74919714be235e72b8f689abd1091 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Tue, 20 Sep 2022 01:07:56 +0200 Subject: [PATCH 026/269] inklingreader: init at unstable-2017-09-07 --- pkgs/tools/misc/inklingreader/default.nix | 39 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/misc/inklingreader/default.nix diff --git a/pkgs/tools/misc/inklingreader/default.nix b/pkgs/tools/misc/inklingreader/default.nix new file mode 100644 index 000000000000..8710da482a65 --- /dev/null +++ b/pkgs/tools/misc/inklingreader/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, gtk3 +, librsvg +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "inklingreader"; + version = "unstable-2017-09-07"; + + src = fetchFromGitHub { + owner = "roelj"; + repo = "inklingreader"; + rev = "90f9d0d7f5353657f4d25fd75635e29c10c08d2e"; + sha256 = "sha256-852m8g61r+NQhCYz9ghSbCG0sjao2E8B9GS06NG4GyY="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + gtk3 + librsvg + libusb1 + ]; + + meta = { + homepage = "https://github.com/roelj/inklingreader"; + description = "A GNU/Linux-friendly version of the Wacom Inkling SketchManager"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ totoroot ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b104897a0f1b..e2173227c62f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28890,6 +28890,8 @@ with pkgs; inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; + inklingreader = callPackage ../tools/misc/inklingreader { }; + inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; }; From ab3f0771a42aef7e691815209119bb49d1c63f93 Mon Sep 17 00:00:00 2001 From: samlich <1349989+samlich@users.noreply.github.com> Date: Fri, 23 Sep 2022 19:22:04 +0000 Subject: [PATCH 027/269] pymol: use Qt instead of Tk; fixes #192555 --- .../science/chemistry/pymol/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index c281f63b3bf8..4ad0380ef1e3 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -7,12 +7,11 @@ , netcdf , glew , glm -, freeglut , libpng , libxml2 -, tk , freetype , msgpack +, qt5 }: let pname = "pymol"; @@ -47,12 +46,11 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-JdsgcVF1w1xFPZxVcyS+GcWg4a1Bd4SvxFOuSdlz9SM="; }; - buildInputs = [ python3Packages.numpy glew glm freeglut libpng libxml2 tk freetype msgpack netcdf ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + buildInputs = [ python3Packages.numpy python3Packages.pyqt5 glew glm libpng libxml2 freetype msgpack netcdf ]; NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2"; hardeningDisable = [ "format" ]; - setupPyBuildFlags = [ "--glut" ]; - installPhase = '' python setup.py install --home="$out" runHook postInstall @@ -60,13 +58,17 @@ python3Packages.buildPythonApplication rec { postInstall = with python3Packages; '' wrapProgram $out/bin/pymol \ - --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ Pmw tkinter ]} + --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ pyqt5 pyqt5.pyqt5_sip ]} mkdir -p "$out/share/icons/" ln -s ../../lib/python/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg" cp -r "${desktopItem}/share/applications/" "$out/share/" ''; + preFixup = '' + wrapQtApp "$out/bin/pymol" + ''; + meta = with lib; { broken = stdenv.isDarwin; inherit description; From 1d4bddaed58c23fbfb4df0bf80d5ffd6803a6a34 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 25 Sep 2022 20:31:34 +0200 Subject: [PATCH 028/269] gnome.nixos-gsettings-override: extract from NixOS module This will clean up the module slightly and bring it more in line with Pantheon & Cinnamon. While at it do some other refactoring inspired by those modules: - Correct a typo in light background attribute name. - Rename the attribute name. - Quote arguments. - Extract the overridden package list and override text into variables. - Avoid having separate copy commands for overrides from packages. - Avoid `with` statements. - Use `concatMapStringsSep`. --- .../services/x11/desktop-managers/gnome.nix | 42 +++----------- pkgs/desktops/gnome/default.nix | 2 + .../nixos/gsettings-overrides/default.nix | 55 +++++++++++++++++++ 3 files changed, 64 insertions(+), 35 deletions(-) create mode 100644 pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 7bb7ef27ed57..d3db98cb4e2a 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -22,42 +22,14 @@ let favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ] ''; - nixos-background-ligtht = pkgs.nixos-artwork.wallpapers.simple-blue; + nixos-background-light = pkgs.nixos-artwork.wallpapers.simple-blue; nixos-background-dark = pkgs.nixos-artwork.wallpapers.simple-dark-gray; - nixos-gsettings-desktop-schemas = let - defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome.gnome-shell ]; - in - pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } - '' - mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - - ${concatMapStrings - (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") - (defaultPackages ++ cfg.extraGSettingsOverridePackages)} - - cp -f ${pkgs.gnome.gnome-shell}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - - ${optionalString flashbackEnabled '' - cp -f ${pkgs.gnome.gnome-flashback}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - ''} - - chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides - cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF - [org.gnome.desktop.background] - picture-uri='file://${nixos-background-ligtht.gnomeFilePath}' - picture-uri-dark='file://${nixos-background-dark.gnomeFilePath}' - - [org.gnome.desktop.screensaver] - picture-uri='file://${nixos-background-dark.gnomeFilePath}' - - ${cfg.favoriteAppsOverride} - - ${cfg.extraGSettingsOverrides} - EOF - - ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/ - ''; + # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this + nixos-gsettings-desktop-schemas = pkgs.gnome.nixos-gsettings-overrides.override { + inherit (cfg) extraGSettingsOverrides extraGSettingsOverridePackages favoriteAppsOverride; + inherit flashbackEnabled nixos-background-dark nixos-background-light; + }; nixos-background-info = pkgs.writeTextFile rec { name = "nixos-background-info"; @@ -67,7 +39,7 @@ let Blobs - ${nixos-background-ligtht.gnomeFilePath} + ${nixos-background-light.gnomeFilePath} ${nixos-background-dark.gnomeFilePath} zoom solid diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index a0561ca00300..1169bae6d67e 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -123,6 +123,8 @@ lib.makeScope pkgs.newScope (self: with self; { withGnome = true; }; + nixos-gsettings-overrides = callPackage ./nixos/gsettings-overrides { }; + rygel = callPackage ./core/rygel { }; simple-scan = callPackage ./core/simple-scan { }; diff --git a/pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix b/pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix new file mode 100644 index 000000000000..3110fc7939bb --- /dev/null +++ b/pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix @@ -0,0 +1,55 @@ +{ lib +, runCommand +, gsettings-desktop-schemas +, gnome-shell +, glib +, gnome-flashback +, nixos-artwork +, nixos-background-light ? nixos-artwork.wallpapers.simple-blue +, nixos-background-dark ? nixos-artwork.wallpapers.simple-dark-gray +, extraGSettingsOverrides ? "" +, extraGSettingsOverridePackages ? [ ] +, favoriteAppsOverride ? "" +, flashbackEnabled ? false +}: + +let + + inherit (lib) concatMapStringsSep; + + gsettingsOverridePackages = [ + gsettings-desktop-schemas + gnome-shell + ] ++ lib.optionals flashbackEnabled [ + gnome-flashback + ] ++ extraGSettingsOverridePackages; + + gsettingsOverrides = '' + [org.gnome.desktop.background] + picture-uri='file://${nixos-background-light.gnomeFilePath}' + picture-uri-dark='file://${nixos-background-dark.gnomeFilePath}' + + [org.gnome.desktop.screensaver] + picture-uri='file://${nixos-background-dark.gnomeFilePath}' + + ${favoriteAppsOverride} + + ${extraGSettingsOverrides} + ''; + +in + +runCommand "gnome-gsettings-overrides" { preferLocalBuild = true; } '' + data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides" + schema_dir="$data_dir/glib-2.0/schemas" + mkdir -p "$schema_dir" + + ${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schema_dir\"") gsettingsOverridePackages} + + chmod -R a+w "$data_dir" + cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF + ${gsettingsOverrides} + EOF + + ${glib.dev}/bin/glib-compile-schemas "$schema_dir" +'' From 35e033d416a512c0a5406ef76b4fe96a1f2e564a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 26 Sep 2022 00:12:54 +0200 Subject: [PATCH 029/269] gnome.nixos-gsettings-override: Make compilation strict Otherwise people will just miss errors in their overrides and be confused why they do not work. --- pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix b/pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix index 3110fc7939bb..e75e2eb1e887 100644 --- a/pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix +++ b/pkgs/desktops/gnome/nixos/gsettings-overrides/default.nix @@ -51,5 +51,5 @@ runCommand "gnome-gsettings-overrides" { preferLocalBuild = true; } '' ${gsettingsOverrides} EOF - ${glib.dev}/bin/glib-compile-schemas "$schema_dir" + ${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir" '' From dff1ed86905e1c3a564aed37b6717d521552be17 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 26 Sep 2022 00:27:08 +0200 Subject: [PATCH 030/269] cinnamon.cinnamon-gsettings-overrides: Bring closer to GNOME - Prefer local builds to avoid costly copying. - Quote arguments. - Avoid `with` statements. - Use `concatMapStringsSep`. --- .../cinnamon-gsettings-overrides/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index a3456755045f..8795f1b918f0 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -20,6 +20,8 @@ let + inherit (lib) concatMapStringsSep; + gsettingsOverridePackages = [ # from mint-artwork @@ -38,22 +40,21 @@ let in -with lib; - # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this -runCommand "cinnamon-gsettings-overrides" { } +runCommand "cinnamon-gsettings-overrides" { preferLocalBuild = true; } '' - schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides" + schema_dir="$data_dir/glib-2.0/schemas" - mkdir -p $schema_dir + mkdir -p "$schema_dir" - ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml ${glib.getSchemaPath pkg}/*.gschema.override $schema_dir\n") gsettingsOverridePackages} + ${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schema_dir\"") gsettingsOverridePackages} - chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides + chmod -R a+w "$data_dir" - cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF + cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF ${extraGSettingsOverrides} EOF - ${glib.dev}/bin/glib-compile-schemas $schema_dir + ${glib.dev}/bin/glib-compile-schemas "$schema_dir" '' From 5e408af4de6cd0cc296467e2638db21360157df8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 25 Sep 2022 20:34:45 +0200 Subject: [PATCH 031/269] cinnamon.cinnamon-gsettings-overrides: Make compilation strict Otherwise people will just miss errors in their overrides and be confused why they do not work. --- pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 8795f1b918f0..a8d46d578996 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -56,5 +56,5 @@ runCommand "cinnamon-gsettings-overrides" { preferLocalBuild = true; } ${extraGSettingsOverrides} EOF - ${glib.dev}/bin/glib-compile-schemas "$schema_dir" + ${glib.dev}/bin/glib-compile-schemas --strict "$schema_dir" '' From cb0c70b38855278096bfab28bcf2fcd69cc8b407 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 26 Sep 2022 00:26:22 +0200 Subject: [PATCH 032/269] pantheon.elementary-gsettings-schemas: Bring closer to GNOME - Prefer local builds to avoid costly copying. - Quote arguments. - Avoid `with` statements. - Use `concatMapStringsSep`. - Format with `nixpkgs-fmt` to fix indentation. --- .../elementary-gsettings-schemas/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index dd6b10f5c830..41c4c099cf2d 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -10,11 +10,13 @@ , elementary-dock , gsettings-desktop-schemas , extraGSettingsOverrides ? "" -, extraGSettingsOverridePackages ? [] +, extraGSettingsOverridePackages ? [ ] }: let + inherit (lib) concatMapStringsSep; + gsettingsOverridePackages = [ elementary-dock gnome-settings-daemon @@ -27,25 +29,24 @@ let in -with lib; # TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this -runCommand "elementary-gsettings-desktop-schemas" {} +runCommand "elementary-gsettings-desktop-schemas" { preferLocalBuild = true; } '' - schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + data_dir="$out/share/gsettings-schemas/nixos-gsettings-overrides" + schema_dir="$data_dir/glib-2.0/schemas" - mkdir -p $schema_dir + mkdir -p "$schema_dir" + cp -rf "${glib.getSchemaPath gala}"/*.gschema.override "$schema_dir" - cp -rf ${glib.getSchemaPath gala}/*.gschema.override $schema_dir + ${concatMapStringsSep "\n" (pkg: "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"$schema_dir\"") gsettingsOverridePackages} - ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml $schema_dir\n") gsettingsOverridePackages} + chmod -R a+w "$data_dir" + cp "${glib.getSchemaPath elementary-default-settings}"/* "$schema_dir" - chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides - cp ${glib.getSchemaPath elementary-default-settings}/* $schema_dir + cat - > "$schema_dir/nixos-defaults.gschema.override" <<- EOF + ${extraGSettingsOverrides} + EOF - cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF - ${extraGSettingsOverrides} - EOF - - ${glib.dev}/bin/glib-compile-schemas $schema_dir + ${glib.dev}/bin/glib-compile-schemas $schema_dir '' From f893f280190f247c52954f9a3af3f9cec1ac54ee Mon Sep 17 00:00:00 2001 From: Philipp Middendorf Date: Tue, 27 Sep 2022 12:53:25 +0200 Subject: [PATCH 033/269] crystfel-headless: fix wrapProgram dependency --- pkgs/applications/science/physics/crystfel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/physics/crystfel/default.nix b/pkgs/applications/science/physics/crystfel/default.nix index 85b18eb82fd7..81c1fdd6b054 100644 --- a/pkgs/applications/science/physics/crystfel/default.nix +++ b/pkgs/applications/science/physics/crystfel/default.nix @@ -166,7 +166,7 @@ stdenv.mkDerivation rec { url = "https://www.desy.de/~twhite/${pname}/${pname}-${version}.tar.gz"; sha256 = "0i9d5ggalic7alj97dxjdys7010kxhm2cb4lwakvigl023j8ms79"; }; - nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers ] + nativeBuildInputs = [ meson pkg-config ninja flex bison doxygen opencl-headers makeWrapper ] ++ lib.optionals withGui [ wrapGAppsHook ]; buildInputs = [ hdf5 From 4078880ab4ee02cfcfee683f66bba95c8acbb81d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Sep 2022 16:41:51 +0000 Subject: [PATCH 034/269] pinniped: 0.19.0 -> 0.20.0 --- pkgs/applications/networking/cluster/pinniped/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/applications/networking/cluster/pinniped/default.nix index ebc074d148a9..32ce4d74a3d9 100644 --- a/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/pkgs/applications/networking/cluster/pinniped/default.nix @@ -2,18 +2,18 @@ buildGoModule rec{ pname = "pinniped"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-VGvT0jj2f4+jiaPQkebL0GE+W4U8+RfSEsGr2sNBu2Q="; + sha256 = "sha256-JKZij9f6zlBzbYolxz03R5j95zKELVmEhX+QRTxF/cc="; }; subPackages = "cmd/pinniped"; - vendorSha256 = "sha256-7jQRUYJiRdYuAy3x+VPK4Nh5GF6ME7juloagm85oOVg="; + vendorSha256 = "sha256-szv/B7LG/In0j6MT6KCnuUfaCnK7RsJOLeuOtJ/ig9w="; ldflags = [ "-s" "-w" ]; From dd480e2235f849c4f0b8d9cbbf501be916b13d0b Mon Sep 17 00:00:00 2001 From: Yves Fischer Date: Wed, 28 Sep 2022 23:51:46 +0200 Subject: [PATCH 035/269] qcad: fix executable path in .desktop file the patch did specify qcad-bin but the binary is just named qcad --- pkgs/applications/misc/qcad/application-dir.patch | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/applications/misc/qcad/application-dir.patch b/pkgs/applications/misc/qcad/application-dir.patch index 0b8a29319eb3..84782e1e7178 100644 --- a/pkgs/applications/misc/qcad/application-dir.patch +++ b/pkgs/applications/misc/qcad/application-dir.patch @@ -33,16 +33,3 @@ index c6c31cbf5..c51b59ce6 100644 } int RSettings::getSnapRange() { -diff --git a/qcad.desktop b/qcad.desktop -index 93c5e9720..2d0e6bf32 100644 ---- a/qcad.desktop -+++ b/qcad.desktop -@@ -48,7 +48,7 @@ Comment[sv]=2D CAD-system - Comment[sl]=Sistem 2D CAD - Comment[uk]=2D САПР - Comment[tr]=2D CAD Sistemi --Exec=qcad %F -+Exec=qcad-bin %F - X-MultipleArgs=true - Icon=qcad_icon - Terminal=false From eaaf02d9c43f900c22a05d44529b14921f432a92 Mon Sep 17 00:00:00 2001 From: Lyndon Sanche Date: Wed, 28 Sep 2022 21:49:59 -0600 Subject: [PATCH 036/269] 1password-gui: Patch `op-ssh-sign` --- pkgs/applications/misc/1password-gui/beta.nix | 4 ++-- pkgs/applications/misc/1password-gui/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/beta.nix b/pkgs/applications/misc/1password-gui/beta.nix index d90b3e46f50c..fabbf862f3d0 100644 --- a/pkgs/applications/misc/1password-gui/beta.nix +++ b/pkgs/applications/misc/1password-gui/beta.nix @@ -120,8 +120,8 @@ in stdenv.mkDerivation rec { cp -a resources/icons $out/share interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper} - patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper} + patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} + patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} for file in $(find $out -type f -name \*.so\* ); do patchelf --set-rpath ${rpath}:$out/share/1password $file done diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 46480a032598..2dba8af6c9e0 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -120,8 +120,8 @@ in stdenv.mkDerivation rec { cp -a resources/icons $out/share interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper} - patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper} + patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} + patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,op-ssh-sign} for file in $(find $out -type f -name \*.so\* ); do patchelf --set-rpath ${rpath}:$out/share/1password $file done From 91879ce1604060e3b91d275f7686b98d2357c9a6 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 29 Sep 2022 12:34:06 +0200 Subject: [PATCH 037/269] make-options-doc: Make optionIdPrefix configurable ("opt-") --- nixos/lib/make-options-doc/default.nix | 3 +++ nixos/lib/make-options-doc/options-to-docbook.xsl | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index 43dbff0e68dd..6a1bb868c20d 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -26,6 +26,8 @@ # If you include more than one option list into a document, you need to # provide different ids. , variablelistId ? "configuration-variable-list" + # Strig to prefix to the option XML/HTML id attributes. +, optionIdPrefix ? "opt-" , revision ? "" # Specify revision for the options # a set of options the docs we are generating will be merged into, as if by recursiveUpdate. # used to split the options doc build into a static part (nixos/modules) and a dynamic part @@ -183,6 +185,7 @@ in rec { --stringparam documentType '${documentType}' \ --stringparam revision '${revision}' \ --stringparam variablelistId '${variablelistId}' \ + --stringparam optionIdPrefix '${optionIdPrefix}' \ -o intermediate.xml ${./options-to-docbook.xsl} sorted.xml ${pkgs.libxslt.bin}/bin/xsltproc \ -o "$out" ${./postprocess-option-descriptions.xsl} intermediate.xml diff --git a/nixos/lib/make-options-doc/options-to-docbook.xsl b/nixos/lib/make-options-doc/options-to-docbook.xsl index 978d5e2468a8..d5b921b1dedb 100644 --- a/nixos/lib/make-options-doc/options-to-docbook.xsl +++ b/nixos/lib/make-options-doc/options-to-docbook.xsl @@ -15,6 +15,7 @@ + @@ -36,7 +37,7 @@ .driver` attribute instead, and call it with the flag `result/bin/nixos-test-driver --interactive`. diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md index 99704ec3c141..2efe52b9883c 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -22,12 +22,12 @@ A NixOS test is a module that has the following structure: ``` We refer to the whole test above as a test module, whereas the values -in [`nodes.`](#opt-nodes) are NixOS modules themselves. +in [`nodes.`](#test-opt-nodes) are NixOS modules themselves. -The option [`testScript`](#opt-testScript) is a piece of Python code that executes the +The option [`testScript`](#test-opt-testScript) is a piece of Python code that executes the test (described below). During the test, it will start one or more virtual machines, the configuration of which is described by -the option [`nodes`](#opt-nodes). +the option [`nodes`](#test-opt-nodes). An example of a single-node test is [`login.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix). @@ -171,7 +171,7 @@ The following methods are available on machine objects: least one will be returned. ::: {.note} - This requires [`enableOCR`](#opt-enableOCR) to be set to `true`. + This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`. ::: `get_screen_text` @@ -180,7 +180,7 @@ The following methods are available on machine objects: machine\'s screen using optical character recognition. ::: {.note} - This requires [`enableOCR`](#opt-enableOCR) to be set to `true`. + This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`. ::: `send_monitor_command` @@ -291,7 +291,7 @@ The following methods are available on machine objects: `get_screen_text` and `get_screen_text_variants`). ::: {.note} - This requires [`enableOCR`](#opt-enableOCR) to be set to `true`. + This requires [`enableOCR`](#test-opt-enableOCR) to be set to `true`. ::: `wait_for_console_text` diff --git a/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml b/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml index 35d9bbd1c1fe..16db709f8b91 100644 --- a/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml +++ b/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml @@ -44,14 +44,14 @@ $ ./result/bin/nixos-test-driver --keep-vm-state The .driverInteractive attribute combines the regular test configuration with definitions from the - interactive + interactive submodule. This gives you a more usable, graphical, but slightly different configuration. You can add your own interactive-only test configuration by adding extra configuration to the - interactive + interactive submodule. diff --git a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml index 32f5fdb77f50..4db196273dad 100644 --- a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml +++ b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml @@ -24,16 +24,16 @@ We refer to the whole test above as a test module, whereas the values in - nodes.<name> + nodes.<name> are NixOS modules themselves. The option - testScript + testScript is a piece of Python code that executes the test (described below). During the test, it will start one or more virtual machines, the configuration of which is described by the option - nodes. + nodes. An example of a single-node test is @@ -263,7 +263,7 @@ start_all() This requires - enableOCR + enableOCR to be set to true. @@ -281,7 +281,7 @@ start_all() This requires - enableOCR + enableOCR to be set to true. @@ -522,7 +522,7 @@ start_all() This requires - enableOCR + enableOCR to be set to true. diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix index 04e99f9e21d6..fb181c1d7e9a 100644 --- a/nixos/lib/testing/driver.nix +++ b/nixos/lib/testing/driver.nix @@ -120,7 +120,7 @@ in }; qemu.package = mkOption { - description = mdDoc "Which qemu package to use for the virtualisation of [{option}`nodes`](#opt-nodes)."; + description = mdDoc "Which qemu package to use for the virtualisation of [{option}`nodes`](#test-opt-nodes)."; type = types.package; default = hostPkgs.qemu_test; defaultText = "hostPkgs.qemu_test"; @@ -152,7 +152,7 @@ in description = mdDoc '' Extra arguments to pass to the test driver. - They become part of [{option}`driver`](#opt-driver) via `wrapProgram`. + They become part of [{option}`driver`](#test-opt-driver) via `wrapProgram`. ''; type = types.listOf types.str; default = []; @@ -172,7 +172,7 @@ in description = mdDoc '' Disable type checking. This must not be enabled for new NixOS tests. - This may speed up your iteration cycle, unless you're working on the [{option}`testScript`](#opt-testScript). + This may speed up your iteration cycle, unless you're working on the [{option}`testScript`](#test-opt-testScript). ''; }; }; diff --git a/nixos/lib/testing/meta.nix b/nixos/lib/testing/meta.nix index 4d8b0e0f1c43..65754fe3c541 100644 --- a/nixos/lib/testing/meta.nix +++ b/nixos/lib/testing/meta.nix @@ -24,14 +24,14 @@ in type = types.nullOr types.int; default = null; # NOTE: null values are filtered out by `meta`. description = mdDoc '' - The [{option}`test`](#opt-test)'s [`meta.timeout`](https://nixos.org/manual/nixpkgs/stable/#var-meta-timeout) in seconds. + The [{option}`test`](#test-opt-test)'s [`meta.timeout`](https://nixos.org/manual/nixpkgs/stable/#var-meta-timeout) in seconds. ''; }; broken = lib.mkOption { type = types.bool; default = false; description = mdDoc '' - Sets the [`meta.broken`](https://nixos.org/manual/nixpkgs/stable/#var-meta-broken) attribute on the [{option}`test`](#opt-test) derivation. + Sets the [`meta.broken`](https://nixos.org/manual/nixpkgs/stable/#var-meta-broken) attribute on the [{option}`test`](#test-opt-test) derivation. ''; }; }; diff --git a/nixos/lib/testing/name.nix b/nixos/lib/testing/name.nix index a54622e139bf..0af593169eec 100644 --- a/nixos/lib/testing/name.nix +++ b/nixos/lib/testing/name.nix @@ -7,7 +7,7 @@ in description = mdDoc '' The name of the test. - This is used in the derivation names of the [{option}`driver`](#opt-driver) and [{option}`test`](#opt-test) runner. + This is used in the derivation names of the [{option}`driver`](#test-opt-driver) and [{option}`test`](#test-opt-test) runner. ''; type = types.str; }; diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index 765af2878dfe..0395238cbaae 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -44,7 +44,7 @@ in description = mdDoc '' An attribute set of NixOS configuration modules. - The configurations are augmented by the [`defaults`](#opt-defaults) option. + The configurations are augmented by the [`defaults`](#test-opt-defaults) option. They are assigned network addresses according to the `nixos/lib/testing/network.nix` module. @@ -54,7 +54,7 @@ in defaults = mkOption { description = mdDoc '' - NixOS configuration that is applied to all [{option}`nodes`](#opt-nodes). + NixOS configuration that is applied to all [{option}`nodes`](#test-opt-nodes). ''; type = types.deferredModule; default = { }; @@ -62,7 +62,7 @@ in extraBaseModules = mkOption { description = mdDoc '' - NixOS configuration that, like [{option}`defaults`](#opt-defaults), is applied to all [{option}`nodes`](#opt-nodes) and can not be undone with [`specialisation..inheritParentConfig`](https://search.nixos.org/options?show=specialisation.%3Cname%3E.inheritParentConfig&from=0&size=50&sort=relevance&type=packages&query=specialisation). + NixOS configuration that, like [{option}`defaults`](#test-opt-defaults), is applied to all [{option}`nodes`](#test-opt-nodes) and can not be undone with [`specialisation..inheritParentConfig`](https://search.nixos.org/options?show=specialisation.%3Cname%3E.inheritParentConfig&from=0&size=50&sort=relevance&type=packages&query=specialisation). ''; type = types.deferredModule; default = { }; @@ -82,7 +82,7 @@ in type = types.bool; default = false; description = mdDoc '' - Enable to configure all [{option}`nodes`](#opt-nodes) to run with a minimal kernel. + Enable to configure all [{option}`nodes`](#test-opt-nodes) to run with a minimal kernel. ''; }; From e1db0a9aa59b395fcf7ebc04e9a37451c6f750b5 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 26 Nov 2021 18:36:31 +0100 Subject: [PATCH 039/269] python310Packages.django-annoying: init at 0.10.6 --- .../django-annoying/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/django-annoying/default.nix diff --git a/pkgs/development/python-modules/django-annoying/default.nix b/pkgs/development/python-modules/django-annoying/default.nix new file mode 100644 index 000000000000..3e062f29a0e0 --- /dev/null +++ b/pkgs/development/python-modules/django-annoying/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, django +, six +, pytest-django +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "django-annoying"; + version = "0.10.6"; + + src = fetchFromGitHub { + owner = "skorokithakis"; + repo = "django-annoying"; + rev = "v${version}"; + sha256 = "sha256-M1zOLr1Vjf2U0xlW66Mpno+S+b4IKLklN+kYxRaj6cA="; + }; + + patches = [ + (fetchpatch { + name = "django-4-compatibility.patch"; + url = "https://github.com/skorokithakis/django-annoying/pull/101/commits/51b5bd7bc8bb7a410400667e00d0813603df32bd.patch"; + sha256 = "sha256-gLRlAtIHHJ85I88af3C3y+ZT+nXrj2KrV7QgOuEqspk="; + }) + ]; + + propagatedBuildInputs = [ + django + six + ]; + + DJANGO_SETTINGS_MODULE = "tests.settings"; + + checkInputs = [ + pytest-django + pytestCheckHook + ]; + + meta = with lib; { + description = "A django application that tries to eliminate annoying things in the Django framework"; + homepage = "https://skorokithakis.github.io/django-annoying/"; + license = licenses.bsd3; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e68e86822916..3bad7e5785f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2497,6 +2497,8 @@ in { django-anymail = callPackage ../development/python-modules/django-anymail { }; + django-annoying = callPackage ../development/python-modules/django-annoying { }; + django-appconf = callPackage ../development/python-modules/django-appconf { }; django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; From 5a4f2b5a8adf11bd28e960e8aa24c42d9f91f307 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 26 Nov 2021 18:37:30 +0100 Subject: [PATCH 040/269] python310Packages.django-autocomplete-light: init at 3.9.4 --- .../django-autocomplete-light/default.nix | 73 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/development/python-modules/django-autocomplete-light/default.nix diff --git a/pkgs/development/python-modules/django-autocomplete-light/default.nix b/pkgs/development/python-modules/django-autocomplete-light/default.nix new file mode 100644 index 000000000000..26138a4ab4af --- /dev/null +++ b/pkgs/development/python-modules/django-autocomplete-light/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, six +, pytestCheckHook +, django-debug-toolbar +, django-extensions +, django-taggit +, django_tagging +, mock +, pytest-django +, selenium +, splinter +, sqlparse +, tenacity +, whitenoise +}: + +buildPythonPackage rec { + pname = "django-autocomplete-light"; + version = "3.9.4"; + + src = fetchFromGitHub { + owner = "yourlabs"; + repo = "django-autocomplete-light"; + rev = version; + sha256 = "sha256-YUiGN6q7ARM/rg7d+ykeDEYZDYjB+DHxMCmdme6QccU="; + }; + + propagatedBuildInputs = [ + django + six + ]; + + # Too many un-packaged dependencies + doCheck = false; + + checkInputs = [ + pytestCheckHook + django-debug-toolbar + django-extensions + django-taggit + django_tagging + mock + pytest-django + selenium + splinter + sqlparse + tenacity + whitenoise + + # FIXME: not packaged + # django-generic-m2m + # django-gm2m + # django-querysetsequence + # pytest-splinter + # dango-nested-admin + # djhacker + ]; + + # Taken from tox.ini + preCheck = "cd test_project"; + + pythonImportsCheck = [ "dal" ]; + + meta = with lib; { + description = "A fresh approach to autocomplete implementations, specially for Django"; + homepage = "https://django-autocomplete-light.readthedocs.io"; + license = licenses.bsd3; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3bad7e5785f8..9e02c74b68f2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2503,6 +2503,8 @@ in { django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; + django-autocomplete-light = callPackage ../development/python-modules/django-autocomplete-light { }; + django-cache-url = callPackage ../development/python-modules/django-cache-url { }; django-cacheops = callPackage ../development/python-modules/django-cacheops { }; From 5c71b2335b8ecbb0aa18d0c2dfd1c4c4606f4985 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 28 Nov 2021 14:36:53 +0100 Subject: [PATCH 041/269] python310Packages.django-hcaptcha: init at 0.2.0 --- .../django-hcaptcha/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/django-hcaptcha/default.nix diff --git a/pkgs/development/python-modules/django-hcaptcha/default.nix b/pkgs/development/python-modules/django-hcaptcha/default.nix new file mode 100644 index 000000000000..d200444ab50f --- /dev/null +++ b/pkgs/development/python-modules/django-hcaptcha/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, django +}: + +buildPythonPackage rec { + pname = "django-hcaptcha"; + version = "0.2.0"; + + src = fetchPypi { + inherit version; + pname = "django-hCaptcha"; + sha256 = "sha256-slGerwzJeGWscvglMBEixc9h4eSFLWiVmUFgIirLbBo="; + }; + + propagatedBuildInputs = [ + django + ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ "hcaptcha" ]; + + meta = with lib; { + description = "Django hCaptcha provides a simple way to protect your django forms using hCaptcha"; + homepage = "https://github.com/AndrejZbin/django-hcaptcha"; + license = licenses.bsd3; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e02c74b68f2..693113c42829 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2557,6 +2557,8 @@ in { django-haystack = callPackage ../development/python-modules/django-haystack { }; + django-hcaptcha = callPackage ../development/python-modules/django-hcaptcha { }; + django-health-check = callPackage ../development/python-modules/django-health-check { }; django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; From 1c6d12b9f4719525e6ea67a90152abd3f7aa1334 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 28 Nov 2021 14:44:11 +0100 Subject: [PATCH 042/269] python310Packages.django-crispy-forms: init at 1.14.0 --- .../django-crispy-forms/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/django-crispy-forms/default.nix diff --git a/pkgs/development/python-modules/django-crispy-forms/default.nix b/pkgs/development/python-modules/django-crispy-forms/default.nix new file mode 100644 index 000000000000..2677d8ec5262 --- /dev/null +++ b/pkgs/development/python-modules/django-crispy-forms/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, pytestCheckHook +, pytest-django +}: + +buildPythonPackage rec { + pname = "django-crispy-forms"; + version = "1.14.0"; + + src = fetchFromGitHub { + owner = "django-crispy-forms"; + repo = "django-crispy-forms"; + rev = version; + sha256 = "sha256-NZ2lWxsQHc7Qc4HDoWgjJTZ/bJHmjpBf3q1LVLtzA+8="; + }; + + propagatedBuildInputs = [ + django + ]; + + # FIXME: RuntimeError: Model class source.crispy_forms.tests.forms.CrispyTestModel doesn't declare an explicit app_label and isn't in an application in INSTALLED_APPS. + doCheck = false; + + checkInputs = [ + pytest-django + pytestCheckHook + ]; + + pytestFlagsArray = [ + "--ds=crispy_forms.tests.test_settings" + "crispy_forms/tests/" + ]; + + pythonImportsCheck = [ "crispy_forms" ]; + + meta = with lib; { + description = "The best way to have DRY Django forms."; + homepage = "https://django-crispy-forms.readthedocs.io/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 693113c42829..35e1724474cd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2529,6 +2529,8 @@ in { django-cors-headers = callPackage ../development/python-modules/django-cors-headers { }; + django-crispy-forms = callPackage ../development/python-modules/django-crispy-forms { }; + django-cryptography = callPackage ../development/python-modules/django-cryptography { }; django-csp = callPackage ../development/python-modules/django-csp { }; From 20c95ad03a73d7cadd61d2af8799f55e331e1375 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 28 Nov 2021 14:57:20 +0100 Subject: [PATCH 043/269] python310Packages.django-js-reverse: init at 2022-09-16 --- .../django-js-reverse/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/django-js-reverse/default.nix diff --git a/pkgs/development/python-modules/django-js-reverse/default.nix b/pkgs/development/python-modules/django-js-reverse/default.nix new file mode 100644 index 000000000000..9757d9aa2782 --- /dev/null +++ b/pkgs/development/python-modules/django-js-reverse/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchpatch +, fetchFromGitHub +, python +, django +, nodejs +, js2py +, six +}: + +buildPythonPackage rec { + pname = "django-js-reverse"; + # Support for Django 4.0 not yet released + version = "unstable-2022-09-16"; + + src = fetchFromGitHub { + owner = "ierror"; + repo = "django-js-reverse"; + rev = "7cab78c4531780ab4b32033d5104ccd5be1a246a"; + sha256 = "sha256-oA4R5MciDMcSsb+GAgWB5jhj+nl7E8t69u0qlx2G93E="; + }; + + patches = [ + (fetchpatch { + name = "fix-requires_system_checks-list-or-tuple"; + url = "https://github.com/ierror/django-js-reverse/commit/1477ba44b62c419d12ebec86e56973f1ae56f712.patch"; + sha256 = "sha256-xUtCziewVhnCOaNWddJBH4/Vvhwjjq/wcQDvh2YzWMQ="; + }) + ]; + + propagatedBuildInputs = [ + django + ]; + + checkInputs = [ + nodejs + js2py + six + ]; + + checkPhase = '' + ${python.interpreter} django_js_reverse/tests/unit_tests.py + ''; + + pythonImportsCheck = [ "django_js_reverse" ]; + + meta = with lib; { + description = "Javascript url handling for Django that doesn't hurt"; + homepage = "https://django-js-reverse.readthedocs.io/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35e1724474cd..253f50c01ee4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2574,6 +2574,8 @@ in { django-js-asset = callPackage ../development/python-modules/django-js-asset { }; + django-js-reverse = callPackage ../development/python-modules/django-js-reverse { }; + django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; From cdb99182adfecc5a3cb0df158bc9509bce94edf7 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 28 Nov 2021 15:05:16 +0100 Subject: [PATCH 044/269] python310Packages.django-scopes: init at 1.2.0.post1 --- .../python-modules/django-scopes/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/django-scopes/default.nix diff --git a/pkgs/development/python-modules/django-scopes/default.nix b/pkgs/development/python-modules/django-scopes/default.nix new file mode 100644 index 000000000000..26810445faad --- /dev/null +++ b/pkgs/development/python-modules/django-scopes/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, pytestCheckHook +, pytest-django +}: + +buildPythonPackage rec { + pname = "django-scopes"; + version = "1.2.0.post1"; + + src = fetchFromGitHub { + owner = "raphaelm"; + repo = "django-scopes"; + # No 1.2.0.post1 tag, see https://github.com/raphaelm/django-scopes/issues/27 + rev = "0b93cdb6a8335cb02a8ea7296511358ba841d137"; + sha256 = "sha256-djptJRkW1pfVbxhhs58fJA4d8dKZuvYRy01Aa3Btr+k="; + }; + + propagatedBuildInputs = [ + django + ]; + + checkInputs = [ + pytest-django + pytestCheckHook + ]; + + pythonImportsCheck = [ "django_scopes" ]; + + meta = with lib; { + description = "Safely separate multiple tenants in a Django database"; + homepage = "https://github.com/raphaelm/django-scopes"; + license = licenses.asl20; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 253f50c01ee4..6f7f75a930d1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2610,6 +2610,8 @@ in { django-q = callPackage ../development/python-modules/django-q { }; + django-scopes = callPackage ../development/python-modules/django-scopes { }; + djangoql = callPackage ../development/python-modules/djangoql { }; django-ranged-response = callPackage ../development/python-modules/django-ranged-response { }; From 682ebaafa296239f78852eb456b5b1c7f5d32064 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 28 Nov 2021 15:16:17 +0100 Subject: [PATCH 045/269] python310Packages.bleach-allowlist: init at 1.0.3 --- .../bleach-allowlist/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/bleach-allowlist/default.nix diff --git a/pkgs/development/python-modules/bleach-allowlist/default.nix b/pkgs/development/python-modules/bleach-allowlist/default.nix new file mode 100644 index 000000000000..4c52df127b00 --- /dev/null +++ b/pkgs/development/python-modules/bleach-allowlist/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, bleach +}: + +buildPythonPackage rec { + pname = "bleach-allowlist"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-VuIghgeaDmoxAK6Z5NuvIOslhUhlmOsOmUAIoRQo2ps="; + }; + + propagatedBuildInputs = [ + bleach + ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ "bleach_allowlist" ]; + + meta = with lib; { + description = "Curated lists of tags and attributes for sanitizing html"; + homepage = "https://github.com/yourcelf/bleach-allowlist"; + license = licenses.bsd2; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f7f75a930d1..2c1c961e03d7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1385,6 +1385,8 @@ in { bleach = callPackage ../development/python-modules/bleach { }; + bleach-allowlist = callPackage ../development/python-modules/bleach-allowlist { }; + bleak = callPackage ../development/python-modules/bleak { }; bleak-retry-connector = callPackage ../development/python-modules/bleak-retry-connector { }; From 6505d75bd1aaff52e2d9c7a676b543750e7c1e00 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 28 Nov 2021 15:45:40 +0100 Subject: [PATCH 046/269] python310Packages.jstyleson: init at 2022-09-16 --- .../python-modules/jstyleson/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/jstyleson/default.nix diff --git a/pkgs/development/python-modules/jstyleson/default.nix b/pkgs/development/python-modules/jstyleson/default.nix new file mode 100644 index 000000000000..be6eff6755f5 --- /dev/null +++ b/pkgs/development/python-modules/jstyleson/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jstyleson"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "linjackson78"; + repo = "jstyleson"; + # https://github.com/linjackson78/jstyleson/issues/6 + rev = "544b9fdb43339cdd15dd03dc69a6d0f36dd73241"; + sha256 = "sha256-s/0DDfy+07TuUNjHPqKRT3xMMQl6spZCacB7Dweof7A="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "jstyleson" ]; + + meta = with lib; { + description = "A python library to parse JSON with js-style comments"; + homepage = "https://github.com/linjackson78/jstyleson"; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2c1c961e03d7..b47d55ad0e55 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4872,6 +4872,8 @@ in { json-tricks = callPackage ../development/python-modules/json-tricks { }; + jstyleson = callPackage ../development/python-modules/jstyleson { }; + jug = callPackage ../development/python-modules/jug { }; junitparser = callPackage ../development/python-modules/junitparser { }; From b0f1f710ae3ed2f9c18f655c62c951ded32e568b Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 28 Nov 2021 15:22:56 +0100 Subject: [PATCH 047/269] python310Packages.microdata: init at 0.8.0 --- .../python-modules/microdata/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/microdata/default.nix diff --git a/pkgs/development/python-modules/microdata/default.nix b/pkgs/development/python-modules/microdata/default.nix new file mode 100644 index 000000000000..39ed19395c5d --- /dev/null +++ b/pkgs/development/python-modules/microdata/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, html5lib +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "microdata"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "edsu"; + repo = "microdata"; + rev = "v${version}"; + sha256 = "sha256-BAygCLBLxZ033ZWRFSR52dSM2nPY8jXplDXQ8WW3KPo="; + }; + + propagatedBuildInputs = [ + html5lib + ]; + + checkInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ "microdata" ]; + + meta = with lib; { + description = "Library for extracting html microdata"; + homepage = "https://github.com/edsu/microdata"; + license = licenses.cc0; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b47d55ad0e55..66d1af78f3b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5712,6 +5712,8 @@ in { micawber = callPackage ../development/python-modules/micawber { }; + microdata = callPackage ../development/python-modules/microdata { }; + midiutil = callPackage ../development/python-modules/midiutil { }; mido = callPackage ../development/python-modules/mido { }; From f0b2aba79ca45a0b79b043d11800e300bb1e4bf5 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 28 Nov 2021 15:39:29 +0100 Subject: [PATCH 048/269] python310Packages.html-text: init at 0.5.2 --- .../python-modules/html-text/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/html-text/default.nix diff --git a/pkgs/development/python-modules/html-text/default.nix b/pkgs/development/python-modules/html-text/default.nix new file mode 100644 index 000000000000..997cf053a5f7 --- /dev/null +++ b/pkgs/development/python-modules/html-text/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, lxml +, six +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "html-text"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "TeamHG-Memex"; + repo = "html-text"; + rev = version; + sha256 = "sha256-jw/hpz0QfcgP5OEJcmre0h1OzOfpPtaROxHm+YUqces="; + }; + + propagatedBuildInputs = [ + lxml + ]; + + checkInputs = [ + pytestCheckHook + six + ]; + + pythonImportsCheck = [ "html_text" ]; + + meta = with lib; { + description = "Extract text from HTML"; + homepage = "https://github.com/TeamHG-Memex/html-text"; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 66d1af78f3b6..bc113f821504 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4301,6 +4301,8 @@ in { html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; + html-text = callPackage ../development/python-modules/html-text { }; + HTSeq = callPackage ../development/python-modules/HTSeq { }; httmock = callPackage ../development/python-modules/httmock { }; From ac7c5852e58ff738895077979b87f34951da94b6 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 28 Nov 2021 15:53:52 +0100 Subject: [PATCH 049/269] python310Packages.mf2py: init at 1.1.2 --- .../python-modules/mf2py/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/mf2py/default.nix diff --git a/pkgs/development/python-modules/mf2py/default.nix b/pkgs/development/python-modules/mf2py/default.nix new file mode 100644 index 000000000000..110da8e60f8f --- /dev/null +++ b/pkgs/development/python-modules/mf2py/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, beautifulsoup4 +, html5lib +, requests +, lxml +, mock +, nose +}: + +buildPythonPackage rec { + pname = "mf2py"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "microformats"; + repo = "mf2py"; + rev = version; + sha256 = "sha256-9pAD/eCmc/l7LGmKixDhZy3hhj1jCmcyo9wbqgtz/wI="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + html5lib + requests + ]; + + checkInputs = [ + lxml + mock + nose + ]; + + pythonImportsCheck = [ "mf2py" ]; + + meta = with lib; { + description = "Microformats2 parser written in Python"; + homepage = "https://microformats.org/wiki/mf2py"; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc113f821504..642939177b10 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5712,6 +5712,8 @@ in { mezzanine = callPackage ../development/python-modules/mezzanine { }; + mf2py = callPackage ../development/python-modules/mf2py { }; + micawber = callPackage ../development/python-modules/micawber { }; microdata = callPackage ../development/python-modules/microdata { }; From 8c3ae3902d6c87c65cb7f5b90a66ac18cb61e6c4 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 28 Nov 2021 16:02:32 +0100 Subject: [PATCH 050/269] python310Packages.pyrdfa3: init at 3.5.3 --- .../python-modules/pyrdfa3/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/pyrdfa3/default.nix diff --git a/pkgs/development/python-modules/pyrdfa3/default.nix b/pkgs/development/python-modules/pyrdfa3/default.nix new file mode 100644 index 000000000000..97768e7fed50 --- /dev/null +++ b/pkgs/development/python-modules/pyrdfa3/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, rdflib +, html5lib +}: + +buildPythonPackage rec { + pname = "pyrdfa3"; + version = "3.5.3"; + disabled = isPy27; + + src = fetchPypi { + inherit version; + pname = "pyRdfa3"; + sha256 = "sha256-FXZjqSuH3zRbb2m94jXf9feXiRYI4S/h5PqNrWhxMa4="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "'html = pyRdfa.rdflibparsers:StructuredDataParser'" "'html = pyRdfa.rdflibparsers:StructuredDataParser'," \ + --replace "'hturtle = pyRdfa.rdflibparsers:HTurtleParser'" "'hturtle = pyRdfa.rdflibparsers:HTurtleParser'," + ''; + + propagatedBuildInputs = [ + rdflib + html5lib + ]; + + # Does not work with python3 + doCheck = false; + + pythonImportsCheck = [ "pyRdfa" ]; + + meta = with lib; { + description = "RDFa 1.1 distiller/parser library"; + homepage = "https://www.w3.org/2012/pyRdfa/"; + license = licenses.w3c; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 642939177b10..80911fa28a81 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7017,6 +7017,8 @@ in { pypoolstation = callPackage ../development/python-modules/pypoolstation { }; + pyrdfa3 = callPackage ../development/python-modules/pyrdfa3 { }; + pyrevolve = callPackage ../development/python-modules/pyrevolve { }; pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { }; From 48919bc2246e23673b322dd02c347473cc67380d Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 28 Nov 2021 15:34:49 +0100 Subject: [PATCH 051/269] python310Packages.extruct: init at 0.13.0 --- .../python-modules/extruct/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/extruct/default.nix diff --git a/pkgs/development/python-modules/extruct/default.nix b/pkgs/development/python-modules/extruct/default.nix new file mode 100644 index 000000000000..39591ac55fa2 --- /dev/null +++ b/pkgs/development/python-modules/extruct/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonRelaxDepsHook +, html-text +, jstyleson +, lxml +, mf2py +, pyrdfa3 +, rdflib +, six +, w3lib +, pytestCheckHook +, mock +}: + +buildPythonPackage rec { + pname = "extruct"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "scrapinghub"; + repo = "extruct"; + rev = "v${version}"; + sha256 = "sha256-hf6b/tZLggHzgFmZ6aldZIBd17Ni7vCTIIzhNlyjvxw="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + # rdflib-jsonld functionality is part of rdblib from version 6 onwards + pythonRemoveDeps = [ + "rdflib-jsonld" + ]; + + propagatedBuildInputs = [ + html-text + jstyleson + lxml + mf2py + pyrdfa3 + rdflib + six + w3lib + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "extruct" ]; + + meta = with lib; { + description = "Extract embedded metadata from HTML markup"; + homepage = "https://github.com/scrapinghub/extruct"; + license = licenses.bsd3; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80911fa28a81..33ea0833e9c1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3138,6 +3138,8 @@ in { extras = callPackage ../development/python-modules/extras { }; + extruct = callPackage ../development/python-modules/extruct { }; + eyeD3 = callPackage ../development/python-modules/eyed3 { }; ezdxf = callPackage ../development/python-modules/ezdxf { }; From d1710a21fc463437d6396b481882c86f07f75050 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 28 Nov 2021 17:25:27 +0100 Subject: [PATCH 052/269] python310Packages.language-tags: init at 1.1.0 --- .../python-modules/language-tags/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/language-tags/default.nix diff --git a/pkgs/development/python-modules/language-tags/default.nix b/pkgs/development/python-modules/language-tags/default.nix new file mode 100644 index 000000000000..ea3be88335c9 --- /dev/null +++ b/pkgs/development/python-modules/language-tags/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "language-tags"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "OnroerendErfgoed"; + repo = "language-tags"; + rev = version; + sha256 = "sha256-4Ira3EMS64AM8I3SLmUm+m6V5vwtDYf8WDmVDvI+ZOw="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "language_tags" ]; + + meta = with lib; { + description = "Dealing with IANA language tags in Python"; + homepage = "https://language-tags.readthedocs.io/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 33ea0833e9c1..b55acb84ff49 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5085,6 +5085,8 @@ in { language-data = callPackage ../development/python-modules/language-data { }; + language-tags = callPackage ../development/python-modules/language-tags { }; + lark = callPackage ../development/python-modules/lark { }; latexcodec = callPackage ../development/python-modules/latexcodec { }; From c9185dbf9189452c543d93e3888b2cc4445dbc69 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 28 Nov 2021 15:28:42 +0100 Subject: [PATCH 053/269] python310Packages.recipe-scrapers: init at 14.14.0 --- .../recipe-scrapers/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/recipe-scrapers/default.nix diff --git a/pkgs/development/python-modules/recipe-scrapers/default.nix b/pkgs/development/python-modules/recipe-scrapers/default.nix new file mode 100644 index 000000000000..897a8239f0fa --- /dev/null +++ b/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, beautifulsoup4 +, extruct +, language-tags +, regex +, requests +, pytestCheckHook +, responses +}: + +buildPythonPackage rec { + pname = "recipe-scrapers"; + version = "14.14.0"; + + src = fetchFromGitHub { + owner = "hhursev"; + repo = "recipe-scrapers"; + rev = version; + sha256 = "sha256-3qrjNd1jX4JP3qG9YX8MQqwPh8cvfkZa1tEk0uCwego="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + extruct + language-tags + regex + requests + ]; + + checkInputs = [ + pytestCheckHook + responses + ]; + + disabledTestPaths = [ + # This is not actual code, just some pre-written boiler-plate template + "templates/test_scraper.py" + ]; + + pythonImportsCheck = [ "recipe_scrapers" ]; + + meta = with lib; { + description = "Python package for scraping recipes data "; + homepage = "https://github.com/hhursev/recipe-scrapers"; + license = licenses.mit; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b55acb84ff49..b3e26f4b8e11 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9553,6 +9553,8 @@ in { recaptcha_client = callPackage ../development/python-modules/recaptcha_client { }; + recipe-scrapers = callPackage ../development/python-modules/recipe-scrapers { }; + recoll = toPythonModule (pkgs.recoll.override { python3Packages = self; }); From 81ab6b593ba7e9df0be3378587a425b0576b6a2e Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 28 Nov 2021 17:49:09 +0100 Subject: [PATCH 054/269] python310Packages.drf-writable-nested: init at 0.6.4 --- .../drf-writable-nested/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/drf-writable-nested/default.nix diff --git a/pkgs/development/python-modules/drf-writable-nested/default.nix b/pkgs/development/python-modules/drf-writable-nested/default.nix new file mode 100644 index 000000000000..77ce7d37ff8d --- /dev/null +++ b/pkgs/development/python-modules/drf-writable-nested/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, djangorestframework +, pytestCheckHook +, pytest-django +}: + +buildPythonPackage rec { + pname = "drf-writable-nested"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "beda-software"; + repo = "drf-writable-nested"; + rev = "v${version}"; + sha256 = "sha256-RybtXZ5HipQHaA2RV6TOKIpl6aI9V49mqXDhCH6lg58="; + }; + + propagatedBuildInputs = [ + django + djangorestframework + ]; + + checkInputs = [ + pytest-django + pytestCheckHook + ]; + + meta = with lib; { + description = "Writable nested model serializer for Django REST Framework"; + homepage = "https://github.com/beda-software/drf-writable-nested"; + license = licenses.bsd2; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3e26f4b8e11..de5e9c571afd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2808,6 +2808,8 @@ in { drf-spectacular-sidecar = callPackage ../development/python-modules/drf-spectacular-sidecar { }; + drf-writable-nested = callPackage ../development/python-modules/drf-writable-nested { }; + drf-yasg = callPackage ../development/python-modules/drf-yasg { }; drivelib = callPackage ../development/python-modules/drivelib { }; From f2a7a77151999ef7aa074318ca7dadc59452da5b Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 28 Nov 2021 18:45:47 +0100 Subject: [PATCH 055/269] python310Packages.django-cors-headers: 3.7.0 -> 3.13.0 --- .../python-modules/django-cors-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index ace1dc4f2de5..452c00b6e37f 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.7.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "adamchainz"; repo = "django-cors-headers"; rev = version; - sha256 = "1wc8cs1gpg9v98bq5qwnd4pcv043za50wd63gwkm86lbvjxyxynz"; + sha256 = "sha256-pIyf4poW8/slxj4PVvmXpuYp//v5w00yU0Vz6Jiy2yM="; }; propagatedBuildInputs = [ From 334ca79a7b3f0eb8a0e7d6162aae9bbd59a563b5 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 16 Sep 2022 17:40:19 +0200 Subject: [PATCH 056/269] python310Packages.django-oauth-toolkit: relax 'django' dependency --- .../python-modules/django-oauth-toolkit/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 65bf5045a035..7905c1c985fe 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonRelaxDepsHook # propagates , django @@ -39,6 +40,11 @@ buildPythonPackage rec { requests ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; + pythonRelaxDeps = [ + "django" + ]; + DJANGO_SETTINGS_MODULE = "tests.settings"; checkInputs = [ From 284e89493f5507c4fa03decaeabf9bd68b980239 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 16 Sep 2022 17:50:57 +0200 Subject: [PATCH 057/269] python310Packages.djangorestframework: fix 'collectstatic' with django 4.1 --- .../python-modules/djangorestframework/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 7feb65620265..ca81d7bd57bb 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , coreapi , django , django-guardian @@ -24,6 +25,15 @@ buildPythonPackage rec { sha256 = "sha256-XmX6DZBZYzVCe72GERplAWt5jIjV/cYercZGb0pYjoc="; }; + patches = [ + # See https://github.com/encode/django-rest-framework/issues/8608 + # and https://github.com/encode/django-rest-framework/pull/8591/ + (fetchpatch { + name = "fix-django-collect-static.patch"; + url = "https://github.com/encode/django-rest-framework/pull/8591/commits/65943bb58deba6ee1a89fe4504f270ab1806fce6.patch"; + sha256 = "sha256-wI7EzX9tlyyXAPrJEr+/2uTg7dVY98IKgh7Cc/NZo5k="; + }) + ]; propagatedBuildInputs = [ django From f4ab764c9d936e177f6835c908d685b8ac4a00f7 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Thu, 29 Sep 2022 22:40:13 +0200 Subject: [PATCH 058/269] arguments: rename name to pname&version --- pkgs/development/libraries/arguments/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/arguments/default.nix b/pkgs/development/libraries/arguments/default.nix index 85dafde83c27..bacb7662386e 100644 --- a/pkgs/development/libraries/arguments/default.nix +++ b/pkgs/development/libraries/arguments/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "arguments"; - name = "${pname}-2015-11-30"; + version = "unstable-2015-11-30"; owner = "BIC-MNI"; From 8e7161ed80a7c70df2d15c6cf37d7e3bf22a5e2d Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 30 Sep 2022 12:40:07 +0200 Subject: [PATCH 059/269] rPackages.rmarkdown: add pandoc as buildInput https://github.com/rstudio/rmarkdown/blob/main/DESCRIPTION#L91 requires pandoc from system --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 1e511534ec50..583b2bf4c3b5 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -622,6 +622,7 @@ let ncdfFlow = [ pkgs.zlib.dev ]; proj4 = [ pkgs.proj.dev ]; rtmpt = [ pkgs.gsl ]; + rmarkdown = [ pkgs.pandoc ]; mixcat = [ pkgs.gsl ]; libstableR = [ pkgs.gsl ]; landsepi = [ pkgs.gsl ]; From 2965d7774d5cbf59c1944d618b426d379e14b75c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Sep 2022 19:18:59 +0000 Subject: [PATCH 060/269] nix-prefetch-github: 5.2.1 -> 5.2.2 --- .../python-modules/nix-prefetch-github/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index d1f493d0279e..42533cfcacd8 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "5.2.1"; + version = "5.2.2"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - sha256 = "etmlRavPzJKLmyw3PYMgeMveFj4aVi38crHjdtDuaLg="; + sha256 = "sha256-+0s47YhpMojxmRHKC7kazov2ZUsOs2/Y2EmHAAcARf0="; }; checkInputs = [ unittestCheckHook git which ]; From f6e9a942863d6dd71917abb4a6e1dee3a63858ad Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 1 Oct 2022 00:30:46 +0200 Subject: [PATCH 061/269] nordzy-icon-theme: 1.6 -> 1.7 https://github.com/alvatip/Nordzy-icon/releases/tag/1.7 --- pkgs/data/icons/nordzy-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/data/icons/nordzy-icon-theme/default.nix index 28da45f4c347..23bb6564d451 100644 --- a/pkgs/data/icons/nordzy-icon-theme/default.nix +++ b/pkgs/data/icons/nordzy-icon-theme/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "nordzy-icon-theme"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "alvatip"; repo = "Nordzy-icon"; rev = version; - sha256 = "sha256-syiJL5i7JJXiSedUtaaoCnAv/6NgRtB3um7A5Sp+Pek="; + sha256 = "sha256-pyWEHP7tqg7Cca38a7cGTCx/PCQ+OqG2koxQB6PSzkA="; }; # In the post patch phase we should first make sure to patch shebangs. From 918a5d36a28328c75e37d94456591bd635137e0a Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 30 Sep 2022 20:15:58 -0300 Subject: [PATCH 062/269] sonic-lineup: mark broken * Fix bzip2 and jack issue at logs. --- pkgs/applications/audio/sonic-lineup/default.nix | 4 ++++ pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index 711444651c33..d795138a4b56 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -2,6 +2,7 @@ , libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate , libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto , wrapQtAppsHook, pkg-config +, libjack2 }: stdenv.mkDerivation rec { @@ -17,6 +18,7 @@ stdenv.mkDerivation rec { [ alsa-lib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo libmad liboggz libpulseaudio libsamplerate libsndfile lrdf opusfile portaudio rubberband serd sord capnproto + libjack2 ]; nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; @@ -34,5 +36,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.vandenoever ]; platforms = platforms.linux; + # undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.4.29' + broken = true; # at 2022-09-30 }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4987d1e06c0f..fc34aa1172c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31395,7 +31395,10 @@ with pkgs; socialscan = with python3.pkgs; toPythonApplication socialscan; - sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { stdenv = gcc10StdenvCompat; }; + sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { + bzip2 = bzip2_1_1; + stdenv = gcc10StdenvCompat; + }; sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; From 5a012749d5c57caf20e8fd89901d18ac9bbcd56c Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 30 Sep 2022 22:04:25 -0300 Subject: [PATCH 063/269] adom: mark broken --- pkgs/games/adom/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index b40a608412ef..bef9d1b42d32 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { # Please, notify me (smironov) if you need the x86 version platforms = ["x86_64-linux"]; + broken = true; # at 2022-09-30, failed download. }; } From 88eed8261dddc85d6f9708302a4004fb9183e5c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Oct 2022 03:43:14 +0000 Subject: [PATCH 064/269] xarchiver: 0.5.4.18 -> 0.5.4.19 --- pkgs/tools/archivers/xarchiver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 12d112de54a6..8862ad8030bf 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -2,14 +2,14 @@ coreutils, zip, unzip, p7zip, unar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "0.5.4.18"; + version = "0.5.4.19"; pname = "xarchiver"; src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; rev = version; - sha256 = "sha256-WBHsUMI4xl1P17aBTuxxyGOhQzOnd8ZhS/ped8nXMLA="; + sha256 = "sha256-YCfjOGbjjv4ntNDK3E49hYCVYDhMsRBJ7zsHt8hqQ7Y="; }; nativeBuildInputs = [ intltool pkg-config makeWrapper wrapGAppsHook ]; From 19a47178461e509bcd3821cea3b92e8deba20a40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 15 Sep 2022 15:32:57 -0300 Subject: [PATCH 065/269] directoryListingUpdater: init Update a package looking for available versions in an html page --- .../directory-listing-updater.nix | 19 ++++++ pkgs/common-updater/generic-updater.nix | 2 +- pkgs/common-updater/scripts.nix | 32 ++++++++- .../scripts/list-directory-versions | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 pkgs/common-updater/directory-listing-updater.nix create mode 100755 pkgs/common-updater/scripts/list-directory-versions diff --git a/pkgs/common-updater/directory-listing-updater.nix b/pkgs/common-updater/directory-listing-updater.nix new file mode 100644 index 000000000000..fb7491ab879a --- /dev/null +++ b/pkgs/common-updater/directory-listing-updater.nix @@ -0,0 +1,19 @@ +{ lib +, genericUpdater +, common-updater-scripts +}: + +{ pname ? null +, version ? null +, attrPath ? null +, ignoredVersions ? "" +, rev-prefix ? "" +, odd-unstable ? false +, patchlevel-unstable ? false +, url ? null +}: + +genericUpdater { + inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable; + versionLister = "${common-updater-scripts}/bin/list-directory-versions ${lib.optionalString (url != null) "--url=${lib.escapeShellArg url}"}"; +} diff --git a/pkgs/common-updater/generic-updater.nix b/pkgs/common-updater/generic-updater.nix index 04adcf563814..e75a6dd7ab05 100644 --- a/pkgs/common-updater/generic-updater.nix +++ b/pkgs/common-updater/generic-updater.nix @@ -62,7 +62,7 @@ let return 1 } - tags=$($version_lister --pname=$pname --attr-path=$attr_path --file="${fileForGitCommands}") || exit 1 + tags=$(sh -c "$version_lister --pname=$pname --attr-path=$attr_path --file=\"${fileForGitCommands}\"") || exit 1 # print available tags for tag in $tags; do diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix index 26c77e876362..d5ee3b58c504 100644 --- a/pkgs/common-updater/scripts.nix +++ b/pkgs/common-updater/scripts.nix @@ -1,9 +1,28 @@ -{ lib, stdenv, makeWrapper, coreutils, gnused, gnugrep, diffutils, nix, git, jq }: +{ lib +, stdenv +, makeWrapper +, coreutils +, diffutils +, git +, gnugrep +, gnused +, jq +, nix +, python3Packages +}: stdenv.mkDerivation { name = "common-updater-scripts"; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + python3Packages.wrapPython + ]; + + pythonPath = [ + python3Packages.beautifulsoup4 + python3Packages.requests + ]; dontUnpack = true; @@ -11,8 +30,15 @@ stdenv.mkDerivation { mkdir -p $out/bin cp ${./scripts}/* $out/bin + # wrap non python scripts for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${lib.makeBinPath [ coreutils gnused gnugrep nix diffutils git jq ]} + if ! (head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'); then + wrapProgram $f --prefix PATH : ${lib.makeBinPath [ coreutils diffutils git gnugrep gnused jq nix ]} + fi done + + # wrap python scripts + makeWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ nix ]}" ) + wrapPythonPrograms ''; } diff --git a/pkgs/common-updater/scripts/list-directory-versions b/pkgs/common-updater/scripts/list-directory-versions new file mode 100755 index 000000000000..46c9e9d30a5d --- /dev/null +++ b/pkgs/common-updater/scripts/list-directory-versions @@ -0,0 +1,65 @@ +#!/usr/bin/env python + +import argparse +import requests +import os +import subprocess +import json +import re +from bs4 import BeautifulSoup + +parser = argparse.ArgumentParser( + description="Get all available versions listed for a package in a site." +) + +parser.add_argument( + "--pname", + default=os.environ.get("UPDATE_NIX_PNAME"), + required="UPDATE_NIX_PNAME" not in os.environ, + help="name of the package", +) +parser.add_argument( + "--attr-path", + default=os.environ.get("UPDATE_NIX_ATTR_PATH"), + help="attribute path of the package", +) +parser.add_argument("--url", help="url of the page that lists the package versions") +parser.add_argument("--file", help="file name for writing debugging information") + + +if __name__ == "__main__": + args = parser.parse_args() + + pname = args.pname + + attr_path = args.attr_path or pname + + url = args.url or json.loads( + subprocess.check_output( + [ + "nix-instantiate", + "--json", + "--eval", + "-E", + f"with import ./. {{}}; dirOf (lib.head {attr_path}.src.urls)", + ], + text=True, + ) + ) + + # print a debugging message + if args.file: + with open(args.file, "a") as f: + f.write(f"# Listing versions for {pname} from {url}\n") + + page = requests.get(url) + soup = BeautifulSoup(page.content, "html.parser") + links = soup.find_all("a") + for link in links: + link_url = link.get("href", None) + if link_url is not None: + match = re.fullmatch( + rf"{args.pname}-([\d.]+?(-[\d\w.-]+?)?)(\.tar)?(\.[^.]*)", link_url + ) + if match: + print(match.group(1)) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 295e50ee13fc..a6dd4b5b1e60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -126,6 +126,8 @@ with pkgs; _experimental-update-script-combinators = callPackage ../common-updater/combinators.nix { }; + directoryListingUpdater = callPackage ../common-updater/directory-listing-updater.nix { }; + gitUpdater = callPackage ../common-updater/git-updater.nix { }; httpTwoLevelsUpdater = callPackage ../common-updater/http-two-levels-updater.nix { }; From 0b9c39e819f7cd10817ee144cd316d2444e98b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 30 Sep 2022 10:04:43 -0300 Subject: [PATCH 066/269] gitUpdater: fix variable default value --- pkgs/common-updater/scripts/list-git-tags | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/common-updater/scripts/list-git-tags b/pkgs/common-updater/scripts/list-git-tags index 186dfd5ea6d4..703e71438a71 100755 --- a/pkgs/common-updater/scripts/list-git-tags +++ b/pkgs/common-updater/scripts/list-git-tags @@ -31,7 +31,7 @@ while (( $# > 0 )); do done if [[ -z "$pname" ]]; then - pname="$UPDATE_NIX_NAME" + pname="$UPDATE_NIX_PNAME" fi if [[ -z "$attr_path" ]]; then From a15e083372a19aaa04b4a8ce4c36be52295bfe42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 30 Sep 2022 09:59:29 -0300 Subject: [PATCH 067/269] httpTwoLevelsUpdater: fix variable default value --- pkgs/common-updater/http-two-levels-updater.nix | 2 +- pkgs/common-updater/scripts/list-archive-two-levels-versions | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/common-updater/http-two-levels-updater.nix b/pkgs/common-updater/http-two-levels-updater.nix index 8ece1161015c..4656163c18a3 100644 --- a/pkgs/common-updater/http-two-levels-updater.nix +++ b/pkgs/common-updater/http-two-levels-updater.nix @@ -15,5 +15,5 @@ genericUpdater { inherit pname version attrPath ignoredVersions rev-prefix odd-unstable patchlevel-unstable; - versionLister = "${common-updater-scripts}/bin/list-archive-two-levels-versions ${lib.optionalString (url != null) "--url=${url}"}"; + versionLister = "${common-updater-scripts}/bin/list-archive-two-levels-versions ${lib.optionalString (url != null) "--url=${lib.escapeShellArg url}"}"; } diff --git a/pkgs/common-updater/scripts/list-archive-two-levels-versions b/pkgs/common-updater/scripts/list-archive-two-levels-versions index 11db08ad07b8..e7c02ed90b06 100755 --- a/pkgs/common-updater/scripts/list-archive-two-levels-versions +++ b/pkgs/common-updater/scripts/list-archive-two-levels-versions @@ -4,7 +4,7 @@ pname="" # package name attr_path="" # package attribute path -url="" # directory list url +url="" # directory listing url file="" # file for writing debugging information while (( $# > 0 )); do @@ -31,7 +31,7 @@ while (( $# > 0 )); do done if [[ -z "$pname" ]]; then - pname="$UPDATE_NIX_NAME" + pname="$UPDATE_NIX_PNAME" fi if [[ -z "$attr_path" ]]; then From 767b1fd5da953432779e6c684f4b93b7fb4fcac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 30 Sep 2022 10:45:35 -0300 Subject: [PATCH 068/269] enlightenment.enlightenment: add update script --- pkgs/desktops/enlightenment/enlightenment/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 52c4a0719d03..7818df245f69 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -14,10 +14,10 @@ , pam , xkeyboard_config , udisks2 - , waylandSupport ? false, wayland-protocols, xwayland , bluetoothSupport ? true, bluez5 , pulseSupport ? !stdenv.isDarwin, libpulseaudio +, directoryListingUpdater }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { version = "0.25.4"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; + url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; sha256 = "sha256-VttdIGuCG5qIMdJucT5BCscLIlWm9D/N98Ae794jt6I="; }; @@ -71,6 +71,8 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "enlightenment" ]; + passthru.updateScript = directoryListingUpdater { }; + meta = with lib; { description = "The Compositing Window Manager and Desktop Shell"; homepage = "https://www.enlightenment.org"; From c5b04c91442728619ec2ac4e192e5400621147c4 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Sat, 1 Oct 2022 12:58:22 -0400 Subject: [PATCH 069/269] firefox: address automated review comments --- .../applications/networking/browsers/firefox-bin/default.nix | 5 +++-- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 5d221a9c70c2..d6b78a90fecf 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -144,14 +144,15 @@ stdenv.mkDerivation { inherit gtk3; - buildInputs = [ wrapGAppsHook gtk3 adwaita-icon-theme ]; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ gtk3 adwaita-icon-theme ]; # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 dontStrip = true; dontPatchELF = true; - patchPhase = '' + postPatch = '' # Don't download updates from Mozilla directly echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js ''; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 3e20e6158c97..e09bbef871b5 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem, makeWrapper, makeBinaryWrapper, lndir, config -, fetchurl, zip, unzip, jq, xdg-utils, writeText +, jq, xdg-utils, writeText ## various stuff that can be plugged in , ffmpeg_5, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify, opensc From 919ac6f91fe4096aac1526b211ea0c5573bfbebb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Oct 2022 21:16:23 +0200 Subject: [PATCH 070/269] clairvoyance: init at 2.0.4 --- pkgs/tools/security/clairvoyance/default.nix | 51 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/tools/security/clairvoyance/default.nix diff --git a/pkgs/tools/security/clairvoyance/default.nix b/pkgs/tools/security/clairvoyance/default.nix new file mode 100644 index 000000000000..6d4fc13ed468 --- /dev/null +++ b/pkgs/tools/security/clairvoyance/default.nix @@ -0,0 +1,51 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "clairvoyance"; + version = "2.0.4"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "nikitastupin"; + repo = pname; + rev = "v${version}"; + hash = "sha256-b69a3UTRt5axTSjLcEYkqGe7bFlQKCiMzoNtw91HCyI="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + aiohttp + ]; + + checkInputs = with python3.pkgs; [ + aiounittest + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'asyncio = "^3.4.3"' "" + ''; + + pythonImportsCheck = [ + "clairvoyance" + ]; + + disabledTests = [ + # KeyError + "test_probe_typename" + ]; + + meta = with lib; { + description = "Tool to obtain GraphQL API schemas"; + homepage = "https://github.com/nikitastupin/clairvoyance"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a1f9f0d7966..427ead7f76b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2376,6 +2376,8 @@ with pkgs; clair = callPackage ../tools/admin/clair { }; + clairvoyance = callPackage ../tools/security/clairvoyance { }; + cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; cloudfox = callPackage ../tools/security/cloudfox { }; From 8c0453705721d167247bc9934492fa09d5eb18fe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 2 Oct 2022 00:25:08 +0200 Subject: [PATCH 071/269] dirstalk: init at 1.3.3 --- pkgs/tools/security/dirstalk/default.nix | 36 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/security/dirstalk/default.nix diff --git a/pkgs/tools/security/dirstalk/default.nix b/pkgs/tools/security/dirstalk/default.nix new file mode 100644 index 000000000000..59ad831b7a1e --- /dev/null +++ b/pkgs/tools/security/dirstalk/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "dirstalk"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "stefanoj3"; + repo = pname; + rev = version; + hash = "sha256-gSMkTGzMDI+scG3FQ0u0liUDL4qOPPW2UWLlAQcmmaA="; + }; + + vendorHash = "sha256-nesKIaMMuN71LpvX8nOm7hDecgGjnx3tmsinrJg4GpQ="; + + subPackages = "cmd/dirstalk"; + + ldflags = [ + "-w" + "-s" + "-X github.com/stefanoj3/dirstalk/pkg/cmd.Version=${version}" + ]; + + # Tests want to write to the root directory + doCheck = false; + + meta = with lib; { + description = "Tool to brute force paths on web servers"; + homepage = "https://github.com/stefanoj3/dirstalk"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbcaac916526..f7122c05c9b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3674,6 +3674,8 @@ with pkgs; direnv = callPackage ../tools/misc/direnv { }; + dirstalk = callPackage ../tools/security/dirstalk { }; + h = callPackage ../tools/misc/h { }; discount = callPackage ../tools/text/discount { }; From 51f5c65914d2adf62907e3fd95acb5d8da3ee076 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 5 Sep 2022 00:41:42 -0700 Subject: [PATCH 072/269] gnupg: unbreak builds without tpm2-tss Builds without tpm2-tss no longer seem to work after #183753. This PR fixes that. --- pkgs/tools/security/gnupg/23.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gnupg/23.nix b/pkgs/tools/security/gnupg/23.nix index cb11e9f7eab6..0b7941ce46e1 100644 --- a/pkgs/tools/security/gnupg/23.nix +++ b/pkgs/tools/security/gnupg/23.nix @@ -2,8 +2,9 @@ , libgpg-error, libiconv, npth, gettext, texinfo, buildPackages , guiSupport ? stdenv.isDarwin, enableMinimal ? false , adns, bzip2, gnutls, libusb1, openldap -, tpm2-tss, pinentry, readline, sqlite, zlib +, pinentry, readline, sqlite, zlib , withPcsc ? !enableMinimal, pcsclite +, withTpm2Tss ? !stdenv.isDarwin && !enableMinimal, tpm2-tss }: assert guiSupport -> enableMinimal == false; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { libgcrypt libassuan libksba libiconv npth gettext ] ++ lib.optionals (!enableMinimal) ([ readline libusb1 gnutls adns openldap zlib bzip2 sqlite - ] ++ lib.optional (!stdenv.isDarwin) tpm2-tss); + ] ++ lib.optional withTpm2Tss tpm2-tss); patches = [ ./fix-libusb-include-path.patch @@ -56,7 +57,7 @@ stdenv.mkDerivation rec { "--with-ksba-prefix=${libksba.dev}" "--with-npth-prefix=${npth}" ] ++ lib.optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}" - ++ lib.optional ((!stdenv.isDarwin) && (!enableMinimal)) "--with-tss=intel"; + ++ lib.optional withTpm2Tss "--with-tss=intel"; postInstall = if enableMinimal then '' rm -r $out/{libexec,sbin,share} From eefaaf41d67ea28c3f70150958f6a29533dce709 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 24 Jul 2022 20:49:05 +0200 Subject: [PATCH 073/269] kubo: rename from ipfs Go-IPFS was renamed to Kubo in version 0.14.0, see https://github.com/ipfs/kubo/issues/8959. --- nixos/modules/module-list.nix | 2 +- .../{ipfs.nix => kubo.nix} | 65 +++++++++++++------ nixos/tests/all-tests.nix | 2 +- nixos/tests/{ipfs.nix => kubo.nix} | 6 +- .../networking/ipfs-migrator/default.nix | 23 ------- .../all-migrations.nix | 12 ++-- .../networking/kubo-migrator/default.nix | 23 +++++++ .../unwrapped.nix | 4 +- .../networking/{ipfs => kubo}/default.nix | 15 +++-- .../python-modules/ipfshttpclient/default.nix | 4 +- .../python-modules/ipwhl/default.nix | 4 +- pkgs/top-level/aliases.nix | 4 ++ pkgs/top-level/all-packages.nix | 15 +++-- 13 files changed, 104 insertions(+), 75 deletions(-) rename nixos/modules/services/network-filesystems/{ipfs.nix => kubo.nix} (75%) rename nixos/tests/{ipfs.nix => kubo.nix} (96%) delete mode 100644 pkgs/applications/networking/ipfs-migrator/default.nix rename pkgs/applications/networking/{ipfs-migrator => kubo-migrator}/all-migrations.nix (87%) create mode 100644 pkgs/applications/networking/kubo-migrator/default.nix rename pkgs/applications/networking/{ipfs-migrator => kubo-migrator}/unwrapped.nix (89%) rename pkgs/applications/networking/{ipfs => kubo}/default.nix (86%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dec66e395aad..edde5d6ab6d4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -721,7 +721,7 @@ ./services/network-filesystems/drbd.nix ./services/network-filesystems/glusterfs.nix ./services/network-filesystems/kbfs.nix - ./services/network-filesystems/ipfs.nix + ./services/network-filesystems/kubo.nix ./services/network-filesystems/litestream/default.nix ./services/network-filesystems/netatalk.nix ./services/network-filesystems/nfsd.nix diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/kubo.nix similarity index 75% rename from nixos/modules/services/network-filesystems/ipfs.nix rename to nixos/modules/services/network-filesystems/kubo.nix index b9cf9ea882ff..9942e4e41ad6 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -1,9 +1,9 @@ { config, lib, pkgs, utils, ... }: with lib; let - cfg = config.services.ipfs; + cfg = config.services.kubo; - ipfsFlags = utils.escapeSystemdExecArgs ( + kuboFlags = utils.escapeSystemdExecArgs ( optional cfg.autoMount "--mount" ++ optional cfg.enableGC "--enable-gc" ++ optional (cfg.serviceFdlimit != null) "--manage-fdlimit=false" ++ @@ -50,27 +50,27 @@ in options = { - services.ipfs = { + services.kubo = { enable = mkEnableOption (lib.mdDoc "Interplanetary File System (WARNING: may cause severe network degredation)"); package = mkOption { type = types.package; - default = pkgs.ipfs; - defaultText = literalExpression "pkgs.ipfs"; - description = lib.mdDoc "Which IPFS package to use."; + default = pkgs.kubo; + defaultText = literalExpression "pkgs.kubo"; + description = lib.mdDoc "Which Kubo package to use."; }; user = mkOption { type = types.str; default = "ipfs"; - description = lib.mdDoc "User under which the IPFS daemon runs"; + description = lib.mdDoc "User under which the Kubo daemon runs"; }; group = mkOption { type = types.str; default = "ipfs"; - description = lib.mdDoc "Group under which the IPFS daemon runs"; + description = lib.mdDoc "Group under which the Kubo daemon runs"; }; dataDir = mkOption { @@ -84,7 +84,7 @@ in then "/var/lib/ipfs" else "/var/lib/ipfs/.ipfs" ''; - description = lib.mdDoc "The data dir for IPFS"; + description = lib.mdDoc "The data dir for Kubo"; }; defaultMode = mkOption { @@ -96,13 +96,13 @@ in autoMount = mkOption { type = types.bool; default = false; - description = lib.mdDoc "Whether IPFS should try to mount /ipfs and /ipns at startup."; + description = lib.mdDoc "Whether Kubo should try to mount /ipfs and /ipns at startup."; }; autoMigrate = mkOption { type = types.bool; default = true; - description = lib.mdDoc "Whether IPFS should try to run the fs-repo-migration at startup."; + description = lib.mdDoc "Whether Kubo should try to run the fs-repo-migration at startup."; }; ipfsMountDir = mkOption { @@ -126,7 +126,7 @@ in apiAddress = mkOption { type = types.str; default = "/ip4/127.0.0.1/tcp/5001"; - description = lib.mdDoc "Where IPFS exposes its API to"; + description = lib.mdDoc "Where Kubo exposes its API to"; }; swarmAddress = mkOption { @@ -137,7 +137,7 @@ in "/ip4/0.0.0.0/udp/4001/quic" "/ip6/::/udp/4001/quic" ]; - description = lib.mdDoc "Where IPFS listens for incoming p2p connections"; + description = lib.mdDoc "Where Kubo listens for incoming p2p connections"; }; enableGC = mkOption { @@ -174,14 +174,14 @@ in extraFlags = mkOption { type = types.listOf types.str; - description = lib.mdDoc "Extra flags passed to the IPFS daemon"; + description = lib.mdDoc "Extra flags passed to the Kubo daemon"; default = [ ]; }; localDiscovery = mkOption { type = types.bool; - description = lib.mdDoc ''Whether to enable local discovery for the ipfs daemon. - This will allow ipfs to scan ports on your local network. Some hosting services will ban you if you do this. + description = lib.mdDoc ''Whether to enable local discovery for the Kubo daemon. + This will allow Kubo to scan ports on your local network. Some hosting services will ban you if you do this. ''; default = false; }; @@ -189,14 +189,14 @@ in serviceFdlimit = mkOption { type = types.nullOr types.int; default = null; - description = lib.mdDoc "The fdlimit for the IPFS systemd unit or `null` to have the daemon attempt to manage it"; + description = lib.mdDoc "The fdlimit for the Kubo systemd unit or `null` to have the daemon attempt to manage it"; example = 64 * 1024; }; startWhenNeeded = mkOption { type = types.bool; default = false; - description = lib.mdDoc "Whether to use socket activation to start IPFS when needed."; + description = lib.mdDoc "Whether to use socket activation to start Kubo when needed."; }; }; @@ -223,7 +223,7 @@ in uid = config.ids.uids.ipfs; description = "IPFS daemon user"; packages = [ - pkgs.ipfs-migrator + pkgs.kubo-migrator ]; }; }; @@ -255,7 +255,7 @@ in # After an unclean shutdown this file may exist which will cause the config command to attempt to talk to the daemon. This will hang forever if systemd is holding our sockets open. rm -vf "$IPFS_PATH/api" '' + optionalString cfg.autoMigrate '' - ${pkgs.ipfs-migrator}/bin/fs-repo-migrations -to '${cfg.package.repoVersion}' -y + ${pkgs.kubo-migrator}/bin/fs-repo-migrations -to '${cfg.package.repoVersion}' -y '' + '' ipfs --offline config profile apply ${profile} >/dev/null fi @@ -279,7 +279,7 @@ in | ipfs --offline config replace - ''; serviceConfig = { - ExecStart = [ "" "${cfg.package}/bin/ipfs daemon ${ipfsFlags}" ]; + ExecStart = [ "" "${cfg.package}/bin/ipfs daemon ${kuboFlags}" ]; User = cfg.user; Group = cfg.group; StateDirectory = ""; @@ -320,4 +320,27 @@ in meta = { maintainers = with lib.maintainers; [ Luflosi ]; }; + + imports = [ + (mkRenamedOptionModule [ "services" "ipfs" "enable" ] [ "services" "kubo" "enable" ]) + (mkRenamedOptionModule [ "services" "ipfs" "package" ] [ "services" "kubo" "package" ]) + (mkRenamedOptionModule [ "services" "ipfs" "user" ] [ "services" "kubo" "user" ]) + (mkRenamedOptionModule [ "services" "ipfs" "group" ] [ "services" "kubo" "group" ]) + (mkRenamedOptionModule [ "services" "ipfs" "dataDir" ] [ "services" "kubo" "dataDir" ]) + (mkRenamedOptionModule [ "services" "ipfs" "defaultMode" ] [ "services" "kubo" "defaultMode" ]) + (mkRenamedOptionModule [ "services" "ipfs" "autoMount" ] [ "services" "kubo" "autoMount" ]) + (mkRenamedOptionModule [ "services" "ipfs" "autoMigrate" ] [ "services" "kubo" "autoMigrate" ]) + (mkRenamedOptionModule [ "services" "ipfs" "ipfsMountDir" ] [ "services" "kubo" "ipfsMountDir" ]) + (mkRenamedOptionModule [ "services" "ipfs" "ipnsMountDir" ] [ "services" "kubo" "ipnsMountDir" ]) + (mkRenamedOptionModule [ "services" "ipfs" "gatewayAddress" ] [ "services" "kubo" "gatewayAddress" ]) + (mkRenamedOptionModule [ "services" "ipfs" "apiAddress" ] [ "services" "kubo" "apiAddress" ]) + (mkRenamedOptionModule [ "services" "ipfs" "swarmAddress" ] [ "services" "kubo" "swarmAddress" ]) + (mkRenamedOptionModule [ "services" "ipfs" "enableGC" ] [ "services" "kubo" "enableGC" ]) + (mkRenamedOptionModule [ "services" "ipfs" "emptyRepo" ] [ "services" "kubo" "emptyRepo" ]) + (mkRenamedOptionModule [ "services" "ipfs" "extraConfig" ] [ "services" "kubo" "extraConfig" ]) + (mkRenamedOptionModule [ "services" "ipfs" "extraFlags" ] [ "services" "kubo" "extraFlags" ]) + (mkRenamedOptionModule [ "services" "ipfs" "localDiscovery" ] [ "services" "kubo" "localDiscovery" ]) + (mkRenamedOptionModule [ "services" "ipfs" "serviceFdlimit" ] [ "services" "kubo" "serviceFdlimit" ]) + (mkRenamedOptionModule [ "services" "ipfs" "startWhenNeeded" ] [ "services" "kubo" "startWhenNeeded" ]) + ]; } diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 36c51b573100..efe1f10707c7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -284,7 +284,6 @@ in { installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix {}; invoiceplane = handleTest ./invoiceplane.nix {}; iodine = handleTest ./iodine.nix {}; - ipfs = handleTest ./ipfs.nix {}; ipv6 = handleTest ./ipv6.nix {}; iscsi-multipath-root = handleTest ./iscsi-multipath-root.nix {}; iscsi-root = handleTest ./iscsi-root.nix {}; @@ -317,6 +316,7 @@ in { ksm = handleTest ./ksm.nix {}; kthxbye = handleTest ./kthxbye.nix {}; kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {}; + kubo = handleTest ./kubo.nix {}; ladybird = handleTest ./ladybird.nix {}; languagetool = handleTest ./languagetool.nix {}; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; diff --git a/nixos/tests/ipfs.nix b/nixos/tests/kubo.nix similarity index 96% rename from nixos/tests/ipfs.nix rename to nixos/tests/kubo.nix index 024822745ada..e84a873a1a18 100644 --- a/nixos/tests/ipfs.nix +++ b/nixos/tests/kubo.nix @@ -1,11 +1,11 @@ import ./make-test-python.nix ({ pkgs, ...} : { - name = "ipfs"; + name = "kubo"; meta = with pkgs.lib.maintainers; { maintainers = [ mguentner ]; }; nodes.machine = { ... }: { - services.ipfs = { + services.kubo = { enable = true; # Also will add a unix domain socket socket API address, see module. startWhenNeeded = true; @@ -15,7 +15,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; nodes.fuse = { ... }: { - services.ipfs = { + services.kubo = { enable = true; apiAddress = "/ip4/127.0.0.1/tcp/2324"; autoMount = true; diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix deleted file mode 100644 index d8c5de150bb3..000000000000 --- a/pkgs/applications/networking/ipfs-migrator/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, buildEnv -, makeWrapper -, ipfs-migrator-unwrapped -, ipfs-migrator-all-fs-repo-migrations -}: - -buildEnv { - name = "ipfs-migrator-${ipfs-migrator-unwrapped.version}"; - - nativeBuildInputs = [ makeWrapper ]; - - paths = [ ipfs-migrator-unwrapped ]; - - pathsToLink = [ "/bin" ]; - - postBuild = '' - wrapProgram "$out/bin/fs-repo-migrations" \ - --prefix PATH ':' '${lib.makeBinPath [ ipfs-migrator-all-fs-repo-migrations ]}' - ''; - - inherit (ipfs-migrator-unwrapped) meta; -} diff --git a/pkgs/applications/networking/ipfs-migrator/all-migrations.nix b/pkgs/applications/networking/kubo-migrator/all-migrations.nix similarity index 87% rename from pkgs/applications/networking/ipfs-migrator/all-migrations.nix rename to pkgs/applications/networking/kubo-migrator/all-migrations.nix index a376e9f895b1..a9197c9db5fb 100644 --- a/pkgs/applications/networking/ipfs-migrator/all-migrations.nix +++ b/pkgs/applications/networking/kubo-migrator/all-migrations.nix @@ -2,23 +2,23 @@ , stdenv , symlinkJoin , buildGoModule -, ipfs-migrator-unwrapped +, kubo-migrator-unwrapped }: # This package contains all the individual migrations in the bin directory. -# This is used by fs-repo-migrations and could also be used by IPFS itself +# This is used by fs-repo-migrations and could also be used by Kubo itself # when starting it like this: ipfs daemon --migrate let fs-repo-common = pname: version: buildGoModule { inherit pname version; - inherit (ipfs-migrator-unwrapped) src; + inherit (kubo-migrator-unwrapped) src; sourceRoot = "source/${pname}"; vendorSha256 = null; doCheck = false; - meta = ipfs-migrator-unwrapped.meta // { + meta = kubo-migrator-unwrapped.meta // { mainProgram = pname; - description = "Individual migration for the filesystem repository of ipfs clients"; + description = "Individual migration for the filesystem repository of Kubo clients"; }; }; @@ -58,6 +58,6 @@ let in symlinkJoin { - name = "ipfs-migrator-all-fs-repo-migrations-${version}"; + name = "kubo-migrator-all-fs-repo-migrations-${version}"; paths = all-migrations; } diff --git a/pkgs/applications/networking/kubo-migrator/default.nix b/pkgs/applications/networking/kubo-migrator/default.nix new file mode 100644 index 000000000000..e45cbf84d524 --- /dev/null +++ b/pkgs/applications/networking/kubo-migrator/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildEnv +, makeWrapper +, kubo-migrator-unwrapped +, kubo-migrator-all-fs-repo-migrations +}: + +buildEnv { + name = "kubo-migrator-${kubo-migrator-unwrapped.version}"; + + nativeBuildInputs = [ makeWrapper ]; + + paths = [ kubo-migrator-unwrapped ]; + + pathsToLink = [ "/bin" ]; + + postBuild = '' + wrapProgram "$out/bin/fs-repo-migrations" \ + --prefix PATH ':' '${lib.makeBinPath [ kubo-migrator-all-fs-repo-migrations ]}' + ''; + + inherit (kubo-migrator-unwrapped) meta; +} diff --git a/pkgs/applications/networking/ipfs-migrator/unwrapped.nix b/pkgs/applications/networking/kubo-migrator/unwrapped.nix similarity index 89% rename from pkgs/applications/networking/ipfs-migrator/unwrapped.nix rename to pkgs/applications/networking/kubo-migrator/unwrapped.nix index c8ade793218f..a99ab2b2cbb6 100644 --- a/pkgs/applications/networking/ipfs-migrator/unwrapped.nix +++ b/pkgs/applications/networking/kubo-migrator/unwrapped.nix @@ -4,7 +4,7 @@ }: buildGoModule rec { - pname = "ipfs-migrator"; + pname = "kubo-migrator"; version = "2.0.2"; src = fetchFromGitHub { @@ -26,7 +26,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "Migrations for the filesystem repository of ipfs clients"; + description = "Migrations for the filesystem repository of Kubo clients"; homepage = "https://github.com/ipfs/fs-repo-migrations"; license = licenses.mit; maintainers = with maintainers; [ Luflosi elitak ]; diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/kubo/default.nix similarity index 86% rename from pkgs/applications/networking/ipfs/default.nix rename to pkgs/applications/networking/kubo/default.nix index 6054bca1d8ad..dc6f1edd574d 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchurl, nixosTests, openssl, pkg-config }: buildGoModule rec { - pname = "ipfs"; + pname = "kubo"; version = "0.15.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; - passthru.repoVersion = "12"; # Also update ipfs-migrator when changing the repo version + passthru.repoVersion = "12"; # Also update kubo-migrator when changing the repo version - # go-ipfs makes changes to it's source tarball that don't match the git source. + # Kubo makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; hash = "sha256-GkOY1G2CKXbMbHXkw5v27HmfkJIl2nZOmjjZbzuaRWs="; @@ -15,10 +15,10 @@ buildGoModule rec { # tarball contains multiple files/directories postUnpack = '' - mkdir ipfs-src + mkdir kubo-src shopt -s extglob - mv !(ipfs-src) ipfs-src || true - cd ipfs-src + mv !(kubo-src) kubo-src || true + cd kubo-src ''; sourceRoot = "."; @@ -29,7 +29,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; tags = [ "openssl" ]; - passthru.tests.ipfs = nixosTests.ipfs; + passthru.tests.kubo = nixosTests.kubo; vendorSha256 = null; @@ -57,6 +57,7 @@ buildGoModule rec { homepage = "https://ipfs.io/"; license = licenses.mit; platforms = platforms.unix; + mainProgram = "ipfs"; maintainers = with maintainers; [ fpletz ]; }; } diff --git a/pkgs/development/python-modules/ipfshttpclient/default.nix b/pkgs/development/python-modules/ipfshttpclient/default.nix index 6af860a39805..71e0194a6b2f 100644 --- a/pkgs/development/python-modules/ipfshttpclient/default.nix +++ b/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -14,7 +14,7 @@ , pytest-order , pytest-cid , mock -, ipfs +, kubo , httpx , httpcore }: @@ -46,7 +46,7 @@ buildPythonPackage rec { pytest-order pytest-cid mock - ipfs + kubo httpcore httpx ]; diff --git a/pkgs/development/python-modules/ipwhl/default.nix b/pkgs/development/python-modules/ipwhl/default.nix index 8bbf257ebdcf..6ccb1dabebb3 100644 --- a/pkgs/development/python-modules/ipwhl/default.nix +++ b/pkgs/development/python-modules/ipwhl/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, pythonOlder, fetchFromSourcehut -, ipfs, packaging, tomli }: +, kubo, packaging, tomli }: buildPythonPackage rec { pname = "ipwhl"; @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-YaIYcoUnbiv9wUOFIzGj2sWGbh7NsqRQcqOR2X6+QZA="; }; - buildInputs = [ ipfs ]; + buildInputs = [ kubo ]; propagatedBuildInputs = [ packaging tomli ]; doCheck = false; # there's no test pythonImportsCheck = [ "ipwhl" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 891f83f1a61d..abe58292c630 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -515,6 +515,10 @@ mapAliases ({ interfacer = throw "interfacer is deprecated and archived by upstream"; # Added 2022-04-05 inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2022-09-24 iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06 + ipfs = kubo; # Added 2022-09-27 + ipfs-migrator-all-fs-repo-migrations = kubo-migrator-all-fs-repo-migrations; # Added 2022-09-27 + ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27 + ipfs-migrator = kubo-migrator; # Added 2022-09-27 iproute = throw "'iproute' has been renamed to/replaced by 'iproute2'"; # Converted to throw 2022-09-24 ipsecTools = throw "ipsecTools has benn removed, because it was no longer maintained upstream"; # Added 2021-12-15 itch-setup = throw "itch-setup has benn removed, use itch instead"; # Added 2022-06-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80f7c717a3da..5f6efdc5c27a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7830,17 +7830,10 @@ with pkgs; ipfetch = callPackage ../tools/networking/ipfetch { }; - ipfs = callPackage ../applications/networking/ipfs { - openssl = openssl_1_1; - }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { buildGoModule = buildGo119Module; }; - ipfs-migrator-all-fs-repo-migrations = callPackage ../applications/networking/ipfs-migrator/all-migrations.nix { }; - ipfs-migrator-unwrapped = callPackage ../applications/networking/ipfs-migrator/unwrapped.nix { }; - ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipfs-upload-client = callPackage ../applications/networking/ipfs-upload-client { }; ipget = callPackage ../applications/networking/ipget { }; @@ -8185,6 +8178,14 @@ with pkgs; kubergrunt = callPackage ../applications/networking/cluster/kubergrunt { }; + kubo = callPackage ../applications/networking/kubo { + openssl = openssl_1_1; + }; + + kubo-migrator-all-fs-repo-migrations = callPackage ../applications/networking/kubo-migrator/all-migrations.nix { }; + kubo-migrator-unwrapped = callPackage ../applications/networking/kubo-migrator/unwrapped.nix { }; + kubo-migrator = callPackage ../applications/networking/kubo-migrator { }; + kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; peruse = libsForQt5.callPackage ../tools/misc/peruse { }; From 49b299074d4fbd2becdc6dbc5362a3d0fc2fb2b1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 28 Sep 2022 15:50:56 -0300 Subject: [PATCH 074/269] k3s: convenience change to update script --- pkgs/applications/networking/cluster/k3s/update.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/update.sh index 6c9755334cde..ac46e7ae51e5 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/update.sh @@ -7,8 +7,8 @@ WORKDIR=$(mktemp -d) trap "rm -rf ${WORKDIR}" EXIT NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/ -NIXPKGS_K3S_FOLDER=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ -cd ${NIXPKGS_K3S_FOLDER} +NIXPKGS_K3S_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/ +cd ${NIXPKGS_K3S_PATH} LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ @@ -60,7 +60,7 @@ CRI_CTL_VERSION=$(grep github.com/kubernetes-sigs/cri-tools ${FILE_GO_MOD} \ | head -n1 | awk '{print $4}' | sed -e 's/"//g' -e 's/^v//') setKV () { - sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ${NIXPKGS_K3S_FOLDER}default.nix + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ${NIXPKGS_K3S_PATH}default.nix } setKV k3sVersion ${K3S_VERSION} @@ -91,3 +91,11 @@ else echo "Update failed. K3S_VENDOR_SHA256 is empty." exit 1 fi + +# `git` flag here is to be used by local maintainers to speed up the bump process +if [ $# -eq 1 ] && [ "$1" = "git" ]; then + OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_ROOT. {}; k3s.version or (builtins.parseDrvName k3s.name).version" | tr -d '"')" + git switch -c "package-k3s-${K3S_VERSION}" + git add "$NIXPKGS_K3S_PATH"/default.nix + git commit -m "k3s: ${OLD_VERSION} -> ${K3S_VERSION}" +fi From 049c5e902652601f24768af59fc6510e6da5b797 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Oct 2022 11:46:46 -0300 Subject: [PATCH 075/269] diffoscope: revised tests failing --- pkgs/tools/misc/diffoscope/default.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 65b66b4cf43f..3884807bd719 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -67,25 +67,12 @@ python3Packages.buildPythonApplication rec { ''; disabledTests = [ - # Disable flaky test and a failing one - "test_android_manifest" "test_sbin_added_to_path" "test_diff_meta" "test_diff_meta2" - "test_obj_no_differences" # fails because it fails to determine llvm version "test_item3_deflate_llvm_bitcode" - - # OSError: [Errno 84] Invalid or incomplete multibyte or wide character: b'/build/pytest-of-nixbld/pytest-0/\xf0(\x8c(' - "test_non_unicode_filename" - - # disable formatting tests because they can break on black updates - "test_code_is_black_clean" - - # fails at 2022-09-30 - "test_identification" - "test_diff" ] ++ lib.optionals stdenv.isDarwin [ # Disable flaky tests on Darwin "test_non_unicode_filename" From 4c0eb8eb9e3ad2ea1807a622f359ab1baa1bf9b3 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 1 Oct 2022 14:22:33 +0200 Subject: [PATCH 076/269] nsync: add Luflosi as maintainer --- pkgs/development/libraries/nsync/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/nsync/default.nix b/pkgs/development/libraries/nsync/default.nix index a00893c15732..aa5023c08d80 100644 --- a/pkgs/development/libraries/nsync/default.nix +++ b/pkgs/development/libraries/nsync/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/google/nsync"; description = "C library that exports various synchronization primitives"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ puffnfresh ]; + maintainers = with lib.maintainers; [ puffnfresh Luflosi ]; # On macOS we get an error for some reason: # > mkdir: cannot create directory 'build': File exists platforms = lib.platforms.linux; From 3f2381e4bd9144d01bb2f04c79c6e5e7a566b5b3 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 1 Oct 2022 14:28:18 +0200 Subject: [PATCH 077/269] nsync: fix build on macOS --- pkgs/development/libraries/nsync/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/nsync/default.nix b/pkgs/development/libraries/nsync/default.nix index aa5023c08d80..15c3880d6164 100644 --- a/pkgs/development/libraries/nsync/default.nix +++ b/pkgs/development/libraries/nsync/default.nix @@ -17,13 +17,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # Needed for case-insensitive filesystems like on macOS + # because a file named BUILD exists already. + cmakeBuildDir = "build_dir"; + meta = { homepage = "https://github.com/google/nsync"; description = "C library that exports various synchronization primitives"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ puffnfresh Luflosi ]; - # On macOS we get an error for some reason: - # > mkdir: cannot create directory 'build': File exists - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } From cd7bcc91744b8d46b0fb882f5b97ff8f123aa02a Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 1 Oct 2022 14:28:36 +0200 Subject: [PATCH 078/269] nsync: 1.24.0 -> 1.25.0 https://github.com/google/nsync/releases/tag/1.25.0 --- pkgs/development/libraries/nsync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nsync/default.nix b/pkgs/development/libraries/nsync/default.nix index 15c3880d6164..5a6024189471 100644 --- a/pkgs/development/libraries/nsync/default.nix +++ b/pkgs/development/libraries/nsync/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nsync"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = version; - sha256 = "sha256-jQJtlBDR6efBe1tFOUOZ6awaMTT33qM/GbvbwiWTZxw="; + sha256 = "sha256-bdnYrMnBnpnEKGuMlDLILfzgwfu/e5tyMdSDWqreyto="; }; nativeBuildInputs = [ cmake ]; From 3d200bd959e9b448e52212e9989e109c6dce3ab4 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 29 Sep 2022 09:58:45 -0300 Subject: [PATCH 079/269] nixos/tests/k3s: fix tests * add superherointj as maintainer --- nixos/tests/k3s/multi-node.nix | 27 ++++++++++++++++++++++----- nixos/tests/k3s/single-node.nix | 17 +++++++++++++---- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix index ae9609fbccc9..e33fa3e36d27 100644 --- a/nixos/tests/k3s/multi-node.nix +++ b/nixos/tests/k3s/multi-node.nix @@ -1,4 +1,4 @@ -import ../make-test-python.nix ({ pkgs, ... }: +import ../make-test-python.nix ({ pkgs, lib, ... }: let imageEnv = pkgs.buildEnv { name = "k3s-pause-image-env"; @@ -54,7 +54,15 @@ import ../make-test-python.nix ({ pkgs, ... }: role = "server"; package = pkgs.k3s; clusterInit = true; - extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local --node-ip 192.168.1.1"; + extraFlags = '' + --disable coredns \ + --disable local-storage \ + --disable metrics-server \ + --disable servicelb \ + --disable traefik \ + --node-ip 192.168.1.1 \ + --pause-image test.local/pause:local + ''; }; networking.firewall.allowedTCPPorts = [ 2379 2380 6443 ]; networking.firewall.allowedUDPPorts = [ 8472 ]; @@ -76,7 +84,15 @@ import ../make-test-python.nix ({ pkgs, ... }: enable = true; serverAddr = "https://192.168.1.1:6443"; clusterInit = false; - extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local --node-ip 192.168.1.3"; + extraFlags = '' + --disable coredns \ + --disable local-storage \ + --disable metrics-server \ + --disable servicelb \ + --disable traefik \ + --node-ip 192.168.1.3 \ + --pause-image test.local/pause:local + ''; }; networking.firewall.allowedTCPPorts = [ 2379 2380 6443 ]; networking.firewall.allowedUDPPorts = [ 8472 ]; @@ -110,7 +126,7 @@ import ../make-test-python.nix ({ pkgs, ... }: }; meta = with pkgs.lib.maintainers; { - maintainers = [ euank ]; + maintainers = [ euank superherointj ]; }; testScript = '' @@ -123,7 +139,8 @@ import ../make-test-python.nix ({ pkgs, ... }: server.wait_until_succeeds("k3s kubectl get node agent") for m in machines: - m.succeed("k3s check-config") + '' # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)" + + lib.optionalString (!pkgs.stdenv.isAarch64) ''m.succeed("k3s check-config")'' + '' m.succeed( "${pauseImage} | k3s ctr image import -" ) diff --git a/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix index 27e1e455e641..583aac8ac656 100644 --- a/nixos/tests/k3s/single-node.nix +++ b/nixos/tests/k3s/single-node.nix @@ -1,4 +1,4 @@ -import ../make-test-python.nix ({ pkgs, ... }: +import ../make-test-python.nix ({ pkgs, lib, ... }: let imageEnv = pkgs.buildEnv { name = "k3s-pause-image-env"; @@ -26,7 +26,7 @@ import ../make-test-python.nix ({ pkgs, ... }: { name = "k3s"; meta = with pkgs.lib.maintainers; { - maintainers = [ euank ]; + maintainers = [ euank superherointj ]; }; nodes.machine = { pkgs, ... }: { @@ -40,7 +40,15 @@ import ../make-test-python.nix ({ pkgs, ... }: services.k3s.role = "server"; services.k3s.package = pkgs.k3s; # Slightly reduce resource usage - services.k3s.extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local"; + services.k3s.extraFlags = '' + --disable coredns \ + --disable local-storage \ + --disable metrics-server \ + --disable servicelb \ + --disable traefik \ + --pause-image \ + test.local/pause:local + ''; users.users = { noprivs = { @@ -57,7 +65,8 @@ import ../make-test-python.nix ({ pkgs, ... }: machine.wait_for_unit("k3s") machine.succeed("k3s kubectl cluster-info") machine.fail("sudo -u noprivs k3s kubectl cluster-info") - machine.succeed("k3s check-config") + '' # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)" + + lib.optionalString (!pkgs.stdenv.isAarch64) ''machine.succeed("k3s check-config")'' + '' machine.succeed( "${pauseImage} | k3s ctr image import -" From 2d55e4d1eed9c39fcadea9ebbbd46ea4f866f3f7 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 28 Sep 2022 15:56:09 -0300 Subject: [PATCH 080/269] k3s: 1.25.2+k3s1 -> 1.25.2+k3s1 --- pkgs/applications/networking/cluster/k3s/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 47caa1721336..1fed375117c2 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -47,10 +47,10 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.25.0+k3s1"; # k3s git tag - k3sCommit = "26e9405767263a2915723cb72b1ffd7f50687a8f"; # k3s git commit at the above version - k3sRepoSha256 = "0rk0svqx26rn6qlvvyj5rsqb87195h1qcf84qmmvf874qwszwpgh"; - k3sVendorSha256 = "sha256-YX/yLOLtDxGhRB4tic6oTli/qeeSnpP+f+S+sVXXDSs="; + k3sVersion = "1.25.2+k3s1"; # k3s git tag + k3sCommit = "53c268d8eb90ceea5e1c7865f89db5c7fb8763bc"; # k3s git commit at the above version + k3sRepoSha256 = "1w040bsrf981k19rwaaxjsv52pgzc0k77x083fkhysmrca565z0y"; + k3sVendorSha256 = "sha256-8Xti08sjFk1WKimH/GEb99oqBdFO79WVCvYyXIWMpgo="; # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. From ea6b6a46b6ebccd75a178ce7b331accf864e806f Mon Sep 17 00:00:00 2001 From: Daniel Thwaites Date: Sun, 2 Oct 2022 17:03:14 +0100 Subject: [PATCH 081/269] coreboot-configurator: init at 2022-08-22 --- .../misc/coreboot-configurator/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/tools/misc/coreboot-configurator/default.nix diff --git a/pkgs/tools/misc/coreboot-configurator/default.nix b/pkgs/tools/misc/coreboot-configurator/default.nix new file mode 100644 index 000000000000..bed689651a4b --- /dev/null +++ b/pkgs/tools/misc/coreboot-configurator/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, inkscape +, meson +, ninja +, pkg-config +, libyamlcpp +, nvramtool +, qtbase +, qtsvg +, wrapQtAppsHook +}: + +stdenv.mkDerivation { + pname = "coreboot-configurator"; + version = "unstable-2022-08-22"; + + src = fetchFromGitHub { + owner = "StarLabsLtd"; + repo = "coreboot-configurator"; + rev = "37c93e7e101a20f85be309904177b9404875cfd8"; + sha256 = "2pk+uJk1EnVNO2vO1zF9Q6TLpij69iRdr5DFiNcZlM0="; + }; + + nativeBuildInputs = [ inkscape meson ninja pkg-config wrapQtAppsHook ]; + buildInputs = [ libyamlcpp qtbase qtsvg ]; + + postPatch = '' + substituteInPlace src/application/*.cpp \ + --replace '/usr/bin/pkexec' 'sudo' \ + --replace '/usr/bin/systemctl' 'systemctl' \ + --replace '/usr/sbin/nvramtool' '${nvramtool}/bin/nvramtool' + ''; + + meta = with lib; { + description = "A simple GUI to change settings in Coreboot's CBFS"; + homepage = "https://support.starlabs.systems/kb/guides/coreboot-configurator"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ danth ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3aef6eb81fd2..792a19be17a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3406,6 +3406,8 @@ with pkgs; acpidump-all coreboot-utils; + coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { }; + corosync = callPackage ../servers/corosync { }; cowsay = callPackage ../tools/misc/cowsay { }; From fcab0c7453fa3e983fcf6e874dffd5e0d6bcfae6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Oct 2022 16:12:20 +0000 Subject: [PATCH 082/269] python310Packages.django-reversion: 5.0.2 -> 5.0.3 --- pkgs/development/python-modules/django-reversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-reversion/default.nix b/pkgs/development/python-modules/django-reversion/default.nix index 2932eb31e114..3c262a2c6f11 100644 --- a/pkgs/development/python-modules/django-reversion/default.nix +++ b/pkgs/development/python-modules/django-reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "5.0.2"; + version = "5.0.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JDoS7k4EwWEcDwdvv8MHTxrUCvxFrcZN5bokFMxOryk="; + sha256 = "sha256-rLYA+EghRzEqJ71Y5jdmqgODMQGB5IXm6qL0LSZQLJs="; }; # tests assume the availability of a mysql/postgresql database From 82d94d1aeda2086c92c817ad0486532cb72a5298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 2 Oct 2022 19:13:46 +0200 Subject: [PATCH 083/269] libcec: remove ? null from inputs, use postPatch --- pkgs/development/libraries/libcec/default.nix | 25 +++++++++++++------ pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 039d3af37605..1d6fd44acb69 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, udev +, libcec_platform +, withLibraspberrypi ? false +, libraspberrypi +}: stdenv.mkDerivation rec { pname = "libcec"; @@ -11,17 +20,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-OWqCn7Z0KG8sLlfMWd0btJIFJs79ET3Y1AV/y/Kj2TU="; }; - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ udev libcec_platform ] ++ - lib.optional (libraspberrypi != null) libraspberrypi; - - cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ]; - # Fix dlopen path - patchPhase = '' + postPatch = '' substituteInPlace include/cecloader.h --replace "libcec.so" "$out/lib/libcec.so" ''; + nativeBuildInputs = [ pkg-config cmake ]; + buildInputs = [ udev libcec_platform ] ++ + lib.optional withLibraspberrypi libraspberrypi; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ]; + meta = with lib; { description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling"; homepage = "http://libcec.pulse-eight.com"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80f7c717a3da..0d7d680e1af4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19463,9 +19463,7 @@ with pkgs; libccd = callPackage ../development/libraries/libccd { }; - libcec = callPackage ../development/libraries/libcec { - libraspberrypi = null; - }; + libcec = callPackage ../development/libraries/libcec { }; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; From 058a81c348d86cc1341e0639e02ace6f9eacc742 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 2 Oct 2022 18:32:17 +0200 Subject: [PATCH 084/269] nautilus-open-any-terminal: 0.3.0 -> 0.4.0 --- .../nautilus-open-any-terminal/default.nix | 4 +-- .../hardcode-gsettings.patch | 29 +++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix index 21dd287f56ad..3d34dda25a52 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix +++ b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -15,13 +15,13 @@ python3.pkgs.buildPythonPackage rec { pname = "nautilus-open-any-terminal"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Stunkymonkey"; repo = pname; rev = version; - sha256 = "sha256-PF6DVpiAPL9NG4jK6wDqdqYw+26Nks/bGEbbaV/5aIs="; + sha256 = "sha256-EAI60Mw+OTPfjOS6lkGMul7QvTR7NXyNfevWY2JP1yI="; }; patches = [ ./hardcode-gsettings.patch ]; diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch b/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch index 402f78ed04b1..194bb55902ae 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch +++ b/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch @@ -2,20 +2,20 @@ diff --git a/nautilus_open_any_terminal/open_any_terminal_extension.py b/nautilu index b02a995..a616399 100644 --- a/nautilus_open_any_terminal/open_any_terminal_extension.py +++ b/nautilus_open_any_terminal/open_any_terminal_extension.py -@@ -125,9 +125,10 @@ def set_terminal_args(*args): +@@ -205,9 +205,10 @@ def set_terminal_args(*args): - class OpenAnyTerminalShortcutProvider(GObject.GObject, Nautilus.LocationWidgetProvider): - def __init__(self): -- source = Gio.SettingsSchemaSource.get_default() -- if source.lookup(GSETTINGS_PATH, True): -- self._gsettings = Gio.Settings.new(GSETTINGS_PATH) -+ source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True) -+ if True: -+ _schema = source.lookup(GSETTINGS_PATH, False) -+ self._gsettings = Gio.Settings.new_full(_schema, None, None); - self._gsettings.connect("changed", self._bind_shortcut) - self._create_accel_group() - self._window = None + class OpenAnyTerminalShortcutProvider(GObject.GObject, Nautilus.LocationWidgetProvider): + def __init__(self): +- source = Gio.SettingsSchemaSource.get_default() +- if source.lookup(GSETTINGS_PATH, True): +- self._gsettings = Gio.Settings.new(GSETTINGS_PATH) ++ source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True) ++ if True: ++ _schema = source.lookup(GSETTINGS_PATH, False) ++ self._gsettings = Gio.Settings.new_full(_schema, None, None); + self._gsettings.connect("changed", self._bind_shortcut) + self._create_accel_group() + self._window = None @@ -232,9 +233,10 @@ class OpenAnyTerminalExtension(GObject.GObject, Nautilus.MenuProvider): return items @@ -28,5 +28,4 @@ index b02a995..a616399 100644 + _schema = source.lookup(GSETTINGS_PATH, False) + _gsettings = Gio.Settings.new_full(_schema, None, None); _gsettings.connect("changed", set_terminal_args) - value = _gsettings.get_string(GSETTINGS_TERMINAL) - if value in TERM_PARAMS: + set_terminal_args() From e2a22846581333e02cca7a79df758a1f2e29f631 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 2 Oct 2022 20:35:44 +0200 Subject: [PATCH 085/269] electrum: make compatible with protobuf 4+ --- pkgs/applications/misc/electrum/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 46ea57c6193d..9421cce1d8f7 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -89,7 +89,13 @@ python3.pkgs.buildPythonApplication { qdarkstyle ]; - preBuild = '' + postPatch = '' + # make compatible with protobuf4 by easing dependencies ... + substituteInPlace ./contrib/requirements/requirements.txt \ + --replace "protobuf>=3.12,<4" "protobuf>=3.12" + # ... and regenerating the paymentrequest_pb2.py file + protoc --python_out=. electrum/paymentrequest.proto + substituteInPlace ./electrum/ecc_fast.py \ --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} '' + (if enableQt then '' From 34687f1a5e2bd16a0562bc997987f5dbac6e9623 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 2 Oct 2022 18:51:09 -0400 Subject: [PATCH 086/269] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 492 +++++++++--------- 1 file changed, 252 insertions(+), 240 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index d2fb08a807fc..df4084892ba0 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -53,12 +53,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-09-16"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "4098ba53139d3e59efae1c9140180440d3df9174"; - sha256 = "053a6b7xxz85bkh4v4s5kmjwvdlj26sksv5vyjmjk3anps9lc0dr"; + rev = "98c99cc950f147a877d56a590d92b357c24086b9"; + sha256 = "06q4riwy7gdmcrqjqnsgw98r382jwsk5qn1f43pg04cwdaksjy4k"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-09-24"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "687fc5aca8eef79278a01345f1a93dcc68453f29"; - sha256 = "0mldl6zssdxnkxls4r9rbb94f9i5yi7bc0r99k34v4bq25j9ls55"; + rev = "33873c71335a31988b62025c3b2224f3a9fe8e15"; + sha256 = "134z58jhi343ylr6nip8f180cqvyf2l7gxrzygxyv55d2iz182qk"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-09-25"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "2adcaae6f53e0bc42445f14caa210e8d64368469"; - sha256 = "039rfly4knc7d9n3wkvi4f7m4pwh4ifpci59gnbvqlyhr9x29mzs"; + rev = "46f53be2f8e538e5b5aa5344bd9f9dd1a9ef1679"; + sha256 = "1c02vql960mfpgj96zmzkij8yc2xpsxwgs7dfqphkmwq3b02r1nx"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -437,12 +437,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-09-22"; + version = "2022-09-27"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "cdd88b5e46109c01a69f3f9b10eae53811b4a65c"; - sha256 = "0v7dg2s7igs11566kxd5qjl81fq4iw5i6xn9qrl23wg5mbksvwiy"; + rev = "8c173bc4d2c5b03cf53575092a7c5c2bc67afd9a"; + sha256 = "1m2sk3pqc2825px3x8l8jrwjwrdljygrf3pb2wy4y15dbjy56hf1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-09-25"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "87099324fdf55e5219e852676769f3b5f0290d98"; - sha256 = "039mh32k1vz3g7sdagavsir79wzxgp1y6747rgpgdrrf5jdf3crh"; + rev = "6f1b28b549147c2f9e09de16869fcc34cf076253"; + sha256 = "02k6p7bx63xsj98hvi0chm2g8wyk8kv9y8cz265lv9i5yrh6fpcc"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -534,12 +534,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-09-25"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "78942df284a4a00c59a6edcc187684cdbc333fb9"; - sha256 = "1i29zqi1xqar0i0a0y30jssl914a3mxvvvfki3k3c6gdhskf9in3"; + rev = "a33960eb51b638f232dff71cfeac5ede87b38312"; + sha256 = "1v56lzs9i29bwzb1iqwanzv3khr9gd9lmwv5v5ddhg9b3bq55rnv"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -678,12 +678,12 @@ final: prev: asynctasks-vim = buildVimPluginFrom2Nix { pname = "asynctasks.vim"; - version = "2022-08-23"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "4b6abc813b67e743fee205da2f996f737df1ae20"; - sha256 = "03vqz5yz76wymsrvbkyvnfl3453b4hba2h0ji9lyy3brxb6lf1bg"; + rev = "1a5f4916192767973c05b3bb648548b0891865a2"; + sha256 = "0ghg00bflnp9lyrjjls7si0vvjzxzy72fxz36dvps15rddm4bry2"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; @@ -786,12 +786,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-09-01"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "c41ad6e3f68c2c9f6aa268c6232cdef885107303"; - sha256 = "0mdimwsiclpjn2df75lc92ryyjyql4m1x0bvpl629z33hvhlcvs0"; + rev = "95f2c58c84726eac14fd6e86dbcab599d7ecaedd"; + sha256 = "19nja82dcv7gr0sc1404zjak00wb5n7k3plnnnndl0siah3i4d7k"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -978,12 +978,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2022-09-26"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "19483e6c226650f14acabfc4b1ec6521cf964a4e"; - sha256 = "11p4mzbyjsxik9jzg11d17mnacj8krxzrq4hjjg0pn1cggh3wqyh"; + rev = "0a8a6f1b42dd3c8031fe5d96cc835998169e1ac9"; + sha256 = "01k31s7mpl3kkh2yl078915yq78ga9x0rhawbz03s0kjssvlsfyd"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1050,12 +1050,12 @@ final: prev: clangd_extensions-nvim = buildVimPluginFrom2Nix { pname = "clangd_extensions.nvim"; - version = "2022-09-23"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "f2ca89d978f9fc907beb432a472a89fced7e10bd"; - sha256 = "0g0w950l7pam1fibkc5fggchvsfi4fsyvrky2f1yizrndpmq09yz"; + rev = "7fa598a4a1bfd61a8f194d7db1e4d820221e9ea9"; + sha256 = "1wxyy98gal3zdwrh6z92044yyj3nbw2bzq9diwa1h5waraf9jg7r"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1530,12 +1530,12 @@ final: prev: cmp-treesitter = buildVimPluginFrom2Nix { pname = "cmp-treesitter"; - version = "2022-06-09"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "ray-x"; repo = "cmp-treesitter"; - rev = "c2886bbb09ef6daf996a258db29546cc1e7c12a7"; - sha256 = "1ar6d6pqybn4vqynbh18mc7fy1ybv0s9mi1r2j1nfcmgvh4wsvwk"; + rev = "5f695e4173ad74a4c8dbbfd8990286464bf69293"; + sha256 = "1l32k8fdmpg8lfh1qqmahash957izz9zr6gfjvfs5s4if0fl3f2r"; }; meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; @@ -1710,12 +1710,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-09-25"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "ca63592c1ba484aa7146a6a9f34b9a6cb8d8ffb9"; - sha256 = "10dr4kp8z2kzg167n1n7ndmdm7hhvsv4423g290yljlk0vbvflfn"; + rev = "487d077e1131ee5b09e329d15f9d9ae53aa8f44a"; + sha256 = "148wajzy64ys74km0k1mgvrfk3mqdib0nh2wylwfnx83s50f2sx2"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1794,12 +1794,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-09-26"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "7cc86127d30f7001a6e83c8b72656f17a67bc55f"; - sha256 = "1jl2wwr8ssszgkynnkxpz2c57mw7yapvrc892jrnkbkj6lv7h8vi"; + rev = "97a188a98b5a3a6f9b1b850799ac078faa17ab67"; + sha256 = "05836nr9nwssjzjmg8zmbdfx8wclhnjb6pp4cwiykgi6kv4dzjnz"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1866,12 +1866,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "12641f77bea3e1bd93560653cba6e9f1c264c0dd"; - sha256 = "1fm81s16ccrm0ia21hwc299mnpx3r2i3byggkwsi7cb5kh4lh6zw"; + rev = "737ec0937c2e3f8279bedb6e308a1c183b81f08a"; + sha256 = "1jawin6rvz5rkmh1vh3l980zghnc5hmppqginnj82n8s0lz1dl0d"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -1998,24 +1998,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "dbebb09f0c48d9af2b36f4e36e30e74ee7cef558"; - sha256 = "09bv552gg5pkkzz8b0bj1xgp41ywz2yjwgrzqi64xhk98hdhhpy6"; + rev = "a72ed519665c483706e99c8e080b6333fece6030"; + sha256 = "1im5lrpz7b3nhc53sy7nn0i4ngiy47l2l3h8c0yjrbqz9j3gcjcm"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "be1075ca88e3fd1d22bb8d3c8490701b4c90d2cb"; - sha256 = "007gsvd0n53hgk92dk2wxx91lfdng8rq8cxl469gd9n71ixr31d0"; + rev = "563bdd935c282d1d380bd98d53923c2f7d02eae9"; + sha256 = "06lh0rm15frv741fv21hc8gwjahbp49iz03h944abqfh69cf4a35"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2034,12 +2034,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "8988534294ceaa8fc0a76e68b188efdca88626bf"; - sha256 = "09s8x7knsjbbbwnx13m3911nddapr92xink75lhn2k3hkr0hwmvq"; + rev = "55b4222262ad8e826ce1c144a7b2b35f16f8a8e5"; + sha256 = "0bmcv72nw0vk8qlzhs5lfirh4jq13azva1wm2w2a8hlvnfg764ij"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2178,12 +2178,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2022-09-16"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "1c4802a654c9127c745cbe2ffff9909a3a9ff965"; - sha256 = "1fs9qk3xskvhbbs33kywk9krkcrbsrmizm0imqsbsp3c1cr3m8xk"; + rev = "1676ebeb334a644dd68f7858f9e993602dd8577c"; + sha256 = "164giy2s45dc1zlf63fsbf9z8qvf81npdmy304xxr81azpb8amqi"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2492,12 +2492,12 @@ final: prev: deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete.nvim"; - version = "2022-08-24"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "4e30d980f51087241499e20d687b76dc5000274e"; - sha256 = "0ll5wb8kpqy907rw6c9v99vkldp9lcvbrzdysjcdq4z8gzcwrvac"; + rev = "14578f1d0c7ed8faca7e640104840b7eaa1c35ee"; + sha256 = "1gwq7nhd90ifh1gys2jvrq2s8521pyz7w3nsr2pmnv64h3yl1f2f"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -2758,12 +2758,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2022-09-19"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "496975425a28ef1f974e90e9664fe3409738f071"; - sha256 = "14p688anpsfj09yhmmjbl949xfx61qv79vg26hbxif149i3z5035"; + rev = "83fcde2853a8881ea1b59cca80a5285662c1706c"; + sha256 = "0v3xmvk8jgad29wpxqdkqq95s1cap7gdz07i299hcz94l1y5fiqz"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2806,12 +2806,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-07-25"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "492492e7d50452a9ace8346d31f6d6da40439f0e"; - sha256 = "1s3qv09gbsjjmqkb85hc4832j18hd21j37rg4iqks0a4n2z5yi4b"; + rev = "1097a86db8ba38e390850dc4035a03ed234a4673"; + sha256 = "15pspfihd2rjzyw6pzd3yycjrn98nx79njasrn4j4sl4ivlay5g6"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2891,12 +2891,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-08-26"; + version = "2022-09-27"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "07a746e6df6bf4c77766aa6c19723da618a38781"; - sha256 = "0qffbwvb3vh92vixk8wq6h11ayvzvlq64x4qdwx7nz7dfd6cwlhb"; + rev = "88aa63ba216708611b472d8737b96af71c2f3785"; + sha256 = "0x55w1fs0pciinapdvs3vdsiql29753vi2f9sr3jpxlk4rgaygpa"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -3023,12 +3023,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-09-22"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "316879662ff9c33ae4b1072f8238e4bba2999e0a"; - sha256 = "1b334fqvv49d9cnk4yv3hd3qgnw4x48l1i2ja1pxxiwi91q1hgwr"; + rev = "e7c610889ff954101c644cdb9cf68e499a3751ac"; + sha256 = "15bkdkr9jr9rdg3nwjyzb3rzx27h5ldi6484whqaij40gpk1ifgz"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3335,12 +3335,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-09-15"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "c632f629026cf41308b4473ab9bb9686318c993c"; - sha256 = "1dn4a5wnahh2hnhx3sda2lrmfi675bmifpm3g1xjxqj3771ivznk"; + rev = "24f9e795bfac5fabbaba703116e747dcf2ad8d2f"; + sha256 = "0an08vf70ispd3alywz964vlxkgg17dgfz5n18q60ix2fs6pmgii"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3490,12 +3490,12 @@ final: prev: hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-09-17"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "a71c37feb8fe878d54f15135ddea0d2b3ea04a44"; - sha256 = "1z7wq8dzfqw0m6ydvfahqi513x4a77vg7kxq3476awq8601h1525"; + rev = "86f4f2f7c1cebdbeb9a9bd498810a0154e80dbab"; + sha256 = "0gzxnh13l1ys8jbcnkgfrjz901qf8wvyslqyldyzm3ryis823acg"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -4103,12 +4103,12 @@ final: prev: litee-calltree-nvim = buildVimPluginFrom2Nix { pname = "litee-calltree.nvim"; - version = "2022-09-27"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "04e766756aa755e00a400cd09dae867a03f6f25d"; - sha256 = "050a19kmilxlh4pknw6jakhnnkwwl51cddvi9aw2742pspddhnyy"; + rev = "e2dffec35740032258fee3a3c7f30123226f2271"; + sha256 = "091iga42vmkwxwr8y4p4j8l2cawja5q7n10bq7bqc9j8z6jvl9x8"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; @@ -4127,12 +4127,12 @@ final: prev: litee-symboltree-nvim = buildVimPluginFrom2Nix { pname = "litee-symboltree.nvim"; - version = "2022-09-26"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-symboltree.nvim"; - rev = "4cbb64f3aa433522160c4e340fdf19900198e4ea"; - sha256 = "0v8w2ddf8zwb0vpqwxc0294cgi4674ff335w0f226hrpkl962022"; + rev = "488a660afcfd54644e6b755256907d3c7d8cf8d0"; + sha256 = "0mjjap47cz01qar0q87ssh45l4dkzizxcm986gksrmvhwwrii3ap"; }; meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; }; @@ -4294,12 +4294,12 @@ final: prev: lua-dev-nvim = buildVimPluginFrom2Nix { pname = "lua-dev.nvim"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "folke"; repo = "lua-dev.nvim"; - rev = "e18c4ce4048497384972052d8118eeaa0a681ada"; - sha256 = "1yg3g613i2wp6zhvf940gvgz3318g8hzw4m5x76i63qpz6nanbmx"; + rev = "2ffe2f6de00360f13ac939b7f7257e6de5e80132"; + sha256 = "04nks3j6ah2dn4hlqabz0cvlwam86ig0a89mzpnw52injl95k9a1"; }; meta.homepage = "https://github.com/folke/lua-dev.nvim/"; }; @@ -4330,12 +4330,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-09-20"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "d36c063b7f6e701852f7880f1314656592a61b4f"; - sha256 = "1kqarf2710iqwa1zz8y7dm8s37b1q4330ldnw2adyzlyh6zifjwv"; + rev = "8f8d493e7836f2697df878ef9c128337cbf2bb84"; + sha256 = "17kz2w90m1f7wg8gyaz6lhg8hdkjq4zly092halgd1fn6brhd23f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4439,12 +4439,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-09-26"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "49f970355e7b0dc5407057eb39b778d20209b7aa"; - sha256 = "13fa6anil5y4wj0a543j4pip9a1slvrxwvlqihvh57cqn3r7vxsz"; + rev = "3f2c7a2aee528309fb42091b723285fb7630a0c2"; + sha256 = "18049zbm2gxm6gjif6radwy09x84ix1y30657q294n7scsh25mg5"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -4811,12 +4811,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-09-22"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "463820a83f4ba387655f370a17c87dc3100cdf0d"; - sha256 = "1h0mil77s8pbgjvqb0kf6l4avz1y33116rgv2kkaii1zn4dwmnws"; + rev = "74c9e29b61780345d3ad9d7a4a4437607caead4a"; + sha256 = "07szj9ajv3n8hpx0ibvysi0p5rfshcnbk0v3jyh2lvrcvky2qkqg"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -4871,12 +4871,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-09-23"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "9279eb2de80c8a9af12b1a35f3e0fd8d742b61dd"; - sha256 = "0l7k6bf9jnqakzy7931fjr1pna2fvwcwd9y4y0yp7rsql5a5fk3d"; + rev = "c5345e72ebdd84585eec6272755aa26233431317"; + sha256 = "0ip2gy11xhvfdrin1yz3fqr9z2hwbd51avm1616825pj6mr8dxn5"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4931,12 +4931,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2022-09-25"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "0198dcf2d5585742220e21e002f095464874e19e"; - sha256 = "1qbh4rpv4gzrsaqq0s64rq3c93ghspfd1ida76wpivzbzcrj4q7w"; + rev = "bae6314522e47172564203d4f1c56dc1e39c1c14"; + sha256 = "0hwhcdswa5msxndcfcn68dq8aj6gka7vmfcvbnaxmwza23ik09cd"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -5051,12 +5051,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-09-05"; + version = "2022-09-27"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "83f6ee9e646c803aa14c7293ad7775900f24ea1a"; - sha256 = "07fi55ilkqmb7xqwk1vd6nkmpfwrpqjnjz8wv8z84h1s3dpcslzx"; + rev = "59c3dbcec362eff7794f1cb576d56fd8a3f2c8bb"; + sha256 = "1dkwgqx576xc8fryhi61q7mka93vv28hfsw340k594jkqc3da9i2"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5159,12 +5159,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-09-22"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "8af89c5fa2b732aaa9c3bf8aed95bccc9c4ce295"; - sha256 = "0801yhgh6vjhskcmcwd9z62zvcp7szmb4q8xdrzn30gfwxzci04j"; + rev = "c0c19f32b614b3921e17886c541c13a72748d450"; + sha256 = "1dvxpbl5jkzwcq1hk0b4r09qmjh5dxknbfmsyjxb6d4pzwv795xh"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5207,12 +5207,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-09-17"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "14cc2a4fc6243152ba085cc2059834113496c60a"; - sha256 = "1z5dmlzvp0dmji8zl7nggl6wp9qh4cgkabqk0wabl1fa4y913qxp"; + rev = "4fc96c8f3df89b6d23e5092d31c866c53a346347"; + sha256 = "09aka75d7a0acixrp2b7hfy08vdnjxxiknd5ngf2pk479k8z5zbj"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -5279,12 +5279,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "2427d06b6508489547cd30b6e86b1c75df363411"; - sha256 = "14ksk5c2dds7plqn5kfvxa65kck1yjn3dbgzalrfwn35ynxl92nx"; + rev = "b0dff0ec4f2748626aae13f011d1a47071fe9abc"; + sha256 = "1md42dvgphrrcrs8vb8ff98l5j2sfrfkfip7vfjapymdlk356byp"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5303,12 +5303,12 @@ final: prev: nvim-colorizer-lua = buildVimPluginFrom2Nix { pname = "nvim-colorizer.lua"; - version = "2022-09-22"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvim-colorizer.lua"; - rev = "20fd0091ef4d873fb1ce8b2bbb278664514cac7a"; - sha256 = "02wj29bm7fwkp7igvynfmvndxmz6gngkhjz740xbwv2ncxiv974j"; + rev = "9dd7ecde55b06b5114e1fa67c522433e7e59db8b"; + sha256 = "1lmvxz8k680yfjhadkh0km2v16vhg8p07xbkkvc0jhkp6hg4sxx4"; }; meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; @@ -5375,24 +5375,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-09-24"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "764899df5ca39076acb08a447f7e5bd0b4fa3147"; - sha256 = "1l02prap758nhgcfgnf440ndv6cchns1rd7wd2acpwhzdvx5xfdf"; + rev = "0b320f5bd4e5f81e8376f9d9681b5c4ee4483c25"; + sha256 = "1308jj5jqqadw7kw8zkh7x1hs9cn0030xnb5bms4wsp013krdr08"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-09-25"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "8d0768a83f7b89bd8cb8811800bc121b9353f0b2"; - sha256 = "0hic4wf4lpl4ya4zbdng0ih2lbcc1bp6mqxc588nlmw044m68bia"; + rev = "c8ce83a66deb0ca6f5af5a9f9d5fcc05a6d0f66b"; + sha256 = "18v77mx5806v2g9yksbfxv97b6nb1c9jp09gad1bcd09lvwqd3d9"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -5483,12 +5483,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-09-26"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "b00336ebecc7115740577afa267ff8c26c6b31dc"; - sha256 = "08k4j4qhdiq50rkq8q13dplyga6jrn9nkmzyn6m55sahh3cqz4xn"; + rev = "5e6ea33cfdf8be57bb33146f1927b7723d3ddff6"; + sha256 = "0zhjsg627avq3755a9q28hy8g6iahrn17cwavx47q69j3hp0cl7q"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -5507,12 +5507,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-09-18"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "e9f40e793a16f3cebbd7e864e1ea0c32afa38747"; - sha256 = "111962k5axifxmc5jilgimj2ly7sk7wwjskmviqc7i3wpc9pahia"; + rev = "75d27daa061458dd5735b5eb5bbc48d3baad1186"; + sha256 = "12yr1awyjl3chifq02yk3477vylli6vx4d2jkypqy7z91c1xf5jf"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5567,12 +5567,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-09-21"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "1b3468b07452e3736b67afd43547f766cc1db307"; - sha256 = "096yp2lpqkr7fv2nh3kk3v06d5mcy1lsr0x3d0y3j7zsy2xxn8fb"; + rev = "eefa696036d7cbaa23d4b72ad272f2c615936e73"; + sha256 = "1wfsv7c4gl7dwy9n7x5pa0xrasim6ksl58ah8l4a6dpayyw2wrgm"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -5591,12 +5591,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-09-23"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d4eb971db353ccf78cefb3be1b05483b69ec1e69"; - sha256 = "0hrf4lkd8ikdrncajylbsgjkpj8vg6yfmbdlqaw6z8bqqk0n28dq"; + rev = "f11fdff7e8b5b415e5ef1837bdcdd37ea6764dda"; + sha256 = "0nr58hq0ywid1ickzs6wqx3dsiggh2384kqp8gr3325p9ygkmkgx"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5627,12 +5627,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-09-05"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "b7587a9155d22761f1b28c18f7927e6df0d08387"; - sha256 = "03jym28bk49609m5k0lw18xir6ia23df4m4av5046zqm9dmvhkj0"; + rev = "2b795eed773d4d693bee9feae1ade84a5e9a39e7"; + sha256 = "12kdn7xg5j6flqafnfx98zv3cr2166730qwmkh48jb18p8pwci3b"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -5675,12 +5675,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-09-22"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "3a8ec89e1918ea2acbb9b22c5ac2006d31773052"; - sha256 = "00ixzciwgzpi2sg6s5cyw8101nnwrv0ks8x77mcqrvpmqnlg6hky"; + rev = "414465468c93f693be4e2f69f47586cf37f3f751"; + sha256 = "04gzpjv8a7hwszs0smd23n11mhia90r00h15ywmlgx7xbp8a9c8y"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5711,12 +5711,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2022-09-22"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "afff8a8cbda4de2b75249ee08359d0584458f0ef"; - sha256 = "1swhn82b2a9gc5kxas9cgdpkvykpb9322ghmk5nwss99i05nrnl0"; + rev = "ee5ed2100b953c315d9fa2bfd08e93d6548253e0"; + sha256 = "0k8x58f12y565283h2rjw8mdlnhv39awldc4d9aqm0ny8vh4mj1h"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -5747,12 +5747,12 @@ final: prev: nvim-surround = buildVimPluginFrom2Nix { pname = "nvim-surround"; - version = "2022-09-26"; + version = "2022-09-27"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "a0b35fd410e16f00543e81dbb6c52c723f49717e"; - sha256 = "1krsgy0x3x9bml8iszd0svz9iqmdn73yn15n49ffznq3vj3gafr2"; + rev = "17191679202978b1de8c1bd5d975400897b1b92d"; + sha256 = "0d9vq7zkn1pzdzhh68qxzciky27n57cwb74ma1s6ibkks9s52f9d"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -5771,24 +5771,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-09-25"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "9914780cbabdffe3cd030867f0bc34c6e51bcb95"; - sha256 = "1w6icjxl3l9djr8gx2p3rvwg0878g64npxn2l6s40iyizdb4qvc6"; + rev = "7282f7de8aedf861fe0162a559fc2b214383c51c"; + sha256 = "1x8alllrhd1ns2gghv8cl0lra9f9rk0qy3h4z4b6rj2dq6if3jx9"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "0289160c963fac1d0330966a798acacf85a43a88"; - sha256 = "0c78089lk5wrj8brszcy08gzp6wvpmwiraynbixnnaxq8cnfmxgn"; + rev = "8e763332b7bf7b3a426fd8707b7f5aa85823a5ac"; + sha256 = "1ah1ywrdcqzqd8jm2rhb9k4wpkq0xcm011vnalkiw1xiax251ndv"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -5831,12 +5831,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-09-03"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "e63c2ff8e38fad77299dd74e14c7c9360e1b3181"; - sha256 = "1f3lkjfb7nh68yd2466fglz5xvzplghq522irfndq8ik5jpwcwbn"; + rev = "41e8d8964e5c874d9ce5e37d00a52f37f218502e"; + sha256 = "0bl98fbxp7sjd943wvz127xqivj8830pgdfwf510lyzczaixn1ds"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -5867,24 +5867,24 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-09-17"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "fad8badcd9baa4deb2cf2a5376ab412a1ba41797"; - sha256 = "1q6daj6q89pf16pxgq8phcjad1l3i8m6afmra2b5ay5f9f2qk53q"; + rev = "1ec3f880585c644ddd50a51502c59f4e36f03e62"; + sha256 = "03403mx5rdknsaia8br0ymc9y53kv8jnnlawfrwralxm1fsrml5h"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2022-09-18"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "969728506c0175644a1d448f55e311ccdada7eaf"; - sha256 = "0ycxr16bxqjrp9mzq263j561jb8si9161asgdq2g1644r7mlzhbv"; + rev = "563f3635c2d8a7be7933b9e547f7c178ba0d4352"; + sha256 = "0lfhv9pd9a9q5qy45f9zag2fzfjlsisrf5h4xd64033331a67pgg"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -6023,12 +6023,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-09-26"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "d8ca7cfd1c64f262568da4531257fa9f54f211b3"; - sha256 = "194yvzk7hi21hbbxrfmnk2xfhkylkl2nc5ymbjvgsy992x16d52r"; + rev = "a8cac3f8634edf16fb0fa855329b48ef3a8eea8d"; + sha256 = "1siwvam38mlcazv6kq1qvrc7rkxs817zah4pkk0107821z38hpyr"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6047,12 +6047,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2022-09-18"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "a31be34c1186f240fbadb9646ff00774f5759595"; - sha256 = "1zicshnz0s4cfv793rd2wyi5mzh90ykg27a4jsydblgcgbqbgnih"; + rev = "749ee2f7fdeb9a02f25195d4850d2ff16240c863"; + sha256 = "0zagysrszabwfxr942dhj4aqdsnbr15qsvq6pvnd99nc3rs05w45"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -6083,12 +6083,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-09-25"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "77ea13332f3c811b707e902c7cb8605c471a2f4c"; - sha256 = "02276gfmkik74248fy2zx888v0vf2fyf9vywagy5d9q566c78zac"; + rev = "95f927355d4c275a9aad1e7fcc576cdb59f42d60"; + sha256 = "197ijymf7ad36zpk9d62nm4nb54d4n1ai17yimx7ji2a2z0qc845"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -6227,12 +6227,12 @@ final: prev: plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-09-17"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "62dc2a7acd2fb2581871a36c1743b29e26c60390"; - sha256 = "1qrdv9as2h591rgv47irz374rwndv0jgaia5a7x931j6j8zr0kkp"; + rev = "4b7e52044bbb84242158d977a50c4cbcd85070c7"; + sha256 = "11815h0h2mf5ym282ghk7xav90635r88qbgaflpgbyk2banl31wl"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -6517,12 +6517,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2022-08-16"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "23f9efc71cc7aa42a44df8a2f20f6812f6c54abf"; - sha256 = "0aj4mx8riiclaccii1y0yzkp6kkkcfvjqgvkkkvr93ywncrfc6h9"; + rev = "d155742d5727373be0b484e87a0635348bbe2895"; + sha256 = "047c1nirs4qldxikx70dgchb8clmqac8255hbwrcydlbqrv6b66y"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -6637,12 +6637,12 @@ final: prev: rust-vim = buildVimPluginFrom2Nix { pname = "rust.vim"; - version = "2021-10-05"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "4aa69b84c8a58fcec6b6dad6fe244b916b1cf830"; - sha256 = "07nh8gvkwq91i7qcz0rk5jlc8sb4d3af4zq2892kmmw576zg1wd8"; + rev = "1cdc5cb4bd061bc30b502e07321682b5a4396dca"; + sha256 = "1xklq4g6dvqd3a5msnrir899hzqmjkscpb8bq9wd4fi3ivmjjjgg"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -6890,12 +6890,12 @@ final: prev: space-vim = buildVimPluginFrom2Nix { pname = "space-vim"; - version = "2022-08-03"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "space-vim"; - rev = "f1465f4c586962cec9231e237f1d6c15b9156a98"; - sha256 = "0qq4g2kldg3hjv5g18na0r2442vg5xa52fs0h004908prnwdsnjr"; + rev = "ad92c42f97c2cb495c34b83f43d91b3d6cfdfa4e"; + sha256 = "1ijzvnj3hff2c0kilqlb2gwv7l141p61176xv4nz5r4v9knqgl5s"; }; meta.homepage = "https://github.com/liuchengxu/space-vim/"; }; @@ -6999,12 +6999,12 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2022-07-23"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "56c5aacd5e31496d9b3cd3d1b0e570bb9a65d35b"; - sha256 = "1yx3bar8gsapaka0x9bkm5d7frzz3k1kpwbc7n110f5x3cirf1yx"; + rev = "47685f0adb89928fc1b2a9b812418680f29aaf27"; + sha256 = "03l86sr766kpggxxk97rc3fy6j4igsprsh19wdq8mzk119nmww0i"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; @@ -7409,12 +7409,12 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency.nvim"; - version = "2022-09-06"; + version = "2022-09-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "d51c7631dcc0f598692676f554c4e79d7596d541"; - sha256 = "03mjzlk28igjjwln61r8g4xz972ps7yfhdxgs4fh3b2m08gqkdnd"; + rev = "9634c3508c6565284065ec011476204ce13f354a"; + sha256 = "1d0d9lwrpxqhvjn1r4jd1dnmra48jabjjbhi35sw41iw1v5v3al3"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -7494,12 +7494,12 @@ final: prev: telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; - version = "2022-09-16"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-project.nvim"; - rev = "91e9a9737b8522b5a4ecbd8464504da35a1e96cd"; - sha256 = "1nlamiyswmkx39m61lqnazdkak6vk6wyv6izl0g5k9g0ribdcjiw"; + rev = "a0dec67decbc85cf1af2002807c8a963f72c1d13"; + sha256 = "0gz7rxzn7phq45ss1bhb5g35z1kq97r7yapvrnb1yi0259jwbxsa"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; @@ -7578,12 +7578,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-09-17"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "30e2dc5232d0dd63709ef8b44a5d6184005e8602"; - sha256 = "1nn6gpmaw8qdx3qf89sjayhhh31x80h52dprxdllyyj0n79a10w4"; + rev = "76ea9a898d3307244dce3573392dcf2cc38f340f"; + sha256 = "0f5x1jxmzj2mndknrz3cbyz8inb127hfw3zvmxiqpg2kjvmvxrhd"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -7722,12 +7722,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2022-09-17"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "02eb3019786d9083b93ab9457761899680c6f3ec"; - sha256 = "1p8gyi405knrb0rf9nqzy4d1ginhamrgsg4nz5x73bjxjf4klmg6"; + rev = "8df75dbb9ddd78a378b9661f25f0b193f38f06dd"; + sha256 = "149rq2w65gqi3972bwsp243qkflkyj2aqc4gc561kj9rkspqh82x"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -7771,12 +7771,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2022-09-24"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "81f0db1bd0b7f4eb8eb9e81c4b4f12b878cefb10"; - sha256 = "0msaz7lh6x2dcgwrxjw1dxrbwh09qx87mcqnhx2hlwy5b10apvmf"; + rev = "66bfc2e8f754869c7b651f3f47a2ee56ae557764"; + sha256 = "1ld3cddnp7hl2zv86b2y2b2fjb3pivq3vlfn2mmnyy5vgflpq0w5"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -7903,12 +7903,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-08-13"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "4f5249b2a6f6308377cb2bf734974a4e6f8a960e"; - sha256 = "0zaiyv63hzk1vaa9xd317zs0s2x1d9rbjam13g7qsm2i3lip6n65"; + rev = "e99fdf15cd55a4a8e0cb0a80a6810c1867a5c401"; + sha256 = "1ym6myhxq4z9h6nnh1dxvkqc4nbhq500wy4mj494lm2hz6nnhl09"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -8359,12 +8359,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-09-26"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "78abec3b83b5fb1bef51fcdddbcbebd7d4293685"; - sha256 = "0ifd90mb1ysry9cpsimd7x2i2q63y17ragwv2rvvxppb4q7kkbdq"; + rev = "46dd87223757619a0a7fb0b075e2cf7d23ea899d"; + sha256 = "0xcv66ic68hgiw5cqdfbnimqdya7hg3zbrrzafgvfx6v468kgy96"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -8743,12 +8743,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-09-25"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "5cd460ca66a734824d35e95f51750858bce1dc1c"; - sha256 = "1521kv2fcay1kx9zyvcwrd1cj85y0slicpj04dhhnvc9my97ydpa"; + rev = "dc7089bef1e9759a219dc7df7efe39053f20fad3"; + sha256 = "1brkxd0yjrpkv9wzd42dzg5xqy3xifd7590f27lqjz2z0fymzgcy"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9031,12 +9031,12 @@ final: prev: vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2022-09-26"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "dec7689004dcf6e5a3a4efd2a55944f7d43aed40"; - sha256 = "0w0k5m3lb29ack7kh8yb1h58r2jc3ygnjywf6v7m7z91py933c40"; + rev = "29ffd51107bff410f9fa667575541e253f4099a1"; + sha256 = "0ibknwr8lc58aggblndr7zm5qjb6nspxcmqad2b8whaxs9176a3h"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -9067,12 +9067,12 @@ final: prev: vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2022-01-10"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "a2258658661e42dd4cdba4958805dbad1fe29ef4"; - sha256 = "044aim36332ss5zlv8vxww8gqv0pldmn3nw08msldkfxmi86ybbd"; + rev = "71f239af28b7214eebb60d4ea5bd040291fb7e33"; + sha256 = "0kshppxgi63wn96a8h9zv7drwqcbljin5jhszh8q7pqw2xsd83gn"; }; meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; @@ -9307,12 +9307,12 @@ final: prev: vim-erlang-runtime = buildVimPluginFrom2Nix { pname = "vim-erlang-runtime"; - version = "2022-09-16"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-runtime"; - rev = "6dc03035315a5d694c8e5bd852937784766b7904"; - sha256 = "0n6wm3pydc08ryvqkhs98lszqaxql975w9smlzr55h3a9xmyj7p6"; + rev = "f7d4bbdcff675000d4345d9834cc7d825a84ed3f"; + sha256 = "0b4f2jwsbsbysg364pslw8c94nvh5q2clfxfnz3lqrkkl1cpr3cs"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; }; @@ -10281,12 +10281,12 @@ final: prev: vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2022-08-12"; + version = "2022-09-30"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "519befb7004bf3a66a3ddfdc2d431b0bd360dc97"; - sha256 = "0dg23ayi191xjvhyyb52byjvl731xrrf9255h3qci7hi3p20jkcy"; + rev = "212e3aa210c9f0965e4b234653a08fd3aa525470"; + sha256 = "1vbkm5rs0n9hhcv462ldrf3acx4q170fgzzp44444dmxd7w2pgf9"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -10510,12 +10510,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-09-21"; + version = "2022-10-01"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "80ad7817e58755a602f993163f61f3500978ebe5"; - sha256 = "1q001rwqp04nl09xl32c328vbbdmm9n51i3a8wszqpz3blp4jl3s"; + rev = "3fa1b2283e957784922fe891de361a2342b90bca"; + sha256 = "0x86wmph3pb4bkqddb1zm381q9214hvf7cq9ydch4hjbx0vmbjwi"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -10606,12 +10606,12 @@ final: prev: vim-mucomplete = buildVimPluginFrom2Nix { pname = "vim-mucomplete"; - version = "2022-05-25"; + version = "2022-09-28"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-mucomplete"; - rev = "71269817dd8f5a9122ae40891bb116050cadbf89"; - sha256 = "1f0rjxb7x6haz96j3wqrayk972k6g8kw4c40m3rcfhp2bxsn1g9m"; + rev = "03bcd4a7dfe0a2f6d432e8ce936d35273a15209d"; + sha256 = "04vqya8dsphxia5j080ir7jk61jak2gc6xhg810wwxql4zls3fs1"; }; meta.homepage = "https://github.com/lifepillar/vim-mucomplete/"; }; @@ -11951,12 +11951,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-09-22"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "8e2d3f55fdf315903a59cfa9ee60bac283a5f7fa"; - sha256 = "0fnjgalxgyjzy5c5j20zvla1c645hgf2d5mqinz397xxss672mfm"; + rev = "e7150de777ef0c81a015972e4feb56c4b3137efd"; + sha256 = "03jc3jf4znhknvw90iqyn4jpwm13fc3w0nw4vllggwxzvihha1hv"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -12623,12 +12623,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-09-23"; + version = "2022-09-27"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "46c280d2fb9b329ae8dec8c1e520cab3a3d5b743"; - sha256 = "158yiba4hnai1fk8yq0dz6rmrhy17h8rb8gkaajac2b5c8f823f2"; + rev = "c95ad4c8fb54adb75ceb0397ef6ace1c4eec3790"; + sha256 = "1mxgw6zx529lmi98z4072zc0ri9idf2ysaxmfby3wycl2z73b7k8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -12636,12 +12636,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-09-26"; + version = "2022-09-29"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "f72d835b40946a2c934f9cb775dc2d6b1eae0b66"; - sha256 = "0828792i2kjjd8yvc3xj7206klhb8i82n1l2flzkl2r4asdncjd7"; + rev = "54fd9f5ba70ba907e683a42e2b1903133a98dd60"; + sha256 = "04ksc7kw8w84ck7j1v7j16f0n85g6sv66cv4k6v8wdr3zm544zhl"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -12959,14 +12959,26 @@ final: prev: meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; + windows-nvim = buildVimPluginFrom2Nix { + pname = "windows.nvim"; + version = "2022-09-28"; + src = fetchFromGitHub { + owner = "anuvyklack"; + repo = "windows.nvim"; + rev = "e3a1217976d4ec8d2515cb634dbf5d26cabd46d5"; + sha256 = "1wpbspyjxcdvvbdysk0982wg24fy0p47df6c8d9rs2dmzb9zghv3"; + }; + meta.homepage = "https://github.com/anuvyklack/windows.nvim/"; + }; + catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "ef90176bb55fb71da491c4b6c098986c22f1d8e5"; - sha256 = "145m98vihgy8qpgdsxqqcv66m804i8ysf30flck896rfz492dqy6"; + rev = "a111e8075101c0ac8be79f293e8c5181efa06402"; + sha256 = "0zqfl8xrwvab2gypw85kjirl10gc4afnwddz9j3spcq1mc11c3sn"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -12985,12 +12997,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-09-27"; + version = "2022-10-02"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "7cd1f0acb516f031648d5e93d9abf56c025cc82a"; - sha256 = "1y9jk7pqgbdjiinx9sx7hibxah9rxaq4nfjr8mxg6w04jacwdmn7"; + rev = "f58e1b82cf3c2f2b89d9f9c41a9fa3215880ad5c"; + sha256 = "02dzhfwmvqrkj19cgsinbvzdha6w1nw287dr0b1r6j5i5aqkqapa"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; From 85710fbd86ca92f6fcb21fa46a57798c79afab80 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 2 Oct 2022 18:51:17 -0400 Subject: [PATCH 087/269] vimPlugins: resolve github repository redirects --- .../editors/vim/plugins/generated.nix | 24 +++++++++---------- .../editors/vim/plugins/vim-plugin-names | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index df4084892ba0..fd40986d39d2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -12766,6 +12766,18 @@ final: prev: meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; + windows-nvim = buildVimPluginFrom2Nix { + pname = "windows.nvim"; + version = "2022-09-28"; + src = fetchFromGitHub { + owner = "anuvyklack"; + repo = "windows.nvim"; + rev = "e3a1217976d4ec8d2515cb634dbf5d26cabd46d5"; + sha256 = "1wpbspyjxcdvvbdysk0982wg24fy0p47df6c8d9rs2dmzb9zghv3"; + }; + meta.homepage = "https://github.com/anuvyklack/windows.nvim/"; + }; + winshift-nvim = buildVimPluginFrom2Nix { pname = "winshift.nvim"; version = "2022-09-06"; @@ -12959,18 +12971,6 @@ final: prev: meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; - windows-nvim = buildVimPluginFrom2Nix { - pname = "windows.nvim"; - version = "2022-09-28"; - src = fetchFromGitHub { - owner = "anuvyklack"; - repo = "windows.nvim"; - rev = "e3a1217976d4ec8d2515cb634dbf5d26cabd46d5"; - sha256 = "1wpbspyjxcdvvbdysk0982wg24fy0p47df6c8d9rs2dmzb9zghv3"; - }; - meta.homepage = "https://github.com/anuvyklack/windows.nvim/"; - }; - catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; version = "2022-10-02"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d9ab6cf89a21..cbce1a3dcf02 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1071,6 +1071,7 @@ https://github.com/mattn/webapi-vim/,, https://github.com/folke/which-key.nvim/,, https://github.com/gelguy/wilder.nvim/,, https://github.com/gcmt/wildfire.vim/,, +https://github.com/anuvyklack/windows.nvim/,, https://github.com/sindrets/winshift.nvim/,, https://github.com/wannesm/wmgraphviz.vim/,, https://github.com/vim-scripts/wombat256.vim/,, @@ -1087,4 +1088,3 @@ https://github.com/ziglang/zig.vim/,, https://github.com/mickael-menu/zk-nvim/,HEAD, https://github.com/troydm/zoomwintab.vim/,, https://github.com/nanotee/zoxide.vim/,, -https://github.com/anuvyklack/windows.nvim/,, From 7d0d078d504a04dc18a303b7e4c29f354dbdbceb Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 2 Oct 2022 18:51:23 -0400 Subject: [PATCH 088/269] vimPlugins.template-string-nvim: init at 2022-08-18 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index fd40986d39d2..3e12947f4b3b 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -7588,6 +7588,18 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; + template-string-nvim = buildVimPluginFrom2Nix { + pname = "template-string.nvim"; + version = "2022-08-18"; + src = fetchFromGitHub { + owner = "axelvc"; + repo = "template-string.nvim"; + rev = "84e50b878caa92100c65deec12ccb41aa4ef3fae"; + sha256 = "1ibz9vpqy0lck8pxzr3bikrw3zcrrw0nx5kz53a5n38qrb4l95gg"; + }; + meta.homepage = "https://github.com/axelvc/template-string.nvim/"; + }; + tender-vim = buildVimPluginFrom2Nix { pname = "tender.vim"; version = "2021-05-24"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index cbce1a3dcf02..054b273a8a7e 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -636,6 +636,7 @@ https://github.com/tom-anders/telescope-vim-bookmarks.nvim/,, https://github.com/nvim-telescope/telescope-z.nvim/,, https://github.com/jvgrootveld/telescope-zoxide/,, https://github.com/nvim-telescope/telescope.nvim/,, +https://github.com/axelvc/template-string.nvim/,HEAD, https://github.com/jacoborus/tender.vim/,, https://github.com/wincent/terminus/,, https://github.com/oberblastmeister/termwrapper.nvim/,, From 3565d5566c399d9625d77efb0e97e1797197c470 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 2 Oct 2022 18:51:31 -0400 Subject: [PATCH 089/269] vimPlugins.nvim-rename-state: init at 2022-09-29 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3e12947f4b3b..49416992366f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5697,6 +5697,18 @@ final: prev: meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; + nvim-rename-state = buildVimPluginFrom2Nix { + pname = "nvim-rename-state"; + version = "2022-09-29"; + src = fetchFromGitHub { + owner = "olrtg"; + repo = "nvim-rename-state"; + rev = "d8a2ad1d3e9269d673007dbd0e76871bb10da878"; + sha256 = "1aj9pz1y3yn63z4nyifs3f47j3zcbwl4v42l64rjz7m9pzdsa34b"; + }; + meta.homepage = "https://github.com/olrtg/nvim-rename-state/"; + }; + nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; version = "2022-09-26"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 054b273a8a7e..d5abababab68 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -479,6 +479,7 @@ https://github.com/AckslD/nvim-neoclip.lua/,, https://github.com/yamatsum/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, https://github.com/gennaro-tedesco/nvim-peekup/,, +https://github.com/olrtg/nvim-rename-state/,HEAD, https://github.com/dstein64/nvim-scrollview/,, https://github.com/dcampos/nvim-snippy/,HEAD, https://github.com/ishan9299/nvim-solarized-lua/,, From eadcfe74dd9dabd9f4477f9666568071e2d1d9f2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 2 Oct 2022 18:51:40 -0400 Subject: [PATCH 090/269] vimPlugins.nvim-highlight-colors: init at 2022-09-28 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 49416992366f..3966128380b5 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5469,6 +5469,18 @@ final: prev: meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; + nvim-highlight-colors = buildVimPluginFrom2Nix { + pname = "nvim-highlight-colors"; + version = "2022-09-28"; + src = fetchFromGitHub { + owner = "brenoprata10"; + repo = "nvim-highlight-colors"; + rev = "5d20935b99d976ffa0d8226a78a8b2e091f0f699"; + sha256 = "0mqczqcrz2iz0k52k5bglad6rbsr8dddm5mvb1gsihbqp0ijyj85"; + }; + meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; + }; + nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; version = "2022-08-22"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d5abababab68..fc9a83184d14 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -460,6 +460,7 @@ https://github.com/vijaymarupudi/nvim-fzf/,, https://github.com/vijaymarupudi/nvim-fzf-commands/,, https://github.com/sakhnik/nvim-gdb/,, https://github.com/smiteshp/nvim-gps/,, +https://github.com/brenoprata10/nvim-highlight-colors/,HEAD, https://github.com/Iron-E/nvim-highlite/,, https://github.com/kevinhwang91/nvim-hlslens/,, https://github.com/neovimhaskell/nvim-hs.vim/,, From 4607eebf3a8bd69c2fb0e1dfe1ce7c6090d7346c Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 2 Oct 2022 18:51:47 -0400 Subject: [PATCH 091/269] vimPlugins.auto-save-nvim: init at 2022-08-06 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3966128380b5..f2476b0412d6 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -736,6 +736,18 @@ final: prev: meta.homepage = "https://github.com/jiangmiao/auto-pairs/"; }; + auto-save-nvim = buildVimPluginFrom2Nix { + pname = "auto-save.nvim"; + version = "2022-08-06"; + src = fetchFromGitHub { + owner = "pocco81"; + repo = "auto-save.nvim"; + rev = "2c7a2943340ee2a36c6a61db812418fca1f57866"; + sha256 = "0zfy1pw39c0zf4mfd8kgl1hj9h1hcbsql32rp0wk0kf714hbxqli"; + }; + meta.homepage = "https://github.com/pocco81/auto-save.nvim/"; + }; + auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; version = "2022-09-19"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index fc9a83184d14..e02ef4471aae 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -60,6 +60,7 @@ https://github.com/vmchale/ats-vim/,, https://github.com/ray-x/aurora/,, https://github.com/hotwatermorning/auto-git-diff/,, https://github.com/jiangmiao/auto-pairs/,, +https://github.com/pocco81/auto-save.nvim/,HEAD, https://github.com/rmagatti/auto-session/,, https://github.com/vim-scripts/autoload_cscope.vim/,, https://github.com/rafi/awesome-vim-colorschemes/,, From 85301d07cd52c36fadfc1b83fbebd1d3b4d88bff Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 2 Oct 2022 18:53:49 -0400 Subject: [PATCH 092/269] vimPlugins.vim-clap: fix cargoSha256 --- pkgs/applications/editors/vim/plugins/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 743c0b99f8a3..be365caeabdb 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -983,7 +983,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-g5yNqDCN1O9x7/HcM8NsZlMwLudDTuPLE5gSpScNQnY="; + cargoSha256 = "sha256-AY14YEdMpHXmiHwEA9hwSwwwJ8hYIomAuIuCJv1OUDw="; }; in '' From 90b6f0d20a6e46de0b8a14ee52fe45326c9375ce Mon Sep 17 00:00:00 2001 From: zendo Date: Sat, 1 Oct 2022 06:48:09 +0800 Subject: [PATCH 093/269] kooha: 2.0.1 -> 2.2.2 --- pkgs/applications/video/kooha/default.nix | 28 +++++++---------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/video/kooha/default.nix b/pkgs/applications/video/kooha/default.nix index 66cac403727a..37644b10252b 100644 --- a/pkgs/applications/video/kooha/default.nix +++ b/pkgs/applications/video/kooha/default.nix @@ -4,8 +4,8 @@ , appstream-glib , desktop-file-utils , glib -, gobject-introspection , gst_all_1 +, pipewire , gtk4 , libadwaita , libpulseaudio @@ -13,27 +13,26 @@ , meson , ninja , pkg-config -, python3 , rustPlatform , wayland -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "kooha"; - version = "2.0.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "SeaDve"; repo = "Kooha"; rev = "v${version}"; - sha256 = "05ynpwjdpl7zp9f17zhhvb59rbz3gd7hc0amla1g85ldgfxbgl00"; + hash = "sha256-HgouIMbwpmR/K1hPU7QDzeEtyi5hC66huvInkJFLS2w="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256:16zf6vb001z7xdv2g4kpmb2vqsmaql2cpsx1rl9zrfhpl2z6frs9"; + hash = "sha256-rdxD9pys11QcUtufcZ/zCrviytyc8hIXJfsXg2JoaKE="; }; nativeBuildInputs = [ @@ -41,18 +40,15 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - python3 pkg-config rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc - wayland - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ glib - gobject-introspection gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-ugly @@ -60,18 +56,10 @@ stdenv.mkDerivation rec { libadwaita libpulseaudio librsvg + wayland + pipewire ]; - propagatedBuildInputs = [ python3.pkgs.pygobject3 ]; - - strictDeps = false; - - # Fixes https://github.com/NixOS/nixpkgs/issues/31168 - postPatch = '' - patchShebangs build-aux/meson_post_install.py - substituteInPlace meson.build --replace '>= 1.0.0-alpha.1' '>= 1.0.0' - ''; - installCheckPhase = '' $out/bin/kooha --help ''; From abb91732c5f32dfb784c7d2fc6c98465da52296c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 01:24:26 +0000 Subject: [PATCH 094/269] signal-cli: 0.10.11 -> 0.11.0 --- .../networking/instant-messengers/signal-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index dd2a34a60fa4..79cceed6feef 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.10.11"; + version = "0.11.0"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz"; - sha256 = "sha256-tBgtSYKSoyze9qFWpy6IUdwMU9KCLZGEIpOkjLdHsHM="; + sha256 = "sha256-BIVeY4H5pn8hdjUkSDrlVMTXy5wuMskkSlccfgCWc6Q="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; From 6ba7e643cd29bcbf96d11629a7cb98d7d95a36df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 01:42:56 +0000 Subject: [PATCH 095/269] srain: 1.4.1 -> 1.5.0 --- pkgs/applications/networking/irc/srain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix index 20cadacb85a1..d17fcb07a03b 100644 --- a/pkgs/applications/networking/irc/srain/default.nix +++ b/pkgs/applications/networking/irc/srain/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "srain"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "SrainApp"; repo = "srain"; rev = version; - sha256 = "sha256-zkSePzmbi/QnUYJO/henkxfhuN+BXTXtKGPW7M2QyBY="; + sha256 = "sha256-AJ02S5+A/n8kO6lic8EbPYqNDmHL/tKbXhIkHTrcXOM="; }; nativeBuildInputs = [ From 8b920d919c81ebf563aba7d8bb1e12e294605c95 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Oct 2022 03:48:26 +0200 Subject: [PATCH 096/269] maintainers/team-list: Update feature freeze team selection GitHub issues allow roughly 65-70 mentions on a single comment, so I think it's wise to reduce the selection to teams that maintain some critical component or a larger ecosystem within nixpkgs. Everyone is of course always welcome to check-in regardless and report important issues, that deserve attention. --- maintainers/team-list.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index fbd7972cb2bb..d207dc9bc7bc 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -38,6 +38,7 @@ with lib.maintainers; { ]; scope = "Maintain ACME-related packages and modules."; shortName = "ACME"; + enableFeatureFreezePing = true; }; bazel = { @@ -90,7 +91,6 @@ with lib.maintainers; { ]; scope = "Maintain Blockchain packages and modules."; shortName = "Blockchains"; - enableFeatureFreezePing = true; }; c = { @@ -111,7 +111,6 @@ with lib.maintainers; { ]; scope = "Maintain packages used in the C3D2 hackspace"; shortName = "c3d2"; - enableFeatureFreezePing = true; }; cinnamon = { @@ -202,7 +201,6 @@ with lib.maintainers; { ]; scope = "Maintain Docker and related tools."; shortName = "DockerTools"; - enableFeatureFreezePing = true; }; docs = { @@ -220,7 +218,6 @@ with lib.maintainers; { ]; scope = "Maintain the Emacs editor and packages."; shortName = "Emacs"; - enableFeatureFreezePing = true; }; enlightenment = { @@ -426,6 +423,7 @@ with lib.maintainers; { ]; scope = "Maintain Mate desktop environment and related packages."; shortName = "MATE"; + enableFeatureFreezePing = true; }; matrix = { @@ -448,7 +446,6 @@ with lib.maintainers; { ]; scope = "Maintain Mobile NixOS."; shortName = "Mobile"; - enableFeatureFreezePing = true; }; nix = { @@ -483,7 +480,6 @@ with lib.maintainers; { tazjin zimbatm ]; - enableFeatureFreezePing = true; scope = "Group registration for Numtide team members who collectively maintain packages."; shortName = "Numtide team"; }; @@ -548,7 +544,6 @@ with lib.maintainers; { ]; scope = "Maintain Podman and CRI-O related packages and modules."; shortName = "Podman"; - enableFeatureFreezePing = true; }; postgres = { @@ -557,7 +552,6 @@ with lib.maintainers; { ]; scope = "Maintain the PostgreSQL package and plugins along with the NixOS module."; shortName = "PostgreSQL"; - enableFeatureFreezePing = true; }; python = { @@ -610,7 +604,6 @@ with lib.maintainers; { ]; scope = "Manage the current nixpkgs/NixOS release."; shortName = "Release"; - enableFeatureFreezePing = true; }; ruby = { @@ -699,7 +692,6 @@ with lib.maintainers; { ]; scope = "Maintain the vim and neovim text editors and related packages."; shortName = "Vim/Neovim"; - enableFeatureFreezePing = true; }; xfce = { @@ -708,5 +700,6 @@ with lib.maintainers; { ]; scope = "Maintain Xfce desktop environment and related packages."; shortName = "Xfce"; + enableFeatureFreezePing = true; }; } From e08918e91dd646e24001dd59fa7999bf39d25981 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Oct 2022 03:54:50 +0200 Subject: [PATCH 097/269] maintainers/team-list: Extend `enableFeatureFreezePing` documentation --- maintainers/team-list.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index d207dc9bc7bc..9c855b92499f 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -15,6 +15,8 @@ - `scope` describes the scope of the group. - `shortName` short human-readable name - `enableFeatureFreezePing` will ping this team during the Feature Freeze announcements on releases + - There is limited mention capacity in a single post, so this should be reserved for critical components + or larger ecosystems within nixpkgs. - `githubTeams` will ping specified GitHub teams as well More fields may be added in the future. From 292aab9822c1f0fcdabdfd81e6dd8db1e39df894 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Mon, 3 Oct 2022 11:10:46 +0800 Subject: [PATCH 098/269] nixos/systemd: update extraConfig description --- nixos/modules/system/boot/systemd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index a3bff27626d8..8f2044a0985e 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -325,8 +325,8 @@ in type = types.lines; example = "DefaultLimitCORE=infinity"; description = lib.mdDoc '' - Extra config options for systemd. See man systemd-system.conf for - available options. + Extra config options for systemd. See systemd-system.conf(5) man page + for available options. ''; }; From a0a570bf789c20cc1d7376248c8273500fad6e3a Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Mon, 3 Oct 2022 08:19:53 +0200 Subject: [PATCH 099/269] pkgsStatic.lz4: fix build --- pkgs/tools/compression/lz4/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index bf048eeb87df..579ee9b2094c 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, valgrind +{ lib, stdenv, fetchFromGitHub, fetchpatch, valgrind , enableStatic ? stdenv.hostPlatform.isStatic , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -14,6 +14,16 @@ stdenv.mkDerivation rec { owner = pname; }; + patches = lib.optionals (!enableShared) [ + # This patch is already part of the `dev` branch. + # Remove when upgrading to the next version. + (fetchpatch { + name = "lz4-fix-BUILD_SHARED=no.patch"; + url = "https://github.com/lz4/lz4/commit/5ccbd38277989ae6a728171d59ae03bad6f2f4d5.patch"; + sha256 = "sha256-P+/uz3m7EAmHgXF/1Vncc0uKKxNVq6HNIsElx0rGxpw="; + }) + ]; + # TODO(@Ericson2314): Separate binaries and libraries outputs = [ "bin" "out" "dev" ]; From 41963339b973da3e3782e227aee22e3537f21909 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Mon, 3 Oct 2022 08:28:17 +0200 Subject: [PATCH 100/269] pkgsStatic.protobuf: fix installation of protoc --- .../libraries/protobuf/generic-v3-cmake.nix | 2 ++ .../static-executables-have-no-rpath.patch | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch diff --git a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix index 07e84a2ae066..207017b5edd5 100644 --- a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ b/pkgs/development/libraries/protobuf/generic-v3-cmake.nix @@ -53,6 +53,8 @@ let url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; }) + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + ./static-executables-have-no-rpath.patch ]; nativeBuildInputs = let diff --git a/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch b/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch new file mode 100644 index 000000000000..cd2474e14590 --- /dev/null +++ b/pkgs/development/libraries/protobuf/static-executables-have-no-rpath.patch @@ -0,0 +1,18 @@ +diff --git a/cmake/install.cmake b/cmake/install.cmake +index 26a55be8b..b6823c3f9 100644 +--- a/cmake/install.cmake ++++ b/cmake/install.cmake +@@ -32,13 +32,6 @@ if (protobuf_BUILD_PROTOC_BINARIES) + install(TARGETS protoc EXPORT protobuf-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) +- if (UNIX AND NOT APPLE) +- set_property(TARGET protoc +- PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") +- elseif (APPLE) +- set_property(TARGET protoc +- PROPERTY INSTALL_RPATH "@loader_path/../lib") +- endif() + endif (protobuf_BUILD_PROTOC_BINARIES) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc ${CMAKE_CURRENT_BINARY_DIR}/protobuf-lite.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") From d6a4694b65b879941a07f544ca9f7b8dfa766dc2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Oct 2022 08:35:02 +0200 Subject: [PATCH 101/269] python310Packages.meshtastic: 1.3.36 -> 1.3.37 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 2432abe7b09c..411dea4204b9 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.3.36"; + version = "1.3.37"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - hash = "sha256-mv4sj9W8bWSaqiPlBdW0v0QAPr9beD/sOgrfJH68S5o="; + hash = "sha256-UcB8f0Ywmzm/EED4NECO4UkaxhtnYUpfUJPvkWIcKNg="; }; propagatedBuildInputs = [ From 635a92a26afecc6be4f90fe4f38768e111296043 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Oct 2022 08:37:16 +0200 Subject: [PATCH 102/269] python310Packages.velbus-aio: 2022.9.1 -> 2022.10.1 --- pkgs/development/python-modules/velbus-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index e001ce95d03e..ab367f615a0a 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2022.9.1"; + version = "2022.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "sha256-sJ90vfw3JefDsafmEc5sUtPxlQJ4CPtWHpY+mp1cMw8="; + sha256 = "sha256-/CwBe8S2aiOhNqs7LksthcZv0AXIaYFtw024toN1ivs="; fetchSubmodules = true; }; From b72c3fe1afedbc5876db3c12a91941e7e3d63546 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Oct 2022 08:40:40 +0200 Subject: [PATCH 103/269] python310Packages.venstarcolortouch: 0.18 -> 0.19 --- pkgs/development/python-modules/venstarcolortouch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/venstarcolortouch/default.nix b/pkgs/development/python-modules/venstarcolortouch/default.nix index 0672060d3570..2eb878e8d9c2 100644 --- a/pkgs/development/python-modules/venstarcolortouch/default.nix +++ b/pkgs/development/python-modules/venstarcolortouch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "venstarcolortouch"; - version = "0.18"; + version = "0.19"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ucz0Ejpgiss8boF8dzt45FwpieNoJ6S3DUvtay6FDrw="; + sha256 = "sha256-QjcoF46GrBH7ExGQno8xDgtOSGNxhAP+NycJb22hL+E="; }; propagatedBuildInputs = [ From 79ab1e634b038667be4b089fca75e3c8d60d2eb1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Oct 2022 08:43:01 +0200 Subject: [PATCH 104/269] python310Packages.yolink-api: 0.0.9 -> 0.1.0 --- pkgs/development/python-modules/yolink-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index 4247cb7d7895..ed5edf43c03d 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.0.9"; + version = "0.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = pname; rev = "v${version}"; - hash = "sha256-ROw+azrexDfATo7KtFwNEx175s6O6Zqcv9bZbOHMnP8="; + hash = "sha256-uEW8d8b7ObwmGwVTOq25kZWaLVv4lxTl+cqZK5Kjkmo="; }; propagatedBuildInputs = [ From 635239b68f20904e1af493c6f4f6872e52abe8d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Oct 2022 08:51:10 +0200 Subject: [PATCH 105/269] python310Packages.qcs-api-client: 0.21.1 -> 0.21.2 --- pkgs/development/python-modules/qcs-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qcs-api-client/default.nix b/pkgs/development/python-modules/qcs-api-client/default.nix index 925d2e014a03..22e29ce3a762 100644 --- a/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/pkgs/development/python-modules/qcs-api-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.21.1"; + version = "0.21.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Fhu2XtreilkxwUZPmr79jFsNoajpLs0AzTMc7BaiduA="; + hash = "sha256-gQow1bNRPhUm4zRu2T5FpcgOTcS2F1TQIz8WP1K0Xww="; }; nativeBuildInputs = [ From 6428e72f1a10121cf628446a46ca2a74c75b7e35 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Oct 2022 08:59:20 +0200 Subject: [PATCH 106/269] python310Packages.time-machine: 2.8.1 -> 2.8.2 --- pkgs/development/python-modules/time-machine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix index 81dcf1053712..44335c7248b9 100644 --- a/pkgs/development/python-modules/time-machine/default.nix +++ b/pkgs/development/python-modules/time-machine/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "time-machine"; - version = "2.8.1"; + version = "2.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "adamchainz"; repo = pname; rev = version; - sha256 = "sha256-65jX6R3tZ5guouEug/mClvNqg0LE4v9OGzCL0eFyqsA="; + sha256 = "sha256-EFlvO9QlOP351kZAFQ+hwghL+7m+Cin/OyLV3NX+y8E="; }; propagatedBuildInputs = [ From 9ef4c7f4f6b23a8f0f4c59fa6de68494389411e6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Oct 2022 09:06:53 +0200 Subject: [PATCH 107/269] nmap: 7.92 -> 7.93 --- pkgs/tools/security/nmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 5e71c2e16551..d6276b3cc40e 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { pname = "nmap"; - version = "7.92"; + version = "7.93"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "sha256-pUefL4prCyUWdn0vcYnDhsHchY2ZcWfX7Fz8eYx1caE="; + sha256 = "sha256-Vbz+R5PiWsyWukJ02MQijbVQuOjv1yAEs47FWi3RZlE="; }; patches = [ ./zenmap.patch ] From 62c7443beb8221418eba1d987e5d78be85de8a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 3 Oct 2022 09:46:19 +0200 Subject: [PATCH 108/269] vdr: Set platform to linux --- pkgs/applications/video/vdr/default.nix | 2 +- pkgs/applications/video/vdr/plugins.nix | 12 ++++++------ pkgs/applications/video/vdr/softhddevice/default.nix | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 5584e63ab446..68750ac918cb 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -50,7 +50,7 @@ homepage = "http://www.tvdr.de/"; description = "Video Disc Recorder"; maintainers = [ maintainers.ck3d ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.linux; license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 6719b0412b82..9d25e03710e7 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -46,7 +46,7 @@ in { description = "DVB Frontend Status Monitor plugin for VDR"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -92,7 +92,7 @@ in { description = "MarkAd marks advertisements in VDR recordings."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -140,7 +140,7 @@ in { description = "Searchtimer and replacement of the VDR program menu"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -165,7 +165,7 @@ in { description = "VDR plugin to handle KODI clients."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -201,7 +201,7 @@ in { description = "VDR Text2Skin Plugin"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; @@ -226,7 +226,7 @@ in { description = "A plugin for VDR to access AVMs Fritz Box routers"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; }; } diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 1b7f4128ca61..e09e01d1ea7c 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "VDR SoftHDDevice Plug-in"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; - platforms = [ "i686-linux" "x86_64-linux" ]; + inherit (vdr.meta) platforms; }; } From 00d53d212b4cfa317287f3670fd215bdbb5891d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 07:47:32 +0000 Subject: [PATCH 109/269] flyctl: 0.0.402 -> 0.0.403 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 9a17d8e8a64c..d566f92e9f5c 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.402"; + version = "0.0.403"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-SKnSVa+ZARlCA6lrpDZpn5vkJmdvEp3aMwGtpT31jrc="; + sha256 = "sha256-8hnK/W/ro9FKzddu8VKqldr3JU6Weiszq6Hpy/d96Ok="; }; vendorSha256 = "sha256-gmqCqZ0w7UQDxovxUFm3uweTh/gCAhcqCk/9zt54ndI="; From 6a1359e4a236ef32d5f9fcdf6e533d269a659bf1 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 26 Nov 2021 18:00:14 +0100 Subject: [PATCH 110/269] tandoor-recipes: init at 1.4.1 --- .../misc/tandoor-recipes/common.nix | 19 +++ .../misc/tandoor-recipes/default.nix | 135 ++++++++++++++++++ .../misc/tandoor-recipes/frontend.nix | 57 ++++++++ .../misc/tandoor-recipes/media-root.patch | 17 +++ .../misc/tandoor-recipes/update.sh | 42 ++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 272 insertions(+) create mode 100644 pkgs/applications/misc/tandoor-recipes/common.nix create mode 100644 pkgs/applications/misc/tandoor-recipes/default.nix create mode 100644 pkgs/applications/misc/tandoor-recipes/frontend.nix create mode 100644 pkgs/applications/misc/tandoor-recipes/media-root.patch create mode 100755 pkgs/applications/misc/tandoor-recipes/update.sh diff --git a/pkgs/applications/misc/tandoor-recipes/common.nix b/pkgs/applications/misc/tandoor-recipes/common.nix new file mode 100644 index 000000000000..77f1c3f9aef5 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/common.nix @@ -0,0 +1,19 @@ +{ lib, fetchFromGitHub }: +rec { + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "TandoorRecipes"; + repo = "recipes"; + rev = version; + sha256 = "sha256-Q/IwjSByCUXVYxhk3U7oWvlMxrJxyajhpsRyq67PVHY="; + }; + + yarnSha256 = "sha256-gH0q3pJ2BC5pAU9KSo3C9DDRUnpypoyLOEqKSrkxYrk="; + + meta = with lib; { + homepage = "https://tandoor.dev/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix new file mode 100644 index 000000000000..eb0a8fde447c --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -0,0 +1,135 @@ +{ callPackage +, python3 +}: +let + python = python3.override { + packageOverrides = self: super: { + django = super.django_4; + + # Tests are incompatible with Django 4 + django-js-reverse = super.django-js-reverse.overridePythonAttrs (_: { + doCheck = false; + }); + }; + }; + + common = callPackage ./common.nix { }; + + frontend = callPackage ./frontend.nix { }; +in +python.pkgs.pythonPackages.buildPythonPackage rec { + pname = "tandoor-recipes"; + + inherit (common) version src; + + format = "other"; + + patches = [ + # Allow setting MEDIA_ROOT through environment variable + ./media-root.patch + ]; + + propagatedBuildInputs = with python.pkgs; [ + beautifulsoup4 + bleach + bleach-allowlist + boto3 + cryptography + django + django-allauth + django-annoying + django-auth-ldap + django-autocomplete-light + django-cleanup + django-cors-headers + django-crispy-forms + django-hcaptcha + django-js-reverse + django-oauth-toolkit + django-prometheus + django-scopes + django-storages + django-tables2 + django-webpack-loader + django_treebeard + djangorestframework + drf-writable-nested + gunicorn + icalendar + jinja2 + lxml + markdown + microdata + pillow + psycopg2 + pyppeteer + python-dotenv + pytube + pyyaml + recipe-scrapers + requests + six + uritemplate + validators + webdavclient3 + whitenoise + ]; + + configurePhase = '' + runHook preConfigure + + ln -sf ${frontend}/ cookbook/static/vue + cp ${frontend}/webpack-stats.json vue/ + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + # Avoid dependency on django debug toolbar + export DEBUG=0 + + # See https://github.com/TandoorRecipes/recipes/issues/2043 + mkdir cookbook/static/themes/maps/ + touch cookbook/static/themes/maps/style.min.css.map + touch cookbook/static/themes/bootstrap.min.css.map + touch cookbook/static/css/bootstrap-vue.min.css.map + + ${python.pythonForBuild.interpreter} manage.py collectstatic_js_reverse + ${python.pythonForBuild.interpreter} manage.py collectstatic + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp -r . $out/lib/tandoor-recipes + chmod +x $out/lib/tandoor-recipes/manage.py + makeWrapper $out/lib/tandoor-recipes/manage.py $out/bin/tandoor-recipes \ + --prefix PYTHONPATH : "$PYTHONPATH" + + runHook postInstall + ''; + + checkInputs = with python.pkgs; [ + pytestCheckHook + pytest-django + pytest-factoryboy + ]; + + passthru = { + inherit frontend python; + + updateScript = ./update.sh; + }; + + meta = common.meta // { + description = '' + Application for managing recipes, planning meals, building shopping lists + and much much more! + ''; + }; +} diff --git a/pkgs/applications/misc/tandoor-recipes/frontend.nix b/pkgs/applications/misc/tandoor-recipes/frontend.nix new file mode 100644 index 000000000000..47dcde5aca51 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/frontend.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs-16_x }: +let + common = callPackage ./common.nix { }; +in +stdenv.mkDerivation { + pname = "tandoor-recipes-frontend"; + inherit (common) version; + + src = "${common.src}/vue"; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${common.src}/vue/yarn.lock"; + sha256 = common.yarnSha256; + }; + + nativeBuildInputs = [ + fixup_yarn_lock + # Use Node JS 16 because of @achrinza/node-ipc@9.2.2 + nodejs-16_x + nodejs-16_x.pkgs.yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$yarnOfflineCache" + fixup_yarn_lock yarn.lock + command -v yarn + yarn install --frozen-lockfile --offline --no-progress --non-interactive + patchShebangs node_modules/ + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -R ../cookbook/static/vue/ $out + cp webpack-stats.json $out + echo "${common.version}" > "$out/version" + + runHook postInstall + ''; + + meta = common.meta // { + description = "Tandoor Recipes frontend"; + }; +} diff --git a/pkgs/applications/misc/tandoor-recipes/media-root.patch b/pkgs/applications/misc/tandoor-recipes/media-root.patch new file mode 100644 index 000000000000..8114ca8aaeb3 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/media-root.patch @@ -0,0 +1,17 @@ +diff --git a/recipes/settings.py b/recipes/settings.py +index 5676fe0a..6c6f1747 100644 +--- a/recipes/settings.py ++++ b/recipes/settings.py +@@ -426,10 +426,10 @@ if os.getenv('S3_ACCESS_KEY', ''): + AWS_S3_CUSTOM_DOMAIN = os.getenv('S3_CUSTOM_DOMAIN', '') + + MEDIA_URL = os.getenv('MEDIA_URL', '/media/') +- MEDIA_ROOT = os.path.join(BASE_DIR, "mediafiles") ++ MEDIA_ROOT = os.getenv('MEDIA_ROOT', os.path.join(BASE_DIR, "mediafiles")) + else: + MEDIA_URL = os.getenv('MEDIA_URL', '/media/') +- MEDIA_ROOT = os.path.join(BASE_DIR, "mediafiles") ++ MEDIA_ROOT = os.getenv('MEDIA_ROOT', os.path.join(BASE_DIR, "mediafiles")) + + # Serve static files with gzip + STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage' diff --git a/pkgs/applications/misc/tandoor-recipes/update.sh b/pkgs/applications/misc/tandoor-recipes/update.sh new file mode 100755 index 000000000000..49b6d5f98ae9 --- /dev/null +++ b/pkgs/applications/misc/tandoor-recipes/update.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq + +# shellcheck shell=bash + +if [ -n "$GITHUB_TOKEN" ]; then + TOKEN_ARGS=(--header "Authorization: token $GITHUB_TOKEN") +fi + +if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then + echo "Regenerates packaging data for the tandoor-recipes package." + echo "Usage: $0 [git release tag]" + exit 1 +fi + +version="$1" + +set -euo pipefail + +if [ -z "$version" ]; then + version="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/TandoorRecipes/recipes/releases?per_page=1" | jq -r '.[0].tag_name')" +fi + +package_src="https://raw.githubusercontent.com/TandoorRecipes/recipes/$version" + +src_hash=$(nix-prefetch-github TandoorRecipes recipes --rev "${version}" | jq -r .sha256) + +tmpdir=$(mktemp -d) +trap 'rm -rf "$tmpdir"' EXIT + +pushd "$tmpdir" +wget "${TOKEN_ARGS[@]}" "$package_src/vue/yarn.lock" +yarn_hash=$(prefetch-yarn-deps yarn.lock) +popd + +# Use friendlier hashes +src_hash=$(nix hash to-sri --type sha256 "$src_hash") +yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash") + +sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix +sed -i -E -e "s#sha256 = \".*\"#sha256 = \"$src_hash\"#" common.nix +sed -i -E -e "s#yarnSha256 = \".*\"#yarnSha256 = \"$yarn_hash\"#" common.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eecc50b96c10..6953dfcc453d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11545,6 +11545,8 @@ with pkgs; inherit (callPackages ../applications/networking/taler { }) taler-exchange taler-merchant; + tandoor-recipes = callPackage ../applications/misc/tandoor-recipes { }; + tangram = callPackage ../applications/networking/instant-messengers/tangram { }; t1utils = callPackage ../tools/misc/t1utils { }; From d8b1d3480664e226f3d39fa4bae846131f8b9382 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 17 Sep 2022 16:36:39 +0200 Subject: [PATCH 111/269] nixos/tandoor-recipes: init module --- .../from_md/release-notes/rl-2211.section.xml | 7 + .../manual/release-notes/rl-2211.section.md | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/misc/tandoor-recipes.nix | 144 ++++++++++++++++++ 4 files changed, 154 insertions(+) create mode 100644 nixos/modules/services/misc/tandoor-recipes.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 bfe04d89fa83..cf5b5dd872c2 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 @@ -194,6 +194,13 @@ services.komga. + + + Tandoor Recipes, + a self-hosted multi-tenant recipe collection. Available as + services.tandoor-recipes. + + HBase diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index dcbe545a626c..0d510b3a0df0 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -72,6 +72,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [Komga](https://komga.org/), a free and open source comics/mangas media server. Available as [services.komga](#opt-services.komga.enable). +- [Tandoor Recipes](https://tandoor.dev), a self-hosted multi-tenant recipe collection. Available as [services.tandoor-recipes](options.html#opt-services.tandoor-recipes.enable). + - [HBase cluster](https://hbase.apache.org/), a distributed, scalable, big data store. Available as [services.hadoop.hbase](options.html#opt-services.hadoop.hbase.enable). - [Sachet](https://github.com/messagebird/sachet/), an SMS alerting tool for the Prometheus Alertmanager. Available as [services.prometheus.sachet](#opt-services.prometheus.sachet.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dec66e395aad..b53c2701892e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -653,6 +653,7 @@ ./services/misc/svnserve.nix ./services/misc/synergy.nix ./services/misc/sysprof.nix + ./services/misc/tandoor-recipes.nix ./services/misc/taskserver ./services/misc/tiddlywiki.nix ./services/misc/tp-auto-kbbl.nix diff --git a/nixos/modules/services/misc/tandoor-recipes.nix b/nixos/modules/services/misc/tandoor-recipes.nix new file mode 100644 index 000000000000..a349bcac9321 --- /dev/null +++ b/nixos/modules/services/misc/tandoor-recipes.nix @@ -0,0 +1,144 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.services.tandoor-recipes; + pkg = cfg.package; + + # SECRET_KEY through an env file + env = { + GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}"; + DEBUG = "0"; + MEDIA_ROOT = "/var/lib/tandoor-recipes"; + } // optionalAttrs (config.time.timeZone != null) { + TIMEZONE = config.time.timeZone; + } // ( + lib.mapAttrs (_: toString) cfg.extraConfig + ); + + manage = + let + setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env); + in + pkgs.writeShellScript "manage" '' + ${setupEnv} + exec ${pkg}/bin/tandoor-recipes "$@" + ''; +in +{ + meta.maintainers = with maintainers; [ ambroisie ]; + + options.services.tandoor-recipes = { + enable = mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Enable Tandoor Recipes. + + When started, the Tandoor Recipes database is automatically created if + it doesn't exist and updated if the package has changed. Both tasks are + achieved by running a Django migration. + + A script to manage the instance (by wrapping Django's manage.py) is linked to + `/var/lib/tandoor-recipes/tandoor-recipes-manage`. + ''; + }; + + address = mkOption { + type = types.str; + default = "localhost"; + description = lib.mdDoc "Web interface address."; + }; + + port = mkOption { + type = types.port; + default = 8080; + description = lib.mdDoc "Web interface port."; + }; + + extraConfig = mkOption { + type = types.attrs; + default = { }; + description = lib.mdDoc '' + Extra tandoor recipes config options. + + See [the example dot-env file](https://raw.githubusercontent.com/vabene1111/recipes/master/.env.template) + for available options. + ''; + example = { + ENABLE_SIGNUP = "1"; + }; + }; + + package = mkOption { + type = types.package; + default = pkgs.tandoor-recipes; + defaultText = literalExpression "pkgs.tandoor-recipes"; + description = lib.mdDoc "The Tandoor Recipes package to use."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.tandoor-recipes = { + description = "Tandoor Recipes server"; + + serviceConfig = { + ExecStart = '' + ${pkg.python.pkgs.gunicorn}/bin/gunicorn recipes.wsgi + ''; + Restart = "on-failure"; + + User = "tandoor_recipes"; + DynamicUser = true; + StateDirectory = "tandoor-recipes"; + WorkingDirectory = "/var/lib/tandoor-recipes"; + RuntimeDirectory = "tandoor-recipes"; + + BindReadOnlyPaths = [ + "${config.environment.etc."ssl/certs/ca-certificates.crt".source}:/etc/ssl/certs/ca-certificates.crt" + builtins.storeDir + "-/etc/resolv.conf" + "-/etc/nsswitch.conf" + "-/etc/hosts" + "-/etc/localtime" + "-/run/postgresql" + ]; + CapabilityBoundingSet = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + # gunicorn needs setuid + SystemCallFilter = [ "@system-service" "~@privileged" "@resources" "@setuid" "@keyring" ]; + UMask = "0066"; + } // lib.optionalAttrs (cfg.port < 1024) { + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + }; + + wantedBy = [ "multi-user.target" ]; + + preStart = '' + ln -sf ${manage} tandoor-recipes-manage + + # Let django migrate the DB as needed + ${pkg}/bin/tandoor-recipes migrate + ''; + + environment = env // { + PYTHONPATH = "${pkg.python.pkgs.makePythonPath pkg.propagatedBuildInputs}:${pkg}/lib/tandoor-recipes"; + }; + }; + }; +} From 91ba8464f472250ffebff579a16288321b6ca302 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 17 Sep 2022 16:36:39 +0200 Subject: [PATCH 112/269] nixos/tandoor-recipes: add test --- nixos/tests/all-tests.nix | 1 + nixos/tests/tandoor-recipes.nix | 43 +++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 nixos/tests/tandoor-recipes.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 011d7b11b4f8..f95f9683c3d0 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -611,6 +611,7 @@ in { systemd-shutdown = handleTest ./systemd-shutdown.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; systemd-misc = handleTest ./systemd-misc.nix {}; + tandoor-recipes = handleTest ./tandoor-recipes.nix {}; taskserver = handleTest ./taskserver.nix {}; teeworlds = handleTest ./teeworlds.nix {}; telegraf = handleTest ./telegraf.nix {}; diff --git a/nixos/tests/tandoor-recipes.nix b/nixos/tests/tandoor-recipes.nix new file mode 100644 index 000000000000..54456238fe63 --- /dev/null +++ b/nixos/tests/tandoor-recipes.nix @@ -0,0 +1,43 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "tandoor-recipes"; + meta.maintainers = with lib.maintainers; [ ambroisie ]; + + nodes.machine = { pkgs, ... }: { + # Setup using Postgres + services.tandoor-recipes = { + enable = true; + + extraConfig = { + DB_ENGINE = "django.db.backends.postgresql"; + POSTGRES_HOST = "/run/postgresql"; + POSTGRES_USER = "tandoor_recipes"; + POSTGRES_DB = "tandoor_recipes"; + }; + }; + + services.postgresql = { + enable = true; + ensureDatabases = [ "tandoor_recipes" ]; + ensureUsers = [ + { + name = "tandoor_recipes"; + ensurePermissions."DATABASE tandoor_recipes" = "ALL PRIVILEGES"; + } + ]; + }; + + systemd.services = { + tandoor-recipes = { + after = [ "postgresql.service" ]; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("tandoor-recipes.service") + + with subtest("Web interface gets ready"): + # Wait until server accepts connections + machine.wait_until_succeeds("curl -fs localhost:8080") + ''; +}) From 83f5c2d5ecb08d1aaaae1df0a5d2af02befeea0e Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 17 Sep 2022 18:07:18 +0200 Subject: [PATCH 113/269] tandoor-recipes: add 'passthru.tests' --- pkgs/applications/misc/tandoor-recipes/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index eb0a8fde447c..008468f1b5e5 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -1,4 +1,5 @@ { callPackage +, nixosTests , python3 }: let @@ -124,6 +125,10 @@ python.pkgs.pythonPackages.buildPythonPackage rec { inherit frontend python; updateScript = ./update.sh; + + tests = { + inherit (nixosTests) tandoor-recipes; + }; }; meta = common.meta // { From 0aede75ecf9db5bc07119021fbfb3f51101b5fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 3 Oct 2022 10:26:27 +0200 Subject: [PATCH 114/269] vdrPlugins.femon: switch src --- pkgs/applications/video/vdr/plugins.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 9d25e03710e7..d4c989182bcf 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -32,9 +32,11 @@ in { buildInputs = [ vdr ]; - src = fetchurl { - url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${pname}-${version}.tgz"; - sha256 = "1hra1xslj8s68zbyr8zdqp8yap0aj1p6rxyc6cwy1j122kwcnapp"; + src = fetchFromGitHub { + repo = "vdr-plugin-femon"; + owner = "rofafor"; + sha256 = "sha256-0qBMYgNKk7N9Bj8fAoOokUo+G9gfj16N5e7dhoKRBqs="; + rev = "v${version}"; }; postPatch = "substituteInPlace Makefile --replace /bin/true true"; @@ -42,7 +44,7 @@ in { makeFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - homepage = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/"; + inherit (src.meta) homepage; description = "DVB Frontend Status Monitor plugin for VDR"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; From 1b015cf57b6bc1dac2e066ca991153d022dc81b8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 3 Oct 2022 10:57:55 +0200 Subject: [PATCH 115/269] ucx: 1.13.0 -> 1.13.1 --- pkgs/development/libraries/ucx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 7a5f57b42299..a6e1b43f5db4 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "ucx"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "sha256-DWiOmqxBAAH8DE7H0teoKyp+m3wYEo652ac7ey43Erg="; + sha256 = "sha256-NhtN8xrHc6UnUrMbq9LHpb25JO+/LDGcLLGebCfGnv4="; }; patches = [ From fe181e0f943b41060cd90c777d34b69fb73aa0e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 3 Oct 2022 10:27:08 +0200 Subject: [PATCH 116/269] vdrPlugins.markad: 3.0.25 -> 3.0.26 --- pkgs/applications/video/vdr/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index d4c989182bcf..117043e03672 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -55,12 +55,12 @@ in { markad = stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.0.25"; + version = "3.0.26"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-m7cUAxwXj62spelHYH6uTIoViSavSR0d4psr7+KLJg8="; + sha256 = "sha256-0J6XeLgr9IZSWsheQZWVNRLIxp8iyCvR9Y0z/yrbTnI="; rev = "v${version}"; }; @@ -90,7 +90,7 @@ in { installFlags = buildFlags; meta = with lib; { - homepage = "https://github.com/kfb77/vdr-plugin-markad"; + inherit (src.meta) homepage; description = "MarkAd marks advertisements in VDR recordings."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; From 2de6316bbfc1028309210aac1f608d8629115b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 3 Oct 2022 10:27:45 +0200 Subject: [PATCH 117/269] vdrPlugins.epgsearch: switch src --- pkgs/applications/video/vdr/plugins.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 117043e03672..e3f0c4a3d8cb 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -103,8 +103,9 @@ in { pname = "vdr-epgsearch"; version = "2.4.1"; - src = fetchgit { - url = "git://projects.vdr-developer.org/vdr-plugin-epgsearch.git"; + src = fetchFromGitHub { + repo = "vdr-plugin-epgsearch"; + owner = "vdr-projects"; sha256 = "sha256-UlbPCkUFN0Gyxjw9xq2STFTDZRVcPPNjadSQd4o2o9U="; rev = "v${version}"; }; @@ -138,7 +139,7 @@ in { outputs = [ "out" "man" ]; meta = with lib; { - homepage = "http://winni.vdr-developer.org/epgsearch"; + inherit (src.meta) homepage; description = "Searchtimer and replacement of the VDR program menu"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; From 360892caf563ea0c2eb9a86327eb4701775287ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 3 Oct 2022 10:28:18 +0200 Subject: [PATCH 118/269] vdrPlugins.vnsiserver: 1.8.0 -> 1.8.1 --- pkgs/applications/video/vdr/plugins.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index e3f0c4a3d8cb..d43a78a04a4d 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -150,7 +150,7 @@ in { vnsiserver = stdenv.mkDerivation rec { pname = "vdr-vnsiserver"; - version = "1.8.0"; + version = "1.8.1"; buildInputs = [ vdr ]; @@ -158,13 +158,13 @@ in { src = fetchFromGitHub { repo = "vdr-plugin-vnsiserver"; - owner = "FernetMenta"; - rev = "v${version}"; - sha256 = "0n7idpxqx7ayd63scl6xwdx828ik4kb2mwz0c30cfjnmnxxd45lw"; + owner = "vdr-projects"; + rev = version; + sha256 = "sha256-1C0Z7NoU+FNch4BhrAcbJdzVvGuH1YDaxJ+9PflR78E="; }; meta = with lib; { - homepage = "https://github.com/FernetMenta/vdr-plugin-vnsiserver"; + inherit (src.meta) homepage; description = "VDR plugin to handle KODI clients."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; From 59bb395f1c527afa9e5adbd51c3972183ac1d650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 3 Oct 2022 10:29:13 +0200 Subject: [PATCH 119/269] vdrPlugins.softhddevice: 1.9.0 -> 1.9.2 --- pkgs/applications/video/vdr/softhddevice/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index e09e01d1ea7c..187a493b2502 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-IqG1Jr+fV4MMyTTOUGY34HNqS8qvAH+CSi2IEyVGVFo="; + sha256 = "sha256-2kh8qMxaAjekvgjMVRmm1nPzlN2wjY/6qYjFyo6CLlg="; rev = "v${version}"; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/ua0lnj/vdr-plugin-softhddevice"; + inherit (src.meta) homepage; description = "VDR SoftHDDevice Plug-in"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; From 7fae1d6f7a1c702040133ee04083f9ee08aa8a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Mon, 3 Oct 2022 10:29:51 +0200 Subject: [PATCH 120/269] vdrPlugins: get homepage from src --- pkgs/applications/video/vdr/plugins.nix | 2 +- pkgs/applications/video/vdr/streamdev/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index d43a78a04a4d..28528318c162 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -225,7 +225,7 @@ in { installFlags = [ "DESTDIR=$(out)" ]; meta = with lib; { - homepage = "https://github.com/jowi24/vdr-fritz"; + inherit (src.meta) homepage; description = "A plugin for VDR to access AVMs Fritz Box routers"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; diff --git a/pkgs/applications/video/vdr/streamdev/default.nix b/pkgs/applications/video/vdr/streamdev/default.nix index 6ef00deab096..de45b31d8690 100644 --- a/pkgs/applications/video/vdr/streamdev/default.nix +++ b/pkgs/applications/video/vdr/streamdev/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with lib;{ - homepage = "https://github.com/vdr-projects/vdr-plugin-streamdev"; + inherit (src.meta) homepage; description = "This PlugIn is a VDR implementation of the VTP (Video Transfer Protocol) Version 0.0.3 (see file PROTOCOL) and a basic HTTP Streaming Protocol."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; From 16e2cfc5b1157bf3913578bdacb38662251f80fb Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk <24990891+ymatsiuk@users.noreply.github.com> Date: Mon, 3 Oct 2022 11:14:10 +0200 Subject: [PATCH 121/269] aws-sso-cli: 1.9.2 -> 1.9.4 --- pkgs/tools/admin/aws-sso-cli/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix index f658597e8a7b..3700c6ee81e4 100644 --- a/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/pkgs/tools/admin/aws-sso-cli/default.nix @@ -6,20 +6,19 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.9.2"; + version = "1.9.4"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - sha256 = "9/dZfRmFAyE5NEMmuiVsRvwgqQrTNhXkTR9N0d3zgfk="; + sha256 = "sha256-xFAJrJSVf7wgJPUELCiwZVK0nBeOChuJBKROeJIRURc="; }; - vendorSha256 = "BlSCLvlrKiubMtfFSZ5ppMmL2ZhJcBXxJfeRgMADYB4="; + vendorSha256 = "sha256-f0HrQzHK1JDWmRrnqG/N4X8TG0DP/IRWd6b7QR/vyzo="; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - mv $out/bin/cmd $out/bin/aws-sso wrapProgram $out/bin/aws-sso \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ''; From c04611da264995cbaee32c500e2c3b17bd83d9c2 Mon Sep 17 00:00:00 2001 From: gbtb Date: Mon, 3 Oct 2022 21:02:57 +1000 Subject: [PATCH 122/269] nvtop: 2.0.3->2.0.4 --- pkgs/tools/system/nvtop/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index bafffd0bf726..2240d72235ff 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -25,23 +25,15 @@ let in stdenv.mkDerivation rec { pname = "nvtop" + pname-suffix; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; rev = version; - sha256 = "sha256-LhVgNU2OSM7fOUUQHYJhKhjE0fkFvYC3FIJFgu6T68Q="; + sha256 = "sha256-WOXVmKnVNRjWqShbOUZ0Z4hd0m9njLmCGLnV9FBS3Us="; }; - #this patch should be fine to remove with next version update - patches = [ - (fetchpatch { - url = "https://github.com/Syllo/nvtop/commit/663a69f1c9038eabdfc3155112fb9b8d662578aa.diff"; - sha256 = "sha256-/EJlr5b+kZnHm9UxythYreJvO+Ma+1sUI3KLBQFCCmc="; - }) - ]; - cmakeFlags = with lib; [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_TESTING=ON" From fad386bad17441c8954736ffd61935c7af889677 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 11:23:59 +0000 Subject: [PATCH 123/269] firefox-beta-bin-unwrapped: 106.0b5 -> 106.0b7 --- .../browsers/firefox-bin/beta_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index fc3c98f4f36b..1dc80b26d5d3 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "106.0b5"; + version = "106.0b7"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ach/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ach/firefox-106.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "bea7f87f3a7b29f3c096f49f2ab94e51856cb442e7f1761094f8f52bde5eb059"; + sha256 = "ecd7045d17cb90ac9c6ab510efa9f72100db81700d2161ac20d417c258f9bc89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/af/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/af/firefox-106.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "a9dd69131df9d9a3bb8caf9a4b55ae3dcd4465b704b5f8bddd781ab7cfc775e8"; + sha256 = "90eb1a93f2b1b3acb18bfab506c9ccbcaab21b116e5d7549725611ee5fa48508"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/an/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/an/firefox-106.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "c15a591ca484546cd529a53a574941f53be43c521fef08e3e55010be351d06dc"; + sha256 = "caa1274d35146636fc61d4f6fa48b30e22119c25eb0c6474f74153445828b685"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ar/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ar/firefox-106.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "4c995eddc6de0eef2459e37bb1501bccbc552bf0ad47193eb1043154e3e07a49"; + sha256 = "1fad1e3f8d1b5e707ead9ef3301255bc9397ceb4f041c4a05714ebc5f97375a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ast/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ast/firefox-106.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "ae81c1f39262047e85d621b86c99baccd8fe82f756f5c0c44d1bd2ad90710943"; + sha256 = "5c5c4d5d666dc6408be7c80feca8835986d11a568f33ba8004709729dee5ba53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/az/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/az/firefox-106.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "3910d9fe216ee82555db1f0828646c987c5cb613ef5762a2711c60093971737b"; + sha256 = "f073c3483935c5f1758c8ed8c5ed601fd64ff68dd64ff3893734b22ce7a1dc36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/be/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/be/firefox-106.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "2ce805213b9a64661f2557f7afecbc5f8f6944d89f6d060c2bdb4a19dc8d7901"; + sha256 = "d8e6eda0f165d339a7a33ab783972daaf4c4cf4d2cbce208bc02fc24af4a759e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/bg/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/bg/firefox-106.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a6bbe60761bbff9f22b1734b9a9c3e43909fa9d5ff6631e5d625994df18d65fb"; + sha256 = "eb3fb557dc4ffc74d8bd9a00cf275991e52e3c7a46aff31c8344d07566227c61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/bn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/bn/firefox-106.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "7429b78661eafadecf5fc2c21ba2e32c424fb29843625ee3d5768104c9c79c73"; + sha256 = "13888375e4fe5d026a117b264bef2376504ede8ddb99bbe2917b7c37998c23da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/br/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/br/firefox-106.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "68381f2a0fa6666c97607b6a6c66b667e54311ec61292ccdfa2432c6d3919931"; + sha256 = "c73b6fb4662cae52f1feb7ed0be11566bd73bfeb38c0d408ba5edd8ccb9fd1d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/bs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/bs/firefox-106.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "73a61dde5341c3222922da34552a8fbf7b61db27d067319def238f3185912a2f"; + sha256 = "6f2daacd16f89c286693d3c91c4da63df75ee45562be3f9565ff33e0e4143871"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ca-valencia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ca-valencia/firefox-106.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "df2b3b99b7aca85bb36b590ca30c1208ac8560b70823de3f84ef0a992b2e78b8"; + sha256 = "d41c1f978e561e48952c0ded35c73a7dd846fd66a985bd6487ac849255c0538d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ca/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ca/firefox-106.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "de7dd57997baf718d07535457092c82046d48d91049c7774e3b8ecfde4c7fe8d"; + sha256 = "43ad12b7041cae31d90ff5cb690a81f45c846bf1c455aacd529cf9a925787fb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/cak/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/cak/firefox-106.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "91e28a46e769a9c61ccf6673de33c5e87291c428ca0d35d00a7ff6f8e168ade4"; + sha256 = "b5431cec2230fb8fb7f9b954861705b0705f5e576a75a7820e60e9c710794d5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/cs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/cs/firefox-106.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "25b8a12896b9caaeda63b8a37476f2696fbba0ece2ea29e2589543895bbc724d"; + sha256 = "6905de2c05f82e1105a8b81ad432a1941efcfddea9a86709c7d8c63572b1282b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/cy/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/cy/firefox-106.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "00722d5a8fa7b7fef65aa1414095ed792cef438249548e49996768533ccf62a3"; + sha256 = "6db453e583441c5f9c9af69e51bc30083e6370bcf1cf74597d323cc64fc237e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/da/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/da/firefox-106.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "98b4d5daaa9e01a8fe94479263ab036c11f9b54eb248b38679e04b240be0a5a7"; + sha256 = "eea5bf0ca3f14301c12a569828293e5aca43774c380432e311444e276a7db254"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/de/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/de/firefox-106.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "afa49b3348af68b40ad2878fe4179aa574bfbcd3c018c3fc2ab558ceb685d019"; + sha256 = "09c30091df15e554eecd9b76e7d36684f59a90efc32782ec13c8993d56ad8581"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/dsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/dsb/firefox-106.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "f924915523444a65b931bf79c313f2f812a674ababcac9c6b87d409b0a85dea8"; + sha256 = "f148c26bf9555a53c74c4ff76b7e682b3b13bacb4a0f4133667c4b5ca4208f04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/el/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/el/firefox-106.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b8b45b326456fb57d21a5824088e7dee205eb32678a054e3a5df07f7bd1a78d2"; + sha256 = "cea7663be419264d6dc737ef462e2f4b586feedb85054fcd9d6b875de8818945"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/en-CA/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/en-CA/firefox-106.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "0b0008a5286cde1dd8921221d824b431c63a72fc9481f7fce1b38f74d5cd012f"; + sha256 = "8dd867c8ce550cbd691d6ddcefe15ecee034d9cdcb14877041b62e5b87f1d975"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/en-GB/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/en-GB/firefox-106.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "94591b8014b8a11af8eba21d0d11b26cabdc316c0e8d767467b47f8a6812d5a9"; + sha256 = "1ee2fd8c844c40d4e77c4ae965c8211dcb9c84467577d7a05387f3808b6bd1c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/en-US/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/en-US/firefox-106.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "e273a1b11dc3e91000d68dce334ea7a4268cfbbe6b58237eac7d9ab18951023e"; + sha256 = "dd2075f2dd50496032b79a2388d2a13a9b5812695e32126aa029101ad520ee67"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/eo/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/eo/firefox-106.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "1dea74114d1b7faac73ea4c5a311b7154aec8909c1889b83027d7099ecf554e5"; + sha256 = "2096522d62e1af8facfcad52397b90d38d9d752ce0ba153bccf3f2230a0eb518"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/es-AR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/es-AR/firefox-106.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "071ea18cd48c6e18276e0b78c7aaf71c2e63076b1a2ddeb56383937cad01946d"; + sha256 = "3623b3b2b3b0a9685e71da15cc87dbd17e5544d42582ee95d8c542d4e068094c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/es-CL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/es-CL/firefox-106.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "1f00980599f660f3e428ef84afa09df877311fb9ab681fcec04b83612ba112f7"; + sha256 = "b6b3eaa5c1b2ea3815bae9a4c614d685b21bc06f71c6a193ff95adb4799f92c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/es-ES/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/es-ES/firefox-106.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b8c126fc40a10ec3be625d769a5480226893e80684ef0a107b67478c5e66609a"; + sha256 = "34f5a84812c0b562ede46c5785191d9b8b46b981ad94b37d613d4c65292e4880"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/es-MX/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/es-MX/firefox-106.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "2b5954e0de55133c34aa559a249fa25c57457db1d2d8faf2bf62cf7e4913dedf"; + sha256 = "7808345d63fe88eb9ca02bbab6cb2d48d8e446addb2254c459a87e59de5ea6cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/et/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/et/firefox-106.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "25a1f91f515e22a2ff746ba0d7bdf0d2dc872054332cca11073b1a044816b1b4"; + sha256 = "f35466d7e9f64c794b0b4c088dad1219e5bdbd08478cd1a8d0561b66501588bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/eu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/eu/firefox-106.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "7b15f34cec3ffddefa5abf3b7c188ae4632ebe6bdb65857da08a243e109ec017"; + sha256 = "bd1a5c513c3119889a667f27ebe92ad6f31d84c7bf5d2781688346464700f8a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/fa/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/fa/firefox-106.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "241350d7f85483d005db7c1a019a310f3a522733f7cde4e99a07b5455df3b24f"; + sha256 = "3ae12af04bf9f4eb78ce2f423489612ff06f95f2a7fbe2157f88c94ca1432aa8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ff/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ff/firefox-106.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b3d86797d3194e60f45e831e81b98d59605c71f67867c441bd7cb09b798a8a6c"; + sha256 = "ac1739fadf01ec20803027f313255688644ac7b531c62878a8d70214300804f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/fi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/fi/firefox-106.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "67718e8fb190fad9293f83141e3c019813e32f6ae4488a27a65f083835d2d875"; + sha256 = "e501c7e57e0d6749d438d1058fae1f19b7e511c4a127d659f464420f201c147e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/fr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/fr/firefox-106.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "1fd4c7f4beaaeebc5096cd1f0dca50489373f6df7ee14882382e11af83b9f7d6"; + sha256 = "7addbd60e07e933c53d7975e40675d2933a0932e257a0eda5ffd873a4d1de754"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/fy-NL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/fy-NL/firefox-106.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "ae1c105ec2612c51c4e22d8927f10db6d8ac926f68418d668302f6f88a19446a"; + sha256 = "c6bab722560310b62cc764f5ef6ffa9ed9755d1c7b67e799b4f410574253ae2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ga-IE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ga-IE/firefox-106.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "019fb8ca065127fdf32549429377eaec17cdca33be1bf23d8a984e24e5122892"; + sha256 = "d36fa51ef76625644210d6926057a490929ea5739b978e43f3acc85672e4465e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/gd/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/gd/firefox-106.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "d6fc76cf2af53b13eef471b32a5e56e832713208d9a93f401c4c024a2a805431"; + sha256 = "02112ff31a082969a34e05ba0380d58ec2f1567f5a7eaa0be0bc655e9d8c1f4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/gl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/gl/firefox-106.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8927a42942c020ae39ab7e71009019c8a8eea5c95504c8a1078ea9c4d747db79"; + sha256 = "6f71e18c6f89d90910c3b0b956a1251d170ac9b49fa786939d82364e97441fdf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/gn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/gn/firefox-106.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "9ebfc17c47c2ae47ee1fccbd060936dd80896839672200ddcf33ab8a0443f591"; + sha256 = "7f21fa663aba17cbcc10bb95781a964a7534e2a54411334a53ee6d6f932eb328"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/gu-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/gu-IN/firefox-106.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "e8b258e4824668c2418636f152b908e731712a42443b12f2da15703c91ddde0a"; + sha256 = "be380d1702e819a30c6bf9e170afac55b0b1cc185f784297b0ddf05d4baf5d24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/he/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/he/firefox-106.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "272276863f7614f276b6798f5ab7613b04a0c715dc3d6f132c212971d8844908"; + sha256 = "26dd5f43b7df9b98f9274b8d083e750f0191f70428efc3112a9beb84a1f872ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/hi-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/hi-IN/firefox-106.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "76a40f6845a43bcb614df52735604c797f26ef7d5bdc524a977fa6ef5893a7f9"; + sha256 = "f033df4457795085c22a0971b36baf5afd48d70bea3e53e1c9d8ec3e55ec9731"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/hr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/hr/firefox-106.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "dcf93acdd526561af640e3a6fa13b7de92b20cd0e0b5e4011c0490f95550080c"; + sha256 = "df144a053e504f477b8c183d127da3eed0c0fb45f03937d738d30b4c1e25ac6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/hsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/hsb/firefox-106.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "aefc788cd53e96eb91635bc0b29c257ca5f6eadcd349f33d211a69e0c35fb633"; + sha256 = "623025849d1c98e3b33772b856e344422f321b2b565b96ce005ef7a03bc06ba6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/hu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/hu/firefox-106.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2d9b5f4f8dd3fdd10316c4d63bf5c5177831489499adf27d4de6d7dd2e860964"; + sha256 = "6325390e3b893f4e9e9313e73b050165f3a73b27a816a45047f8d70593040af7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/hy-AM/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/hy-AM/firefox-106.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a399698df95f954613020654c9a088cd1929d9f772a22a388d3f39861f26ff98"; + sha256 = "510ec136954d08f2e3824ff3cafc2a5e55e5acb7b27447460f158fcae1e2c6f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ia/firefox-106.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "51f3425e0769384010c7a09914410ddd980b11e098b07e489f624302a515a33b"; + sha256 = "c6e58ad9a40fe58661f3e382bf0c63aa1903a8297405586d8e2b081f8702bc8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/id/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/id/firefox-106.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "70ef6ff4532ab0c3b65770d632ad56dbddd08bf23e641b16a2d2ef477d13682e"; + sha256 = "46d742c83740dbefe43103e634f7e0c29ef3224be17e341e6ce3c68fb45a8a00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/is/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/is/firefox-106.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "ad6aa8a533a00a2a2deb2b0f3ec89f4b3fedbc4981c9efe68eaaf6df8aff7599"; + sha256 = "be9adc44cf44378352d5274e76f23d08668e07b2fdad27eee2e55106c8019dc4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/it/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/it/firefox-106.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "e94457fd250270e5814a463e6d27e1b23f3d092ed9af0a2c8341eac238f598c9"; + sha256 = "8b279efa12ddfca75e772cbb37269f7ed5734808b91177e06c441181f4413541"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ja/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ja/firefox-106.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "fe2c1e465e2bfa951e516e83b00de06942e496f8c49a1263397d7bdc1f842c8c"; + sha256 = "dc65aa1765974df098c891f7c840bb4f6589ed765b77e88c63cc0d70109f40e6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ka/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ka/firefox-106.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "cdea26f06a2022b1dc257345488befadc7d56846f058b8cf4c13428921d8b45d"; + sha256 = "6bfaf53e1ea47c3dbab5af64c1366d9b91b05b57e8ab35fca5c53f8de4445125"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/kab/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/kab/firefox-106.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "ea574431246be1f4255c526d8f22f6a93eb013236531fe0c8e82b84e3a332ed1"; + sha256 = "820b7354dbca4f8996836d38417d075644f0bb02f7efe9357b1e3c3ea5002488"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/kk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/kk/firefox-106.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "09bba91f39ba55c982859be6f9f35b6292c7501d65b5f91205f2c281962b5673"; + sha256 = "0d10dd7371805f1cab5c893d0c43737cbbfea0f35fe1df5ab0427de9af4a325d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/km/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/km/firefox-106.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "0034438685615cd9a60ae185e28f1536d85c47e7b2f2673c9754fa49474ab079"; + sha256 = "4c858da278a900e1150c32bcba5e00743cb4f24c70e9e9e436cf0f59cab03468"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/kn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/kn/firefox-106.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "f39eddee2312c72573982e673986f15feeb080b61248d9d9cbe2505643a89ab7"; + sha256 = "9b062057cf79266b90367e48f281336207f0a7dbd3caec9f735282afe1bfa90f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ko/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ko/firefox-106.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "533f070343c7ad16f588c3e1c95e9426322f9125f0ec6e44ec14028a84c795b1"; + sha256 = "a5c008c5fc8ecef9eb3f2919ca5bc4cf848c4bdab20484fe95cb9a71b74d6070"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/lij/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/lij/firefox-106.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2ccbaa80bc62059889e40d9ac942afbe4ea1a4ce59443fc4dad1496cc5b111b4"; + sha256 = "54fb1cd2c858da8f9b9553a0b85da659e35f4ee88cbc109759be6c30c5bd1dd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/lt/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/lt/firefox-106.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "1414dc3341af8fbea50697f1c3d2ef82113165fd433301c2cf855496e48851c0"; + sha256 = "43d5610a211fb55c8fc7736744f29bba0f643e3ad5946fd3e6ab76c5ee590da7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/lv/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/lv/firefox-106.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "2a5b9870de4717d3c38306f761db12ebfa3aa168a4853c2da112ff90654a1fa6"; + sha256 = "9bbcb1b4acd690ed44a30b7411147434413c2842f3bf1f7476730dd87763d938"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/mk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/mk/firefox-106.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "2fa658a186ea7d45137d4733bd36228165ead1344c0c5a55f5d1f08cca705d26"; + sha256 = "dd9a01d305aae7fc92a321c70030adf28e41ebabab03a9cb7dd547e3d36d7d43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/mr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/mr/firefox-106.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "c84dad1b673bebd621c671c3955dc0f74dd0c33d5fea0bf984b323baceeec753"; + sha256 = "2941ede2c01aeba0ff5cd6512614b611f664b7523226332a263f4623d625f337"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ms/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ms/firefox-106.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "3874937e10203c29a7694055eb94c21fa21c22eed84a8a784df0a6c2db3af628"; + sha256 = "74f9b49141fccaba3345c7c9ffb581df138e8da49c074eeba748ef00103c1ee7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/my/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/my/firefox-106.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "0458d73594a7b6a893fbe238f3c04040ef465ef24de99cf93ce63d2ee138a6ef"; + sha256 = "86d4f30ce413229533db9bbfd1cbd67eb465347a1e9facd82ec2702821fcc6bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/nb-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/nb-NO/firefox-106.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "627e707144082ba5b517e81494d897a7ba45037bd7671e51a31f050f43c893aa"; + sha256 = "3e4e2909c4f533ad0f91a57a289c85640677cf9dcc95b1527260bb487a7ae006"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ne-NP/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ne-NP/firefox-106.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "8e3f0eebe18515d6ba3313647ca7eb4b47a5562aa6d98fc5ff03f76c19a9f195"; + sha256 = "ba48b31263f55e743fd078f83833977b14bfd8834f8e989cfaa3a4df4634d9b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/nl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/nl/firefox-106.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "c01353905bb853f9bb84b6a57e659957f056bcec97f909429a11afee615fd467"; + sha256 = "433cb151c5a59e9d1802422589facb29fa509e4f185de7aba166a209267142df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/nn-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/nn-NO/firefox-106.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "e7f32834243ccc2750f3c910a77ab3ca23c2ad20a25b36f46ed158dd8a2b6ff4"; + sha256 = "e13cf999ad3e1a5405d1b63c0701dcaa1a06a2ff9843b28151865e4b1bcd1cec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/oc/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/oc/firefox-106.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "68f961dc9cb1736788d24af07de2ff898203f83e22a104b4753b9ca5975eab01"; + sha256 = "6f06af02a2d47c2effbb25ab31e407701ead15e2eff380de2d547767c18e5673"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/pa-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/pa-IN/firefox-106.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "8473afdf1cd2f401d590b590572741bbb9a9d6de813d9156eee9f211372f3919"; + sha256 = "77d081a7a9ca59d8759041af5319a043e05f2bb2bcf6a7c002e2074a4b78c325"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/pl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/pl/firefox-106.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9d0b27ca2d551dc1b0e2441e42ddfdccac9be9c55fbe6407da62a13a812d6c2f"; + sha256 = "5da9e6fe666058304caee127f8e9ad43e63c879948f208d5e58507cf8e04571e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/pt-BR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/pt-BR/firefox-106.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "cb6437c603f99b6fffb61068abbea8c14ed918c5f6014cf74c4e07061c585c62"; + sha256 = "5a753f304a09a36026c3e099eee015098b7947900fbd32d287c8aaf2e009eca6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/pt-PT/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/pt-PT/firefox-106.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "3e77d7b0d5defaa43b2d546acaa432386cfc1a7500080381b7f0aa7d76bb3f8e"; + sha256 = "92cd44463360b5f5c7630046e1eae15f6c6b7cbc74b6cf39e217565585f3cfe4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/rm/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/rm/firefox-106.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "401b0c3c8a20f8e54fb7b4efdee8ff5b87b2e5a92f810ebbbf95ca29a3d198f8"; + sha256 = "c7e0d8160043f2e2535996c54c19ee69bfc5daecb1f9e57724d023a471c16df4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ro/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ro/firefox-106.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "7c8579b37b2f87221484cf4d9b91e0ce07b3fbe491d52045dad5a99487014d3d"; + sha256 = "93c8375c2048c07ae8c93a3263e0c5114a0e1132a7488fd8a32c63e1b455d311"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ru/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ru/firefox-106.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "b09f65afe0fadf16d7f79c9394a32ec01810e5ff5d6f579a134f1af2a9572b5e"; + sha256 = "a6675d71bcb565f497068668906adea6a72bdbee05fcded6a01f05e0b2092907"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sco/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/sco/firefox-106.0b7.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "4c3ab17ec042eff2f22e64d8e13fddb5bc8c2f20b50e5c2f270dafbb8e291734"; + sha256 = "0037077c4531e3d8d62217045f90911f53aec09fe9012364c5bc10b9bc0d9484"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/si/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/si/firefox-106.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "29eca6a13366388a53d2be6ec5ed0f920162658778998f5bf4db74992d4c822a"; + sha256 = "5d805aa378645ded5f3d13c6234db868bb1422636aedd462c7f46370b807dd78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/sk/firefox-106.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "f8f15fb9d5d79a7c871bc85e9d307c9f80c9483effae44e785eaf9366e9d965d"; + sha256 = "c01a728a35a7006b68b9fb2beaeef5e1f5e4f4b3ebbe06536301574a3deb84e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/sl/firefox-106.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "2598d5da878e9191d3afd09c763f8fa8810dbd07e74cc7e606be16b662ccaaf0"; + sha256 = "51c6fabac979d2342fd10e46b2fd3728f4cd648810f90a62c094fba8f12da4b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/son/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/son/firefox-106.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "82195883335e0e519e49bee16e74658346ae746fa8dbba7f8e93e54d0af2fbd8"; + sha256 = "337a076c0ac79730b93fa2c9f36681b6ea2b45dc93462678ef819c85e6c1cc3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sq/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/sq/firefox-106.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "2539b349125716e96daca48728bc630fef26f7041ff9555c05d999da249f30c5"; + sha256 = "2e6145fc5730135d99c93aac30bf827a2ab52fcdd2f249fe4844ea1d86a4df81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/sr/firefox-106.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b83878494c9d2c00576456f353fcebd451741d806d4f28e3bd471a79d50ea1af"; + sha256 = "c52b225480738f740a351779195b03be4ff8b4730d58c0db1c422a0828b21b96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/sv-SE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/sv-SE/firefox-106.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "6401bd691601f5ce3eb6dc15bbf317601b1e6f4538a34029a81dca9db2fc2818"; + sha256 = "57d6acd288457e2de3006019e75b7902d7d42b374443cc4aa0a05fe8c48ee42e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/szl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/szl/firefox-106.0b7.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "2329347da1cd23f925a00c30119c27e7bc3d51250b65f692b098fee50ad95224"; + sha256 = "592cb8451a7aa47eafe76d0291517adea90692313b18d40551809a9c4dbd2526"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ta/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ta/firefox-106.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "850cbd19a1a4f382e9457caa92f0a2fdb43a11bf7351e0d2b291eee48f9ff8e1"; + sha256 = "77721643321df463403f0ddc78d16eabfa960652ab965f2ee1ce53dce9bef4a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/te/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/te/firefox-106.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "b9fe3a5939eb5590692533ee23ce60063b11531480d4161de5722dea6e98eeba"; + sha256 = "7add1fc92fa629aa9b63d72efaf5d9e18bbadd62519c2b1b21d4bc86ad9854e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/th/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/th/firefox-106.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "7bc0e3063692bcb8b45ba8e1f66adbcad564c2f26a4ce86e064cb1e65868ae3a"; + sha256 = "17a91a31ddc4bed57381d8dbebc0656ce04d587e3692df2e7ee42f1c5a5cbacf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/tl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/tl/firefox-106.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "8cd7a5b6a8ad541f221785db3eb36d57fa881940e0f6e3f815fe25521efd9b4c"; + sha256 = "f929487a1f68c4683298c8c75945107be250677d69d90a909ea74f1aa6e09260"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/tr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/tr/firefox-106.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "1cd939b803cde0ae9c492e9228c25e5b5f3ee791a0f24e78487453c9da62404f"; + sha256 = "dfe431bcbd213dfd886b7250e450fbe5b8a0b66540fc8ab4b8c009edea089b45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/trs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/trs/firefox-106.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "822f95b96f3e4bc5443a94d5211bba78c97522851b4bbf140505ac02f4568582"; + sha256 = "7e1359f45e722bd6b3612e3acc30cc007916381905e0ce5df93036cefd075725"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/uk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/uk/firefox-106.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e8f636cb417047c77a172a408897dc4c561a791398f0ef67109d442296e83c7d"; + sha256 = "655567cbf26d724896744d2e72ebbb913e336f4bb21979033cfaec7935ab7446"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/ur/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/ur/firefox-106.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "a5d34b9c701f6ac3d7bc9d489fb745b6e1918a32134ba2a46602b0dbf02cfd71"; + sha256 = "1873bbd32f6a01d653d88f15294bc0b60ac4cb369b6043413407203e4fd3afb8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/uz/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/uz/firefox-106.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "99b5cb40e2395eae81a08e4b35e493783b3ae9974bbf8ab07be19f06d7083196"; + sha256 = "72ffb4e2360956d8e1ede0e18461a5b763627f33c226a5a36737d5a22da0c06a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/vi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/vi/firefox-106.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "b7f9a9ff83528a178271f11468cbb44061a338d89f0b81bf55173dede0104651"; + sha256 = "57175f191c80e1e452a964f87ce6c8301dc0d4897222b428d18550cb21d1dea8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/xh/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/xh/firefox-106.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "f56cf5d4ec969ce37c50380e10c9c705f4c4c024243e7f240a85be1643a4218a"; + sha256 = "c8e7f2b9858430ec4276bff1e4e0eb81e8265cbe060438a5174d61a630b5bb96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/zh-CN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/zh-CN/firefox-106.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "98d28832e91435cf766f8600eb234618e29cfc924338b20b5839a65f157d056c"; + sha256 = "4cd9a02fc76230c951b73d3fbc2b6f1231fa99431f6b6edb2e153f3cc2b28868"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-x86_64/zh-TW/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-x86_64/zh-TW/firefox-106.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "a7c8399e074762be8bd4db9d35b16a7c4cfe77cf652bc7171026049b2294a9fd"; + sha256 = "0896037fef1d1c0c8c897e5f2652821b45a9ebde42a498b07e09bf85806046f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ach/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ach/firefox-106.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "169078c74274713ffbb76cb8adc528c6cabaabd1273c9ac1a95cfee05aaa7bef"; + sha256 = "7c037a7f9b798d53344def013689bfe4aef4459437b69cc7177ac882733ffdbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/af/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/af/firefox-106.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "e4242a1757a8b99f546fbc744afff0c1522404a89f7c6e9e1aeb818a2a6d4bae"; + sha256 = "3b60a1c58f01e6f329bbf5f1e54842e19761603aabd08ae2698354a0d9e18497"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/an/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/an/firefox-106.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "454a0c854b3b79d3b95d9867a020dde2f80ee3b0f0095df9c4fe2a9df9544551"; + sha256 = "008d11062022790e533d769c76cff8f8922ba74403ec3896a60f7172798b2392"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ar/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ar/firefox-106.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "9cb8ae5b764d5b8f5256486039f8408895f710620a3a9e12ecb161bef85d53a0"; + sha256 = "069e1f3c501e66f25cfa976195655c208fc1105b5d695ef063810c976580574a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ast/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ast/firefox-106.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "e4c5d5fdcf8046311a838d2240a667681e88ba54c8e23dd83b9eb63585a652a0"; + sha256 = "5bcac25b4fd6229855075b8f6348d01fea85f17c515ec0706eea4efc227b1973"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/az/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/az/firefox-106.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "1bf60c9297ca771568fbc05b5cdec9ea8b9a635db1892367bd7d56a8f7634fa3"; + sha256 = "4fef9c5406ea631ed708e7b788a3370e4e49e06a1f2b7f97607de5ae019a21ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/be/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/be/firefox-106.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "f446ea1ec69f709f9414b1ae12ed1f743ddb6c51fa4934e7045fef34d6ff69fe"; + sha256 = "bef2825ac266d9ccc542224bea61ef7614ac286797f1fb9a968270cf24af93a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/bg/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/bg/firefox-106.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "794a41ebcfc905628cd4c79af06e044c63c6ff2121ecf35d99b414e65c897a36"; + sha256 = "154a12e8b39cfbd0bd7c61228e17fba0929813dbfa38a08491fac5d8c671c666"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/bn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/bn/firefox-106.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "f101f45d4de2e3fdf0e6d505982e363f0431d1955f95e35afc0bbac8d5e38bd7"; + sha256 = "d99784aa88d2c0ead320e9df52d7509fe553dc2a32982e2b7845067d123af5d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/br/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/br/firefox-106.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3285c16382a1a53dbfb97c6ef5cc248efa136737a8ab163d011bfefc8c3dbd48"; + sha256 = "90ba0e57e54fca9d7b57c598a85e9484ce27053574c917af820703df649f20ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/bs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/bs/firefox-106.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "42f651f98d3a55fd7e0839a099cfd56ca4d52042ff77de5380db2941cc281ce0"; + sha256 = "6c01a2a6821085807a257a700a563826dd8d410ea40cc254a60ceb235bc32e53"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ca-valencia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ca-valencia/firefox-106.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "11df86cb15f49f56cd342dd6e1bdae85c9be3c5275b309f4c5c69ad788d64507"; + sha256 = "0096587beb67efed5bd233abf169fef2bebf24742923879e96f2d64c7571d5bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ca/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ca/firefox-106.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "7171df8a1cd84e8a8037ed4403abffa84c3d6f962dcc8536473ed1032eb44497"; + sha256 = "e8314293cf9eb9310ba2da6c5b95a5215ffc52241f8c750b1bd01b5c2bea727f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/cak/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/cak/firefox-106.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "defe1af608fbd9feaa67387ab62f261f9ca907d2bd2ffa0221393b83b32e2018"; + sha256 = "ff8bd0305f7e0949f1d87e101da985a5c837258f524f0d43e82ee83bf088a59a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/cs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/cs/firefox-106.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5cd180fcbf478d9f7c7b46879ca03bd043f6d3aff116dc0da82a4ca78f85d75d"; + sha256 = "ebe83f7d95d8b1644dd9b35c05dad7b09b40b44933a48a0ed6a2cb2a69c14cd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/cy/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/cy/firefox-106.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "becd879cd077966bd14463d29bc6bb2661446f4ca5fae88cfd7b6885281931b7"; + sha256 = "c5180563502a34e3e51627f15d90d9f47aa310e67b527f4c521e29771afd6c83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/da/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/da/firefox-106.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "fe6d51f6e466e4032b0e676781dcd0261f74202d87141eb0d28886342c4b34eb"; + sha256 = "7310631331ee9c5a08d122b52647f4a1d1408bf101c93b408b2312da7f7cf324"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/de/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/de/firefox-106.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "3b30a374bc43e7bccbec85b315066262820abcbaca827839cbde81995ca515ff"; + sha256 = "e3eed877d55f3cd7577090259762197f64df5adbf4a0c4c9ccabac3a6801cb2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/dsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/dsb/firefox-106.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "84564df51533b11ea8d87c3cf22b7717af60ef82d10480e29ff3e8d6a78c91f1"; + sha256 = "72a54a9c27c71186964dcd95731adb276383c9af3e36d12652d5eb39d305d42f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/el/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/el/firefox-106.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "1a714aa96e1b1b8e703342656dadb3cb69e71c3ae500ad2e3478c7595845d961"; + sha256 = "46af42aa7e6dfcccebcb22a8fb6e0041d1b9ca99cd4fd689620f05bbbf4e1b32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/en-CA/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/en-CA/firefox-106.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "615bf2277f21cdd78977ba69e650e71674ee5dd9bc8b8f2494a58b384ed504da"; + sha256 = "e2184f3991838c1a77fb86c1bf40805fdc763b21adf39c215d8315b3f6c4512a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/en-GB/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/en-GB/firefox-106.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "56c164907b01f1e82a93895c5a0eccd9ccb5263bdb1f1994152291e72adc674f"; + sha256 = "c06a1534428e83b430116cd1d94f518461d098ccc8f8ce855cdaa28951c72d3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/en-US/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/en-US/firefox-106.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "50493199497b216f1be3bf25ba86364806eada947112f375f59bb7bf354ca8a2"; + sha256 = "7d57ec845d80fe1108e60cd8904ff437cd7f76e4601e98a866ce27fcfb751caa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/eo/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/eo/firefox-106.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "262a430720e18cee49592f9c0dcda721a6011b44ee67d45a827cb6a962fc727a"; + sha256 = "7f8026b06ab366ccc2323c75d07afde601aaf91f02774a5af78d4eddf2d092ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/es-AR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/es-AR/firefox-106.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "811a8106f0e1582deddf17cc06e1e897b9bbbc6971ee7b918b435e94091b5dde"; + sha256 = "b45c45918a0101130990eb3d78736c54347b1e0278e2bc613cb967b677f11e50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/es-CL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/es-CL/firefox-106.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "fbd830e4167439ca683a85a651bc8c775e041bdf36f8a37e620f0a75abe9a414"; + sha256 = "321e424cdde9fca73afc8e5ccb698ddcc01890ff1df0c5366d8e0f022ddfdade"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/es-ES/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/es-ES/firefox-106.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "41830935f8a966c2dedb9273bfc4d0a621c57a9e0a4ff26344a02f28f9d3ced2"; + sha256 = "3515bbe241a2b6499c7c9b3834de24b8f9466a8be79809726f369f4b0c36e6d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/es-MX/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/es-MX/firefox-106.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "9282891f005799dfb6e3de35c58c83d56a7f54ad18453cbc9baa353683f41062"; + sha256 = "f72ad491fe50debcbb4845167e47bff295d390d8a6eeacbb32062e5d2d5890a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/et/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/et/firefox-106.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "30156bfb0e8bad70f2d7627f715f88a01bdcd386f413e046f1870945124bcbfa"; + sha256 = "be518323c8aa0e9c37e7be693abb91cfe62b4bccf920f322ae46ad7dfaf95d1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/eu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/eu/firefox-106.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "276d3ed3317085eb0eb8cb1c579cd06ee12f7b615599f3e3dc1428758d7b2c78"; + sha256 = "576a2312ce6c9ad37a9f33821927e02fc0fe5a7f503512331a1d744a65767771"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/fa/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/fa/firefox-106.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "e91dff193a088ab5fd17f918e85adcb99a9d6971df59f0934b933676808a44be"; + sha256 = "f43b93cb1ef729fc7e5df778336f04905de61bd18aa25cbd8c8aa2ec04b1249f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ff/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ff/firefox-106.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "1ceb71ed721122af040cf77be246df18a5598766b8e4288f8f16e2127ea2308b"; + sha256 = "f61295ac00176ab44c2b2389e7784bc5b57955983681c5d7b4f9172820384ec3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/fi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/fi/firefox-106.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "dd0e8125686a13dc8a7a870781a076256e1797b97a784198cf39399a3a8cef1f"; + sha256 = "23c9ac57f079bf7111823d99cc6893a7603ba6f39d2ebef570d885cd36ce81a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/fr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/fr/firefox-106.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "0120c5b797070f7cd3b3fd12bf83a8aec29c423ed9633df4995f653408492c49"; + sha256 = "c85632fc43dddb7fd1bea23912458484013a812966d709afc169a23fb4f42ed2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/fy-NL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/fy-NL/firefox-106.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "cd746b723f847bcb428b92d53e86a0a9a566f7539aeccd982f056cd3416c2a8c"; + sha256 = "0dcdcb5ada9fafb48a873fc20b004890413ad2ad1aa0cde9d55a0eeacfa2e725"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ga-IE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ga-IE/firefox-106.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "2c8f04872e6da8dcdf9a5cd6b39b2b6d5d16eee1b75180c829e75d040ec0e108"; + sha256 = "aae7902f839771afeb05143a081659e6b308a83a432a7b61f7cb3d7d429fb293"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/gd/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/gd/firefox-106.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "974558931565de0e93fd95e8af46e8203ee3d50c7ed74cea3e1cf8d9a231dbb2"; + sha256 = "964449ddb6554ea3130dcd89ff9d47e66521bead99f5c1cb7b49a0270a655cb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/gl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/gl/firefox-106.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "25c7e7398c41e698bbc1ef60a29ec67ec6b4cb0d5970f16e438d0251c4b233be"; + sha256 = "68585d3071d186a69c4a676da7469e4bcd0c34eefb930c151107614eb79efe74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/gn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/gn/firefox-106.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "9a60eca480973b4d17cc61ade4220db856afc3fede155cf20cb7d3d1520edb19"; + sha256 = "e98e9baa06568ec4be2623c67d2197d1349aa0261794265e8cc0f49fe1fc39fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/gu-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/gu-IN/firefox-106.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "b5dbf1c01e67bb8803300774eab8a2db1090ebced6b63aa95731bbd3e0ee5c92"; + sha256 = "26dae7968a01fc9b412321717c6e389886f921d2842f78c3abacd08e665b678c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/he/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/he/firefox-106.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "d9fb27f016bc8ed15582c064ad616ccc0aab11ad8054d6b7cef79d552658cc00"; + sha256 = "0d2e173921e7c946a22099e3b89b93989e15bf8b494ed355b70c9f7754ee8817"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/hi-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/hi-IN/firefox-106.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "427375be41df65c7b42619bdf52d7ff74cc6019d9d95ada7cf0abe388c430bfe"; + sha256 = "9add5ebaac96e4cba64a7062f567396724d8055abdb532af03175fc4729f21ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/hr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/hr/firefox-106.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4142e5fce3fbc48e71d62635958d8f91ce18759066a3808eaeba66b8560cf683"; + sha256 = "f3d663f28e57ae3cd3228d67ae74d50720af2fb3d69e4b560c0e92daace6320f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/hsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/hsb/firefox-106.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "282031c7b262ee6e25cd8a8d7358f4067de7ded90413c5e6fc2f0309733c0df6"; + sha256 = "f692817cb8dea141e51b2d9e967b8f7f6382cc8f887060033ffe23e0f544e1b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/hu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/hu/firefox-106.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "82c9562e6e00c508675ce68a95576f5182377d69bd6d88ac852501b5a68b38cf"; + sha256 = "143ca5fd40cff38d8d822b5ef64c2a861fea23d9f13e68d0668159db52bf1e59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/hy-AM/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/hy-AM/firefox-106.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "56eeceb75cfdb3289ab3676fbd11b00b9a2af5ff43f635e740690bc51c56b989"; + sha256 = "3a04c0c589004edb17900d65bb64d434d7dbfd00df29d38dac1555d37877d2ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ia/firefox-106.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "853a3b4f646df1f1a0b35bd2b5adc1037230fbecbf3e3cd695e23d650987fe5d"; + sha256 = "bc998c07ecd9e4a6f65132f8de81af2ba641289281f5c46bd71f8bc139987229"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/id/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/id/firefox-106.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "88d9b1afcb5b0ba2e9ba15e4cc3c4db1c70f3f7c3e610d1673f7e6a79730676a"; + sha256 = "2585274428eb9744e851d230a0c69c1a7b79a7448ec154cd98822932a4bd2529"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/is/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/is/firefox-106.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "17b81b21f0b29af20b7fe784291ce82af92c2f500826a9317824589cc53fd531"; + sha256 = "9ba6d3c15a472bb657d0cbcc60f5ac47b5257c92819ded17f1318dd46863ce02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/it/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/it/firefox-106.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "accc16a4e97055e20d2b43cd6845a1366d98e47e82210fa64205935f465b7905"; + sha256 = "6d9696165ffd67b2cf816dae531473074320cd47cf61ad151591042127348ad4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ja/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ja/firefox-106.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d33537fc124f00aa026d7c38516c57abc8db96c91683283bd4e05a6913c2e4f8"; + sha256 = "8ee77d183c1e734a05030a866391bc5933d5af8acc60228b8a6c46a2cb316f97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ka/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ka/firefox-106.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "7b2f82de48d51c3974f5f6d288ad36ccbb1c2c81a1e552a79018b769cdfad897"; + sha256 = "0fe5834a3e22352c090406b72d3184990e0a4bbcdc4538c54539cd774d13163d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/kab/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/kab/firefox-106.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "199068a45daa7969f76eda767a5d93d46a50a17deef61882f2735df595aac59b"; + sha256 = "efb8a8761eec4c4d4027298fd32f5b6b615dcbe40ca08f87676fbf6c4906c2b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/kk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/kk/firefox-106.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "00fc43c92a23afc23dfd5a8898aefa598ad43b70364024659aba3f30f79d1c42"; + sha256 = "b3143f13a030432765c63af0b3169b2adaa4d9814600b5045bdbacc12ae40407"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/km/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/km/firefox-106.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "34aa8d09cf26680d73785ecdb437f3725e869c9f5228d732bd63ea59cee4a413"; + sha256 = "61da45cf586053be2b82623c30ffdada621296581dab74a38e61448a61af0d19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/kn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/kn/firefox-106.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "e32ba6af267023b41228fff4846494f57c2716f473f82b1c496402a770bce2f7"; + sha256 = "a6dee26e984a4e4008202ac02abd9412a2698fadca64a890ca9cd3a66d529d75"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ko/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ko/firefox-106.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "79c749404b273e38c5e55f9aa826008948113789f8e4e8d081fb6b1373c90d84"; + sha256 = "d5965a33cf45f5ed38a6ea4efc5cc84e1ebefd5228db6c765ba7c984c26fe949"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/lij/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/lij/firefox-106.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "cae6d39686fb95b24d49384050c0ecdb6e62ee3c6ca5e09b3060df66eb6d8ab4"; + sha256 = "e46955d650bc4b6d07898449a67412b076ddb18eed449a892e25e8fcfa80df6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/lt/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/lt/firefox-106.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "587b6e65835fafc7248019796ad8be5f66e76711a501047c1bb3f13a85405ba4"; + sha256 = "4e2e8412a8aef645af84dc758c57fe0ebe1e8546990757eb036980dab0070bf8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/lv/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/lv/firefox-106.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "ad0b9cc6999fbf2d94c31bc1374ad69b63d055e95e472ce78989b717411b7b06"; + sha256 = "460fd177856fe71208f76ed42f8a174d8ae7cefd94282c7e9814dac8f4b4e764"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/mk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/mk/firefox-106.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6157eb460916c3380c482de68a90efa56ee34ed5726cccc7f4a6b6592f5e3a4d"; + sha256 = "b42d33f8792ead3571e1623c6caccca788c9e1dd73c21d0aaacbc1eff4064f60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/mr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/mr/firefox-106.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "1bc36fe6d9c1053251273378e88d0fee9390473d2e4727daa3f6ada440d5daee"; + sha256 = "52f435fb94aa4dd68466873d23caf2b3887ac6696aea0e49f38de8fcee91e5e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ms/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ms/firefox-106.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "39177d411723ad28f4b7c5068d2e170eb1bd24241304052473185d72ca05ce84"; + sha256 = "e180ea06a703dffc7c2f50a1551d12777b99729752b087d87268d477eae871b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/my/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/my/firefox-106.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "acaa92b8a029f8207e150f8417156aa474e28af775199b7a9e4ec9757ef8c0b5"; + sha256 = "3b055513759f02cadb8756fd33419658061fd248e798b257f63144ea6bef8d08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/nb-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/nb-NO/firefox-106.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "177f0dd59c5d463937dce0fedf18841cc6cf7423decfacae5347ae580aeb6bcd"; + sha256 = "6ae32100e21106abd4204d247d33d4a25107d278ca08cee2e75852cf1beb081c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ne-NP/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ne-NP/firefox-106.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "246f98ba8548543213e6e15f1c33613dd7c4d718d23c6c93c7453dcde63c2d46"; + sha256 = "3c259d914791d565938599b52c580519835f722a3f549f4bbaacb1b771d1aa47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/nl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/nl/firefox-106.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "0fde142970d72d4f1bf0a0aa9729a2828172856697440253fef2c2888ebbf077"; + sha256 = "8b3fe921cdd7554796bea0cbc8061c30c2c9701e53e0b1a9b58ec8774a0153d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/nn-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/nn-NO/firefox-106.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "2801c4a9db78587d3d5a4d817cdb6551551c6daedada650b658a94e0bdbca91f"; + sha256 = "9a70f964a3afa5a7fe020a92b29e9dcdb35c935bbb6ee129837b5531aeae913b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/oc/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/oc/firefox-106.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "db851c61ac83f4328b97fe95e377a748da500beca19f2eedfd9b58abaf346239"; + sha256 = "5f120072e0958d33dbc9e6849f6e31ab8c99f2065ed0c7c0c6624366f28e0394"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/pa-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/pa-IN/firefox-106.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "bbc9e82d30764efcc9e5168fef26c8d3ab141af6a2bee58007843b5dc9170ef8"; + sha256 = "5c9d946f9b460bc6aefac6624c223397ba77f6b0fc17124a03ee0285e1e00ca0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/pl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/pl/firefox-106.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "cdafd35d0ff5482477f0942fce33258974a533371d55e2a4de7c7b5f0ff17b0b"; + sha256 = "06bf18e3aea7167a52be683227e9cd6203c91bcfec65808b430cfaf793062a81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/pt-BR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/pt-BR/firefox-106.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "fb80e5442da92bedecc4a94f935321ac70c3a57072e115663243287265d9ce7b"; + sha256 = "e218a5280052fcbd15071f58817aedc987d9e4ad66a73522b288ecacbd294d04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/pt-PT/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/pt-PT/firefox-106.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "471daad9a2ac8bc4df475bca4c6f8ff940e545b9171970c01ed57b173ff820ff"; + sha256 = "80dd9140f83d6ae549f713d7837e4fa4f08960a6286be47609226dd4c4cabd7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/rm/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/rm/firefox-106.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "993751ae6469b7105cb187952570b1b4e87f458720b47576ffeccb50c7b9f52f"; + sha256 = "722b4773442d116fb2d4901e29712524a4a116f44b0fe479db05030206898dda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ro/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ro/firefox-106.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "47ec676324b841bcb9cf366176a394640f9b47c181b5a3a818342b1692e3b1c5"; + sha256 = "ca63e47cb9035b9f96391d40cb3cb3d03131384f505aa06a1964a083839fd038"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ru/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ru/firefox-106.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "15dc118027eaa0d7d063523aabba12b46920405076c1ce238fda62db2b4ee7e4"; + sha256 = "3922ba091731c781718c7b93363ff2724cba7c4787c3434cb09b819a62cc9c1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sco/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/sco/firefox-106.0b7.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "82476bdfe8ad10077e32b96789c5fed32eaeb5c907650e003010203788006bf0"; + sha256 = "9ce16a7fd41d505e5d94cccadb2ab3b7b633936ae63478008b9611f452b87ea9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/si/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/si/firefox-106.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "bd2e414bc53a2f13cb36366a0fbed16dac9aed3e777553e1fe052f435af03bdb"; + sha256 = "3a9640e5e28cfd750b15f29265c87129a27b84e249f00961fb2488f1f83636fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/sk/firefox-106.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "4c6a3a51cfe0ac744b1f7940f419b78d67033733c9ec141e6e117cb80ecf8dd7"; + sha256 = "df9c92857de434588e7a3f5530d55aa9320f3417919c46c3688384401f3e7ebf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/sl/firefox-106.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "305cba317b340a649a531c493801bca0533e05b68b7b8c1c81f4970cf57a1d09"; + sha256 = "b9a647cca8734ae9150702c6c97672e77d7dbb55c74cbbdd47f354411235b4aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/son/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/son/firefox-106.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "88c43f4fd4c61a1cdbd6109f65bb27235e22f471c8091d52890c0dcb8bf38b48"; + sha256 = "aa54fec77aa630f149a91aae1f96f76181450568632580aa32704d2e85ab1fe7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sq/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/sq/firefox-106.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "127e042d07e6b56e2bc177c05a09a6b712ee63fbbaeb4a90d4b0e9775fef7aa2"; + sha256 = "51cfc2b22f95991556d026e91b278ea28d8689525a5e9026bd40a0a1b43863f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/sr/firefox-106.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d08f6fba892fb500924d2ed2531127b6bf51b7b9d65f11c36ae3e05adebd1a71"; + sha256 = "bba0d2f1e797ad79951f252fcf58d44591357be12504f13e1018a2e072a2ff9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/sv-SE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/sv-SE/firefox-106.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ef56a2f2acd15e54f831f0e0c4a55506c3ed8ff1d532cefca86f6fdaa5b14d21"; + sha256 = "5858fd392f63a1155c5cc4401e66dd7be6a13942709d7ef757c9fc348d8cd57b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/szl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/szl/firefox-106.0b7.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "8aefe66b15188403a200cd215c89da1b35998d5a5cbf5519ee05160dc98b8e10"; + sha256 = "2835ca7ad201b5647b8600f16d6903f91da08ecde93b53db20220c1f9a9f3c59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ta/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ta/firefox-106.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "427f704d4d0a533b76f120d10164def4da34d0292870e728dd3019d7aa7d87e0"; + sha256 = "e72b67ae007bcd8060056f2f0b85cef3d1ca816064bcf04d852a5727d54c6ae8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/te/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/te/firefox-106.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "7edb070de265f08795b5808dc1bdb6f98b17b22b7a1f8cbd449de5e54fd2c4c3"; + sha256 = "92bef22f5c613309300a651cb720058781f31a73639d5db0fd20ee7cbc7902b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/th/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/th/firefox-106.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "c618a55797f8dcc66efe766ed00ceb8a26768fb8873865d3a88c721e8419fba1"; + sha256 = "1f6bb85b1e7090eacb423df43a0e3955def57815de768ce93205fe86110ddc6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/tl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/tl/firefox-106.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "d33946e26e36e72e341d7407184806230c5bff06f9d9cd4042dfc723f0283072"; + sha256 = "0a636edcc22f03e76821b4333abeff5cae8765683cf472e84e1ffdcedc55370d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/tr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/tr/firefox-106.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "38ae66fe5a76b6f86283adbce1e2b47117e69316d4fdf17c68b3173ae332ed13"; + sha256 = "e603b7361de2be1f1b233c6120b36b6c37ad8a14d382ca90d12b8278e822942c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/trs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/trs/firefox-106.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "0f628d1d423a024491dc1360c5d7ff949061ec7e4b373501f026f94e0725493b"; + sha256 = "98d350921b5a40e55f6fba61b947203669f9bf6cd66b827e58c8f386ca103e45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/uk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/uk/firefox-106.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "95ec7c2a00e87aec69055334681a81dd1e26074136bae946e166193b380d469a"; + sha256 = "993f3c5d5e8f4e5293f021cd09f892c2d3efbc33402478bf1b6ebaeb0be3b00c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/ur/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/ur/firefox-106.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "9f7a89e65ce6e3c286499bc2b54ed86cb4319a509cafbc5705bcd6fd509bc0b2"; + sha256 = "84ebd00aa3b7e3c69a093704f3bb5f8d6476e4e701a9bc99cf144f3094b115dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/uz/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/uz/firefox-106.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "54e32fe8c68655dfd0ac18af6be75f6bb853b4d2f065a021e8042c415fefc90f"; + sha256 = "7d668b40554bb7e66547d78765cafd52425bb35fdc954c78c9c6dc1c445bc3f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/vi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/vi/firefox-106.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "23a925448bb9bf719f12af2d5d1735d580f1a53f9a7f4d9d0ef351a1d1bc1b59"; + sha256 = "2b1f57d703dc24934842af33edd2ef7bcd260a1a8b0c3e66bff8d2b5131d38c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/xh/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/xh/firefox-106.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "258cd630090bdf94f9df31a572d20bfc6b556527646c0c29e75446c884cda1db"; + sha256 = "269e61539ec0c77c962e300fd3a3c159f2ec50ee441c4e5d52f4ffb058fd4745"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/zh-CN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/zh-CN/firefox-106.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "5509842e4292b9b98fe24671643b646b25f7f50a32f4cf75bbe0afeb4e784642"; + sha256 = "23e4bdb4f63fa5184974a1e6edcfc69515b276668054549182bb739e36203a8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b5/linux-i686/zh-TW/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0b7/linux-i686/zh-TW/firefox-106.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "5fe8c896bd2ef9b80041c4375a3441707b3719161d2f03e220e54cfd956ad9e2"; + sha256 = "5c28c9bbb072cb88405c4030e0f7940a4357101db2ed81b0246c9ec5b3d98606"; } ]; } From f33230dc4c0a51a8ffa10cb11ae614e9c1e82145 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 11:24:20 +0000 Subject: [PATCH 124/269] firefox-devedition-bin-unwrapped: 106.0b5 -> 106.0b7 --- .../firefox-bin/devedition_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index d84d53101937..527ce0aaf8a1 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "106.0b5"; + version = "106.0b7"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ach/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ach/firefox-106.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "8561511ffa05f44e7ecb355e55a5f34debf314fda2db73f9e3b72be9748acd40"; + sha256 = "359762621838b9da78e565b62b6cd9c765144683e2c34edc5118f45303f3c9b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/af/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/af/firefox-106.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "83617476e933ae50766e48d915716606585e52aadfb0794f2f522ea0249588bd"; + sha256 = "3180fd9e1aab8e81dd4b3e1992cacda19518ced459103772fbe7995f0edbab1d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/an/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/an/firefox-106.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "05500e3cb7dfd8d6767cf1a0a9de36f8e5569f8c561a6c723702373a258e9416"; + sha256 = "4a0dc51afedfa4e98a960e70c7073e04f38b0d7a66f9acbc7c7138052ad9780c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ar/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ar/firefox-106.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "7a084938b7996cf7003a9d351ac6a47d36d1341aada27be3a7b4cd8a904bb8aa"; + sha256 = "202efda3ad2478b9a7e8ab84485155893680ebf8a3993de026e8c369ca658a3c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ast/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ast/firefox-106.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2555cbd082b0e4e94ebbc71f45897c3f2e62703d8f14300360d896cc48d70e86"; + sha256 = "107236a15c69563066f6b6db763d2f53104888f1e8008be586c8a6d2ebdb9638"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/az/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/az/firefox-106.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "71cff2fa458bc664a8fc43f8c94b36dd75b61c6534e45d904e391991dae38590"; + sha256 = "eb09bd9f2bfba5191787280718d2727692a2acb997a3d5427b4f0dfc48337ca2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/be/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/be/firefox-106.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "30b1055d251fffe08c867e4e17ce564e0cfb98db57c5e94733a462e25a93b357"; + sha256 = "d6240c2a8b919e999fc13d7a7fbc6f0bb1031b7bde489ea10df69d8441223d4d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/bg/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/bg/firefox-106.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "0fa796ab33be0378f5119f6485310370032b3ff0a265c09844060a16299d8044"; + sha256 = "655022cab5a0f1e38bf55e2e6644cbf7c3cc5c56ad6f9684669cd8a74c5ba491"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/bn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/bn/firefox-106.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "e9167f0d715f29337bc378d0bad08c283b61128d0c6d4d34b0ea9d0230129d27"; + sha256 = "f0a9d666df7bd3549c54ca04b7b677d7ef18e4eb51f680ac6e4766aa9b8d008c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/br/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/br/firefox-106.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "7ffd2f5ce0a865984016849c41c2eec420f65f569142d2999a45c85f88b6359b"; + sha256 = "8347b6853b9cfc8bfc05a9fd2a9150e60e06668e5ffd3dda7cf246ef5ac5f1d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/bs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/bs/firefox-106.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "255a076f7d77405a6a9a717baa2e7428810ab2d0e52f4b1b7d3bd661a8e68d45"; + sha256 = "6b1f553ddd950f6e9c189db5b688a2183b85f7ceb7bc06a94387950449a2ff4c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ca-valencia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ca-valencia/firefox-106.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "adea915bc0c7b6b108c78399e1f2246c71e6c52edf68b0acc5bb09b89910c77f"; + sha256 = "4eed27266496f2e6cf4fbf80f6f19b2728abc6aa5d058b329c2f94cf309b791c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ca/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ca/firefox-106.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "bd57a37cd9d7d7b7fe11d4d657a65edb28f6d8cdf97c618db8f5ee61cf0f45a1"; + sha256 = "06b8863bc7ad303d29b381bdaac04946dd67b72812d42b204cf34757e6c1aba2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/cak/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/cak/firefox-106.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "064bfc818a73e26b2391af3952419fcd33185b777a445566f7611573b512aa36"; + sha256 = "e8866feeb9ff8ed1ab007a8b9436d7a894c5023d587e7f9cd699e0638c5b1f2a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/cs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/cs/firefox-106.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "96f9ffcd5c27fb63322146012db1484f4348e37ef67487ee6ae595785f821d4c"; + sha256 = "f5cb08e6aeed826b57a3d9506b06e6c7dabc578371f4bb320471082abb2cdb77"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/cy/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/cy/firefox-106.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "f33a17099b64ca3a88d53666ac3e82f9d349f17610bceb3be2f2f78c00b442c3"; + sha256 = "0c36b39e6c3b944a619b465fb6a56a1e39194b00990f1fb8b29dbc439b15dc57"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/da/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/da/firefox-106.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c17bd03975c4aea3c8469f16340a50ae55287b1fd9a92223487e5293e6520540"; + sha256 = "9916a70bd9a5b9b15c2921c54bd3b276f7552abb3729fd96291777e805e6b3fc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/de/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/de/firefox-106.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "3b8c84ab9a961d4c0b1fbfcab10a6b38e855bff9b54446d94f9f7b5a66dd04a1"; + sha256 = "8ef416d90d38b1bee9cea5068dabb3080043864ebb205cf7328a764fbbba5647"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/dsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/dsb/firefox-106.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "10f57d6cb48e493d860a1fbcd1817224e63bbaf36bcc9bf8d6d56e9e7e07d490"; + sha256 = "cbd676e1ccac0e09021efdf4bab11e7e5b3fa039d050ec31e8a6fbd7a54b857b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/el/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/el/firefox-106.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ebb6a84f17e0a0ae677f01417e7e199be75b8888624c739a63be50e7cb6631ed"; + sha256 = "32b0c0f2e91cfeb73839cf35d9bad9115aff8d1f7be231f8c7d1c025a87c0e97"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/en-CA/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/en-CA/firefox-106.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f132aa451958757f8f8fd1ae82ed0b72e46838ff59044d956edc7242a106687e"; + sha256 = "c66fcfd0ec7f5f8a005a149433b795c5562df7bffdc51f7468d00c0d2a658df2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/en-GB/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/en-GB/firefox-106.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "733e103756d3e885d9b7dd084448c8ed9158b735615e2433ea2eb35c4aacf413"; + sha256 = "bbc6a2ac4dd659d31c2646b2ca6f924336ddb880a1e0e00a8b2062680cb81ecb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/en-US/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/en-US/firefox-106.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "3c5e8abf57742958345d1be9ed5d4cc8096198a8f9e1b58277ddf5dee300df42"; + sha256 = "a037da733f802a0ab56f016bb78019a1a66c3ff259e03ccbc894f67076a57b1d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/eo/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/eo/firefox-106.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "ed02281964a7b63be645a1c0bfa54c60c9c06e17ae46958b4bbe7feaf844a55b"; + sha256 = "26debaa8208345d8c349a0cc4defb19621e03da77ad51172350b3de5c8f428db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/es-AR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/es-AR/firefox-106.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "8acea707b073aee74c3a5072f04150b35bbf4e1b603752d3931dca3d51abfb5e"; + sha256 = "4c3ffc1fd742f9dfc38c7bfbef8629a549cb86192b624c540127eef2a2b1174a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/es-CL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/es-CL/firefox-106.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "295208a0fa79f04f27e7d0a5597faa40ace70c425c6236ce5ffa0105d617a68e"; + sha256 = "a61ad4e55c3574caa5ae227a2cef1a76b8fd09a06c5dce919a9837c87a5388d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/es-ES/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/es-ES/firefox-106.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c278cf1a3010f0fdf63334773b37e02a368f2fa60aeb626215f16a45cbea7ac8"; + sha256 = "7ef506ee7465ef7984aa4694a98d18921377b8012c3ee8369022e797e77337e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/es-MX/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/es-MX/firefox-106.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "68b8242ce796aef4e08e23db3c804d373e7b811e22759fc0fd4777169e77864f"; + sha256 = "dfc1a75c7bb1e2dc6f4cffcb8098b0d91b8aac8df87bd556b6b94ea3beb99e05"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/et/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/et/firefox-106.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "0526e691ee552cbf11a74749d2a1c633d84289210ba85677f035565c9ac9f395"; + sha256 = "bf5b057efe389d809ab78666ed504b4640dce39a49b0ab88be4fc749528a9143"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/eu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/eu/firefox-106.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "fb8aadf65afcc9503181600eb1c446922fe6d46ba74a32c069b7dbe9acab4f14"; + sha256 = "23e77ff26c7bc2fe39153b5b84f0d6c2bb688b19dbd3afda5056b227d6091e49"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/fa/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/fa/firefox-106.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "79f82ad1a1aeacd865449c34c1d7249d62875924dc204e04e9cd0123fad04286"; + sha256 = "8420aeeee19f88c87f5974012eb24c97c6a8ab438c514ca9a662a5f7cc9d0d80"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ff/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ff/firefox-106.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "c33b13c7b6a19604f46f33e705ea3d950832ea62495ef687212e38d8205b322a"; + sha256 = "8e513252a794111b68d4336637106a801aeb7805759d3f5a30b8d94a7cc88344"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/fi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/fi/firefox-106.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "8080d7de2104faa02a38b12700bde752c8bd2b01168d975247c2576e59b34d8e"; + sha256 = "33b75d9ab79fbf5ebddb07012cd4b57c325fbffa17ab0219cf6c0a39965f8511"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/fr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/fr/firefox-106.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f552d225f475b428c701a52780824f559659760438928c6ca765fc95888d4a48"; + sha256 = "e3fa779ef2a4bf06cd5938ffba4e99051414b9626462fd9e13f2a1ca26032f7e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/fy-NL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/fy-NL/firefox-106.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3918bf4e8662d104255c633e6845653797c15ec4919864b20460520320ec0acf"; + sha256 = "1866db6b85e94d9e86991727a60d8610526246642d58d910c88051404ebd6369"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ga-IE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ga-IE/firefox-106.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "643808c3cddae4bb84d1e1801e861c82d8254c783a70e08bd2323e0ffc6f1136"; + sha256 = "730bdbc8e3c0da1dc1b3cd81959aba9ed7bbdda3305a9203eae52dac522e7c95"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/gd/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/gd/firefox-106.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "d07e8ac6bd91644e92a81d004f2167b4a0157671b4883cae42e5ee4435bdfb04"; + sha256 = "6c2622449bedad732de84aec4ea9a4507b6e856e7bccd26eaea226fbf158b613"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/gl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/gl/firefox-106.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "bc844861dedb5a3567f20352bc522cdd6f1517a8578716dd856a0c505f13f350"; + sha256 = "908e841f00ab7c80f15ca345ed701fd90ef0a006b5ec6fe02cb806ebbd3b394c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/gn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/gn/firefox-106.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "28b2a372aad0253f7c86897eeee1ffbd5618b3adc1795fab5f45519ad8308df0"; + sha256 = "d7ace082b7695fbdd67a727d7ea29af1d90416f2c6623a81682097d2230a953d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/gu-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/gu-IN/firefox-106.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "513eb2523c4ae09c14b7102c09f6fbc6a33f194e0f9c71ab0fbbeca96796d9a6"; + sha256 = "39dd935e22e3ec8adde5fea3528cfe00ae8639cf54e0b590434b93e5a35e7f31"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/he/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/he/firefox-106.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "20b83257778c16097889f9399f326cbc631fdd9fb3c8aec03e9d99d1af0d1764"; + sha256 = "289f00df9cbeef3e6e107ff61b1a1aac1db305c9bec79f5e9f1c844d9f94c233"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/hi-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/hi-IN/firefox-106.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "beb5034ab76c09b605b91a87070674c82a5ffe92da5e8905cade02477976dbc4"; + sha256 = "e4d4d703b7292f1be23e53f8fe034b48677a9baee20151fc3478265f75c8f9c4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/hr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/hr/firefox-106.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "76585fcca92bae5ea91b2e16d1c38b645d1a5b6132a474be1de070efa7d14a34"; + sha256 = "1784a8bf7912f47204f13fce89fba19d0c99eb941d0bed728f28b65ae09a94c0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/hsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/hsb/firefox-106.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "ee3c70ec61475cb01df13adbf45d6f889934e97162662dba56e54a553b403913"; + sha256 = "c9ade3120de8a3193d0ad35af9ee37a677d376952207a56f3f9829e6d98395fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/hu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/hu/firefox-106.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2349d58a9dce6588de0a0afcb28a66269674cdd6b8879a3ff9514a4d129dad09"; + sha256 = "125ee3b7970c3636c4f1321a64248da697e80fa2c642ae116d1887367d51de19"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/hy-AM/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/hy-AM/firefox-106.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a5429d3282b68498986668070ca1e6b009b2471871efee707df659d4ab1a5051"; + sha256 = "3ad843210807522e2d8ed295ee617bd6364fe96fc2fc5fb515a38d3437d6cf62"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ia/firefox-106.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "c00260190fa7f71b0394f33eb4f3955c3eaece1c47ba85eb32c7c61ddc750fb7"; + sha256 = "89b408523c51c4bb36fe1ca7d860b493e6ae9e2826cbb1c9b793a1433a7b228d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/id/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/id/firefox-106.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1b89d56c33b0b36d16d4a454beb1572a29f21f4e93c584f7282367770f309b46"; + sha256 = "84464b35f8017d55378b0f8e56b348f0ad6537c1b29205278697a122bd0d011f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/is/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/is/firefox-106.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "64b453f79e65911ebc192201a711439d0d4c2bf31b2757fafcdbaf42e4cdd61a"; + sha256 = "a6834434d730ba48a1bbd2170fc54f0881ea3c10e9ae2712c894e1fbbd77de38"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/it/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/it/firefox-106.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f199bbd3957966733a8d7b3b7cb365b9d8ff6bb1a1009dc8a444b9d23cf75ce6"; + sha256 = "3a737cbff45fa973c6afc0d58b3fec457f7cd21cb919744cccad56cec278a044"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ja/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ja/firefox-106.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "fd671e68f74080861b7671c7c50e10553d3aab4e3bd695f2726eade496a7d462"; + sha256 = "dc5f0a16fe67a56940e67978860009ed2f6ef94be66ee424b5a41eb615a5d224"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ka/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ka/firefox-106.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "85b4c5e5c1aa54e634db7beea0fd9570aaf7d88753cca8fee58198763be86d54"; + sha256 = "b226b3424e6728f04efdd322d2e3929761dfd0b9122da917f6084209bf3ff4c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/kab/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/kab/firefox-106.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f99f041f9239e4c2f01c812523390bf53a514ddb76dc9be59865f04deae06b1d"; + sha256 = "484c984b1fd4bf98b5af6a343a092e883c628cdca499394a574e8ef25b15d6e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/kk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/kk/firefox-106.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "7b594bee8a5c86306e8b1958418b3113bafeff8ffeab26996b4d61f6adbbc10c"; + sha256 = "50e1633fb3e3869e4469203fb8e49360779550329738dcd48fa6123325b7e647"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/km/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/km/firefox-106.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "77290edbc038e7a263ba2020215d69f18d1dd431982d54ddeb2947296f0b798a"; + sha256 = "29cfb6844031f835a7b2781e64f0cc92cc728dc297bb5b357560020b82150ba4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/kn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/kn/firefox-106.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "32e9df13c83adb6a9d715e3987ae8a64c8b008265b9737b5c9ca1e219963905a"; + sha256 = "b6f416dc1b64b266767744a1688526b70d7d61c5496a2b7dd5e4d65defc41f29"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ko/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ko/firefox-106.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "4bc1ac651a96274d6353113f7c28a2937d533d12a297f8c8afa8596b73e1b35f"; + sha256 = "c87cc71b72f7a8cb245639e69fda9051189073ec39c80828871a48faa8fb46a1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/lij/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/lij/firefox-106.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "51beb8c5e8aab30a3cfeeeb6944315082c3bad5f6984ed9de8b0f3b439bb47fc"; + sha256 = "3fdd1f219603d3719ec36e620719b8602362b881368fc636e3060dce8ced39ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/lt/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/lt/firefox-106.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "18ee3a3f4d3628060338ff32b738e6ece839aa01c8b7c21e54eeb1a4a42decb2"; + sha256 = "f19956f493242cd4c72c84d2de1f273e95c550284bb3d5cd346de14743cb0a9b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/lv/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/lv/firefox-106.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "dee950f1b2dbd3d96e121d4200c3ed05befb3e96f88b70fe08a4c5ec081b6190"; + sha256 = "de45abfa58edd814ba4eff5dec510f2712f1b8f35359e9ae07d086288875cc3b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/mk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/mk/firefox-106.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "1ae47a547f40f517f185fd49cd74c48d3203a40d377651705563fcb651b867af"; + sha256 = "2d8aa8c4cf103e1fd7aaa618b1885a19c819301d4fea00beeeeb5a4c1233c65b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/mr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/mr/firefox-106.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "0adfcf990bb90bc33b056fe113f7c89a4dcd06e2dd5e05ba1fa5e6290fa4cb50"; + sha256 = "b7fdb6d0d16484a475f87c559ed994a650613448d36ed7d747e69dce226db354"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ms/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ms/firefox-106.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c105fb810a6665a95b801f963aa66356b110ebe573c720e0076b123fc3f6ee8d"; + sha256 = "f81c1049e920c3fde7dc44b972be12ae730470738a78be7baf71a5ca2e7d678f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/my/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/my/firefox-106.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "73c8a093f14db76099b84f9bd97c679cbceee78e93470878cc2144f50edc7c21"; + sha256 = "0e40d79a0f33323167c08443fc2b83ca37d9d8729bc2c4ac824238fa94e32e6a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/nb-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/nb-NO/firefox-106.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9b323cc24010071a915c2d7f8ad7c62a125799289e2d37e16054df22deea0e95"; + sha256 = "a6f01144deccc3bf4d220ece19a006043e165b340db08aabef6b4a5dd1b2d233"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ne-NP/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ne-NP/firefox-106.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "aac79aeba8cfe567b8f281c98e4b0914c7ba94c746ba836c3eb3d2dc5b908e04"; + sha256 = "51e092bb26dde85e52c6b4c5354dd1efc1006f78702f4a1545fb9a5e22bc431f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/nl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/nl/firefox-106.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "e7d7b3ba83e5de6636335c612b709916974f06b9fb9bedac3786f23a8d76887d"; + sha256 = "c825a8ac003a77e95d9b79d5e552c1671c4e7140638dea5cf15bb4d8dc98b7d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/nn-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/nn-NO/firefox-106.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "806a6d230030228fc9c386711de90a57d47fb46a8360f6d0ca4608e845bf1e5d"; + sha256 = "3a9f3e7aae25b59f2b412e97e6a50fcf4d1b2d27bf5011f8b958aa8f5751957e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/oc/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/oc/firefox-106.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d44da3e42a9539efb56d87f15d8f931d10e555124951f679f6651630161e1434"; + sha256 = "f211129b7ff7dfa5c965cccbe67e50f8a86635edfa87365de877d330f66eb663"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/pa-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/pa-IN/firefox-106.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "f5a69d6488040009bbdd02481931a4b8b16a2cefd092f8b77822e7d92acfd658"; + sha256 = "063c84bb41c536b9908be67822c4a8c1c49f0825615511e6711c7faceea64efb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/pl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/pl/firefox-106.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "713b9a753f3124c7f828b9d47fd0efb096f992d7dda927469ba9d5b657488ffd"; + sha256 = "49e2edb9f975653d79ced3ab60e5ebd6d9619890eced521b287ae4e80e4a302b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/pt-BR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/pt-BR/firefox-106.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "765ceef939a14617f3c6551245c5f5add040b2be481366dfb80f55680ccd5a4f"; + sha256 = "26943b70efe1415ad730ddaaa8474474e1301b3f0b0b3c2851f297407da72657"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/pt-PT/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/pt-PT/firefox-106.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "7489126fb451d4a75b5a18be31d1bee296efe7b47339def2b7d97a7308663800"; + sha256 = "4db58ae17522f53d875646c4e3715abdb55c86c28d4bb21902fa1aef681935dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/rm/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/rm/firefox-106.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "444781014ed9cb501c6ce6bd7254bef771b5d9a78a46b40caa057fda5ea9fdbc"; + sha256 = "87fc2617a0d277b0d999c61777a5c428c0380d6b7a801290e7a65b4b1d414ee1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ro/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ro/firefox-106.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "a435a105cc1b450e56fa773215f4f39974dd1865ff21abdfe0d9eab15ac38f20"; + sha256 = "4eb307a2048cfa157c572fe20c6a7846e0b857ed5bb2b58558bfa57788a44cb3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ru/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ru/firefox-106.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "50bb64601eac51ee80cd232f25a37c40f58f630ea888f4656e06ff53a511d978"; + sha256 = "6ee3bbb4fa808d256bbc0a4e764224d52a370f7a06fa2222c192099a1cb61e4e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sco/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/sco/firefox-106.0b7.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "30d43956c9ad25eb0e60453fdd88f9adad5d057ddddcafe32d8e103193a8a7f0"; + sha256 = "3c65a5564bb0db6f695174801b2819aa8d574d12cbb60158e848cd9a1cded6d1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/si/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/si/firefox-106.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "0013f2fd5008756443e661becf13d91d5a6fcec91c83aedf9deb422b14c1957a"; + sha256 = "93e4e5db574752966c01d8c9cd0937774f19f1eac53b71a9533a2525eb784f42"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/sk/firefox-106.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "8feabb983ee212d93f59bcad6d9a8a66450e871560e597d768ad7c986f694b68"; + sha256 = "0c093be16128bc268f344a90025ea1ed26d3d17892259acc124aed0cf7391b41"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/sl/firefox-106.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "ecab79986183edc42aa1450488cbb6163a7ad92a21788ee5f8468ad47d3629f8"; + sha256 = "7b3eb5eca14d84730bc463555b3c0ca694f910deec7c518071060daae40b6858"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/son/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/son/firefox-106.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "7742d879125b22e25bc18e9113e567150eea3b991a6fe55d364399ca01374552"; + sha256 = "3cce1cf0644652e3b85ec39f04bb8bdd80a5b68acf838a84c1833760ae9d70e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sq/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/sq/firefox-106.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "21d213389cae20280f5ecba82993d165dba36fc36c6f9ab0e93732d049f2f593"; + sha256 = "47a84e9558145dcbd4ba59a9ad711d947925b85c36dd2da72cedb3526314a4ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/sr/firefox-106.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "978ad725c887c4b68a65cf7c67349b44298ef404d7d84f7113a0c4855370a31e"; + sha256 = "12eecdbb0e063a2f2e0e5a670b2e571f8337c0fcbac53ddc9aabc6792463bf01"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/sv-SE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/sv-SE/firefox-106.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "7e53f46c1135822a09c53cd10a375ca299b6254752daf0a90883648c1d428209"; + sha256 = "aa75fb252fdb0807abccc2df77f7ece2fd706799347d059f3cd2c7b10cbb1ee4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/szl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/szl/firefox-106.0b7.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "37e203a9b83482ffa8bd2ac5c757d295e0ff1550077b0151023e1974f049642f"; + sha256 = "7a654136ec67dcc20da7933a6a0dfba0e2ab0c4d75922cbcd06d35ab5fe87407"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ta/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ta/firefox-106.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "2044377f697fd6943d7e904b74556a084700d2a7064eb994114119264fef450e"; + sha256 = "7e869fd56051fd0cb00f2b7156675c6bb2ed582ab8f8b90636e58f391e1bda58"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/te/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/te/firefox-106.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "0afe9d890f0e3d6087d3f12a63d007de658bd94c7bad43845065e2f7f8ea1715"; + sha256 = "d204fc178195974a67a45001a00e7c73e5934690415fedaa82ed09b6a41d6d76"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/th/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/th/firefox-106.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "9d3bfa3a227c1193c4900e99aa181306aa2560e0f419405e8f0026aa5f04e0b7"; + sha256 = "c158796a86107c3092433964f02e7c4300c4a80abdac54f8ae62b90af306b208"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/tl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/tl/firefox-106.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "c4784990fefd26fcb26abdc59bf5b978bf00dc6036212565e4c4c75baf71f8fe"; + sha256 = "5f17513452be4596b7907d8653424f8ce55a7c1c2b669830b9e67592477c90f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/tr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/tr/firefox-106.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "bff6fcbdc140766aa4971dabd2544a08ce42f923a8726871fc47b18fde099c59"; + sha256 = "f26f2eb123f4d94dfe9e08781ac24d70a843e9cab25b1009cc1e527028641c2e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/trs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/trs/firefox-106.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "727663232ee0fca2a9b5918688211de5013dc294d2fec80e7f568ef579fcfcdb"; + sha256 = "48592e0212529a4b8c4a90e8006f501af070921cff9f6b53de400d2e5af9a724"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/uk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/uk/firefox-106.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "feda8099c81ca622f19a1a3205d6aef9d2b452397e16e6d1b213609ff23bfa05"; + sha256 = "7dbcd348ec1baed171dd68b33f65aeb917c6b91f4ca9dc39dff4b9e2009d8410"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/ur/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/ur/firefox-106.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "40ee8c47b590054eddf4bf8789abc52bb76d8a4261fd342db26a15e614ce6e57"; + sha256 = "ba4ec9154574b44accf6697f06c94b5c05700ea74e8d6104557b957c5a540786"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/uz/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/uz/firefox-106.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "f6fa60d36fc6f624ce5b8b97a74a181720645ff0aa7b0f5545b6759804e9821c"; + sha256 = "7ab9963203f48cebd55eb5413fb80450dd3e51a99bba79d13e4f371bb6225e95"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/vi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/vi/firefox-106.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "0159e7f7bec4e32589a955cc7b94c322e0d80257fbb960c8fa1f5d56cb5564cb"; + sha256 = "6248ea729a7f67f66c1e7343b49ce4ce9eb259bc24b57e981ad6bdebc94d5271"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/xh/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/xh/firefox-106.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "e05a18b54cc54b74b7a90317378939cfac2278473e5d2166288a560bc621964e"; + sha256 = "f717f66ffb040d40d64e3a0153639fbc1b3fd0f05fac5ad360ee969caebcb851"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/zh-CN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/zh-CN/firefox-106.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "88337f1fa445a934866493be661e59d968ab48d1beb8ab65820adbf5c43b47ad"; + sha256 = "fbf9b5b2e03b740846cd7dcda54f6db8f8737f998906bf3f2882471b31384224"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-x86_64/zh-TW/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-x86_64/zh-TW/firefox-106.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "5710e0a112ccc06d7dfbcfc550e397796a3a829d9b587723cd6f74352ad2ffa3"; + sha256 = "c388fe114381f6d7efacc00f9e0aa7743ab2dd70c93fdb1c6baa7a5985c4083a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ach/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ach/firefox-106.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "ad16eeb19cb0d64715faafa58f7ae5344306c57ae5cc00064870ea6d0d422705"; + sha256 = "2c4105a4bec2a534e8db7365c5853d4ee844cc63321e24806d2697a0b1cb5ab3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/af/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/af/firefox-106.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "3e94c4b550466e7ae223ee9347e67ba05f00b5aa77a889b4063066b6c0f96a01"; + sha256 = "08a98ce84524312151d44bca4dda305d2ad1db0513f207d071dd7efe0a363e2e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/an/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/an/firefox-106.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "7bec79c662b03e5b9690ea283d15b26105714ebcae5e43ddf6acff3207c8a399"; + sha256 = "c986ed7e79c806186906c231520ce2a89eab74b84f10829b99aa1bfde2bc0cc0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ar/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ar/firefox-106.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "7ff23d45f9af6dc4e381ad944726f196239baa0c073f2e91ce2b6a0f8fbb0e82"; + sha256 = "ee4ac94d58f7dd54a9902ffce3c144d57b72d2a4a195a2c8e7f90a2016c72f1d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ast/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ast/firefox-106.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "4ebba3167fbb09e7881c765378db6dc283f68dfe5cb430bc1b7e7d1d69f5e7d1"; + sha256 = "52eec40019912cf91b336b5f0717433081dde38d45519da291a1bee505753073"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/az/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/az/firefox-106.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "d14511717cf9d7baeff5d18bacf364374f24d5a6f5ef780eb43db7b85feb490b"; + sha256 = "84f74cf651b10cad5e597f6906bf4eaadcaef0563f7365987fbdc7a43fbef618"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/be/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/be/firefox-106.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "a9e8f4776977c30cf9b3f30f5d0e82c34b402ca0974d3c130ed5629a22e168b2"; + sha256 = "044a29b81becb57456187406e695cf6a8cbadb412ab0f86e2dd645b7a178b887"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/bg/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/bg/firefox-106.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "47d8c1926013cb318b400f9e0cf68c9ce555fe2e4923d47d5017df792925beae"; + sha256 = "618d5f9b13c4980682bdb05352b55af1438b41f8e026864410e2af05bfeda3a1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/bn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/bn/firefox-106.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "551740e8756abde368f1c7937f123ec571ebf576d1b71d60ca20ec075ecc2b2d"; + sha256 = "f08c98b27d11041352894e48542f4ed8313f95995d8f60ea799fea43c1cf92fb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/br/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/br/firefox-106.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "2d1a3e19a9f076f0e71600527324db780b3422f4f204f64c7b99d0e01256c5ba"; + sha256 = "343ea06cbdadc55fe80aaaf13e521d66cc941dd78472c21793cace24d18e9680"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/bs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/bs/firefox-106.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "9d1030495857bbb0e1ff8bb76c4e7519b73c219233d608c74420149dac2d8f1b"; + sha256 = "b747ceb34d3480d2aa7e93a8621e98c5cf2bfccab621c029ebdb39592b1807cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ca-valencia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ca-valencia/firefox-106.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "1eeb313718a669ea559b7f88a427d96b54f0229424ad8b3db01b8e3843bbc4ed"; + sha256 = "018487d6fcd1a52953b4e0aaf137454b4c51e32511d73d1088b6bacc1482dc32"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ca/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ca/firefox-106.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e348847c952faa0a60a6a21a579102c86cf186b28b400cbac07119228bee33a1"; + sha256 = "313222aa752f40335757151e857addb040c65837ea4ea0e495e48b39cc8a004b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/cak/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/cak/firefox-106.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8f019eb3200baa1ff673b86d4a020ec40008c79d217e54698f0b01b4b6bea4ac"; + sha256 = "49dfe2a1c98070e5d08e9a3132dfb3930b5d6ac767bc72c42a5ce5243240f69c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/cs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/cs/firefox-106.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b3076475e5eefcfb7053dd6efc93ab71aa60fdcf2007d4d78c19c277b1ae696f"; + sha256 = "e6b6c7bdfff78c4eed8240f52023b8e412e470e29c01800162ee4b0be65a7562"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/cy/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/cy/firefox-106.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "ce73e760b47aceba4585a0e1c718efe454276878bab20d3bdef949e95167340a"; + sha256 = "27b004aa42d5048edacaeccf1e624d6a4ef0058d82c346876507606c4ac21cd8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/da/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/da/firefox-106.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "0f3a2ca436f1ae15fcc894c404debe5c2a913374839d307c6ddf63542d9755fa"; + sha256 = "9ee9ad75f5e9df0f70d8e066a36111f925dac67517bf95603e4f679e4018a7b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/de/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/de/firefox-106.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "fddc3ac5efc62eee05df25aff44b9581e716206e57b0d466bcc97294c76d3f27"; + sha256 = "cbf2470f1c5c11cb2e975c2e82686a0afa6b8af3fa5c1a18b6308ae697d51b2c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/dsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/dsb/firefox-106.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "55fb931de68335a636689aa7734a03f3b4bd12796b0d16f82dd4400d0c250960"; + sha256 = "1ff50512d648805855956d675023248e04df1c270e088984c8bf2a3e86aa62a6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/el/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/el/firefox-106.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "8a5a2396eb14fd11c58c4e6c951746bac1d2e1ba65804927f105e3b97607ee3c"; + sha256 = "e7262d415f135ddc7a2f4657a5223089925ca15131a086b36431a0d85c9105fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/en-CA/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/en-CA/firefox-106.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "18651db0a2a70b056b3d324279e294d1626790701bf523c43f2f1641f4d89fdd"; + sha256 = "0f5fcef3ababce75ed9d1f81ca373c2bcdfe8b78efb2142f7f06f016746efd2b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/en-GB/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/en-GB/firefox-106.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "8efd080d721fe1d971d61ebfd9a284f78feb743fc3450c216d0438e46734e1bc"; + sha256 = "14b3ef466fddb2fdfb51e8c8b21ef81cff2aaf13fc6c8a182c1e72b18802292c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/en-US/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/en-US/firefox-106.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "732c2355f1105af61505c899932e6e53e43c79784c1e921b684ff10db3c50262"; + sha256 = "afa9192132f4c8ac8214969874eb3571f5bdb10152115f11cce666a6663ff33a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/eo/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/eo/firefox-106.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "7151f8420e25157e86733bdf13df4a2fed5357aecf7674dab505feee9c4eb09c"; + sha256 = "3922a35171cade0e124c33fd9de4b4f4874675c7a53be7609da16a22701a4f8a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/es-AR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/es-AR/firefox-106.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "1f017a00e0755655c5503348e7d4f0462330fc6afba8d3aec24ab3173efd0926"; + sha256 = "fee9648322e9290300704919266f6bd564456577fbdea996659c2e418bb5ed1f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/es-CL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/es-CL/firefox-106.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "a31fba6855a952403692d6fbdb85c01ea83770205e8542e0cef8c635a861c6a6"; + sha256 = "d49bf5f3169795e6c75931dc2ffa39b4edcd965252c5df9526fb4cee632f0f99"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/es-ES/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/es-ES/firefox-106.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a28f566bbf8e0eb5908fc88b5468f3f94455e3b70cff0bc81006c1370144404d"; + sha256 = "ed27016cd9bf8b703170d9b006457fee1c35dc40fe3a2d28560dae414a846cad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/es-MX/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/es-MX/firefox-106.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "641f6b89fcd53bd8a55b93bd72b2e59922f43f0e4bef3ae0391dd721ba1e124c"; + sha256 = "5148676e5b14eb8f631b4e5a8d613657a825b6f363cc39d6bf35ac926f1ffc67"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/et/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/et/firefox-106.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4b4f28c3590ff40d42246c5e2867398606a572d0f1f289c2b1e60e5aae4ffb5f"; + sha256 = "96bf5ebac3992c6497aa1f532da24eef082b7409768101b7b9c45949a8c8f551"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/eu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/eu/firefox-106.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "dd5a093ff4a8990f48900b48f30b3eec6df7029a41cddb4eae23b934770da1ec"; + sha256 = "cef99a6adcf89d793e539709569925173c1f07dfed568f4d5f2109e1f9a06a0e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/fa/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/fa/firefox-106.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "f4c869d935cc9e57bb1363d7bd4fff11eb85af6f9a6569164acf01948f675a84"; + sha256 = "78b25c602cb990eedd50d04fded3ed3d07d7debea0482fa0c20eb709af2c76a1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ff/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ff/firefox-106.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "a4b4eb26b522d3394c7beb1b059cd7bc347e613e5cd24660f6f9841193ac8c8a"; + sha256 = "26156ac64a89e588b82d127053826f5d06cd078b97ca2365449722881f0d0b50"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/fi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/fi/firefox-106.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "5b88dd9ea08e45ad165ba05d2e17586aff8df602277724be9106068508d59234"; + sha256 = "f71012685db5ea5490224e6c33b94a80f25c03cbbca1b3837454cbdd81b48383"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/fr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/fr/firefox-106.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "5b5e392b8984afb42bd2871e5a0044c5b64fcc006026af618d4bbee6905f06ed"; + sha256 = "4d9458e23ba113412d6d20f2ce71529adb1e71cbd6b2d5c3dbf9b968f61cc44e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/fy-NL/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/fy-NL/firefox-106.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e71c2f92a1b7805b23ea03902383ebb82318d6252be76726a80659c53f73c1ba"; + sha256 = "7bc4383e79c31248603f020de88a04362e4531e8436d4dec070a03e378b0fb8f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ga-IE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ga-IE/firefox-106.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "7bfe67bff7f844586fa9fc3d46c383823cec26a35856d7d71b73f84c59deb1d5"; + sha256 = "f69fd8c92b5223b637a6826813d45ad0b5481ae7941c96edfcba474edf82c5d6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/gd/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/gd/firefox-106.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2de9bcaf38257b2557f61d0f2828bdd3ab67d4b406cb93dcdc4d8ef145716708"; + sha256 = "f9870ae84267474ede49c2e94f70e7767e8c057a79aa76f229a46e34de266065"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/gl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/gl/firefox-106.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "94f25607dde8a8b7cd96c91bbf59047b40c6e28763cd28055ab0991470448de2"; + sha256 = "6ef2812ec048425a842f41c4885080783115ce67505fef2a219c170b97267ebb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/gn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/gn/firefox-106.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "8b7fb89fa16cfebc8f88ebfa0a71e00fc6be999e5ab8d5605482580f2c812d1b"; + sha256 = "e759e11d800e92ae1e10d69b5a7b27a4c03d05b68ba03b5f91c2574f2d0389e1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/gu-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/gu-IN/firefox-106.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "eb6a925a483b5f0e42e14d8f9be83c4d1fe0d6d29aea44adb9e1b3e53cad465e"; + sha256 = "965a6c2dedb0989534d64c6deb4f2cac22933dc287919a18ccb69e523b1e45ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/he/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/he/firefox-106.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "137ac1cdaebfaa5b07076176537d6bf83e7159f23d486f7846dafda995177d76"; + sha256 = "cc893f60b509222e75c9635269e41648578bacca2d1b3715edbd98ed5e7d4ada"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/hi-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/hi-IN/firefox-106.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "5c0fb3aa2c88d954dab3f4a11ae901f56e3af990b37e0c161952ada8280c2b8b"; + sha256 = "89ea9f2cb5b1ff7e2b9ca95dc9f758ea81284031ab0ed82f2e00388a8c945083"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/hr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/hr/firefox-106.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "36339c7514dd93088dd89fb58de234804cc6cd2959ab47be01e66b08322e0e0c"; + sha256 = "98b78ea1b06f972dbf55ba611ce8d444716994298d5638e7cdf62a425fa1a200"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/hsb/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/hsb/firefox-106.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "438cfe725888f0a3ecd06c426951148dd26a2102e8085de988f62f391ae63491"; + sha256 = "a5879bc3f97ed427d534ef6fd74cf301394ded653fab563e1ce8ebaf6b70947f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/hu/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/hu/firefox-106.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "d6cf04012dcdcba201e02d2e8bdc54134d845ad3055d604cce9701e6b1a43a2d"; + sha256 = "49e4a174f51ca12498b16b929a0308dbc5f3ce71696104e6f25da499828cd5b6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/hy-AM/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/hy-AM/firefox-106.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "46622bc5ba0240171a93f8eb6b023998455fbc46c562f5ee134eca255349e896"; + sha256 = "fe9403120aa0529b42590dd2b0c1870a45d9e423cf52bc29853381d5a49d1ad4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ia/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ia/firefox-106.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "70f0ce5b7a053b9dc0e0728501c525c305683792654717ffa8f56d53e7421b19"; + sha256 = "19f898aaa987a6ee4859321281233df09ad73e8c32da2919dcb275aea587c87d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/id/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/id/firefox-106.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c544291b74d3538ce76dadaef86b68ef16a7bdb6af12f274fa4313fc6ac55474"; + sha256 = "288fdb91ba686e37322228d44b6cb32ab64ebb995aec05e1acfcc0fc097d9347"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/is/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/is/firefox-106.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "345965cd4a4ddf0a69b00ec10f33ba947f75b38a35e56705a6ff44957d2b650d"; + sha256 = "02ecda5be7d4d766687dc098327896e933d02aaea1ab08c7a68406c53ebabe7a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/it/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/it/firefox-106.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "b01889446d3e539046c13c0b3c8a9c60308768e0e0bb3cc772a7b19198702547"; + sha256 = "0f55cddf7607f9c52fe2ab76e2e632a2e44cafe020aac8298b69dbe3eee16bea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ja/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ja/firefox-106.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "6270bad12685a49626291d90f620aa194e3262e2e0a59fda87a75e1bb47b3559"; + sha256 = "4761bce1c0046baafa53be698b67ae936467da77165ea18bebd2fcd86c43738d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ka/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ka/firefox-106.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "20c845eb27d0aab0ffceef8ff1d7215b8fcda883dcc7cd285ff01a890ecdbf7f"; + sha256 = "689b13ee74a3c4ea49b79896b935cf556dbd866d5f6353a824bc919040bf509e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/kab/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/kab/firefox-106.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "82083c91554c9432c93fbdb740a69cff2fa0d23ec937c6f308524b5e8c619348"; + sha256 = "6ee5f563693f9b0a78d862ff94f20df6fc803dd67ec4daf311cfd128f8741425"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/kk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/kk/firefox-106.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "0060a1ffbc5c272c9f13375f657bedbbd856e39f88ac13082db138b5c5361ca7"; + sha256 = "e2e8f0f09364dee27afe6af1d81b1b9cd7646052dcbf8cb29c6da406d9b0a8a0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/km/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/km/firefox-106.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "f888e6b31238df74d6c10ac1136c795276c65ab7b2e9b4d63b4f20230b861fb3"; + sha256 = "804fa393a504e86f44a82f11f8c9cec483f7085d59410158019e6f18691d0c59"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/kn/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/kn/firefox-106.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "107b113f5239f0d1a225248f274f7d730b6e5b2c3ed7b873c0252d83c5d798e4"; + sha256 = "b7b0c21bc008a2b057ac97781378bfa915eab796ccf9b33113bf0e5dbbe89c12"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ko/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ko/firefox-106.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d4db566fa090f3ab7c49d51d2fa4d3d822ac6fdb7c6562278f1880b6b742deed"; + sha256 = "8b4f33b5f16382ac363526cd1252e56a8dd6bfd3f554f7ee74126bbb1ac0847a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/lij/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/lij/firefox-106.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "32a62e75511133ac65c0cf02bd41e9142ee33adaeefc593795dfb7f477f9b6ce"; + sha256 = "a885c32387497de62659af615d6ec000c8e1dbd513d36c5d431df90ec69ceb35"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/lt/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/lt/firefox-106.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "926c0eef7c2f96034ae0901d3803d9940a03b9c5d14a2bc6baabda82d285cfa5"; + sha256 = "06b4adbd4c9c1dc2deb178cbfdc93fbe161a46d0be8c6eb8fcc3b6b6dea59a35"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/lv/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/lv/firefox-106.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "7c4643e8b8626679b55499cdffaeca1b7d941502c916171c7cac28c4efa925d4"; + sha256 = "9383a9827b2711a95962f676a15fd69234c6ccf3299b743351929c0d63497a73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/mk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/mk/firefox-106.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "652ba14a7c92460f6f6ded6340888b7442df3eef506ede26d1f829999f223766"; + sha256 = "936ac6d8eb99437f183bb0df64f2f3aa5c91f1413e8a38cbfb330d015c3b7277"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/mr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/mr/firefox-106.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "8b8f2da65becc73b9d4b17cef27554e6a29d4313174947f80567b9ea1dfb7036"; + sha256 = "68c1e7a8e5c42a617f35e540ad65033d2a4a15dac0c9f1695891e544ec730ef9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ms/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ms/firefox-106.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "39cf1d632f53a686d66f76a2a9d51c2da719655824ef888cd89b9f0deb04d1e1"; + sha256 = "829e25db99a1b9dc089e42f8e41534f2b47e37b8a09b4d7321e330e7ca2722ac"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/my/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/my/firefox-106.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "ab8afee1d85f3f7b96c232bbee11ba7e7e3442e3415e450cb9d0fe93922a78f4"; + sha256 = "00c657f0d56094fe34df1f126894fdf72bd312b6d7e8deb1e65dbe3ff8e37914"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/nb-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/nb-NO/firefox-106.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "9e4dba2ab7645922257e59cdf3f008086fddd32c5acfd52dd2d2ffa97f747aae"; + sha256 = "77435d29c9fd3cef3cce478230b8b63e86125d292ca2d7dceb05bd4283899f69"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ne-NP/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ne-NP/firefox-106.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "2a158b9898f464500a94f9f70575d717195c9f197fea2844f3d7ae7f3b3ee619"; + sha256 = "1e79f226c0dc56daf1b0eece2eb433ed6d6915a092125fe412c9e90389321c69"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/nl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/nl/firefox-106.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "528f9f405a69ef8c8b1a49c2ed9c5e24a23d570b0e956c5376ffeff5e3ad21e0"; + sha256 = "7fc343ebcbff3eb104693122b93ebca08670fc0091fddf51abfd1c2af2139f25"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/nn-NO/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/nn-NO/firefox-106.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "47722775d70bd26f72bb1d0791afc8871ad1a6e0770ffb79858a078a23ea0796"; + sha256 = "171487cdfc716a969e0e39ff8e62b4a14bfa2d3989f1c80737682e72d661c320"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/oc/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/oc/firefox-106.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "bdf867e3a02420d361f1089b4c3795473c062a8b7e0d3b6fa6d43734f059cd9f"; + sha256 = "4682b5c1bfa7ffb62d8d9aefe11f22fc82b44b3600b35239aeeb317b8792f04e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/pa-IN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/pa-IN/firefox-106.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "d533a1f51a2feeeb233b0a450ce7f435acbae3e7d10d085c96ccf2668a3980ab"; + sha256 = "b289b3212376746ba2bdfe135e9c2d64e9bc71d2081f8ef6dc3fd7a8675962be"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/pl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/pl/firefox-106.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "dac080a9f0967529443d78e78641239e33176751b81d21654110b6479daa53e8"; + sha256 = "b1dc67444c48d1f3e69feb7c3861d23a8b492f5a38186f6eec0f2cbd5e746d43"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/pt-BR/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/pt-BR/firefox-106.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "2c0a21897e70bc1a552f85040ba35b024e0c702eb4b4455b47ecf94a7220de71"; + sha256 = "9ba199d04c4bffe55ea06c4a63e881468075b09b552a089d6c293f8b14eb1696"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/pt-PT/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/pt-PT/firefox-106.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "1a3ce08ce28134b84c05b2bebf9706e0735931af479ab117684d76b4fd33b097"; + sha256 = "654692390595b993cb5722415dfb8beb5383e6f7f1d95862d0ac6adc72e176dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/rm/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/rm/firefox-106.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "fffd3d3a7b9bdfb6f61c92105dbafcf018acc58733cc5e6d7552acc0ab0505b6"; + sha256 = "1b69764a9b15dba52233ef4c60fe5c2436097b320817295f30a8b6cd11bdd041"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ro/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ro/firefox-106.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "4d7fe3626437e5c4b49e35aff6bdfd532203599947ef0014953a869cdffa31f9"; + sha256 = "aabc3b0158028d5443fca0e4cebdfc6e1e955e5c3f807df731ce951b2790d92d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ru/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ru/firefox-106.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c31f1f2dadb723a10097408b36e63532f921fa1362d4699c9f437c016d24169c"; + sha256 = "fb7a0121d29ac9ef73f9b0a6bd158790954f6e7522c0c51e6a9462334be0f43f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sco/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/sco/firefox-106.0b7.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "d7ae32dd99b2c5b09d5ce01d068bbcdd6ba3c42a81852693fd895c7611ce7bc9"; + sha256 = "00de38fb436e61da1e0f66f2024cc82cff410bb6c8d7c18aeca325f90ecc58fa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/si/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/si/firefox-106.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "350533abb41efa727a2cc74ade0b23a1bd25e8fdb6858c90c32f9c395db263c7"; + sha256 = "8850fdbe4e090d5ccd740cb922807302e80a1a9bb60c29cd455447e7146d556c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/sk/firefox-106.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7358c40827d3c0fdc5e36766c0073374b42281cd0c6e63f45b7f0e03207f4bd4"; + sha256 = "351a140601ca621581e528deb7e4657267db893e4505afb9f22f5bc9031f17ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/sl/firefox-106.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b5e38822a3aeb879a6dbca59b7c2417e3ebedbf79dbd08d4df5881ebf776e62a"; + sha256 = "20279f321209aeeb66fd8f353693556cf1552ffc45d88000b1cbdb0b619eae8e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/son/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/son/firefox-106.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "484e3341331e95e9c375a263fbaa8ca7a59db445701f9c7f9caa1d70d3f6805e"; + sha256 = "c2fccee232fa5bc4975bde1ad8e6c576fe6d06356b56a026dbedee2ccedfd765"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sq/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/sq/firefox-106.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "8d408e7bf017679496e76f7f2968684d5c4046c9fb443d2fb3c9ea13abf19594"; + sha256 = "24ce23ed5579a6daa06a2966cf026a74ae0957e795787d7c92d67c1ce81337d3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/sr/firefox-106.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "50a3b16863ac0c79ad17361fc845d1d374ca114038fbdbb1722a1e90ca4c52c6"; + sha256 = "711887db203ea356605f28889a518508a97ef49fe81c4d7651a36da16015ba5e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/sv-SE/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/sv-SE/firefox-106.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ca9af22602e8683d810032f895e7d7e5d5ae7c5f6b3ceded2085277c3c7ea3f2"; + sha256 = "fdfbf234b075e375e849a611e8f7eb9ae6b0ab5cb5fcf7afd61fb5f07f319bdb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/szl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/szl/firefox-106.0b7.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "501b33a929f17e5ad49041113140676d77f24484343ef4a785dd29b5e2fb23a2"; + sha256 = "3ec709490ff4e3e4e001047aa609cf4554293defc065a9b13d157c52f748e64d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ta/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ta/firefox-106.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "513af6cc93ed1197a8f4519fbf26a3791b2de608ba5d3e3c282d04e5bad941db"; + sha256 = "d6f416f23315c4d64464448a39c6a2e372b4bfb00b6e67205a87e390d83b66c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/te/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/te/firefox-106.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "7a2a9d2244c73c39d915a970e2133532a1a44596dcad4fec0783702bd630521d"; + sha256 = "c7592024f057cc3ca9227ee7e9ca260d33a4bc5fba7af553b925e779e72a16e2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/th/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/th/firefox-106.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "7c5453ef9a84da8f71305919cc23b8e0bb746239df4a94b75a26c240c3b00c12"; + sha256 = "8b03482f7a9312fee583e7d5ce9070a72f132f08faeb0d6cc6d19c08ef8c2e73"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/tl/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/tl/firefox-106.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "00c4d5b8120a2e434cf77c2fa994575eda8a46d10fddf5e55407bf5a84b9d7ea"; + sha256 = "a261baf195215a453502c2682d616623b3e09078d03392492d5acb2556ba9c04"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/tr/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/tr/firefox-106.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "daa107b760f215ec0bec362462edebbd3df0e9f7dc3ecec0baba394bf16f9c51"; + sha256 = "b08480d14c9567d627fc88ebff5f5f9ab7c5d103a48d49b7ce093650751a1452"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/trs/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/trs/firefox-106.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "bcfc29fbfbf9e791896e19935b868609cdfc85116282a732cfdd83f5871f825f"; + sha256 = "a360b902f5967c5bb407bfc78c1e3507a48e98197b68f541955cab3b8841b4b8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/uk/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/uk/firefox-106.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "a0a55891b3032d00da27a940b99af8447537e9f5c1aab3689ef77131e7ae9210"; + sha256 = "7f9a7f6f47c724c6adf98e0af7ca2b37819184aeebbc8505a1c8f76865c423cd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/ur/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/ur/firefox-106.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "a6038932291061aba7b57a3cd95346580df997ba34e45bbf77b0f648f9f3f7ed"; + sha256 = "e0256b283e22fdfc6346c6ce409749f3e89ecb4fe9254bd77eaff62ff1cb8cd6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/uz/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/uz/firefox-106.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "c1eecdca0d2047392cb70d19ee485d02b7cda0717ed4bc3eabc9906579f3189c"; + sha256 = "d9d97ef5d0cd271b2adcd79aa2fe8a29d252bcd81cee6b29e0812e4d43de886a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/vi/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/vi/firefox-106.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "bc33bb2e02e23ec740cb1f91298862d346b799ac9df04ed3e0301e19a7b97e34"; + sha256 = "eff782f137d75908e84541c27c47281e40377f8443400d28666bb6f3e18beab4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/xh/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/xh/firefox-106.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "4d7147385bbd00a3cca6130831ca67e87904aa403d4e8134d459c18a8b3824d6"; + sha256 = "eb3074ac774994908c0a4d0eeba7b57917739e527153b1998c17c2f828c88231"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/zh-CN/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/zh-CN/firefox-106.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "3d854dfd5ba369e803a462c75cbe4912e3c28767e570f5946cf3ec07a25c85d7"; + sha256 = "95c1f35da9733491a68d20050ba7b5ad9bbcbf06e2baab8a8f7ec86f0b6cd19d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b5/linux-i686/zh-TW/firefox-106.0b5.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/106.0b7/linux-i686/zh-TW/firefox-106.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "b439906bdc4e1b6b2b19ca28506aebbedaf0fb063ea9a5955654521983ec0f6b"; + sha256 = "ecb32555002a8a7a8733967ac23fda2b18dbb6c1215fc680032a531b5e5d9a9b"; } ]; } From c884134125abd09589cab5cdcae27f791221004c Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 18 Sep 2022 20:05:17 +0200 Subject: [PATCH 125/269] kitty: 0.25.2 -> 0.26.2 https://github.com/kovidgoyal/kitty/releases/tag/v0.26.2 --- .../terminal-emulators/kitty/default.nix | 36 ++++++++++--------- .../kitty/fix-test_ssh_env_vars.patch | 13 +++++++ 2 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 28dad82fe162..b6a6ca7780fb 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -4,6 +4,7 @@ , libxkbcommon, libXi, libXext, wayland-protocols, wayland , lcms2 , librsync +, openssl , installShellFiles , dbus , darwin @@ -27,14 +28,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.25.2"; + version = "0.26.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-o/vVz1lPfsgkzbYjYhIrScCAROmVdiPsNwjW/m5n7Us="; + sha256 = "sha256-IqXRkKzOfqWolH/534nmM2R/69olhFOk6wbbF4ifRd0="; }; buildInputs = [ @@ -42,6 +43,7 @@ buildPythonApplication rec { ncurses lcms2 librsync + openssl.dev ] ++ lib.optionals stdenv.isDarwin [ Cocoa CoreGraphics @@ -77,6 +79,9 @@ buildPythonApplication rec { outputs = [ "out" "terminfo" "shell_integration" ]; patches = [ + # Gets `test_ssh_env_vars` to pass when `bzip2` is in the output of `env`. + ./fix-test_ssh_env_vars.patch + # Needed on darwin # Gets `test_ssh_shell_integration` to pass for `zsh` when `compinit` complains about @@ -98,14 +103,18 @@ buildPythonApplication rec { --update-check-interval=0 \ --shell-integration=enabled\ no-rc ''; + darwinOptions = '' + --disable-link-time-optimization \ + ${commonOptions} + ''; in '' runHook preBuild ${if stdenv.isDarwin then '' - ${python.interpreter} setup.py kitty.app \ - --disable-link-time-optimization \ - ${commonOptions} - make man + ${python.interpreter} setup.py build ${darwinOptions} + make docs + ${python.interpreter} setup.py kitty.app ${darwinOptions} '' else '' + ${python.interpreter} setup.py build-launcher ${python.interpreter} setup.py linux-package \ --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ @@ -126,7 +135,7 @@ buildPythonApplication rec { ]; # skip failing tests due to darwin sandbox - preCheck = if stdenv.isDarwin then '' + preCheck = lib.optionalString stdenv.isDarwin '' substituteInPlace kitty_tests/file_transmission.py \ --replace test_file_get dont_test_file_get \ --replace test_path_mapping_receive dont_test_path_mapping_receive @@ -138,15 +147,9 @@ buildPythonApplication rec { --replace test_ssh_connection_data dont_test_ssh_connection_data substituteInPlace kitty_tests/fonts.py \ --replace 'class Rendering(BaseTest)' 'class Rendering' - '' else ""; + ''; - checkPhase = - let buildBinPath = - if stdenv.isDarwin - then "kitty.app/Contents/MacOS" - else "linux-package/bin"; - in - '' + checkPhase = '' runHook preCheck # Fontconfig error: Cannot load default config file: No such file: (null) @@ -155,7 +158,8 @@ buildPythonApplication rec { # Required for `test_ssh_shell_integration` to pass. export TERM=kitty - env PATH="${buildBinPath}:$PATH" ${python.interpreter} test.py + make test + runHook postCheck ''; installPhase = '' diff --git a/pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch b/pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch new file mode 100644 index 000000000000..719b38b48159 --- /dev/null +++ b/pkgs/applications/terminal-emulators/kitty/fix-test_ssh_env_vars.patch @@ -0,0 +1,13 @@ +diff --git a/kitty_tests/ssh.py b/kitty_tests/ssh.py +index 7b3bdbeb..710aeceb 100644 +--- a/kitty_tests/ssh.py ++++ b/kitty_tests/ssh.py +@@ -272,8 +272,6 @@ def check_bootstrap(self, sh, home_dir, login_shell='', SHELL_INTEGRATION_VALUE= + + def check_untar_or_fail(): + q = pty.screen_contents() +- if 'bzip2' in q: +- raise ValueError('Untarring failed with screen contents:\n' + q) + return 'UNTAR_DONE' in q + pty.wait_till(check_untar_or_fail) + self.assertTrue(os.path.exists(os.path.join(home_dir, '.terminfo/kitty.terminfo'))) From a75e477c016b68f0d4a9575f02136f226eaa224e Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 3 Oct 2022 09:02:51 -0400 Subject: [PATCH 126/269] cargo-lock: init at 8.0.2 --- .../tools/rust/cargo-lock/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-lock/default.nix diff --git a/pkgs/development/tools/rust/cargo-lock/default.nix b/pkgs/development/tools/rust/cargo-lock/default.nix new file mode 100644 index 000000000000..608faf92a5a8 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-lock/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-lock"; + version = "8.0.2"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-I64LXY8e8ztICS6AKfrNr/7Ntap7ESjindNWEeny6ZA="; + }; + + cargoSha256 = "sha256-Yy7KQvPeyw5YSzUmoxUJAueVzkfQqDPE1j2+L+KifpU="; + + buildFeatures = [ "cli" ]; + + meta = with lib; { + description = "Self-contained Cargo.lock parser with graph analysis"; + homepage = "https://github.com/rustsec/rustsec/tree/main/cargo-lock"; + changelog = "https://github.com/rustsec/rustsec/blob/cargo-lock/v${version}/cargo-lock/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a09bb50c797..c8ce63041573 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14665,6 +14665,7 @@ with pkgs; cargo-hack = callPackage ../development/tools/rust/cargo-hack { }; cargo-license = callPackage ../development/tools/rust/cargo-license { }; cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; + cargo-lock = callPackage ../development/tools/rust/cargo-lock { }; cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; From a222ca468ea31c0ebf5ba11488dec4dec4c45b5b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Sep 2022 23:03:02 +0200 Subject: [PATCH 127/269] python3Packages.tensorboardx: 2.5 -> 2.5.1 Unpins protobuf; the wanted version is a lower bound, not an upper one, which is instead given inside setup.py. https://github.com/lanpa/tensorboardX/blob/v2.5.1/setup.py#L46 --- .../python-modules/tensorboardx/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index 76507a11e09b..7d0a28a4198c 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -8,7 +8,7 @@ , moto , numpy , pillow -, protobuf3_8 +, protobuf , pytestCheckHook , torch , six @@ -19,13 +19,14 @@ buildPythonPackage rec { pname = "tensorboardx"; - version = "2.5"; + version = "2.5.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "lanpa"; repo = "tensorboardX"; - rev = "refs/tags/${version}"; - sha256 = "sha256-g6x0yUpofeSNA4rKPidqOKC7/TrOICstcc98VnQcfDY="; + rev = "refs/tags/v${version}"; + hash = "sha256-Np0Ibn51qL0ORwq1IY8lUle05MQDdb5XkI1uzGOKJno="; }; # apparently torch API changed a bit at 1.6 @@ -39,9 +40,10 @@ buildPythonPackage rec { sed -i -e "s/'protobuf[^']*'/'protobuf'/" setup.py ''; - # Wanted protobuf version is mentioned here: - # https://github.com/lanpa/tensorboardX/blob/0d08112618a2bbda4c028a15a137fed3afe77401/compile.sh#L6 - nativeBuildInputs = [ which protobuf3_8 ]; + nativeBuildInputs = [ + which + protobuf + ]; # required to make tests deterministic PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; From 0aee87185d4307fac15902986085b42ed27ac33f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Sep 2022 23:41:17 +0200 Subject: [PATCH 128/269] rippled: unpin protobuf Fails the same three tests as on hydra, so no regression. --- pkgs/servers/rippled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 835307ae0a00..55b082f99484 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config -, openssl, boost, grpc, abseil-cpp, protobuf3_8, libnsl }: +, openssl, boost, grpc, abseil-cpp, protobuf, libnsl }: let sqlite3 = fetchurl rec { @@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"]; nativeBuildInputs = [ pkg-config cmake git ]; - buildInputs = [ openssl openssl.dev boostSharedStatic grpc abseil-cpp protobuf3_8 libnsl ]; + buildInputs = [ openssl openssl.dev boostSharedStatic grpc abseil-cpp protobuf libnsl ]; preConfigure = '' export HOME=$PWD From 06ed064a3ed6d8adbec2704e2f90a4fe31823273 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Sep 2022 00:01:11 +0200 Subject: [PATCH 129/269] ibus-engines.mozc: unpin protobuf Also use the git tag, so the package can be better updated. --- pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 8d4a93a375ec..7333558aaaef 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "063c41f1d7c1a877f44c1f8caad6be1897350336"; - sha256 = "sha256-sgsfJZALpPHFB5bXu4OkRssViRDaPcgLfEyGhbqvJbI="; + rev = "refs/tags/${version}"; + hash = "sha256-sgsfJZALpPHFB5bXu4OkRssViRDaPcgLfEyGhbqvJbI="; fetchSubmodules = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a09bb50c797..aff908337054 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5340,7 +5340,7 @@ with pkgs; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { stdenv = clangStdenv; - protobuf = pkgs.protobuf3_8.overrideDerivation (_: { stdenv = clangStdenv; }); + protobuf = pkgs.protobuf.overrideDerivation (_: { stdenv = clangStdenv; }); }; rime = callPackage ../tools/inputmethods/ibus-engines/ibus-rime { }; From 3d1c995185ef4878a21851bc8ad1ab2082f2435d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Oct 2022 15:15:44 +0200 Subject: [PATCH 130/269] python3Packages.coqui-trainer: unpin protobuf --- pkgs/development/python-modules/coqui-trainer/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/coqui-trainer/default.nix b/pkgs/development/python-modules/coqui-trainer/default.nix index c8bd0d67839e..1a6bf6b2aeb0 100644 --- a/pkgs/development/python-modules/coqui-trainer/default.nix +++ b/pkgs/development/python-modules/coqui-trainer/default.nix @@ -30,6 +30,10 @@ buildPythonPackage { hash = "sha256-WBFsQuGnpqOiQW7VFfsk0t7qEBs1ScOChfQFpLmqTz4="; }; + postPatch = '' + sed -i 's/^protobuf.*/protobuf/' requirements.txt + ''; + propagatedBuildInputs = [ coqpit fsspec From 397ad93dd379d33205f7a6522dc3088a135f2ce2 Mon Sep 17 00:00:00 2001 From: Georges Date: Thu, 18 Aug 2022 07:30:48 +0200 Subject: [PATCH 131/269] Apply suggestions from code review Co-authored-by: Mostly Void Co-authored-by: Dee Anzorge Co-authored-by: Sandro --- pkgs/tools/networking/doggo/default.nix | 84 ++++++++++++------------- 1 file changed, 40 insertions(+), 44 deletions(-) diff --git a/pkgs/tools/networking/doggo/default.nix b/pkgs/tools/networking/doggo/default.nix index 713cc38edf1e..9b8bf0fb2ce4 100644 --- a/pkgs/tools/networking/doggo/default.nix +++ b/pkgs/tools/networking/doggo/default.nix @@ -1,48 +1,44 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - runCommand, - installShellFiles, -}: let - buildDate = "2022-08-15T21:36:49"; - buildCommit = "2cf9e7b"; -in - with lib; - buildGoModule rec { - pname = "doggo"; - version = "0.5.4"; - vendorSha256 = "sha256-pyzu89HDFrMQqYJZC2vdqzOc6PiAbqhaTgYakmN0qj8="; - src = fetchFromGitHub { - owner = "mr-karan"; - repo = "doggo"; - rev = "v0.5.4"; - sha256 = "sha256-6jNs8vigrwKk47Voe42J9QYMTP7KnNAtJ5vFZTUW680="; - }; +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: - nativeBuildInputs = [installShellFiles]; - subPackages = ["cmd/doggo"]; +buildGoModule rec { + pname = "doggo"; + version = "0.5.4"; - ldflags = [ - "-w -s" - "-X main.buildVersion=${buildCommit}" - "-X main.buildDate=${buildDate}" - ]; + src = fetchFromGitHub { + owner = "mr-karan"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-6jNs8vigrwKk47Voe42J9QYMTP7KnNAtJ5vFZTUW680="; + }; - postInstall = '' - installShellCompletion --cmd doggo --fish --name doggo.fish completions/doggo.fish - installShellCompletion --cmd doggo --zsh --name _doggo completions/doggo.zsh - ''; + vendorSha256 = "sha256-pyzu89HDFrMQqYJZC2vdqzOc6PiAbqhaTgYakmN0qj8="; + nativeBuildInputs = [ installShellFiles ]; + subPackages = [ "cmd/doggo" ]; - meta = { - homepage = "https://github.com/mr-karan/doggo"; - description = "Command-line DNS Client for Humans. Written in Golang"; - longDescription = '' - doggo is a modern command-line DNS client (like dig) written in Golang. - It outputs information in a neat concise manner and supports protocols like DoH, DoT, DoQ, and DNSCrypt as well - ''; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [georgesalkhouri]; - }; - } + ldflags = [ + "-w -s" + "-X main.buildVersion=v${version}" + ]; + + postInstall = '' + installShellCompletion --cmd doggo \ + --fish --name doggo.fish completions/doggo.fish \ + --zsh --name _doggo completions/doggo.zsh + ''; + + meta = with lib; { + homepage = "https://github.com/mr-karan/doggo"; + description = "Command-line DNS Client for Humans. Written in Golang"; + longDescription = '' + doggo is a modern command-line DNS client (like dig) written in Golang. + It outputs information in a neat concise manner and supports protocols like DoH, DoT, DoQ, and DNSCrypt as well + ''; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ georgesalkhouri ]; + }; +} From 66044f7e4384e12ffd68ce7d7372fcdcb528a358 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 3 Oct 2022 09:44:50 -0400 Subject: [PATCH 132/269] artem: init at 1.1.5 --- pkgs/applications/graphics/artem/default.nix | 50 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/graphics/artem/default.nix diff --git a/pkgs/applications/graphics/artem/default.nix b/pkgs/applications/graphics/artem/default.nix new file mode 100644 index 000000000000..5747c88b24bb --- /dev/null +++ b/pkgs/applications/graphics/artem/default.nix @@ -0,0 +1,50 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, pkg-config +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "artem"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "finefindus"; + repo = pname; + rev = "v${version}"; + sha256 = "1jax39gizlcbqnkjckxwm5h0wdk5dk8dasaj9wxv7yidbcbgj4zh"; + }; + + cargoSha256 = "sha256-n2NOWrgcMVHpNCHL7r8+Kl1e01XYadaNM7UdE8fQo1U="; + + nativeBuildInputs = [ installShellFiles pkg-config ]; + + buildInputs = [ openssl ]; + + OPENSSL_NO_VENDOR = 1; + + checkFlags = [ + # require internet access + "--skip=arguments::input::url_input" + "--skip=full_file_compare_url" + + # flaky + "--skip=full_file_compare_html" + ]; + + postInstall = '' + installManPage $releaseDir/build/artem-*/out/artem.1 + installShellCompletion $releaseDir/build/artem-*/out/artem.{bash,fish} \ + --zsh $releaseDir/build/artem-*/out/_artem + ''; + + meta = with lib; { + description = "A small CLI program to convert images to ASCII art"; + homepage = "https://github.com/finefindus/artem"; + changelog = "https://github.com/finefindus/artem/blob/v${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a09bb50c797..0b39e510c7f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26768,6 +26768,8 @@ with pkgs; arkade = callPackage ../applications/networking/cluster/arkade { }; + artem = callPackage ../applications/graphics/artem { }; + asuka = callPackage ../applications/networking/browsers/asuka { inherit (darwin.apple_sdk.frameworks) Security; }; From ada969769ee4a62125ed27253efe4da9f9d518f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Oct 2022 15:27:31 +0000 Subject: [PATCH 133/269] cubiomes-viewer: 2.4.1 -> 2.5.0 --- pkgs/applications/misc/cubiomes-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 2243a8d09375..f5e10cf7b46c 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-vneX3Wo1DUK1WIwBP3nMUDV26EN2A7XIqMcTZQ4UI4A="; + sha256 = "sha256-VZsq2HMvhFB6DR+Z3bVtyIJ2O984QaryYWCcP/a7paw="; fetchSubmodules = true; }; From e9bd62f650d9ca273d14856bad8bc3326c452f6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 01:25:51 +0000 Subject: [PATCH 134/269] simdjson: 2.2.2 -> 2.2.3 --- pkgs/development/libraries/simdjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index d8934a1ebf53..831558152ad8 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-PU6yTA2FXHcuSwr6oIU+cP7uYxkgggnj3FV2LbkS69w="; + sha256 = "sha256-OAjPSTSQap2m2gsC3mTae7UZ3Bq4qjK2eShdVTZUzFM="; }; nativeBuildInputs = [ cmake ]; From 18b770c06b6c8cb78179f638bed8f31f444d4341 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Oct 2022 03:23:47 +0000 Subject: [PATCH 135/269] x42-plugins: 20220714 -> 20220923 --- pkgs/applications/audio/x42-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 30b7abc6dfba..a1613946150b 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20220714"; + version = "20220923"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "sha256-myrHOfgpCwuW8YX0jZ3RutoqtXysU0ejBNcuxN3stXU="; + sha256 = "sha256-9Y9up5Ziipm6ums1wESfcADKgMwas2SESgGPn74RTt4="; }; nativeBuildInputs = [ pkg-config ]; From 4ad8209b12331a32c779e7f04dc8e60132062b24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Sep 2022 20:20:43 +0000 Subject: [PATCH 136/269] pocketbase: 0.7.6 -> 0.7.7 --- pkgs/servers/pocketbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 14c88e9d04f8..f438df71949c 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-03CvpAATd8HSKaMY17Sl7v08xzTxrQsoBchkYZ5pz14="; + sha256 = "sha256-pHYbz1LuPZDOtg3xrvgr+16ziZMZHCtSbY685E8RA1E="; }; vendorSha256 = "sha256-i3CRba2HA7dOEh4PU1rNZUl05pZqIm946lIjP7ZcFEc="; From 16fde6b3487394644da7e3c830bb99c4f0bf4acf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Sep 2022 08:30:17 +0000 Subject: [PATCH 137/269] adguardhome: 0.107.12 -> 0.107.14 --- pkgs/servers/adguardhome/bins.nix | 20 ++++++++++---------- pkgs/servers/adguardhome/default.nix | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index 3a415f9ecf84..b437df04da0c 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,23 +1,23 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-2QGXyXHU2p7DFKDWyau2+SCzaQnM+o0EbYqHFnErXX4="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-llVKoUAB5cIeRE79Lw5oAvR9rwXdtmALYEwiIg1vN9Q="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.14/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-16XJUh78B45d1uuLi1xcFeti6CvGUkXYUVe4pS/hhXs="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-v6Dvs0Ny39tOO+f9JWadBa07QwKCC9gHU69+OMmPxXM="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.14/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-ML9WSJwQTC8F07MOTQBpZXH/tHSlbQEzAofGpjHZrLU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-ofx16H6+tSTOEz+UuTXKzzVx3hREwW8EjEqAgXdnqQg="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.14/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-fGSBfQzlYQbsZExOqsxa2Zdb/gvo0c9O313ziSkvOjY="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-kftAZ2snv3xsrVPq3y5uJKwZhHtNO/VQL1LBh5yk/DA="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.14/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-WR8omfW5udMmXNKuUIfqdXvggumG4Pb1gESJV9YZ9rc="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.12/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-JVy2dDZGfH+vZhNJ94wvoYY3I0tQA6CSZ/c1rBikZWw="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.14/AdGuardHome_linux_arm64.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index fee86027c50e..78bc977b3be3 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.12"; + version = "0.107.14"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' From 64eafc25d69cd84ed9c41e00b9ab8db3e4a02b6e Mon Sep 17 00:00:00 2001 From: Valentin Bruch <46252273+stiglers-eponym@users.noreply.github.com> Date: Mon, 3 Oct 2022 11:12:43 +0200 Subject: [PATCH 138/269] Update source to fix #194116 Before this commit, paths to GUI config and manual were written to the config file. When running gc after an update, these paths do not exist anymore. That changes with this commit: Paths are commented out in config file. Nonexisting paths are removed from config file when running beamerpresenter. Other changes in the code compared to v0.2.3: compatibility with Qt 6.4 --- pkgs/applications/office/beamerpresenter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index 2e4959ce0a52..be794c529ac3 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "beamerpresenter"; - version = "0.2.3"; + version = "0.2.3-1"; src = fetchFromGitHub { owner = "stiglers-eponym"; repo = "BeamerPresenter"; - rev = "v${version}"; - sha256 = "1n9d0i0j67ymnghn8zkqf52c88zby6rqin8aicbw8cpn35fqf5a6"; + rev = "dd41a00b3c6c8b881fa62945165c965634df66f0"; + sha256 = "11yj1zl8hdnqbynkbyzg8kwyx1jl8c87x8f8qyllpk0s6cg304d0"; }; nativeBuildInputs = [ From 07400e6c09c8d5242c3526063b5ec822385d7311 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 14:59:23 +0000 Subject: [PATCH 139/269] oh-my-zsh: 2022-09-10 -> 2022-10-03 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index d3e6c5978f8b..49c102afa67d 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-09-10"; + version = "2022-10-03"; pname = "oh-my-zsh"; - rev = "7dcabbe6826073ef6069c8a4b6f9a943f00d2df0"; + rev = "23f3ded92d07184b3611d08c62d7b474a76c956f"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "Mk2GQh7Yh0cyklSEIutIIUEQNMAcPC1i3QT5K6lCEt8="; + sha256 = "s4YwOOog+FxN0Dyyo8Jo7XZE9s0Wg/pexGujhqFxykQ="; }; strictDeps = true; From d76526987254786d5fe08702f9bea079898cd5fe Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 3 Oct 2022 23:08:05 +0800 Subject: [PATCH 140/269] traefik: 2.8.8 -> 2.9.1 --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index ed6afbc1145e..812d0cfb99de 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.8.8"; + version = "2.9.1"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-DfCHoo6CmEzemzOQrjKj0+p1jogMUkT6wFIOXJssn1s="; + sha256 = "sha256-wo1V1anBlIHtMf5ajNs5rLR2uyolCFJTHFIzqJJjwug="; stripRoot = false; }; - vendorSha256 = "sha256-kKm8yvw5KVwXm2xz/8RxXAI+y1jD9IukSZWiRYG/pHA="; + vendorSha256 = "sha256-nAWWnH2ZN+icFPBRaIEATug1jdtRhuiT7CZlYCfzDaY="; subPackages = [ "cmd/traefik" ]; From 1085ad554ffecf098555c77b0a40f4b14b51f940 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Oct 2022 05:25:20 +0000 Subject: [PATCH 141/269] verilator: 4.224 -> 4.226 --- pkgs/applications/science/electronics/verilator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index ee84c15a22cf..b9cc2274a3d6 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.224"; + version = "4.226"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kn44yWkNcOLkc79HLDTxx5zQn/vqft+hhbvsoUAKR7I="; + sha256 = "sha256-X6Kwpcm+ugu+4gVkWfsqdCPFTESHzJ1jjCPnGqE3/vo="; }; enableParallelBuilding = true; From 25b70355131d06500cdc0d603563c40ebcef5b3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 15:25:33 +0000 Subject: [PATCH 142/269] open-watcom-v2-unwrapped: unstable-2022-08-02 -> unstable-2022-10-03 --- pkgs/development/compilers/open-watcom/v2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/open-watcom/v2.nix b/pkgs/development/compilers/open-watcom/v2.nix index bdef71006bd8..9ee2a21bd0f0 100644 --- a/pkgs/development/compilers/open-watcom/v2.nix +++ b/pkgs/development/compilers/open-watcom/v2.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; - version = "unstable-2022-08-02"; + version = "unstable-2022-10-03"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "4bdb73995b871982dd106838296903701ded29c2"; - sha256 = "sha256-Ay/f+gnj8EklN8T/uP0a+Zji6HEHAoPLdkrSTQaC9Rs="; + rev = "61538429a501a09f369366d832799f2e3b196a02"; + sha256 = "sha256-YvqRw0klSqOxIuO5QFKjcUp6aRWlO2j3L+T1ekx8SfA="; }; postPatch = '' From 9c87e6e1a64a79698912be7197fabe9e24d4c48e Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 3 Oct 2022 11:35:04 -0400 Subject: [PATCH 143/269] vimPlugins.command-t: fix build on darwin --- pkgs/applications/editors/vim/plugins/overrides.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index be365caeabdb..204ac0d298f3 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -53,6 +53,7 @@ , zsh # command-t dependencies +, getconf , ruby # cpsm dependencies @@ -239,10 +240,11 @@ self: super: { }; command-t = super.command-t.overrideAttrs (old: { - buildInputs = [ ruby ]; + nativeBuildInputs = [ getconf ruby ]; buildPhase = '' substituteInPlace lua/wincent/commandt/lib/Makefile \ - --replace '/bin/bash' 'bash' + --replace '/bin/bash' 'bash' \ + --replace xcrun "" make build rm ruby/command-t/ext/command-t/*.o ''; From b1e552ef27aa8e43a4099bcd138fc9f86666460c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 16:23:07 +0000 Subject: [PATCH 144/269] jaq: 0.8.0 -> 0.8.1 --- pkgs/development/tools/jaq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/development/tools/jaq/default.nix index 9c28cdf73994..6444e7215cd0 100644 --- a/pkgs/development/tools/jaq/default.nix +++ b/pkgs/development/tools/jaq/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - sha256 = "sha256-4WCVXrw/v3cGsl7S1nGqKmWrIHeM/ODCXQBxQJgZLjw="; + sha256 = "sha256-lTfpN+BnWMENRlSjR1+iGlGMTp4BBiMDvzFjvwRpuLQ="; }; - cargoSha256 = "sha256-D+Wpzgj05PJcMlGS9eL43SdncHO/q1Wt00gvPlC7ZAE="; + cargoSha256 = "sha256-z12ecgJJYKYc5kOLyjZU/MfBuBp7aJuEmDAGleiecz0="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From ef0c3cfde614aa72b6362b4d3da62a6c3c30a9a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 16:25:56 +0000 Subject: [PATCH 145/269] jqp: 0.2.0 -> 0.3.0 --- pkgs/development/tools/jqp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jqp/default.nix b/pkgs/development/tools/jqp/default.nix index 7563972d0e17..519bef162ac2 100644 --- a/pkgs/development/tools/jqp/default.nix +++ b/pkgs/development/tools/jqp/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jqp"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "noahgorstein"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dVarasXLJrB/akMUvjZn313+bqM39Ji4l91PAxwmfG0="; + sha256 = "sha256-f1HSwo0TwNpw02bNT1dzfovXcRQuP/IxAmomBgKuQxQ="; }; - vendorSha256 = "sha256-KlnKWeLbmLH6M5+oD/BYuqkTyrV9Xo7ibrNjukFe7ss="; + vendorSha256 = "sha256-cx5esdxAJInxXHXx0xeKQNGTDBjKD3GhnY0Fu/Tzy9U="; subPackages = [ "." ]; From 0827eed12918b2fd5b1d99eefae056d4333405fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 16:41:19 +0000 Subject: [PATCH 146/269] python310Packages.aioesphomeapi: 11.0.0 -> 11.1.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 525abf0cfb21..822d4dfa2f92 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "11.0.0"; + version = "11.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-HHVA/eH6Ucn1shQy6QzcxvHWRQqjv/OEgHgq0ITS23Q="; + sha256 = "sha256-jD/VAxehUvR98SpGQD04Qqrsr8k2L8SLw/1vd9zzku0="; }; postPatch = '' From f9c2d606a1e478daeec4eddb5ecab453e69a5124 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 3 Oct 2022 09:44:34 -0700 Subject: [PATCH 147/269] python310Packages.atomman: 1.4.5 -> 1.4.6 --- .../python-modules/atomman/default.nix | 35 ++++--------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index d703240cec45..ca2075cab7a3 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -4,7 +4,6 @@ , cython , datamodeldict , fetchFromGitHub -, fetchpatch , matplotlib , numericalunits , numpy @@ -18,47 +17,27 @@ , pythonAtLeast , requests , scipy +, setuptools , toolz , xmltodict }: buildPythonPackage rec { - version = "1.4.5"; + version = "1.4.6"; pname = "atomman"; - format = "setuptools"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "usnistgov"; repo = "atomman"; rev = "v${version}"; - hash = "sha256-wXz/uHjXKHVKJu/HoFF2mADSBLp6UGF9ivOp2ZOz/Ys="; + hash = "sha256-tcsxtFbBdMC6+ixzqhnR+5UNwcQmnPQSvuyNA2IYelI="; }; - patches = [ - # Fix several tests that are failing on master. - # https://github.com/usnistgov/atomman/pull/9 - (fetchpatch { - name = "fix-tests-1.patch"; - url = "https://github.com/usnistgov/atomman/commit/d255977a5e0ce4584e2c886f6c55ccb9f5932731.patch"; - hash = "sha256-lBFOgcozY85JfQVsVjd51Jf9mrokwQuYdxa8l7VzkqU="; - }) - (fetchpatch { - name = "fix-tests-2.patch"; - url = "https://github.com/usnistgov/atomman/commit/de4177f28ad7c48d482cb606f323128e2fcb86aa.patch"; - hash = "sha256-+YpwdKCT/OTue3b2GOk9Jagg26r1PTTV2Zg+GGBd8sM="; - }) - (fetchpatch { - name = "fix-tests-3.patch"; - url = "https://github.com/usnistgov/atomman/commit/10b168493ee883348699f1e42680423cec84bed5.patch"; - hash = "sha256-b4f3POjiceq3xApfjnKAs9dEf1trCiTIyu7hMPL0ZTw="; - }) - (fetchpatch { - name = "fix-tests-4.patch"; - url = "https://github.com/usnistgov/atomman/commit/057d24c70427bab3c7c530251ceb5f4e27eb5c56.patch"; - hash = "sha256-FTg/GNRZ5xigGW8SpUTIw2/GEzOxwb1rsv2wGebmZOk="; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ From 42e7385777b3d5513534da2e2f1dce81894b4fd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 16:50:57 +0000 Subject: [PATCH 148/269] python310Packages.aiounifi: 35 -> 36 --- pkgs/development/python-modules/aiounifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 8425cb3f86c7..c90e2b74cb29 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "35"; + version = "36"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mKAg6LNtHEmF223xIrZM7rSxE2+B4jUPCv0dCtHmHXc="; + hash = "sha256-ko3lfFitY6fFomh4dLSHdY6moeG2k11fmdcViT3IKGU="; }; propagatedBuildInputs = [ From 0deec20d46dd26e5fcfc3ce232ea2de94719d75d Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 3 Oct 2022 13:38:51 +0200 Subject: [PATCH 149/269] binutils: drop R_ARM_COPY.patch This reverts commit b3640e024f01453b3c4f720135dc6cff529da8ab. When applied, the patch causes some dynamic relocations to be missing, even in cases where they are clearly needed. This causes bugs such as https://github.com/NixOS/nixpkgs/issues/107386 where `fprintf(stderr, ...)` segfaults because the stderr relocation was not added. --- .../tools/misc/binutils/2.38/R_ARM_COPY.patch | 29 ------------------- .../tools/misc/binutils/2.38/default.nix | 8 ----- .../tools/misc/binutils/R_ARM_COPY.patch | 29 ------------------- .../tools/misc/binutils/default.nix | 8 ----- 4 files changed, 74 deletions(-) delete mode 100644 pkgs/development/tools/misc/binutils/2.38/R_ARM_COPY.patch delete mode 100644 pkgs/development/tools/misc/binutils/R_ARM_COPY.patch diff --git a/pkgs/development/tools/misc/binutils/2.38/R_ARM_COPY.patch b/pkgs/development/tools/misc/binutils/2.38/R_ARM_COPY.patch deleted file mode 100644 index 874809863523..000000000000 --- a/pkgs/development/tools/misc/binutils/2.38/R_ARM_COPY.patch +++ /dev/null @@ -1,29 +0,0 @@ -@@ -, +, @@ ---- - bfd/elf32-arm.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) ---- a/bfd/elf32-arm.c -+++ a/bfd/elf32-arm.c -@@ -15398,7 +15398,11 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, - linker to copy the initial value out of the dynamic object and into - the runtime process image. We need to remember the offset into the - .rel(a).bss section we are going to use. */ -- if ((h->root.u.def.section->flags & SEC_READONLY) != 0) -+ if (info->nocopyreloc == 0 -+ && (h->root.u.def.section->flags & SEC_ALLOC) != 0 -+ /* PR 16177: A copy is only needed if the input section is readonly. */ -+ && (h->root.u.def.section->flags & SEC_READONLY) != 0 -+ && h->size != 0) - { - s = globals->root.sdynrelro; - srel = globals->root.sreldynrelro; -@@ -15410,6 +15414,8 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, - } - if (info->nocopyreloc == 0 - && (h->root.u.def.section->flags & SEC_ALLOC) != 0 -+ /* PR 16177: A copy is only needed if the input section is readonly. */ -+ && (h->root.u.def.section->flags & SEC_READONLY) != 0 - && h->size != 0) - { - elf32_arm_allocate_dynrelocs (info, srel, 1); - diff --git a/pkgs/development/tools/misc/binutils/2.38/default.nix b/pkgs/development/tools/misc/binutils/2.38/default.nix index 3ea42ee42299..820f667bf9d0 100644 --- a/pkgs/development/tools/misc/binutils/2.38/default.nix +++ b/pkgs/development/tools/misc/binutils/2.38/default.nix @@ -90,14 +90,6 @@ stdenv.mkDerivation { ./deterministic-temp-prefixes.patch ] ++ lib.optional targetPlatform.isiOS ./support-ios.patch - # This patch was suggested by Nick Clifton to fix - # https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - # It can be removed when that 7-year-old bug is closed. - # This binutils bug causes GHC to emit broken binaries on armv7, and indeed - # GHC will refuse to compile with a binutils suffering from it. See this - # comment for more information: - # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 - ++ lib.optional (targetPlatform.isAarch32 && hostPlatform.system != targetPlatform.system) ./R_ARM_COPY.patch ++ lib.optional stdenv.targetPlatform.isWindows ./windres-locate-gcc.patch ++ lib.optional stdenv.targetPlatform.isMips64n64 # this patch is from debian: diff --git a/pkgs/development/tools/misc/binutils/R_ARM_COPY.patch b/pkgs/development/tools/misc/binutils/R_ARM_COPY.patch deleted file mode 100644 index 874809863523..000000000000 --- a/pkgs/development/tools/misc/binutils/R_ARM_COPY.patch +++ /dev/null @@ -1,29 +0,0 @@ -@@ -, +, @@ ---- - bfd/elf32-arm.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) ---- a/bfd/elf32-arm.c -+++ a/bfd/elf32-arm.c -@@ -15398,7 +15398,11 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, - linker to copy the initial value out of the dynamic object and into - the runtime process image. We need to remember the offset into the - .rel(a).bss section we are going to use. */ -- if ((h->root.u.def.section->flags & SEC_READONLY) != 0) -+ if (info->nocopyreloc == 0 -+ && (h->root.u.def.section->flags & SEC_ALLOC) != 0 -+ /* PR 16177: A copy is only needed if the input section is readonly. */ -+ && (h->root.u.def.section->flags & SEC_READONLY) != 0 -+ && h->size != 0) - { - s = globals->root.sdynrelro; - srel = globals->root.sreldynrelro; -@@ -15410,6 +15414,8 @@ elf32_arm_adjust_dynamic_symbol (struct bfd_link_info * info, - } - if (info->nocopyreloc == 0 - && (h->root.u.def.section->flags & SEC_ALLOC) != 0 -+ /* PR 16177: A copy is only needed if the input section is readonly. */ -+ && (h->root.u.def.section->flags & SEC_READONLY) != 0 - && h->size != 0) - { - elf32_arm_allocate_dynrelocs (info, srel, 1); - diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index e5ecc365d48b..c294dbbb3559 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -93,14 +93,6 @@ stdenv.mkDerivation { ./gas-dwarf-zero-PR29451.patch ] ++ lib.optional targetPlatform.isiOS ./support-ios.patch - # This patch was suggested by Nick Clifton to fix - # https://sourceware.org/bugzilla/show_bug.cgi?id=16177 - # It can be removed when that 7-year-old bug is closed. - # This binutils bug causes GHC to emit broken binaries on armv7, and indeed - # GHC will refuse to compile with a binutils suffering from it. See this - # comment for more information: - # https://gitlab.haskell.org/ghc/ghc/issues/4210#note_78333 - ++ lib.optional (targetPlatform.isAarch32 && hostPlatform.system != targetPlatform.system) ./R_ARM_COPY.patch ++ lib.optional stdenv.targetPlatform.isWindows ./windres-locate-gcc.patch ++ lib.optional stdenv.targetPlatform.isMips64n64 # this patch is from debian: From b3ca7c9f7b75d1d3753ef62a8272e1da2ad1ed46 Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 3 Oct 2022 23:43:46 +0800 Subject: [PATCH 150/269] canokey-qemu: init at unstable-2022-06-23 --- .../virtualization/qemu/canokey-qemu.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/virtualization/qemu/canokey-qemu.nix diff --git a/pkgs/applications/virtualization/qemu/canokey-qemu.nix b/pkgs/applications/virtualization/qemu/canokey-qemu.nix new file mode 100644 index 000000000000..9536b91ba540 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/canokey-qemu.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: +stdenv.mkDerivation rec { + pname = "canokey-qemu"; + version = "unstable-2022-06-23"; + rev = "b70af31229f1858089c3366f71b8d771de4a1e84"; + + src = fetchFromGitHub { + owner = "canokeys"; + repo = "canokey-qemu"; + inherit rev; + fetchSubmodules = true; + hash = "sha256-VJb59K/skx+DhoJs5qGUu070hAjQZC2Z6hAMXuX0bMw="; + }; + + postPatch = '' + substituteInPlace canokey-core/CMakeLists.txt \ + --replace "COMMAND git describe --always --tags --long --abbrev=8 --dirty >>" "COMMAND echo '$rev' >>" + ''; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://github.com/canokeys/canokey-qemu"; + description = "CanoKey QEMU Virt Card"; + license = licenses.asl20; + maintainers = with maintainers; [ oxalica ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aff908337054..a1ddd44a40a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30836,6 +30836,8 @@ with pkgs; qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; + canokey-qemu = callPackage ../applications/virtualization/qemu/canokey-qemu.nix { }; + wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { }; qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { }; From 4f74ae0d99e7a6299a84c2c782cfc76ecc00c6ba Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 3 Oct 2022 23:44:04 +0800 Subject: [PATCH 151/269] qemu: add canokeySupport --- pkgs/applications/virtualization/qemu/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 8e7a683ed33e..4f55b48bc540 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -26,6 +26,7 @@ , smbdSupport ? false, samba , tpmSupport ? true , uringSupport ? stdenv.isLinux, liburing +, canokeySupport ? false, canokey-qemu , hostCpuOnly ? false , hostCpuTargets ? (if hostCpuOnly then (lib.optional stdenv.isx86_64 "i386-softmmu" @@ -79,7 +80,8 @@ stdenv.mkDerivation rec { ++ lib.optionals virglSupport [ virglrenderer ] ++ lib.optionals libiscsiSupport [ libiscsi ] ++ lib.optionals smbdSupport [ samba ] - ++ lib.optionals uringSupport [ liburing ]; + ++ lib.optionals uringSupport [ liburing ] + ++ lib.optionals canokeySupport [ canokey-qemu ]; dontUseMesonConfigure = true; # meson's configurePhase isn't compatible with qemu build @@ -161,7 +163,8 @@ stdenv.mkDerivation rec { ++ lib.optional tpmSupport "--enable-tpm" ++ lib.optional libiscsiSupport "--enable-libiscsi" ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd" - ++ lib.optional uringSupport "--enable-linux-io-uring"; + ++ lib.optional uringSupport "--enable-linux-io-uring" + ++ lib.optional canokeySupport "--enable-canokey"; dontWrapGApps = true; From 68df1186376e9c33eab56ca7aa925a4aca751362 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Mon, 3 Oct 2022 19:13:12 +0200 Subject: [PATCH 152/269] pythonPackages.pysdl2: fix build by fixing patch The PySDL2-dll.patch did not apply after the last package bump. This commit both fixes the patch and introduces a pythonImportsCheck. Closes #193814. --- .../python-modules/pysdl2/PySDL2-dll.patch | 63 ++++++------------- .../python-modules/pysdl2/default.nix | 2 + 2 files changed, 21 insertions(+), 44 deletions(-) diff --git a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch index 37b318ebb7c7..9b8374a0f051 100644 --- a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch +++ b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch @@ -1,8 +1,8 @@ diff --git a/sdl2/dll.py b/sdl2/dll.py -index 6e30259..12e1f7d 100644 +index 2413329..f460bf6 100644 --- a/sdl2/dll.py +++ b/sdl2/dll.py -@@ -145,7 +145,7 @@ class DLL(object): +@@ -235,7 +235,7 @@ class DLL(object): """Function wrapper around the different DLL functions. Do not use or instantiate this one directly from your user code. """ @@ -11,49 +11,31 @@ index 6e30259..12e1f7d 100644 self._dll = None self._deps = None self._libname = libinfo -@@ -157,11 +157,12 @@ class DLL(object): - "SDL2_image": 2001, - "SDL2_gfx": 1003 +@@ -247,11 +247,7 @@ class DLL(object): + "SDL2_image": (2, 0, 1), + "SDL2_gfx": (1, 0, 3) } - foundlibs = _findlib(libnames, path) - dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") - if len(foundlibs) == 0: - raise RuntimeError("could not find any library for %s (%s)" % - (libinfo, dllmsg)) -+ #foundlibs = _findlib(libnames, path) -+ #dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") -+ #if len(foundlibs) == 0: -+ # raise RuntimeError("could not find any library for %s (%s)" % -+ # (libinfo, dllmsg)) + foundlibs = [ libfile ] for libfile in foundlibs: try: self._dll = CDLL(libfile) -@@ -185,19 +186,19 @@ class DLL(object): +@@ -276,9 +272,6 @@ class DLL(object): (foundlibs, libinfo)) if _using_ms_store_python(): self._deps = _preload_deps(libinfo, self._libfile) - if path is not None and sys.platform in ("win32",) and \ - path in self._libfile: - os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) -+ #if path is not None and sys.platform in ("win32",) and \ -+ # path in self._libfile: -+ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) def bind_function(self, funcname, args=None, returns=None, added=None): """Binds the passed argument and return value types to the specified - function. If the version of the loaded library is older than the - version where the function was added, an informative exception will - be raised if the bound function is called. - - Args: - funcname (str): The name of the function to bind. - args (List or None, optional): The data types of the C function's - arguments. Should be 'None' if function takes no arguments. - returns (optional): The return type of the bound C function. Should - be 'None' if function returns 'void'. -@@ -288,7 +289,7 @@ def nullfunc(*args): - return +@@ -359,7 +352,7 @@ class DLL(object): + # Once the DLL class is defined, try loading the main SDL2 library try: - dll = DLL("SDL2", ["SDL2", "SDL2-2.0", "SDL2-2.0.0"], os.getenv("PYSDL2_DLL_PATH")) @@ -62,10 +44,10 @@ index 6e30259..12e1f7d 100644 raise ImportError(exc) diff --git a/sdl2/sdlgfx.py b/sdl2/sdlgfx.py -index 090752e..a8a7488 100644 +index 015eeaf..d6ce52f 100644 --- a/sdl2/sdlgfx.py +++ b/sdl2/sdlgfx.py -@@ -50,8 +50,7 @@ __all__ = [ +@@ -27,8 +27,7 @@ __all__ = [ try: @@ -76,32 +58,25 @@ index 090752e..a8a7488 100644 raise ImportError(exc) diff --git a/sdl2/sdlimage.py b/sdl2/sdlimage.py -index a6884e8..95d96df 100644 +index a702136..dcdea51 100644 --- a/sdl2/sdlimage.py +++ b/sdl2/sdlimage.py -@@ -32,15 +32,14 @@ __all__ = [ - "IMG_LoadXCF_RW", "IMG_LoadWEBP_RW", "IMG_LoadXPM_RW", - "IMG_LoadXV_RW", "IMG_ReadXPMFromArray", - "IMG_GetError", "IMG_SetError", "IMG_SaveJPG", "IMG_SaveJPG_RW", -- -+ - # Python Functions - "get_dll_file" - ] +@@ -30,9 +30,7 @@ __all__ = [ try: -- dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"], -- os.getenv("PYSDL2_DLL_PATH")) +- dll = DLL( +- "SDL2_image", ["SDL2_image", "SDL2_image-2.0"], os.getenv("PYSDL2_DLL_PATH") +- ) + dll = DLL("SDL2_image", "@sdl2_image@") except RuntimeError as exc: raise ImportError(exc) diff --git a/sdl2/sdlmixer.py b/sdl2/sdlmixer.py -index 9ad9b85..1c36289 100644 +index 5f2163c..23d95b0 100644 --- a/sdl2/sdlmixer.py +++ b/sdl2/sdlmixer.py -@@ -76,8 +76,7 @@ __all__ = [ +@@ -50,8 +50,7 @@ __all__ = [ ] try: @@ -112,10 +87,10 @@ index 9ad9b85..1c36289 100644 raise ImportError(exc) diff --git a/sdl2/sdlttf.py b/sdl2/sdlttf.py -index 9c2d951..bd5a16a 100644 +index 7c5f7db..61814cd 100644 --- a/sdl2/sdlttf.py +++ b/sdl2/sdlttf.py -@@ -54,8 +54,7 @@ __all__ = [ +@@ -41,8 +41,7 @@ __all__ = [ try: diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index f5d76eda9b94..04a59fa5df90 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -3,11 +3,13 @@ buildPythonPackage rec { pname = "PySDL2"; version = "0.9.14"; + # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff # like "screensaver disabling", which would have to be cleverly # sandboxed. Disable for now. doCheck = false; + pythonImportsCheck = [ "sdl2" ]; src = fetchPypi { inherit pname version; From 30cc0cde34b5a03652d97bc74867167eb7aab260 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 3 Oct 2022 20:19:54 +0300 Subject: [PATCH 153/269] stdenv: complete the deprecation of stdenv.glibc --- pkgs/stdenv/linux/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 6e61b6f12be1..03856d5c0711 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -415,12 +415,6 @@ in inherit (prevStage.stdenv) fetchurlBoot; extraAttrs = { - # remove before 22.11 - glibc = lib.warn - ( "`stdenv.glibc` is deprecated and will be removed in release 22.11." - + " Please use `pkgs.glibc` instead.") - prevStage.glibc; - inherit bootstrapTools; shellPackage = prevStage.bash; }; From 8240e2069a060412bc90c03164a501feb3ec4914 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Mon, 3 Oct 2022 18:18:40 +0200 Subject: [PATCH 154/269] python3Packages.ecos: fix test_interface_bb.py tests --- pkgs/development/python-modules/ecos/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/ecos/default.nix b/pkgs/development/python-modules/ecos/default.nix index da1f9fa51069..0f5ef9c2e1fa 100644 --- a/pkgs/development/python-modules/ecos/default.nix +++ b/pkgs/development/python-modules/ecos/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , nose , numpy , pythonOlder @@ -22,6 +23,15 @@ buildPythonPackage rec { fetchSubmodules = true; }; + patches = [ + # Fix for test_interface_bb.py tests + (fetchpatch { + name = "test_interface_bb_use_nparray.patch"; + url = "https://github.com/embotech/ecos-python/commit/4440dcb7ddbd92217bc83d8916b72b61537dffbf.patch"; + hash = "sha256-pcTPviK916jzCLllRhopbC9wDHv+aS6GmV/92sUwzHc="; + }) + ]; + propagatedBuildInputs = [ numpy scipy From 4e224a9a64baf80f2775f7d77dbd8eee6e8887c0 Mon Sep 17 00:00:00 2001 From: Sebastien Iooss Date: Mon, 3 Oct 2022 09:54:54 +0200 Subject: [PATCH 155/269] maintainers: add net-mist --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2195778492eb..13bd6025b418 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9534,6 +9534,12 @@ github = "nessdoor"; githubId = 25993494; }; + net-mist = { + email = "archimist.linux@gmail.com"; + github = "Net-Mist"; + githubId = 13920346; + name = "Sébastien Iooss"; + }; netali = { name = "Jennifer Graul"; email = "me@netali.de"; From 22080b7dc0fd3e0c8ef2f65b12ba1a22125600d1 Mon Sep 17 00:00:00 2001 From: Sebastien Iooss Date: Mon, 3 Oct 2022 09:55:36 +0200 Subject: [PATCH 156/269] python3Packages.mkdocs-jupyter: init at 0.22.0 --- .../python-modules/mkdocs-jupyter/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/mkdocs-jupyter/default.nix diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix new file mode 100644 index 000000000000..2c9b85e64e0b --- /dev/null +++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -0,0 +1,50 @@ +{ buildPythonPackage +, fetchPypi +, ipykernel +, jupytext +, lib +, mkdocs +, mkdocs-material +, nbconvert +, pygments +, pytestCheckHook +, pytest-cov +}: + +buildPythonPackage rec { + pname = "mkdocs-jupyter"; + version = "0.22.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-WFzGm+pMufr2iYExl43JqbIlCR7UtghPWrZWUqXhIYU="; + }; + + postPatch = '' + substituteInPlace mkdocs_jupyter/tests/test_base_usage.py \ + --replace "[\"mkdocs\"," "[\"${mkdocs.out}/bin/mkdocs\"," + ''; + + propagatedBuildInputs = [ + nbconvert + jupytext + mkdocs + mkdocs-material + pygments + ipykernel + ]; + + pythonImportsCheck = [ "mkdocs_jupyter" ]; + + checkInputs = [ + pytest-cov + pytestCheckHook + ]; + + meta = with lib; { + description = "Use Jupyter Notebook in mkdocs"; + homepage = "https://github.com/danielfrg/mkdocs-jupyter"; + license = licenses.asl20; + maintainers = with maintainers; [ net-mist ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4336b1767bc7..3cb075cd8f58 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5760,6 +5760,7 @@ in { mkdocs-autorefs = callPackage ../development/python-modules/mkdocs-autorefs { }; mkdocs-drawio-exporter = callPackage ../development/python-modules/mkdocs-drawio-exporter { }; mkdocs-exclude = callPackage ../development/python-modules/mkdocs-exclude { }; + mkdocs-jupyter = callPackage ../development/python-modules/mkdocs-jupyter { }; mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { }; mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { }; mkdocs-material = callPackage ../development/python-modules/mkdocs-material { }; From 00e30f7ae076f6d27d047895b42f133ed02f23fd Mon Sep 17 00:00:00 2001 From: Sebastien Iooss Date: Mon, 3 Oct 2022 09:55:52 +0200 Subject: [PATCH 157/269] python3Packages.nbconvert: patch bug that made mkdocs-jupyter failing --- .../python-modules/nbconvert/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 82d3aad69626..1940da96047d 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -39,6 +39,18 @@ buildPythonPackage rec { hash = "sha256-kdOmE7BnkRy2lsNQ2OVrEXXZntJUPJ//b139kSsfKmI="; excludes = [ "pyproject.toml" ]; }) + + # patch nbconvert/filters/markdown_mistune.py + (fetchpatch { + name = "clean-up-markdown-parsing.patch"; + url = "https://github.com/jupyter/nbconvert/commit/4df1f5451c9c3e8121036dfbc7e07f0095f4d524.patch"; + hash = "sha256-O+VWUaQi8UMCpE9/h/IsrenmEuJ2ac/kBkUBq7GFJTY"; + }) + (fetchpatch { + name = "fix-markdown-table.patch"; + url = "https://github.com/jupyter/nbconvert/commit/d3900ed4527f024138dc3a8658c6a1b1dfc43c09.patch"; + hash = "sha256-AFE1Zhw29JMLB0Sj17zHcOfy7VEFqLekO8NYbyMLrdI="; + }) ]; postPatch = '' @@ -47,6 +59,10 @@ buildPythonPackage rec { # Use mistune 2.x substituteInPlace setup.py \ --replace "mistune>=0.8.1,<2" "mistune>=2.0.3,<3" + + # Equivalent of the upstream patch https://github.com/jupyter/nbconvert/commit/aec39288c9a6c614d659bcaf9f5cb36634d6b37b.patch + substituteInPlace share/jupyter/nbconvert/templates/lab/base.html.j2 \ + --replace "{{ output.data['image/svg+xml'] | clean_html }}" "{{ output.data['image/svg+xml'].encode(\"utf-8\") | clean_html }}" ''; propagatedBuildInputs = [ From 8e652f2f5cdb42c38990b550864c745b86e855bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 18:12:47 +0000 Subject: [PATCH 158/269] minio-client: 2022-09-16T09-16-47Z -> 2022-10-01T07-56-14Z --- pkgs/tools/networking/minio-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 8b11514b1085..767ef35fd0c6 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-09-16T09-16-47Z"; + version = "2022-10-01T07-56-14Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-8oy61ueCXJTV58CxtsB8uiKS5NVaomICu8yQ1wSxl7s="; + sha256 = "sha256-UAzSqxBQNMpCJsVly6Z7x03CjOWB4VGL0PE4NQbp0PE="; }; - vendorSha256 = "sha256-1jws2is/n3+l7ULTgBfO2glq4l9GzOP5AJ2wwhluQb8="; + vendorSha256 = "sha256-vnJPc2yZUs6rS2+ysUIG6YreSFxxL8hD/FaNbGFDo+s="; subPackages = [ "." ]; From cbae4c2af6819ea549e6cb2389564030411e9b63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 18:13:02 +0000 Subject: [PATCH 159/269] minio: 2022-09-25T15-44-53Z -> 2022-10-02T19-29-29Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 1a8a2b251c0e..1b3440761abb 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-09-25T15-44-53Z"; + version = "2022-10-02T19-29-29Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-ygDE7oqNddC+7kIkGu3QuswQp1Mh441rHvwF2JIKOzE="; + sha256 = "sha256-J40QbyqywKF2vYqznFqkLxje241WHSdNL7v34chBybA="; }; - vendorSha256 = "sha256-nl7lQ+PnfEgEnc/g2PIpsSQH18v/YF5yw+tlIYWNP1A="; + vendorSha256 = "sha256-DXvNM9NI2nyoUbvLKRROLc7kA1RYPZzFX8rOhKku8KA="; doCheck = false; From bd62717fd3c263629138fef08897420b2cc673ba Mon Sep 17 00:00:00 2001 From: David Morgan Date: Mon, 3 Oct 2022 20:13:43 +0100 Subject: [PATCH 160/269] libinput: Add tappingButtonMap option (#189612) Co-authored-by: Sandro --- nixos/modules/services/x11/hardware/libinput.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix index 8eb11e281d66..0d30b9b5e68d 100644 --- a/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixos/modules/services/x11/hardware/libinput.nix @@ -156,6 +156,14 @@ let cfg = config.services.xserver.libinput; ''; }; + tappingButtonMap = mkOption { + type = types.nullOr (types.enum [ "lrm" "lmr" ]); + default = null; + description = lib.mdDoc '' + Set the button mapping for 1/2/3-finger taps to left/right/middle or left/middle/right, respectively. + ''; + }; + tappingDragLock = mkOption { type = types.bool; default = true; @@ -220,6 +228,7 @@ let cfg = config.services.xserver.libinput; Option "HorizontalScrolling" "${xorgBool cfg.${deviceType}.horizontalScrolling}" Option "SendEventsMode" "${cfg.${deviceType}.sendEventsMode}" Option "Tapping" "${xorgBool cfg.${deviceType}.tapping}" + ${optionalString (cfg.${deviceType}.tappingButtonMap != null) ''Option "TappingButtonMap" "${cfg.${deviceType}.tappingButtonMap}"''} Option "TappingDragLock" "${xorgBool cfg.${deviceType}.tappingDragLock}" Option "DisableWhileTyping" "${xorgBool cfg.${deviceType}.disableWhileTyping}" ${cfg.${deviceType}.additionalOptions} @@ -241,6 +250,7 @@ in { "horizontalScrolling" "sendEventsMode" "tapping" + "tappingButtonMap" "tappingDragLock" "transformationMatrix" "disableWhileTyping" From 92e4b65d22e0f47469337e6f7cff58fc3ac4e8fb Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 4 Oct 2022 03:25:16 +0800 Subject: [PATCH 161/269] elisp-packages: fix AOT native-comp for several packages Currently, AOT native-comp for emacs packages is implemented[1] in postInstall. These packages override postInstall and do not keep old.postInstall, so they do not do AOT native-comp. This patch fixes this by keeping the old.postInstall in their overrides. Note that I do not fix emacspeak because I have not found an elegant way to do so. [1]: a7cb8e36ac17526ffc2255c9c48c94be675c4d67 --- .../editors/emacs/elisp-packages/elpa-packages.nix | 2 +- .../editors/emacs/elisp-packages/melpa-packages.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 2bfc2f18e97d..94ca0cdf0b6d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -96,7 +96,7 @@ self: let ./build.sh -j$NIX_BUILD_CORES ''; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' ./install.sh --prefix=$out ''; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 39835c58b650..6190d25ce93d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -186,7 +186,7 @@ let cd - ''; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' install -m=755 -D source/sqlite/emacsql-sqlite \ $out/share/emacs/site-lisp/elpa/emacsql-sqlite-${old.version}/sqlite/emacsql-sqlite ''; @@ -301,7 +301,7 @@ let make popd ''; - postInstall = '' + postInstall = (attrs.postInstall or "") + "\n" + '' outd=$(echo $out/share/emacs/site-lisp/elpa/libgit-**) mkdir $outd/build install -m444 -t $outd/build ./source/src/libegit2.so @@ -426,7 +426,7 @@ let cd - ''; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' mkdir -p $out/bin install -m755 -Dt $out/bin ./source/server/telega-server ''; @@ -456,7 +456,7 @@ let pkgs.libtool (pkgs.zeromq.override { enableDrafts = true; }) ]; - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' mv $EZMQ_LIBDIR/emacs-zmq.* $out/share/emacs/site-lisp/elpa/zmq-* rm -r $out/share/emacs/site-lisp/elpa/zmq-*/src rm $out/share/emacs/site-lisp/elpa/zmq-*/Makefile @@ -533,7 +533,7 @@ let ]; # we need the proper out directory to exist, so we do this in the # postInstall instead of postBuild - postInstall = '' + postInstall = (old.postInstall or "") + "\n" + '' pushd source/build >/dev/null make install -m444 -t $out/share/emacs/site-lisp/elpa/vterm-** ../*.so From aafe8b96171b68eeeb21a96f95c0c9c14c859ffa Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 3 Oct 2022 14:16:03 -0400 Subject: [PATCH 162/269] ruff: 0.0.50 -> 0.0.52 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 3913a2a410f4..795ddd49b2fb 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.50"; + version = "0.0.52"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fKpFchiJ5pVEl39onovlB3eIneta5avXjZ0ApEakHzc="; + sha256 = "sha256-x4aP2CZQLd5K2VVk32Cuopd7/CJbNQvqXMHontrNtSE="; }; - cargoSha256 = "sha256-ezmswwtbuqyeEZ5DrFLAwVySYjQ1EXPZoZdwvMcC2S4="; + cargoSha256 = "sha256-7q+mVu/y/A1+XNTKlxfbAn1s9xWIbdHJxQ2civxjW8o="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From dfa4024ae7145aad3cf3242750bf34ba345cec97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 19:35:12 +0000 Subject: [PATCH 163/269] oh-my-posh: 11.1.1 -> 11.3.0 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index b3a56fb9d098..7ae79d1c1495 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "11.1.1"; + version = "11.3.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6BTH4wiiiQEP8DMq+pYHizIgnJrj8bO3i/RIwvqAYbQ="; + sha256 = "sha256-u10hxJEt08NtwXyLc7CrQj+70NczgOIeyFvudxxb1Qw="; }; vendorSha256 = "sha256-A4+sshIzPla7udHfnMmbFqn+fW3SOCrI6g7tArzmh1E="; From 87447d47760082cb69aa0f05e0f59e23a4eb2037 Mon Sep 17 00:00:00 2001 From: Zoey de Souza Pessanha Date: Mon, 3 Oct 2022 16:51:13 -0300 Subject: [PATCH 164/269] polypane: init at 10.0.1 (#158159) Co-authored-by: Sandro --- .../networking/browsers/polypane/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/networking/browsers/polypane/default.nix diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix new file mode 100644 index 000000000000..ad7f6e5154ad --- /dev/null +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -0,0 +1,41 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "polypane"; + version = "10.0.1"; + + src = fetchurl { + url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; + name = "${pname}-${version}.AppImage"; + sha256 = "eujv99L5svMhDIKHFOfm7sOwNZ4xiUaIsimfOf4BBik="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname src version; + }; +in appimageTools.wrapType2 { + inherit pname src version; + + multiPkgs = null; + extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; + + extraInstallCommands = '' + ln -s $out/bin/${pname}-${version} $out/bin/${pname} + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/${pname}.png \ + $out/share/icons/hicolor/512x512/apps/${pname}.png + ''; + + meta = with lib; { + description = "Browser with unified devtools targeting responsability and acessibility"; + longDescription = '' + The stand-alone browser for ambitious developers that want to build responsive, + accessible and performant websites in a fraction of the time it takes with other browsers. + ''; + homepage = "https://polypane.app/"; + maintainers = with maintainers; [ zoedsoupe ]; + platforms = [ "x86_64-linux" ]; + changelog = "https://polypane.app/docs/changelog/"; + license = licenses.unfree; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bc0e109acb6..d4de1c8cd5e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10249,6 +10249,8 @@ with pkgs; poly2tri-c = callPackage ../development/libraries/poly2tri-c { }; + polypane = callPackage ../applications/networking/browsers/polypane { }; + ponysay = callPackage ../tools/misc/ponysay { }; popfile = callPackage ../tools/text/popfile { }; From 4b587a7cb8051ffb72fa8a5c2c0b172c41a77dbb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 20:01:15 +0000 Subject: [PATCH 165/269] python310Packages.pytest-subprocess: 1.4.1 -> 1.4.2 --- .../python-modules/pytest-subprocess/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-subprocess/default.nix b/pkgs/development/python-modules/pytest-subprocess/default.nix index cc890096f796..7dc1bd9d08e9 100644 --- a/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "pytest-subprocess"; - version = "1.4.1"; + version = "1.4.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aklajnert"; repo = "pytest-subprocess"; - rev = version; - hash = "sha256-xNkOXBCQ4AH/JVmxFzI3VSouA6jkCbUom7AdckfjGiE="; + rev = "refs/tags/${version}"; + hash = "sha256-8Of3/RltijfF5MXtVazGzIqpmRIhreT26kLNjzXLF1k="; }; buildInputs = [ From fe271bcada6f757e7cbdb208c99631db60a7ddc2 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 3 Oct 2022 16:03:03 -0400 Subject: [PATCH 166/269] goreleaser: 1.11.4 -> 1.11.5 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index ff6458243a62..56a315951143 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.11.4"; + version = "1.11.5"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hbgInZZ1ahFPIGHiHs68GqbMfFfYMcJy92iL2fvGxr0="; + sha256 = "sha256-RertNRBwrlodsjwv1NqNOR6ZDEMaRsHG1dVEu0Z501I="; }; - vendorSha256 = "sha256-iUXbvwh04W8cZ4pa+OS4bRi3bCyFQ2shPzHNh6/e3Vs="; + vendorSha256 = "sha256-d068X29Lh0l9S7HTmO75HcsV9ZdUsjp977Esxy7gzKI="; ldflags = [ "-s" From 960e4e772bff4c1900e5730df1d1da9016c17aa5 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Mon, 3 Oct 2022 13:08:56 -0700 Subject: [PATCH 167/269] input-remapper: 1.4.2 -> 1.5.0 (#191967) Co-authored-by: Sandro --- .../inputmethods/input-remapper/default.nix | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/tools/inputmethods/input-remapper/default.nix index 0a1ce3108f23..9137b834555d 100644 --- a/pkgs/tools/inputmethods/input-remapper/default.nix +++ b/pkgs/tools/inputmethods/input-remapper/default.nix @@ -29,28 +29,20 @@ # failures when building. Override this to true to run tests anyway # See upstream issue: https://github.com/sezanzeb/input-remapper/issues/306 , withDoCheck ? false - # Version and rev and hash are package arguments to allow overriding - # while ensuring the values in prePatch and src match - # https://discourse.nixos.org/t/avoid-rec-expresions-in-nixpkgs/8293/7 - # The names are prefixed with input_remapper to avoid potential - # collisions with package names -, input_remapper_version ? "1.4.2" -, input_remapper_src_rev ? "af20f87a1298153e765b840a2164ba63b9ef937a" -, input_remapper_src_hash ? "sha256-eG4Fx1z74Bq1HrfmzOuULQLziGdWnHLax8y2dymjWsI=" }: let maybeXmodmap = lib.optional withXmodmap xmodmap; in -buildPythonApplication { +(buildPythonApplication { pname = "input-remapper"; - version = input_remapper_version; + version = "1.5.0"; src = fetchFromGitHub { - rev = input_remapper_src_rev; + rev = "e31a1b2bc5d23fe13130afcc242063196335399f"; owner = "sezanzeb"; repo = "input-remapper"; - hash = input_remapper_src_hash; + hash = "sha256-KPQLgXSonuOgphagYN2JN+CMIpmjTIPUTCqOPDk0UYU="; }; # Fixes error @@ -58,17 +50,14 @@ buildPythonApplication { # at startup, see https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; - prePatch = '' - # set revision for --version output - echo "COMMIT_HASH = '${input_remapper_src_rev}'" > inputremapper/commit_hash.py - + postPatch = '' # fix FHS paths substituteInPlace inputremapper/configs/data.py \ --replace "/usr/share/input-remapper" "$out/usr/share/input-remapper" - '' + (lib.optionalString (withDebugLogLevel) '' + '' + lib.optionalString withDebugLogLevel '' # if debugging substituteInPlace inputremapper/logger.py --replace "logger.setLevel(logging.INFO)" "logger.setLevel(logging.DEBUG)" - ''); + ''; doCheck = withDoCheck; checkInputs = [ @@ -161,4 +150,14 @@ buildPythonApplication { maintainers = with maintainers; [ LunNova ]; mainProgram = "input-remapper-gtk"; }; -} +}).overrideAttrs (final: prev: { + # Set in an override as buildPythonApplication doesn't yet support + # the `final:` arg yet from #119942 'overlay style overridable recursive attributes' + # this ensures the rev matches the input src's rev after overriding + # See https://discourse.nixos.org/t/avoid-rec-expresions-in-nixpkgs/8293/7 for more + # discussion + postPatch = prev.postPatch or "" + '' + # set revision for --version output + echo "COMMIT_HASH = '${final.src.rev}'" > inputremapper/commit_hash.py + ''; +}) From 3e117af149cde4bd6ecb5a585872d15eadf7014d Mon Sep 17 00:00:00 2001 From: bandithedoge Date: Mon, 3 Oct 2022 21:47:56 +0200 Subject: [PATCH 168/269] gzdoom: fix libfluidsynth not loading --- pkgs/games/gzdoom/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index c2489e5d033e..c64e3dbe693b 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -16,6 +16,10 @@ let nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fluidsynth ]; + + cmakeFlags = [ "-DDYN_FLUIDSYNTH=OFF" ]; + preConfigure = '' sed -i \ -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \ From 128f745ffff126f1c90937f239ef4cfed349c3d9 Mon Sep 17 00:00:00 2001 From: bandithedoge Date: Mon, 3 Oct 2022 22:08:30 +0200 Subject: [PATCH 169/269] gzdoom: fix IWAD selection menu --- pkgs/games/gzdoom/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index c64e3dbe693b..3eb69fa3c112 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, openal, fluidsynth , soundfont-fluid, libGL, SDL2, bzip2, zlib, libjpeg, libsndfile, libvpx, mpg123 -, game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem }: +, game-music-emu, pkg-config, copyDesktopItems, makeDesktopItem, gtk3 }: let zmusic = stdenv.mkDerivation rec { @@ -43,16 +43,17 @@ let nativeBuildInputs = [ cmake makeWrapper pkg-config copyDesktopItems ]; buildInputs = [ SDL2 - libGL - openal - fluidsynth bzip2 - zlib + fluidsynth + game-music-emu + gtk3 + libGL libjpeg libsndfile libvpx mpg123 - game-music-emu + openal + zlib zmusic ]; @@ -65,6 +66,8 @@ let NIX_CFLAGS_LINK = "-lopenal -lfluidsynth"; + cmakeFlags = [ "-DDYN_GTK=OFF" ]; + desktopItems = [ (makeDesktopItem { name = "gzdoom"; From 35d5dd7989580540453f47dd331bc1975949c7d8 Mon Sep 17 00:00:00 2001 From: "Samuel W. Flint" Date: Wed, 21 Sep 2022 12:21:13 -0500 Subject: [PATCH 170/269] readstat: init at 1.1.8 The readstat package allows for reading and manipulating SAS/Stata/SPSS data files. This can be useful for interacting and interoperating with datasets distributed in these formats. --- .../science/math/readstat/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/science/math/readstat/default.nix diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/applications/science/math/readstat/default.nix new file mode 100644 index 000000000000..51ee824b6ff1 --- /dev/null +++ b/pkgs/applications/science/math/readstat/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: + +stdenv.mkDerivation rec { + name = "readstat"; + version = "1.1.8"; + + src = fetchFromGitHub { + owner = "WizardMac"; + repo = "ReadStat"; + rev = "v${version}"; + sha256 = "1r04lq45h1yn34v1mgfiqjfzyaqv4axqlby0nkandamcsqyhc7y4"; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + meta = { + homepage = "https://github.com/WizardMac/ReadStat"; + description = "Command-line tool (+ C library) for converting SAS, Stata, and SPSS files"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ swflint ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac351e13aba7..e0925431a8c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10510,6 +10510,8 @@ with pkgs; read-edid = callPackage ../os-specific/linux/read-edid { }; + readstat = callPackage ../applications/science/math/readstat { }; + redir = callPackage ../tools/networking/redir { }; redmine = callPackage ../applications/version-management/redmine { }; From f5355f8a3814417490e0dc4783ee8149772ff230 Mon Sep 17 00:00:00 2001 From: "Samuel W. Flint" Date: Wed, 21 Sep 2022 12:36:09 -0500 Subject: [PATCH 171/269] pyreadstat: init at 1.1.9 --- .../python-modules/pyreadstat/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/pyreadstat/default.nix diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix new file mode 100644 index 000000000000..499aa97db8c7 --- /dev/null +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchFromGitHub, cython, zlib, pandas, readstat }: + +buildPythonPackage rec { + pname = "pyreadstat"; + version = "1.1.9"; + + src = fetchFromGitHub { + owner = "Roche"; + repo = "pyreadstat"; + rev = "v${version}"; + sha256 = "16aa16ybh3ikmlxsg8zm19x9k6r4gpd0sxqagv318w76jjyw1nrs"; + }; + + nativeBuildInputs = [ + cython + ]; + + buildInputs = [ + zlib + ]; + + propagatedBuildInputs = [ + readstat + pandas + ]; + + meta = { + homepage = "https://github.com/Roche/pyreadstat"; + description = "Python package to read SAS, SPSS and Stata files into pandas data frames using the readstat C library"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ swflint ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb4600bcaaec..6da11b306108 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9469,6 +9469,8 @@ in { readme_renderer = callPackage ../development/python-modules/readme_renderer { }; + readstats = callPackage ../development/python-modules/pyreadstat { }; + readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { }; rebulk = callPackage ../development/python-modules/rebulk { }; From 29ba4c72c9ce8ad5f0c5bcab9158cff5755ae809 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 3 Oct 2022 01:55:55 -0700 Subject: [PATCH 172/269] peertube: 4.2.2 -> 4.3.0 --- pkgs/servers/peertube/default.nix | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 90b84367ab7b..29e082e65cf2 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -1,5 +1,16 @@ -{ lib, stdenv, callPackage, fetchurl, fetchFromGitHub, buildGoModule, fetchYarnDeps, nixosTests -, fixup_yarn_lock, jq, nodejs, yarn +{ lib +, stdenv +, callPackage +, fetchurl +, fetchFromGitHub +, buildGoModule +, fetchYarnDeps +, nixosTests +, fixup_yarn_lock +, jq +, nodejs +, which +, yarn }: let arch = @@ -9,36 +20,36 @@ let bcrypt_version = "5.0.1"; bcrypt_lib = fetchurl { url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v${bcrypt_version}/bcrypt_lib-v${bcrypt_version}-napi-v3-${arch}-glibc.tar.gz"; - sha256 = "3R3dBZyPansTuM77Nmm3f7BbTDkDdiT2HQIrti2Ottc="; + hash = "sha256-3R3dBZyPansTuM77Nmm3f7BbTDkDdiT2HQIrti2Ottc="; }; in stdenv.mkDerivation rec { pname = "peertube"; - version = "4.2.2"; + version = "4.3.0"; src = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; rev = "v${version}"; - sha256 = "sha256-q6wSk5AO91Z6dw5MgpO7QTAlA8Q5Xx1CboBr7SElVUA="; + hash = "sha256-1QpJtonn/mWGcTv2mSeGKAHwPAqOV6VBAYFZH1/jAH8="; }; yarnOfflineCacheServer = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - sha256 = "sha256-MMsxh20jcbW4YYsJyoupKbT9+Xa1BWZAmYHoj2/t+LM="; + hash = "sha256-BimtZpU3aZepvlMfhJ/u0trk1rUsGlzjYk2G90fstII="; }; yarnOfflineCacheTools = fetchYarnDeps { yarnLock = "${src}/server/tools/yarn.lock"; - sha256 = "sha256-maPR8OCiuNlle0JQIkZSgAqW+BrSxPwVm6CkxIrIg5k="; + hash = "sha256-maPR8OCiuNlle0JQIkZSgAqW+BrSxPwVm6CkxIrIg5k="; }; yarnOfflineCacheClient = fetchYarnDeps { yarnLock = "${src}/client/yarn.lock"; - sha256 = "sha256-6Snx1OwEndGrkMZbAEsoNRUQnZcwH+pwSDZW8igCzXA="; + hash = "sha256-IKMu+gQa+d30+yXjHCu/oQOQXL6kTN9WxDI/Y5IL1E8="; }; - nativeBuildInputs = [ fixup_yarn_lock jq nodejs yarn ]; + nativeBuildInputs = [ fixup_yarn_lock jq nodejs which yarn ]; buildPhase = '' # Build node modules @@ -80,7 +91,7 @@ in stdenv.mkDerivation rec { # Build PeerTube tools cp -r "./server/tools/node_modules" "./dist/server/tools" npm run tsc -- --build ./server/tools/tsconfig.json - npm run resolve-tspaths:cli + npm run resolve-tspaths:server # Build PeerTube client npm run build:client From 934c03e19d8b926d960ebf1f454b10503974d397 Mon Sep 17 00:00:00 2001 From: Christian Kemper Date: Mon, 3 Oct 2022 21:20:07 +0100 Subject: [PATCH 173/269] pulumi-bin: 3.40.1 -> 3.40.2 --- pkgs/tools/admin/pulumi/data.nix | 162 +++++++++++++++--------------- pkgs/tools/admin/pulumi/update.sh | 2 +- 2 files changed, 82 insertions(+), 82 deletions(-) diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index ddb4874267a2..37f472c147f9 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.40.1"; + version = "3.40.2"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.1-linux-x64.tar.gz"; - sha256 = "07zh77spxsgrq409p61pfik0b8r87ib02x8hcpfhsjd9kgmc9614"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.2-linux-x64.tar.gz"; + sha256 = "0xd307r3280nb11yz5nmm51jg4jd1in1n42jz8ibb20vzqlwb1f3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-amd64.tar.gz"; @@ -29,12 +29,12 @@ sha256 = "0y7np2qg2hp81cji78bjbcw7ng2g81y1asbnqb2jd2ip0yf43aqp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.14.0-linux-amd64.tar.gz"; - sha256 = "099ljh9kkjp2cy64qs6mvbscgr9whmgqd81c6nfmvxjbfy1i118p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.0-linux-amd64.tar.gz"; + sha256 = "0f3lzx9k6r20cqkccdcwskk3wya4d9zchfbid2yd08kyrx8ga6z5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.19.0-linux-amd64.tar.gz"; - sha256 = "10xmh1apjhp1b94c8z8v7x3zpmv2nlh85vbkd83d7pb4cvv0dixq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.20.0-linux-amd64.tar.gz"; + sha256 = "1icichldk238f9r630vcc8a4hq8pqaqz2wj4cvyr68nqwnibxh95"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-linux-amd64.tar.gz"; @@ -45,8 +45,8 @@ sha256 = "12sxvvjzf9761cag1kah7sdvjg98mi05jrfy0g06xf7lghlyxpcr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.11.0-linux-amd64.tar.gz"; - sha256 = "16hkrmw35vvsg1m9bfh6bw989yfmn784hzj7058hpd6mwhac7c07"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.12.1-linux-amd64.tar.gz"; + sha256 = "177s1vi6ci4v04gyck8c2p9r17w8538migw6d1n7yzyf74qjdwhl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-linux-amd64.tar.gz"; @@ -57,8 +57,8 @@ sha256 = "1wcxz4sg7ca0n8csp3j2qjd60cvn984mllbv3js55rrzbh8iqfwp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.2-linux-amd64.tar.gz"; - sha256 = "0dv6vnm34qnj4qlw65fffb4knbph3yy1afj7zim9bzxbm07nv2wh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-linux-amd64.tar.gz"; + sha256 = "0dwnrqng4w02wcmznksdxksak9kgfrj6pg2jny175a1lr6584blf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-linux-amd64.tar.gz"; @@ -73,12 +73,12 @@ sha256 = "1087d10z0h2vlx18czh4yhplb4qqyy94zf0hvqm5n6vmyh9kpr8j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.37.0-linux-amd64.tar.gz"; - sha256 = "11wpxzvzw4mbp3mqywgy5n9fx6217w823hqmb6an6m8zskrfgh5m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-linux-amd64.tar.gz"; + sha256 = "11qik0dg12svgh93f5xr7sbqs0bkb8m680cn252lwcwdyz06hfni"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.17.0-linux-amd64.tar.gz"; - sha256 = "14sdhvn2y32y1a6ydqgy1bsbld976c66aiyc9raybxjn9ym28gkd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-linux-amd64.tar.gz"; + sha256 = "1n7hmbqc3a4z44wa8pzmfxqzg895pynqsjk0php9z052nkl034kz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-linux-amd64.tar.gz"; @@ -93,8 +93,8 @@ sha256 = "09i6lh9wfsfpa5jkj2nb80f3gvmpg3m3flfgfcc794khlrikqmib"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.2-linux-amd64.tar.gz"; - sha256 = "1ihy52ckcvw2kpaz7905nm19lzahw26c39x4v8mrlz7zjb0pgxj8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.4-linux-amd64.tar.gz"; + sha256 = "0xdwl5xh114s61wb662239nsqad7jbkr26xs3d3gxm8z1wy6nw90"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-amd64.tar.gz"; @@ -121,16 +121,16 @@ sha256 = "0vxspn9rjb928ax4755086kil6j3616ga5zn3d6xrwm9cvmal0kb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-linux-amd64.tar.gz"; - sha256 = "1ymcbqb2rx8g1nsvppasqlc2ws00jzrx33k6cghy14yjkd82n6pv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-linux-amd64.tar.gz"; + sha256 = "1i43wmldn3q0jshfa07rldbn7rhyg5r536dzwnfmp47dvk6jhzyl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-amd64.tar.gz"; sha256 = "0rdvz6ibk41dhyfsqblfj56ib5hrr6vsx0z9kgzz5qamyjd1580h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-linux-amd64.tar.gz"; - sha256 = "1i5y1kqyc84v90c7lh5gaydk5qvvs62gc6xxd6n8zzmn9ygkr0c4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-linux-amd64.tar.gz"; + sha256 = "1xf1xikal6fp381pxb7xnq37vx3ica81452xckgpsdn0b2dybxlz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.1-darwin-x64.tar.gz"; - sha256 = "0av0i5g2450l5ndvihxw32cxzamjqwr338200yaw4wh2qyl8p7rw"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.2-darwin-x64.tar.gz"; + sha256 = "0c7k32bsjw98f5hshlkhjdsvjflnfmcvykq4zzwi43z68zhmla0s"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-amd64.tar.gz"; @@ -187,12 +187,12 @@ sha256 = "0dz583zm47v2x2aznc4yszxibmp9schp3b38yzmbry0xrkm1gryx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.14.0-darwin-amd64.tar.gz"; - sha256 = "1ar4cfjmq3iszh08i9xmrqvhwc7lb8qvyhnnx4nh99wyw32ssk0a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.0-darwin-amd64.tar.gz"; + sha256 = "1qmifh4mbjlmahwhj7359m8849pb2b1av6n3df5d070vlxqab33v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.19.0-darwin-amd64.tar.gz"; - sha256 = "1g5hjpi7w2zwknv6lcvlrbwvd7nq73n5953qzx764hfh6whp5431"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.20.0-darwin-amd64.tar.gz"; + sha256 = "1p9vkmjda2pf5bzrzwmj7ch6275drc77smgfxg0033hj2f421lsv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-darwin-amd64.tar.gz"; @@ -203,8 +203,8 @@ sha256 = "026i7hxa80b7mipw792anv1wplmz2w23irfy26bsh77an36hk46y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.11.0-darwin-amd64.tar.gz"; - sha256 = "0gs08839j2miqvw8rx4b3hz76y5ac6sy7h8pryychcficgf3h2px"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.12.1-darwin-amd64.tar.gz"; + sha256 = "18k9gzsbx48q17y9p8i5wqbjcq9bq94ha96lxvljcyf0jmsklkj6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-darwin-amd64.tar.gz"; @@ -215,8 +215,8 @@ sha256 = "1g3wxvw27v942s4fdym6nxcgipxrqgkh219mi6dn4j3n3kp15scj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.2-darwin-amd64.tar.gz"; - sha256 = "031pkzx7xshzbf9x5fb84a9699c6zcwqvx295s5diqw4jrcx6003"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-darwin-amd64.tar.gz"; + sha256 = "08v8s77plv9fv5bjx6g6wfq1fxknmmacws33zgl06vqdgdsfg1gx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-darwin-amd64.tar.gz"; @@ -231,12 +231,12 @@ sha256 = "02p8g3kirc9g9jgmv50l8c9jamidk389in33f7qnz22hck880dr8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.37.0-darwin-amd64.tar.gz"; - sha256 = "1p37i9c8d66rvjp11ghjh5fhxg07lgwgpjmr0amjic1vpxlx96wc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-darwin-amd64.tar.gz"; + sha256 = "0s2lvm3zf5dnirm9ka8ilrk5l4m39bdid2r6dpldfc326h079xva"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.17.0-darwin-amd64.tar.gz"; - sha256 = "16a8q87yb4d6ssdrvw5zgflq7bfr6zpf4ldf01y0ffc7hmgwpwbn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-darwin-amd64.tar.gz"; + sha256 = "0kz7ah6a1lai12n0lq0lygvszs8fh7fnnz92na06p517bl5dbink"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-darwin-amd64.tar.gz"; @@ -251,8 +251,8 @@ sha256 = "1jp9cfw8jj1wms73b5d1xhkmnylly061fxilxzvnpd49glam7da6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.2-darwin-amd64.tar.gz"; - sha256 = "038phqrwvyjqh9kvnrn9ic4ac3h6niahrlwz81lllqg757ibrd08"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.4-darwin-amd64.tar.gz"; + sha256 = "1afb90qzwgdvl3lvgqzrkcknv4gd4krdcxmwd39xzzb2kjfd1fh3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-amd64.tar.gz"; @@ -279,16 +279,16 @@ sha256 = "0086l2ch5wdhdilwipln9clq09lnj2njgpp2wn8mxvd69xjccsz0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-darwin-amd64.tar.gz"; - sha256 = "1imgmpn2n9daghpaca6qlww7bp3dmw894fv54j43cpxkm6z29kjk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-darwin-amd64.tar.gz"; + sha256 = "1a7mq8qw17g4f6zfgdnym77q7j8dc1iigxcwmnz46d07mjq34d0h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-amd64.tar.gz"; sha256 = "1p27dsar8jl7krqz2vrzics45g8s85l4xx3216207x2hq7qbdfb5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-darwin-amd64.tar.gz"; - sha256 = "0yv03kh209cwzi1b47bhsbxslmnk454qkx5lqcn6qnjyc7ij7k6x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-darwin-amd64.tar.gz"; + sha256 = "08nr4qwilg4l3rrjndpr5r9k7fccdqlfzgh0i2np7hk3d5g5nar7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.1-linux-arm64.tar.gz"; - sha256 = "1vb7ad3gadqhxf4jv5fkr9pf7lzliwaazmfl6j2ja5imqdl4iyri"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.2-linux-arm64.tar.gz"; + sha256 = "0bpkz0j7d3aidq26dfas81f9ln8kdv3nhpdcypdx82ddglqi78wr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-arm64.tar.gz"; @@ -345,12 +345,12 @@ sha256 = "0ni0dp0wghcaybnzvvwyf0nbnyq8k2akkghxlym48z8dq7n4206y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.14.0-linux-arm64.tar.gz"; - sha256 = "0knzcqjpvgs9blarj0rf36racnaav8vii2yxl99rrs731cnf4l1w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.0-linux-arm64.tar.gz"; + sha256 = "1vkv48109lg1wkim5gk52w2vb6fh7qx7rxq3gr05l1xpy2cr28f6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.19.0-linux-arm64.tar.gz"; - sha256 = "0agz4izq6plzsb4j5jic6dvnkks8q37gy025y5xlrlnczrr45k41"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.20.0-linux-arm64.tar.gz"; + sha256 = "0j9dcqxmpbg8ng9lcxa742fmql2cc77c29q51jqiazy91zaz09ya"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-linux-arm64.tar.gz"; @@ -361,8 +361,8 @@ sha256 = "1bxrh89hkw9b0g20d4apwhswl1dxb4v4nn5rkkkjd91ykin5idp2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.11.0-linux-arm64.tar.gz"; - sha256 = "1l54kgg14lhgx694yrzabjn27m4xy90v7kifj9b0cdfly4jlhzhz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.12.1-linux-arm64.tar.gz"; + sha256 = "0gr30lgad0xf7f4acxj9v7r69gncfzh1x7rn7nvyibsfy7ggn80z"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-linux-arm64.tar.gz"; @@ -373,8 +373,8 @@ sha256 = "1kmp1lg312d8l1b3sylc6fan5rracmb7rd2v871gwyqx6gya6aqk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.2-linux-arm64.tar.gz"; - sha256 = "0vanpq5mb3rdbdqflfwp8f1w94xim42ih3a7hc2cmbavyf1vg16a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-linux-arm64.tar.gz"; + sha256 = "0bx2dczfm1zqpkclyf1pj0m0iv2w7c3dlqdajfgism3inyb6313c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-linux-arm64.tar.gz"; @@ -389,12 +389,12 @@ sha256 = "1cymvx8dx836d2vcnakgqz51nc033702dph66w8j4swj0sg4wd92"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.37.0-linux-arm64.tar.gz"; - sha256 = "0wihyyww8nr2asfw1qkcn7zb31w6f15j94135v7wnzljil6pfibx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-linux-arm64.tar.gz"; + sha256 = "1bdbf17z8a2rfgs79xvd71vj7k0zhyvjjvb3vwc46qlf9if3kzsm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.17.0-linux-arm64.tar.gz"; - sha256 = "0bjpccmn7h4cl7cvmflfzz5avh2hzmkfh3gibnjxfmgs5m92h0bf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-linux-arm64.tar.gz"; + sha256 = "0nf5s17x2k57rbmfi0b7lyicmsnm1gq1y5vfy5gpb0wxrcmnyadm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-linux-arm64.tar.gz"; @@ -409,8 +409,8 @@ sha256 = "0gis39k5kgdxl0i4afy78hkcmwpzm1shh4x713p7dg6h8w0afdmi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.2-linux-arm64.tar.gz"; - sha256 = "12awf88y3iy3hhvpclwlvf6nx46phn0gb84z77k3mb3mp296fnyg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.4-linux-arm64.tar.gz"; + sha256 = "1xsmnym5i7m8sqw1yciy6xgwxy5sryl0c8dqmyyclzmmxss4y3ng"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-arm64.tar.gz"; @@ -437,16 +437,16 @@ sha256 = "1djc9ar4x6rmi49grl4nxhycc2fbfvk9h1g2xnzl67adxh2cbgj9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-linux-arm64.tar.gz"; - sha256 = "0bpmmfgmi0061xrfadpijskw1hsgxk64l4kl4vrvc9l9iwjnbk64"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-linux-arm64.tar.gz"; + sha256 = "0rwvp6v00iybqlnf52n3a1afvpvr3vvvsxql9jsv4n2wxn4w1bhb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-arm64.tar.gz"; sha256 = "0nn7xj38injiwla8vss4nj25r53ddj0p0mplwqrk1r92l2vcihix"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-linux-arm64.tar.gz"; - sha256 = "1b9nw8q5m30csgxq0mg6npzwbsna4nwkwh7b33gax6fimalbcpal"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-linux-arm64.tar.gz"; + sha256 = "0p82fkch37zr53vl6wk2i1c8aplv8nk5hypjgzhjcg64a7ahlsv3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.1-darwin-arm64.tar.gz"; - sha256 = "1zhga32lii81pdgdj6bc2zsm45v8w0sqxk1m2srxgx27kynm848q"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.40.2-darwin-arm64.tar.gz"; + sha256 = "0y4gxwk77yxxxv9rmms3cwk6m64xmkd9mpx0nsp0gvihyxsgrbbv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-arm64.tar.gz"; @@ -503,12 +503,12 @@ sha256 = "11qrwc44vl0s59bbhjbb15nkcy8nb9lcsw9brb7whvxh2z080nbk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.14.0-darwin-arm64.tar.gz"; - sha256 = "1ib3162lbcg4ri0mrqj9qjzfxfgbf47vrazx58bj24j0z804wpcg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.0-darwin-arm64.tar.gz"; + sha256 = "07gfp1gqd9djd7qvvw9his8qxd6jlgvm9z2iazq66hblqyra5chq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.19.0-darwin-arm64.tar.gz"; - sha256 = "1lw0gp5lyc2r1a3dsgr55adcja3rj66bfrmp5qncpdmpkcx2fs74"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.20.0-darwin-arm64.tar.gz"; + sha256 = "1iq2kcpwr4bmwjx0jm7vn7i8qmsbwa9pafcfbpmlcbbd23d90y99"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-darwin-arm64.tar.gz"; @@ -519,8 +519,8 @@ sha256 = "030fyfj5yd4p0f7ffwdsqvkjwxihz96vgy2qqibhyyv3p6ymdpym"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.11.0-darwin-arm64.tar.gz"; - sha256 = "1762izxr7vm2invlpff99afs76vln8q87xa0kxdlsn3jp664gbhw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.12.1-darwin-arm64.tar.gz"; + sha256 = "0jp50xcv9ss156i3v173j28ia7ykslmcv8nb4a8bz10jmhkxg52v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-darwin-arm64.tar.gz"; @@ -531,8 +531,8 @@ sha256 = "0903sjihlr5wjf9ddnib3j072549d4342p0pnjprb4kacc1b43ln"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.15.2-darwin-arm64.tar.gz"; - sha256 = "1s2faanxajzd0x8qd1a42nzkzfjrkinwqw7654zgb8l25bgnhykd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-darwin-arm64.tar.gz"; + sha256 = "1gzh37b5jmpz3ih7s7r11vx7wpph7pvn3iidy6gckrs9rw9jp7l4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-darwin-arm64.tar.gz"; @@ -547,12 +547,12 @@ sha256 = "1gmx1lympd3r4i2vsnnmd70qq3x0ijbv53j7vkys59g560rw1bvm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.37.0-darwin-arm64.tar.gz"; - sha256 = "029zq7r58m69gwxr8ihay70qsgm2609daqn0h62ach0p9dzyisdq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-darwin-arm64.tar.gz"; + sha256 = "1rfxrqyfm7dijmcg1h6ipic1wj0r177aqnrfhrql50asy0c0spmf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.17.0-darwin-arm64.tar.gz"; - sha256 = "0kqp1w7w6g9a6q0h0ahmrq2klxxj128x9dcln577f5js0yb14g1w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-darwin-arm64.tar.gz"; + sha256 = "0246m5df3xbh5kjfj2g3lifk443daphq0sccs1rbmvfzhb8lm7yv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.8.0-darwin-arm64.tar.gz"; @@ -567,8 +567,8 @@ sha256 = "1679zpv2r3i2acjmx2a6i7dc47p73gf3jw1k1aclasd5cyjf46jf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.2-darwin-arm64.tar.gz"; - sha256 = "0csvmcbwpqlychwg5h12vjmdxf803aw5m6v10rlbhdhncg38zgcj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.21.4-darwin-arm64.tar.gz"; + sha256 = "0f6qyr1g96skvgvbdkgaqjmp5rb97558s2g1viar9pv729zk8ijr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-arm64.tar.gz"; @@ -595,16 +595,16 @@ sha256 = "1j6c83xvcanyzp1q8zwa952dplvvi0f4psfdscpplbsgzmq5v54n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.13.0-darwin-arm64.tar.gz"; - sha256 = "0pvfnycvnz3ram5lpvaggbhfn7lxbi74rbcndw5xw0ihpk31kjim"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-darwin-arm64.tar.gz"; + sha256 = "07kj6rz7dh08n74zfjprjnzjcrizcmy8rfbnvfi9qkavh0mgcxvv"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-arm64.tar.gz"; sha256 = "149isdz4fs052z1r7jfhx1mq18j8s4wrfgvbabil3wchfkgcqr8f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.9.0-darwin-arm64.tar.gz"; - sha256 = "09vg056rjzrp8zqh4kjjlq4dnkkzxz32kzawmaj8fxi6ds1s9y9i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-darwin-arm64.tar.gz"; + sha256 = "1y1hb4s9214a5nlm0byzm0w4n1c190w57b0q4grl064hnw6490v1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 23b400f24948..24e4ab225092 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -12,7 +12,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.40.1" +VERSION="3.40.2" # An array of plugin names. The respective repository inside Pulumi's # Github organization is called pulumi-$name by convention. From f5b3a4ab7ccd0723b2e94ca3c7decc6f61890bc8 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 3 Oct 2022 22:45:48 +0200 Subject: [PATCH 174/269] python310Packages.sphinx-book-theme: Mark as broken (#187401) * python310Packages.sphinx-book-theme: Mark as broken * Update pkgs/development/python-modules/sphinx-book-theme/default.nix Co-authored-by: Sandro --- pkgs/development/python-modules/sphinx-book-theme/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/sphinx-book-theme/default.nix b/pkgs/development/python-modules/sphinx-book-theme/default.nix index 3fd28acef9cb..10f45cb6a7d5 100644 --- a/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -36,5 +36,8 @@ buildPythonPackage rec { homepage = "https://github.com/executablebooks/sphinx-book-theme"; license = licenses.bsd3; maintainers = with maintainers; [ marsam ]; + # Missing sphinx 5.X support + # https://github.com/executablebooks/sphinx-book-theme/issues/592 + broken = true; }; } From 052662fab431c89e1e8f611aa37983c7bb3cbdac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 17:17:03 +0000 Subject: [PATCH 175/269] librepcb: 0.1.6 -> 0.1.7 --- pkgs/applications/science/electronics/librepcb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index 15b64938b256..bd824ac28889 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "librepcb"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0gzf3asdgdicpikb412134ybqnbbark948yrfhvba2w4i9cwbk2r"; + sha256 = "sha256-zqvvc3CHqdRWVUFt4BkH5Vq50/FKNvMNW2NvGyfWwFM="; fetchSubmodules = true; }; From 1a8036575058f5e788a599cf2ced1f96fe964c3a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 3 Oct 2022 21:52:42 +0000 Subject: [PATCH 176/269] netbsd.libc: fix build This has been broken since we made -fno-common the default. --- pkgs/os-specific/bsd/netbsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 25ac9ce451cc..ae93d42b6765 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -907,7 +907,7 @@ in lib.makeScopeWithSplicing byacc genassym gencat lorder tsort statHook rsync rpcgen ]; buildInputs = with self; [ headers csu ]; - NIX_CFLAGS_COMPILE = "-B${self.csu}/lib"; + NIX_CFLAGS_COMPILE = "-B${self.csu}/lib -fcommon"; meta.platforms = lib.platforms.netbsd; SHLIBINSTALLDIR = "$(out)/lib"; MKPICINSTALL = "yes"; From 388d6c1c2f9d69731ec152eec647e1b602df1742 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Mon, 3 Oct 2022 15:41:34 -0500 Subject: [PATCH 177/269] hashi-up: init at 0.16.0 --- .../networking/cluster/hashi-up/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/cluster/hashi-up/default.nix diff --git a/pkgs/applications/networking/cluster/hashi-up/default.nix b/pkgs/applications/networking/cluster/hashi-up/default.nix new file mode 100644 index 000000000000..1efc1c438a5a --- /dev/null +++ b/pkgs/applications/networking/cluster/hashi-up/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "hashi-up"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "jsiebens"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-PdZ8X2pJ5TfT0bJ4/P/XbMTv+yyL5/1AxIFHnL/qNcg="; + }; + + vendorSha256 = "sha256-dircE3WlDPsPnF+0wT5RG/c4hC8qPs8NaSGM5wpvVlM="; + + meta = with lib; { + description = "A lightweight utility to install HashiCorp Consul, Nomad, or Vault on any remote Linux host"; + homepage = "https://github.com/jsiebens/hashi-up"; + license = licenses.mit; + maintainers = with maintainers; [ lucperkins ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ff38f9793ff..1c3b2a44febc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23166,6 +23166,8 @@ with pkgs; hashi-ui = callPackage ../servers/hashi-ui {}; + hashi-up = callPackage ../applications/networking/cluster/hashi-up { }; + hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc810.graphql-engine; hasura-cli = callPackage ../servers/hasura/cli.nix { }; From 03b51707ff1ac75ceb1435f7d81bbe5e80256920 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Tue, 4 Oct 2022 00:08:30 +0200 Subject: [PATCH 178/269] lego: 4.8.0 -> 4.9.0 --- pkgs/tools/admin/lego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 5d565b218879..609c085edbd3 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OYzk5SQQW3360hc/52bYoW3JJDGk/NRUF8IzIjtWlpc="; + sha256 = "sha256-lMPyquQ+CeMe/V+hG4h61+GiuCXqjVAcTV9Fo3DNb6E="; }; - vendorSha256 = "sha256-FtlVYeW5ac/qOn1WFqbhix8xw/ARol+k3uiyH/dBQbk="; + vendorSha256 = "sha256-gHwyXzmws99tPRJKR/boc0Hf+b5h9ZkzH2aiN8u6Z0I="; doCheck = false; From 5a65614cbdf083be2f339c645e967869e292ffb1 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Mon, 2 May 2022 02:53:13 +0200 Subject: [PATCH 179/269] pythonPackages.versioningit: init at 2.0.1 --- .../python-modules/versioningit/default.nix | 68 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/development/python-modules/versioningit/default.nix diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix new file mode 100644 index 000000000000..74cccb73cb5b --- /dev/null +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, importlib-metadata +, packaging +, setuptools +, tomli +, pytestCheckHook +, build +, pydantic +, pytest-mock +, git +, mercurial +}: + +buildPythonPackage rec { + pname = "versioningit"; + version = "2.0.1"; + disabled = pythonOlder "3.8"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-gJfiYNm99nZYW9gTO/e1//rDeox2KWJVtC2Gy1EqsuM="; + }; + + propagatedBuildInputs = [ + packaging + setuptools + tomli + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-metadata + ]; + + checkInputs = [ + pytestCheckHook + build + pydantic + pytest-mock + git + mercurial + ]; + + disabledTests = [ + # wants to write to the Nix store + "test_editable_mode" + ]; + + preCheck = '' + substituteInPlace tox.ini \ + --replace "--cov=versioningit" "" \ + --replace "--cov-config=tox.ini" "" \ + --replace "--no-cov-on-fail" "" + ''; + + pythonImportsCheck = [ + "versioningit" + ]; + + meta = with lib; { + description = "setuptools plugin for determining package version from VCS"; + homepage = "https://github.com/jwodder/versioningit"; + changelog = "https://versioningit.readthedocs.io/en/latest/changelog.html"; + license = licenses.mit; + maintainers = with maintainers; [ DeeUnderscore ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb4600bcaaec..7f9b56ac5b81 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11526,6 +11526,8 @@ in { versionfinder = callPackage ../development/python-modules/versionfinder { }; + versioningit = callPackage ../development/python-modules/versioningit { }; + versiontag = callPackage ../development/python-modules/versiontag { }; versiontools = callPackage ../development/python-modules/versiontools { }; From 2034a3da5a0107070fc420bcce04c3de39d74892 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Mon, 2 May 2022 03:03:05 +0200 Subject: [PATCH 180/269] streamlink: 3.2.0 -> 5.0.1 Changelogs: - https://github.com/streamlink/streamlink/releases/tag/4.0.0 - https://github.com/streamlink/streamlink/releases/tag/4.0.1 - https://github.com/streamlink/streamlink/releases/tag/4.1.0 - https://github.com/streamlink/streamlink/releases/tag/4.2.0 - https://github.com/streamlink/streamlink/releases/tag/4.3.0 - https://github.com/streamlink/streamlink/releases/tag/5.0.0 - https://github.com/streamlink/streamlink/releases/tag/5.0.1 Streamlink switched to the pyproject format in 4.0.0 --- pkgs/applications/video/streamlink/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 415790b4c11c..9f2487734f02 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -6,11 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "3.2.0"; + version = "5.0.1"; + format = "pyproject"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "sha256-l3DS2DhExTeKc+FBMNy3YKvIVlZsqgpB/FuXoN7V2SY="; + hash = "sha256-PKRioPBhTV6i3ckQgcKuhQFmpBvUQE4o3FLej8qx4mM="; }; checkInputs = with python3Packages; [ @@ -20,6 +21,10 @@ python3Packages.buildPythonApplication rec { freezegun ]; + nativeBuildInputs = with python3Packages; [ + versioningit + ]; + propagatedBuildInputs = (with python3Packages; [ isodate lxml From 1ca2296b0391797d4c5e7260f6e02d3d3f33fe83 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Mon, 3 Oct 2022 23:39:10 +0300 Subject: [PATCH 181/269] electron_21: init at 21.0.1 --- pkgs/development/tools/electron/default.nix | 11 ++++++++++- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 237f350fa488..f941b83bb5b4 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -23,7 +23,7 @@ let in rec { - electron = electron_20; + electron = electron_21; electron_9 = mkElectron "9.4.4" { x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; @@ -140,4 +140,13 @@ rec { aarch64-darwin = "a09f83442f1e9f4b1edc07445a1dca73d9597529b23d62731eaa3fa0488f4ab0"; headers = "11cv0p52864k4knwlwakiq8v6rxdv3iz6kvwhn0w8mpap2h5pzii"; }; + + electron_21 = mkElectron "21.0.1" { + armv7l-linux = "07cb5a4642248c3662b64fdba8ff7a245674e09bdc52a45e9067e8b508bf4866"; + aarch64-linux = "86d7eca977042c5fd9204d5aefe2dad5aae81538de1707f04cac59c912edf780"; + x86_64-linux = "4fd6d7b5a65f44a43165ae77d0484db992b30d6efba478a192e984506fbd52b6"; + x86_64-darwin = "f1ee563ac2b2defbf856e444c0f8fdbd7afae1a81dc0a29ebb190e2f68f48efd"; + aarch64-darwin = "0027d3ffe795e44a959e23f0e9e91452e742ea697fc1141eb93f31b840c3a26f"; + headers = "0ra6gd09ly184m6icj6k4wzp6qrjlbc2hdmy06xp2wcdgzc8dsn8"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44232de98245..f56cc54f2273 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15895,7 +15895,8 @@ with pkgs; electron_17 electron_18 electron_19 - electron_20; + electron_20 + electron_21; autobuild = callPackage ../development/tools/misc/autobuild { }; From 525dd957a14b681b6fe35ef12d3a23e349a03ca8 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 3 Oct 2022 19:19:01 -0400 Subject: [PATCH 182/269] nil: 2022-09-26 -> 2022-10-03 --- pkgs/development/tools/nil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/nil/default.nix b/pkgs/development/tools/nil/default.nix index fca968c909a7..29a4a4c425bd 100644 --- a/pkgs/development/tools/nil/default.nix +++ b/pkgs/development/tools/nil/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nil"; - version = "2022-09-26"; + version = "2022-10-03"; src = fetchFromGitHub { owner = "oxalica"; repo = pname; rev = version; - hash = "sha256-2bcAXcJiFV+xKSIy3oD2/TkijV4302jAtTF3xtHiOhU="; + hash = "sha256-Oo0y/333YyeW9zeYQyiUUay7q7GK/Uu/FdEa6+5c4Pk="; }; - cargoHash = "sha256-RL9n2kfWPpu17qudqSx5DkZbgxqVCf2IRBu/koCAqFA="; + cargoHash = "sha256-z7wjap7IL2OTd2wEUB6EbSbP71dZiqbKDmJ7oUjVi0U="; CFG_DATE = version; CFG_REV = "release"; From 01a2054000cff5e12b3902e12a6a8d39782bce1a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 2 Oct 2022 17:57:58 +0200 Subject: [PATCH 183/269] python3Packages.nototools: 0.2.16 -> 0.2.17 Introduces Unicode 15.0 support. https://github.com/googlefonts/nototools/releases/tag/v0.2.17 --- pkgs/data/fonts/noto-fonts/tools.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index e829e98bee0b..82b56b9effff 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "nototools"; - version = "0.2.16"; + version = "0.2.17"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "nototools"; rev = "v${version}"; - sha256 = "14rrdamkmhrykff8ln07fq9cm8zwj3k113lzwjcy0lgz23g51jyl"; + sha256 = "0jxydivqzggirc31jv7b4mrsjkg646zmra5m4h0pk4amgy65rvyp"; }; postPatch = '' From da60d463c537d2a3220236f9aa328ca57888b9a4 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 2 Oct 2022 17:58:34 +0200 Subject: [PATCH 184/269] noto-fonts-emoji: 2.034 -> 2.038 * Adds glyphs for Unicode 15.0. https://github.com/googlefonts/noto-emoji/releases/tag/v2.038 * NotoEmoji-Regular.ttf is no longer checked in in the repository. --- pkgs/data/fonts/noto-fonts/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 45366a8e5054..019ed1f371c0 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -128,7 +128,7 @@ in }; noto-fonts-emoji = let - version = "2.034"; + version = "2.038"; emojiPythonEnv = buildPackages.python3.withPackages (p: with p; [ fonttools nototools ]); in stdenvNoCC.mkDerivation { @@ -139,7 +139,7 @@ in owner = "googlefonts"; repo = "noto-emoji"; rev = "v${version}"; - sha256 = "1d6zzk0ii43iqfnjbldwp8sasyx99lbjp1nfgqjla7ixld6yp98l"; + sha256 = "1rgmcc6nqq805iqr8kvxxlk5cf50q714xaxk3ld6rjrd69kb8ix9"; }; depsBuildBuild = [ @@ -171,8 +171,10 @@ in enableParallelBuilding = true; installPhase = '' + runHook preInstall mkdir -p $out/share/fonts/noto - cp NotoColorEmoji.ttf fonts/NotoEmoji-Regular.ttf $out/share/fonts/noto + cp NotoColorEmoji.ttf $out/share/fonts/noto + runHook postInstall ''; meta = with lib; { From 0dd481b2ad61effd97d7215046d564953a33e526 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 18:17:05 +0000 Subject: [PATCH 185/269] meilisearch: 0.28.1 -> 0.29.0 --- pkgs/servers/search/meilisearch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 9dca908a0773..ce4023ff2781 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -8,7 +8,7 @@ , nixosTests }: -let version = "0.28.1"; +let version = "0.29.0"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -17,9 +17,9 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "MeiliSearch"; rev = "v${version}"; - sha256 = "sha256-AjSzzOQ1K47tyc8Zn7kAU3B1UE9Tfvd3SvP7W13m6/o="; + sha256 = "sha256-/B44rqw4oilR7w2GnJ5LYFIWh9qv2N5Bwa+ZCgugTpQ="; }; - cargoSha256 = "sha256-zRSAjOKKmL79eXrA6/ZNE3lo8MFdOqYJkcagcA51c6M="; + cargoSha256 = "sha256-70Nn2yvIM05K1TWh4umbh0ZHkrjPFogQ4DfCjQmgOcM="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; buildInputs = lib.optionals stdenv.isDarwin [ Security DiskArbitration Foundation ]; From 75a5a66ac9751c130eddb875cbf23de05fa99f0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 00:55:52 +0000 Subject: [PATCH 186/269] python310Packages.google-cloud-appengine-logging: 1.1.4 -> 1.1.5 --- .../python-modules/google-cloud-appengine-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 85b1a7bdfa45..532596c485df 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.1.4"; + version = "1.1.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-im0A14OQghyYqgtkD767qG+niKQX4jpb0pm2yNBwBCQ="; + hash = "sha256-/zKQX6olZS0yl1yAu7Hguj87GUCiPfuf9oamobFHxjw="; }; propagatedBuildInputs = [ From 989a9813eeedd0133384f84e54090ac11420acc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 00:57:16 +0000 Subject: [PATCH 187/269] python310Packages.google-cloud-automl: 2.8.1 -> 2.8.2 --- .../python-modules/google-cloud-automl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index ffa2e73e9acb..16a903c4962e 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.8.1"; + version = "2.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FlR7jpj/NKJgGLjTvfGr/YusKi+FQ43dyhd6GhTjNE0="; + hash = "sha256-hMVsjdjA/BkEuGDQK1x2zqWZSjIR7KroX4kcyJnIq4Q="; }; propagatedBuildInputs = [ From cbc4dc1a06d16b2da564cca465b06f63384db8ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 00:57:48 +0000 Subject: [PATCH 188/269] python310Packages.google-cloud-bigquery-logging: 1.0.5 -> 1.0.6 --- .../python-modules/google-cloud-bigquery-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index e965debbcf57..2cd1030d0f22 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mKsRLljxWe6CYaWy08Gk5XvkygzoVWmu7wOIOGivmZM="; + sha256 = "sha256-n32dnkSujb8npafG4OQZpKqyfdPsIt9hZVpvtjhI6U0="; }; propagatedBuildInputs = [ From bdabb67e3ef7cb527cde47f907fee20906c4cb98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 01:02:08 +0000 Subject: [PATCH 189/269] python310Packages.google-cloud-container: 2.12.0 -> 2.12.1 --- .../python-modules/google-cloud-container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index cd7d98092790..6fe2b0063e3a 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.12.0"; + version = "2.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8zf8PYSOI0KE1P4wAjcehuEzPKZ7RdQlxdUGWYygzIM="; + hash = "sha256-FwwI5rlVspPjfgFSaed+bqQSHuq6OFgLrQN/JL+bffM="; }; propagatedBuildInputs = [ From 324f9c2003145be5345a0a8560e3215804993586 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 01:03:13 +0000 Subject: [PATCH 190/269] python310Packages.google-cloud-datacatalog: 3.9.1 -> 3.9.2 --- .../python-modules/google-cloud-datacatalog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 3a534fa74ffc..2c0c1fb7de4b 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.9.1"; + version = "3.9.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8TwAwl9/gq47lW+MXi5x2RlqaAs6dnQiuAZkb4oPD84="; + hash = "sha256-pRFMFet7p5qvNOfti5bmehyTGNaXlxpXxZ/kOxdiiZU="; }; propagatedBuildInputs = [ From a1526293a996d648442145b5a4820082239d51fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 01:05:13 +0000 Subject: [PATCH 191/269] python310Packages.google-cloud-iot: 2.6.2 -> 2.6.3 --- pkgs/development/python-modules/google-cloud-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index d5752e3205ac..53be1c859f5b 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.6.2"; + version = "2.6.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BCNpEZdpBRkRa6p8OwDoE6F70ljbSg6doG83hCnQbwM="; + sha256 = "sha256-UB1kxnKobjR1xpezanpgrVg7bU7sA5r2sn7fRbwSrdY="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; From b7247cc0ca52e2501b771c72997e93b2f95577ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 01:06:53 +0000 Subject: [PATCH 192/269] python310Packages.google-cloud-monitoring: 2.11.1 -> 2.11.2 --- .../python-modules/google-cloud-monitoring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 31c0b127c111..692c6723022d 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.11.1"; + version = "2.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PXZGPMer/Y4zmx2Us8EfrLYLnF1tgF63ZDHmBmPPM0w="; + hash = "sha256-KOvXJUsLAj7Afc1dLE3iMLhZU/piUveIwtvjMN+H/Rw="; }; propagatedBuildInputs = [ From 5045ac3390ea91b8fba203345a71cf56ff2bb7a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 01:08:05 +0000 Subject: [PATCH 193/269] python310Packages.google-cloud-os-config: 1.12.2 -> 1.12.3 --- .../python-modules/google-cloud-os-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index bc3737f5bfd1..78bfe78e2d5a 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.12.2"; + version = "1.12.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pr/JPao4GS5XrmeRLk3f1bCaDqlqXodWsn+cTEoR+NM="; + sha256 = "sha256-zSVAVh0WiI5I0P5Jy1wAld4IftWm2hurICYK+Hy5fK0="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From b15043de261fad1ed04ede70832511e6da0bbe3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 01:09:34 +0000 Subject: [PATCH 194/269] python310Packages.google-cloud-redis: 2.9.1 -> 2.9.2 --- .../development/python-modules/google-cloud-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 94641ead4529..b2fe94bda70e 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.9.1"; + version = "2.9.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tVBbsZod71v3hvkuWI4xIJYsx2xT7m7c4B9in/P2ww0="; + hash = "sha256-nltk97HZEpWOQIgL77crnaXR9Qu/mTOIc8v0vty6mtI="; }; propagatedBuildInputs = [ From 5da5e8b220c9c424b5885b788c24c25281bf04b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 01:11:30 +0000 Subject: [PATCH 195/269] python310Packages.google-cloud-secret-manager: 2.12.4 -> 2.12.5 --- .../python-modules/google-cloud-secret-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 6bee80695f0d..90088dff3d37 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.12.4"; + version = "2.12.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-nbM+uZr7a3RXvtLI7n5XZZD9r9ZVoh5iCSoZAnDIuQQ="; + hash = "sha256-zfDMYUE05rju6Wb6ghEyvv4Mc3m1ehqhWyPWJngFWQ4="; }; propagatedBuildInputs = [ From c7d29ada46904d79d4dc340101b57658c9d86e35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 01:16:32 +0000 Subject: [PATCH 196/269] python310Packages.google-cloud-speech: 2.15.1 -> 2.16.0 --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index b45490087ebf..bca537368aa1 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.15.1"; + version = "2.16.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-kTNDOgqSNdl2GytcrkZg8APCEFZ4ofUcEBIlvIXv/M8="; + hash = "sha256-pq8Pkx2XoVAE1RJl2cOra/T4QtKwYHWU/ZzNUjjC3oA="; }; propagatedBuildInputs = [ From 75d050a1d4e4a336d965736960083a2f4843ed79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 01:17:33 +0000 Subject: [PATCH 197/269] python310Packages.google-cloud-tasks: 2.10.2 -> 2.10.3 --- .../development/python-modules/google-cloud-tasks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 1aa58d872842..f784a412d788 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.10.2"; + version = "2.10.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9vAUmK1GG06fNK+d3WMRht2/7Ftaz56ec9xwP5eXxDU="; + hash = "sha256-iICX2Na3FQgOMzx5R66sKgTPrVeZEk5ofPBPKQWRRv0="; }; propagatedBuildInputs = [ From 4e4e9ec35412b455cc57bb42787a1923a4688626 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 01:17:59 +0000 Subject: [PATCH 198/269] python310Packages.google-cloud-texttospeech: 2.12.1 -> 2.12.2 --- .../python-modules/google-cloud-texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 7a3e2a85b1b5..37f86ce4d5c5 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.12.1"; + version = "2.12.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JWwYnz12E56GrUSDoatB8pbS+S9C3ZSPsxDW25GfDhA="; + sha256 = "sha256-z/rOMqQ+UkJl8zw55JP54+s+Qk+gHxmuBDjZaz3Qacs="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; From c4d202be1c12304386da8abad1a4c8293394e323 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 01:21:27 +0000 Subject: [PATCH 199/269] python310Packages.google-cloud-trace: 1.7.1 -> 1.7.2 --- .../development/python-modules/google-cloud-trace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index b828ea516a46..40c3d4b1a97c 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.7.1"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zd/N/eVhacopDiYiVbcVNaBOvpMfO426ktuQYhForkQ="; + sha256 = "sha256-m0dwEm0uQSh4wS+j01BIbRtznyOanv+Joo7LbLplXUQ="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; From 62597fef3169d7637f401e220bbfcc6761190cf6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 01:21:40 +0000 Subject: [PATCH 200/269] python310Packages.google-cloud-translate: 3.8.2 -> 3.8.3 --- .../python-modules/google-cloud-translate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index dfe50519c428..aefb77a82829 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.8.2"; + version = "3.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wxKWoRQ8DW94De9Z0sOYjm+oTXuEcW5Vw3Iu4YITBQ0="; + hash = "sha256-vaz2UAm3kRliZdog/OxEDYvtYnB8tK7JH+4P7ZgTSpc="; }; propagatedBuildInputs = [ From df4acb2c9ae5c31a7775ab2b7dfe3ef9b084ef17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 01:31:22 +0000 Subject: [PATCH 201/269] python310Packages.google-cloud-videointelligence: 2.8.1 -> 2.8.2 --- .../python-modules/google-cloud-videointelligence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 0af930a08f2d..af018a2416db 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.8.1"; + version = "2.8.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-I86T4Zw7y4pn5ixy+RM6LBMTEGuv7LR2uE2mwoEeCh0="; + sha256 = "sha256-NqElDocBlpARYFTK4k47kCsC/7D1048rNYrrARHeWmg="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; From a63e6225662abb27fdac613c622dcdc4b572d816 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 01:34:49 +0000 Subject: [PATCH 202/269] python310Packages.google-cloud-websecurityscanner: 1.9.0 -> 1.9.1 --- .../google-cloud-websecurityscanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 260c67bed733..0e2cc1cac338 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.9.0"; + version = "1.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-T+a154A4EakPGk7OL65mweveLBEL1ol3ZYYh2MTyxy8="; + hash = "sha256-TBZI32KX1c5XPAV1AmjQvQVhE5UgGOGd5U/enLRV3IU="; }; propagatedBuildInputs = [ From 6ef43258cdd11f494425d6950d8f7adcf0ebd283 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 02:22:30 +0000 Subject: [PATCH 203/269] python310Packages.hahomematic: 2022.9.1 -> 2022.10.0 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 8a9e0c1e20cd..a68cbc570f59 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.9.1"; + version = "2022.10.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-OWEF1CJ4ZW64P4w3M+uur/NKCmjhS1c19izA041cC8A="; + sha256 = "sha256-1O6MMuRpFDWr85Uf9deW8tjolBXT5852ALsZoDleIpw="; }; nativeBuildInputs = [ From be3f2e855475b36d3a118f9164b69ddb05a8ecea Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 4 Oct 2022 04:20:00 +0000 Subject: [PATCH 204/269] yt-dlp: 2022.9.1 -> 2022.10.4 https://github.com/yt-dlp/yt-dlp/releases/tag/2022.10.04 --- pkgs/tools/misc/yt-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 8c6c0906b5df..28902ecd2700 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2022.9.1"; + version = "2022.10.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vHTuJVeQBD5FgZeq8lxsEE/vyfzaRFj2UmGUR6tK4Nc="; + sha256 = "sha256-F3Ki5vMrlxtNAm3q4wRPV2uAUgNSVco0DzRc/pDTjTg="; }; propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ]; From 490a05c4a82236a86e1e1a4822f714c972e8c4f0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 3 Oct 2022 11:24:14 +0800 Subject: [PATCH 205/269] maestral: add missing dbus dependency --- pkgs/development/python-modules/maestral/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index aeae43aeee4d..370655029e42 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -5,6 +5,7 @@ , pythonOlder , python , click +, dbus-python , desktop-notifier , dropbox , fasteners @@ -40,6 +41,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click desktop-notifier + dbus-python dropbox fasteners keyring From 0a986acdb60e4b371c6b0bda0e91aa62f8b45a95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 08:49:28 +0200 Subject: [PATCH 206/269] python310Packages.google-cloud-videointelligence: disable on older Python releases --- .../google-cloud-videointelligence/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index af018a2416db..4738926e9d5c 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -7,20 +7,32 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-videointelligence"; version = "2.8.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NqElDocBlpARYFTK4k47kCsC/7D1048rNYrrARHeWmg="; + hash = "sha256-NqElDocBlpARYFTK4k47kCsC/7D1048rNYrrARHeWmg="; }; - propagatedBuildInputs = [ google-api-core proto-plus ]; + propagatedBuildInputs = [ + google-api-core + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # require credentials From e0eab822a7f36d1654dcf46cf759aa6782e43520 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 08:51:10 +0200 Subject: [PATCH 207/269] python310Packages.google-cloud-texttospeech: disable on older Python releases --- .../google-cloud-texttospeech/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 37f86ce4d5c5..2a6518a1a940 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -7,20 +7,32 @@ , mock , proto-plus , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-texttospeech"; version = "2.12.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-z/rOMqQ+UkJl8zw55JP54+s+Qk+gHxmuBDjZaz3Qacs="; + hash = "sha256-z/rOMqQ+UkJl8zw55JP54+s+Qk+gHxmuBDjZaz3Qacs="; }; - propagatedBuildInputs = [ libcst google-api-core proto-plus ]; + propagatedBuildInputs = [ + libcst + google-api-core + proto-plus + ]; - checkInputs = [ mock pytest-asyncio pytestCheckHook ]; + checkInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; disabledTests = [ # Disable tests that require credentials From b887f96a41d6fd03895deab203ef1c54628ae33d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 08:53:41 +0200 Subject: [PATCH 208/269] python310Packages.google-cloud-trace: disable on older Python releases --- .../google-cloud-trace/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 40c3d4b1a97c..6576f2d2e29a 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -8,20 +8,33 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-trace"; version = "1.7.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-m0dwEm0uQSh4wS+j01BIbRtznyOanv+Joo7LbLplXUQ="; + hash = "sha256-m0dwEm0uQSh4wS+j01BIbRtznyOanv+Joo7LbLplXUQ="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-core + proto-plus + ]; - checkInputs = [ google-cloud-testutils mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + google-cloud-testutils + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # require credentials From 545de296e01d54b995b08361c7a72a517b68acbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 08:57:26 +0200 Subject: [PATCH 209/269] python310Packages.google-cloud-speech: update disabled --- pkgs/development/python-modules/google-cloud-speech/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index bca537368aa1..2d81d8bf69dd 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { version = "2.16.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From b2f3292ea61cd3093a308af2dced48a56939619a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 09:00:13 +0200 Subject: [PATCH 210/269] python310Packages.google-cloud-os-config: disable on older Python releases --- .../google-cloud-os-config/default.nix | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 78bfe78e2d5a..497f5e46c309 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -1,19 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi, google-api-core, libcst, mock, proto-plus, pytestCheckHook, pytest-asyncio }: +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, libcst +, mock +, proto-plus +, pytestCheckHook +, pytest-asyncio +, pythonOlder +}: buildPythonPackage rec { pname = "google-cloud-os-config"; version = "1.12.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zSVAVh0WiI5I0P5Jy1wAld4IftWm2hurICYK+Hy5fK0="; + hash = "sha256-zSVAVh0WiI5I0P5Jy1wAld4IftWm2hurICYK+Hy5fK0="; }; - propagatedBuildInputs = [ google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; - pythonImportsCheck = [ "google.cloud.osconfig" ]; + pythonImportsCheck = [ + "google.cloud.osconfig" + ]; disabledTests = [ "test_patch_deployment" From c7f2e5359babdf02478403a737e479c6f459f99a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 09:00:43 +0200 Subject: [PATCH 211/269] python310Packages.google-cloud-secret-manager: update disabled --- .../python-modules/google-cloud-secret-manager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 90088dff3d37..2da04ba2a2ca 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { version = "2.12.5"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From 0162bd26aefa2176a1712ad6463c5ea41f183d01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 09:01:11 +0200 Subject: [PATCH 212/269] python310Packages.google-cloud-redis: update disabled --- pkgs/development/python-modules/google-cloud-redis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index b2fe94bda70e..237fd97ba75b 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "2.9.2"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From def8bc92a92df8f461c3758a9cf7ff5a52c7d144 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 09:02:45 +0200 Subject: [PATCH 213/269] python310Packages.google-cloud-iot: disable on older Python releases --- .../google-cloud-iot/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index 53be1c859f5b..c1ece06f828c 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -7,21 +7,34 @@ , proto-plus , pytestCheckHook , pytest-asyncio +, pythonOlder , mock }: buildPythonPackage rec { pname = "google-cloud-iot"; version = "2.6.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UB1kxnKobjR1xpezanpgrVg7bU7sA5r2sn7fRbwSrdY="; + hash = "sha256-UB1kxnKobjR1xpezanpgrVg7bU7sA5r2sn7fRbwSrdY="; }; - propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; + propagatedBuildInputs = [ + grpc-google-iam-v1 + google-api-core + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; disabledTests = [ # requires credentials From 6f8a7852e2f70f44e444c272044536800a1f5eda Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 09:04:31 +0200 Subject: [PATCH 214/269] python310Packages.google-cloud-datacatalog: update disabled --- .../python-modules/google-cloud-datacatalog/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 2c0c1fb7de4b..36494c491810 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { version = "3.9.2"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From 4a8c795c4a8d0d98b3b5e0c2853c3f7c44bd0dd9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 09:05:53 +0200 Subject: [PATCH 215/269] python310Packages.google-cloud-bigquery-logging: disable on older Python releases --- .../google-cloud-bigquery-logging/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 2cd1030d0f22..fecccef18cf2 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -7,15 +7,19 @@ , proto-plus , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; version = "1.0.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-n32dnkSujb8npafG4OQZpKqyfdPsIt9hZVpvtjhI6U0="; + hash = "sha256-n32dnkSujb8npafG4OQZpKqyfdPsIt9hZVpvtjhI6U0="; }; propagatedBuildInputs = [ From 5e4543e9f0ebffdfde9b6a512e9d99924beaa3ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 09:06:35 +0200 Subject: [PATCH 216/269] python310Packages.google-cloud-appengine-logging: update disabled --- .../python-modules/google-cloud-appengine-logging/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 532596c485df..bab843f81ccf 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "1.1.5"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; From 288222fff98d048c47b7ba96aa79618aa3fff296 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 09:20:44 +0200 Subject: [PATCH 217/269] python310Packages.django-reversion: disable on older Python releases --- .../django-reversion/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/django-reversion/default.nix b/pkgs/development/python-modules/django-reversion/default.nix index 3c262a2c6f11..5a29f75911bf 100644 --- a/pkgs/development/python-modules/django-reversion/default.nix +++ b/pkgs/development/python-modules/django-reversion/default.nix @@ -2,23 +2,31 @@ , buildPythonPackage , fetchPypi , django +, pythonOlder }: buildPythonPackage rec { pname = "django-reversion"; version = "5.0.3"; + format = "setuptools"; - src = fetchPypi { + disabled = pythonOlder "3.7"; + +src = fetchPypi { inherit pname version; - sha256 = "sha256-rLYA+EghRzEqJ71Y5jdmqgODMQGB5IXm6qL0LSZQLJs="; + hash = "sha256-rLYA+EghRzEqJ71Y5jdmqgODMQGB5IXm6qL0LSZQLJs="; }; - # tests assume the availability of a mysql/postgresql database + propagatedBuildInputs = [ + django + ]; + + # Tests assume the availability of a mysql/postgresql database doCheck = false; - propagatedBuildInputs = [ django ]; - - pythonImportsCheck = [ "reversion" ]; + pythonImportsCheck = [ + "reversion" + ]; meta = with lib; { description = "An extension to the Django web framework that provides comprehensive version control facilities"; From d8c964c2f7a12bacb4c90b219773304b46b8a615 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 07:47:47 +0000 Subject: [PATCH 218/269] carapace: 0.16.0 -> 0.17.0 --- pkgs/shells/carapace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index f1f6a5028172..842bfe9ca973 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - sha256 = "sha256-gIEJvnLX223g6bhfFYrXMTmGGBibc0uewfGqEppOYek="; + sha256 = "sha256-nRxNa0Knq2rmm57+7m/LnHFt4eic6bop+yhjHoX0Jc4="; }; - vendorSha256 = "sha256-o3BuNQMBZ/rEkXh+9C0DEKbo0Nto7rihM9yuvQFrGws="; + vendorSha256 = "sha256-iYZk2G9axC2jVjLwz6PkQKDQCQVmXqRvYmhTOz0OS2U="; subPackages = [ "./cmd/carapace" ]; From c46bdcbaf299064ca935438b6704a2f99394966c Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 1 Oct 2022 04:31:19 -0700 Subject: [PATCH 219/269] nixos/lib/qemu-common.nix: set qemuSerialDevice for isMips64 --- nixos/lib/qemu-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix index 3f4d674e9a93..a8ed27dd6091 100644 --- a/nixos/lib/qemu-common.nix +++ b/nixos/lib/qemu-common.nix @@ -19,7 +19,7 @@ rec { ]; qemuSerialDevice = - if pkgs.stdenv.hostPlatform.isx86 || pkgs.stdenv.hostPlatform.isRiscV then "ttyS0" + if with pkgs.stdenv.hostPlatform; isx86 || isMips64 || isRiscV then "ttyS0" else if (with pkgs.stdenv.hostPlatform; isAarch || isPower) then "ttyAMA0" else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'"; From 3c8f16a2e221a82012e079fd70318b42cb38217a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 21:51:19 +0000 Subject: [PATCH 220/269] rust-analyzer-unwrapped: 2022-09-26 -> 2022-10-03 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 2cbf183ef419..71d397b6a5bb 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-09-26"; - cargoSha256 = "sha256-Wq5fI/ohoTHEjx0wa8De2uh8cG5+92H+vAfDa25JilY="; + version = "2022-10-03"; + cargoSha256 = "sha256-G6eCAlcsyRIuq0uOwosLO4ZrSAQvwDi36bkARjDQXSA="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-aCHudrXd8DKocehX6aWzlbZv4bq2l7MFXhM/wc2NdmI="; + sha256 = "sha256-mVf9fjQbtYbrVvQSaJOCwArWIvXHrXqVVUhP0x9ZcVY="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; From 2107211a4eab90116b36a5baae28128b6797c24d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 07:09:17 +0000 Subject: [PATCH 221/269] benthos: 4.8.0 -> 4.9.0 --- pkgs/development/tools/benthos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/benthos/default.nix b/pkgs/development/tools/benthos/default.nix index 0723995ce743..c3f7e75d4d6a 100644 --- a/pkgs/development/tools/benthos/default.nix +++ b/pkgs/development/tools/benthos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "benthos"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "benthosdev"; repo = "benthos"; rev = "v${version}"; - sha256 = "sha256-jddPUNl+W8BYpBlz3h/bsz7xFvE8tSlaagBmUbOGfFI="; + sha256 = "sha256-gFtlu+Jg5XC9OlUArTCHPFN4iTF7kdyrcRcymRwSHsw="; }; - vendorSha256 = "sha256-xnrw/rXOGlZduCG/Sy4GxGJaojtve+oe2zVf3sV3lJ4="; + vendorSha256 = "sha256-sRhiTati1EsU+gBv29OkBAxqot+Bjp1BemYR1qbqN1w="; doCheck = false; From b7a6fde153d9470afdb6aa1da51c4117f03b84ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 07:29:13 +0000 Subject: [PATCH 222/269] ferium: 4.1.10 -> 4.1.11 --- pkgs/games/ferium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index 2d21d5dc523a..7b47c0aadf52 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "ferium"; - version = "4.1.10"; + version = "4.1.11"; src = fetchFromGitHub { owner = "gorilla-devs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dHubI5IaPAjn+vcHvT1t4HqBraO0QztZnp3sdzpYBJo="; + sha256 = "sha256-CqErnyBoGC+jTN1wNzKsjuAmfuwZ0NzZKyqdP2hPKUM="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-r3QLCh/TXOoXh72AjyV1Ng6nYNCEV9/JggBmd2Gu7j8="; + cargoSha256 = "sha256-2IEIIO4Gi9nyf0FoTiqGuA/ebE15sIFjeFqlETARaJY="; # Disable the GUI file picker so that GTK/XDG dependencies aren't used buildNoDefaultFeatures = true; From e2f8348fabaa1f5fba7e28371e9fc40e8d39e706 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 4 Oct 2022 01:23:36 -0700 Subject: [PATCH 223/269] buildah: 1.27.2 -> 1.28.0 (#194360) --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 79e238351b4d..b146ea7376a9 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.27.2"; + version = "1.28.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-jEAfiPNb7qpbKiKDx6slnBeR0fISalebAedBfY7OS6E="; + sha256 = "sha256-Q8IqyI6okTaXKDoYvaTcIv+wy4aiHXOjFkKBxTn4wwk="; }; outputs = [ "out" "man" ]; From 31852b460051a58339b7a154ad51189f9291d465 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Sep 2022 18:47:16 +0000 Subject: [PATCH 224/269] kotlin: 1.7.10 -> 1.7.20 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 450659498f50..bd3cd5a75734 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.7.10"; + version = "1.7.20"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - hash = "sha256-doP1RR7zCOt3Omhu53eadqle2LFDxprCR5N2GdfKOgk="; + hash = "sha256-XjyND5ZUEP8S6Q1vjcXfL8Cf1ZWmhNUUYWhRzn6Urn0="; }; propagatedBuildInputs = [ jre ] ; From 28827908017f7d628e0ff4e89de91595670c5f02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Sep 2022 21:55:25 +0000 Subject: [PATCH 225/269] libplctag: 2.5.1 -> 2.5.2 --- pkgs/development/libraries/libplctag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index d391797659ea..a569e881b988 100644 --- a/pkgs/development/libraries/libplctag/default.nix +++ b/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-ZD7mf6O1iBGmZ2bRWfnM0WPuP1itIi9TxZ5rK4uvBTw="; + sha256 = "sha256-HBhVPHkr21iT78lE0FRydZAY7kkH1s/EWP7lsWFC0xA="; }; nativeBuildInputs = [ cmake ]; From a2a6cb1a6940d95e119fa69ac1b9f6a2aa6aaa80 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Tue, 4 Oct 2022 10:33:32 +0200 Subject: [PATCH 226/269] python3Packages.langcodes: add missing setuptools --- pkgs/development/python-modules/langcodes/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index e3454acd5cd9..72a80298c5cd 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -6,6 +6,7 @@ , poetry-core , pytestCheckHook , language-data +, setuptools }: buildPythonPackage rec { @@ -27,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ language-data marisa-trie + setuptools # pkg_resources import in language_data/util.py ]; checkInputs = [ From 34d1d336adec65ecd6547924c5149709eec798de Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 3 Oct 2022 17:28:11 +0200 Subject: [PATCH 227/269] onnnxruntime, python3Packages.onnxruntime: improve packaging The Python bindings to onnxruntime were added by me in #193188. Adding Python support this way is not a good way. Here a wheel was created (which is fine) and installed in a python output. The propagated-build-inputs file is put in the dev output. That's fine, except that stdenv.mkDerivation does not automatically add dev when python is included, because other outputs are only added when no output is explicitly selected. This means that when you want to use these bindings in another Python package, pip will complain it cannot find the dependencies of the bindings. In this PR, the onnxruntime derivation outputs a wheel in the dist output. Then, in python-packages.nix we have a separate onnxruntime package which installs the bindings. The Python bindings have quite some dependencies which, depending on your use case, are not required. Thus the dependency relax hook is used to remove some of these dependencies. Note there is also an issue with protobuf versions. The onnxruntime bindings require an older protobuf and Python protobuf which we cannot offer. Thus protobuf is also removed as Python dependency. --- .../libraries/onnxruntime/default.nix | 34 ++++++---- .../python-modules/onnxruntime/default.nix | 64 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 10 +-- 3 files changed, 93 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/onnxruntime/default.nix diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index e297f835f326..48da747c3020 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -15,11 +15,18 @@ , boost , oneDNN , gtest -, pythonSupport ? true +, pythonSupport ? false , nsync , flatbuffers }: +# Python Support +# +# When enabling Python support a wheel is made and stored in a `dist` output. +# This wheel is then installed in a separate derivation. + +assert pythonSupport -> lib.versionOlder protobuf.version "3.20"; + let # prefetch abseil # Note: keep URL in sync with `cmake/external/abseil-cpp.cmake` @@ -58,26 +65,26 @@ stdenv.mkDerivation rec { setuptools wheel pip + pythonOutputDistHook ]); buildInputs = [ libpng zlib - protobuf howard-hinnant-date nlohmann_json boost oneDNN - ] ++ lib.optionals pythonSupport ([ - flatbuffers + protobuf + ] ++ lib.optionals pythonSupport [ nsync - ] ++ (with python3Packages; [ - numpy - pybind11 - ])); + python3Packages.numpy + python3Packages.pybind11 + ]; # TODO: build server, and move .so's to lib output - outputs = [ "out" "dev" ] ++ lib.optionals pythonSupport [ "python" ]; + # Python's wheel is stored in a separate dist output + outputs = [ "out" "dev" ] ++ lib.optionals pythonSupport [ "dist" ]; enableParallelBuilding = true; @@ -116,10 +123,15 @@ stdenv.mkDerivation rec { ../include/onnxruntime/core/framework/provider_options.h \ ../include/onnxruntime/core/providers/cpu/cpu_provider_factory.h \ ../include/onnxruntime/core/session/onnxruntime_*.h - '' + lib.optionalString pythonSupport '' - pip install dist/*.whl --no-index --no-warn-script-location --prefix="$python" --no-cache --no-deps ''; + passthru = { + inherit protobuf; + tests = lib.optionalAttrs pythonSupport { + python = python3Packages.onnxruntime; + }; + }; + meta = with lib; { description = "Cross-platform, high performance scoring engine for ML models"; longDescription = '' diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix new file mode 100644 index 000000000000..af369b0d82d1 --- /dev/null +++ b/pkgs/development/python-modules/onnxruntime/default.nix @@ -0,0 +1,64 @@ +{ lib +, buildPythonPackage +, autoPatchelfHook +, pythonRelaxDepsHook +, onnxruntime +, coloredlogs +, numpy +, packaging +, oneDNN + +}: + +# onnxruntime requires an older protobuf. +# Doing an override in protobuf in the python-packages set +# can give you a functioning Python package but note not +# all Python packages will be compatible then. +# +# Because protobuf is not always needed we remove it +# as a runtime dependency from our wheel. +# +# We do include here the non-Python protobuf so the shared libs +# link correctly. If you do also want to include the Python +# protobuf, you can add it to your Python env, but be aware +# the version likely mismatches with what is used here. + +buildPythonPackage { + inherit (onnxruntime) pname version; + format = "wheel"; + src = onnxruntime.dist; + + unpackPhase = '' + cp -r $src dist + chmod +w dist + ''; + + nativeBuildInputs = [ + autoPatchelfHook + pythonRelaxDepsHook + ]; + + # This project requires fairly large dependencies such as sympy which we really don't always need. + pythonRemoveDeps = [ + "flatbuffers" + "protobuf" + "sympy" + ]; + + # Libraries are not linked correctly. + buildInputs = [ + oneDNN + onnxruntime.protobuf + ]; + + propagatedBuildInputs = [ + coloredlogs + # flatbuffers + numpy + packaging + # protobuf + # sympy + ]; + + meta = onnxruntime.meta // { maintainers = with lib.maintainers; [ fridh ]; }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 047e0ae394dc..6d41513df179 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6436,10 +6436,12 @@ in { onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { }; - onnxruntime = (toPythonModule (pkgs.onnxruntime.override { - python3Packages = self; - pythonSupport = true; - })).python; + onnxruntime = callPackage ../development/python-modules/onnxruntime { + onnxruntime = pkgs.onnxruntime.override { + python3Packages = self; + pythonSupport = true; + }; + }; onvif-zeep-async = callPackage ../development/python-modules/onvif-zeep-async { }; From f9af66562a3e2316eef4d021f231a9e9e77e2be2 Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 3 Oct 2022 01:49:32 +0800 Subject: [PATCH 228/269] neovim-remote: fix build with neovim 0.8 --- .../editors/neovim/neovim-remote.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index b18811dd0980..6cfcec8f1f7b 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , python3 , neovim +, fetchpatch }: with python3.pkgs; buildPythonApplication rec { @@ -15,6 +16,14 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "0lbz4w8hgxsw4k1pxafrl3rhydrvi5jc6vnsmkvnhh6l6rxlmvmq"; }; + patches = [ + # Fix a compatibility issue with neovim 0.8.0 + (fetchpatch { + url = "https://github.com/mhinz/neovim-remote/commit/56d2a4097f4b639a16902390d9bdd8d1350f948c.patch"; + hash = "sha256-/PjE+9yfHtOUEp3xBaobzRM8Eo2wqOhnF1Es7SIdxvM="; + }) + ]; + propagatedBuildInputs = [ pynvim psutil @@ -26,15 +35,12 @@ with python3.pkgs; buildPythonApplication rec { pytestCheckHook ]; - disabledTests = [ - # these tests get stuck and never return - "test_escape_filenames_properly" - "test_escape_single_quotes_in_filenames" - "test_escape_double_quotes_in_filenames" - ]; - doCheck = !stdenv.isDarwin; + preCheck = '' + export HOME="$(mktemp -d)" + ''; + meta = with lib; { description = "A tool that helps controlling nvim processes from a terminal"; homepage = "https://github.com/mhinz/neovim-remote/"; From 0406a78202ef273a956b5277b83ce7ae649c7389 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 09:32:53 +0000 Subject: [PATCH 229/269] python310Packages.pyatmo: 7.0.1 -> 7.1.0 --- pkgs/development/python-modules/pyatmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 25d61641f207..378a5c668bf4 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "7.0.1"; + version = "7.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jabesq"; repo = "pyatmo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-WrpRLAfViudC0n7AG5es2CM8XbZ0yJqXCY9yod9czb0="; + sha256 = "sha256-0K4PEDLn9ayEP965RfQFdEXGUPBDFQyd7rTUzt5YQ/A="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 3d92e81834bc497b218e1e46f81601a98f9aa39a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 4 Oct 2022 11:50:20 +0200 Subject: [PATCH 230/269] icinga2: Add pname to .vim Makes it compatible with the vim module of home-manager which expects pname to be set. --- pkgs/servers/monitoring/icinga2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 55b57e90cbe1..32d9ac270a1b 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ''} ''; - vim = runCommand "vim-icinga2-${version}" {} '' + vim = runCommand "vim-icinga2-${version}" { pname = "vim-icinga2"; } '' mkdir -p $out/share/vim-plugins cp -r "${src}/tools/syntax/vim" $out/share/vim-plugins/icinga2 ''; From 4094a6176ecc32d0dc551776d210d3dc03a68846 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 10:19:59 +0000 Subject: [PATCH 231/269] python310Packages.pyhiveapi: 0.5.13 -> 0.5.14 --- pkgs/development/python-modules/pyhiveapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhiveapi/default.nix b/pkgs/development/python-modules/pyhiveapi/default.nix index bd85e0dfa73c..b2035077fa0d 100644 --- a/pkgs/development/python-modules/pyhiveapi/default.nix +++ b/pkgs/development/python-modules/pyhiveapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyhiveapi"; - version = "0.5.13"; + version = "0.5.14"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Pyhass"; repo = "Pyhiveapi"; rev = "refs/tags/v${version}"; - hash = "sha256-VuWP+yypQznirNcjvqbI3x+bWRiVIfO1NxG76Mdc37g="; + hash = "sha256-YBcVoffcM3nkVmuPKE6WR/1TqAiz6ePzCxcrntqCQkY="; }; postPatch = '' From bb3010ea13c93b591a7ad16c2650ffea33dff2a3 Mon Sep 17 00:00:00 2001 From: Philipp Arras Date: Tue, 4 Oct 2022 12:40:31 +0200 Subject: [PATCH 232/269] python3Packages.ducc0: 0.25.0 -> 0.26.0 --- pkgs/development/python-modules/ducc0/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix index af7d501ee20d..81ce58ed73b8 100644 --- a/pkgs/development/python-modules/ducc0/default.nix +++ b/pkgs/development/python-modules/ducc0/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "ducc0"; - version = "0.25.0"; + version = "0.26.0"; disabled = pythonOlder "3.7"; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "mtr"; repo = "ducc"; rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "h+x6dakjyTyqOT9nzzZiCmjw5duZBGu+zpnQJnTnN1M="; + sha256 = "p5TW8utFDlN80zD6hvWPcmM2DfKqvEuOzRUtTvLwNT0="; }; buildInputs = [ pybind11 ]; From 75436580086dfdef0305830c6d3a2cf484b3524a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 10:40:56 +0000 Subject: [PATCH 233/269] gum: 0.6.0 -> 0.7.0 --- pkgs/applications/misc/gum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gum/default.nix b/pkgs/applications/misc/gum/default.nix index 8d77d75dafeb..416de12bcb18 100644 --- a/pkgs/applications/misc/gum/default.nix +++ b/pkgs/applications/misc/gum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gum"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pEULArQDwKZzpD0GVH21L1v9xVZiBz91kL/jPJjJav4="; + sha256 = "sha256-T8dIk99qUMyeZvfM+rLA13HAmITQ8SMsQ9uIXtMM+MM="; }; - vendorSha256 = "sha256-vvNoO5eABGVwvAzK33uPelmo3BKxfqiYgEXZI7kgeSo="; + vendorSha256 = "sha256-sht9e4pam4aJCylUZPeVGwk9TYttumJSniNVxI0LfNM="; nativeBuildInputs = [ installShellFiles From 3241ef22f987ed3dfee7456d0432842ba710736a Mon Sep 17 00:00:00 2001 From: x10an14 Date: Sat, 1 Oct 2022 17:31:00 +0200 Subject: [PATCH 234/269] vscode-extensions.streetsidesoftware.code-spell-checker: 2.3.1 -> 2.10.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a7936404015f..1eb42b3f18bf 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2374,8 +2374,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.3.1"; - sha256 = "0pm9i3zw4aa4qrcqnzb9bz166rl7p6nwb81m9rqzisdc85mx4s3x"; + version = "2.10.1"; + sha256 = "sha256-FeYkSML6QYtuIHIbAovOqlPwkKfNkHr7IdMCWwkynQ0="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; From e9b0609af7cd8d7b3365384584efd24408e76180 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 12:54:36 +0200 Subject: [PATCH 235/269] python310Packages.rns: 0.3.12 -> 0.3.13 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index c2c727f7f8db..e7866448ebe5 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.3.12"; + version = "0.3.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-2GTMpIYDbvwAuRVOEW1Tp8idelHAV5SkAyGBj2yh1OQ="; + hash = "sha256-obF2pMGrZ6OGZqZ20Bm6iNFNlU8DTLGLXwkqKW4jNHM="; }; propagatedBuildInputs = [ From 052cb0862e1c4facc20d347ced4c3ffdd2fde645 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 12:54:40 +0200 Subject: [PATCH 236/269] python310Packages.lxmf: 0.1.8 -> 0.1.9 --- pkgs/development/python-modules/lxmf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 51c692455557..22574d6869e5 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.1.8"; + version = "0.1.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-NwjijbRSg9RYl1NS5dXAG4HohkZx5oeEyMyvEFYQhYk="; + hash = "sha256-6MwykOVS0SVjagqlRWrYRamwid3Mfg71uzOSzHzPjWM="; }; propagatedBuildInputs = [ From ee42f9b29c2a1f35026ff430d94c9afe5d6af6ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 12:55:02 +0200 Subject: [PATCH 237/269] python310Packages.nomadnet: 0.2.2 -> 0.2.3 --- pkgs/development/python-modules/nomadnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 431caf19a570..0ae8cc995c1b 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.2.2"; + version = "0.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = version; - hash = "sha256-NCnf50li0RZa8RCDutS1s7DfLfOK3RjEeJ4QvQzqsHs="; + hash = "sha256-yArRhJ8NOv/RbjHthnwbz9ieIirq9t5cX9gYcDgEwCw="; }; propagatedBuildInputs = [ From 85827a5de806435c1a6042ac000f98362df1ea30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 11:05:38 +0000 Subject: [PATCH 238/269] jql: 5.0.2 -> 5.1.0 --- pkgs/development/tools/jql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index b91777a8e56c..fca3f825d54d 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "5.0.2"; + version = "5.1.0"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bCq8EUczhBx/txafdJvTKqbJoZaGZlrdl87TQt8iMDM="; + sha256 = "sha256-8qL6ryCbCdHA9Zl/yScQ8tJh+i0Vr4JeH+fQYGb+wPE="; }; - cargoSha256 = "sha256-V+fzGg0MOCG8ikuiFtN3k6825QXRfBRpUKfdTjQVChM="; + cargoSha256 = "sha256-E7uuvE2xVyAiDfMEFbvVHt4agPEEt7JwF+SRFe+fqYk="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; From 6520ff3aadd400c6547b5ab8996cf50b0226aa9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 13:06:30 +0200 Subject: [PATCH 239/269] python310Packages.identify: 2.5.5 -> 2.5.6 --- pkgs/development/python-modules/identify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 800172340dc0..0fdf63653211 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.5"; + version = "2.5.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Lv2rydAW1qvCa7cFmkmlOEpO2af+kMhsvG4yxTUy3FA="; + sha256 = "sha256-DAVCQQmL6ABMjygKm48knZL+smovES5CWv149GoDp34="; }; checkInputs = [ From 6ffc735377f7248d25ab6164e992edecf3c1a74c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 11:07:22 +0000 Subject: [PATCH 240/269] k3sup: 0.12.3 -> 0.12.7 --- pkgs/applications/networking/cluster/k3sup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3sup/default.nix b/pkgs/applications/networking/cluster/k3sup/default.nix index 3bedb0195248..f9586ffa4661 100644 --- a/pkgs/applications/networking/cluster/k3sup/default.nix +++ b/pkgs/applications/networking/cluster/k3sup/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "k3sup"; - version = "0.12.3"; + version = "0.12.7"; src = fetchFromGitHub { owner = "alexellis"; repo = "k3sup"; rev = version; - sha256 = "sha256-2S/VnxVb056aPxFd5LxtUdaNlosHLlu7Tl/RQbY/zpA="; + sha256 = "sha256-EOGYOxRhpPHOSo9ccCSvat9kq2SlujPqno8v7/zmuto="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From d0637e1a25b7aa04a123d98cff471420d84aa1fe Mon Sep 17 00:00:00 2001 From: squalus Date: Mon, 3 Oct 2022 22:34:34 -0700 Subject: [PATCH 241/269] vouch-proxy: enable checkPhase Upstream fixed tests in https://github.com/vouch/vouch-proxy/commit/8eae4e5edc9 --- pkgs/servers/vouch-proxy/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix index b812454fc4c5..9ef0e17f9570 100644 --- a/pkgs/servers/vouch-proxy/default.nix +++ b/pkgs/servers/vouch-proxy/default.nix @@ -18,9 +18,6 @@ buildGoModule rec { "-X main.version=${version}" ]; - # broken with go>1.16 - doCheck = false; - preCheck = '' export VOUCH_ROOT=$PWD ''; From 7527505f0be45af148e864a51b0430446cda1a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 4 Oct 2022 13:31:23 +0200 Subject: [PATCH 242/269] schema2ldif: Fix ldap-schema-manager not working Also minor package fixes to clean it up. --- pkgs/tools/text/schema2ldif/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/tools/text/schema2ldif/default.nix index 84196ae11197..fc4a2153d662 100644 --- a/pkgs/tools/text/schema2ldif/default.nix +++ b/pkgs/tools/text/schema2ldif/default.nix @@ -1,14 +1,23 @@ -{ lib, stdenv, fetchurl, makeWrapper, perlPackages }: +{ lib, stdenvNoCC, fetchurl, makeWrapper, perlPackages }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "schema2ldif"; version = "1.3"; src = fetchurl { url = "https://repos.fusiondirectory.org/sources/schema2ldif/schema2ldif-${version}.tar.gz"; - sha256 = "00cd9xx9g0mnnfn5lvay3vg166z84jla0ya1x34ljdc8bflxsr9a"; + hash = "sha256-KmXdqVuINUnJ6EF5oKgk6BsT3h5ebVqss7aCl3pPjQE="; }; + postPatch = '' + # Removes the root check and changes the temporary location + # from the nix store to $PWD + sed -i \ + -e '/You have to run this script as root/d' \ + -e 's|/\^(\.\*)\\\.schema\$/|/.*\\/(.*)\\.schema$/|g' \ + bin/ldap-schema-manager + ''; + buildInputs = [ perlPackages.perl ]; nativeBuildInputs = [ makeWrapper ]; From 4ef739adf11585fa15e9edd943a5049bda9f63e7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 4 Oct 2022 13:41:56 +0200 Subject: [PATCH 243/269] scandir: fix build on aarch64-darwin --- pkgs/development/misc/resholve/resholve.nix | 14 ++-------- .../scandir/add-aarch64-darwin-dirent.patch | 28 +++++++++++++++++++ .../python2-modules/scandir/default.nix | 6 +++- 3 files changed, 36 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 959e7ee0cb52..435cca919da6 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -19,24 +19,16 @@ python27Packages.buildPythonApplication { propagatedBuildInputs = [ oildev - /* - Disable configargparse's tests on aarch64-darwin. - Several of py27 scandir's tests fail on aarch64-darwin. Chain: - configargparse -> pytest-check-hook -> pytest -> pathlib2 -> scandir - TODO: drop if https://github.com/NixOS/nixpkgs/issues/156807 resolves? - */ - (python27Packages.configargparse.overridePythonAttrs (old: { - doCheck = stdenv.hostPlatform.system != "aarch64-darwin"; - })) + python27Packages.configargparse ]; - patchPhase = '' + postPatch = '' for file in setup.cfg _resholve/version.py; do substituteInPlace $file --subst-var-by version ${version} done ''; - postInstall = '' + postInstall = '' installManPage resholve.1 ''; diff --git a/pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch b/pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch new file mode 100644 index 000000000000..1b35a0b950ce --- /dev/null +++ b/pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch @@ -0,0 +1,28 @@ +diff --git a/scandir.py b/scandir.py +index 3f602fb..40af3e5 100644 +--- a/scandir.py ++++ b/scandir.py +@@ -23,6 +23,7 @@ from os import listdir, lstat, stat, strerror + from os.path import join, islink + from stat import S_IFDIR, S_IFLNK, S_IFREG + import collections ++import platform + import sys + + try: +@@ -432,6 +433,15 @@ elif sys.platform.startswith(('linux', 'darwin', 'sunos5')) or 'bsd' in sys.plat + ('__d_padding', ctypes.c_uint8 * 4), + ('d_name', ctypes.c_char * 256), + ) ++ elif 'darwin' in sys.platform and 'arm64' in platform.machine(): ++ _fields_ = ( ++ ('d_ino', ctypes.c_uint64), ++ ('d_off', ctypes.c_uint64), ++ ('d_reclen', ctypes.c_uint16), ++ ('d_namlen', ctypes.c_uint16), ++ ('d_type', ctypes.c_uint8), ++ ('d_name', ctypes.c_char * 1024), ++ ) + else: + _fields_ = ( + ('d_ino', ctypes.c_uint32), # must be uint32, not ulong diff --git a/pkgs/development/python2-modules/scandir/default.nix b/pkgs/development/python2-modules/scandir/default.nix index f92b1f5a6ed7..e712cca8348d 100644 --- a/pkgs/development/python2-modules/scandir/default.nix +++ b/pkgs/development/python2-modules/scandir/default.nix @@ -6,9 +6,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 ="1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd"; + sha256 = "1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd"; }; + patches = [ + ./add-aarch64-darwin-dirent.patch + ]; + checkPhase = "${python.interpreter} test/run_tests.py"; meta = with lib; { From d8cb641929a86d2036a4d16713240af3c5cb6dc0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 4 Oct 2022 13:42:21 +0200 Subject: [PATCH 244/269] pygobject: fix build on aarch64-darwin --- pkgs/development/python-modules/pygobject/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index bf42d17b4deb..14acb15e03b5 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }: +{ lib, stdenv, fetchurl, fetchpatch, python, buildPythonPackage, pkg-config, glib, isPy3k, pythonAtLeast }: buildPythonPackage rec { pname = "pygobject"; @@ -15,6 +15,11 @@ buildPythonPackage rec { patches = lib.optionals stdenv.isDarwin [ ./pygobject-2.0-fix-darwin.patch + (fetchpatch { + url = "https://github.com/macports/macports-ports/raw/f2975d5bbbc2459c661905c5a850cc661fa32f55/python/py-gobject/files/py-gobject-dynamic_lookup-11.patch"; + sha256 = "sha256-mtlyu+La3+iC5iQAmVJzDA5E35XGaRQy/EKXzvrWRCg="; + extraPrefix = ""; + }) ]; configureFlags = [ "--disable-introspection" ]; From 7994937ed20a50681738e1dd91619a6672e5ac19 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 4 Oct 2022 13:42:41 +0200 Subject: [PATCH 245/269] pygtk: fix build on aarch64-darwin --- pkgs/development/python2-modules/pygtk/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python2-modules/pygtk/default.nix b/pkgs/development/python2-modules/pygtk/default.nix index 08e1520c4c85..5aea8f46df0c 100644 --- a/pkgs/development/python2-modules/pygtk/default.nix +++ b/pkgs/development/python2-modules/pygtk/default.nix @@ -36,7 +36,8 @@ buildPythonPackage rec { buildPhase = "buildPhase"; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-ObjC"; + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-ObjC" + ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-lpython2.7"; installPhase = "installPhase"; From a097585ef1506f133ecb754c24b231f07cc48832 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 10:03:44 +0000 Subject: [PATCH 246/269] ft2-clone: 1.58 -> 1.59 --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 1047da60906e..d26d92e00db0 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.58"; + version = "1.59"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-FHhASs1PKTz6G1sAKNUeft0BHbWgl44l7eiOnyQXZb8="; + sha256 = "sha256-TQJCkvPV6vbhURLcuH41i8obHnfHkrCTJG0+IuSVDos="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) From 1b6bef9c08aad93643a3c823069f51004d80c7d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 14:22:44 +0200 Subject: [PATCH 247/269] pip-audit: 2.4.3 -> 2.4.4 --- pkgs/development/tools/pip-audit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index c5362cc0abf6..1a6fd40776ab 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -25,14 +25,14 @@ with py.pkgs; buildPythonApplication rec { pname = "pip-audit"; - version = "2.4.3"; + version = "2.4.4"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "v${version}"; - hash = "sha256-Q5wZJKP5YgLZQ9lrwE+8W9V7pZCJTLBm6qbjzmYJ9yg="; + hash = "sha256-xOcBOk+ac1djfCLKqrCTS+WnOXFf1niRUWN5hItO0v0="; }; nativeBuildInputs = [ @@ -68,7 +68,7 @@ buildPythonApplication rec { disabledTestPaths = [ # Tests require network access "test/dependency_source/test_requirement.py" - "test/dependency_source/test_resolvelib.py" + "test/dependency_source/resolvelib/test_resolvelib.py" "test/service/test_pypi.py" "test/service/test_osv.py" ]; From 081db4e4b79572972e320163dd3e6f7429b9bca0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 4 Oct 2022 14:05:39 +0200 Subject: [PATCH 248/269] python3Packages.wxPython4_0: fix build --- pkgs/development/python-modules/wxPython/4.0.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index 3a86ef4c6390..9b4dcd5e6b48 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, setuptools , pkg-config , which , cairo @@ -25,6 +26,7 @@ buildPythonPackage rec { pname = "wxPython"; version = "4.0.7.post2"; + format = "other"; src = fetchPypi { inherit pname version; @@ -33,7 +35,7 @@ buildPythonPackage rec { doCheck = false; - nativeBuildInputs = [ pkg-config which doxygen ] + nativeBuildInputs = [ pkg-config which doxygen setuptools ] ++ (if stdenv.isDarwin then [ wxmac ] else [ wxGTK ]); buildInputs = [ ncurses libintl ] From b794e83b395253fc46df958a0a12e1fc7b80d069 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 4 Oct 2022 14:05:52 +0200 Subject: [PATCH 249/269] python3Packages.wxPython4_1: fix build --- pkgs/development/python-modules/wxPython/4.1.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/wxPython/4.1.nix b/pkgs/development/python-modules/wxPython/4.1.nix index 94fb10f113b3..afe961f7323b 100644 --- a/pkgs/development/python-modules/wxPython/4.1.nix +++ b/pkgs/development/python-modules/wxPython/4.1.nix @@ -2,6 +2,7 @@ , stdenv , fetchPypi , buildPythonPackage +, setuptools , which , pkg-config , python @@ -33,6 +34,7 @@ buildPythonPackage rec { pname = "wxPython"; version = "4.1.1"; disabled = isPy27; + format = "other"; src = fetchPypi { inherit pname version; @@ -48,6 +50,7 @@ buildPythonPackage rec { doxygen wxGTK.gtk pkg-config + setuptools ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; From 5bae92a7155b885619cbab9d3ddae91aa59e91cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Oct 2022 14:18:13 +0200 Subject: [PATCH 250/269] =?UTF-8?q?zfs:=202.1.5=20=E2=86=92=202.1.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/os-specific/linux/zfs/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 5e92e63553d0..080a198b0f40 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15 +, linuxPackages_5_19 ? pkgs.linuxKernel.packages.linux_5_19 }: let @@ -216,28 +216,28 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "5.19"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelOlder "5.20"; + latestCompatibleLinuxPackages = linuxPackages_5_19; # this package should point to the latest release. - version = "2.1.5"; + version = "2.1.6"; - sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE="; + sha256 = "sha256-gd5WlNtnoSiVj4sKUGf0WhR7Z1GPebwu3Z1mkNsoC/I="; }; zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "5.19"; - latestCompatibleLinuxPackages = linuxPackages_5_15; + kernelCompatible = kernel.kernelOlder "5.20"; + latestCompatibleLinuxPackages = linuxPackages_5_19; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.5"; + version = "2.1.6"; # rev = "0000000000000000000000000000000000000000"; - sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE="; + sha256 = "sha256-gd5WlNtnoSiVj4sKUGf0WhR7Z1GPebwu3Z1mkNsoC/I="; isUnstable = true; }; From 5598afb4208fc35aa011aed90877188385f22c24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Oct 2022 12:40:43 +0000 Subject: [PATCH 251/269] mdbook-linkcheck: 0.7.6 -> 0.7.7 --- pkgs/tools/text/mdbook-linkcheck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-linkcheck/default.nix b/pkgs/tools/text/mdbook-linkcheck/default.nix index eaccd05eb9c4..0d2533eba48d 100644 --- a/pkgs/tools/text/mdbook-linkcheck/default.nix +++ b/pkgs/tools/text/mdbook-linkcheck/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-linkcheck"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "Michael-F-Bryan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZEOuA8W05800cnArscaGGOWTgzU6V3/wJiQcSx1MVkY="; + sha256 = "sha256-ZbraChBHuKAcUA62EVHZ1RygIotNEEGv24nhSPAEj00="; }; - cargoSha256 = "sha256-EtPhbKvPHSnmPXemCzOXujlqqfdDSFaJpcZVJoHQq6U="; + cargoSha256 = "sha256-AwixlCL5ZcLgj9wYeBvkSy2U6J8alXf488l8DMn73w4="; buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ]; From 453efa3153cc5ce9b782b45861abba60876db10f Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 4 Oct 2022 15:06:21 +0200 Subject: [PATCH 252/269] python310Packages.versioningit: move patching to postPatch --- .../python-modules/versioningit/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix index 74cccb73cb5b..5f058d5f1b15 100644 --- a/pkgs/development/python-modules/versioningit/default.nix +++ b/pkgs/development/python-modules/versioningit/default.nix @@ -25,6 +25,13 @@ buildPythonPackage rec { hash = "sha256-gJfiYNm99nZYW9gTO/e1//rDeox2KWJVtC2Gy1EqsuM="; }; + postPatch = '' + substituteInPlace tox.ini \ + --replace "--cov=versioningit" "" \ + --replace "--cov-config=tox.ini" "" \ + --replace "--no-cov-on-fail" "" + ''; + propagatedBuildInputs = [ packaging setuptools @@ -47,13 +54,6 @@ buildPythonPackage rec { "test_editable_mode" ]; - preCheck = '' - substituteInPlace tox.ini \ - --replace "--cov=versioningit" "" \ - --replace "--cov-config=tox.ini" "" \ - --replace "--no-cov-on-fail" "" - ''; - pythonImportsCheck = [ "versioningit" ]; From 1c660d1a00dff4f57f456db6a0167d473642ed1d Mon Sep 17 00:00:00 2001 From: Tyler Langlois Date: Tue, 4 Oct 2022 07:28:29 -0600 Subject: [PATCH 253/269] betterlockscreen: wrap with dbus and dunst (#176335) Co-authored-by: Sandro --- pkgs/misc/screensavers/betterlockscreen/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index 43bc96ea6e79..36eaa50e32c4 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -6,6 +6,8 @@ # Dependencies (@see https://github.com/pavanjadhaw/betterlockscreen/blob/master/shell.nix) , bc , coreutils +, dbus +, dunst , i3lock-color , gawk , gnugrep @@ -35,7 +37,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp betterlockscreen $out/bin/betterlockscreen - wrapProgram "$out/bin/betterlockscreen" --prefix PATH : "$out/bin:${lib.makeBinPath [ bc coreutils i3lock-color gawk gnugrep gnused imagemagick procps xdpyinfo xrandr xset ]}" + wrapProgram "$out/bin/betterlockscreen" \ + --prefix PATH : "$out/bin:${lib.makeBinPath [ bc coreutils dbus dunst i3lock-color gawk gnugrep gnused imagemagick procps xdpyinfo xrandr xset ]}" runHook postInstall ''; From 60c89561041dc66c264c372a133060c557b69b15 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 15:28:45 +0200 Subject: [PATCH 254/269] python310Packages.velbus-aio: 2022.10.1 -> 2022.10.2 (#194409) --- pkgs/development/python-modules/velbus-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index ab367f615a0a..15dad57c07e2 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2022.10.1"; + version = "2022.10.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - sha256 = "sha256-/CwBe8S2aiOhNqs7LksthcZv0AXIaYFtw024toN1ivs="; + sha256 = "sha256-Aa6SIn+/exHJZKgU8rBTPXtNY3lMUMK35wi5j+64Nrk="; fetchSubmodules = true; }; From 8d764e5a35ddf95bafc7430a574a0e3af4ac788a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Oct 2022 15:29:00 +0200 Subject: [PATCH 255/269] python310Packages.vt-py: 0.16.0 -> 0.17.1 (#194410) --- pkgs/development/python-modules/vt-py/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix index f47570a3f878..1d0c7b4ffb71 100644 --- a/pkgs/development/python-modules/vt-py/default.nix +++ b/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.16.0"; + version = "0.17.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Z2rTZCPquyNA+81FCJV1f8p2YvOdSLZFGzPGplzmESc="; + hash = "sha256-yG0bKBn3pQWtxjuxkhKMMJW1nzbsk5y/9h2OOCkdch8="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for VirusTotal"; homepage = "https://virustotal.github.io/vt-py/"; + changelog = "https://github.com/VirusTotal/vt-py/releases/tag//${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From a2c41adf739aaef0e0b3fd81a36b498c08db1291 Mon Sep 17 00:00:00 2001 From: erdnaxe Date: Tue, 4 Oct 2022 15:32:21 +0200 Subject: [PATCH 256/269] cfdg: remove src-for-default.nix, cleanups (#192727) --- pkgs/tools/graphics/cfdg/default.nix | 9 +++++++-- pkgs/tools/graphics/cfdg/src-for-default.nix | 9 --------- 2 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 pkgs/tools/graphics/cfdg/src-for-default.nix diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 44a1e0d1d2a1..fd4a8b366fef 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "13m8npccacmgxbs4il45zw53dskjh53ngv2nxahwqw8shjrws4mh"; }; - buildInputs = [ libpng bison flex ffmpeg icu ]; + nativeBuildInputs = [ bison flex ]; + buildInputs = [ libpng ffmpeg icu ]; postPatch = '' sed -e "/YY_NO_UNISTD/a#include " -i src-common/cfdg.l @@ -18,11 +19,15 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp cfdg $out/bin/ mkdir -p $out/share/doc/${pname}-${version} cp *.txt $out/share/doc/${pname}-${version} + + runHook postInstall ''; meta = with lib; { @@ -30,6 +35,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; homepage = "https://contextfreeart.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; }; } diff --git a/pkgs/tools/graphics/cfdg/src-for-default.nix b/pkgs/tools/graphics/cfdg/src-for-default.nix deleted file mode 100644 index 7ff076a5b0ae..000000000000 --- a/pkgs/tools/graphics/cfdg/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - version="3.0.2"; - name="cfdg-3.0.2"; - hash="1pd1hjippbhad8l4s4lsglykh22i24qfrgmnxrsx71bvcqbr356p"; - url="http://www.contextfreeart.org/download/ContextFreeSource3.0.2.tgz"; - advertisedUrl="http://www.contextfreeart.org/download/ContextFreeSource3.0.2.tgz"; - - -} From c75b4ee2f0af0b3c66c03219416254088b39da1a Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 4 Oct 2022 15:42:45 +0200 Subject: [PATCH 257/269] cp2k: 9.1.0 -> 2022.2 --- pkgs/applications/science/chemistry/cp2k/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index 26cf411cb78a..01fbfb1ccf9c 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "cp2k"; - version = "9.1.0"; + version = "2022.2"; src = fetchFromGitHub { owner = "cp2k"; repo = "cp2k"; rev = "v${version}"; - hash = "sha256-P9RwZmrE1E0UTQVasQxWAqa3LBLyJNGeJo8T6u5WWcw="; + hash = "sha256-zDIsgPcLnA0ATJEN1vQClpkToqvIyW7KuXhyGiXJXDw="; fetchSubmodules = true; }; From 04c496c1551125f409546ed990c817dc8d7dc1d6 Mon Sep 17 00:00:00 2001 From: erdnaxe Date: Tue, 4 Oct 2022 15:49:16 +0200 Subject: [PATCH 258/269] telepathy-farstream: rename name to pname&version (#193575) --- .../development/libraries/telepathy/farstream/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index 2885f3cbb12d..59f0a165221c 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -1,21 +1,21 @@ { lib, stdenv, fetchurl, pkg-config, telepathy-glib, farstream, dbus-glib }: stdenv.mkDerivation rec { - name = "${pname}-0.6.2"; pname = "telepathy-farstream"; + version = "0.6.2"; src = fetchurl { - url = "https://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz"; sha256 = "02ky12bb92prr5f6xmvmfq4yz2lj33li6nj4829a98hk5pr9k83g"; }; - propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ]; nativeBuildInputs = [ pkg-config ]; + propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ]; meta = with lib; { description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call"; homepage = "https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/"; platforms = platforms.linux; - license = licenses.lgpl21; + license = licenses.lgpl21Only; }; } From 11bb01e7fa509db5a8adce09b5edfc8554f7eee4 Mon Sep 17 00:00:00 2001 From: erdnaxe Date: Tue, 4 Oct 2022 15:56:29 +0200 Subject: [PATCH 259/269] python3Packages.dlib: split name to pname&version (#194382) --- .../python-modules/dlib/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index 642794835654..601c5ca50758 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -4,7 +4,17 @@ }: buildPythonPackage { - inherit (dlib) name src nativeBuildInputs buildInputs meta; + inherit (dlib) pname version src nativeBuildInputs buildInputs meta; + + patches = [ ./build-cores.patch ]; + + checkInputs = [ pytest more-itertools ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "more-itertools<6.0.0" "more-itertools" \ + --replace "pytest==3.8" "pytest" + ''; # although AVX can be enabled, we never test with it. Some Hydra machines # fail because of this, however their build results are probably used on hardware @@ -18,15 +28,5 @@ buildPythonPackage { "--set USE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; - patches = [ ./build-cores.patch ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace "more-itertools<6.0.0" "more-itertools" \ - --replace "pytest==3.8" "pytest" - ''; - - checkInputs = [ pytest more-itertools ]; - dontUseCmakeConfigure = true; } From f633575af3ad7b4dcf77fd4cb7733184d5b65e3e Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 4 Oct 2022 16:01:15 +0200 Subject: [PATCH 260/269] libvori: 210412 -> 220621 --- pkgs/development/libraries/libvori/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvori/default.nix b/pkgs/development/libraries/libvori/default.nix index 2eb7bffbdf12..78882374f3bb 100644 --- a/pkgs/development/libraries/libvori/default.nix +++ b/pkgs/development/libraries/libvori/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libvori"; - version = "210412"; + version = "220621"; src = fetchurl { url = "https://brehm-research.de/files/${pname}-${version}.tar.gz"; - sha256 = "1b4hpwibf3k7gl6n984l3wdi0zyl2fmpz84m9g2di4yhm6p8c61k"; + hash = "sha256-HPqYxWSBS92s8cDn8RWCE311hmj2MH5us5LHIxeYTBQ="; }; nativeBuildInputs = [ cmake ]; From 93c7d8070c30692d8974fae34f16f54bfe84fb8a Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 4 Oct 2022 16:33:52 +0200 Subject: [PATCH 261/269] avogadrolibs: 1.95.1 -> 1.97.0, disable mmtf-cpp avogadrolibs: reenable mmtf-cpp --- .../libraries/science/chemistry/avogadrolibs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix index b7f5f5f6d90e..e23fba7fb0eb 100644 --- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix +++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "avogadrolibs"; - version = "1.95.1"; + version = "1.97.0"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = pname; rev = version; - sha256 = "0zzVg8xNqFwDrK8gRkDm3tRgBt7fD4K3Uy/ajUBc+eQ="; + hash = "sha256-ZGFyUlFyI403aw/6GVze/gronT67XlEOKuw5sfHeVy8="; }; postUnpack = '' From b070c222d137ac32d687df7f84997e0e67401ede Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 4 Oct 2022 15:34:16 +0200 Subject: [PATCH 262/269] avogadro2: 1.95.1 -> 1.97.0 --- pkgs/applications/science/chemistry/avogadro2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix index 6931c8621c96..2ff0cab1847a 100644 --- a/pkgs/applications/science/chemistry/avogadro2/default.nix +++ b/pkgs/applications/science/chemistry/avogadro2/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "avogadro2"; - version = "1.95.1"; + version = "1.97.0"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = "avogadroapp"; rev = version; - sha256 = "9GnsxQsMuik6CPDmJbJPF0/+LXbZHf/JLevpSsMEoP0="; + hash = "sha256-gZpMgFSPz70QNfd8gH5Jb9RTxQfQalWx33LkgXLEqOQ="; }; postUnpack = '' From 94b9ed29b989186a39541667ee37f475626b44ec Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 4 Oct 2022 18:10:03 +0300 Subject: [PATCH 263/269] wireplumber: 0.4.11 -> 0.4.12 --- .../libraries/pipewire/wireplumber.nix | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index d43a4331f98d..5770866ebbed 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , nix-update-script , # base build deps meson @@ -27,7 +26,7 @@ let in stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.4.11"; + version = "0.4.12"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -36,24 +35,9 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - sha256 = "sha256-3NrzOsL0MekxMMXCFubEkazzSWFNsjUsX8n2ECcr7yY="; + sha256 = "sha256-2qM6sX807v/3DZXTuBvUSGV8+cPB87rWYb+HTDCm3kw="; }; - patches = [ - # fix sound not working in VMs - # FIXME: drop in next release - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c16e637c329bc9dda8544b18f5bd47a8d63ee253.patch"; - sha256 = "sha256-xhhAlhOovwIjwAxXxvHRTG4GzpIPYvKQE2F4ZP1Udq8="; - }) - # fix bluetooth rescan loops - # FIXME: drop in next release - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/merge_requests/398.patch"; - sha256 = "sha256-rEp/3fjBRbkFuw4rBW6h8O5hcy/oBP3DW7bPu5rVfNY="; - }) - ]; - nativeBuildInputs = [ meson pkg-config From 092bb3c6e023d91a03a538c092b7768b63393018 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 4 Oct 2022 17:54:37 +0200 Subject: [PATCH 264/269] python3Packages.libvirt: Fix build on darwin The `zfs` package is not supported on darwin at all, resulting in an evaluation error. This change conditionally removes the patch that tried to introduce the dependency regardless of that fact in f00d5620804f700b05b8cb913ac10ef3ddcaa068, https://github.com/NixOS/nixpkgs/pull/191552 --- pkgs/development/libraries/libvirt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 4d0ef8bebd4c..363b955dea87 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -125,6 +125,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch + ] ++ lib.optionals enableZfs [ (substituteAll { src = ./0002-substitute-zfs-and-zpool-commands.patch; zfs = "${zfs}/bin/zfs"; From 2e19f2fa5391b3b30e9eace7b4b6a60926b828ae Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 4 Oct 2022 14:06:48 -0300 Subject: [PATCH 265/269] maintainers: remove superherointj --- maintainers/maintainer-list.nix | 7 ----- nixos/modules/hardware/ckb-next.nix | 2 +- nixos/tests/k3s/multi-node.nix | 2 +- nixos/tests/k3s/single-node.nix | 2 +- .../editors/vscode/extensions/default.nix | 26 +++++++++---------- .../default.nix | 2 +- .../networking/cluster/cmctl/default.nix | 2 +- .../networking/cluster/fluxcd/default.nix | 2 +- .../networking/cluster/istioctl/default.nix | 2 +- .../networking/cluster/k3s/default.nix | 2 +- .../networking/cluster/linkerd/generic.nix | 2 +- .../brisk-reconciler/default.nix | 2 +- .../ocaml-modules/flex/default.nix | 2 +- .../ocaml-modules/rebez/default.nix | 2 +- .../ocaml-modules/reperf/default.nix | 2 +- .../ocaml-modules/telegraml/default.nix | 2 +- .../ocaml-modules/tsdl-image/default.nix | 2 +- .../ocaml-modules/tsdl-mixer/default.nix | 2 +- .../ocaml-modules/tsdl-ttf/default.nix | 2 +- .../python-modules/cinemagoer/default.nix | 2 +- .../python-modules/glad/default.nix | 2 +- .../tools/database/prisma-engines/default.nix | 2 +- pkgs/development/tools/ent/default.nix | 2 +- .../tools/protoc-gen-entgrpc/default.nix | 2 +- pkgs/servers/dns/coredns/default.nix | 2 +- pkgs/servers/firebird/default.nix | 2 +- pkgs/tools/misc/ckb-next/default.nix | 2 +- 27 files changed, 38 insertions(+), 45 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bae79f73b037..b8e642588d44 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12863,13 +12863,6 @@ githubId = 2666479; name = "Y Nguyen"; }; - superherointj = { - name = "Sérgio G."; - email = "5861043+superherointj@users.noreply.github.com"; - matrix = "@superherointj:matrix.org"; - github = "superherointj"; - githubId = 5861043; - }; SuperSandro2000 = { email = "sandro.jaeckel@gmail.com"; matrix = "@sandro:supersandro.de"; diff --git a/nixos/modules/hardware/ckb-next.nix b/nixos/modules/hardware/ckb-next.nix index e5c79c814314..79977939eec8 100644 --- a/nixos/modules/hardware/ckb-next.nix +++ b/nixos/modules/hardware/ckb-next.nix @@ -48,6 +48,6 @@ in }; meta = { - maintainers = with lib.maintainers; [ superherointj ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix index e33fa3e36d27..ce7e4b6ead14 100644 --- a/nixos/tests/k3s/multi-node.nix +++ b/nixos/tests/k3s/multi-node.nix @@ -126,7 +126,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: }; meta = with pkgs.lib.maintainers; { - maintainers = [ euank superherointj ]; + maintainers = [ euank ]; }; testScript = '' diff --git a/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix index 583aac8ac656..ab562500f5d2 100644 --- a/nixos/tests/k3s/single-node.nix +++ b/nixos/tests/k3s/single-node.nix @@ -26,7 +26,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: { name = "k3s"; meta = with pkgs.lib.maintainers; { - maintainers = [ euank superherointj ]; + maintainers = [ euank ]; }; nodes.machine = { pkgs, ... }: { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 1eb42b3f18bf..f078e0f00a7f 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -326,7 +326,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=attilabuti.brainfuck-syntax"; homepage = "https://github.com/attilabuti/brainfuck-syntax"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -410,7 +410,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=badochov.ocaml-formatter"; homepage = "https://github.com/badochov/ocamlformatter-vscode"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -585,7 +585,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=christian-kohler.path-intellisense"; homepage = "https://github.com/ChristianKohler/PathIntellisense"; license = licenses.mit; - maintainers = with maintainers; [ imgabe superherointj ]; + maintainers = with maintainers; [ imgabe ]; }; }; @@ -943,7 +943,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; homepage = "https://github.com/prettier/prettier-vscode"; license = licenses.mit; - maintainers = with maintainers; [ datafoo superherointj ]; + maintainers = with maintainers; [ datafoo ]; }; }; @@ -1134,7 +1134,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=gencer.html-slim-scss-css-class-completion"; homepage = "https://github.com/gencer/SCSS-Everywhere"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -1150,7 +1150,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=gitlab.gitlab-workflow"; homepage = "https://gitlab.com/gitlab-org/gitlab-vscode-extension#readme"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -1400,7 +1400,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=IronGeek.vscode-env"; homepage = "https://github.com/IronGeek/vscode-env.git"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -1468,7 +1468,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=jnoortheen.nix-ide"; homepage = "https://github.com/jnoortheen/vscode-nix-ide"; license = licenses.mit; - maintainers = with maintainers; [ superherointj SuperSandro2000 ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; }; @@ -1963,7 +1963,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=phoenixframework.phoenix"; homepage = "https://github.com/phoenixframework/vscode-phoenix"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -2027,7 +2027,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform"; homepage = "https://github.com/ocamllabs/vscode-ocaml-platform"; license = licenses.isc; - maintainers = with maintainers; [ ratsclub superherointj ]; + maintainers = with maintainers; [ ratsclub ]; }; mktplcRef = { name = "ocaml-platform"; @@ -2090,7 +2090,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=Prisma.prisma"; homepage = "https://github.com/prisma/language-tools"; license = licenses.asl20; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -2332,7 +2332,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=stefanjarina.vscode-eex-snippets"; homepage = "https://github.com/stefanjarina/vscode-eex-snippets"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; @@ -2469,7 +2469,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=theangryepicbanana.language-pascal"; homepage = "https://github.com/ALANVF/vscode-pascal-magic"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; }; diff --git a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix index e019e9f1b986..3a8750301fea 100644 --- a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix +++ b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix @@ -41,7 +41,7 @@ buildGoModule rec { ''; license = licenses.mit; homepage = "https://github.com/mschneider82/keylight-control"; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 4a990caf3b50..82728cc1d2a2 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -48,6 +48,6 @@ buildGoModule rec { downloadPage = "https://github.com/cert-manager/cert-manager"; license = licenses.asl20; homepage = "https://cert-manager.io/"; - maintainers = with maintainers; [ joshvanl superherointj ]; + maintainers = with maintainers; [ joshvanl ]; }; } diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 71597daea2b0..c0886ff20430 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -65,7 +65,7 @@ in buildGoModule rec { ''; homepage = "https://fluxcd.io"; license = licenses.asl20; - maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ]; + maintainers = with maintainers; [ bryanasdev000 jlesquembre ]; mainProgram = "flux"; }; } diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 13d08e334786..e469562bff2b 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -42,7 +42,7 @@ buildGoModule rec { description = "Istio configuration command line utility for service operators to debug and diagnose their Istio mesh"; homepage = "https://istio.io/latest/docs/reference/commands/istioctl"; license = licenses.asl20; - maintainers = with maintainers; [ superherointj bryanasdev000 veehaitch ]; + maintainers = with maintainers; [ bryanasdev000 veehaitch ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 1fed375117c2..0fdc7cc4f429 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -77,7 +77,7 @@ let description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ euank mic92 superherointj ]; + maintainers = with maintainers; [ euank mic92 ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix index 80150b45d866..f21ee96ecd33 100644 --- a/pkgs/applications/networking/cluster/linkerd/generic.nix +++ b/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -53,6 +53,6 @@ buildGoModule rec { downloadPage = "https://github.com/linkerd/linkerd2/"; homepage = "https://linkerd.io/"; license = licenses.asl20; - maintainers = with maintainers; [ bryanasdev000 Gonzih superherointj ]; + maintainers = with maintainers; [ bryanasdev000 Gonzih ]; }; } diff --git a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix index 65d5abd6f440..925f899995f0 100644 --- a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix +++ b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix @@ -27,7 +27,7 @@ buildDunePackage rec { * stateful functions: Functions that maintain state over time. Imagine that you can take any variable in your function and manage its value over the function's invocation. Now, imagine that any function invocation really creates its own "instance" of the function which will track this state separately from other invocations of this function. ''; homepage = "https://github.com/briskml/brisk-reconciler"; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/ocaml-modules/flex/default.nix b/pkgs/development/ocaml-modules/flex/default.nix index c9db2440e01c..b8a56d5224fc 100644 --- a/pkgs/development/ocaml-modules/flex/default.nix +++ b/pkgs/development/ocaml-modules/flex/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { meta = with lib; { description = "Native Reason implementation of CSS Flexbox layout. An Yoga project port"; homepage = "https://github.com/jordwalke/flex"; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/ocaml-modules/rebez/default.nix b/pkgs/development/ocaml-modules/rebez/default.nix index 743f94454eeb..6a871069eb6a 100644 --- a/pkgs/development/ocaml-modules/rebez/default.nix +++ b/pkgs/development/ocaml-modules/rebez/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { description = "Cubic bezier implementation in Reason / OCaml"; homepage = "https://github.com/jchavarri/rebez/"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; mainProgram = "RebezApp.exe"; }; } diff --git a/pkgs/development/ocaml-modules/reperf/default.nix b/pkgs/development/ocaml-modules/reperf/default.nix index 6ec05a861498..10c6ee65626c 100644 --- a/pkgs/development/ocaml-modules/reperf/default.nix +++ b/pkgs/development/ocaml-modules/reperf/default.nix @@ -35,7 +35,7 @@ buildDunePackage rec { Outputs a JSON performance report, and compare it with previous iterations - and fail if a regression is detected. ''; homepage = "https://github.com/bryphe/reperf"; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/ocaml-modules/telegraml/default.nix b/pkgs/development/ocaml-modules/telegraml/default.nix index b6f5f69b876f..9fed705ce3ee 100644 --- a/pkgs/development/ocaml-modules/telegraml/default.nix +++ b/pkgs/development/ocaml-modules/telegraml/default.nix @@ -29,6 +29,6 @@ buildDunePackage rec { description = "An OCaml library implementing the Telegram bot API"; homepage = "https://github.com/nv-vn/TelegraML/"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/tsdl-image/default.nix b/pkgs/development/ocaml-modules/tsdl-image/default.nix index a8a2e2d38d62..d4eaaae65caa 100644 --- a/pkgs/development/ocaml-modules/tsdl-image/default.nix +++ b/pkgs/development/ocaml-modules/tsdl-image/default.nix @@ -32,6 +32,6 @@ buildDunePackage rec { description = "OCaml SDL2_image bindings to go with Tsdl"; homepage = "https://github.com/sanette/tsdl-image"; license = licenses.bsd3; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix index 4a59025f9d88..24043ef4391e 100644 --- a/pkgs/development/ocaml-modules/tsdl-mixer/default.nix +++ b/pkgs/development/ocaml-modules/tsdl-mixer/default.nix @@ -32,6 +32,6 @@ buildDunePackage rec { description = "SDL2_mixer bindings to go with Tsdl"; homepage = "https://github.com/sanette/tsdl-mixer"; license = licenses.bsd3; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix index c8445bf4337c..0ff1963fcaf0 100644 --- a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix +++ b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix @@ -32,6 +32,6 @@ buildDunePackage rec { description = "SDL2_ttf bindings for Ocaml with Tsdl"; homepage = "https://github.com/sanette/tsdl-ttf"; license = licenses.bsd3; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/cinemagoer/default.nix b/pkgs/development/python-modules/cinemagoer/default.nix index 45d80c26b8b3..8b62a57b306f 100644 --- a/pkgs/development/python-modules/cinemagoer/default.nix +++ b/pkgs/development/python-modules/cinemagoer/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { downloadPage = "https://github.com/cinemagoer/cinemagoer/"; homepage = "https://cinemagoer.github.io/"; license = licenses.gpl2Only; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/glad/default.nix b/pkgs/development/python-modules/glad/default.nix index 9d05720d84df..5307a2e46124 100644 --- a/pkgs/development/python-modules/glad/default.nix +++ b/pkgs/development/python-modules/glad/default.nix @@ -13,6 +13,6 @@ buildPythonPackage rec { description = "Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs"; homepage = "https://github.com/Dav1dde/glad"; license = licenses.mit; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 969a04b3d191..fd25a497dc00 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.prisma.io/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ pamplemousse pimeys superherointj tomhoule ]; + maintainers = with maintainers; [ pamplemousse pimeys tomhoule ]; }; } diff --git a/pkgs/development/tools/ent/default.nix b/pkgs/development/tools/ent/default.nix index 42de24825e41..31c6007fb0a4 100644 --- a/pkgs/development/tools/ent/default.nix +++ b/pkgs/development/tools/ent/default.nix @@ -34,7 +34,7 @@ buildGoModule rec { homepage = "https://entgo.io/"; downloadPage = "https://github.com/ent/ent"; license = licenses.asl20; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; mainProgram = "ent"; }; } diff --git a/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/pkgs/development/tools/protoc-gen-entgrpc/default.nix index 77e872a68b13..c2afb381aa29 100644 --- a/pkgs/development/tools/protoc-gen-entgrpc/default.nix +++ b/pkgs/development/tools/protoc-gen-entgrpc/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { downloadPage = "https://github.com/ent/contrib/"; license = licenses.asl20; homepage = "https://entgo.io/"; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 95f1565f863e..10cc86e00fff 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -33,6 +33,6 @@ buildGoModule rec { homepage = "https://coredns.io"; description = "A DNS server that runs middleware"; license = licenses.asl20; - maintainers = with maintainers; [ rushmorem rtreffer deltaevo superherointj ]; + maintainers = with maintainers; [ rushmorem rtreffer deltaevo ]; }; } diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 3f98beede3ab..e49f683da877 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -10,7 +10,7 @@ let base = { changelog = "https://github.com/FirebirdSQL/firebird/blob/master/CHANGELOG.md"; license = [ "IDPL" "Interbase-1.0" ]; platforms = platforms.linux; - maintainers = with maintainers; [ marcweber superherointj ]; + maintainers = with maintainers; [ marcweber ]; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index 14edd24d2487..efd581a06cbc 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -50,6 +50,6 @@ mkDerivation rec { homepage = "https://github.com/ckb-next/ckb-next"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ ]; }; } From 3bc2971030c70a9191b3682346f98067e88d0a94 Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Tue, 4 Oct 2022 22:45:29 +0200 Subject: [PATCH 266/269] fix typo --- .github/ISSUE_TEMPLATE/missing_documentation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/missing_documentation.md b/.github/ISSUE_TEMPLATE/missing_documentation.md index fbeb69eeee85..c00dc91bae8f 100644 --- a/.github/ISSUE_TEMPLATE/missing_documentation.md +++ b/.github/ISSUE_TEMPLATE/missing_documentation.md @@ -15,7 +15,7 @@ assignees: '' -- [ ] checked [latest Nixpkgs manual] \([source][nixpkgs-source]) and [latest NixOS manual]] \([source][nixos-source]) +- [ ] checked [latest Nixpkgs manual] \([source][nixpkgs-source]) and [latest NixOS manual] \([source][nixos-source]) - [ ] checked [open documentation issues] for possible duplicates - [ ] checked [open documentation pull requests] for possible solutions From 868a6714da40500e22471d60247cef78bb416873 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 4 Oct 2022 22:47:54 +0200 Subject: [PATCH 267/269] maintainers/team-list.nix: add lua team --- maintainers/team-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 9c855b92499f..a43b3eb41412 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -384,6 +384,15 @@ with lib.maintainers; { shortName = "Lumiguide employees"; }; + lua = { + githubTeams = [ + "lua" + ]; + scope = "Maintain the lua ecosystem."; + shortName = "lua"; + enableFeatureFreezePing = true; + }; + lumina = { members = [ romildo From 645c8426f5c97e7ed7005e544f7d8c0a64d3d2ce Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 5 Oct 2022 07:22:53 +1000 Subject: [PATCH 268/269] gh: 2.16.1 -> 2.17.0 https://github.com/cli/cli/releases/tag/v2.17.0 --- .../version-management/git-and-tools/gh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 60e0d9d28d05..4a4367bfdf7e 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "2.16.1"; + version = "2.17.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-I8/vO7SfZr4JVbFNBgIaP7CwHn7q6CMIZMjLBsTLY2Q="; + sha256 = "sha256-2GDhDmk7AVb2DGxibIQM0b7hj2iGvjeLJ4+vAZggxtk="; }; vendorSha256 = "sha256-TVMFOit2pi+ZVcppzs0iKNXluDW9ZQDH2d7cPSzg+ak="; From 5662a3075747515e6e1cb5662cb3fa67f8314f10 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 4 Oct 2022 23:44:26 +0200 Subject: [PATCH 269/269] rain: build with Go 1.18 instead of 1.17 Go 1.17 is EOL. --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cc34e2a7f4f..0a392722ce38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10570,9 +10570,7 @@ with pkgs; radvd = callPackage ../tools/networking/radvd { }; - rain = callPackage ../development/tools/rain { - buildGoModule = buildGo117Module; - }; + rain = callPackage ../development/tools/rain { }; rainbowstream = with python3.pkgs; toPythonApplication rainbowstream;