From 52e9ddd3457998c0dd6d7c694d303adb0a4f6cad Mon Sep 17 00:00:00 2001 From: Joscha Loos Date: Tue, 29 Nov 2022 16:17:25 +0100 Subject: [PATCH 001/222] nixos/gollum: --- nixos/modules/services/misc/gollum.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index 4eec9610b5e9..d0c0621fba2c 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -91,18 +91,30 @@ in The package used in the service ''; }; + + user = mkOption { + type = types.str; + default = "gollum"; + description = lib.mdDoc "Specifies the owner of the wiki directory"; + }; + + group = mkOption { + type = types.str; + default = "gollum"; + description = lib.mdDoc "Specifies the owner group of the wiki directory"; + }; }; config = mkIf cfg.enable { - users.users.gollum = { - group = config.users.users.gollum.name; + users.users.gollum = mkIf (cfg.user == "gollum") { + group = cfg.group; description = "Gollum user"; createHome = false; isSystemUser = true; }; - users.groups.gollum = { }; + users.groups.gollum = mkIf (cfg.group == "gollum") { }; systemd.tmpfiles.rules = [ "d '${cfg.stateDir}' - ${config.users.users.gollum.name} ${config.users.groups.gollum.name} - -" @@ -120,8 +132,8 @@ in ''; serviceConfig = { - User = config.users.users.gollum.name; - Group = config.users.groups.gollum.name; + User = cfg.user; + Group = cfg.group; WorkingDirectory = cfg.stateDir; ExecStart = '' ${cfg.package}/bin/gollum \ From 05885a166b4ee787693d28ce1b7f7c8ccdd79e71 Mon Sep 17 00:00:00 2001 From: jooooscha <57965027+jooooscha@users.noreply.github.com> Date: Tue, 21 Mar 2023 13:26:22 +0100 Subject: [PATCH 002/222] Update nixos/modules/services/misc/gollum.nix Co-authored-by: Kerstin --- nixos/modules/services/misc/gollum.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index d0c0621fba2c..b73528abaf65 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -114,7 +114,7 @@ in isSystemUser = true; }; - users.groups.gollum = mkIf (cfg.group == "gollum") { }; + users.groups."${cfg.group}" = { }; systemd.tmpfiles.rules = [ "d '${cfg.stateDir}' - ${config.users.users.gollum.name} ${config.users.groups.gollum.name} - -" From 00000008777eaba4e314cca3460fbcd1739dd559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 May 2023 23:18:47 +0200 Subject: [PATCH 003/222] mediawiki: use stdenvNoCC, remove extra derivation --- pkgs/servers/web-apps/mediawiki/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index b90dffb0be1d..5c39fc48ae6d 100644 --- a/pkgs/servers/web-apps/mediawiki/default.nix +++ b/pkgs/servers/web-apps/mediawiki/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, writeText, nixosTests }: +{ lib, stdenvNoCC, fetchurl, nixosTests }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "mediawiki"; version = "1.39.3"; @@ -13,18 +13,14 @@ stdenv.mkDerivation rec { sed -i 's|$vars = Installer::getExistingLocalSettings();|$vars = null;|' includes/installer/CliInstaller.php ''; - installPhase = let - phpConfig = writeText "LocalSettings.php" '' - - ''; - in '' + installPhase = '' runHook preInstall mkdir -p $out/share/mediawiki cp -r * $out/share/mediawiki - cp ${phpConfig} $out/share/mediawiki/LocalSettings.php + echo "" > $out/share/mediawiki/LocalSettings.php runHook postInstall ''; From 879c2dd588d42e6c09bec256a09d262c7abdce9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 20 May 2023 02:24:32 +0200 Subject: [PATCH 004/222] nixos/nix-optimise: cleanup, remove with lib --- nixos/modules/services/misc/nix-optimise.nix | 34 +++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix index db8148c060e7..58fc1ea4162a 100644 --- a/nixos/modules/services/misc/nix-optimise.nix +++ b/nixos/modules/services/misc/nix-optimise.nix @@ -1,28 +1,21 @@ { config, lib, ... }: -with lib; - let cfg = config.nix.optimise; in { - - ###### interface - options = { - nix.optimise = { - - automatic = mkOption { + automatic = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; description = lib.mdDoc "Automatically run the nix store optimiser at a specific time."; }; - dates = mkOption { + dates = lib.mkOption { default = ["03:45"]; - type = types.listOf types.str; + type = with lib.types; listOf str; description = lib.mdDoc '' Specification (in the format described by {manpage}`systemd.time(7)`) of the time at @@ -32,9 +25,6 @@ in }; }; - - ###### implementation - config = { assertions = [ { @@ -43,14 +33,12 @@ in } ]; - systemd.services.nix-optimise = lib.mkIf config.nix.enable - { description = "Nix Store Optimiser"; - # No point this if the nix daemon (and thus the nix store) is outside - unitConfig.ConditionPathIsReadWrite = "/nix/var/nix/daemon-socket"; - serviceConfig.ExecStart = "${config.nix.package}/bin/nix-store --optimise"; - startAt = optionals cfg.automatic cfg.dates; - }; - + systemd.services.nix-optimise = lib.mkIf config.nix.enable { + description = "Nix Store Optimiser"; + # No point this if the nix daemon (and thus the nix store) is outside + unitConfig.ConditionPathIsReadWrite = "/nix/var/nix/daemon-socket"; + serviceConfig.ExecStart = "${config.nix.package}/bin/nix-store --optimise"; + startAt = lib.optionals cfg.automatic cfg.dates; + }; }; - } From f2ea5c05c14e7c8ea962058f3028c2aca45993cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 20 May 2023 02:32:19 +0200 Subject: [PATCH 005/222] nixos/nix-optimise: persist timer otherwise the timer might never run on laptops which could be shutdown during the night --- nixos/modules/services/misc/nix-optimise.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix index 58fc1ea4162a..0398229a13da 100644 --- a/nixos/modules/services/misc/nix-optimise.nix +++ b/nixos/modules/services/misc/nix-optimise.nix @@ -33,12 +33,19 @@ in } ]; - systemd.services.nix-optimise = lib.mkIf config.nix.enable { - description = "Nix Store Optimiser"; - # No point this if the nix daemon (and thus the nix store) is outside - unitConfig.ConditionPathIsReadWrite = "/nix/var/nix/daemon-socket"; - serviceConfig.ExecStart = "${config.nix.package}/bin/nix-store --optimise"; - startAt = lib.optionals cfg.automatic cfg.dates; + systemd = lib.mkIf config.nix.enable { + services.nix-optimise = { + description = "Nix Store Optimiser"; + # No point this if the nix daemon (and thus the nix store) is outside + unitConfig.ConditionPathIsReadWrite = "/nix/var/nix/daemon-socket"; + serviceConfig.ExecStart = "${config.nix.package}/bin/nix-store --optimise"; + startAt = lib.optionals cfg.automatic cfg.dates; + }; + + timers.nix-optimise.timerConfig = { + Persistent = true; + RandomizedDelaySec = 1800; + }; }; }; } From 6ed59c84208f8e14ee0b020b3b31090b04a3daa3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 May 2023 04:20:00 +0000 Subject: [PATCH 006/222] fmt_10: init at 10.0.0 https://github.com/fmtlib/fmt/releases/tag/10.0.0 --- pkgs/development/libraries/fmt/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 5f810ecbe5ed..7facad7ef438 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -51,4 +51,9 @@ in version = "9.1.0"; sha256 = "sha256-rP6ymyRc7LnKxUXwPpzhHOQvpJkpnRFOt2ctvUNlYI0="; }; + + fmt_10 = generic { + version = "10.0.0"; + sha256 = "sha256-sVY2TVPS/Zx32p5XIYR6ghqN4kOZexzH7Cr+y8sZXK8="; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f233b2d3d3b9..de1a291019e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20381,7 +20381,7 @@ with pkgs; flyway = callPackage ../development/tools/flyway { }; - inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9; + inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9 fmt_10; fmt = fmt_9; From b005ff482d839a6ecd7b954be469864304185cda Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 May 2023 04:20:00 +0000 Subject: [PATCH 007/222] fmt: add packages as reverse dependencies to passthru.tests --- pkgs/development/libraries/fmt/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 7facad7ef438..20c2510b76e1 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,5 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake +{ lib +, stdenv +, fetchFromGitHub +, cmake , enableShared ? !stdenv.hostPlatform.isStatic + +# tests +, mpd +, openimageio +, fcitx5 +, spdlog }: let @@ -27,6 +36,10 @@ let doCheck = true; + passthru.tests = { + inherit mpd openimageio fcitx5 spdlog; + }; + meta = with lib; { description = "Small, safe and fast formatting library"; longDescription = '' From b3b41261d5d0a4f59eebc92a794c7c1e8257ced2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 May 2023 04:20:00 +0000 Subject: [PATCH 008/222] fmt: add changelog to meta --- pkgs/development/libraries/fmt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 20c2510b76e1..f6ea2f018244 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -47,6 +47,7 @@ let used as a fast and safe alternative to printf and IOStreams. ''; homepage = "https://fmt.dev/"; + changelog = "https://github.com/fmtlib/fmt/blob/${version}/ChangeLog.rst"; downloadPage = "https://github.com/fmtlib/fmt/"; maintainers = [ maintainers.jdehaas ]; license = licenses.mit; From a04ba8f26ccfbe28bbe064bd73b4f05de628e26b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 May 2023 04:20:00 +0000 Subject: [PATCH 009/222] bear: fix compatiblity with fmt 10.0 --- pkgs/development/tools/build-managers/bear/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 468cec567913..c82d322cf58e 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , grpc @@ -43,6 +44,12 @@ stdenv.mkDerivation rec { patches = [ # Default libexec would be set to /nix/store/*-bear//nix/store/*-bear/libexec/... ./no-double-relative.patch + + # Fix compatiblity with fmt 10.0. Remove with the next release + (fetchpatch { + url = "https://github.com/rizsotto/Bear/commit/46a032fa0fc8131779ece13f26735ec84be891e8.patch"; + hash = "sha256-zYKwQ5PLSTJ1hROGnTfP8xPoM0cBw6abAZLx6GxmdfI="; + }) ]; meta = with lib; { From c171cc95be70f6d133bf797330111aae355453c2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 May 2023 04:20:00 +0000 Subject: [PATCH 010/222] fcitx5: fix compatiblity with fmt 10.0 --- pkgs/tools/inputmethods/fcitx5/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index 8dd13bbd1674..01167b4d007a 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchFromGitHub +, fetchpatch , pkg-config , cmake , extra-cmake-modules @@ -51,6 +52,14 @@ stdenv.mkDerivation rec { hash = "sha256-zS25XeNtBN7QIi+Re/p1uLoH/Q4xKAsFrEmgk2LYRu8="; }; + patches = [ + # Fix compatiblity with fmt 10.0. Remove with the next release + (fetchpatch { + url = "https://github.com/fcitx/fcitx5/commit/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch"; + hash = "sha256-Z4Sqdyp/doJPTB+hEUrG9vncUP29L/b0yJ/u5ldpnds="; + }) + ]; + prePatch = '' ln -s ${enDict} src/modules/spell/$(stripHash ${enDict}) ''; From 21ab21acee0c83abdf2e59a598f6e2ad589b477c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 May 2023 04:20:00 +0000 Subject: [PATCH 011/222] spdlog: fix compatiblity with fmt 10.0 --- pkgs/development/libraries/spdlog/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 01a472f8e766..93bccfbc13ba 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fmt +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, fmt , staticBuild ? stdenv.hostPlatform.isStatic }: @@ -13,6 +13,18 @@ stdenv.mkDerivation rec { hash = "sha256-kA2MAb4/EygjwiLEjF9EA7k8Tk//nwcKB1+HlzELakQ="; }; + patches = [ + # Fix compatiblity with fmt 10.0. Remove with the next release + (fetchpatch { + url = "https://github.com/gabime/spdlog/commit/0ca574ae168820da0268b3ec7607ca7b33024d05.patch"; + hash = "sha256-cRsQilkyUQW47PFpDwKgU/pm+tOeLvwPx32gNOPAO1U="; + }) + (fetchpatch { + url = "https://github.com/gabime/spdlog/commit/af1785b897c9d1098d4aa7213fad232be63c19b4.patch"; + hash = "sha256-zpfLiBeDAOsvk4vrIyXC0kvFe2WkhAhersd+fhA8DFY="; + }) + ]; + nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ fmt ]; From aaf7964376b406df6cc457e7a1b1366349c06128 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 May 2023 04:20:00 +0000 Subject: [PATCH 012/222] spdlog: add packages as reverse dependencies to passthru.tests --- pkgs/development/libraries/spdlog/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index 93bccfbc13ba..bde66f292cf9 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -1,5 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, fmt , staticBuild ? stdenv.hostPlatform.isStatic + +# tests +, bear, tiledb }: stdenv.mkDerivation rec { @@ -46,6 +49,10 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + inherit bear tiledb; + }; + meta = with lib; { description = "Very fast, header only, C++ logging library"; homepage = "https://github.com/gabime/spdlog"; From a3b6c8124afbb51206b1d4764a962c6ec67fac97 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 May 2023 04:20:00 +0000 Subject: [PATCH 013/222] mkvtoolnix: fix compatiblity with fmt 10.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 7bf52e73f9b1..437c95c4ba91 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -56,6 +56,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-jeuok3sspLQRnLCYvsmIbjhuf00eSS/4FjmzlRyzYzc="; }; + patches = [ + # Fix compatiblity with fmt 10.0. Remove with the next release + (fetchpatch { + url = "https://gitlab.com/mbunkus/mkvtoolnix/-/commit/24716ce95bf5b10d685611de23489045cf2ca5cc.patch"; + hash = "sha256-vOm3FmXL3mHzs3RHCJ9gbTLSe3xhSXo8IfgA+s0cFjY="; + includes = [ "src/common/codec.h" ]; + }) + ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl From 1d3593a6d1252b070d8ba28ad3b15e8b80921f9b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 May 2023 04:20:00 +0000 Subject: [PATCH 014/222] clasp-common-lisp: build with fmt 9 Clasp is not compatible with fmt 10 yet. --- pkgs/development/compilers/clasp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index bd43970e55b8..c9fecafbd460 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -55,7 +55,7 @@ in llvmPackages_15.stdenv.mkDerivation { sbcl git pkg-config - fmt + fmt_9 gmpxx libelf boost From b84796f3eab1ca2d9bffe33b80298fa2cb171f68 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 20 May 2023 04:20:00 +0000 Subject: [PATCH 015/222] fmt: 9.1.0 -> 10.0.0 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de1a291019e6..63896c6389f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20383,7 +20383,7 @@ with pkgs; inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9 fmt_10; - fmt = fmt_9; + fmt = fmt_10; fplll = callPackage ../development/libraries/fplll { }; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { }; From c7695805ca3f39cf1285e3db2478b315333c023b Mon Sep 17 00:00:00 2001 From: Georges Date: Sat, 6 May 2023 10:33:41 +0200 Subject: [PATCH 016/222] nixos/shadow: refactor login.defs config options Add a settings option for the login.defs file to provide enhanced configuration abilities. Co-authored-by: Sandro --- nixos/modules/programs/shadow.nix | 294 ++++++++++++++++++++---------- 1 file changed, 201 insertions(+), 93 deletions(-) diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 35267acd6bb7..00895db03fc3 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -1,67 +1,131 @@ # Configuration for the pwdutils suite of tools: passwd, useradd, etc. - { config, lib, utils, pkgs, ... }: - with lib; - let + cfg = config.security.loginDefs; +in +{ + options = with types; { + security.loginDefs = { + package = mkPackageOptionMD pkgs "shadow" { }; - /* - There are three different sources for user/group id ranges, each of which gets - used by different programs: - - The login.defs file, used by the useradd, groupadd and newusers commands - - The update-users-groups.pl file, used by NixOS in the activation phase to - decide on which ids to use for declaratively defined users without a static - id - - Systemd compile time options -Dsystem-uid-max= and -Dsystem-gid-max=, used - by systemd for features like ConditionUser=@system and systemd-sysusers - */ - loginDefs = - '' - DEFAULT_HOME yes + chfnRestrict = mkOption { + description = mdDoc '' + Use chfn SUID to allow non-root users to change their account GECOS information. + ''; + type = nullOr str; + default = null; + }; - SYS_UID_MIN 400 - SYS_UID_MAX 999 - UID_MIN 1000 - UID_MAX 29999 + settings = mkOption { + description = mdDoc '' + Config options for the /etc/login.defs file, that defines + the site-specific configuration for the shadow password suite. + See login.defs(5) man page for available options. + ''; + type = submodule { + freeformType = (pkgs.formats.keyValue { }).type; + /* There are three different sources for user/group id ranges, each of which gets + used by different programs: + - The login.defs file, used by the useradd, groupadd and newusers commands + - The update-users-groups.pl file, used by NixOS in the activation phase to + decide on which ids to use for declaratively defined users without a static + id + - Systemd compile time options -Dsystem-uid-max= and -Dsystem-gid-max=, used + by systemd for features like ConditionUser=@system and systemd-sysusers + */ + options = { + DEFAULT_HOME = mkOption { + description = mdDoc "Indicate if login is allowed if we can't cd to the home directory."; + default = "yes"; + type = enum [ "yes" "no" ]; + }; - SYS_GID_MIN 400 - SYS_GID_MAX 999 - GID_MIN 1000 - GID_MAX 29999 + ENCRYPT_METHOD = mkOption { + description = mdDoc "This defines the system default encryption algorithm for encrypting passwords."; + # The default crypt() method, keep in sync with the PAM default + default = "YESCRYPT"; + type = enum [ "YESCRYPT" "SHA512" "SHA256" "MD5" "DES"]; + }; - TTYGROUP tty - TTYPERM 0620 + SYS_UID_MIN = mkOption { + description = mdDoc "Range of user IDs used for the creation of system users by useradd or newusers."; + default = 400; + type = int; + }; - # Ensure privacy for newly created home directories. - UMASK 077 + SYS_UID_MAX = mkOption { + description = mdDoc "Range of user IDs used for the creation of system users by useradd or newusers."; + default = 999; + type = int; + }; - # Uncomment this and install chfn SUID to allow non-root - # users to change their account GECOS information. - # This should be made configurable. - #CHFN_RESTRICT frwh + UID_MIN = mkOption { + description = mdDoc "Range of user IDs used for the creation of regular users by useradd or newusers."; + default = 1000; + type = int; + }; - # The default crypt() method, keep in sync with the PAM default - ENCRYPT_METHOD YESCRYPT - ''; + UID_MAX = mkOption { + description = mdDoc "Range of user IDs used for the creation of regular users by useradd or newusers."; + default = 29999; + type = int; + }; - mkSetuidRoot = source: - { setuid = true; - owner = "root"; - group = "root"; - inherit source; + SYS_GID_MIN = mkOption { + description = mdDoc "Range of group IDs used for the creation of system groups by useradd, groupadd, or newusers"; + default = 400; + type = int; + }; + + SYS_GID_MAX = mkOption { + description = mdDoc "Range of group IDs used for the creation of system groups by useradd, groupadd, or newusers"; + default = 999; + type = int; + }; + + GID_MIN = mkOption { + description = mdDoc "Range of group IDs used for the creation of regular groups by useradd, groupadd, or newusers."; + default = 1000; + type = int; + }; + + GID_MAX = mkOption { + description = mdDoc "Range of group IDs used for the creation of regular groups by useradd, groupadd, or newusers."; + default = 29999; + type = int; + }; + + TTYGROUP = mkOption { + description = mdDoc '' + The terminal permissions: the login tty will be owned by the TTYGROUP group, + and the permissions will be set to TTYPERM''; + default = "tty"; + type = str; + }; + + TTYPERM = mkOption { + description = mdDoc '' + The terminal permissions: the login tty will be owned by the TTYGROUP group, + and the permissions will be set to TTYPERM''; + default = "0620"; + type = str; + }; + + # Ensure privacy for newly created home directories. + UMASK = mkOption { + description = mdDoc "The file mode creation mask is initialized to this value."; + default = "077"; + type = str; + }; + }; + }; + default = { }; + }; }; -in - -{ - - ###### interface - - options = { - - users.defaultUserShell = lib.mkOption { - description = lib.mdDoc '' + users.defaultUserShell = mkOption { + description = mdDoc '' This option defines the default shell assigned to user accounts. This can be either a full system path or a shell package. @@ -69,63 +133,107 @@ in used outside the store (in particular in /etc/passwd). ''; example = literalExpression "pkgs.zsh"; - type = types.either types.path types.shellPackage; + type = either path shellPackage; }; - }; - ###### implementation config = { + assertions = [ + { + assertion = cfg.settings.SYS_UID_MIN <= cfg.settings.SYS_UID_MAX; + message = "SYS_UID_MIN must be less than or equal to SYS_UID_MAX"; + } + { + assertion = cfg.settings.UID_MIN <= cfg.settings.UID_MAX; + message = "UID_MIN must be less than or equal to UID_MAX"; + } + { + assertion = cfg.settings.SYS_GID_MIN <= cfg.settings.SYS_GID_MAX; + message = "SYS_GID_MIN must be less than or equal to SYS_GID_MAX"; + } + { + assertion = cfg.settings.GID_MIN <= cfg.settings.GID_MAX; + message = "GID_MIN must be less than or equal to GID_MAX"; + } + ]; - environment.systemPackages = - lib.optional config.users.mutableUsers pkgs.shadow ++ - lib.optional (types.shellPackage.check config.users.defaultUserShell) - config.users.defaultUserShell; + security.loginDefs.settings.CHFN_RESTRICT = + mkIf (cfg.chfnRestrict != null) cfg.chfnRestrict; + + environment.systemPackages = optional config.users.mutableUsers cfg.package + ++ optional (types.shellPackage.check config.users.defaultUserShell) config.users.defaultUserShell + ++ optional (cfg.chfnRestrict != null) pkgs.util-linux; environment.etc = - { # /etc/login.defs: global configuration for pwdutils. You - # cannot login without it! - "login.defs".source = pkgs.writeText "login.defs" loginDefs; + # Create custom toKeyValue generator + # see https://man7.org/linux/man-pages/man5/login.defs.5.html for config specification + let + toKeyValue = generators.toKeyValue { + mkKeyValue = generators.mkKeyValueDefault { } " "; + }; + in + { + # /etc/login.defs: global configuration for pwdutils. + # You cannot login without it! + "login.defs".source = pkgs.writeText "login.defs" (toKeyValue cfg.settings); # /etc/default/useradd: configuration for useradd. - "default/useradd".source = pkgs.writeText "useradd" - '' - GROUP=100 - HOME=/home - SHELL=${utils.toShellPath config.users.defaultUserShell} - ''; + "default/useradd".source = pkgs.writeText "useradd" '' + GROUP=100 + HOME=/home + SHELL=${utils.toShellPath config.users.defaultUserShell} + ''; }; - security.pam.services = - { chsh = { rootOK = true; }; - chfn = { rootOK = true; }; - su = { rootOK = true; forwardXAuth = true; logFailures = true; }; - passwd = {}; - # Note: useradd, groupadd etc. aren't setuid root, so it - # doesn't really matter what the PAM config says as long as it - # lets root in. - useradd = { rootOK = true; }; - usermod = { rootOK = true; }; - userdel = { rootOK = true; }; - groupadd = { rootOK = true; }; - groupmod = { rootOK = true; }; - groupmems = { rootOK = true; }; - groupdel = { rootOK = true; }; - login = { startSession = true; allowNullPassword = true; showMotd = true; updateWtmp = true; }; - chpasswd = { rootOK = true; }; + security.pam.services = { + chsh = { rootOK = true; }; + chfn = { rootOK = true; }; + su = { + rootOK = true; + forwardXAuth = true; + logFailures = true; }; - - security.wrappers = { - su = mkSetuidRoot "${pkgs.shadow.su}/bin/su"; - sg = mkSetuidRoot "${pkgs.shadow.out}/bin/sg"; - newgrp = mkSetuidRoot "${pkgs.shadow.out}/bin/newgrp"; - newuidmap = mkSetuidRoot "${pkgs.shadow.out}/bin/newuidmap"; - newgidmap = mkSetuidRoot "${pkgs.shadow.out}/bin/newgidmap"; - } // lib.optionalAttrs config.users.mutableUsers { - chsh = mkSetuidRoot "${pkgs.shadow.out}/bin/chsh"; - passwd = mkSetuidRoot "${pkgs.shadow.out}/bin/passwd"; + passwd = { }; + # Note: useradd, groupadd etc. aren't setuid root, so it + # doesn't really matter what the PAM config says as long as it + # lets root in. + useradd.rootOK = true; + usermod.rootOK = true; + userdel.rootOK = true; + groupadd.rootOK = true; + groupmod.rootOK = true; + groupmems.rootOK = true; + groupdel.rootOK = true; + login = { + startSession = true; + allowNullPassword = true; + showMotd = true; + updateWtmp = true; + }; + chpasswd = { rootOK = true; }; }; + + security.wrappers = + let + mkSetuidRoot = source: { + setuid = true; + owner = "root"; + group = "root"; + inherit source; + }; + in + { + su = mkSetuidRoot "${cfg.package.su}/bin/su"; + sg = mkSetuidRoot "${cfg.package.out}/bin/sg"; + newgrp = mkSetuidRoot "${cfg.package.out}/bin/newgrp"; + newuidmap = mkSetuidRoot "${cfg.package.out}/bin/newuidmap"; + newgidmap = mkSetuidRoot "${cfg.package.out}/bin/newgidmap"; + } + // optionalAttrs config.users.mutableUsers { + chsh = mkSetuidRoot "${cfg.package.out}/bin/chsh"; + passwd = mkSetuidRoot "${cfg.package.out}/bin/passwd"; + }; }; } From 000000491e310c10468065602a367b71a0e07d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 May 2023 23:26:58 +0200 Subject: [PATCH 017/222] maintainers/scripts/check-hydra-by-maintainer: don't check aliases --- maintainers/scripts/check-hydra-by-maintainer.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/check-hydra-by-maintainer.nix b/maintainers/scripts/check-hydra-by-maintainer.nix index 326aae47f8c5..1062230a53c9 100644 --- a/maintainers/scripts/check-hydra-by-maintainer.nix +++ b/maintainers/scripts/check-hydra-by-maintainer.nix @@ -1,6 +1,8 @@ { maintainer }: let - pkgs = import ./../../default.nix { }; + pkgs = import ./../../default.nix { + config.allowAliases = false; + }; maintainer_ = pkgs.lib.maintainers.${maintainer}; packagesWith = cond: return: prefix: set: (pkgs.lib.flatten From 290820f2fa4c3b936b8f0451edbeb28c4e4401e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 22 May 2023 23:27:19 +0200 Subject: [PATCH 018/222] maintainers/scripts/check-hydra-by-maintainer: remove pkgs.lib use --- maintainers/scripts/check-hydra-by-maintainer.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/maintainers/scripts/check-hydra-by-maintainer.nix b/maintainers/scripts/check-hydra-by-maintainer.nix index 1062230a53c9..c40729a3974e 100644 --- a/maintainers/scripts/check-hydra-by-maintainer.nix +++ b/maintainers/scripts/check-hydra-by-maintainer.nix @@ -3,15 +3,16 @@ let pkgs = import ./../../default.nix { config.allowAliases = false; }; + inherit (pkgs) lib; maintainer_ = pkgs.lib.maintainers.${maintainer}; packagesWith = cond: return: prefix: set: - (pkgs.lib.flatten - (pkgs.lib.mapAttrsToList + (lib.flatten + (lib.mapAttrsToList (name: pkg: let result = builtins.tryEval ( - if pkgs.lib.isDerivation pkg && cond name pkg then + if lib.isDerivation pkg && cond name pkg then # Skip packages whose closure fails on evaluation. # This happens for pkgs like `python27Packages.djangoql` # that have disabled Python pkgs as dependencies. @@ -44,7 +45,7 @@ let ) ) (name: name) - ("") + "" pkgs; in From dbcd187add9ff7a11398f9a58e9ec302eb0fc264 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 6 Jun 2023 19:39:38 +0200 Subject: [PATCH 019/222] nixos/udev: silence harmless warnings `udevRulesFor` generates a lot of warnings like: substituteStream(): WARNING: pattern '"/sbin/modprobe' doesn't match anything in file '/nix/store/.../95-dm-notify.rules' due to the (preemptive) substitution of common paths in the default udev rules. In this case a file having no matches is not unepected and poses no issue at all. --- nixos/modules/services/hardware/udev.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 94406b60b29c..e3451e1f6c7d 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -72,7 +72,7 @@ let --replace \"/sbin/blkid \"${pkgs.util-linux}/sbin/blkid \ --replace \"/bin/mount \"${pkgs.util-linux}/bin/mount \ --replace /usr/bin/readlink ${pkgs.coreutils}/bin/readlink \ - --replace /usr/bin/basename ${pkgs.coreutils}/bin/basename + --replace /usr/bin/basename ${pkgs.coreutils}/bin/basename 2>/dev/null ${optionalString (initrdBin != null) '' substituteInPlace $i --replace '/run/current-system/systemd' "${removeSuffix "/bin" initrdBin}" ''} From be48010eb2591e452b3f848c12c7a1ba2426890e Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Wed, 14 Jun 2023 16:09:25 -0400 Subject: [PATCH 020/222] nixos/networkd: make overriding boot.initrd.systemd.package a little easier by using mkDefault --- nixos/modules/system/boot/networkd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 463e2b8d90b0..38d46f9a9bde 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -3165,7 +3165,7 @@ let (mkIf cfg.enable { - systemd.package = pkgs.systemdStage1Network; + systemd.package = mkDefault pkgs.systemdStage1Network; # For networkctl systemd.dbus.enable = mkDefault true; From 64ac9d57b4a31971d58b32861a42842d03831ac4 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Wed, 14 Jun 2023 10:46:18 +1000 Subject: [PATCH 021/222] networkminer: init at 2.8 --- pkgs/tools/security/networkminer/default.nix | 73 ++++++++ pkgs/tools/security/networkminer/deps.nix | 8 + .../security/networkminer/xdg-dirs.patch | 174 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 257 insertions(+) create mode 100644 pkgs/tools/security/networkminer/default.nix create mode 100644 pkgs/tools/security/networkminer/deps.nix create mode 100644 pkgs/tools/security/networkminer/xdg-dirs.patch diff --git a/pkgs/tools/security/networkminer/default.nix b/pkgs/tools/security/networkminer/default.nix new file mode 100644 index 000000000000..c9c6c528cbc4 --- /dev/null +++ b/pkgs/tools/security/networkminer/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildDotnetModule +, fetchurl +, unzip +, dos2unix +, makeWrapper +, msbuild +, mono +}: +buildDotnetModule rec { + pname = "networkminer"; + version = "2.8"; + + src = fetchurl { + # Upstream does not provide versioned releases, a mirror has been uploaded + # to archive.org + url = "https://archive.org/download/networkminer-${lib.replaceStrings ["."] ["-"] version}/NetworkMiner_${lib.replaceStrings ["."] ["-"] version}_source.zip"; + sha256 = "1n2312acq5rq0jizlcfk0crslx3wgcsd836p47nk3pnapzw0cqvv"; + }; + + nativeBuildInputs = [ unzip dos2unix msbuild ]; + + patches = [ + # Store application data in XDG_DATA_DIRS instead of trying to write to nix store + ./xdg-dirs.patch + ]; + + postPatch = '' + # Not all files have UTF-8 BOM applied consistently + find . -type f -exec dos2unix -m {} \+ + + # Embedded base64-encoded app icon in resx fails to parse. Delete it + sed -zi 's|||g' NetworkMiner/NamedPipeForm.resx + sed -zi 's|||g' NetworkMiner/UpdateCheck.resx + ''; + + nugetDeps = ./deps.nix; + + buildPhase = '' + runHook preBuild + + msbuild /p:Configuration=Release NetworkMiner.sln + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share + cp -r NetworkMiner/bin/Release $out/share/NetworkMiner + makeWrapper ${mono}/bin/mono $out/bin/NetworkMiner \ + --add-flags "$out/share/NetworkMiner/NetworkMiner.exe" \ + --add-flags "--noupdatecheck" + + install -D NetworkMiner/NetworkMiner.desktop $out/share/applications/NetworkMiner.desktop + substituteInPlace $out/share/applications/NetworkMiner.desktop \ + --replace "Exec=mono NetworkMiner.exe %f" "Exec=NetworkMiner" \ + --replace "Icon=./networkminericon-96x96.png" "Icon=NetworkMiner" + install -D NetworkMiner/networkminericon-96x96.png $out/share/pixmaps/NetworkMiner.png + + runHook postInstall + ''; + + meta = with lib; { + description = "The Open Source Network Forensic Analysis Tool (NFAT)"; + homepage = "https://www.netresec.com/?page=NetworkMiner"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.linux; + mainProgram = "NetworkMiner"; + }; +} diff --git a/pkgs/tools/security/networkminer/deps.nix b/pkgs/tools/security/networkminer/deps.nix new file mode 100644 index 000000000000..196ca32bf1ea --- /dev/null +++ b/pkgs/tools/security/networkminer/deps.nix @@ -0,0 +1,8 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.2"; sha256 = "0i42rn8xmvhn08799manpym06kpw89qy9080myyy2ngy565pqh0a"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.2"; sha256 = "0js3dp26nszx82q0phv7hmsm5z23dva7javbmk6a91lbkm07y8p2"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.2"; sha256 = "1dny43jksy6dm9zrkdm8j80gb25w6wdvjlxnphj7ngf0fbg3dd2c"; }) +] diff --git a/pkgs/tools/security/networkminer/xdg-dirs.patch b/pkgs/tools/security/networkminer/xdg-dirs.patch new file mode 100644 index 000000000000..58c0745d338b --- /dev/null +++ b/pkgs/tools/security/networkminer/xdg-dirs.patch @@ -0,0 +1,174 @@ +diff --git a/NetworkMiner/NetworkMinerForm.cs b/NetworkMiner/NetworkMinerForm.cs +index 06c808b..6495b73 100644 +--- a/NetworkMiner/NetworkMinerForm.cs ++++ b/NetworkMiner/NetworkMinerForm.cs +@@ -1,4 +1,4 @@ +-// Copyright: Erik Hjelmvik, NETRESEC ++// Copyright: Erik Hjelmvik, NETRESEC + // + // NetworkMiner is free software; you can redistribute it and/or modify it + // under the terms of the GNU General Public License +@@ -419,7 +419,7 @@ namespace NetworkMiner { + } + try { + //require FileIOPermission to be PermissionState.Unrestricted +- string path = System.IO.Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath) + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY; ++ string path = System.IO.Path.GetDirectoryName(SharedUtils.XdgDirectories.GetOrCreateXdgDataHome()) + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY; + System.Security.Permissions.FileIOPermission fileIOPerm = new System.Security.Permissions.FileIOPermission(System.Security.Permissions.FileIOPermissionAccess.AllAccess, path); + fileIOPerm.Demand(); + } +@@ -1023,13 +1023,13 @@ namespace NetworkMiner { + public void CreateNewPacketHandlerWrapper(System.IO.DirectoryInfo outputDirectory) { + //make sure that folders exists + try { +- System.IO.DirectoryInfo di = new System.IO.DirectoryInfo(outputDirectory.FullName + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY); ++ System.IO.DirectoryInfo di = new System.IO.DirectoryInfo(SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY); + if (!di.Exists) + di.Create(); +- di = new System.IO.DirectoryInfo(outputDirectory.FullName + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY + System.IO.Path.DirectorySeparatorChar + "cache"); ++ di = new System.IO.DirectoryInfo(SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY + System.IO.Path.DirectorySeparatorChar + "cache"); + if (!di.Exists) + di.Create(); +- di = new System.IO.DirectoryInfo(outputDirectory.FullName + System.IO.Path.DirectorySeparatorChar + "Captures"); ++ di = new System.IO.DirectoryInfo(SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + "Captures"); + if (!di.Exists) + di.Create(); + } +@@ -1962,7 +1962,7 @@ namespace NetworkMiner { + string filename = Tools.GenerateCaptureFileName(DateTime.Now); + //string filename="NM_"+DateTime.Now.ToString("s", System.Globalization.DateTimeFormatInfo.InvariantInfo).Replace(':','-')+".pcap"; + +- string fileFullPath = this.OutputDirectory.FullName + "Captures" + System.IO.Path.DirectorySeparatorChar + filename; ++ string fileFullPath = SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + "Captures" + System.IO.Path.DirectorySeparatorChar + filename; + //string fileFullPath = System.IO.Path.GetDirectoryName(System.IO.Path.GetFullPath(System.Windows.Forms.Application.ExecutablePath)) + System.IO.Path.DirectorySeparatorChar + "Captures" + System.IO.Path.DirectorySeparatorChar + filename; + + //make sure to get the right datalink type +@@ -2534,7 +2534,7 @@ namespace NetworkMiner { + + if (removeCapturedFiles) { + PacketParser.FileTransfer.FileStreamAssemblerList.RemoveTempFiles(); +- string capturesDirectory = System.IO.Path.GetDirectoryName(System.IO.Path.GetFullPath(System.Windows.Forms.Application.ExecutablePath)) + System.IO.Path.DirectorySeparatorChar + "Captures"; ++ string capturesDirectory = System.IO.Path.GetDirectoryName(System.IO.Path.GetFullPath(SharedUtils.XdgDirectories.GetOrCreateXdgDataHome())) + System.IO.Path.DirectorySeparatorChar + "Captures"; + if (System.IO.Directory.Exists(capturesDirectory)) { + foreach (string pcapFile in System.IO.Directory.GetFiles(capturesDirectory)) + try { +@@ -2545,7 +2545,7 @@ namespace NetworkMiner { + //this.ShowAnomaly("Error deleting file \"" + pcapFile + "\"", DateTime.Now); + } + } +- capturesDirectory = this.packetHandlerWrapper.PacketHandler.OutputDirectory + "Captures"; ++ capturesDirectory = SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + "Captures"; + if (System.IO.Directory.Exists(capturesDirectory)) { + foreach (string pcapFile in System.IO.Directory.GetFiles(capturesDirectory)) + try { +@@ -2635,7 +2635,7 @@ namespace NetworkMiner { + try { + PacketParser.Utils.ByteConverter.ToByteArrayFromHexString(keyword);//to force valid hex + this.keywordListBox.Items.Add(keyword); +- //Lägg till keywordet till PacketHandler.PacketHandler!!! ++ //L�gg till keywordet till PacketHandler.PacketHandler!!! + } + catch (Exception ex) { + errorMessage = ex.Message; +@@ -2720,7 +2720,7 @@ namespace NetworkMiner { + #endregion + + private void hostSortOrderComboBox_SelectedIndexChanged(object sender, EventArgs e) { +- //HÄR SKA detailsHeader LIGGA Enabled MASSA OLIKA SORTERINGSORDNINGAR: ++ //H�R SKA detailsHeader LIGGA Enabled MASSA OLIKA SORTERINGSORDNINGAR: + //IP, HOTSNAME, SENT PACKETS, RECEIVED PACKETS, MAC ADDRESS + this.RebuildHostsTree(sender, e); + } +@@ -2754,7 +2754,7 @@ namespace NetworkMiner { + foreach (string p in paths) { + if (!p.Contains(PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY)) + return false; +- if (!this.IsSubDirectoryOf(new System.IO.DirectoryInfo(p), new System.IO.DirectoryInfo(this.packetHandlerWrapper.PacketHandler.OutputDirectory + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY))) ++ if (!this.IsSubDirectoryOf(new System.IO.DirectoryInfo(p), new System.IO.DirectoryInfo(SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY))) + return false; + } + return true; +@@ -3976,7 +3976,7 @@ finally { + } + + private void closeToolStripMenuItem_Click(object sender, EventArgs e) { +- DialogResult yesOrNo = MessageBox.Show("Would you like to delete all extracted files from:" + Environment.NewLine + this.OutputDirectory.FullName + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY + System.IO.Path.DirectorySeparatorChar, "Delete extracted files?", MessageBoxButtons.YesNo); ++ DialogResult yesOrNo = MessageBox.Show("Would you like to delete all extracted files from:" + Environment.NewLine + SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY + System.IO.Path.DirectorySeparatorChar, "Delete extracted files?", MessageBoxButtons.YesNo); + this.ResetCapturedData(false, yesOrNo == DialogResult.Yes, true); + } + +diff --git a/NetworkMiner/PcapOverIP/ReceivePcapOverTcpForm.cs b/NetworkMiner/PcapOverIP/ReceivePcapOverTcpForm.cs +index 9bae5f0..72586d4 100644 +--- a/NetworkMiner/PcapOverIP/ReceivePcapOverTcpForm.cs ++++ b/NetworkMiner/PcapOverIP/ReceivePcapOverTcpForm.cs +@@ -162,7 +162,7 @@ namespace NetworkMiner.PcapOverIP { + DateTime lastFrameTimestamp = DateTime.MinValue; + + string filename = Tools.GenerateCaptureFileName(DateTime.Now); +- string fileFullPath = this.packetHandler.OutputDirectory + "Captures" + System.IO.Path.DirectorySeparatorChar + filename; ++ string fileFullPath = SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + "Captures" + System.IO.Path.DirectorySeparatorChar + filename; + //string fileFullPath = System.IO.Path.GetDirectoryName(System.IO.Path.GetFullPath(System.Windows.Forms.Application.ExecutablePath)) + System.IO.Path.DirectorySeparatorChar + "Captures" + System.IO.Path.DirectorySeparatorChar + filename; + + PcapFileWriter pcapFileWriter = new PcapFileWriter(fileFullPath, this.pcapStreamReader.FileDataLinkType[0]); +diff --git a/PacketParser/FileTransfer/FileStreamAssemblerList.cs b/PacketParser/FileTransfer/FileStreamAssemblerList.cs +index 4a6a4dd..129d48b 100644 +--- a/PacketParser/FileTransfer/FileStreamAssemblerList.cs ++++ b/PacketParser/FileTransfer/FileStreamAssemblerList.cs +@@ -191,7 +191,7 @@ namespace PacketParser.FileTransfer { + if (removeExtractedFilesFromDisk) { + //remove all files + foreach (string subDirectory in System.IO.Directory.GetDirectories(this.FileOutputDirectory)) { +- if (subDirectory == this.FileOutputDirectory + System.IO.Path.DirectorySeparatorChar + "cache") { ++ if (subDirectory == SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + "cache") { + foreach (string cacheFile in System.IO.Directory.GetFiles(subDirectory)) + try { + System.IO.File.Delete(cacheFile); +diff --git a/PacketParser/PacketHandler.cs b/PacketParser/PacketHandler.cs +index a600200..cb78071 100644 +--- a/PacketParser/PacketHandler.cs ++++ b/PacketParser/PacketHandler.cs +@@ -1,4 +1,4 @@ +-// Copyright: Erik Hjelmvik, NETRESEC ++// Copyright: Erik Hjelmvik, NETRESEC + // + // NetworkMiner is free software; you can redistribute it and/or modify it + // under the terms of the GNU General Public License +@@ -228,7 +228,7 @@ namespace PacketParser { + //this.networkTcpSessionDictionary=new Dictionary(); + this.networkTcpSessionList=new PopularityList(200); + this.networkTcpSessionList.PopularityLost+=new PopularityList.PopularityLostEventHandler(networkTcpSessionList_PopularityLost); +- this.FileStreamAssemblerList = new FileTransfer.FileStreamAssemblerList(this, 100, this.OutputDirectory + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY + System.IO.Path.DirectorySeparatorChar); ++ this.FileStreamAssemblerList = new FileTransfer.FileStreamAssemblerList(this, 100, SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY + System.IO.Path.DirectorySeparatorChar); + this.FileStreamAssemblerList.PopularityLost += this.FileStreamAssemblerList_PopularityLost; + this.ReconstructedFileList=new List(); + this.credentialList=new SortedList(); +@@ -874,7 +874,7 @@ namespace PacketParser { + + //check the frame content for keywords + foreach (byte[] keyword in this.keywordList) { +- //jAG SLUTADE HÄR. FUNKAR EJ VID RELOAD ++ //jAG SLUTADE H�R. FUNKAR EJ VID RELOAD + int keyIndex = receivedFrame.IndexOf(keyword); + if (keyIndex >= 0) { + if (networkPacket != null) +diff --git a/SharedUtils/XdgDirectories.cs b/SharedUtils/XdgDirectories.cs +new file mode 100644 +index 0000000..80c09e3 +--- /dev/null ++++ b/SharedUtils/XdgDirectories.cs +@@ -0,0 +1,15 @@ ++using System; ++using System.IO; ++ ++namespace SharedUtils { ++ public class XdgDirectories { ++ public static string GetOrCreateXdgDataHome() { ++ string home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); ++ string data = Environment.GetEnvironmentVariable("XDG_DATA_HOME") ?? home + System.IO.Path.DirectorySeparatorChar + ".local" + System.IO.Path.DirectorySeparatorChar + "share"; ++ string dir = data + System.IO.Path.DirectorySeparatorChar + "NetworkMiner"; ++ // Directory.CreateDirectory(dir); ++ return dir; ++ } ++ ++ } ++} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bb2c80d05f2..c94dd3aad2c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9600,6 +9600,8 @@ with pkgs; netsniff-ng = callPackage ../tools/networking/netsniff-ng { }; + networkminer = callPackage ../tools/security/networkminer { }; + nixpacks = callPackage ../applications/virtualization/nixpacks { }; nkeys = callPackage ../tools/system/nkeys { }; From 051fe7c2227563698ffff9844ea3229dd87d7dad Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Wed, 14 Jun 2023 11:55:14 +0100 Subject: [PATCH 022/222] python3Packages.pkgutil-resolve-name: init at 1.3.10 --- .../pkgutil-resolve-name/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/pkgutil-resolve-name/default.nix diff --git a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix new file mode 100644 index 000000000000..00b419ca7c19 --- /dev/null +++ b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, fetchPypi +, lib +, nix-update-script +, pythonOlder +}: +buildPythonPackage rec { + pname = "pkgutil_resolve_name"; + version = "1.3.10"; + src = fetchPypi { + inherit pname version; + hash = "sha256-NX1snmp1VlPP14iTgXwIU682XdUeyX89NYqBk3O70XQ="; + }; + format = "flit"; + disabled = pythonOlder "3.7"; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://pypi.org/project/pkgutil_resolve_name/"; + description = "A backport of Python 3.9’s pkgutil.resolve_name."; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yajo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd5c9b3b1f00..58b16f835fe4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7530,6 +7530,8 @@ self: super: with self; { phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + pkgutil-resolve-name = callPackage ../development/python-modules/pkgutil-resolve-name { }; + micloud = callPackage ../development/python-modules/micloud { }; msgraph-core = callPackage ../development/python-modules/msgraph-core { }; From 0f574794a21a050a1d0ec28bc75663e569f7b7ff Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Wed, 14 Jun 2023 11:57:56 +0100 Subject: [PATCH 023/222] python38Packages.jsonschema: depend on pkgutil-resolve-name The missing dependency was making the build fail. See https://github.com/python-jsonschema/jsonschema/blob/d35f2c258a8a4fed7533d73e9fe3f3ec36c579e8/pyproject.toml#L42 Co-authored-by: Sandro --- .../development/python-modules/jsonschema/default.nix | 2 ++ .../python-modules/pkgutil-resolve-name/default.nix | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index f60b693a8287..52bc89511d23 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -7,6 +7,7 @@ , hatchling , importlib-metadata , importlib-resources +, pkgutil-resolve-name , pyrsistent , pythonOlder , twisted @@ -54,6 +55,7 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources + pkgutil-resolve-name ]; passthru.optional-dependencies = { diff --git a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix index 00b419ca7c19..79c5c209d07b 100644 --- a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix +++ b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix @@ -5,14 +5,17 @@ , pythonOlder }: buildPythonPackage rec { - pname = "pkgutil_resolve_name"; + pname = "pkgutil-resolve-name"; version = "1.3.10"; + format = "flit"; + + disabled = pythonOlder "3.7"; + src = fetchPypi { - inherit pname version; + pname = "pkgutil_resolve_name"; + inherit version; hash = "sha256-NX1snmp1VlPP14iTgXwIU682XdUeyX89NYqBk3O70XQ="; }; - format = "flit"; - disabled = pythonOlder "3.7"; passthru.updateScript = nix-update-script { }; From db230657fce0f8cf0c5bbee490bbef3dc84ab8dc Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sun, 14 May 2023 23:12:50 +0200 Subject: [PATCH 024/222] nixos/pixelfed: cleanup package cache at the very start --- nixos/modules/services/web-apps/pixelfed.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix index b0c92aac979f..ada8465c4fee 100644 --- a/nixos/modules/services/web-apps/pixelfed.nix +++ b/nixos/modules/services/web-apps/pixelfed.nix @@ -380,6 +380,12 @@ in { }; script = '' + # Before running any PHP program, cleanup the bootstrap. + # It's necessary if you upgrade the application otherwise you might + # try to import non-existent modules. + rm -f ${cfg.runtimeDir}/bootstrap/app.php + rm -rf ${cfg.runtimeDir}/bootstrap/cache/* + # Concatenate non-secret .env and secret .env rm -f ${cfg.dataDir}/.env cp --no-preserve=all ${configFile} ${cfg.dataDir}/.env @@ -406,11 +412,6 @@ in { # Install Horizon # FIXME: require write access to public/ — should be done as part of install — pixelfed-manage horizon:publish - # Before running any PHP program, cleanup the bootstrap. - # It's necessary if you upgrade the application otherwise you might - # try to import non-existent modules. - rm -rf ${cfg.runtimeDir}/bootstrap/* - # Perform the first migration. [[ ! -f ${cfg.dataDir}/.initial-migration ]] && pixelfed-manage migrate --force && touch ${cfg.dataDir}/.initial-migration From 38e58154222a40774bbd3170c92546deccc364ae Mon Sep 17 00:00:00 2001 From: Astavie Date: Thu, 15 Jun 2023 16:49:35 +0200 Subject: [PATCH 025/222] odin: 0.13.0 -> dev-2023-05 --- maintainers/maintainer-list.nix | 6 +++ pkgs/development/compilers/odin/default.nix | 51 ++++++++++++++------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 43 insertions(+), 18 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1bcc00c334bb..42224cea975e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1429,6 +1429,12 @@ githubId = 453170; name = "Alastair Pharo"; }; + astavie = { + email = "astavie@pm.me"; + github = "astavie"; + githubId = 7745457; + name = "Astavie"; + }; astro = { email = "astro@spaceboyz.net"; github = "astro"; diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/development/compilers/odin/default.nix index 5845be142b62..f53981d21d2e 100644 --- a/pkgs/development/compilers/odin/default.nix +++ b/pkgs/development/compilers/odin/default.nix @@ -1,31 +1,43 @@ { lib , fetchFromGitHub -, llvmPackages +, llvmPackages_13 , makeWrapper , libiconv +, MacOSX-SDK +, which }: let + llvmPackages = llvmPackages_13; inherit (llvmPackages) stdenv; in stdenv.mkDerivation rec { pname = "odin"; - version = "0.13.0"; + version = "dev-2023-05"; src = fetchFromGitHub { owner = "odin-lang"; repo = "Odin"; - rev = "v${version}"; - sha256 = "ke2HPxVtF/Lh74Tv6XbpM9iLBuXLdH1+IE78MAacfYY="; + rev = version; + sha256 = "sha256-qEewo2h4dpivJ7D4RxxBZbtrsiMJ7AgqJcucmanbgxY="; }; nativeBuildInputs = [ - makeWrapper + makeWrapper which ]; buildInputs = lib.optional stdenv.isDarwin libiconv; - postPatch = '' - sed -i 's/^GIT_SHA=.*$/GIT_SHA=/' Makefile + LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; + + postPatch = lib.optionalString stdenv.isDarwin '' + sed -i src/main.cpp \ + -e 's|-syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk|-syslibroot ${MacOSX-SDK}|' + '' + '' + sed -i build_odin.sh \ + -e 's/^GIT_SHA=.*$/GIT_SHA=/' \ + -e 's/LLVM-C/LLVM/' \ + -e 's/framework System/lSystem/' + patchShebangs build_odin.sh ''; dontConfigure = true; @@ -37,21 +49,26 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp odin $out/bin/odin - cp -r core $out/bin/core - wrapProgram $out/bin/odin --prefix PATH : ${lib.makeBinPath (with llvmPackages; [ - bintools - llvm - clang - lld - ])} + mkdir -p $out/share + cp -r core $out/share/core + cp -r vendor $out/share/vendor + + wrapProgram $out/bin/odin \ + --prefix PATH : ${lib.makeBinPath (with llvmPackages; [ + bintools + llvm + clang + lld + ])} \ + --set-default ODIN_ROOT $out/share ''; meta = with lib; { description = "A fast, concise, readable, pragmatic and open sourced programming language"; homepage = "https://odin-lang.org/"; - license = licenses.bsd2; - maintainers = with maintainers; [ luc65r ]; - platforms = platforms.x86_64; + license = licenses.bsd3; + maintainers = with maintainers; [ luc65r astavie ]; + platforms = platforms.x86_64 ++ [ "aarch64-darwin" ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95f4b821a799..28cc694e1823 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27596,7 +27596,9 @@ with pkgs; octomap = callPackage ../development/libraries/octomap { }; - odin = callPackage ../development/compilers/odin { }; + odin = callPackage ../development/compilers/odin { + inherit (pkgs.darwin.apple_sdk_11_0) MacOSX-SDK; + }; odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; From cfe665eb266ee4728a70d4e13a540ecebd5948de Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Fri, 16 Jun 2023 19:00:55 +0100 Subject: [PATCH 026/222] ispc: fix darwin --- pkgs/development/compilers/ispc/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 004bf4bb10de..b06282495c0e 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses +, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode # the default test target is sse4, but that is not supported by all Hydra agents , testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ] @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-WBAVgjQjW4x9JGx6xotPoTVOePsPjBJEyBYA7TCTBvc="; }; - nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ]; + nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; buildInputs = with llvmPackages; [ libllvm libclang openmp ncurses ]; @@ -30,8 +30,7 @@ stdenv.mkDerivation rec { inherit testedTargets; - # needs 'transcendentals' executable, which is only on linux - doCheck = stdenv.isLinux; + doCheck = true; # the compiler enforces -Werror, and -fno-strict-overflow makes it mad. # hilariously this is something of a double negative: 'disable' the @@ -60,6 +59,8 @@ stdenv.mkDerivation rec { "-DISPC_INCLUDE_UTILS=OFF" ("-DARM_ENABLED=" + (if stdenv.isAarch64 || stdenv.isAarch32 then "TRUE" else "FALSE")) ("-DX86_ENABLED=" + (if stdenv.isx86_64 || stdenv.isx86_32 then "TRUE" else "FALSE")) + ] ++ lib.lists.optionals stdenv.isDarwin [ + "-DISPC_MACOS_SDK_PATH=${xcode}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk" ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 25c408635a47..e4a4789ccdbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21426,6 +21426,7 @@ with pkgs; ispc = callPackage ../development/compilers/ispc { inherit (llvmPackages) stdenv; + xcode = darwin.xcode_14; }; isso = callPackage ../servers/isso { From b8c2f83395b63e2db36be78215e462485d565377 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 16 Jun 2023 00:52:15 +0200 Subject: [PATCH 027/222] pixelfed: add update script --- pkgs/servers/web-apps/pixelfed/default.nix | 5 +++- pkgs/servers/web-apps/pixelfed/update.sh | 35 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100755 pkgs/servers/web-apps/pixelfed/update.sh diff --git a/pkgs/servers/web-apps/pixelfed/default.nix b/pkgs/servers/web-apps/pixelfed/default.nix index 5a8dfbabd395..288bcab6f4fd 100644 --- a/pkgs/servers/web-apps/pixelfed/default.nix +++ b/pkgs/servers/web-apps/pixelfed/default.nix @@ -38,7 +38,10 @@ in package.override rec { hash = "sha256-ZrvYKMSx5WymWR46/UKr5jCsclXXzBeY21ju22zeqN0="; }; - passthru.tests = { inherit (nixosTests) pixelfed; }; + passthru = { + tests = { inherit (nixosTests) pixelfed; }; + updateScript = ./update.sh; + }; meta = with lib; { description = "A federated image sharing platform"; diff --git a/pkgs/servers/web-apps/pixelfed/update.sh b/pkgs/servers/web-apps/pixelfed/update.sh new file mode 100755 index 000000000000..6408170add8b --- /dev/null +++ b/pkgs/servers/web-apps/pixelfed/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#! nix-shell -I nixpkgs=../../../.. -i bash -p nix curl jq nix-update + +# check if composer2nix is installed +if ! command -v composer2nix &> /dev/null; then + echo "Please install composer2nix (https://github.com/svanderburg/composer2nix) to run this script." + exit 1 +fi + +CURRENT_VERSION=$(nix eval -f ../../../.. --raw pixelfed.version) +TARGET_VERSION_REMOTE=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} https://api.github.com/repos/pixelfed/pixelfed/releases/latest | jq -r ".tag_name") +TARGET_VERSION=${TARGET_VERSION_REMOTE:1} +PIXELFED=https://github.com/pixelfed/pixelfed/raw/$TARGET_VERSION_REMOTE +SHA256=$(nix-prefetch-url --unpack "https://github.com/pixelfed/pixelfed/archive/v$TARGET_VERSION/pixelfed.tar.gz") + +if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then + echo "pixelfed is up-to-date: ${CURRENT_VERSION}" + exit 0 +fi + +curl -LO "$PIXELFED/composer.json" +curl -LO "$PIXELFED/composer.lock" + +composer2nix --name "pixelfed" \ + --composition=composition.nix \ + --no-dev +rm composer.json composer.lock + +# change version number +sed -e "s/version =.*;/version = \"$TARGET_VERSION\";/g" \ + -e "s/sha256 =.*;/sha256 = \"$SHA256\";/g" \ + -i ./default.nix + +cd ../../../.. +nix-build -A pixelfed From 8dc46af8e38cba60e125fdd16772ee57cbb0b5f9 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 17 Jun 2023 19:21:09 +0200 Subject: [PATCH 028/222] pixelfed: fix hash format in update script --- pkgs/servers/web-apps/pixelfed/update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/pixelfed/update.sh b/pkgs/servers/web-apps/pixelfed/update.sh index 6408170add8b..f629444013d6 100755 --- a/pkgs/servers/web-apps/pixelfed/update.sh +++ b/pkgs/servers/web-apps/pixelfed/update.sh @@ -12,6 +12,7 @@ TARGET_VERSION_REMOTE=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} https://a TARGET_VERSION=${TARGET_VERSION_REMOTE:1} PIXELFED=https://github.com/pixelfed/pixelfed/raw/$TARGET_VERSION_REMOTE SHA256=$(nix-prefetch-url --unpack "https://github.com/pixelfed/pixelfed/archive/v$TARGET_VERSION/pixelfed.tar.gz") +SRI_HASH=$(nix hash to-sri --type sha256 "$SHA256") if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then echo "pixelfed is up-to-date: ${CURRENT_VERSION}" @@ -28,7 +29,7 @@ rm composer.json composer.lock # change version number sed -e "s/version =.*;/version = \"$TARGET_VERSION\";/g" \ - -e "s/sha256 =.*;/sha256 = \"$SHA256\";/g" \ + -e "s/hash =.*;/hash = \"$SRI_HASH\";/g" \ -i ./default.nix cd ../../../.. From 89e4a7dce65358cc1fb73d200ba1892251fabd00 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 17 Jun 2023 19:22:57 +0200 Subject: [PATCH 029/222] pixelfed: 0.11.5 -> 0.11.8 --- pkgs/servers/web-apps/pixelfed/default.nix | 4 +- .../web-apps/pixelfed/php-packages.nix | 727 ++++-------------- 2 files changed, 170 insertions(+), 561 deletions(-) diff --git a/pkgs/servers/web-apps/pixelfed/default.nix b/pkgs/servers/web-apps/pixelfed/default.nix index 288bcab6f4fd..acf15e4ca83d 100644 --- a/pkgs/servers/web-apps/pixelfed/default.nix +++ b/pkgs/servers/web-apps/pixelfed/default.nix @@ -28,14 +28,14 @@ let }); in package.override rec { pname = "pixelfed"; - version = "0.11.5"; + version = "0.11.8"; # GitHub distribution does not include vendored files src = fetchFromGitHub { owner = "pixelfed"; repo = pname; rev = "v${version}"; - hash = "sha256-ZrvYKMSx5WymWR46/UKr5jCsclXXzBeY21ju22zeqN0="; + hash = "sha256-du+xwSrMqt4KIzQRUos6EmVBRp+39gHuoLSRsgLe1CQ="; }; passthru = { diff --git a/pkgs/servers/web-apps/pixelfed/php-packages.nix b/pkgs/servers/web-apps/pixelfed/php-packages.nix index 1b1643af27fc..deaf587e5c08 100644 --- a/pkgs/servers/web-apps/pixelfed/php-packages.nix +++ b/pkgs/servers/web-apps/pixelfed/php-packages.nix @@ -2,16 +2,6 @@ let packages = { - "asm89/stack-cors" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "asm89-stack-cors-73e5b88775c64ccc0b84fb60836b30dc9d92ac4a"; - src = fetchurl { - url = "https://api.github.com/repos/asm89/stack-cors/zipball/73e5b88775c64ccc0b84fb60836b30dc9d92ac4a"; - sha256 = "1idpisw39ba2dic9jl2s2yrkdgbyny9dfxf0qdr5i0wfvvlmbdih"; - }; - }; - }; "aws/aws-crt-php" = { targetDir = ""; src = composerEnv.buildZipPackage { @@ -25,10 +15,10 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-42ca7ade60a775fc5eb103d4631df3d366b48a29"; + name = "aws-aws-sdk-php-f481134d37b8303fa2e82ca7fe2a3124144057f6"; src = fetchurl { - url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/42ca7ade60a775fc5eb103d4631df3d366b48a29"; - sha256 = "07bcpwsx0by2h5bgrd3bjl6fndzgpbsnaz9g65ga4yb5d36799br"; + url = "https://api.github.com/repos/aws/aws-sdk-php/zipball/f481134d37b8303fa2e82ca7fe2a3124144057f6"; + sha256 = "0ym593x000cm7yjsav0i53sq36np8d4r1j1zhbhfc06765s0x05q"; }; }; }; @@ -65,10 +55,10 @@ let "buzz/laravel-h-captcha" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "buzz-laravel-h-captcha-502a4a15953cde6e0a17df6fec1459a565504d9b"; + name = "buzz-laravel-h-captcha-f2db3734203876ef1f69ba4dc0f4d9d71462f534"; src = fetchurl { - url = "https://api.github.com/repos/thinhbuzz/laravel-h-captcha/zipball/502a4a15953cde6e0a17df6fec1459a565504d9b"; - sha256 = "1ki38b3cjxgydn3845d9a7zrxdiqmdq5ahsl7r3nwcf0m0xj9yby"; + url = "https://api.github.com/repos/thinhbuzz/laravel-h-captcha/zipball/f2db3734203876ef1f69ba4dc0f4d9d71462f534"; + sha256 = "1zpjn2h2181g25acp9j40ll6yigqwpkhvwavxf2dgg08rw76z50h"; }; }; }; @@ -125,10 +115,10 @@ let "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-c480849ca3ad6706a39c970cdfe6888fa8a058b8"; + name = "doctrine-dbal-b4bd1cfbd2b916951696d82e57d054394d84864c"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/dbal/zipball/c480849ca3ad6706a39c970cdfe6888fa8a058b8"; - sha256 = "15j98h80li6m1aj53p8ddy0lkbkanc5kdy6xrikpdd6zhmsfgq9k"; + url = "https://api.github.com/repos/doctrine/dbal/zipball/b4bd1cfbd2b916951696d82e57d054394d84864c"; + sha256 = "04qiilphjk1zx4j5pwjh0svi90ad7vrb94h3x02wscfracxbwhjz"; }; }; }; @@ -145,10 +135,10 @@ let "doctrine/event-manager" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-event-manager-95aa4cb529f1e96576f3fda9f5705ada4056a520"; + name = "doctrine-event-manager-750671534e0241a7c50ea5b43f67e23eb5c96f32"; src = fetchurl { - url = "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520"; - sha256 = "0xi2s28jmmvrndg1yd0r5s10d9a0q6j2dxdbazvcbws9waf0yrvj"; + url = "https://api.github.com/repos/doctrine/event-manager/zipball/750671534e0241a7c50ea5b43f67e23eb5c96f32"; + sha256 = "1inhh3k8ai8d6rhx5xsbdx0ifc3yjjfrahi0cy1npz9nx3383cfh"; }; }; }; @@ -235,20 +225,10 @@ let "firebase/php-jwt" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "firebase-php-jwt-4dd1e007f22a927ac77da5a3fbb067b42d3bc224"; + name = "firebase-php-jwt-e94e7353302b0c11ec3cfff7180cd0b1743975d2"; src = fetchurl { - url = "https://api.github.com/repos/firebase/php-jwt/zipball/4dd1e007f22a927ac77da5a3fbb067b42d3bc224"; - sha256 = "0wl5glq7bzqrph6pm6js05qnydp0rlchc494cjhbv54rawyb6wfs"; - }; - }; - }; - "fruitcake/laravel-cors" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "fruitcake-laravel-cors-783a74f5e3431d7b9805be8afb60fd0a8f743534"; - src = fetchurl { - url = "https://api.github.com/repos/fruitcake/laravel-cors/zipball/783a74f5e3431d7b9805be8afb60fd0a8f743534"; - sha256 = "13mqhjks048fb5042l0rfrr52rz7knp9gjn8qviw9cx76kllw2c9"; + url = "https://api.github.com/repos/firebase/php-jwt/zipball/e94e7353302b0c11ec3cfff7180cd0b1743975d2"; + sha256 = "1iv1252x141m7nhhxzg2bawfyzsvaprhlclhlyhacra9pd5ng61y"; }; }; }; @@ -275,30 +255,30 @@ let "guzzlehttp/guzzle" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-guzzle-b50a2a1251152e43f6a37f0fa053e730a67d25ba"; + name = "guzzlehttp-guzzle-fb7566caccf22d74d1ab270de3551f72a58399f5"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba"; - sha256 = "0cy828r0kafx58jh0k1cy17y77qh248d9kfk9ncn9pyq2q5v9p9p"; + url = "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5"; + sha256 = "0cmpq50s5xi9sg1dygllrhwj5dz5bxxj83xkvjspz63751xr51cs"; }; }; }; "guzzlehttp/promises" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-promises-b94b2807d85443f9719887892882d0329d1e2598"; + name = "guzzlehttp-promises-67ab6e18aaa14d753cc148911d273f6e6cb6721e"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598"; - sha256 = "1vvac7y5ax955qjg7dyjmaw3vab9v2lypjygap0040rv3z4x9vz8"; + url = "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e"; + sha256 = "0y3md6lkpk60kvmi607mgj29cfjg2bljc5nhfh3qf9hzk6c1b2j6"; }; }; }; "guzzlehttp/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "guzzlehttp-psr7-3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf"; + name = "guzzlehttp-psr7-b635f279edd83fc275f822a1188157ffea568ff6"; src = fetchurl { - url = "https://api.github.com/repos/guzzle/psr7/zipball/3cf1b6d4f0c820a2cf8bcaec39fc698f3443b5cf"; - sha256 = "1zgnykvv9fz2adava0gb2sm8wgnxkqj1jy2fky1v6vk1r7xdmr3j"; + url = "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6"; + sha256 = "0734h3r8db06hcffagr8s7bxhjkvlfzvqg1klwmqidflwdwk7yj1"; }; }; }; @@ -345,10 +325,10 @@ let "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-9239128cfb4d22afefb64060dfecf53e82987267"; + name = "laravel-framework-9e6dcff23ab1d4b522bef56074c31625cf077576"; src = fetchurl { - url = "https://api.github.com/repos/laravel/framework/zipball/9239128cfb4d22afefb64060dfecf53e82987267"; - sha256 = "1lpkhhhga9g5njig1qf8n2fs0szni5al19cr3ilnlqhy55dmmrb6"; + url = "https://api.github.com/repos/laravel/framework/zipball/9e6dcff23ab1d4b522bef56074c31625cf077576"; + sha256 = "0nw3isfjmwqs1a4n3qvw0kvsg6jsrx5wcapkxdbcfp2lha0sbmld"; }; }; }; @@ -365,20 +345,20 @@ let "laravel/horizon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-horizon-b49be302566365e0e4d517aac9995a8fe20b580e"; + name = "laravel-horizon-4f762b1bd47b51f0557da84873a208410de9eece"; src = fetchurl { - url = "https://api.github.com/repos/laravel/horizon/zipball/b49be302566365e0e4d517aac9995a8fe20b580e"; - sha256 = "0q2f9q670cfxnzdaij4g5h1h5nd8xjh72hksqcxl469nxnnz0f16"; + url = "https://api.github.com/repos/laravel/horizon/zipball/4f762b1bd47b51f0557da84873a208410de9eece"; + sha256 = "0f9bxc63kqf1ljs1hv5g8h7j337wdy1xs0bcv45dwmh49f1fzkwm"; }; }; }; "laravel/passport" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-passport-4bfdb9610575a0c84a6810701f4fd45fb8ab3888"; + name = "laravel-passport-48a03ffbfce7217b7ceba2c8e685ae8caa68db10"; src = fetchurl { - url = "https://api.github.com/repos/laravel/passport/zipball/4bfdb9610575a0c84a6810701f4fd45fb8ab3888"; - sha256 = "0nkp1gkvyp16i1cpb7wn5slbichyv12rpjfq35s7riyaynhbpkzr"; + url = "https://api.github.com/repos/laravel/passport/zipball/48a03ffbfce7217b7ceba2c8e685ae8caa68db10"; + sha256 = "1lnz22l2jxixbhk0833kvx04xh97q0vz5rqc8dzggim22mdrpd0c"; }; }; }; @@ -405,10 +385,10 @@ let "laravel/ui" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-ui-65ec5c03f7fee2c8ecae785795b829a15be48c2c"; + name = "laravel-ui-a58ec468db4a340b33f3426c778784717a2c144b"; src = fetchurl { - url = "https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c"; - sha256 = "0hr8kkbxvxxidnw86r1i92938wajhskv68zjn1627h1i16b10ysm"; + url = "https://api.github.com/repos/laravel/ui/zipball/a58ec468db4a340b33f3426c778784717a2c144b"; + sha256 = "0qrfr7rbi5b90inx3xf5yy5p9h38rs9b2567p2vh3711w4kqjmqd"; }; }; }; @@ -425,10 +405,10 @@ let "lcobucci/jwt" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "lcobucci-jwt-4d7de2fe0d51a96418c0d04004986e410e87f6b4"; + name = "lcobucci-jwt-47bdb0e0b5d00c2f89ebe33e7e384c77e84e7c34"; src = fetchurl { - url = "https://api.github.com/repos/lcobucci/jwt/zipball/4d7de2fe0d51a96418c0d04004986e410e87f6b4"; - sha256 = "0ripqfq90zf5xgap22zkhw2n5m8ip872lj39bd7fvwcchfjc5rx0"; + url = "https://api.github.com/repos/lcobucci/jwt/zipball/47bdb0e0b5d00c2f89ebe33e7e384c77e84e7c34"; + sha256 = "0bkkf98iflgdpryxm270wwgzw9id627h2iszjgw7ddkibn14lgq3"; }; }; }; @@ -465,20 +445,30 @@ let "league/flysystem" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-81e87e74dd5213795c7846d65089712d2dda90ce"; + name = "league-flysystem-a141d430414fcb8bf797a18716b09f759a385bed"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem/zipball/81e87e74dd5213795c7846d65089712d2dda90ce"; - sha256 = "1lhcl71nbbkq27ssd92ilwbjicddnlwwf4ggihxwwv213847bdl9"; + url = "https://api.github.com/repos/thephpleague/flysystem/zipball/a141d430414fcb8bf797a18716b09f759a385bed"; + sha256 = "0w476nkv4izdrh8dn4g58lrqnfwrp8ijhj6fj8d8cpvr81kq0wiv"; }; }; }; "league/flysystem-aws-s3-v3" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-aws-s3-v3-645e14e4a80bd2da8b01e57388e7296a695a80c2"; + name = "league-flysystem-aws-s3-v3-d8de61ee10b6a607e7996cff388c5a3a663e8c8a"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/645e14e4a80bd2da8b01e57388e7296a695a80c2"; - sha256 = "0dqyjdxwcdfb2jmi4739mz2g6rgnkana5lfbm3a4hz9xnxlw77wq"; + url = "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/d8de61ee10b6a607e7996cff388c5a3a663e8c8a"; + sha256 = "0hr11wwn2c2f26w0kj5yanx17ln17plk0si8yajkd470z3ssprwj"; + }; + }; + }; + "league/flysystem-local" = { + targetDir = ""; + src = composerEnv.buildZipPackage { + name = "league-flysystem-local-543f64c397fefdf9cfeac443ffb6beff602796b3"; + src = fetchurl { + url = "https://api.github.com/repos/thephpleague/flysystem-local/zipball/543f64c397fefdf9cfeac443ffb6beff602796b3"; + sha256 = "1f44jgjip7pgnjafwlazmbv9jap3xsw3jfzhgakbsa4bkx3aavr2"; }; }; }; @@ -505,10 +495,10 @@ let "league/oauth2-server" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-oauth2-server-eed31d86d8cc8e6e9c9f58fbb2113494f8b41e24"; + name = "league-oauth2-server-43cd4d406906c6be5c8de2cee9bd3ad3753544ef"; src = fetchurl { - url = "https://api.github.com/repos/thephpleague/oauth2-server/zipball/eed31d86d8cc8e6e9c9f58fbb2113494f8b41e24"; - sha256 = "19rz6gbvm3hj2l3hcwhdaqqgw5k3yr0yp47bl0bd7pm0wc4hdqk0"; + url = "https://api.github.com/repos/thephpleague/oauth2-server/zipball/43cd4d406906c6be5c8de2cee9bd3ad3753544ef"; + sha256 = "01amlk9r8srsk3603d56qswbq81hvksyw6jbn3i8f97l7fsdvaa9"; }; }; }; @@ -545,10 +535,10 @@ let "monolog/monolog" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "monolog-monolog-f259e2b15fb95494c83f52d3caad003bbf5ffaa1"; + name = "monolog-monolog-9b5daeaffce5b926cac47923798bba91059e60e2"; src = fetchurl { - url = "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1"; - sha256 = "0lz7lgr1bcxsh4c63z8k26bxawkx14h689wgdiap8992rf97kbk2"; + url = "https://api.github.com/repos/Seldaek/monolog/zipball/9b5daeaffce5b926cac47923798bba91059e60e2"; + sha256 = "18nll4p6fh5zmw2wgzgp4lznkqqr6d598663rrji424dfpv55233"; }; }; }; @@ -565,10 +555,10 @@ let "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-496712849902241f04902033b0441b269effe001"; + name = "nesbot-carbon-c1001b3bc75039b07f38a79db5237c4c529e04c8"; src = fetchurl { - url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/496712849902241f04902033b0441b269effe001"; - sha256 = "1bs1a0cji8fyjw7bys23da6162hymwps0pzm0mqib5rx4g0f1v0x"; + url = "https://api.github.com/repos/briannesbitt/Carbon/zipball/c1001b3bc75039b07f38a79db5237c4c529e04c8"; + sha256 = "0w5gk7b05pfsbf091plfr0ag6sx6h90sckz1phr46kd6cnrzk3rh"; }; }; }; @@ -595,10 +585,10 @@ let "nikic/php-parser" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nikic-php-parser-6bb5176bc4af8bcb7d926f88718db9b96a2d4290"; + name = "nikic-php-parser-11e2663a5bc9db5d714eedb4277ee300403b4a9e"; src = fetchurl { - url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290"; - sha256 = "1q7a8wmjn9x28v5snxxriiih3vj12aqc3za0w6pdhbxs9ywxsg9n"; + url = "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e"; + sha256 = "1kkz11dsc11zhflc8wxjxxa8xjww371nwkmjf7ncn0spjf6hx4g5"; }; }; }; @@ -615,10 +605,10 @@ let "nyholm/psr7" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nyholm-psr7-f734364e38a876a23be4d906a2a089e1315be18a"; + name = "nyholm-psr7-3cb4d163b58589e47b35103e8e5e6a6a475b47be"; src = fetchurl { - url = "https://api.github.com/repos/Nyholm/psr7/zipball/f734364e38a876a23be4d906a2a089e1315be18a"; - sha256 = "0w8i5l1qg8dkc1zsyz1gpwn2awgkhlm295l1b8smmzabqdc65dcx"; + url = "https://api.github.com/repos/Nyholm/psr7/zipball/3cb4d163b58589e47b35103e8e5e6a6a475b47be"; + sha256 = "1wbg5fcqkv8bg1ll0ndxp3jmi353sz6cd6gzdldbh35p1b2mp4jm"; }; }; }; @@ -645,10 +635,10 @@ let "paragonie/sodium_compat" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "paragonie-sodium_compat-cb15e403ecbe6a6cc515f855c310eb6b1872a933"; + name = "paragonie-sodium_compat-e592a3e06d1fa0d43988c7c7d9948ca836f644b6"; src = fetchurl { - url = "https://api.github.com/repos/paragonie/sodium_compat/zipball/cb15e403ecbe6a6cc515f855c310eb6b1872a933"; - sha256 = "01jxl868i8bkx5szgp2fp6mi438ani80bqkdcc7rnn9z22lrsm78"; + url = "https://api.github.com/repos/paragonie/sodium_compat/zipball/e592a3e06d1fa0d43988c7c7d9948ca836f644b6"; + sha256 = "0jp8il8mx5ylfx03wqa068437xidrrcgwsfcwxi9qbafhds3mhnm"; }; }; }; @@ -672,16 +662,6 @@ let }; }; }; - "php-http/message-factory" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "php-http-message-factory-a478cb11f66a6ac48d8954216cfed9aa06a501a1"; - src = fetchurl { - url = "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1"; - sha256 = "13drpc83bq332hz0b97whibkm7jpk56msq4yppw9nmrchzwgy7cs"; - }; - }; - }; "phpoption/phpoption" = { targetDir = ""; src = composerEnv.buildZipPackage { @@ -795,30 +775,30 @@ let "psr/http-client" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-http-client-2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"; + name = "psr-http-client-0955afe48220520692d2d09f7ab7e0f93ffd6a31"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"; - sha256 = "0cmkifa3ji1r8kn3y1rwg81rh8g2crvnhbv2am6d688dzsbw967v"; + url = "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31"; + sha256 = "09r970lfpwil861gzm47446ck1s6km6ijibkxl13p1ymwdchnv6m"; }; }; }; "psr/http-factory" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-http-factory-12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; + name = "psr-http-factory-e616d01114759c4c489f93b099585439f795fe35"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be"; - sha256 = "0inbnqpc5bfhbbda9dwazsrw9xscfnc8rdx82q1qm3r446mc1vds"; + url = "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35"; + sha256 = "1vzimn3h01lfz0jx0lh3cy9whr3kdh103m1fw07qric4pnnz5kx8"; }; }; }; "psr/http-message" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psr-http-message-f6561bf28d520154e4b0ec72be95418abe6d9363"; + name = "psr-http-message-cb6ce4845ce34a8ad9e68117c10ee90a29919eba"; src = fetchurl { - url = "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363"; - sha256 = "195dd67hva9bmr52iadr4kyp2gw2f5l51lplfiay2pv6l9y4cf45"; + url = "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba"; + sha256 = "1s87sajxsxl30ciqyhx0vir2pai63va4ssbnq7ki6s050i4vm80h"; }; }; }; @@ -845,20 +825,20 @@ let "psy/psysh" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "psy-psysh-722317c9f5627e588788e340f29b923e58f92f54"; + name = "psy-psysh-4f00ee9e236fa6a48f4560d1300b9c961a70a7ec"; src = fetchurl { - url = "https://api.github.com/repos/bobthecow/psysh/zipball/722317c9f5627e588788e340f29b923e58f92f54"; - sha256 = "122fc66rcv2jwpw2c8di471r4yxcm1289wvpsnadaq345nj3v4bd"; + url = "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec"; + sha256 = "10754cxjwjf818g7i3vyd4jk0sy8r3i36jxpqk38n70ckasdd7w0"; }; }; }; "pusher/pusher-php-server" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "pusher-pusher-php-server-4ace4873873b06c25cecb2dd6d9fdcbf2f20b640"; + name = "pusher-pusher-php-server-416e68dd5f640175ad5982131c42a7a666d1d8e9"; src = fetchurl { - url = "https://api.github.com/repos/pusher/pusher-http-php/zipball/4ace4873873b06c25cecb2dd6d9fdcbf2f20b640"; - sha256 = "0kkzhazdxqr6j225gyrbzmxfjc9zz89nckxbmx97bx8p4lrpdk9k"; + url = "https://api.github.com/repos/pusher/pusher-http-php/zipball/416e68dd5f640175ad5982131c42a7a666d1d8e9"; + sha256 = "13vrpfrpq7g92fshlb5s0pmpyxihmx4267cm1szrwpvza50iirqs"; }; }; }; @@ -885,10 +865,10 @@ let "ramsey/uuid" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "ramsey-uuid-433b2014e3979047db08a17a205f410ba3869cf2"; + name = "ramsey-uuid-60a4c63ab724854332900504274f6150ff26d286"; src = fetchurl { - url = "https://api.github.com/repos/ramsey/uuid/zipball/433b2014e3979047db08a17a205f410ba3869cf2"; - sha256 = "1yvdbbgblnzzv1zjzwggpayfb8n2kpbwki9dnxc42g4wrxissb8j"; + url = "https://api.github.com/repos/ramsey/uuid/zipball/60a4c63ab724854332900504274f6150ff26d286"; + sha256 = "1w1i50pbd18awmvzqjkbszw79dl09912ibn95qm8lxr4nsjvbb27"; }; }; }; @@ -925,40 +905,30 @@ let "react/event-loop" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "react-event-loop-187fb56f46d424afb6ec4ad089269c72eec2e137"; + name = "react-event-loop-6e7e587714fff7a83dcc7025aee42ab3b265ae05"; src = fetchurl { - url = "https://api.github.com/repos/reactphp/event-loop/zipball/187fb56f46d424afb6ec4ad089269c72eec2e137"; - sha256 = "1nnxfdnigzx7zdc521s0fy4467z809dmw8488ig7r1yypv4ri1yc"; + url = "https://api.github.com/repos/reactphp/event-loop/zipball/6e7e587714fff7a83dcc7025aee42ab3b265ae05"; + sha256 = "0f71ahram6w45ksnvscgsgw163m1wylipnpvc4a7gmwzncl9fkw7"; }; }; }; "react/http" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "react-http-aa7512ee17258c88466de30f9cb44ec5f9df3ff3"; + name = "react-http-bb3154dbaf2dfe3f0467f956a05f614a69d5f1d0"; src = fetchurl { - url = "https://api.github.com/repos/reactphp/http/zipball/aa7512ee17258c88466de30f9cb44ec5f9df3ff3"; - sha256 = "08zwgskkf7c3ixqf70r4xld0lrcdj1nk4l2jg994z8pyi2j3biyq"; + url = "https://api.github.com/repos/reactphp/http/zipball/bb3154dbaf2dfe3f0467f956a05f614a69d5f1d0"; + sha256 = "012idw77hrkdhcxh6vb3mfq0i21zbwqkibmrmh9ln5x4c3z4yn7a"; }; }; }; "react/promise" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "react-promise-234f8fd1023c9158e2314fa9d7d0e6a83db42910"; + name = "react-promise-f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38"; src = fetchurl { - url = "https://api.github.com/repos/reactphp/promise/zipball/234f8fd1023c9158e2314fa9d7d0e6a83db42910"; - sha256 = "0p3n6jzlny75qcqwvrz0920ry3p902nq4v64cpg9ndd0g79dbdz4"; - }; - }; - }; - "react/promise-stream" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "react-promise-stream-e6d2805e09ad50c4896f65f5e8705fe4ee7731a3"; - src = fetchurl { - url = "https://api.github.com/repos/reactphp/promise-stream/zipball/e6d2805e09ad50c4896f65f5e8705fe4ee7731a3"; - sha256 = "0vkxqznj221qgqdndag9gx8dvmaqki37r7ipl6jwgn11hw8xpka9"; + url = "https://api.github.com/repos/reactphp/promise/zipball/f913fb8cceba1e6644b7b90c4bfb678ed8a3ef38"; + sha256 = "1awzjaryj6lyi5wn0rmzwf5wyn1lg5wl3c6jp88i1gc9mp50g0n4"; }; }; }; @@ -1005,10 +975,10 @@ let "spatie/db-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "spatie-db-dumper-129b8254b2c9f10881a754a692bd9507b09a1893"; + name = "spatie-db-dumper-3b9fd47899bf6a59d3452392121c9ce675d55d34"; src = fetchurl { - url = "https://api.github.com/repos/spatie/db-dumper/zipball/129b8254b2c9f10881a754a692bd9507b09a1893"; - sha256 = "0q0xi4kcqlsghy8pmlr7sx7h6fbrwxbrrhnppsfnczjbkx5y76fv"; + url = "https://api.github.com/repos/spatie/db-dumper/zipball/3b9fd47899bf6a59d3452392121c9ce675d55d34"; + sha256 = "0w9maf9gz8s76whxfq93wm1r795j82l76y0xypqabrr3kngkmzas"; }; }; }; @@ -1025,10 +995,10 @@ let "spatie/laravel-backup" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "spatie-laravel-backup-f073c8c9f5715272060e4bdceecedd02c29005f9"; + name = "spatie-laravel-backup-a743a8bc21e388e5cc1bceff676859180f018771"; src = fetchurl { - url = "https://api.github.com/repos/spatie/laravel-backup/zipball/f073c8c9f5715272060e4bdceecedd02c29005f9"; - sha256 = "1p1v7wag0iqkq6h256k1xqmgf50wx4iygzi12wf942g6sgsf1yll"; + url = "https://api.github.com/repos/spatie/laravel-backup/zipball/a743a8bc21e388e5cc1bceff676859180f018771"; + sha256 = "1k7vygfjf784a6wnr5w3qhzgh7vz7hgvrshb4b994yk4f8ggr3hk"; }; }; }; @@ -1045,10 +1015,10 @@ let "spatie/laravel-package-tools" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "spatie-laravel-package-tools-bab62023a4745a61170ad5424184533685e73c2d"; + name = "spatie-laravel-package-tools-efab1844b8826443135201c4443690f032c3d533"; src = fetchurl { - url = "https://api.github.com/repos/spatie/laravel-package-tools/zipball/bab62023a4745a61170ad5424184533685e73c2d"; - sha256 = "0y4zfyk6v12kkkgz4sp00h1n8gqsr1idir5blcvzy3f540wxl30y"; + url = "https://api.github.com/repos/spatie/laravel-package-tools/zipball/efab1844b8826443135201c4443690f032c3d533"; + sha256 = "1527wh9gyb5k066fmmyngvyy2ldkmc34glqx2dk9swflc1jfjgpb"; }; }; }; @@ -1065,30 +1035,30 @@ let "spatie/temporary-directory" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "spatie-temporary-directory-e2818d871783d520b319c2d38dc37c10ecdcde20"; + name = "spatie-temporary-directory-0c804873f6b4042aa8836839dca683c7d0f71831"; src = fetchurl { - url = "https://api.github.com/repos/spatie/temporary-directory/zipball/e2818d871783d520b319c2d38dc37c10ecdcde20"; - sha256 = "18zay4l05sh21zfnbs0l6l12192j4y0mn2yfvnsyhm617kr14vgj"; + url = "https://api.github.com/repos/spatie/temporary-directory/zipball/0c804873f6b4042aa8836839dca683c7d0f71831"; + sha256 = "007vxm2x1anrlnzwhrqyk4nw7yflaicfhr4q9wlp5bhy7d3ixljr"; }; }; }; "stevebauman/purify" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "stevebauman-purify-e56289062ed8a25c78c88f35e9106f00d01369c1"; + name = "stevebauman-purify-7b63762b05db9eadc36d7e8b74cf58fa64bfa527"; src = fetchurl { - url = "https://api.github.com/repos/stevebauman/purify/zipball/e56289062ed8a25c78c88f35e9106f00d01369c1"; - sha256 = "0bqzk203c526sdz8dgpvm3kffxk9x67xy1qbjl4p13fl4cwyi8wb"; + url = "https://api.github.com/repos/stevebauman/purify/zipball/7b63762b05db9eadc36d7e8b74cf58fa64bfa527"; + sha256 = "08l5qhx7awd64mivxwhim1vm007h5l244g3ssshz56i44qqji673"; }; }; }; "symfony/cache" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-cache-01a36b32f930018764bcbde006fbbe421fa6b61e"; + name = "symfony-cache-1ce7ed8e7ca6948892b6a3a52bb60cf2b04f7c94"; src = fetchurl { - url = "https://api.github.com/repos/symfony/cache/zipball/01a36b32f930018764bcbde006fbbe421fa6b61e"; - sha256 = "1i484nh0zy4nbq8p3j1wdw7jiz6rs387w8gyrhligfvhv6kkfd2f"; + url = "https://api.github.com/repos/symfony/cache/zipball/1ce7ed8e7ca6948892b6a3a52bb60cf2b04f7c94"; + sha256 = "0n9f8snanv7gxgi7kwjq8z3isjirhjc44ciw2ss3glij63864rwj"; }; }; }; @@ -1105,10 +1075,10 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-cbad09eb8925b6ad4fb721c7a179344dc4a19d45"; + name = "symfony-console-5aa03db8ef0a5457c316ec580e69562d97734c77"; src = fetchurl { - url = "https://api.github.com/repos/symfony/console/zipball/cbad09eb8925b6ad4fb721c7a179344dc4a19d45"; - sha256 = "0373y1dqy8mschqqhw2hvv906i1nc68h4yd5jm1dj4rf8qrynplb"; + url = "https://api.github.com/repos/symfony/console/zipball/5aa03db8ef0a5457c316ec580e69562d97734c77"; + sha256 = "1dc90j27brsidzp025rz3jkk3ir1qyk9chlp2b6vbg617yyr8ipk"; }; }; }; @@ -1135,20 +1105,20 @@ let "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-61e90f94eb014054000bc902257d2763fac09166"; + name = "symfony-error-handler-e847ba47e7a8f9708082990cb40ab4ff0440a11e"; src = fetchurl { - url = "https://api.github.com/repos/symfony/error-handler/zipball/61e90f94eb014054000bc902257d2763fac09166"; - sha256 = "1kxm9pzvvlrd2b1gwbq9b45qgq6sckl0xr078cis7vsbhw9kwbkn"; + url = "https://api.github.com/repos/symfony/error-handler/zipball/e847ba47e7a8f9708082990cb40ab4ff0440a11e"; + sha256 = "1ffx7y5pcsxwb95jxdir8kx06p27bkf2bs7c7qbqmlkb6srga1pg"; }; }; }; "symfony/event-dispatcher" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-404b307de426c1c488e5afad64403e5f145e82a5"; + name = "symfony-event-dispatcher-04046f35fd7d72f9646e721fc2ecb8f9c67d3339"; src = fetchurl { - url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/404b307de426c1c488e5afad64403e5f145e82a5"; - sha256 = "0262hqisnnv3mzb7gn6yjyvr8dhgsqrs18a19s72nwcj0cs7k6mi"; + url = "https://api.github.com/repos/symfony/event-dispatcher/zipball/04046f35fd7d72f9646e721fc2ecb8f9c67d3339"; + sha256 = "1va0impcvcmbf3v8xpjkwrm0l5w14pb2n2fs2k29xp23xjd7lnil"; }; }; }; @@ -1175,10 +1145,10 @@ let "symfony/http-client" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-client-0a5be6cbc570ae23b51b49d67341f378629d78e4"; + name = "symfony-http-client-39f679c12648cc43bd9f0db12cc69b82041b91a1"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-client/zipball/0a5be6cbc570ae23b51b49d67341f378629d78e4"; - sha256 = "1jkgy3k4g2x33952vnbw8n5lv6986fbq8qallpsl8rfcczyzliq3"; + url = "https://api.github.com/repos/symfony/http-client/zipball/39f679c12648cc43bd9f0db12cc69b82041b91a1"; + sha256 = "1mn4nf6hwxdgb0x8xmrfmgbayyr1hy613w632ag8rj582bfmag6z"; }; }; }; @@ -1195,50 +1165,50 @@ let "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-5fc3038d4a594223f9ea42e4e985548f3fcc9a3b"; + name = "symfony-http-foundation-df27f4191a4292d01fd062296e09cbc8b657cb57"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-foundation/zipball/5fc3038d4a594223f9ea42e4e985548f3fcc9a3b"; - sha256 = "13wn8kgxakp9133sjgvn2bfr51r5rxymm6d8vhs8kjxxgkx050l5"; + url = "https://api.github.com/repos/symfony/http-foundation/zipball/df27f4191a4292d01fd062296e09cbc8b657cb57"; + sha256 = "1kdzs427q1qxbd3209fpwas3dq40ihjm0skbh6avxarwsyw9vfwk"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-ca0680ad1e2d678536cc20e0ae33f9e4e5d2becd"; + name = "symfony-http-kernel-954a1a3b178309b216261eedc735c079709e4ab3"; src = fetchurl { - url = "https://api.github.com/repos/symfony/http-kernel/zipball/ca0680ad1e2d678536cc20e0ae33f9e4e5d2becd"; - sha256 = "14b700kcw4ibz9hackx9wvghmv5rnks18vhr4vjb5zskfdajp4qd"; + url = "https://api.github.com/repos/symfony/http-kernel/zipball/954a1a3b178309b216261eedc735c079709e4ab3"; + sha256 = "1iga2bbshrm7d9m90bxmqkh5crzwzziqfyw3g62b6z01iwrp1k42"; }; }; }; "symfony/mailer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mailer-e4f84c633b72ec70efc50b8016871c3bc43e691e"; + name = "symfony-mailer-bfcfa015c67e19c6fdb7ca6fe70700af1e740a17"; src = fetchurl { - url = "https://api.github.com/repos/symfony/mailer/zipball/e4f84c633b72ec70efc50b8016871c3bc43e691e"; - sha256 = "15bi1vy4162mv0k49wscdshwznjmmcwr9g7g03jgadanjq4afyzj"; + url = "https://api.github.com/repos/symfony/mailer/zipball/bfcfa015c67e19c6fdb7ca6fe70700af1e740a17"; + sha256 = "1i6q57w3jhfy69z86jyqvjwx7y50rl8z3y7n6gc1kafw97g1yyn8"; }; }; }; "symfony/mailgun-mailer" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mailgun-mailer-9e27b8ec2f6ee7575c6229a61be1578a5a4b21ee"; + name = "symfony-mailgun-mailer-2c9d47b11cc154d2db3f571030cd965d128de1a8"; src = fetchurl { - url = "https://api.github.com/repos/symfony/mailgun-mailer/zipball/9e27b8ec2f6ee7575c6229a61be1578a5a4b21ee"; - sha256 = "14ny9mqvl8lqfa049cvxd0zqiqssidk82794sg80g6cl1irmj6rp"; + url = "https://api.github.com/repos/symfony/mailgun-mailer/zipball/2c9d47b11cc154d2db3f571030cd965d128de1a8"; + sha256 = "0ppsp07mkj382s4h4wh1g5f0w104a4brw6vl3dwr6kjciakxc3hd"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-62e341f80699badb0ad70b31149c8df89a2d778e"; + name = "symfony-mime-b6c137fc53a9f7c4c951cd3f362b3734c7a97723"; src = fetchurl { - url = "https://api.github.com/repos/symfony/mime/zipball/62e341f80699badb0ad70b31149c8df89a2d778e"; - sha256 = "1l56y494n4phiyafcgc7sa8vfxzsvz6lbzxhnqirdgv19y4zvbim"; + url = "https://api.github.com/repos/symfony/mime/zipball/b6c137fc53a9f7c4c951cd3f362b3734c7a97723"; + sha256 = "1cy2xp4hw8lz3d1n5qc5q5afpzk2y7n0kkn0gl68dnn5ffd06xmr"; }; }; }; @@ -1325,30 +1295,30 @@ let "symfony/process" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-process-680e8a2ea6b3f87aecc07a6a65a203ae573d1902"; + name = "symfony-process-97ae9721bead9d1a39b5650e2f4b7834b93b539c"; src = fetchurl { - url = "https://api.github.com/repos/symfony/process/zipball/680e8a2ea6b3f87aecc07a6a65a203ae573d1902"; - sha256 = "16g99h6ir2mf3v0kciqckjgjg4x8sqyl2b6r7rf9bw1rnfmh3xk7"; + url = "https://api.github.com/repos/symfony/process/zipball/97ae9721bead9d1a39b5650e2f4b7834b93b539c"; + sha256 = "0z5hip2ackw8a97fkf6a5zz7rd8sfv72qj44w4zyw776br0rcviw"; }; }; }; "symfony/psr-http-message-bridge" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-psr-http-message-bridge-a125b93ef378c492e274f217874906fb9babdebb"; + name = "symfony-psr-http-message-bridge-28a732c05bbad801304ad5a5c674cf2970508993"; src = fetchurl { - url = "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/a125b93ef378c492e274f217874906fb9babdebb"; - sha256 = "1c23bv3j2zwbxklizvkvkzrgn2fd1164qb0smgswa15pshwmr0gw"; + url = "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/28a732c05bbad801304ad5a5c674cf2970508993"; + sha256 = "0mbs6d1f05n7ws4nyw3w748q5qp7c28i7d96q9c4lyc6cvxbl12n"; }; }; }; "symfony/routing" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-routing-fa643fa4c56de161f8bc8c0492a76a60140b50e4"; + name = "symfony-routing-69062e2823f03b82265d73a966999660f0e1e404"; src = fetchurl { - url = "https://api.github.com/repos/symfony/routing/zipball/fa643fa4c56de161f8bc8c0492a76a60140b50e4"; - sha256 = "1kv9ijzligl3y6z6hwkk5kjf8h8lff5fh6y0f1ws1ivwxrid8r33"; + url = "https://api.github.com/repos/symfony/routing/zipball/69062e2823f03b82265d73a966999660f0e1e404"; + sha256 = "03nzrw3kvraf3cyn31hmpvnip4aihj84234i5qh5iv59jzpz517p"; }; }; }; @@ -1365,20 +1335,20 @@ let "symfony/string" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-string-67b8c1eec78296b85dc1c7d9743830160218993d"; + name = "symfony-string-193e83bbd6617d6b2151c37fff10fa7168ebddef"; src = fetchurl { - url = "https://api.github.com/repos/symfony/string/zipball/67b8c1eec78296b85dc1c7d9743830160218993d"; - sha256 = "1jvxxb6f5mf1hl1fl6pr46b0g79w8zinqxgw40c871lxw8xmk6hy"; + url = "https://api.github.com/repos/symfony/string/zipball/193e83bbd6617d6b2151c37fff10fa7168ebddef"; + sha256 = "1478grgcbh5vwylwnx89bzjrws5akm8h7kmm7j4h741wvhzv45j6"; }; }; }; "symfony/translation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-90db1c6138c90527917671cd9ffa9e8b359e3a73"; + name = "symfony-translation-64113df3e8b009f92fad63014f4ec647e65bc927"; src = fetchurl { - url = "https://api.github.com/repos/symfony/translation/zipball/90db1c6138c90527917671cd9ffa9e8b359e3a73"; - sha256 = "1fwg6fwlkjv2zxxg7mjxp9i9c3slxfdiixykpl3r9rsddjvpvyjr"; + url = "https://api.github.com/repos/symfony/translation/zipball/64113df3e8b009f92fad63014f4ec647e65bc927"; + sha256 = "18w8yp5l1w0rcrnmm020y4my898ncxldhf7s94875vk7xks69nby"; }; }; }; @@ -1405,20 +1375,20 @@ let "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-cf8d4ca1ddc1e3cc242375deb8fc23e54f5e2a1e"; + name = "symfony-var-dumper-7d10f2a5a452bda385692fc7d38cd6eccfebe756"; src = fetchurl { - url = "https://api.github.com/repos/symfony/var-dumper/zipball/cf8d4ca1ddc1e3cc242375deb8fc23e54f5e2a1e"; - sha256 = "1l771q02a9m4j09dv96y4g1fb9lpmfxnz2hy11hmz57afscl3m7s"; + url = "https://api.github.com/repos/symfony/var-dumper/zipball/7d10f2a5a452bda385692fc7d38cd6eccfebe756"; + sha256 = "1sb6mjh88rd5ycqkkq0rcx0kplvyvyxf2xa1avyv9f8hjlcyydhv"; }; }; }; "symfony/var-exporter" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-exporter-86062dd0103530e151588c8f60f5b85a139f1442"; + name = "symfony-var-exporter-9a07920c2058bafee921ce4d90aeef2193837d63"; src = fetchurl { - url = "https://api.github.com/repos/symfony/var-exporter/zipball/86062dd0103530e151588c8f60f5b85a139f1442"; - sha256 = "1w13ww6qr7bra2c8j2da6wzrr96agp1ks4b81g1h8psyybvb48m6"; + url = "https://api.github.com/repos/symfony/var-exporter/zipball/9a07920c2058bafee921ce4d90aeef2193837d63"; + sha256 = "1vggk9ya9b2703i0qj70bvqp00c3dbddmcg7sax8c8a0hq308r7m"; }; }; }; @@ -1473,372 +1443,11 @@ let }; }; }; - devPackages = { - "brianium/paratest" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "brianium-paratest-51691208db882922c55d6c465be3e7d95028c449"; - src = fetchurl { - url = "https://api.github.com/repos/paratestphp/paratest/zipball/51691208db882922c55d6c465be3e7d95028c449"; - sha256 = "0gmp7zg3lfvsg4lqsh3q5zxl00iz004d5qbvnmya6y97skig2ja6"; - }; - }; - }; - "doctrine/instantiator" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "doctrine-instantiator-c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"; - src = fetchurl { - url = "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"; - sha256 = "059ahw73z0m24cal4f805j6h1i53f90mrmjr7s4f45yfxgwcqvcn"; - }; - }; - }; - "fakerphp/faker" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "fakerphp-faker-92efad6a967f0b79c499705c69b662f738cc9e4d"; - src = fetchurl { - url = "https://api.github.com/repos/FakerPHP/Faker/zipball/92efad6a967f0b79c499705c69b662f738cc9e4d"; - sha256 = "0yxl4vicv0yc5jxsfslxkhh7fjgryg3anmpvdvbqim2df5wv4pqg"; - }; - }; - }; - "fidry/cpu-core-counter" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "fidry-cpu-core-counter-b58e5a3933e541dc286cc91fc4f3898bbc6f1623"; - src = fetchurl { - url = "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/b58e5a3933e541dc286cc91fc4f3898bbc6f1623"; - sha256 = "154qkm931w5d3dy202w455wxfa0wsjx7mmfj23mb36zpp1gck19j"; - }; - }; - }; - "filp/whoops" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "filp-whoops-e864ac957acd66e1565f25efda61e37791a5db0b"; - src = fetchurl { - url = "https://api.github.com/repos/filp/whoops/zipball/e864ac957acd66e1565f25efda61e37791a5db0b"; - sha256 = "1q6lx0d2h1372flsh7qqacyb9gljhhlnasgbvydhil11v1mai50g"; - }; - }; - }; - "hamcrest/hamcrest-php" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "hamcrest-hamcrest-php-8c3d0a3f6af734494ad8f6fbbee0ba92422859f3"; - src = fetchurl { - url = "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/8c3d0a3f6af734494ad8f6fbbee0ba92422859f3"; - sha256 = "1ixmmpplaf1z36f34d9f1342qjbcizvi5ddkjdli6jgrbla6a6hr"; - }; - }; - }; - "jean85/pretty-package-versions" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "jean85-pretty-package-versions-ae547e455a3d8babd07b96966b17d7fd21d9c6af"; - src = fetchurl { - url = "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/ae547e455a3d8babd07b96966b17d7fd21d9c6af"; - sha256 = "07s7hl7705vgmyr5m7czja4426rsqrxqh8m362irn29vbc35k6q8"; - }; - }; - }; - "laravel/telescope" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "laravel-telescope-fafad2e32883eb9dc03b646d0f82b2987e8af880"; - src = fetchurl { - url = "https://api.github.com/repos/laravel/telescope/zipball/fafad2e32883eb9dc03b646d0f82b2987e8af880"; - sha256 = "1pr1a4b07nmwj05ck4c7c1ip1hhr32blr9pwcvapyrh862vv5p13"; - }; - }; - }; - "mockery/mockery" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "mockery-mockery-e92dcc83d5a51851baf5f5591d32cb2b16e3684e"; - src = fetchurl { - url = "https://api.github.com/repos/mockery/mockery/zipball/e92dcc83d5a51851baf5f5591d32cb2b16e3684e"; - sha256 = "0dvkr0ff37cn6s72s7sqw26j6i5fja780x980zhl099frflkw5s9"; - }; - }; - }; - "myclabs/deep-copy" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "myclabs-deep-copy-7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"; - src = fetchurl { - url = "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"; - sha256 = "16k44y94bcr439bsxm5158xvmlyraph2c6n17qa5y29b04jqdw5j"; - }; - }; - }; - "nunomaduro/collision" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "nunomaduro-collision-f05978827b9343cba381ca05b8c7deee346b6015"; - src = fetchurl { - url = "https://api.github.com/repos/nunomaduro/collision/zipball/f05978827b9343cba381ca05b8c7deee346b6015"; - sha256 = "09bpw23vq3yyilrkd6k798igrg0ypryxpw2bfbdgjvjwhs4ndf29"; - }; - }; - }; - "phar-io/manifest" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phar-io-manifest-97803eca37d319dfa7826cc2437fc020857acb53"; - src = fetchurl { - url = "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53"; - sha256 = "107dsj04ckswywc84dvw42kdrqd4y6yvb2qwacigyrn05p075c1w"; - }; - }; - }; - "phar-io/version" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phar-io-version-4f7fd7836c6f332bb2933569e566a0d6c4cbed74"; - src = fetchurl { - url = "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74"; - sha256 = "0mdbzh1y0m2vvpf54vw7ckcbcf1yfhivwxgc9j9rbb7yifmlyvsg"; - }; - }; - }; - "phpunit/php-code-coverage" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpunit-php-code-coverage-443bc6912c9bd5b409254a40f4b0f4ced7c80ea1"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1"; - sha256 = "18v2xs142pw4dl9l6imcmkdvv5m18zd36ar41i586f4mg8d961d1"; - }; - }; - }; - "phpunit/php-file-iterator" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpunit-php-file-iterator-cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"; - sha256 = "1407d8f1h35w4sdikq2n6cz726css2xjvlyr1m4l9a53544zxcnr"; - }; - }; - }; - "phpunit/php-invoker" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpunit-php-invoker-5a10147d0aaf65b58940a0b72f71c9ac0423cc67"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67"; - sha256 = "1vqnnjnw94mzm30n9n5p2bfgd3wd5jah92q6cj3gz1nf0qigr4fh"; - }; - }; - }; - "phpunit/php-text-template" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpunit-php-text-template-5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"; - sha256 = "0ff87yzywizi6j2ps3w0nalpx16mfyw3imzn6gj9jjsfwc2bb8lq"; - }; - }; - }; - "phpunit/php-timer" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpunit-php-timer-5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"; - sha256 = "0g1g7yy4zk1bidyh165fsbqx5y8f1c8pxikvcahzlfsr9p2qxk6a"; - }; - }; - }; - "phpunit/phpunit" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "phpunit-phpunit-86e761949019ae83f49240b2f2123fb5ab3b2fc5"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/86e761949019ae83f49240b2f2123fb5ab3b2fc5"; - sha256 = "1jqsw5qd5cv07fzpbw6m31314s2b64zwz0hz3g83179yf5h4r99z"; - }; - }; - }; - "sebastian/cli-parser" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-cli-parser-442e7c7e687e42adc03470c7b668bc4b2402c0b2"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2"; - sha256 = "074qzdq19k9x4svhq3nak5h348xska56v1sqnhk1aj0jnrx02h37"; - }; - }; - }; - "sebastian/code-unit" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-code-unit-1fc9f64c0927627ef78ba436c9b17d967e68e120"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120"; - sha256 = "04vlx050rrd54mxal7d93pz4119pas17w3gg5h532anfxjw8j7pm"; - }; - }; - }; - "sebastian/code-unit-reverse-lookup" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-code-unit-reverse-lookup-ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"; - sha256 = "1h1jbzz3zak19qi4mab2yd0ddblpz7p000jfyxfwd2ds0gmrnsja"; - }; - }; - }; - "sebastian/comparator" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-comparator-fa0f136dd2334583309d32b62544682ee972b51a"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a"; - sha256 = "0m8ibkwaxw2q5v84rlvy7ylpkddscsa8hng0cjczy4bqpqavr83w"; - }; - }; - }; - "sebastian/complexity" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-complexity-739b35e53379900cc9ac327b2147867b8b6efd88"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88"; - sha256 = "1y4yz8n8hszbhinf9ipx3pqyvgm7gz0krgyn19z0097yq3bbq8yf"; - }; - }; - }; - "sebastian/diff" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-diff-3461e3fccc7cfdfc2720be910d3bd73c69be590d"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d"; - sha256 = "0967nl6cdnr0v0z83w4xy59agn60kfv8gb41aw3fpy1n2wpp62dj"; - }; - }; - }; - "sebastian/environment" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-environment-830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"; - sha256 = "02045n3in01zk571v1phyhj0b2mvnvx8qnlqvw4j33r7qdd4clzn"; - }; - }; - }; - "sebastian/exporter" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-exporter-ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"; - sha256 = "1a6yj8v8rwj3igip8xysdifvbd7gkzmwrj9whdx951pdq7add46j"; - }; - }; - }; - "sebastian/global-state" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-global-state-0ca8db5a5fc9c8646244e629625ac486fa286bf2"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2"; - sha256 = "1csrfa5b7ivza712lfmbywp9jhwf4ls5lc0vn812xljkj7w24kg1"; - }; - }; - }; - "sebastian/lines-of-code" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-lines-of-code-c1c2e997aa3146983ed888ad08b15470a2e22ecc"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc"; - sha256 = "0fay9s5cm16gbwr7qjihwrzxn7sikiwba0gvda16xng903argbk0"; - }; - }; - }; - "sebastian/object-enumerator" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-object-enumerator-5c9eeac41b290a3712d88851518825ad78f45c71"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71"; - sha256 = "11853z07w8h1a67wsjy3a6ir5x7khgx6iw5bmrkhjkiyvandqcn1"; - }; - }; - }; - "sebastian/object-reflector" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-object-reflector-b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"; - sha256 = "0g5m1fswy6wlf300x1vcipjdljmd3vh05hjqhqfc91byrjbk4rsg"; - }; - }; - }; - "sebastian/recursion-context" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-recursion-context-e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"; - sha256 = "1ag6ysxffhxyg7g4rj9xjjlwq853r4x92mmin4f09hn5mqn9f0l1"; - }; - }; - }; - "sebastian/resource-operations" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-resource-operations-0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"; - sha256 = "0p5s8rp7mrhw20yz5wx1i4k8ywf0h0ximcqan39n9qnma1dlnbyr"; - }; - }; - }; - "sebastian/type" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-type-75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"; - sha256 = "0bvfvb62qbpy2hzxs4bjzb0xhks6h3cp6qx96z4qlyz6wl2fa1w5"; - }; - }; - }; - "sebastian/version" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "sebastian-version-c6c1022351a901512170118436c764e473f6de8c"; - src = fetchurl { - url = "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c"; - sha256 = "1bs7bwa9m0fin1zdk7vqy5lxzlfa9la90lkl27sn0wr00m745ig1"; - }; - }; - }; - "theseer/tokenizer" = { - targetDir = ""; - src = composerEnv.buildZipPackage { - name = "theseer-tokenizer-34a41e998c2183e22995f158c581e7b5e755ab9e"; - src = fetchurl { - url = "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e"; - sha256 = "1za4a017kjb4rw2ydglip4bp5q2y7mfiycj3fvnp145i84jc7n0q"; - }; - }; - }; - }; + devPackages = {}; in composerEnv.buildPackage { inherit packages devPackages noDev; - name = "pixelfed-pixelfed"; + name = "pixelfed"; src = composerEnv.filterSrc ./.; executable = false; symlinkDependencies = false; From d99dd867fb4671d7527170d2c5311e6d8cf8eb88 Mon Sep 17 00:00:00 2001 From: pacien Date: Sat, 17 Jun 2023 19:57:29 +0200 Subject: [PATCH 030/222] nixos/pixelfed: fix code cache cleanup The "bootstrap" directory only exists within the app's package. The cached code is placed at the root of the runtime directory instead. --- nixos/modules/services/web-apps/pixelfed.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/pixelfed.nix b/nixos/modules/services/web-apps/pixelfed.nix index ada8465c4fee..f9dc9d066e1c 100644 --- a/nixos/modules/services/web-apps/pixelfed.nix +++ b/nixos/modules/services/web-apps/pixelfed.nix @@ -380,11 +380,11 @@ in { }; script = '' - # Before running any PHP program, cleanup the bootstrap. + # Before running any PHP program, cleanup the code cache. # It's necessary if you upgrade the application otherwise you might # try to import non-existent modules. - rm -f ${cfg.runtimeDir}/bootstrap/app.php - rm -rf ${cfg.runtimeDir}/bootstrap/cache/* + rm -f ${cfg.runtimeDir}/app.php + rm -rf ${cfg.runtimeDir}/cache/* # Concatenate non-secret .env and secret .env rm -f ${cfg.dataDir}/.env From 806a00221597ef48bc3cc52e28a89c7fc7406c94 Mon Sep 17 00:00:00 2001 From: pacien Date: Sun, 18 Jun 2023 17:55:15 +0200 Subject: [PATCH 031/222] pixelfed: remove outdated dist note --- pkgs/servers/web-apps/pixelfed/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/web-apps/pixelfed/default.nix b/pkgs/servers/web-apps/pixelfed/default.nix index acf15e4ca83d..5b0da39f23db 100644 --- a/pkgs/servers/web-apps/pixelfed/default.nix +++ b/pkgs/servers/web-apps/pixelfed/default.nix @@ -30,7 +30,6 @@ in package.override rec { pname = "pixelfed"; version = "0.11.8"; - # GitHub distribution does not include vendored files src = fetchFromGitHub { owner = "pixelfed"; repo = pname; From acf257276d958a1507513f48bbd0c7c2a9e7b1ae Mon Sep 17 00:00:00 2001 From: Jairo Llopis <973709+yajo@users.noreply.github.com> Date: Mon, 19 Jun 2023 08:28:04 +0100 Subject: [PATCH 032/222] python3Packages.pkgutil-resolve-name: disable unexisting checks Co-authored-by: Sandro --- .../python-modules/pkgutil-resolve-name/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix index 79c5c209d07b..d70cfd1c4345 100644 --- a/pkgs/development/python-modules/pkgutil-resolve-name/default.nix +++ b/pkgs/development/python-modules/pkgutil-resolve-name/default.nix @@ -17,6 +17,9 @@ buildPythonPackage rec { hash = "sha256-NX1snmp1VlPP14iTgXwIU682XdUeyX89NYqBk3O70XQ="; }; + # has no tests + doCheck = false; + passthru.updateScript = nix-update-script { }; meta = { From 6514705ef6c8bd49fb94631590cff3caa2d3e71f Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 8 Jun 2023 13:24:59 -0400 Subject: [PATCH 033/222] crystalline: init at 0.9.0 Closes #129002 --- .../language-servers/crystalline/default.nix | 48 +++++++++++++++++++ .../language-servers/crystalline/shards.nix | 27 +++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 79 insertions(+) create mode 100644 pkgs/development/tools/language-servers/crystalline/default.nix create mode 100644 pkgs/development/tools/language-servers/crystalline/shards.nix diff --git a/pkgs/development/tools/language-servers/crystalline/default.nix b/pkgs/development/tools/language-servers/crystalline/default.nix new file mode 100644 index 000000000000..8de4ae808779 --- /dev/null +++ b/pkgs/development/tools/language-servers/crystalline/default.nix @@ -0,0 +1,48 @@ +{ lib +, crystal +, fetchFromGitHub +, llvmPackages +, openssl +, makeWrapper +}: + +let + version = "0.9.0"; +in +crystal.buildCrystalPackage { + pname = "crystalline"; + inherit version; + + src = fetchFromGitHub { + owner = "elbywan"; + repo = "crystalline"; + rev = "v${version}"; + sha256 = "sha256-kx3rdGqIbrOaHY7V3uXLqIFEYzzsMKzNwZ6Neq8zM3c="; + }; + + format = "crystal"; + shardsFile = ./shards.nix; + + nativeBuildInputs = [ llvmPackages.llvm openssl makeWrapper ]; + + doCheck = false; + doInstallCheck = false; + + crystalBinaries.crystalline = { + src = "src/crystalline.cr"; + options = [ "--release" "--no-debug" "--progress" "-Dpreview_mt" ]; + }; + + postInstall = '' + wrapProgram "$out/bin/crystalline" --prefix PATH : '${ + lib.makeBinPath [llvmPackages.llvm.dev] + }' + ''; + + meta = with lib; { + description = "A Language Server Protocol implementation for Crystal"; + homepage = "https://github.com/elbywan/crystalline"; + license = licenses.mit; + maintainers = with maintainers; [ donovanglover ]; + }; +} diff --git a/pkgs/development/tools/language-servers/crystalline/shards.nix b/pkgs/development/tools/language-servers/crystalline/shards.nix new file mode 100644 index 000000000000..2e53527fd0b8 --- /dev/null +++ b/pkgs/development/tools/language-servers/crystalline/shards.nix @@ -0,0 +1,27 @@ +{ + bisect = { + url = "https://github.com/spider-gazelle/bisect.git"; + rev = "v1.2.1"; + sha256 = "1ddz7fag1l65m6g0vw6xa96yv00rdwjj2z69k26rvyz37qk9ccqg"; + }; + lsp = { + url = "https://github.com/elbywan/crystal-lsp.git"; + rev = "v0.1.2"; + sha256 = "0knw8xaq3ssyb34w77a390j79m4w6bks5hlwr8m8fci2gq9a0r6z"; + }; + priority-queue = { + url = "https://github.com/spider-gazelle/priority-queue.git"; + rev = "v1.0.1"; + sha256 = "1rkppd8win4yalxcvsxikqcq6sw0npdqjajqbj57m78bzlxpyjv6"; + }; + sentry = { + url = "https://github.com/samueleaton/sentry.git"; + rev = "e448ce83486f99ef016c311e10ec0cac805cded3"; + sha256 = "13yp7805xpd605jpfpb3srqb0psy25w7n6x9mpkcyvzhqmpnpfyq"; + }; + version_from_shard = { + url = "https://github.com/hugopl/version_from_shard.git"; + rev = "v1.2.5"; + sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea13de2a8ab0..e297fadbf1b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14887,6 +14887,10 @@ with pkgs; crystal2nix = callPackage ../development/compilers/crystal2nix { }; + crystalline = callPackage ../development/tools/language-servers/crystalline { + llvmPackages = llvmPackages_15; + }; + icr = callPackage ../development/tools/icr { }; scry = callPackage ../development/tools/scry { crystal = crystal_1_2; }; From 85f32144876d3bf47725243d738b43e6efcecf8d Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Wed, 7 Jun 2023 16:02:16 -0400 Subject: [PATCH 034/222] maintainers: add donovanglover --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ab644dcb02e6..34a9ce565c05 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4133,6 +4133,14 @@ githubId = 39825; name = "Dominik Honnef"; }; + donovanglover = { + github = "donovanglover"; + githubId = 2374245; + name = "Donovan Glover"; + keys = [{ + fingerprint = "EE7D 158E F9E7 660E 0C33 86B2 8FC5 F7D9 0A5D 8F4D"; + }]; + }; doriath = { email = "tomasz.zurkowski@gmail.com"; github = "doriath"; From cc3a3c40a2cc2eadb1c55ea44260817090f12cb3 Mon Sep 17 00:00:00 2001 From: nikstur Date: Wed, 21 Jun 2023 01:38:27 +0200 Subject: [PATCH 035/222] nixos/tests/qemu-vm-volatile-root: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/qemu-vm-volatile-root.nix | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 nixos/tests/qemu-vm-volatile-root.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5e846fc83d1a..63b2700ae518 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -641,6 +641,7 @@ in { pulseaudio = discoverTests (import ./pulseaudio.nix); qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {}; qemu-vm-restrictnetwork = handleTest ./qemu-vm-restrictnetwork.nix {}; + qemu-vm-volatile-root = runTest ./qemu-vm-volatile-root.nix; quorum = handleTest ./quorum.nix {}; quake3 = handleTest ./quake3.nix {}; qownnotes = handleTest ./qownnotes.nix {}; diff --git a/nixos/tests/qemu-vm-volatile-root.nix b/nixos/tests/qemu-vm-volatile-root.nix new file mode 100644 index 000000000000..bc8fd853409d --- /dev/null +++ b/nixos/tests/qemu-vm-volatile-root.nix @@ -0,0 +1,17 @@ +# Test that the root filesystem is a volatile tmpfs. + +{ lib, ... }: + +{ + name = "qemu-vm-volatile-root"; + + meta.maintainers = with lib.maintainers; [ nikstur ]; + + nodes.machine = _: { + virtualisation.diskImage = null; + }; + + testScript = '' + machine.succeed("findmnt --kernel --types tmpfs /") + ''; +} From 558af1d8a580573309771fa42274723db6da4a1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Wed, 21 Jun 2023 18:16:44 +0900 Subject: [PATCH 036/222] klee: 2.3 -> 3.0 --- pkgs/applications/science/logic/klee/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index a82d9c51e3be..401b2f48a6ea 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -45,30 +45,24 @@ let }; in stdenv.mkDerivation rec { pname = "klee"; - version = "2.3"; + version = "3.0"; src = fetchFromGitHub { owner = "klee"; repo = "klee"; rev = "v${version}"; - sha256 = "sha256-E1c6K6Q+LAWm342W8I00JI6+LMvqmULHZLkv9Kj5RmY="; + hash = "sha256-y5lWmtIcLAthQ0oHYQNd+ir75YaxHZR9Jgiz+ZUFQjY="; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ cryptominisat gperftools - lit # Configure phase checking for lit llvm sqlite stp z3 ]; - - nativeBuildInputs = [ - clang - cmake - ]; - nativeCheckInputs = [ gtest @@ -83,8 +77,9 @@ in stdenv.mkDerivation rec { in [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else if !debug && includeDebugInfo then "RelWithDebInfo" else "MinSizeRel"}" "-DKLEE_RUNTIME_BUILD_TYPE=${if debugRuntime then "Debug" else "Release"}" + "-DLLVMCC=${clang}/bin/clang" + "-DLLVMCXX=${clang}/bin/clang++" "-DKLEE_ENABLE_TIMESTAMP=${onOff false}" - "-DENABLE_KLEE_UCLIBC=${onOff true}" "-DKLEE_UCLIBC_PATH=${kleeuClibc}" "-DENABLE_KLEE_ASSERTS=${onOff asserts}" "-DENABLE_POSIX_RUNTIME=${onOff true}" From 4540dccd9b1746a08efee1b2bf7741a96fbaab18 Mon Sep 17 00:00:00 2001 From: twesterhout <14264576+twesterhout@users.noreply.github.com> Date: Wed, 21 Jun 2023 10:58:24 +0200 Subject: [PATCH 037/222] maintainers: add twesterhout --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a2cfa44e43c8..6e680a933d2e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16598,6 +16598,12 @@ githubId = 9413924; name = "Thorsten Weber"; }; + twesterhout = { + name = "Tom Westerhout"; + matrix = "@twesterhout:matrix.org"; + github = "twesterhout"; + githubId = 14264576; + }; twey = { email = "twey@twey.co.uk"; github = "Twey"; From d474fb31b69c75153a55b25de76ef7d3c1ba3332 Mon Sep 17 00:00:00 2001 From: twesterhout <14264576+twesterhout@users.noreply.github.com> Date: Wed, 21 Jun 2023 10:57:57 +0200 Subject: [PATCH 038/222] halide: remove mesa dependency on darwin --- pkgs/development/compilers/halide/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 636506836dc9..0f5a330faa18 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -3,9 +3,11 @@ , lib , fetchFromGitHub , cmake +, libffi , libpng , libjpeg , mesa +, libGL , eigen , openblas , blas @@ -43,11 +45,14 @@ stdenv.mkDerivation rec { llvmPackages.lld llvmPackages.openmp llvmPackages.libclang + libffi libpng libjpeg - mesa eigen openblas + ] ++ lib.optionals (!stdenv.isDarwin) [ + mesa + libGL ]; nativeBuildInputs = [ cmake ]; @@ -57,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://halide-lang.org"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ck3d atila ]; + maintainers = with maintainers; [ ck3d atila twesterhout ]; }; } From c0ce5cfac0593987aaedc78fd88ef059be157881 Mon Sep 17 00:00:00 2001 From: gruve-p Date: Wed, 21 Jun 2023 19:00:12 +0200 Subject: [PATCH 039/222] electrum-grs 4.3.1 -> 4.4.4 --- pkgs/applications/misc/electrum/grs.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/electrum/grs.nix b/pkgs/applications/misc/electrum/grs.nix index fd1e6706e440..a0c9e49fb60e 100644 --- a/pkgs/applications/misc/electrum/grs.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -9,11 +9,11 @@ }: let - version = "4.3.1"; + version = "4.4.4"; libsecp256k1_name = - if stdenv.isLinux then "libsecp256k1.so.0" - else if stdenv.isDarwin then "libsecp256k1.0.dylib" + if stdenv.isLinux then "libsecp256k1.so.{v}" + else if stdenv.isDarwin then "libsecp256k1.{v}.dylib" else "libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary}"; libzbar_name = @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication { owner = "Groestlcoin"; repo = "electrum-grs"; rev = "refs/tags/v${version}"; - sha256 = "1h9r32wdn0p7br36r719x96c8gay83dijw80y2ks951mam16mkkb"; + sha256 = "0fl01qdvb1z6l6kwipj1lj0qmjk3mzw25wv7yh5j1hh1f5lng0s8"; }; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; @@ -55,6 +55,7 @@ python3.pkgs.buildPythonApplication { tlslite-ng # plugins btchip-python + ledger-bitcoin ckcc-protocol keepkey trezor @@ -66,7 +67,7 @@ python3.pkgs.buildPythonApplication { postPatch = '' # make compatible with protobuf4 by easing dependencies ... substituteInPlace ./contrib/requirements/requirements.txt \ - --replace "protobuf>=3.12,<4" "protobuf>=3.12" + --replace "protobuf>=3.20,<4" "protobuf>=3.20" # ... and regenerating the paymentrequest_pb2.py file protoc --python_out=. electrum_grs/paymentrequest.proto From 4f488c66843735f275c8c135dface1402b7b3d51 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 21 Jun 2023 18:28:03 +0300 Subject: [PATCH 040/222] ayatana-webmail: init at 22.12.15 --- .../mailreaders/ayatana-webmail/default.nix | 90 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 92 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix diff --git a/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix b/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix new file mode 100644 index 000000000000..14be9ab4f3d6 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix @@ -0,0 +1,90 @@ +{ lib +, fetchFromGitHub +, gettext +, gtk3 +, python3Packages +, gdk-pixbuf +, libnotify +, glib +, gobject-introspection +, wrapGAppsHook +# BTW libappindicator is also supported, but upstream recommends their +# implementation, see: +# https://github.com/AyatanaIndicators/ayatana-webmail/issues/24#issuecomment-1050352862 +, libayatana-appindicator +, gsettings-desktop-schemas +, libcanberra-gtk3 +}: + +python3Packages.buildPythonApplication rec { + pname = "ayatana-webmail"; + version = "22.12.15"; + + src = fetchFromGitHub { + owner = "AyatanaIndicators"; + repo = "ayatana-webmail"; + rev = version; + hash = "sha256-K2jqCWrY1i1wYdZVpjN/3TcVyWariOQQ4slZf6sEPRU="; + }; + postConfigure = '' + # Fix fhs paths + substituteInPlace \ + ayatanawebmail/accounts.py \ + ayatanawebmail/actions.py \ + ayatanawebmail/dialog.py \ + --replace /usr/share $out/share + ''; + + buildInputs = [ + gtk3 + gdk-pixbuf + glib + libnotify + gettext + libayatana-appindicator + gsettings-desktop-schemas + ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + glib # For compiling gsettings-schemas + ]; + + propagatedBuildInputs = with python3Packages; [ + urllib3 + babel + psutil + secretstorage + polib + pygobject3 + dbus-python + ]; + + # No tests, and they cause a failure + doCheck = false; + + postInstall = '' + # Fix fhs paths + mv $out/${python3Packages.python.sitePackages}/etc $out + mv $out/${python3Packages.python.sitePackages}/usr/{bin,share} $out/ + rmdir $out/${python3Packages.python.sitePackages}/usr + # Compile gsettings desktop schemas + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + # See https://nixos.org/nixpkgs/manual/#ssec-gnome-common-issues-double-wrapped + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ libcanberra-gtk3 ]}) + ''; + + meta = with lib; { + description = "Webmail notifications and actions for any desktop"; + homepage = "https://github.com/AyatanaIndicators/ayatana-webmail"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ca39b2a0022..eb0b3afcbca8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19965,6 +19965,8 @@ with pkgs; ayatana-ido = callPackage ../development/libraries/ayatana-ido { }; + ayatana-webmail = callPackage ../applications/networking/mailreaders/ayatana-webmail { }; + babl = callPackage ../development/libraries/babl { }; backward-cpp = callPackage ../development/libraries/backward-cpp { }; From 5d00e7aee56622a3961b105b09341e6102f0bb58 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 22 Jun 2023 11:06:43 +0300 Subject: [PATCH 041/222] indilib: unbreak on x86_64-darwin --- .../development/libraries/science/astronomy/indilib/default.nix | 2 -- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index cf722af9cbe1..bb16d8b11e9b 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -54,7 +54,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = with maintainers; [ hjones2199 ]; platforms = platforms.unix; - # error: use of undeclared identifier 'MSG_NOSIGNAL' - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d874c8c9a74..258f62c86f10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21457,7 +21457,7 @@ with pkgs; indicator-sound-switcher = callPackage ../applications/audio/indicator-sound-switcher { }; - indilib = callPackage ../development/libraries/science/astronomy/indilib { }; + indilib = darwin.apple_sdk_11_0.callPackage ../development/libraries/science/astronomy/indilib { }; indi-full = callPackage ../development/libraries/science/astronomy/indilib/indi-full.nix { }; inih = callPackage ../development/libraries/inih { }; From 8f3b487ee41e2786b9bcf25b5499b729089d5c04 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Thu, 22 Jun 2023 17:09:40 +0200 Subject: [PATCH 042/222] openraPackages_2019: remove usages of `with lib;` --- pkgs/games/openra_2019/default.nix | 19 ++++++++++++------- pkgs/games/openra_2019/engine.nix | 8 +++----- pkgs/games/openra_2019/mod.nix | 22 ++++++++++------------ 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/pkgs/games/openra_2019/default.nix b/pkgs/games/openra_2019/default.nix index 76454f69e4b3..9696e4fe2654 100644 --- a/pkgs/games/openra_2019/default.nix +++ b/pkgs/games/openra_2019/default.nix @@ -8,9 +8,9 @@ */ pkgs: -with pkgs.lib; - let + lib = pkgs.lib; + /* Building an engine or out-of-tree mod is very similar, but different enough not to be able to build them with the same package definition, so instaed we define what is common between them in a separate file. @@ -21,7 +21,10 @@ let so either the attributes added by `makeOverridable` have to be removed or the engine and mod package definitions will need to add `...` to the argument list. */ - common = let f = import ./common.nix; in f (builtins.intersectAttrs (functionArgs f) pkgs // { + common = let + f = import ./common.nix; + fArgs = lib.functionArgs f; + in f (builtins.intersectAttrs fArgs pkgs // { lua = pkgs.lua5_1; # It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure, # rather than having to look to the logs why it is not starting. @@ -40,8 +43,8 @@ let to base the name on the attribute name instead, preventing the need to specify the name twice if the attribute name and engine/mod name are equal. */ - callWithName = name: value: if isFunction value then value name else value; - buildOpenRASet = f: args: pkgs.recurseIntoAttrs (mapAttrs callWithName (f ({ + callWithName = name: value: if lib.isFunction value then value name else value; + buildOpenRASet = f: args: pkgs.recurseIntoAttrs (lib.mapAttrs callWithName (f ({ inherit (pkgs) fetchFromGitHub; postFetch = '' sed -i 's/curl/curl --insecure/g' $out/thirdparty/{fetch-thirdparty-deps,noget}.sh @@ -56,14 +59,16 @@ in pkgs.recurseIntoAttrs rec { # Allow specifying the name at a later point if no name has been given. let builder = name: pkgs.callPackage ./engine.nix (common // { engine = engine // { inherit name; }; - }); in if name == null then builder else builder name; + }); + in if name == null then builder else builder name; # See `buildOpenRAEngine`. buildOpenRAMod = { name ? null, version, title, description, homepage, src, engine, assetsError ? "" }@mod: ({ version, mods ? [], src }@engine: let builder = name: pkgs.callPackage ./mod.nix (common // { mod = mod // { inherit name assetsError; }; engine = engine // { inherit mods; }; - }); in if name == null then builder else builder name) engine; + }); + in if name == null then builder else builder name) engine; # See `buildOpenRASet`. engines = buildOpenRASet (import ./engines.nix) { inherit buildOpenRAEngine; }; diff --git a/pkgs/games/openra_2019/engine.nix b/pkgs/games/openra_2019/engine.nix index f3f3b9c073c5..d63800be1e29 100644 --- a/pkgs/games/openra_2019/engine.nix +++ b/pkgs/games/openra_2019/engine.nix @@ -14,9 +14,7 @@ , engine }: -with lib; - -stdenv.mkDerivation (recursiveUpdate packageAttrs rec { +stdenv.mkDerivation (lib.recursiveUpdate packageAttrs rec { pname = "openra_2019"; version = "${engine.name}-${engine.version}"; @@ -27,7 +25,7 @@ stdenv.mkDerivation (recursiveUpdate packageAttrs rec { configurePhase = '' runHook preConfigure - make version VERSION=${escapeShellArg version} + make version VERSION=${lib.escapeShellArg version} runHook postConfigure ''; @@ -48,7 +46,7 @@ stdenv.mkDerivation (recursiveUpdate packageAttrs rec { postInstall = '' ${wrapLaunchGame "" "openra"} - ${concatStrings (map (mod: '' + ${lib.concatStrings (map (mod: '' makeWrapper $out/bin/openra $out/bin/openra-${mod} --add-flags Game.Mod=${mod} '') engine.mods)} ''; diff --git a/pkgs/games/openra_2019/mod.nix b/pkgs/games/openra_2019/mod.nix index c57726580741..2f945b4b4ddc 100644 --- a/pkgs/games/openra_2019/mod.nix +++ b/pkgs/games/openra_2019/mod.nix @@ -14,14 +14,12 @@ , engine }: -with lib; - let engineSourceName = engine.src.name or "engine"; modSourceName = mod.src.name or "mod"; # Based on: https://build.opensuse.org/package/show/home:fusion809/openra-ura -in stdenv.mkDerivation (recursiveUpdate packageAttrs rec { +in stdenv.mkDerivation (lib.recursiveUpdate packageAttrs rec { name = "${pname}-${version}"; pname = "openra_2019-${mod.name}"; inherit (mod) version; @@ -54,8 +52,8 @@ in stdenv.mkDerivation (recursiveUpdate packageAttrs rec { configurePhase = '' runHook preConfigure - make version VERSION=${escapeShellArg version} - make -C ${engineSourceName} version VERSION=${escapeShellArg engine.version} + make version VERSION=${lib.escapeShellArg version} + make -C ${engineSourceName} version VERSION=${lib.escapeShellArg engine.version} runHook postConfigure ''; @@ -67,22 +65,22 @@ in stdenv.mkDerivation (recursiveUpdate packageAttrs rec { make -C ${engineSourceName} install-engine install-common-mod-files DATA_INSTALL_DIR=$out/lib/${pname} - cp -r ${engineSourceName}/mods/{${concatStringsSep "," ([ "common" "modcontent" ] ++ engine.mods)}} mods/* \ + cp -r ${engineSourceName}/mods/{${lib.concatStringsSep "," ([ "common" "modcontent" ] ++ engine.mods)}} mods/* \ $out/lib/${pname}/mods/ substitute ${./mod-launch-game.sh} $out/lib/openra_2019-${mod.name}/launch-game.sh \ --subst-var out \ - --subst-var-by name ${escapeShellArg mod.name} \ - --subst-var-by title ${escapeShellArg mod.title} \ - --subst-var-by assetsError ${escapeShellArg mod.assetsError} + --subst-var-by name ${lib.escapeShellArg mod.name} \ + --subst-var-by title ${lib.escapeShellArg mod.title} \ + --subst-var-by assetsError ${lib.escapeShellArg mod.assetsError} chmod +x $out/lib/openra_2019-${mod.name}/launch-game.sh ${wrapLaunchGame "_2019-${mod.name}" "openra-${mod.name}"} substitute ${./openra-mod.desktop} $(mkdirp $out/share/applications)/${pname}.desktop \ - --subst-var-by name ${escapeShellArg mod.name} \ - --subst-var-by title ${escapeShellArg mod.title} \ - --subst-var-by description ${escapeShellArg mod.description} + --subst-var-by name ${lib.escapeShellArg mod.name} \ + --subst-var-by title ${lib.escapeShellArg mod.title} \ + --subst-var-by description ${lib.escapeShellArg mod.description} cp README.md $(mkdirp $out/share/doc/packages/${pname})/README.md From f626023bea132ea3fbc9fe4f641a9546231eaa0d Mon Sep 17 00:00:00 2001 From: mdarocha Date: Thu, 22 Jun 2023 17:24:32 +0200 Subject: [PATCH 043/222] openraPackages_2019: remove dependency on dotnetPackages --- pkgs/games/openra_2019/common.nix | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/games/openra_2019/common.nix b/pkgs/games/openra_2019/common.nix index 338215616196..4445cc53ba6a 100644 --- a/pkgs/games/openra_2019/common.nix +++ b/pkgs/games/openra_2019/common.nix @@ -2,7 +2,7 @@ and out-of-tree mod packages (mod.nix). */ { lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper -, lua, mono, dotnetPackages, python3 +, lua, mono, python3 , libGL, freetype, openal, SDL2 , zenity }: @@ -40,24 +40,7 @@ in { ''; packageAttrs = { - buildInputs = with dotnetPackages; [ - FuzzyLogicLibrary - MaxMindDb - MaxMindGeoIP2 - MonoNat - NewtonsoftJson - NUnit3 - NUnitConsole - OpenNAT - RestSharp - SharpFont - SharpZipLib - SmartIrc4net - StyleCopMSBuild - StyleCopPlusMSBuild - ] ++ [ - libGL - ]; + buildInputs = [ libGL ]; # TODO: Test if this is correct. nativeBuildInputs = [ From 44f2f9efcdc66b468ac785bcb490df4d37cb3f33 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Thu, 22 Jun 2023 17:25:43 +0200 Subject: [PATCH 044/222] openraPackages_2019: don't use pkgs.lib --- pkgs/games/openra_2019/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/games/openra_2019/default.nix b/pkgs/games/openra_2019/default.nix index 9696e4fe2654..0bcf71cd87f1 100644 --- a/pkgs/games/openra_2019/default.nix +++ b/pkgs/games/openra_2019/default.nix @@ -6,11 +6,9 @@ Additional engines or mods can be added with `openraPackages.buildOpenRAEngine` (function around `engine.nix`) and `openraPackages.buildOpenRAMod` (function around `mod.nix`), respectively. */ -pkgs: +{ pkgs, lib }: let - lib = pkgs.lib; - /* Building an engine or out-of-tree mod is very similar, but different enough not to be able to build them with the same package definition, so instaed we define what is common between them in a separate file. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d874c8c9a74..4ba01395a9f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37138,7 +37138,10 @@ with pkgs; otto-matic = callPackage ../games/otto-matic { }; - openraPackages_2019 = import ../games/openra_2019 pkgs.__splicedPackages; + openraPackages_2019 = import ../games/openra_2019 { + inherit lib; + pkgs = pkgs.__splicedPackages; + }; openra_2019 = openraPackages_2019.engines.release; From 867f6fc82d8945a1b6ff6f5946d8891847886398 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 22 Jun 2023 13:07:51 -0700 Subject: [PATCH 045/222] perlPackages.Po4a: disable tests on darwin --- pkgs/development/perl-modules/Po4a/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/pkgs/development/perl-modules/Po4a/default.nix index f08b5b2361a3..38569204f5a8 100644 --- a/pkgs/development/perl-modules/Po4a/default.nix +++ b/pkgs/development/perl-modules/Po4a/default.nix @@ -45,7 +45,9 @@ buildPerlPackage rec { # https://github.com/void-linux/void-packages/pull/34029#issuecomment-973267880 # Alpine packagers have not worried about running the tests until now: # https://git.alpinelinux.org/aports/tree/main/po4a/APKBUILD#n11 - doCheck = !stdenv.hostPlatform.isMusl; + # + # Disabling tests on Darwin until https://github.com/NixOS/nixpkgs/issues/236560 is resolved. + doCheck = (!stdenv.hostPlatform.isMusl) && (!stdenv.hostPlatform.isDarwin); checkPhase = '' export SGML_CATALOG_FILES=${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat From 6df1c56223496ac21598f24aa409e8e46cbeb5e2 Mon Sep 17 00:00:00 2001 From: Colin Date: Wed, 14 Jun 2023 05:42:44 +0000 Subject: [PATCH 046/222] sequoia: 0.28.0 -> 0.30.1 and fetch from the new upstream, since sequoia-sq (the CLI) was split out of the main sequoia repo (the library). - for the record, python bindings were deprecated and split out into their own repo in 0.25.0, but our build script wasn't updated and has been silently not building bindings since then. - python ffi library: - commit which removed them: --- pkgs/tools/security/sequoia/default.nix | 69 ++++--------------------- pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/python-packages.nix | 5 +- 3 files changed, 13 insertions(+), 65 deletions(-) diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index aed53b57f55d..939e8ab6b77d 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -1,81 +1,38 @@ { stdenv , fetchFromGitLab -, fetchpatch , lib , darwin -, git , nettle , nix-update-script -, cargo -, rustc , rustPlatform , pkg-config , openssl , sqlite -, capnproto -, ensureNewerSourcesForZipFilesHook -, pythonSupport ? true -, pythonPackages ? null }: -assert pythonSupport -> pythonPackages != null; - rustPlatform.buildRustPackage rec { pname = "sequoia"; - # Upstream has separate version numbering for the library and the CLI frontend. - # This derivation provides the CLI frontend, and thus uses its version number. - version = "0.28.0"; + version = "0.30.1"; src = fetchFromGitLab { owner = "sequoia-pgp"; - repo = "sequoia"; - rev = "sq/v${version}"; - hash = "sha256-T7WOYMqyBeVHs+4w8El99t0NTUKqMW1QeAkNGKcaWr0="; + repo = "sequoia-sq"; + rev = "v${version}"; + hash = "sha256-uFcmuyz0JsUTvKqCb+3t8JdB4Dn4hJq00jeEhvMNW18="; }; - cargoHash = "sha256-zaAAEFBumfHU4hGzAOmLvBu3X4J7LAlmexqixHtVPr8="; - - patches = [ - (fetchpatch { - url = "https://gitlab.com/sequoia-pgp/sequoia/-/commit/4dc6e624c2394936dc447f18aedb4a4810bb2ddb.patch"; - hash = "sha256-T6hh7U1gvKvyn/OCuJBvLM7TG1VFnpvpAiWS72m3P6I="; - }) - ]; + cargoHash = "sha256-9UQojec2jy9DVwQQplaKuPWYCeRXtWtdzj1d/LLyfJQ="; nativeBuildInputs = [ pkg-config - cargo - rustc - git rustPlatform.bindgenHook - ensureNewerSourcesForZipFilesHook - capnproto - ] ++ - lib.optionals pythonSupport [ pythonPackages.setuptools ] - ; - - nativeCheckInputs = lib.optionals pythonSupport [ - pythonPackages.pytest - pythonPackages.pytest-runner ]; buildInputs = [ openssl sqlite nettle - ] ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ] - ; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - # Defaults to "ginstall" from some reason, although upstream's Makefiles check uname - "INSTALL=install" - ]; - - buildFlags = [ - "build-release" - ]; + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; # Sometimes, tests fail on CI (ofborg) & hydra without this checkFlags = [ @@ -84,24 +41,20 @@ rustPlatform.buildRustPackage rec { "--skip=macros::time_it" ]; - preInstall = lib.optionalString pythonSupport '' - export installFlags="PYTHONPATH=$PYTHONPATH:$out/${pythonPackages.python.sitePackages}" - '' + lib.optionalString (!pythonSupport) '' - export makeFlags="PYTHON=disable" + # Install manual pages, see https://gitlab.com/sequoia-pgp/sequoia-sq#building + postInstall = '' + mkdir -p $out/share/man + SQ_MAN=$out/share/man/man1 cargo run ''; - # Don't use buildRustPackage phases, only use it for rust deps setup - configurePhase = null; - buildPhase = null; doCheck = true; - checkPhase = null; - installPhase = null; passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A cool new OpenPGP implementation"; homepage = "https://sequoia-pgp.org/"; + changelog = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/v${version}/NEWS"; license = licenses.gpl2Plus; maintainers = with maintainers; [ minijackson doronbehar ]; mainProgram = "sq"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 119a086fc789..35ab8bef5587 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12371,9 +12371,7 @@ with pkgs; seqdiag = with python3Packages; toPythonApplication seqdiag; - sequoia = callPackage ../tools/security/sequoia { - pythonPackages = python3Packages; - }; + sequoia = callPackage ../tools/security/sequoia { }; sequoia-chameleon-gnupg = callPackage ../tools/security/sequoia-chameleon-gnupg { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c260b693c24..f42dd57a954a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11104,10 +11104,7 @@ self: super: with self; { seqeval = callPackage ../development/python-modules/seqeval { }; - sequoia = disabledIf isPyPy (toPythonModule (pkgs.sequoia.override { - pythonPackages = self; - pythonSupport = true; - })); + sequoia = disabledIf isPyPy (toPythonModule pkgs.sequoi); serialio = callPackage ../development/python-modules/serialio { }; From 840afa1db7fc75e0cc6190411733647ae8883fca Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sat, 10 Jun 2023 21:45:17 +0200 Subject: [PATCH 047/222] libdatachannel: init at 0.18.5 --- .../libraries/libdatachannel/default.nix | 80 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/libraries/libdatachannel/default.nix diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix new file mode 100644 index 000000000000..f2c7b1197810 --- /dev/null +++ b/pkgs/development/libraries/libdatachannel/default.nix @@ -0,0 +1,80 @@ +{ stdenv +, lib +, fetchFromGitHub +, srcOnly +, cmake +, ninja +, pkg-config +, libnice +, openssl +, plog +, srtp +, usrsctp +}: + +let + # Use usrsctp version specified at https://github.com/paullouisageneau/libdatachannel/tree/master/deps + # Older or newer usrsctp might break libdatachannel, please keep it synced with upstream. + customUsrsctp = usrsctp.overrideAttrs (finalAttrs: previousAttrs: { + version = "unstable-2021-10-08"; + src = fetchFromGitHub { + owner = "sctplab"; + repo = "usrsctp"; + rev = "7c31bd35c79ba67084ce029511193a19ceb97447"; + hash = "sha256-KeOR/0WDtG1rjUndwTUOhE21PoS+ETs1Vk7jQYy/vNs="; + }; + }); +in +stdenv.mkDerivation rec { + pname = "libdatachannel"; + version = "0.18.5"; + + src = fetchFromGitHub { + owner = "paullouisageneau"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ognjEDw68DpdQ/4JqcTejP5f9K0zLZGnpr99P/dvHK4="; + }; + + outputs = [ "out" "dev" ]; + + strictDeps = true; + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + buildInputs = [ + libnice + openssl + srtp + ]; + + cmakeFlags = [ + "-DUSE_NICE=ON" + "-DUSE_SYSTEM_SRTP=ON" + "-DNO_EXAMPLES=ON" + ]; + + postPatch = '' + # TODO: Remove when updating to 0.19.x, and add + # -DUSE_SYSTEM_USRSCTP=ON and -DUSE_SYSTEM_PLOG=ON to cmakeFlags instead + mkdir -p deps/{usrsctp,plog} + cp -r --no-preserve=mode ${srcOnly customUsrsctp}/. deps/usrsctp + cp -r --no-preserve=mode ${srcOnly plog}/. deps/plog + ''; + + postFixup = '' + # Fix shared library path that will be incorrect on move to "dev" output + substituteInPlace "$dev/lib/cmake/LibDataChannel/LibDataChannelTargets-release.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib" "$out/lib" + ''; + + meta = with lib; { + description = "C/C++ WebRTC network library featuring Data Channels, Media Transport, and WebSockets"; + homepage = "https://libdatachannel.org/"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ erdnaxe ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a6edaca588a..609460425725 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27238,6 +27238,8 @@ with pkgs; libcgroup = callPackage ../os-specific/linux/libcgroup { }; + libdatachannel = callPackage ../development/libraries/libdatachannel { }; + libkrun = callPackage ../development/libraries/libkrun { inherit (darwin.apple_sdk.frameworks) Hypervisor; }; From 4b2a77fdc40bac19e510e0c509c99486df0dfbc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Jun 2023 00:31:17 +0000 Subject: [PATCH 048/222] python310Packages.micawber: 0.5.4 -> 0.5.5 --- pkgs/development/python-modules/micawber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index a7956241adf2..c70a29b4ca67 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "micawber"; - version = "0.5.4"; + version = "0.5.5"; src = fetchPypi { inherit pname version; - sha256 = "003c5345aafe84f6b60fd289c003e8b1fef04c14e015c2d52d792a6b88135c89"; + sha256 = "sha256-CsWBS2X/KngfsTlLkaI6ipX3NJK2u49wW67q2C6t1UM="; }; propagatedBuildInputs = [ beautifulsoup4 ]; From 9f5feba8955f3293e13934710d27fa330f0649ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Jun 2023 02:38:52 +0000 Subject: [PATCH 049/222] discord-development: 0.0.216 -> 0.0.217 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index edff60d9f835..c75fd1564abe 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ let stable = "0.0.27"; ptb = "0.0.42"; canary = "0.0.161"; - development = "0.0.216"; + development = "0.0.217"; } else { stable = "0.0.273"; ptb = "0.0.59"; @@ -28,7 +28,7 @@ let }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - sha256 = "sha256-lQnIQC7Wek7OYDzZvLIJfb8I4oATD8pSB+mjQMPyqYQ="; + sha256 = "sha256-fzNFKrYo5qckrWZAkkiK337czCt6nOM1O8FeG18Q8Y0="; }; }; x86_64-darwin = { From 2bd7b1e147aca074314cdbef47e63b353e136206 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jun 2023 10:10:57 +0200 Subject: [PATCH 050/222] python310Packages.micawber: disable on unsupported python releases --- .../python-modules/micawber/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index c70a29b4ca67..0a4decb49e4d 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -1,19 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, beautifulsoup4 }: +{ lib +, buildPythonPackage +, fetchPypi +, beautifulsoup4 +, pythonOlder +}: buildPythonPackage rec { pname = "micawber"; version = "0.5.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "sha256-CsWBS2X/KngfsTlLkaI6ipX3NJK2u49wW67q2C6t1UM="; }; - propagatedBuildInputs = [ beautifulsoup4 ]; + propagatedBuildInputs = [ + beautifulsoup4 + ]; meta = with lib; { homepage = "https://micawber.readthedocs.io/en/latest/"; - description = "A small library for extracting rich content from urls"; + description = "Module for extracting rich content from URLs"; license = licenses.mit; longDescription = '' micawber supplies a few methods for retrieving rich metadata From 9589a3cda769694f1a0a8b21ec1d96482eaad37a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 25 Jun 2023 23:22:34 +0800 Subject: [PATCH 051/222] libtoxcore: drop unnecessary dependency on msgpack --- .../libraries/libtoxcore/default.nix | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 63e0dae08a3f..87d6633f124e 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchurl, cmake, libsodium, ncurses, libopus, msgpack -, libvpx, check, libconfig, pkg-config }: +{ lib +, stdenv +, fetchurl +, cmake +, libsodium +, ncurses +, libopus +, libvpx +, check +, libconfig +, pkg-config +}: let buildToxAV = !stdenv.isAarch32; in stdenv.mkDerivation rec { @@ -14,14 +24,18 @@ in stdenv.mkDerivation rec { sha256 = "sha256-8pQFN5mIY1k+KLxqa19W8JZ19s2KKDJre8MbSDbAiUI="; }; - cmakeFlags = - [ "-DBUILD_NTOX=ON" "-DDHT_BOOTSTRAP=ON" "-DBOOTSTRAP_DAEMON=ON" ] - ++ lib.optional buildToxAV "-DMUST_BUILD_TOXAV=ON"; + cmakeFlags = [ + "-DDHT_BOOTSTRAP=ON" + "-DBOOTSTRAP_DAEMON=ON" + ] ++ lib.optional buildToxAV "-DMUST_BUILD_TOXAV=ON"; buildInputs = [ - libsodium msgpack ncurses libconfig + libsodium + ncurses + libconfig ] ++ lib.optionals buildToxAV [ - libopus libvpx + libopus + libvpx ]; nativeBuildInputs = [ cmake pkg-config ]; From 56c7d5e2e82cff9a5953a5905805d5b82bf3f2d3 Mon Sep 17 00:00:00 2001 From: Sergey Kazenyuk Date: Mon, 29 May 2023 13:59:00 +0300 Subject: [PATCH 052/222] kodiPackages.libretro-2048: init at 1.0.0.136 --- .../kodi/addons/libretro-2048/default.nix | 31 +++++++++++++++++++ pkgs/top-level/kodi-packages.nix | 4 ++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/video/kodi/addons/libretro-2048/default.nix diff --git a/pkgs/applications/video/kodi/addons/libretro-2048/default.nix b/pkgs/applications/video/kodi/addons/libretro-2048/default.nix new file mode 100644 index 000000000000..67644444d891 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/libretro-2048/default.nix @@ -0,0 +1,31 @@ +{ lib, buildKodiBinaryAddon, fetchFromGitHub, libretro, twenty-fortyeight }: + +buildKodiBinaryAddon rec { + pname = "libretro-2048"; + namespace = "game.libretro.2048"; + version = "1.0.0.136"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "game.libretro.2048"; + rev = "${version}-Nexus"; + hash = "sha256-cIo56ZGansBlAj6CFw51UOYJUivN9n1qhVTWAX9c5Tc="; + }; + + extraCMakeFlags = [ + "-D2048_LIB=${twenty-fortyeight}/lib/retroarch/cores/2048_libretro.so" + ]; + + extraBuildInputs = [ twenty-fortyeight ]; + propagatedBuildInputs = [ + libretro + ]; + + meta = with lib; { + homepage = "https://github.com/kodi-game/game.libretro.2048"; + description = "2048 GameClient for Kodi"; + platforms = platforms.all; + license = licenses.publicDomain; + maintainers = with maintainers; teams.kodi.members ++ [ kazenyuk ]; + }; +} diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index d3d245172944..9d42fb548345 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -3,7 +3,7 @@ with lib; let - inherit (libretro) genesis-plus-gx mgba snes9x; + inherit (libretro) genesis-plus-gx mgba snes9x twenty-fortyeight; in let self = rec { @@ -62,6 +62,8 @@ let self = rec { libretro = callPackage ../applications/video/kodi/addons/libretro { }; + libretro-2048 = callPackage ../applications/video/kodi/addons/libretro-2048 { inherit twenty-fortyeight; }; + libretro-genplus = callPackage ../applications/video/kodi/addons/libretro-genplus { inherit genesis-plus-gx; }; libretro-mgba = callPackage ../applications/video/kodi/addons/libretro-mgba { inherit mgba; }; From 1eebe0b71ea6fe9bee4e84112a959406770b6412 Mon Sep 17 00:00:00 2001 From: Sergey Kazenyuk Date: Fri, 23 Jun 2023 21:54:28 +0300 Subject: [PATCH 053/222] kodiPackages.vfs-rar: init at 20.1.0 --- .../video/kodi/addons/vfs-rar/default.nix | 22 +++++++++++++++++++ pkgs/top-level/kodi-packages.nix | 6 +++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/video/kodi/addons/vfs-rar/default.nix diff --git a/pkgs/applications/video/kodi/addons/vfs-rar/default.nix b/pkgs/applications/video/kodi/addons/vfs-rar/default.nix new file mode 100644 index 000000000000..259295be7ca7 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/vfs-rar/default.nix @@ -0,0 +1,22 @@ +{ lib, rel, buildKodiBinaryAddon, fetchFromGitHub, tinyxml }: +buildKodiBinaryAddon rec { + pname = namespace; + namespace = "vfs.rar"; + version = "20.1.0"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = namespace; + rev = "${version}-${rel}"; + sha256 = "sha256-8IEYA2gNchCa7O9kzrCbO5DxYWJqPzQN3SJIr9zCWc8="; + }; + + extraBuildInputs = [ tinyxml ]; + + meta = with lib; { + description = "RAR archive Virtual Filesystem add-on for Kodi"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index d3d245172944..ef3812e8b58c 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -96,10 +96,12 @@ let self = rec { osmc-skin = callPackage ../applications/video/kodi/addons/osmc-skin { }; - vfs-sftp = callPackage ../applications/video/kodi/addons/vfs-sftp { }; - vfs-libarchive = callPackage ../applications/video/kodi/addons/vfs-libarchive { }; + vfs-rar = callPackage ../applications/video/kodi/addons/vfs-rar { }; + + vfs-sftp = callPackage ../applications/video/kodi/addons/vfs-sftp { }; + visualization-fishbmc = callPackage ../applications/video/kodi/addons/visualization-fishbmc { }; visualization-goom = callPackage ../applications/video/kodi/addons/visualization-goom { }; From c7f52b430b7f18d6847b005749e9b7e7f56bfdef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jun 2023 21:46:39 +0200 Subject: [PATCH 054/222] python311Packages.moreorless: init at 0.4.0 --- .../python-modules/moreorless/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/moreorless/default.nix diff --git a/pkgs/development/python-modules/moreorless/default.nix b/pkgs/development/python-modules/moreorless/default.nix new file mode 100644 index 000000000000..8f849b42f137 --- /dev/null +++ b/pkgs/development/python-modules/moreorless/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, parameterized +, pytestCheckHook +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "moreorless"; + version = "0.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "thatch"; + repo = "moreorless"; + rev = "refs/tags/v${version}"; + hash = "sha256-N11iqsxMGgzwW2QYeOoHQaR/aDEuoUnnd/2Mc5culN0="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + click + ]; + + nativeCheckInputs = [ + parameterized + pytestCheckHook + ]; + + pythonImportsCheck = [ + "moreorless" + ]; + + pytestFlagsArray = [ + "moreorless/tests/click.py" + "moreorless/tests/general.py" + "moreorless/tests/patch.py" + ]; + + meta = with lib; { + description = "Wrapper to make difflib.unified_diff more fun to use"; + homepage = "https://github.com/thatch/moreorless/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a8949202ad9..e3da0968bf55 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6444,6 +6444,8 @@ self: super: with self; { more-properties = callPackage ../development/python-modules/more-properties { }; + moreorless = callPackage ../development/python-modules/moreorless { }; + moretools = callPackage ../development/python-modules/moretools { }; morfessor = callPackage ../development/python-modules/morfessor { }; From db1067257254b9e4eea3e0b940d626568f849897 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jun 2023 21:55:16 +0200 Subject: [PATCH 055/222] python311Packages.stdlibs: init at 2022.10.9 --- .../python-modules/stdlibs/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/stdlibs/default.nix diff --git a/pkgs/development/python-modules/stdlibs/default.nix b/pkgs/development/python-modules/stdlibs/default.nix new file mode 100644 index 000000000000..4d3398d326c3 --- /dev/null +++ b/pkgs/development/python-modules/stdlibs/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "stdlibs"; + version = "2022.10.9"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "omnilib"; + repo = "stdlibs"; + rev = "refs/tags/v${version}"; + hash = "sha256-HkGZw58gQGd8mHnCP4aF6JWXxlpIIfe7B//HJiHVwA4="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "stdlibs" + ]; + + meta = with lib; { + description = "Overview of the Python stdlib"; + homepage = "https://github.com/omnilib/stdlibs"; + changelog = "https://github.com/omnilib/stdlibs/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3da0968bf55..8c203d79007f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11794,6 +11794,8 @@ self: super: with self; { stdlib-list = callPackage ../development/python-modules/stdlib-list { }; + stdlibs = callPackage ../development/python-modules/stdlibs { }; + steamodd = callPackage ../development/python-modules/steamodd { }; steamship = callPackage ../development/python-modules/steamship { }; From fe0f51280653081262f90f438c6b89e8f079ea6c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jun 2023 22:01:42 +0200 Subject: [PATCH 056/222] python311Packages.trailrunner: init at 1.4.0 --- .../python-modules/trailrunner/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/trailrunner/default.nix diff --git a/pkgs/development/python-modules/trailrunner/default.nix b/pkgs/development/python-modules/trailrunner/default.nix new file mode 100644 index 000000000000..04cf6b0c071f --- /dev/null +++ b/pkgs/development/python-modules/trailrunner/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pathspec +, pythonOlder +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "trailrunner"; + version = "1.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "omnilib"; + repo = "trailrunner"; + rev = "refs/tags/v${version}"; + hash = "sha256-qtEBr22yyj6WcSfyYr/4r0IuuMJ6chFFqnmb+uMfQPA="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + pathspec + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ + "trailrunner" + ]; + + meta = with lib; { + description = "Module to walk paths and run things"; + homepage = "https://github.com/omnilib/trailrunner"; + changelog = "https://github.com/omnilib/trailrunner/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c203d79007f..398f2e7f24b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12436,6 +12436,8 @@ self: super: with self; { trackpy = callPackage ../development/python-modules/trackpy { }; + trailrunner = callPackage ../development/python-modules/trailrunner {}; + trainer = callPackage ../development/python-modules/trainer {}; traitlets = callPackage ../development/python-modules/traitlets { }; From 2b28bfdfaad053ba0f1ce241a6c4a7ccc314b5c4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jun 2023 22:11:21 +0200 Subject: [PATCH 057/222] python311Packages.volatile: init at 2.1.0 --- .../python-modules/volatile/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/volatile/default.nix diff --git a/pkgs/development/python-modules/volatile/default.nix b/pkgs/development/python-modules/volatile/default.nix new file mode 100644 index 000000000000..7be5989b159b --- /dev/null +++ b/pkgs/development/python-modules/volatile/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "volatile"; + version = "2.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mbr"; + repo = "volatile"; + rev = "refs/tags/${version}"; + hash = "sha256-TYUvr0bscM/FaPk9oiF4Ob7HdKa2HlbpEFmaPfh4ir0="; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "volatile" + ]; + + meta = with lib; { + description = "A small extension for the tempfile module"; + homepage = "https://github.com/mbr/volatile"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 398f2e7f24b3..bc3cab4eb8d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12966,6 +12966,8 @@ self: super: with self; { vobject = callPackage ../development/python-modules/vobject { }; + volatile = callPackage ../development/python-modules/volatile { }; + volkszaehler = callPackage ../development/python-modules/volkszaehler { }; voluptuous = callPackage ../development/python-modules/voluptuous { }; From b5843e3c6844ea01cbabfb4b574033651c36a660 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jun 2023 22:15:09 +0200 Subject: [PATCH 058/222] python311Packages.usort: init at 1.1.0b2 --- .../python-modules/usort/default.nix | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 69 insertions(+) create mode 100644 pkgs/development/python-modules/usort/default.nix diff --git a/pkgs/development/python-modules/usort/default.nix b/pkgs/development/python-modules/usort/default.nix new file mode 100644 index 000000000000..2f61e8847ac6 --- /dev/null +++ b/pkgs/development/python-modules/usort/default.nix @@ -0,0 +1,65 @@ +{ lib +, attrs +, buildPythonPackage +, click +, fetchFromGitHub +, hatch-vcs +, hatchling +, libcst +, moreorless +, pythonOlder +, stdlibs +, toml +, trailrunner +, unittestCheckHook +, volatile +}: + +buildPythonPackage rec { + pname = "usort"; + version = "1.1.0b2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "usort"; + rev = "refs/tags/v${version}"; + hash = "sha256-c3gQ+f/BRgM+Nwc+mEP7dcmig7ws7FqL5zwQhNJJlsI="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ + attrs + click + libcst + moreorless + stdlibs + toml + trailrunner + ]; + + nativeCheckInputs = [ + unittestCheckHook + volatile + ]; + + pythonImportsCheck = [ + "usort" + ]; + + meta = with lib; { + description = "Safe, minimal import sorting for Python projects"; + homepage = "https://github.com/facebook/usort"; + changelog = "https://github.com/facebook/usort/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f908fb2b36f8..976e0bd275b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13623,6 +13623,8 @@ with pkgs; usbmuxd2 = callPackage ../tools/misc/usbmuxd2 { }; + usort = with python3Packages; toPythonApplication usort; + ustreamer = callPackage ../applications/video/ustreamer { }; usync = callPackage ../applications/misc/usync { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc3cab4eb8d5..80be8f95b834 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12850,6 +12850,8 @@ self: super: with self; { ush = callPackage ../development/python-modules/ush { }; + usort = callPackage ../development/python-modules/usort { }; + utils = callPackage ../development/python-modules/utils { }; uuid = callPackage ../development/python-modules/uuid { }; From b01137d267a169659e0fc45bafab6016ecd7899d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Jun 2023 22:20:51 +0200 Subject: [PATCH 059/222] python311Packages.ufmt: init at 2.1.0 --- .../python-modules/ufmt/default.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 65 insertions(+) create mode 100644 pkgs/development/python-modules/ufmt/default.nix diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix new file mode 100644 index 000000000000..cc510c0fa76f --- /dev/null +++ b/pkgs/development/python-modules/ufmt/default.nix @@ -0,0 +1,61 @@ +{ lib +, black +, buildPythonPackage +, click +, fetchFromGitHub +, flit-core +, libcst +, moreorless +, pythonOlder +, tomlkit +, trailrunner +, typing-extensions +, unittestCheckHook +, usort +}: + +buildPythonPackage rec { + pname = "ufmt"; + version = "2.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "omnilib"; + repo = "ufmt"; + rev = "refs/tags/v${version}"; + hash = "sha256-eQIbSC0Oxi6JD7/3o2y9f+KhT8GIiFiYiV4A3QBoWl0="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + black + click + libcst + moreorless + tomlkit + trailrunner + typing-extensions + usort + ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ + "ufmt" + ]; + + meta = with lib; { + description = "Safe, atomic formatting with black and usort"; + homepage = "https://github.com/omnilib/ufmt"; + changelog = "https://github.com/omnilib/ufmt/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 976e0bd275b2..34eb1e3b5cce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14003,6 +14003,8 @@ with pkgs; udunits = callPackage ../development/libraries/udunits { }; + ufmt = with python3Packages; toPythonApplication ufmt; + uftp = callPackage ../servers/uftp { }; uhttpmock = callPackage ../development/libraries/uhttpmock { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80be8f95b834..031620cec402 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12694,6 +12694,8 @@ self: super: with self; { inherit (pkgs.xorg) libX11 libXext; }; + ufmt = callPackage ../development/python-modules/ufmt { }; + ufo2ft = callPackage ../development/python-modules/ufo2ft { }; ufoLib2 = callPackage ../development/python-modules/ufoLib2 { }; From de1ca081be5489f00ae56c036a27090fdd30cd13 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Thu, 22 Jun 2023 17:08:20 +0200 Subject: [PATCH 060/222] space-station-14-launcher: remove dotnet-specific dependencies This avoids having to regenerate deps.nix when updating dotnet --- pkgs/games/space-station-14-launcher/deps.nix | 5 ----- .../space-station-14-launcher/space-station-14-launcher.nix | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/games/space-station-14-launcher/deps.nix b/pkgs/games/space-station-14-launcher/deps.nix index ef3faa91eeea..5e3fdfec2bc2 100644 --- a/pkgs/games/space-station-14-launcher/deps.nix +++ b/pkgs/games/space-station-14-launcher/deps.nix @@ -25,8 +25,6 @@ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) (fetchNuGet { pname = "libsodium"; version = "1.0.18.2"; sha256 = "02xd4phd6wfixhdq48ma92c166absqw41vdq5kvjch8p0vc9cdl2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.19"; sha256 = "1r41m93kacyyhgjxmhx84n9wv9c2ckwa8295qa4kj8rn73gg4x28"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.19"; sha256 = "1izm1kx4rwi6cp6r6qzjn9h1lmqdcx87yj4gnf291gnabgwpdg9i"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; }) @@ -35,9 +33,6 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "7.0.4"; sha256 = "0lsbzwqiwqv2qq6858aphq7rsp6fs3i0di132w7c0r2r081szql9"; }) (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.4"; sha256 = "0mhfj8bj8dlc01y20ihq6j9r59f67cry6yd6qi6rg9zh93m43jpv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.19"; sha256 = "0xf920dcy92gyf1a4ply370m1k82ja9srql5sq7wm2prl1y77wxp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.19"; sha256 = "0r0q5jd7a0dbc2w767clz460pn6lhvrmimsrn3jqw9irgm7g2xns"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.19"; sha256 = "0slhgkjlwcmz4xjl0x6rwhhcdc6f7hz0vb4lg5ak85inl5m98xa9"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index 5b4dc1b372ef..21d542f0d8cd 100644 --- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -63,7 +63,7 @@ buildDotnetModule rec { updateScript = ./update.sh; }; - dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_7_0 sdk_6_0 ]; dotnet-runtime = dotnetCorePackages.runtime_7_0; dotnetFlags = [ From 983bbf6c1e1f98d76a0f0c9cf31d7b2fb8d5634a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 26 Jun 2023 04:20:00 +0000 Subject: [PATCH 061/222] millet: 0.11.4 -> 0.12.0 Diff: https://github.com/azdavis/millet/compare/v0.11.4...v0.12.0 Changelog: https://github.com/azdavis/millet/raw/v0.12.0/docs/CHANGELOG.md --- .../tools/language-servers/millet/Cargo.lock | 72 +++++++++---------- .../tools/language-servers/millet/default.nix | 4 +- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index 53486c5cfeb5..d77d8c39878e 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "analysis" -version = "0.11.4" +version = "0.12.0" dependencies = [ "config", "diagnostic", @@ -108,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "str-util", @@ -121,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e [[package]] name = "cm-syntax" -version = "0.11.4" +version = "0.12.0" dependencies = [ "lex-util", "paths", @@ -150,7 +150,7 @@ dependencies = [ [[package]] name = "config" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "serde", @@ -178,7 +178,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "once_cell", @@ -415,7 +415,7 @@ dependencies = [ [[package]] name = "input" -version = "0.11.4" +version = "0.12.0" dependencies = [ "cm-syntax", "config", @@ -475,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.11.4" +version = "0.12.0" dependencies = [ "analysis", "anyhow", @@ -503,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.11.4" +version = "0.12.0" [[package]] name = "libc" @@ -575,7 +575,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.11.4" +version = "0.12.0" dependencies = [ "analysis", "codespan-reporting", @@ -593,7 +593,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.11.4" +version = "0.12.0" dependencies = [ "anyhow", "env_logger", @@ -622,7 +622,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "paths", @@ -633,7 +633,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.11.4" +version = "0.12.0" dependencies = [ "config", "diagnostic", @@ -657,7 +657,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.11.4" +version = "0.12.0" dependencies = [ "lex-util", "paths", @@ -729,7 +729,7 @@ dependencies = [ [[package]] name = "panic-hook" -version = "0.11.4" +version = "0.12.0" dependencies = [ "better-panic", ] @@ -923,7 +923,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "str-util", @@ -931,14 +931,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.11.4" +version = "0.12.0" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "fmt-util", @@ -949,7 +949,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.11.4" +version = "0.12.0" dependencies = [ "config", "pretty_assertions", @@ -965,7 +965,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.11.4" +version = "0.12.0" dependencies = [ "config", "elapsed", @@ -979,7 +979,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "once_cell", @@ -988,7 +988,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.11.4" +version = "0.12.0" dependencies = [ "la-arena", "sml-lab", @@ -999,7 +999,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.11.4" +version = "0.12.0" dependencies = [ "config", "cov-mark", @@ -1014,14 +1014,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.11.4" +version = "0.12.0" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.11.4" +version = "0.12.0" dependencies = [ "cov-mark", "diagnostic", @@ -1036,7 +1036,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e [[package]] name = "sml-naive-fmt" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "sml-comment", @@ -1045,11 +1045,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.11.4" +version = "0.12.0" [[package]] name = "sml-parse" -version = "0.11.4" +version = "0.12.0" dependencies = [ "diagnostic", "event-parse", @@ -1061,14 +1061,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.11.4" +version = "0.12.0" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.11.4" +version = "0.12.0" dependencies = [ "num-bigint", "num-traits", @@ -1077,7 +1077,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.11.4" +version = "0.12.0" dependencies = [ "chain-map", "config", @@ -1100,7 +1100,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.11.4" +version = "0.12.0" dependencies = [ "chain-map", "code-h2-md-map", @@ -1119,7 +1119,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.11.4" +version = "0.12.0" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1127,7 +1127,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.11.4" +version = "0.12.0" dependencies = [ "char-name", "code-h2-md-map", @@ -1140,7 +1140,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.11.4" +version = "0.12.0" dependencies = [ "fast-hash", "sml-hir", @@ -1208,7 +1208,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.4" +version = "0.12.0" dependencies = [ "analysis", "cm-syntax", @@ -1552,7 +1552,7 @@ dependencies = [ [[package]] name = "xtask" -version = "0.11.4" +version = "0.12.0" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index aa3c13246dff..11aad10e0f91 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.11.4"; + version = "0.12.0"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-hlL1Rgw78umLyWJNHv3TUpRhQofro+gZQUJJ2ss1ilY="; + hash = "sha256-WoawuH0fuhVrTEtcdfkKpJUQBcbMnbybDST4DDkJEqM="; }; cargoLock = { From 952db33c5e1389d6af4b6abe503caf489d205383 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 26 Jun 2023 04:20:00 +0000 Subject: [PATCH 062/222] nfpm: 2.30.1 -> 2.31.0 Diff: https://github.com/goreleaser/nfpm/compare/v2.30.1...v2.31.0 --- pkgs/tools/package-management/nfpm/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index d4f9faa9e67f..3853271ac00b 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.30.1"; + version = "2.31.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sQpFIZphZqjifqVH3okR+2Ww6IRnqImDySLNk7qYgtg="; + hash = "sha256-49MhTCc+LCfw1tOvLFaagMnQITeCeG+xfH5FmF4/u/c="; }; - vendorHash = "sha256-FW39fqvoMkXrpV0C3WAAOjaEUPF0LrBS99dIC/rFtSI="; + vendorHash = "sha256-eHNdtK3OZRi+oujuC4yToPdNL5GyRqNu09nRRP5cYK4="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; @@ -37,6 +37,7 @@ buildGoModule rec { meta = with lib; { description = "A simple deb and rpm packager written in Go"; homepage = "https://github.com/goreleaser/nfpm"; + changelog = "https://github.com/goreleaser/nfpm/releases/tag/v${version}"; maintainers = with maintainers; [ marsam techknowlogick caarlos0 ]; license = with licenses; [ mit ]; }; From c33c6c4aa419f75076ec36ef196c496b7120d91a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 26 Jun 2023 04:20:00 +0000 Subject: [PATCH 063/222] esbuild: 0.18.9 -> 0.18.10 Diff: https://github.com/evanw/esbuild/compare/v0.18.9...v0.18.10 Changelog: https://github.com/evanw/esbuild/blob/v0.18.10/CHANGELOG.md --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 8249f2ca421e..4e95b02bfb7b 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.18.9"; + version = "0.18.10"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-sNVRn80IKG14OVaBGy58f+WXCMwRCZC4hAh+sN3ulR4="; + hash = "sha256-mJ6q/Ccg7Lm6OXncLnA7QAyiDS/tZJJqobPG+shGPJQ="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From bee727f27d477fbc1d8d28d4660bbb2ed10ff18f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Jun 2023 06:20:05 +0000 Subject: [PATCH 064/222] kodiPackages.inputstreamhelper: 0.5.10+matrix.1 -> 0.6.1+matrix.1 --- .../video/kodi/addons/inputstreamhelper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix index 500a48532cac..ceafe3b9c5ff 100644 --- a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "inputstreamhelper"; namespace = "script.module.inputstreamhelper"; - version = "0.5.10+matrix.1"; + version = "0.6.1+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4="; + sha256 = "sha256-v5fRikswmP+KVbxYibD0NbCK8leUnFbya5EtF1FmS0I="; }; passthru = { From d57a08965239e9b32cdea58213ce99d699be3f04 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 26 Jun 2023 08:07:55 +0000 Subject: [PATCH 065/222] eos-installer: set meta.mainProgram --- pkgs/applications/misc/eos-installer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/eos-installer/default.nix b/pkgs/applications/misc/eos-installer/default.nix index 5200907ff0db..67e6b2bc97ad 100644 --- a/pkgs/applications/misc/eos-installer/default.nix +++ b/pkgs/applications/misc/eos-installer/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { description = "Installer UI which writes images to disk"; license = licenses.gpl2Plus; maintainers = with maintainers; [ qyliss ]; + mainProgram = "gnome-image-installer"; platforms = platforms.linux; }; } From 51c7b1f7f6010b524cc5f602f947f12f0a34b06c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 23 Jun 2023 21:31:59 +0000 Subject: [PATCH 066/222] python3Packages.pysequoia: init at 0.1.14 Also, make `python3Packages.sequoia` throw a message regarding it's replacement of `python3Packages.sequoia`. The main sequoia-pgp/sequoia repository doesn't ship Python code since 0.25.0, just a binary. --- .../manual/release-notes/rl-2311.section.md | 2 + .../python-modules/pysequoia/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 +- pkgs/top-level/python2-packages.nix | 2 - 5 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/python-modules/pysequoia/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index fd710aa1bf88..39917af14532 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -20,6 +20,8 @@ ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} +- `python3.pkgs.sequoia` was removed in favor of `python3.pkgs.pysequoia`. The latter package is based on upstream's dedicated repository for sequoia's Python bindings, where the Python bindings from [gitlab:sequoia-pgp/sequoia](https://gitlab.com/sequoia-pgp/sequoia) were removed long ago. + - `writeTextFile` now requires `executable` to be boolean, values like `null` or `""` will now fail to evaluate. - The latest version of `clonehero` now stores custom content in `~/.clonehero`. See the [migration instructions](https://clonehero.net/2022/11/29/v23-to-v1-migration-instructions.html). Typically, these content files would exist along side the binary, but the previous build used a wrapper script that would store them in `~/.config/unity3d/srylain Inc_/Clone Hero`. diff --git a/pkgs/development/python-modules/pysequoia/default.nix b/pkgs/development/python-modules/pysequoia/default.nix new file mode 100644 index 000000000000..ffc7486cf20a --- /dev/null +++ b/pkgs/development/python-modules/pysequoia/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, pkg-config +, rustPlatform +, cargo +, rustc +, bzip2 +, nettle +, openssl +, pcsclite +, stdenv +, darwin +}: + +buildPythonPackage rec { + pname = "pysequoia"; + version = "0.1.14"; + format = "pyproject"; + + src = fetchFromGitLab { + owner = "sequoia-pgp"; + repo = "pysequoia"; + rev = "v${version}"; + hash = "sha256-63kUUxZTG33cB/IiD4AiDpLOI6Uew/fETgqhaGc7zp0="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-S/j3bGgU46nvVQFs35ih05teVEIJrFN4Ryq4B7rLFDE="; + }; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + cargo + rustc + ]; + + buildInputs = [ + bzip2 + nettle + openssl + pcsclite + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + ]; + + pythonImportsCheck = [ "pysequoia" ]; + + meta = with lib; { + description = "This library provides OpenPGP facilities in Python through the Sequoia PGP library"; + homepage = "https://sequoia-pgp.gitlab.io/pysequoia"; + license = licenses.asl20; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 1d887b287660..5da3cedbae7c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -291,6 +291,7 @@ mapAliases ({ scikitimage = scikit-image; # added 2023-05-14 scikitlearn = scikit-learn; # added 2021-07-21 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10 + sequoia = throw "python3Packages.sequoia was replaced by pysequoia - built from a dedicated repository, with a new API."; # added 2023-06-24 setuptools_scm = setuptools-scm; # added 2021-06-03 sharkiqpy = sharkiq; # added 2022-05-21 ssh-mitm = throw "ssh-mitm was removed in favor of the top-level ssh-mitm"; # added 2023-05-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f42dd57a954a..6e8a8c421a80 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7785,6 +7785,8 @@ self: super: with self; { pysbd = callPackage ../development/python-modules/pysbd { }; + pysequoia = callPackage ../development/python-modules/pysequoia { }; + pyschemes = callPackage ../development/python-modules/pyschemes { }; pyschlage = callPackage ../development/python-modules/pyschlage { }; @@ -11104,8 +11106,6 @@ self: super: with self; { seqeval = callPackage ../development/python-modules/seqeval { }; - sequoia = disabledIf isPyPy (toPythonModule pkgs.sequoi); - serialio = callPackage ../development/python-modules/serialio { }; serpent = callPackage ../development/python-modules/serpent { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index a79dc31ed9dd..1a19118678eb 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -71,8 +71,6 @@ with self; with super; { scandir = callPackage ../development/python2-modules/scandir { }; - sequoia = disabled super.sequoia; - setuptools = callPackage ../development/python2-modules/setuptools { }; setuptools-scm = callPackage ../development/python2-modules/setuptools-scm { }; From 2ae2b4e4a059dca2970aed379b2b4e736a8c963a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 26 Jun 2023 13:14:33 +0300 Subject: [PATCH 067/222] sequoia: Rename to sequoia-sq --- pkgs/tools/security/{sequoia => sequoia-sq}/default.nix | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/tools/security/{sequoia => sequoia-sq}/default.nix (98%) diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia-sq/default.nix similarity index 98% rename from pkgs/tools/security/sequoia/default.nix rename to pkgs/tools/security/sequoia-sq/default.nix index 939e8ab6b77d..4da70b5155bf 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia-sq/default.nix @@ -11,7 +11,7 @@ }: rustPlatform.buildRustPackage rec { - pname = "sequoia"; + pname = "sequoia-sq"; version = "0.30.1"; src = fetchFromGitLab { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6527b83e63b6..cc378246a4bb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1528,6 +1528,7 @@ mapAliases ({ seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 sepolgen = throw "sepolgen was merged into selinux-python"; # Added 2021-11-11 session-desktop-appimage = session-desktop; + sequoia = sequoia-sq; # Added 2023-06-26 sget = throw "sget has been removed from nixpkgs, as it is not supported upstream anymore see https://github.com/sigstore/sget/issues/145"; # Added 2023-05-26 shared_mime_info = throw "'shared_mime_info' has been renamed to/replaced by 'shared-mime-info'"; # Converted to throw 2022-02-22 inherit (libsForQt5.mauiPackages) shelf; # added 2022-05-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35ab8bef5587..ac2fc99dd6eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12371,7 +12371,7 @@ with pkgs; seqdiag = with python3Packages; toPythonApplication seqdiag; - sequoia = callPackage ../tools/security/sequoia { }; + sequoia-sq = callPackage ../tools/security/sequoia-sq { }; sequoia-chameleon-gnupg = callPackage ../tools/security/sequoia-chameleon-gnupg { }; From 2f583a3a0a4fa75a500730ae09258ae30cf79652 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Jun 2023 12:00:02 +0000 Subject: [PATCH 068/222] python310Packages.zigpy-znp: 0.11.1 -> 0.11.2 --- pkgs/development/python-modules/zigpy-znp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix index e110e001c616..ed2c14231876 100644 --- a/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/pkgs/development/python-modules/zigpy-znp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.11.1"; + version = "0.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gYzk3XHXlF4+lnrRHYS5RB2QD0oDHgnMov9UFmXder8="; + hash = "sha256-qCc02iv7SlIPY+e3WNg3BBGijCSuaWAxNrZKSjJhxrs="; }; postPatch = '' From 906c716d22a13c78a91d6a6a6db723e4a540691d Mon Sep 17 00:00:00 2001 From: "Emil \"AngryAnt\" Johansen" Date: Sat, 13 May 2023 14:12:32 +0200 Subject: [PATCH 069/222] steamback: init at 0.3.6 --- pkgs/tools/games/steamback/default.nix | 61 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/tools/games/steamback/default.nix diff --git a/pkgs/tools/games/steamback/default.nix b/pkgs/tools/games/steamback/default.nix new file mode 100644 index 000000000000..44ee3db8db08 --- /dev/null +++ b/pkgs/tools/games/steamback/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonApplication +, fetchPypi +, pythonRelaxDepsHook +, setuptools +, pillow +, psutil +, async-tkinter-loop +, timeago +, platformdirs +, sv-ttk +}: + +buildPythonApplication rec { + pname = "steamback"; + version = "0.3.6"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-hvMPSxIfwwQqo80JCpYhcbVY4kXs5jWtjjafVSMrw6o="; + }; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + + buildInputs = [ + setuptools + pillow + ]; + + propagatedBuildInputs = [ + psutil + async-tkinter-loop + timeago + platformdirs + sv-ttk + ]; + + pythonRelaxDeps = [ + "async-tkinter-loop" + "platformdirs" + "Pillow" + ]; + + checkPhase = '' + runHook preCheck + + $out/bin/${pname} --help + + runHook postCheck + ''; + + meta = with lib; { + description = "A Decky plugin to add versioned save-game snapshots to Steam-cloud enabled games"; + homepage = "https://github.com/geeksville/steamback"; + license = licenses.gpl3; + maintainers = with maintainers; [ AngryAnt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29600cc58489..d8a1fd66d063 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37400,6 +37400,8 @@ with pkgs; steam-acf = callPackage ../tools/games/steam-acf { }; + steamback = python311.pkgs.callPackage ../tools/games/steamback { }; + protontricks = python3Packages.callPackage ../tools/package-management/protontricks { inherit winetricks steam-run yad; }; From 32927c0aba9ca923b5495d58b297530ab2839920 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 26 Jun 2023 21:56:51 +0800 Subject: [PATCH 070/222] uefi-run: 0.6.0 -> 0.6.1 Diff: https://github.com/Richard-W/uefi-run/compare/v0.6.0...v0.6.1 --- pkgs/tools/virtualization/uefi-run/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/uefi-run/default.nix b/pkgs/tools/virtualization/uefi-run/default.nix index 9de84ae8fc23..aacb6f7d583b 100644 --- a/pkgs/tools/virtualization/uefi-run/default.nix +++ b/pkgs/tools/virtualization/uefi-run/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "uefi-run"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Richard-W"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OL21C3J4M7q1nNB6lL9xaU6ryZN45UDUqiKsbqQhYH8="; + hash = "sha256-tR547osqw18dCMHJLqJ8AQBelbv8yCl7rAqslu+vnDQ="; }; - cargoSha256 = "sha256-ieX8jQKv9Fht1p7JtTieZ5M+rXdn6/Oo/LgJ8NEBIuQ="; + cargoHash = "sha256-s1Kbc3JHoYy0UJwNfSunIdQ3xHjlQaut/Cb0JSYyB9g="; meta = with lib; { description = "Directly run UEFI applications in qemu"; From 5e979fc0dd693fbf7579b25d965f482a865e45e7 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 26 Jun 2023 21:51:42 +0800 Subject: [PATCH 071/222] cinnamon.cinnamon-common: 5.8.2 -> 5.8.3 https://github.com/linuxmint/cinnamon/compare/5.8.2...5.8.3 --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 417cd6b717f6..e1f0009ba472 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -72,13 +72,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.8.2"; + version = "5.8.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-KY5ctByMYKxigiZ0X/blaHJuyiAUNB6B2gpGtC/k100="; + hash = "sha256-PvU5lcoIDguWiLdI+uIiJHqS1ae436Xc7TfRVytR02k="; }; patches = [ From 52ae9f099cfba69aa1cea2739298d15d5e48b952 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 26 Jun 2023 21:58:46 +0800 Subject: [PATCH 072/222] xdg-desktop-portal-xapp: 1.0.1 -> 1.0.2 https://github.com/linuxmint/xdg-desktop-portal-xapp/compare/1.0.1...1.0.2 --- .../development/libraries/xdg-desktop-portal-xapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index 5b447e8b8891..ce25bd9519a8 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-N0LVgk3VT0Fax1GTB7jzFhwzNEeAuyFHAuxXNCo2o3Y="; + hash = "sha256-0qZUSo3m63kSFYbfn8GUU8JLdgBimlqfEWWrsK/k+Aw="; }; nativeBuildInputs = [ From f2dc536888b3c62f0bcb0cd95fee95ac4432a054 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 26 Jun 2023 21:59:58 +0800 Subject: [PATCH 073/222] cinnamon.nemo: 5.8.2 -> 5.8.3 https://github.com/linuxmint/nemo/compare/5.8.2...5.8.3 --- pkgs/desktops/cinnamon/nemo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 18b2aff557ff..13963f386dfb 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.8.2"; + version = "5.8.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-Be67TOA1gLwSYx8y2iyfvY0QCpWOFutpXMDaPiTRQGg="; + sha256 = "sha256-/GwtTklOkhCkbBMQLl4dKUnlZwN6FX2kqxN7cJVaVwE="; }; patches = [ From 5bed31475f6e1911e968d9ca45ba28691296f69f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 26 Jun 2023 22:00:26 +0800 Subject: [PATCH 074/222] cinnamon.mint-themes: 2.1.2 -> 2.1.3 https://github.com/linuxmint/mint-themes/compare/2.1.2...2.1.3 --- pkgs/desktops/cinnamon/mint-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index ed7d011bc4f7..05b743904ff0 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mint-themes"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-Y+KmSKuREn2E3FySsScjL+oSpSFnyEqhoXQfU++86JY="; + hash = "sha256-ouqhksy3999pi8v4f64W4X/h655ZVi8dR22g4LlYwMI="; }; nativeBuildInputs = [ From 008293231b0540aab35f25613f3c2cc2af667ac8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 26 Jun 2023 22:03:11 +0800 Subject: [PATCH 075/222] cinnamon.folder-color-switcher: 1.5.7 -> 1.5.8 https://github.com/linuxmint/folder-color-switcher/compare/03311d62...f167627c --- pkgs/desktops/cinnamon/folder-color-switcher/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix index cc7f7e7cdcf6..b889d7ff6a70 100644 --- a/pkgs/desktops/cinnamon/folder-color-switcher/default.nix +++ b/pkgs/desktops/cinnamon/folder-color-switcher/default.nix @@ -7,14 +7,14 @@ stdenvNoCC.mkDerivation rec { pname = "folder-color-switcher"; - version = "1.5.7"; + version = "1.5.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # They don't really do tags, this is just a named commit. - rev = "03311d62a62e2cd7d0592b241c287091161ec6b6"; - sha256 = "sha256-HQv9vSpRSBjqbncGFv+O5XQtRJ+4Cq0aWZHoj5BhKYE="; + rev = "f167627cffaf8b34e27b0515153b669b980fd62e"; + sha256 = "sha256-u8Lv0OTxKgjIp1q5WR0NXULhnwFfEDYGRlBpFMVHCBY="; }; nativeBuildInputs = [ From d6cb6539a05a0b05ad1091a350dbbbb7a58a64b2 Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 26 Jun 2023 00:18:34 +0800 Subject: [PATCH 076/222] qttools: disable clang-based c++ parser by default --- pkgs/development/libraries/qt-6/modules/qttools.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qttools.nix b/pkgs/development/libraries/qt-6/modules/qttools.nix index 7d13e9a03e5c..adca87550cca 100644 --- a/pkgs/development/libraries/qt-6/modules/qttools.nix +++ b/pkgs/development/libraries/qt-6/modules/qttools.nix @@ -3,13 +3,15 @@ , lib , qtbase , qtdeclarative -, llvmPackages , cups +, llvmPackages +# clang-based c++ parser for qdoc and lupdate +, withClang ? false }: qtModule { pname = "qttools"; - buildInputs = [ + buildInputs = lib.optionals withClang [ llvmPackages.libclang llvmPackages.llvm ]; From 4e5204700c6933e6116a8d5dbb059890f11562d2 Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 26 Jun 2023 22:56:51 +0800 Subject: [PATCH 077/222] qtdoc/qtcreator: use qttools with clang support --- pkgs/development/libraries/qt-6/modules/qtdoc.nix | 2 +- pkgs/development/tools/qtcreator/qt6.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtdoc.nix b/pkgs/development/libraries/qt-6/modules/qtdoc.nix index 004a18f53c78..3bbe39e5ee20 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdoc.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdoc.nix @@ -13,7 +13,7 @@ qtModule { --replace '$QT_INSTALL_DOCS' "${qtbase}/share/doc" done ''; - nativeBuildInputs = [ qttools ]; + nativeBuildInputs = [ (qttools.override { withClang = true; }) ]; qtInputs = [ qtdeclarative ]; cmakeFlags = [ "-DCMAKE_MESSAGE_LOG_LEVEL=STATUS" diff --git a/pkgs/development/tools/qtcreator/qt6.nix b/pkgs/development/tools/qtcreator/qt6.nix index 1d61966386f4..25d056917e43 100644 --- a/pkgs/development/tools/qtcreator/qt6.nix +++ b/pkgs/development/tools/qtcreator/qt6.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - qttools + (qttools.override { withClang = true; }) wrapQtAppsHook python3 ninja From ce10c78c78be3da75d2856a84e5d3968746d05c7 Mon Sep 17 00:00:00 2001 From: Glib Shpychka <23005347+gshpychka@users.noreply.github.com> Date: Mon, 26 Jun 2023 18:36:03 +0300 Subject: [PATCH 078/222] tree-sitter: allow use of 'generate' argument --- pkgs/development/tools/parsing/tree-sitter/default.nix | 5 +++-- pkgs/development/tools/parsing/tree-sitter/grammar.nix | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 9da09a10e7e4..6579a039b70d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -41,7 +41,7 @@ let fetchSubmodules = true; }; - update-all-grammars = callPackage ./update.nix {}; + update-all-grammars = callPackage ./update.nix { }; fetchGrammar = (v: fetchgit { inherit (v) url rev sha256 fetchSubmodules; }); @@ -62,6 +62,7 @@ let inherit version; src = grammar.src or (fetchGrammar grammar); location = grammar.location or null; + generate = grammar.generate or false; }; grammars' = import ./grammars { inherit lib; } // extraGrammars; grammars = grammars' // @@ -111,7 +112,7 @@ rustPlatform.buildRustPackage { inherit src version cargoSha256; buildInputs = - lib.optionals stdenv.isDarwin [ Security CoreServices]; + lib.optionals stdenv.isDarwin [ Security CoreServices ]; nativeBuildInputs = [ which ] ++ lib.optionals webUISupport [ emscripten ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix index c2c3ce4a8961..ce46e3623bae 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation ({ stripDebugList = [ "parser" ]; - configurePhase = lib.optionalString generate '' - tree-sitter generate - '' + lib.optionalString (location != null) '' + configurePhase = lib.optionalString (location != null) '' cd ${location} + '' + lib.optionalString generate '' + tree-sitter generate ''; # When both scanner.{c,cc} exist, we should not link both since they may be the same but in From 4eb02eab86c8809d8f7648d770ceb3844cd4516e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 26 Jun 2023 23:53:03 +0800 Subject: [PATCH 079/222] xed-editor: 3.4.1 -> 3.4.2 https://github.com/linuxmint/xed/compare/3.4.1...3.4.2 --- pkgs/applications/editors/xed-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index a1508e7a3b62..de3f1801ef9c 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-fBwxc6n4sNNRiKcax96Tl3cFD+Ryvmj+XizB3z2s4+Q="; + sha256 = "sha256-fTrvHf7iA3qexxdebSgzLXlngAOkdraW3KiVTVYodrY="; }; nativeBuildInputs = [ From 5f10b0db4156e27e74c43bbaa639fb65e6f1d02a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 26 Jun 2023 23:57:00 +0800 Subject: [PATCH 080/222] pantheon.gala: 7.0.3 -> 7.1.0 https://github.com/elementary/gala/releases/tag/7.1.0 --- pkgs/desktops/pantheon/desktop/gala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index ab54f127f7bb..423dcd10f4ab 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "7.0.3"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-RLKPYDWVqT2WfjLPXRFPCNNvcW+fJ0OUKjSLLgPBqdw="; + sha256 = "sha256-x0EIah/iTluJk7P3k0g23cQldx++W58FbjnHNlF31AQ="; }; patches = [ From 118b0bf1300c496781c79deb247649a660e490bf Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Jun 2023 14:29:35 -0400 Subject: [PATCH 081/222] scraper: 0.16.0 -> 0.17.1 Diff: https://diff.rs/scraper/0.16.0/0.17.1 Changelog: https://github.com/causal-agent/scraper/releases/tag/v0.17.1 --- pkgs/tools/text/scraper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/scraper/default.nix b/pkgs/tools/text/scraper/default.nix index fd8324217f05..d325646a35d2 100644 --- a/pkgs/tools/text/scraper/default.nix +++ b/pkgs/tools/text/scraper/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "scraper"; - version = "0.16.0"; + version = "0.17.1"; src = fetchCrate { inherit pname version; - hash = "sha256-3FxEfrScOetB1raiT9xjq9G2xLrLZqVlkqbVAFCIhZ0="; + hash = "sha256-SVrQi9VxTzUHkdFdieOAIBhKvyrZqi3xKGooHkCEmhQ="; }; - cargoHash = "sha256-Pf8+vvOvOHpuJ2v7iwdVzHwneqvhk2E4nbGO4TL/FAM="; + cargoHash = "sha256-/Lut38gFO4XtrBHXr4sfcII+bWgcCDrHf5/PKPrDiDs="; nativeBuildInputs = [ installShellFiles ]; From 03ca5a47c10b16996c5249493835ebfe99624a87 Mon Sep 17 00:00:00 2001 From: pennae Date: Mon, 26 Jun 2023 21:13:11 +0200 Subject: [PATCH 082/222] nixos-render-docs: add missing head tag to html output --- .../nix/nixos-render-docs/src/nixos_render_docs/manual.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py index 2c80d1eaab86..d14b4f5d29bf 100644 --- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py +++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py @@ -304,7 +304,8 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer): '', '', - ' ', + ' ', + ' ', f' {toc.target.title}', "".join((f'' for style in self._html_params.stylesheets)), From a6837eeb14b1a111b0bfb8c5cc1bd8832f3e81fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 26 Jun 2023 21:49:18 +0200 Subject: [PATCH 083/222] python310Packages.parameterized: 0.8.1 -> 0.9.0 --- .../python-modules/parameterized/default.nix | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index a6083836714b..fb08e07ec04b 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -2,26 +2,36 @@ , buildPythonPackage , fetchPypi , mock -, nose , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "parameterized"; - version = "0.8.1"; - format = "setuptools"; + version = "0.9.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Qbv/N9YYZDD3f5ANd35btqJJKKHEb7HeaS+LUriDO1w="; + hash = "sha256-f8kFJyzvpPNkwaNCnLvpwPmLeTmI77W/kKrIDwjbCbE="; }; + postPatch = '' + # broken with pytest 7 + # https://github.com/wolever/parameterized/issues/167 + substituteInPlace parameterized/test.py \ + --replace 'assert_equal(missing, [])' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + checkInputs = [ mock - nose pytestCheckHook ]; @@ -29,14 +39,6 @@ buildPythonPackage rec { "parameterized/test.py" ]; - disabledTests = [ - # Tests seem outdated - "test_method" - "test_with_docstring_0_value1" - "test_with_docstring_1_v_l_" - "testCamelCaseMethodC" - ]; - pythonImportsCheck = [ "parameterized" ]; From 381c0848a73e94a995a557ad2048bc29a2f5402e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Jun 2023 20:22:07 +0000 Subject: [PATCH 084/222] python310Packages.pyinstrument: 4.4.0 -> 4.5.0 --- pkgs/development/python-modules/pyinstrument/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyinstrument/default.nix b/pkgs/development/python-modules/pyinstrument/default.nix index acff1fba1c98..9dfe3b82cb55 100644 --- a/pkgs/development/python-modules/pyinstrument/default.nix +++ b/pkgs/development/python-modules/pyinstrument/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyinstrument"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "joerick"; repo = pname; - rev = "v${version}"; - hash = "sha256-0GbJkYBgSOIZrHSKM93SW93jXD+ieYN6A01kWoFbyvQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-HvPapa3b9/Wc4ClaMOmCAIeHS7H4V9aCR9JCDol2ElE="; }; # Module import recursion From 5887c52c3c40cc44cd16d65901dcc719dd69c077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Mon, 26 Jun 2023 22:25:41 +0200 Subject: [PATCH 085/222] comodoro: 0.0.8 -> 0.0.9 --- pkgs/applications/misc/comodoro/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/comodoro/default.nix b/pkgs/applications/misc/comodoro/default.nix index c036b2aa2c7d..1ce6195aaec5 100644 --- a/pkgs/applications/misc/comodoro/default.nix +++ b/pkgs/applications/misc/comodoro/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "comodoro"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "soywod"; repo = "comodoro"; rev = "v${version}"; - sha256 = "rGnVXyfWJkPHfpf1gRGbDJ6Y1ycKOOcCZ+Jx35fUo6M="; + hash = "sha256-pxe3Nv1N85uWsiv4s0wtD++zlZZgMADH51f5RMK9huA="; }; - cargoSha256 = "jpshuavywCLN03xD/gFgQeGbKtmHq5pULbxd+RUbaDk="; + cargoSha256 = "E5oHeMow9MrVrlDX+v0tX9Nv3gHUxDNUpRAT5jPa+DI="; nativeBuildInputs = lib.optional (installManPages || installShellCompletions) installShellFiles; From dc817e47cf2f8281a4155419ac08817a6a7fec39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 26 Mar 2023 23:55:56 +0200 Subject: [PATCH 086/222] python310Packages.limits: 3.2.0 -> 3.5.0 --- pkgs/development/python-modules/limits/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index aa1b4a697f6f..8ee100670418 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , etcd3 , hiro +, importlib-resources , packaging , pymemcache , pymongo @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "limits"; - version = "3.2.0"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,11 +34,12 @@ buildPythonPackage rec { postFetch = '' rm "$out/limits/_version.py" ''; - hash = "sha256-zMU2MU7MFTWSig2j1PaBLPtKM5/7gNkFajKXw3A+fIQ="; + hash = "sha256-O4yENynvon9xM8F/r0NMSpSh6Hl2EoTcXgldrwzo24M="; }; propagatedBuildInputs = [ deprecated + importlib-resources packaging setuptools typing-extensions From 1ab0f466c8e5d92a0637e9a854543a1f33648b77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Jun 2023 20:53:18 +0000 Subject: [PATCH 087/222] git-machete: 3.17.4 -> 3.17.6 --- pkgs/applications/version-management/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 18b83d8e4400..05e21b641e94 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.17.4"; + version = "3.17.6"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-g3SEUVcyr6+nt0zMHB1F4drCwmQvPYQErOwSl9I+1Tg="; + hash = "sha256-o3Z1xPu5RcspU4m3Bb6ydZkXOMgOMJPN/+TLekwe/wI="; }; nativeBuildInputs = [ installShellFiles ]; From b6d9d0123e7d98165341c05966caf086463792d8 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Jun 2023 17:09:26 -0400 Subject: [PATCH 088/222] typos: 1.15.6 -> 1.15.7 Diff: https://github.com/crate-ci/typos/compare/v1.15.6...v1.15.7 Changelog: https://github.com/crate-ci/typos/blob/v1.15.7/CHANGELOG.md --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 8218a1d59174..f99257fee592 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.15.6"; + version = "1.15.7"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-J78EJi2PXa3a83gP05b+ufDyq+BT9e1h7E/QiYs5mls="; + hash = "sha256-x4ydM6xDls/7otR8toDEZVk/dKBGHB1+3K1RdRGg9eI="; }; - cargoHash = "sha256-9WUzWWwZHC9OPw18Xi3krkIfNH/gdB6VPhrL80RLCvk="; + cargoHash = "sha256-tc0Bf5n4pKwAExps84kSgI0rP2BwvuMRdFEqU0qlDdg="; meta = with lib; { description = "Source code spell checker"; From c203643b82fc99785be7eb3559838e003382eb7f Mon Sep 17 00:00:00 2001 From: Josh Hoffer Date: Mon, 26 Jun 2023 15:21:06 -0600 Subject: [PATCH 089/222] electron-mail: 5.1.6 -> 5.1.8 --- .../networking/mailreaders/electron-mail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index 20f3597b1517..a7b51585e3a0 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -2,12 +2,12 @@ let pname = "electron-mail"; - version = "5.1.6"; + version = "5.1.8"; name = "ElectronMail-${version}"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-lsXVsx7U43czWFWxAgwTUYTnUXSL4KPFnXLzUklieAo="; + sha256 = "sha256-btqlxFrQUyb728i99IE65A9jwEFNvJ5b6zji0kwwATU="; }; appimageContents = appimageTools.extract { inherit name src; }; From 29ace74e8cd767bec80e00a20e47682c57a0c5ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 26 Jun 2023 15:57:30 -0600 Subject: [PATCH 090/222] =?UTF-8?q?mill:=200.11.0=20=E2=86=92=200.11.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/build-managers/mill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index af7335ba54ed..a028bbb07826 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-LB7np8LTes97XWnOHxCTYXY5BRZxxJJ4EpMsG4zUHNQ="; + hash = "sha256-qG+Ddn0BHUZX1VX5hO84exgRz8YuUgYF/fH6MmgkrXE"; }; nativeBuildInputs = [ makeWrapper ]; From 5e7e580a22abcf0a5993c8260db4518f629b1d29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Jun 2023 22:07:07 +0000 Subject: [PATCH 091/222] python310Packages.pysqueezebox: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/pysqueezebox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix index 7762a7645467..7c9425a9d02a 100644 --- a/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/pkgs/development/python-modules/pysqueezebox/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysqueezebox"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "rajlaud"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nNCxptQDabNPKtKFy19kBl5rIhlHlgvvKkz/JWj3k8A="; + hash = "sha256-WnL9Va3uaWlUHVBtit4v+XdYOFmPpxG91mAHEGwI+7c="; }; propagatedBuildInputs = [ From f8eabd05010e9e3539ea6007d3ab5ead4e86b90d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Jun 2023 23:34:32 +0000 Subject: [PATCH 092/222] cypress: 12.9.0 -> 12.16.0 --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index ebe6d9d496ec..048b6ec49747 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -18,7 +18,7 @@ let availableBinaries = { x86_64-linux = { platform = "linux-x64"; - checksum = "sha256-ozyQya2WxnDK6of1VfxlDlXo6IDGxAXkCjFt3DqRM4k="; + checksum = "sha256-TbdOAi1lEA0iU3qrl7O67fV4Pe1Nn21BLmfZmiFexcg="; }; aarch64-linux = { platform = "linux-arm64"; @@ -30,7 +30,7 @@ let inherit (binary) platform checksum; in stdenv.mkDerivation rec { pname = "cypress"; - version = "12.9.0"; + version = "12.16.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip"; From 9cdeb84cd97c7a61b679d7f01ad59ab4442b37f6 Mon Sep 17 00:00:00 2001 From: Tomo <68489118+tomodachi94@users.noreply.github.com> Date: Tue, 16 May 2023 06:39:35 +0000 Subject: [PATCH 093/222] craftos-pc: add basic tests This ensures that most obvious breakages will be caught before they are shipped. --- .../emulators/craftos-pc/default.nix | 6 ++++++ .../test-eval-hello-world/default.nix | 18 ++++++++++++++++++ .../craftos-pc/test-eval-hello-world/init.lua | 3 +++ .../test-eval-periphemu/default.nix | 19 +++++++++++++++++++ .../craftos-pc/test-eval-periphemu/init.lua | 18 ++++++++++++++++++ 5 files changed, 64 insertions(+) create mode 100644 pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix create mode 100644 pkgs/applications/emulators/craftos-pc/test-eval-hello-world/init.lua create mode 100644 pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix create mode 100644 pkgs/applications/emulators/craftos-pc/test-eval-periphemu/init.lua diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index 8dcac1443293..67950e0ed8a4 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, callPackage , patchelf , unzip , poco @@ -59,6 +60,11 @@ stdenv.mkDerivation rec { cp -R ${craftos2-rom}/* $out/share/craftos ''; + passthru.tests = { + eval-hello-world = callPackage ./test-eval-hello-world { }; + eval-periphemu = callPackage ./test-eval-periphemu { }; + }; + meta = with lib; { description = "An implementation of the CraftOS-PC API written in C++ using SDL"; homepage = "https://www.craftos-pc.cc"; diff --git a/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix b/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix new file mode 100644 index 000000000000..b2d887428a0e --- /dev/null +++ b/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/default.nix @@ -0,0 +1,18 @@ +{ stdenv +, craftos-pc +, grep +}: + +stdenv.mkDerivation { + name = "craftos-pc-test-eval-hello-world"; + meta.timeout = 60; + nativeBuildInputs = [ craftos-pc grep ]; + buildCommand = '' + export HOME=$(pwd) + mkdir $HOME/.local $HOME/.config + export XDG_CONFIG_DIR=$HOME/.config + export XDG_DATA_DIR=$HOME/.local + craftos --headless --script ${./init.lua} | grep "Hello Nixpkgs!" > /dev/null + touch $out + ''; +} diff --git a/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/init.lua b/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/init.lua new file mode 100644 index 000000000000..5279b1a78c67 --- /dev/null +++ b/pkgs/applications/emulators/craftos-pc/test-eval-hello-world/init.lua @@ -0,0 +1,3 @@ +print("Hello Nixpkgs!") + +shell.run("shutdown") diff --git a/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix b/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix new file mode 100644 index 000000000000..ad5cf97401a0 --- /dev/null +++ b/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/default.nix @@ -0,0 +1,19 @@ +{ stdenv +, craftos-pc +, grep +}: +stdenv.mkDerivation { + name = "craftos-pc-test-eval-periphemu"; + meta.timeout = 60; + nativeBuildInputs = [ craftos-pc grep ]; + buildCommand = '' + export HOME=$(pwd) + mkdir $HOME/.local $HOME/.config + export XDG_CONFIG_DIR=$HOME/.config + export XDG_DATA_DIR=$HOME/.local + if craftos --headless --script ${./init.lua} | grep -q "FAIL"; then + exit 1 + fi + touch $out + ''; +} diff --git a/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/init.lua b/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/init.lua new file mode 100644 index 000000000000..1d6ec8b6d842 --- /dev/null +++ b/pkgs/applications/emulators/craftos-pc/test-eval-periphemu/init.lua @@ -0,0 +1,18 @@ +local function assert(cond1, cond2) + if not cond1 == cond2 then print("FAIL") end +end + +local function driveTests() + periphemu.create("left", "drive") + local p = peripheral.wrap("left") + + assert(p.isDiskPresent(), false) + p.insertDisk(649) + assert(p.isDiskPresent(), true) + assert(p.getDiskID(), 649) + assert(p.getDiskLabel(), nil) +end + +driveTests() + +shell.run("shutdown") From f076d20622e503b33a7c55b60fb0a89ff08d7cc0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 01:20:14 +0000 Subject: [PATCH 094/222] awscli2: 2.12.2 -> 2.12.3 --- pkgs/tools/admin/awscli2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index e0404b681ae0..a47d75232040 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -18,14 +18,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.12.2"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.12.3"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-BEg7Zlc1gmZ5PpbIY6xL9l69DVz0l2b6e5oiECRucLw="; + hash = "sha256-56eRINxIAuVkgySNvk+bOEC1sYgkOeujNQsIihKefc8="; }; postPatch = '' From 66356e1f7ef5338d5fc37b9710245c13288c347c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 27 Jun 2023 09:24:02 +0800 Subject: [PATCH 095/222] ventoy: 1.0.91 -> 1.0.93 --- pkgs/tools/cd-dvd/ventoy/default.nix | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/cd-dvd/ventoy/default.nix b/pkgs/tools/cd-dvd/ventoy/default.nix index 3c931248305c..2edf7a5fdb71 100644 --- a/pkgs/tools/cd-dvd/ventoy/default.nix +++ b/pkgs/tools/cd-dvd/ventoy/default.nix @@ -51,14 +51,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ventoy"; - version = "1.0.91"; + version = "1.0.93"; - src = let - inherit (finalAttrs) version; - in fetchurl { - url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - hash = "sha256-9vsFdOxsW1Cs06gVPvQusju2+wp4PpBwbHZUugwb3co="; - }; + src = + let + inherit (finalAttrs) version; + in + fetchurl { + url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; + hash = "sha256-oz5IVq0QsPX90N4EBold2QQ8/CY4XF+KcQ41L+TR4iI="; + }; patches = [ ./000-nixos-sanitization.patch @@ -112,7 +114,8 @@ stdenv.mkDerivation (finalAttrs: { terminal = false; categories = [ "Utility" ]; startupNotify = true; - })]; + }) + ]; dontConfigure = true; dontBuild = true; @@ -183,7 +186,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - meta = { + meta = with lib; { homepage = "https://www.ventoy.net"; description = "A New Bootable USB Solution"; longDescription = '' @@ -200,9 +203,9 @@ stdenv.mkDerivation (finalAttrs: { 800+ image files are tested. 90%+ distros in DistroWatch supported. ''; changelog = "https://www.ventoy.net/doc_news.html"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ AndersonTorres ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "mipsel-linux" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; }) From a79818e6d8bfd826d179059128e7e31632237b05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 01:38:12 +0000 Subject: [PATCH 096/222] python310Packages.ipydatawidgets: 4.3.3 -> 4.3.5 --- pkgs/development/python-modules/ipydatawidgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index 09a7ddab4746..df7fe7ac3fc2 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ipydatawidgets"; - version = "4.3.3"; + version = "4.3.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-T7LOaT+yaM2ukAN0z6GpFkHiLZUU0eweYtp0cFCST3Y="; + hash = "sha256-OU8kiVdlh8/XVTd6CaBn9GytIggZZQkgIf0avL54Uqg="; }; nativeBuildInputs = [ From 005c84e12a79f8f81e66e46ad8e081afef8ac411 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Tue, 27 Jun 2023 04:18:05 +0200 Subject: [PATCH 097/222] firefox-mobile: init (#206054) --- .../browsers/firefox/mobile-config.nix | 113 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 115 insertions(+) create mode 100644 pkgs/applications/networking/browsers/firefox/mobile-config.nix diff --git a/pkgs/applications/networking/browsers/firefox/mobile-config.nix b/pkgs/applications/networking/browsers/firefox/mobile-config.nix new file mode 100644 index 000000000000..6e43295697ea --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/mobile-config.nix @@ -0,0 +1,113 @@ +{ stdenv, lib, runCommand, fetchFromGitLab, wrapFirefox, firefox-unwrapped }: + +let + pkg = fetchFromGitLab { + owner = "postmarketOS"; + repo = "mobile-config-firefox"; + rev = "ff2f07873f4ebc6e220da0e9b9f04c69f451edda"; + sha256 = "sha256-8wRz8corz00+0qROMiOmZAddM4tjfmE91bx0+P8JNx4="; + }; + userChrome = runCommand "userChrome.css" {} '' + cat ${pkg}/src/userChrome/*.css > $out + ''; + userContent = runCommand "userContent.css" {} '' + cat ${pkg}/src/userContent/*.css > $out + ''; +in wrapFirefox firefox-unwrapped { + # extraPolicies = (lib.importJSON "${pkg}/src/policies.json").policies; + extraPoliciesFiles = [ "${pkg}/src/policies.json" ]; + extraPrefs = '' + // Copyright 2022 Arnaud Ferraris, Oliver Smith + // SPDX-License-Identifier: MPL-2.0 + + // This is a Firefox autoconfig file: + // https://support.mozilla.org/en-US/kb/customizing-firefox-using-autoconfig + + // Import custom userChrome.css on startup or new profile creation + const {classes: Cc, interfaces: Ci, utils: Cu} = Components; + Cu.import("resource://gre/modules/Services.jsm"); + Cu.import("resource://gre/modules/FileUtils.jsm"); + + var updated = false; + + // Create /chrome/ directory if not already present + var chromeDir = Services.dirsvc.get("ProfD", Ci.nsIFile); + chromeDir.append("chrome"); + if (!chromeDir.exists()) { + chromeDir.create(Ci.nsIFile.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY); + } + + // Create nsIFile objects for userChrome.css in /chrome/ and in /etc/ + var chromeFile = chromeDir.clone(); + chromeFile.append("userChrome.css"); + var defaultChrome = new FileUtils.File("${userChrome}"); + + // No auto-upgrade. Should this be replaced with symlinking? + // // Remove the existing userChrome.css if older than the installed one + // if (chromeFile.exists() && defaultChrome.exists() && + // chromeFile.lastModifiedTime < defaultChrome.lastModifiedTime) { + // chromeFile.remove(false); + // } + + // Copy userChrome.css to /chrome/ + if (!chromeFile.exists()) { + defaultChrome.copyTo(chromeDir, "userChrome.css"); + updated = true; + } + + // Create nsIFile objects for userContent.css in /chrome/ and in /etc/ + var contentFile = chromeDir.clone(); + contentFile.append("userContent.css"); + var defaultContent = new FileUtils.File("${userContent}"); + + // No auto-upgrade. Should this be replaced with symlinking? + // // Remove the existing userContent.css if older than the installed one + // if (contentFile.exists() && defaultContent.exists() && + // contentFile.lastModifiedTime < defaultContent.lastModifiedTime) { + // contentFile.remove(false); + // } + + // Copy userContent.css to /chrome/ + if (!contentFile.exists()) { + defaultContent.copyTo(chromeDir, "userContent.css"); + updated = true; + } + + // Restart Firefox immediately if one of the files got updated + if (updated === true) { + var appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup); + appStartup.quit(Ci.nsIAppStartup.eForceQuit | Ci.nsIAppStartup.eRestart); + } + + defaultPref('general.useragent.override', 'Mozilla/5.0 (Android 11; Mobile; rv:96.0) Gecko/96.0 Firefox/96.0'); + defaultPref('browser.urlbar.suggest.topsites', false); + defaultPref('browser.urlbar.suggest.engines', false); + defaultPref('browser.newtabpage.enabled', true); + + // Enable android-style pinch-to-zoom + pref('dom.w3c.touch_events.enabled', true); + pref('apz.allow_zooming', true); + pref('apz.allow_double_tap_zooming', true); + + // Save vertical space by hiding the titlebar + pref('browser.tabs.inTitlebar', 1); + + // Disable search suggestions + pref('browser.search.suggest.enabled', false); + + // Empty new tab page: faster, less distractions + pref('browser.newtabpage.enabled', false); + + // Allow UI customizations with userChrome.css and userContent.css + pref('toolkit.legacyUserProfileCustomizations.stylesheets', true); + + // Select the entire URL with one click + pref('browser.urlbar.clickSelectsAll', true); + + // Disable cosmetic animations, save CPU + pref('toolkit.cosmeticAnimations.enabled', false); + + // Disable download animations, save CPU + pref('browser.download.animateNotifications', false); + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0cae1ec5ec64..b85950f1e450 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31082,6 +31082,8 @@ with pkgs; firefox-beta = wrapFirefox firefox-beta-unwrapped { }; firefox-devedition = wrapFirefox firefox-devedition-unwrapped { }; + firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { }; + firefox-esr = firefox-esr-102; firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; From e183519871591fad0588a0e5e656a7041d7e0c67 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Jun 2023 22:25:57 -0400 Subject: [PATCH 098/222] fclones-gui: 0.1.3 -> 0.1.4 Diff: https://github.com/pkolaczk/fclones-gui/compare/v0.1.3...v0.1.4 Changelog: https://github.com/pkolaczk/fclones-gui/releases/tag/v0.1.4 --- pkgs/tools/misc/fclones/gui.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/fclones/gui.nix b/pkgs/tools/misc/fclones/gui.nix index 0e7a6ae4dafa..2652b674e39b 100644 --- a/pkgs/tools/misc/fclones/gui.nix +++ b/pkgs/tools/misc/fclones/gui.nix @@ -1,6 +1,6 @@ { lib , rustPlatform -, fetchCrate +, fetchFromGitHub , pkg-config , wrapGAppsHook4 , gdk-pixbuf @@ -12,14 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones-gui"; - version = "0.1.3"; + version = "0.1.4"; - src = fetchCrate { - inherit pname version; - hash = "sha256-SQJ6CZlvu4V9Rs+rhH4jMf0AVWs71KvRUnUxGPlgj80="; + src = fetchFromGitHub { + owner = "pkolaczk"; + repo = "fclones-gui"; + rev = "v${version}"; + hash = "sha256-zJ5TqFmvUL1nKR8E+jGR4K6OGHJ4ckRky+bdKW0T30s="; }; - cargoHash = "sha256-8WLYbEbPrR8c0y+Uaxo6YGiFRt7FLHZM+1O/UZq0c7g="; + cargoHash = "sha256-QT4ZxjarPkEqJLKPsGAaMIaSUmKWZ1xtxWMe2uXaUek="; nativeBuildInputs = [ pkg-config @@ -36,7 +38,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Interactive duplicate file remover"; - homepage = "https://github.com/pkolaczk/fclones/tree/main/fclones-gui"; + homepage = "https://github.com/pkolaczk/fclones-gui"; + changelog = "https://github.com/pkolaczk/fclones-gui/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; From 2229c311e4a70762a33887c0442e0d16ccecf4c5 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 27 Jun 2023 10:52:13 +0800 Subject: [PATCH 099/222] cpeditor: fixup build cpeditor require c++14, the setting of CMAKE_CXX_STANDARD does not seem to affect submodules --- pkgs/applications/editors/cpeditor/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix index eaa2b0d9959c..718c3fdd20fd 100644 --- a/pkgs/applications/editors/cpeditor/default.nix +++ b/pkgs/applications/editors/cpeditor/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { substituteInPlace src/Core/Runner.cpp --replace "/bin/bash" "${runtimeShell}" ''; + env.NIX_CFLAGS_COMPILE = "-std=c++14"; + meta = with lib; { description = "An IDE specially designed for competitive programming"; homepage = "https://cpeditor.org"; From 1b83ce98d323ba6f27d9bb47cc36b62ece3aca70 Mon Sep 17 00:00:00 2001 From: Misaka13514 Date: Tue, 27 Jun 2023 08:44:22 +0800 Subject: [PATCH 100/222] nuclei: 2.9.6 -> 2.9.7 Diff: https://github.com/projectdiscovery/nuclei/compare/v2.9.6...v2.9.7 Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v2.9.7 Co-authored-by: figsoda --- pkgs/tools/security/nuclei/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 778f5e6ca008..2f6323bb3f79 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.9.6"; + version = "2.9.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-hltXm+NXExmO9IuwdfuET9+PaRby9pLAE/4ac7xQqvE="; + hash = "sha256-w9XiXZzkDM1ZETzs/c3uMEoaRXUXKzpzn3k3RbgTXbE="; }; - vendorHash = "sha256-geQBa0caKjDQD3AlVNhU8cmM9mFSR+Ix0HjxKKadSqE="; + vendorHash = "sha256-T09uSUBRZGsI732723UTd2jOT9/pYjUp+nshWthGA1k="; modRoot = "./v2"; subPackages = [ @@ -36,6 +36,6 @@ buildGoModule rec { homepage = "https://github.com/projectdiscovery/nuclei"; changelog = "https://github.com/projectdiscovery/nuclei/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab Misaka13514 ]; }; } From 66483482a1cde8f046906015fb46c8f241e4d359 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Jun 2023 23:04:14 -0400 Subject: [PATCH 101/222] vimPlugins.executor-nvim: init at 2023-05-23 --- pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 5 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 5c489d6d2ab8..7a126fdc2520 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -466,6 +466,10 @@ self: super: { ''; }); + executor-nvim = super.executor-nvim.overrideAttrs (old: { + dependencies = with self; [ nui-nvim ]; + }); + fcitx-vim = super.fcitx-vim.overrideAttrs (old: { passthru.python3Dependencies = ps: with ps; [ dbus-python ]; meta = { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 33669a2a0d88..22e3cc218005 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -257,6 +257,7 @@ https://github.com/dmix/elvish.vim/,, https://github.com/mattn/emmet-vim/,, https://github.com/vim-scripts/emodeline/,, https://github.com/sainnhe/everforest/,, +https://github.com/google/executor.nvim/,HEAD, https://github.com/nvchad/extensions/,HEAD,nvchad-extensions https://github.com/jinh0/eyeliner.nvim/,HEAD, https://github.com/fenetikm/falcon/,, From 32573964153f39f2ce3e45c6a736d8d6a31832b9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Jun 2023 23:05:47 -0400 Subject: [PATCH 102/222] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 442 +++++++++--------- 1 file changed, 227 insertions(+), 215 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 5832dca44786..f1ca8c24fe75 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -173,12 +173,12 @@ final: prev: LazyVim = buildVimPluginFrom2Nix { pname = "LazyVim"; - version = "2023-06-23"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "c3477ed81e8e26bce1eb53f9c04a8aa7adc1807a"; - sha256 = "1hga1b9zx8ygrpr7863x12pd3rh9c3k69lgg59jzpzxiasnm3wkj"; + rev = "c998be8fa4bd67bf130fdbc05f7c2198aa00441c"; + sha256 = "1npgs2fd4ss55ryxh74pkyqwc0psnl4dzsvkih1f0r32skyvg6f0"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -365,12 +365,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-06-22"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "bd4a67e98b2b3de690a288ae3af68232f2c41738"; - sha256 = "0l8p48zw0svcpn48v1qck6wfr5ljdfs5r96vchvbhnlg7bcivpi1"; + rev = "7330a362b0e18e84ef7ac0099151ac60278511b2"; + sha256 = "1l7b801ynbkr1a10xcqqi2bx8jfxrrcqkx62m20dcl0kjpzksry4"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-06-23"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "c663d1b55f002930187a09b9eeb5bd0bad0ea23c"; - sha256 = "0rcf3wlzqb6a4y1jvr3w3yxpik5ykhrdzcnyxw39cr55h94i6xyz"; + rev = "7c2a432238b9c8e8c526619fa003e658691ea127"; + sha256 = "00rmfh0npla0x3al4dqgm6wkwh31b1phvhg85k0prvrbi0kfb3dz"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -1135,12 +1135,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2023-06-17"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "60734264a8655a7db3595159fb50076dc24c2f2c"; - sha256 = "1vlm4azvfxlmcym5p6hq344wjdlmfx90d9pdpxafpvb323ss86rm"; + rev = "bf2f6b7edd0abf6b0732f5e5c0a8f30e51611c75"; + sha256 = "054r6543m6hdq6z44qbnp9kcxnhy6qanrhsabq82g3g3bk59xcy1"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1963,12 +1963,12 @@ final: prev: codeium-vim = buildVimPluginFrom2Nix { pname = "codeium.vim"; - version = "2023-06-23"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "23348d55415a0d1e227a36d4217a2751528aebf2"; - sha256 = "0j0w5m2xmzv6amj5hir9xyvq932yzisqhxnb3nmv9j63pwl06q7y"; + rev = "c6d83d0f917dd3f0259674eb4fb71ff0173b1c78"; + sha256 = "0q9qdpqzxawmczny317c1z5bnkmcvyn5x7398z9y9i190ffgsyhc"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2239,12 +2239,12 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-06-21"; + version = "2023-06-24"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "9cb5396205faf609bc9df0e841e133ccb1b70540"; - sha256 = "11c68lx8grzksl215dhsi813s0svryx7a90d60vxjmwgxw9c3abx"; + rev = "33aa9419da8f9bf9b6a992e6c9c7b7f9e36dac06"; + sha256 = "1r9ync87w3vk9zb2l75qlp2xwibdm67v051crznmms1wzp067npd"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2263,24 +2263,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-06-18"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "af56cc3daf29d1da7f331f679ff45164fa189c67"; - sha256 = "14y08bv45mq8nhqj087429wpahncf9f0lg65ivr1hvxfq89lilnp"; + rev = "13f1fcbfd18386392a7aaa1e920d433951051302"; + sha256 = "0dwwg32j6qr1mm26y7h1y4nvmy123l3r401zhisxs8i1ibcnngnd"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-06-18"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "0ccf22d8e64d5c2d939f08ceec2587c9b9ad9844"; - sha256 = "1hvaf4cyi3kw9k07hxh4g3fcl0d31qfbgxawby6vjkj9y4iaivyf"; + rev = "87b462fc70d95712eabdb2a27d80c05f79941242"; + sha256 = "1q7jjfw45i96r3a71k2ajicpsy9zwg1w5z8xrszvicn1hrp6nbm4"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2299,12 +2299,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-06-23"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "54b069140e1240f8f244d74636c0e911e1337520"; - sha256 = "0bplg5lcrb3bhpqpsw10z56wwfnkfvsr3fzm7747j3idlqspjy27"; + rev = "63d53b14f5ad26b23a58c138a194bc04b49d4de9"; + sha256 = "1vn1vhjmhpvacw1i8znn5fis80slsrl14slp7j3gj0d8syzcg75d"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2551,12 +2551,12 @@ final: prev: denops-vim = buildVimPluginFrom2Nix { pname = "denops.vim"; - version = "2023-06-21"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "df65c22ed88264aa3e264cace46a29d1a1263842"; - sha256 = "080rh2fnnpgxfzcgfq4dwkrbz69ba8qnwdcqbr4fb54cg67zj13x"; + rev = "62b1d22b3e60fcc9e570a531a5af1e4b2393c15a"; + sha256 = "0bdm6ll1m8d1chmwqm4jj2c2qcq0bmrjvsfc4mw5i3158kf7pfws"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; @@ -2853,12 +2853,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-06-14"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "b3a763f8c7810b352226c95faa7d3ac9fb93b8d9"; - sha256 = "0bykp6xs8ikaa6dnj7imngy1l89gk3kghv9zh2b8vinsl1wyh73l"; + rev = "ff8e57a966618e973f443b2df177cab02e7f325c"; + sha256 = "08yh8amr3401xk5c86gfgbv919c58x82csqzyn1fc19scsi72vrj"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2877,12 +2877,12 @@ final: prev: direnv-vim = buildVimPluginFrom2Nix { pname = "direnv.vim"; - version = "2022-04-09"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv.vim"; - rev = "4c858b8cd8cbfac998534096e6ffb710d7a07358"; - sha256 = "1yjrjdwgsv6vi7mlabinxwfaizrd09jkg4w57gkch4xxw7sk6y23"; + rev = "165031fa2c8dbb1e78dfd7054fe064ea926384cb"; + sha256 = "0g8k839x7588azm29iacvvqlgvznfziw8gwcdc251q9ra3z59ynh"; }; meta.homepage = "https://github.com/direnv/direnv.vim/"; }; @@ -2913,24 +2913,24 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2023-06-23"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "1cbc4eef2ef7d745aa1a559b22589e33860cf077"; - sha256 = "0nmb3wiyk21254z4jxnhw2agbg0mfx7kj9fk92zr482i71qz9rlc"; + rev = "e6eff7a5a950a853c3903d906dbcea03f778db5f"; + sha256 = "180whgmdfgsv5xbnrk4jndisafv4v59vi8001ikq4k08wm3ah634"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPluginFrom2Nix { pname = "dropbar.nvim"; - version = "2023-06-22"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "b00ede8cbde4129249ce2476fed657fe3293edb7"; - sha256 = "0k1di9b0irqc9f2bvsyadbnk35wmd7sw71v50fz2p1fm05h53h5d"; + rev = "2cc0381cd7ef1d69d289a36715a3ea817bee2691"; + sha256 = "137hn2v4yzsapq35ad3vx1xnq1i3vf867wnq5j94c8kp7bivjff7"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3010,12 +3010,12 @@ final: prev: elixir-tools-nvim = buildVimPluginFrom2Nix { pname = "elixir-tools.nvim"; - version = "2023-06-21"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "d8f953511167b60694a2922c2d00dc9b87d572df"; - sha256 = "1s0mxybqx50nzd18v4v7p4yw29hi4mfqk07b4x6iz3vcq9vbbn90"; + rev = "2ede39073ce5f2a1c861c5b213122d99e655a493"; + sha256 = "086qxhax858ibdg9f8p656vbyy2c81f2g0cswhmvqvi6mmrip3y3"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3081,6 +3081,18 @@ final: prev: meta.homepage = "https://github.com/sainnhe/everforest/"; }; + executor-nvim = buildVimPluginFrom2Nix { + pname = "executor.nvim"; + version = "2023-05-23"; + src = fetchFromGitHub { + owner = "google"; + repo = "executor.nvim"; + rev = "c1c8d69dceefbfa299c43c8b69433e2adcb0ed02"; + sha256 = "0wld79mrjwr6v13an9v6lx57yfdpad13x06gqxzhr5by0z404bdn"; + }; + meta.homepage = "https://github.com/google/executor.nvim/"; + }; + eyeliner-nvim = buildVimPluginFrom2Nix { pname = "eyeliner.nvim"; version = "2023-06-22"; @@ -3240,12 +3252,12 @@ final: prev: flash-nvim = buildVimPluginFrom2Nix { pname = "flash.nvim"; - version = "2023-06-23"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "188666c2d76347e46fc8527f9428fd48693b469c"; - sha256 = "190jjnwsl7nsf2zljwlrl14gpq2ragrx99ydhli7cgvnwiwwkcnq"; + rev = "7f2d68528c4395a84fdbcea1857049217d7f3dda"; + sha256 = "0gmwb769hhpmx1q2cjz1d40ll1gsgy5xg5slyvnlv22f0a9dwq36"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; @@ -3264,12 +3276,12 @@ final: prev: flit-nvim = buildVimPluginFrom2Nix { pname = "flit.nvim"; - version = "2023-03-24"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "f60e4b3d49bb5a5e97cfffe66f2e671eb422078e"; - sha256 = "12s75i4y7yjby9bs6gfaxs9xwy6ahffccmac3snqllqm51q0ypd5"; + rev = "5c9a78b97f7f4301473ea5e37501b5b1d4da167b"; + sha256 = "1d8zjmynl3qjkv5r8rcf11185gwnrs72pl7xh0f0ckd08gl4ra0c"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3468,12 +3480,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-06-19"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "cb0943a41df4bb59475a13c4dcc7256cc230a2e3"; - sha256 = "1pv06v6g30d9ggq97lgl8jhlwzfkimg088102bxfin43l8r09f7h"; + rev = "5039478fd0e11657eb8abf81c40b9f61fb6b6914"; + sha256 = "150ncwcip1wx98vdi899q66x00vgrb04z18b2p3s37lnb8vir2vf"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3564,12 +3576,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2023-06-02"; + version = "2023-06-24"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "a1a41cf25e985b7bf0b2e6b41b3cd4d1012a63c6"; - sha256 = "08qy16j4psxa7x14wi9wnb1wsxqjp74z9kn0c2y18alnpk0pa9kv"; + rev = "66ba799b1a45ff0b81ccfb1df2ea79a860044618"; + sha256 = "07vss302dbh33v8j7gj787kifbygnhis1bg64rsilxr4l8l46kbz"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3899,12 +3911,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-06-21"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "ce1d69acb193ce49448ea121dc775e2a84316a6c"; - sha256 = "1k0fkay5bk9a2g72c1xp8azczjqfr8zcc1k6m0wkyav23zafccgg"; + rev = "385563527de4a9e3b8eefdf350f396cdfff183da"; + sha256 = "0q2mwna8c385hic6gg5hbpw8qwnirpajs5lf4c3693g7fzg1bq0j"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4535,12 +4547,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-06-22"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "b7043f2983d7aead78ca902f3f2053907081859a"; - sha256 = "1dc8mc9lghxxbk94c8qwny55f7190zwlvip18zajj4bf9a116kpb"; + rev = "4c8b625bc873ca76b76eee0c28c98f1f7148f17f"; + sha256 = "0i4f49cspx78cp0bnry3h3im032fxihabgcfqagjfmgzx62psklm"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4595,12 +4607,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-06-22"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "0e5a8b684b577a1d1af53499007e9b84f6323e45"; - sha256 = "14mqp0l6gwhgg6sz592cdzkrh82gv2wa6l094spyyhz6f598rz62"; + rev = "c390eab0950ea01a0d118c2c3c29db7781430b33"; + sha256 = "1pminnalq75r4cw0j8f4mh0qhvzakzgmr106p9c3qhj54km22jsp"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -5026,12 +5038,12 @@ final: prev: ltex_extra-nvim = buildVimPluginFrom2Nix { pname = "ltex_extra.nvim"; - version = "2023-06-18"; + version = "2023-06-24"; src = fetchFromGitHub { owner = "barreiroleo"; repo = "ltex_extra.nvim"; - rev = "759b1ac2f9da5d7b59daf7445a8ba29b2d671163"; - sha256 = "1rqik12nhdm78fj9ay4wy4hn8xf9d5wy6f8n62l2x0dirvapl9wn"; + rev = "f32a4ca33857a61a8cf8dcd4177fa1d02e16dee0"; + sha256 = "08h0hxwdncpjncvb95azc4sl1nypd2vsahcsvq9i4hikj56ar8mm"; }; meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/"; }; @@ -5062,12 +5074,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-06-19"; + version = "2023-06-24"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "3d2ad0c0fa25e4e272ade48a62a185ebd0fe26c1"; - sha256 = "0v2sjk13phmjpx0n91wqxkd6i5rpw4mbmv9snba7qh1n5qmqr8g1"; + rev = "c7984d1cca3d8615e4daefc196597872a0b8d590"; + sha256 = "09bcxi7ss1j9g5f09xqqarlii77fx82sl7pnx94mfs4vcmrq4k76"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5267,12 +5279,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-06-23"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "f51265b17b8753420372a6a8d3f865fe79630513"; - sha256 = "14dvlma230mjvjvz6vfv1vgxssk776hkdjmlsavch5p2z5l97j89"; + rev = "59a0e2387afffc953285baa1ab8578e948c52495"; + sha256 = "0qwqzjs8mq457xqmvkc9yzb9l32al4493sjkigjxbj41dihhgyd6"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5339,12 +5351,12 @@ final: prev: monokai-pro-nvim = buildVimPluginFrom2Nix { pname = "monokai-pro.nvim"; - version = "2023-06-14"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "cf78199c861d95b302217fb28f3205658ca27673"; - sha256 = "0qvrw169fx88rz4xv4xs9bh0g67f7jmgk8j8fsdn977r9rb6bdh8"; + rev = "cb351c21a46e12df53e0650a5a1ee1b9d27b9a98"; + sha256 = "0hknggiy49h1zfi0yvnxz9xv5r3jnriz5jrp8nyc1m3zwirmrir3"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -5615,12 +5627,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-06-21"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "8324fd52f7880bf17142f56b45f544d64eff5ac9"; - sha256 = "0ff7xvhlfsrcwyqin29d6h4n0ra0x671x413g8i756g5w8301p16"; + rev = "70d3daa22bf24de9e3e284ac659506b1374e3ae2"; + sha256 = "1w5rvkshf1hlz176dqk3jrp1msabl339lfsvmy0b9kw4gxqf0w2j"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5639,12 +5651,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-06-19"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "9625a1710a9be427a662f9ba0a383164588a41a8"; - sha256 = "0ff9mmnb9wcn0267j4i3bj9qv0wxq5h0jhjzg1882p72svfdi5hi"; + rev = "3454d48dce19e0fe534e3e4849aa17c47c47d15f"; + sha256 = "1rgxp5hhh7qavabj17m1wkxjllcs3qpn08fjnlxcyxg5z2731z7s"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5663,12 +5675,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-06-23"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "412776d881d7aa2bedbe8a2572e700f740440cad"; - sha256 = "157l5lbgsacd1b7qvf9fnj8ssdq78bgpgvr15z7rmxm40i25pqrp"; + rev = "a59e3e612e85462b0410a7dce4040fd2ba37f294"; + sha256 = "1wi1sfjpdy5462maijiv08pi73il9027jwf0sbpygafh36d1p84y"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5891,12 +5903,12 @@ final: prev: neotest-haskell = buildVimPluginFrom2Nix { pname = "neotest-haskell"; - version = "2023-06-19"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "d765de6ce7fca43a63e67dbddf736245d640dac0"; - sha256 = "1ddngapg6722m36bln5js0fq5kmfq3rr22lb1pfp7pw0bwlifnpi"; + rev = "9596de6ff2e6b94cc7a6f48b2a8caeb9a1327067"; + sha256 = "0vyf9p3jc0s44vkhpzrk9lk48pj0ys4j0dxnisj6i9idc46z1n74"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -5979,8 +5991,8 @@ final: prev: src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "3394e385cd33397d04ac703c5004ce7924ddcd99"; - sha256 = "02zk00b51jj4cxc6c5lxcppg2ayq48scqgkn41457w8zhzfj7bvb"; + rev = "5072eeb9f9f74856cbd95486699f5c17ab174f5c"; + sha256 = "1yij2s8h6ip75qnzqd8maknlwcbxhlbrzzl6inch6l4iam66vs2n"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; @@ -6071,12 +6083,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2023-06-05"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "b0b09ea46c9f0509556257bd8b838b40f493d6a0"; - sha256 = "1sz3iip6vk0g8x7bjar69ybr2zspf0x073sldvf7cypz2v05jk82"; + rev = "ab2ae4d502a26bc591db78a8548823ddd04bbc9c"; + sha256 = "1my8nkc1fvs1awlzxqdy8q4448niwbg9ay5jliwly8aiiaxp2qvr"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -6191,12 +6203,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-06-19"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "26dbcefebbf3d423feb4cc8f543a5827b444ecb3"; - sha256 = "1s28zyn8lg6166mzqlzja2p9yzc2h709m6767klxpax0a28v4f2g"; + rev = "19738dddb55273c244b03a94ff1b912563c8295d"; + sha256 = "152jy6si32v1qc2rlkcfl9sx4sshpd1pxfifxrfdmkznq8yj0dnj"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -6227,24 +6239,24 @@ final: prev: no-neck-pain-nvim = buildVimPluginFrom2Nix { pname = "no-neck-pain.nvim"; - version = "2023-04-26"; + version = "2023-06-24"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "d3527936c4944baf0227c4f5b7fd64e7119ac13c"; - sha256 = "1hf8dyfgjw5jx7f0zpip20wn7q2ba5zcn4i76vi9p9x6ja2n53vv"; + rev = "fb27d3bff0834d9178250b439d46bfa04b4e1ae2"; + sha256 = "0ri8qwhx4fsrs3im01nr0v05pg3c17k7zfgdmps61s6f1n0rpjf4"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-06-22"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "7d01b45174d0d642302518275ab7cedf73e2690b"; - sha256 = "1712kai7n0cgz1gq9lxka2x83zh647y1gsvp58mh6hbv8cbv9g14"; + rev = "4f4a1702a3b2677878e68111af95cc4e775322e1"; + sha256 = "0pi6hnx92d8p2bc5vrbhxqigs5qlkiiz79wpb7k5z8n0hckyvcgi"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -6335,12 +6347,12 @@ final: prev: nvchad = buildVimPluginFrom2Nix { pname = "nvchad"; - version = "2023-06-22"; + version = "2023-06-24"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "4aa283119ac8abe8e8c4932c3f5ceb026052eebd"; - sha256 = "0xd0axz96z4a6snpdw814w56703kznmdvq8mzwp6aichd5g765rs"; + rev = "286c951d7b1f4531c8f40873a3846f40a3503e33"; + sha256 = "0pcavy26kd84m050z5dmxx9gava0zrvggbmn5p537hwq7x9zwara"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6419,12 +6431,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2023-06-06"; + version = "2023-06-24"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "5895e26e34d032f48d0b9a843da1eb24e25680ea"; - sha256 = "16pw9mpckscbi03p7lfxygyr3s8264dzy56rs3wdj4bm85lqf6cb"; + rev = "3460a1ccf4dc92a52ed7fe2012f02a9194cd84d2"; + sha256 = "02z00d4ah393agcpp0ihzz19z2kgnqnz3l6vwrg9qgln5k21q5fq"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -6707,12 +6719,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-06-22"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "3ff82ebfbec4846d07ce442fb31f21f9785e87a9"; - sha256 = "1cp45lli0y5i41ws3hh888szn6vmbjqqppkm1cadkkhcw36j1kcv"; + rev = "74cf01de9b0fe734054a164427a260e40a74bc60"; + sha256 = "0w2rpywdd29lg9qd4w8x0vqv1i3c4yyl74cvcvf24mwq6vxs8kmh"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6887,12 +6899,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2023-06-08"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "34a82230e3b9c2a09defec79abd444da4902a1f1"; - sha256 = "0nb7br4rb3ns0g6b46zxdr6bbbdr1mggh21npfw407bnvyq2ag54"; + rev = "6065608a98a6add79886ad8ab6d2f2619cff8a09"; + sha256 = "0my8x24gi1agnh0dihx77pr97dsgkdwrig6n2vj8invn1kj9r18a"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6911,24 +6923,24 @@ final: prev: nvim-navbuddy = buildVimPluginFrom2Nix { pname = "nvim-navbuddy"; - version = "2023-05-28"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "SmiteshP"; repo = "nvim-navbuddy"; - rev = "0db1d62761131ca4d0665423b3f7903532763a77"; - sha256 = "03dn2cl5q7ijhhh8qjbb7nijy04bijpwp8h243ysmzz2wwkgck8w"; + rev = "f0a2f66cb1e0b5f7bd803c5724e4b4456b5578a6"; + sha256 = "11hma1f115rvmq4jzsfc4asy8g16y88y6hafpchwdwghhcfh7pab"; }; meta.homepage = "https://github.com/SmiteshP/nvim-navbuddy/"; }; nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2023-05-09"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "15704c607569d6c5cfeab486d3ef9459645a70ce"; - sha256 = "0wsrpz61ndgi2imzyn18s69zixvbmky5j1h5srfgv2cxjzdm67gh"; + rev = "32cff45f1c84bec5e2a7bf15c0f3c6739b64c85d"; + sha256 = "1v2qwhd0kk0cf7j47gljwskx6g4dl0rlarbzykkhgkd0jrikajq1"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -7043,12 +7055,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2023-06-22"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "251c5b9b15f7937bfe9a24bf3066a9944936c32d"; - sha256 = "0ii5ipxijlfbq1dx2sy027ypj006h6b8d6q4gb0gkgjp6kyb3dnb"; + rev = "0cb9efeb03eba99292de1a83e44f9c4196bb6825"; + sha256 = "1jfq5cnbygs3qllb69c3xng93s9jy3xmwgsh6vg86lqcc0sglgl8"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7151,24 +7163,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-06-19"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "c3c6544ee00333b0f1d6a13735d0dd302dba4f70"; - sha256 = "1qgv01dr0srz26997ygxl1p02wfz52w30m20cnyb7wkg6042h5b5"; + rev = "3cc698b35b0a67792c61e1726830bb9ecfc4c9f4"; + sha256 = "17d329x2264qv30pnqrank0lzxx1xl49jz6fsdbcw3z050h0w03x"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-06-23"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "f26596386f31d5bd74b85b7d1ab0fd90c5b98608"; - sha256 = "19ixpk7dsdyb99w41zy72j18amfw7vif6gdp2hvxrmwj0wqhwlmd"; + rev = "d49ba798c95398e62321b40041e8ac4654fea251"; + sha256 = "065qr5wsrd4hrf3hag6ak2acdnk2lsc6n41pykwhkgxcxhlwvv7d"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -7223,12 +7235,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-06-19"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "83c59ed1eeae70a55605990993cf4d208948fdf7"; - sha256 = "1780104ap415dlnvik1s027vhd0ikvly23lcb4dq2d2smlkymjgf"; + rev = "52f1f3280d9092bfaee5c45be5962fabee3d9654"; + sha256 = "1k0065mn4hb3ama3qxrln24rf7cqziysddvw4anxws85dan5x9sj"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7271,11 +7283,11 @@ final: prev: nvim-ts-rainbow2 = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-06-21"; + version = "2023-06-25"; src = fetchgit { url = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; - rev = "3edad7f978513499651d8b068880948f42c16d79"; - sha256 = "0dlsrzfs3kqkcls5y5zp8sfigazhy821yqbkhz5qln6mzvv7sr43"; + rev = "1c7980dadb9d702d063c968cc240e282bb574995"; + sha256 = "0qdy97s7sgf2clmz6x5l5kldwyidk4ha1kqy7wgkypi9c5aa7mj4"; }; meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; @@ -7294,12 +7306,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-06-18"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "14b3a5ba63b82b60cde98d0a40319d80f25e8301"; - sha256 = "0hn54zz5a3zhg796jfryg1vsikv96vpvcgg71mz95wshnqjlr3jr"; + rev = "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9"; + sha256 = "1i40jzpx710amxm7hgy0ac8pda6bsmkm4r110z691c1l0i90ppwl"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -7402,12 +7414,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-06-22"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "8882f6c89eccb3754221cab942904780ed6b3e62"; - sha256 = "1x91qxgj84a7ywgyfwanzxjji5ffblln8p83rfybd6jfcnir6f28"; + rev = "a2b7ab5e99907ac04d75ce04d8dcd5728b0ad2f8"; + sha256 = "06n4cmn06w0nprswy3p7izskj92ng9yr72pkdlq1cx98ys9zyrgs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7487,12 +7499,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2023-06-08"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "3b3ae8a1f32d9f735b5c9ccf287b73e0f5e6d7a5"; - sha256 = "1zdrc2x4c3wxq6ds8lavbmvrlkmljqmr7pja4m2a3xdc98hdbw6m"; + rev = "222839e392a79c48ce0f52d754cccbc79322c01f"; + sha256 = "1xxja94np57zikgfly9c4crrn300p67k2h6x6jj863adjj7q7wv2"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -7547,12 +7559,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2023-06-17"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "4a7b92671094de130897519ca3e060b640a34006"; - sha256 = "03qrphzrbvg10d2028rz7cp7pw3gqg24qhr31sz74694wyd6bam1"; + rev = "7834aea491c02c0eddd2fbc94714535bf06776b3"; + sha256 = "0hsnhh7cmkkwq0g7x316bjd7xzw6071fzc8qz1lrqv1ql5gffhlp"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -7884,12 +7896,12 @@ final: prev: python-mode = buildVimPluginFrom2Nix { pname = "python-mode"; - version = "2022-11-25"; + version = "2023-06-24"; src = fetchFromGitHub { owner = "python-mode"; repo = "python-mode"; - rev = "149ccf7c5be0753f5e9872c023ab2eeec3442105"; - sha256 = "1l577vb781fqsnin44r5ny0zd5mac9yxbg65fyxcr0x9x7iw97x2"; + rev = "71a7f0805212a54bd961c828bbb8e7ba4f83923f"; + sha256 = "18hnsp1jn223w07ifafiqyrja6srac3nr2lj0jv5v0zykzzvp3p8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/python-mode/python-mode/"; @@ -8221,12 +8233,12 @@ final: prev: satellite-nvim = buildVimPluginFrom2Nix { pname = "satellite.nvim"; - version = "2023-06-23"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "5ae27c87f1da3fd0c0924b5adb8e2dd42268b4fe"; - sha256 = "1ymvzjzdrv4li8vhy7k3aj1sa4cvvn6nrq7qr2jxzlwrz7q58sjr"; + rev = "022c884978b888d5b5812052c64d0d243092155e"; + sha256 = "0i3d6di7hfgy665j7v99q2ghm62bhny9yz4w3jyd7as4wwnlqbzi"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -8245,12 +8257,12 @@ final: prev: scope-nvim = buildVimPluginFrom2Nix { pname = "scope.nvim"; - version = "2023-05-09"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "tiagovla"; repo = "scope.nvim"; - rev = "066bdcf97a8634560428241c9176b9e6ef038055"; - sha256 = "0yp7xj6ndf0qc9hk4r340nigcffpav16jf4iwl1i33nhjvam1c55"; + rev = "107214792bb77a35588e5112dde629aa316c80cc"; + sha256 = "1xzl7zfhj1rkaxxnrspxzcfw19ix5ya89qzggzcqj1wj3xvnrx54"; }; meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; @@ -8426,12 +8438,12 @@ final: prev: smart-splits-nvim = buildVimPluginFrom2Nix { pname = "smart-splits.nvim"; - version = "2023-06-12"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "87b0f3374b5c4dd0ff601558a247a2dc78dc7b4e"; - sha256 = "1svng27iqmly5rwq4jbvx38havzp3pqw70jq587lrg1pylila994"; + rev = "7aad6019dee974a01333523a5b8e122b7e7da454"; + sha256 = "1vrwj0pz0gcyw0nkfjiq6bz4cx481dsryc6j0ffkxr1anzrf3clq"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -8630,12 +8642,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2023-04-23"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "c00fa513974811e7bdf34b3d8a53abbd69c9042c"; - sha256 = "08afyma20gv9snv526ppy078hjd5jixxhpzlqw2h7aya0jb455bk"; + rev = "95a700875530a1ad87232e472fab307ee2a553ba"; + sha256 = "0gpj66dwx7qf7gk6qp7sxabfykfq5b8qgzcwm097mv1kzxyp9fxl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -8775,12 +8787,12 @@ final: prev: suda-vim = buildVimPluginFrom2Nix { pname = "suda.vim"; - version = "2023-01-10"; + version = "2023-06-24"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "suda.vim"; - rev = "08abd39dfe1cee681b8ce3e7321da5fa03e045c1"; - sha256 = "0sivx4smg6d02dd16d9aa4v652vl90lpkbpz69kpi5llii6kb1xf"; + rev = "6c54de33d388204b26d72e5bfa43aa4be0362e55"; + sha256 = "18f8ddp4ysamvczqa1lb3lv3zbdfgfav6kmh0qg4v3wcwqwsjc2l"; }; meta.homepage = "https://github.com/lambdalisue/suda.vim/"; }; @@ -9089,12 +9101,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2023-06-12"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "87dfaa9a9c251388cf4f01b9d4078c29d1fc8803"; - sha256 = "1w00iklckrsqz9ggimbmbxjzysw596a30j8h249wbkczhym8bphp"; + rev = "acf2eade45563803afdd4e9873a8481bc98bd726"; + sha256 = "05rrkmyk6ma08h3xqhzy2wxsj6qmdnf4ypi3dqzycklavb44r10k"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -9319,12 +9331,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-06-21"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "ffe35cb433192fcb5080b557c1aef14d37092035"; - sha256 = "1kac34kiwnnz3r80pyfx87r730jryqflh3f12hr8z8crzpz262yk"; + rev = "6074847b6ee4b725747c8fc540d9b6b128ac8a12"; + sha256 = "1glqmvk5q6k3qa55lq2a39qkqbsh7hkfqx7kssl143z76g7f1w04"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -9572,24 +9584,24 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2023-05-30"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "cf146a267a6a7db62b1e2aff40414b20081048a1"; - sha256 = "12windxwl9icn1g9yh36nw4brsmlb2cx16ay68p0dk16axvnhf22"; + rev = "4cac5c96445df3a97f162a0f810e38fde1eb525e"; + sha256 = "0l8rjr53m5q386gm70x2m21001lphipp0gjq0w4rygm648ds6h1j"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-06-21"; + version = "2023-06-24"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "a0a7bfbc4c54348b56880a162afac9d103c618c1"; - sha256 = "0qc3fb18l73qbf38ml4122fbbcka9qab81jmacg73ryw8ifpsn20"; + rev = "fd0a005fd8986ec0d98a1938dc570303e8d8444b"; + sha256 = "18y7s1hkkgzv0lkvz53bcpps65i42ma6v3gfy01pnpxhrxgxmb3p"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -9656,12 +9668,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-06-23"; + version = "2023-06-24"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "a3372bd2ba3a91882a6e54ed35da13a441d7c167"; - sha256 = "05cwzc2sskyijg2j2m82j0yvbh35cyabq8ms7zxi34kv2jm2pqm5"; + rev = "d99e2abd10808ef91738ce98a5c767e6a51df449"; + sha256 = "0j5ypv22qahic4lch0k3vssxwnbdngyx2b5h532yn4jkjlph5y0y"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -9788,12 +9800,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-06-23"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "17fc0db0d876e2e8ce8522a3c4cb56429208c8b3"; - sha256 = "12hgg4jzb4ra3cnmvphzcklimf87x9fcmf1dvfn4pmcd2hnj542z"; + rev = "24fc7cea79f54ccd6ab165c9adaaa34e741c6ebb"; + sha256 = "0whh4hagdvsdhg3dsr55d4nb7bbc39xz9hn3jyz7i4dg24h4a73y"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -9884,12 +9896,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-06-02"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "0300c693975b378802ffdf305187e1cf3f636c5e"; - sha256 = "0p2nc9qnydslij69dcpl1xvydhzrvbpc4gfkbz3r74b8imh1z5dk"; + rev = "f52001f835f0c334bfee4c38534320c1c546b0d8"; + sha256 = "1sjajazx1l3k1gwdm4b3n418s9dxl60ai0jachi3z29z6av9yjf1"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -12382,12 +12394,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2023-05-15"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "e74bd3c986484845a4b87e5aa013773d52030a75"; - sha256 = "0r2g34wzwg80qbppyhrxkv0h1rpsmz93g651j3j65slq2c26qg04"; + rev = "39bad0b67eeba88bf2f0477327693c8e552044fa"; + sha256 = "1l048mspd3vvqv9jypk43jw0yjjk88mddffgkk0g6qr3iz42mszb"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -14088,12 +14100,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2023-05-19"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "08250c56f11cb3460c8a02c8fdb80c8d39c92173"; - sha256 = "19zd8ngmy1aia7myzgn8j6707jcxs27zmy9gc2fxsrhpq7hgnyfm"; + rev = "6fbfbfc434debf3d3e8676fad5041450615f2d5d"; + sha256 = "07ll9i820z3wn85xhym6d0v7iasgyiwg5gpqpyph7b640h02p6is"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -14472,12 +14484,12 @@ final: prev: vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2023-06-23"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "6bb0fff309b0e87509915c6101808f41a16d6f48"; - sha256 = "0n0mxynfy176yn8nm7aafhmwvfg0l409cnf8d2ix1fa8c74b8lk6"; + rev = "04051c1e1af146abfce153cd4a0161817f06e10d"; + sha256 = "0z2095qmlpnl2g4x6gmknnwnsf1pni91vd9m8ckiya7hmn5zh7rf"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -14833,12 +14845,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-06-23"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "efd8248abf7f2cdee13dd27c1d506ddfa788587c"; - sha256 = "09vnqcg52fnasdx2f3vqira0qph6icssf6kzg8gysjrbbg9kypxb"; + rev = "b38bbcab7ab05067ce460e2d9e69c896fea7ebe0"; + sha256 = "1bqh93z5fjrv3nb80s5k6wnl5wbrf5a30l88382cix9l3syz4fqr"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -14857,12 +14869,12 @@ final: prev: vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; - version = "2023-06-22"; + version = "2023-06-26"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "942da42b96251b5b9bef4e54bb79884ebf86c1f4"; - sha256 = "1kmjr26wyn1na9g7m6607vjk4g5yhdapsmlcv62myb9g58r0knpl"; + rev = "65b9f0e68b1c4b6c2023a02b22d11a178e13445e"; + sha256 = "13pfh3k25mfglwpadlf3d7f0bhmzyzx9qf9xa53m88cvmwd82acg"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -15194,12 +15206,12 @@ final: prev: zenbones-nvim = buildVimPluginFrom2Nix { pname = "zenbones.nvim"; - version = "2023-06-09"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "e951fb866bd49497c55e9a943363c00b63cce4d1"; - sha256 = "1lzqyryy9plvqzphrqbwkyf7f4a92ba0ggg7xbakf26gzijhzxy9"; + rev = "ae8a6cb5e2d478a03df3cdbc3d0ca4c4a6db35ba"; + sha256 = "1a1pck42xs96armn33gjjamcw8f730vhfg63vrf9xfy41s8pl1jx"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; @@ -15230,12 +15242,12 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2023-06-20"; + version = "2023-06-23"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "82d03f445fc8db80ef7842874d155956c1136432"; - sha256 = "0rpkhnf7fk39gpzryxnig04hxdl7c28x06vnh1r2mvzxs3c46c55"; + rev = "0c4f965468259ab6e47fd7c6b2127583a8860eb1"; + sha256 = "052jmw1pzqydg4icsq2s7vn66wyn2ki4lzpln2fzxx9r9hbwfi8m"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; @@ -15278,12 +15290,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-06-22"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "506a4aa13443e0104ea49b99947cc09488d0791d"; - sha256 = "0694njpibbmnvlllvf42c7l350m33fxbjzdx9fjv6jz42a6zqwr5"; + rev = "8d02781a638123394f9bc160aad47a9560a113f9"; + sha256 = "1gjr5anvbahxzdzs1x7xsb6kqhfw50lw8yzdj4lxma0pxkgd0aw1"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -15302,12 +15314,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-06-23"; + version = "2023-06-25"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "128b0f8fe46db9b696a747b7c70088ebfc0e0044"; - sha256 = "1ll2ihi42lvshxi7n7lmydyp32aglfsanqa72xa3b16say1y6a0q"; + rev = "0145af11a29557b91d0640500e5ff383dcfb2a51"; + sha256 = "1x66mbdkyxr7spwianajchz4qlba1q5n2gvki5mz786sfprgfcjk"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; From 94b10c8fe86252167f15fd90e2d65c67cc77bb55 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Jun 2023 23:06:39 -0400 Subject: [PATCH 103/222] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 65 +++++++++++-------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 371db86f3940..65eb2f2e78b0 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -403,12 +403,12 @@ }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=692c50c"; + version = "0.0.0+rev=73edfcd"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "692c50c0b961364c40299e73c1306aecb5d20f40"; - hash = "sha256-0LpuyebOB5ew9fULBcaw8aUbF7HM5sXQpv+Jroz4tXg="; + rev = "73edfcdc3bb2ddfc731cd5d63e6cb287a18da90d"; + hash = "sha256-0fC3NYHtZQbi9Ca5UAAD9FEXQUJ9z8caf0XQsPpU5Rs="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -711,12 +711,12 @@ }; hack = buildGrammar { language = "hack"; - version = "0.0.0+rev=b7bd692"; + version = "0.0.0+rev=b1c41e4"; src = fetchFromGitHub { owner = "slackhq"; repo = "tree-sitter-hack"; - rev = "b7bd6928532ada34dddb1dece4a158ab62c6e783"; - hash = "sha256-TSbi4Ik/AjswuIdTaFfJ53S0c/qfq0JYPzVv07JASmc="; + rev = "b1c41e4b82c625cc33ddb8701f6aa5a09c72fcf5"; + hash = "sha256-eEvT8pZeGwtnEanYG2qdkCWR6ifh2qm/yxGOTbuZhdE="; }; meta.homepage = "https://github.com/slackhq/tree-sitter-hack"; }; @@ -733,15 +733,26 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=a75238f"; + version = "0.0.0+rev=ba0bfb0"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "a75238fdefc2281cdba7dc4dca13f1d68a91f177"; - hash = "sha256-KCP6nP2AI6ZwuADSlWTP21I+U4aUr40/sYTn1FVqVMA="; + rev = "ba0bfb0e5d8e9e31c160d287878c6f26add3ec08"; + hash = "sha256-ZSOF0CLOn82GwU3xgvFefmh/AD2j5zz8I0t5YPwfan0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; + haskell_persistent = buildGrammar { + language = "haskell_persistent"; + version = "0.0.0+rev=58a6ccf"; + src = fetchFromGitHub { + owner = "MercuryTechnologies"; + repo = "tree-sitter-haskell-persistent"; + rev = "58a6ccfd56d9f1de8fb9f77e6c42151f8f0d0f3d"; + hash = "sha256-p4Anm/xeG/d7nYBPDABcdDih/a+0rMjwtVUJru7m9QY="; + }; + meta.homepage = "https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent"; + }; hcl = buildGrammar { language = "hcl"; version = "0.0.0+rev=becebeb"; @@ -799,12 +810,12 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=86c253e"; + version = "0.0.0+rev=ff48883"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "86c253e675e7fdd1c0482efe0706f24bafbc3a7d"; - hash = "sha256-mOJ1JUlsnFPH5jQcWdhWJkoZ0qOK1CTvmi/gEPzzeYk="; + rev = "ff48883eb679bbb71b7ac08c8023c8defbf9e234"; + hash = "sha256-o4yQsFosxGHj60nezRXDGVBVEPsgITHqE7Ub4rOEAAU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -1120,12 +1131,12 @@ }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=26c5255"; + version = "0.0.0+rev=b09c27e"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "26c525577c7349b8d9805d244cacd8ef98807b78"; - hash = "sha256-nvjqmyVcVfTkuMFyDWWJLZNN/SeiNwLrQU6qfvQqpmw="; + rev = "b09c27e42732c59321604a15163480ebb4f82f1c"; + hash = "sha256-gIaHyExmgFSEe6Nm7G5NPNafWWhl50Fn1UQm35MrAuE="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1443,12 +1454,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=6282715"; + version = "0.0.0+rev=6ecc2b5"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "62827156d01c74dc1538266344e788da74536b8a"; - hash = "sha256-hVtX4Dyqrq+cSvKTmKMxLbAplcCdR8dfFDoIZNtPFA0="; + rev = "6ecc2b54b39ac390848d81dfcf5ee961f33a2f03"; + hash = "sha256-gfFD1E6hXaNU0z81VHvo0oMU9iLcyRWP6sIRj6uagYU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1509,12 +1520,12 @@ }; racket = buildGrammar { language = "racket"; - version = "0.0.0+rev=2804e03"; + version = "0.0.0+rev=bbdb0bf"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "2804e03223953dc4709f4c041b57b722095a0397"; - hash = "sha256-mPG0faYCxML1Ehu6bZS86rEV9Ys+tgwsGlNKgA4U3zQ="; + rev = "bbdb0bfbaf0dd5f6650b97a393a06a19cef50562"; + hash = "sha256-in/VhL0PkhOXaeiMje8oqTxYJ9/VirLTfzF9QZg/Fuk="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -1696,12 +1707,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=d38db87"; + version = "0.0.0+rev=7bd15d1"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "d38db87c3e979a692cd542be44524f7f5e46f965"; - hash = "sha256-PT7joV3kA8LqB6t/bhahxNsp8zfOKNWQIT8gQ4UnqY4="; + rev = "7bd15d1ca789c5aaef5d2dbfdb14565ec8223d1b"; + hash = "sha256-yX1Ttwl+GgmguThHpIsnM/x3O57WY+u4NcChSdokHo0="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2022,12 +2033,12 @@ }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=e9b4d2b"; + version = "0.0.0+rev=8c0469d"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "e9b4d2b3e732ed841980e7369e945e46ce715b8c"; - hash = "sha256-4j8iEo1BIh4RdYjGPokXNIHhlS7G3JE4ABQ/i3yuObA="; + rev = "8c0469d1f84f1e2733d4490dfb3cf8f8b100e2da"; + hash = "sha256-8Y2Ow9Hppo8qB8SoaxF/vnOTC8pXZg/d5HjlBxy0wwg="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; From 0b9b910faa11d8258dbff62a9ef901a0bbd554d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 03:08:10 +0000 Subject: [PATCH 104/222] discord-ptb: 0.0.42 -> 0.0.43 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index edff60d9f835..b5bace721bbe 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.27"; - ptb = "0.0.42"; + ptb = "0.0.43"; canary = "0.0.161"; development = "0.0.216"; } else { @@ -20,7 +20,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "ZAMyAqyFEBJeTUqQzr5wK+BOFGURqhoHL8w2hJvL0vI="; + sha256 = "tG+QR62JcBYrvJS6KU6oAWSfQFdl68AMcU8E9Zahy2A="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From 37ace213dbc58714b6c61cf8fd906f8275efa2ff Mon Sep 17 00:00:00 2001 From: Evils Date: Sun, 14 May 2023 14:37:07 +0200 Subject: [PATCH 105/222] python310Packages.image-diff: init at 0.2.2 --- .../python-modules/image-diff/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/image-diff/default.nix diff --git a/pkgs/development/python-modules/image-diff/default.nix b/pkgs/development/python-modules/image-diff/default.nix new file mode 100644 index 000000000000..d120737c3ffc --- /dev/null +++ b/pkgs/development/python-modules/image-diff/default.nix @@ -0,0 +1,39 @@ +{ lib +, python +, buildPythonPackage +, fetchFromGitHub +, pillow +, click +, click-default-group +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "image-diff"; + version = "0.2.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "simonw"; + repo = "image-diff"; + rev = version; + hash = "sha256-AQykJNvBgVjmPVTwJOX17eKWelqvZZieq/giid8GYAY="; + }; + + propagatedBuildInputs = [ + pillow + click + click-default-group + ]; + + pythonImportsCheck = [ "image_diff" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "CLI tool for comparing images"; + homepage = "https://github.com/simonw/image-diff"; + license = licenses.asl20; + maintainers = with maintainers; [ evils ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f6ae01f8bea8..d84df0f3c795 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4865,6 +4865,8 @@ self: super: with self; { imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { }; + image-diff = callPackage ../development/python-modules/image-diff { }; + image-go-nord = callPackage ../development/python-modules/image-go-nord { }; imagesize = callPackage ../development/python-modules/imagesize { }; From c77696250badfb62efb8a7fbf527a3338c6bb887 Mon Sep 17 00:00:00 2001 From: Evils Date: Mon, 15 May 2023 07:22:38 +0200 Subject: [PATCH 106/222] python310Packages.diffimg: init at 0.3.0 --- .../python-modules/diffimg/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/diffimg/default.nix diff --git a/pkgs/development/python-modules/diffimg/default.nix b/pkgs/development/python-modules/diffimg/default.nix new file mode 100644 index 000000000000..e5afcdf8cdf1 --- /dev/null +++ b/pkgs/development/python-modules/diffimg/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pillow +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "diffimg"; + version = "0.3.0"; # github recognized 0.1.3, there's a v0.1.5 tag and setup.py says 0.3.0 + format = "setuptools"; + + src = fetchFromGitHub { + owner = "nicolashahn"; + repo = "diffimg"; + rev = "b82f0bb416f100f9105ccccf1995872b29302461"; + hash = "sha256-H/UQsqyfdnlESBe7yRu6nK/0dakQkAfeFaZNwjCMvdM="; + }; + + # it imports the wrong diff, + # fix offered to upstream https://github.com/nicolashahn/diffimg/pull/6 + postPatch = '' + substituteInPlace diffimg/test.py \ + --replace "from diff import diff" "from diffimg.diff import diff" + ''; + + propagatedBuildInputs = [ + pillow + ]; + + pythonImportsCheck = [ "diffimg" ]; + + nativeCheckInputs = [ + unittestCheckHook + ]; + + meta = with lib; { + description = "Differentiate images in python - get a ratio or percentage difference, and generate a diff image"; + homepage = "https://github.com/nicolashahn/diffimg"; + license = licenses.mit; + maintainers = with maintainers; [ evils ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d84df0f3c795..af2f5703b3bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2549,6 +2549,8 @@ self: super: with self; { diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; + diffimg = callPackage ../development/python-modules/diffimg { }; + digital-ocean = callPackage ../development/python-modules/digitalocean { }; digi-xbee = callPackage ../development/python-modules/digi-xbee { }; From fb88230473dd5f950a3315fb0b05d4abfbf110d2 Mon Sep 17 00:00:00 2001 From: Evils Date: Mon, 15 May 2023 07:23:31 +0200 Subject: [PATCH 107/222] python310Packages.imgdiff: init at 1.7.1 --- .../python-modules/imgdiff/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/imgdiff/default.nix diff --git a/pkgs/development/python-modules/imgdiff/default.nix b/pkgs/development/python-modules/imgdiff/default.nix new file mode 100644 index 000000000000..586ed19b2572 --- /dev/null +++ b/pkgs/development/python-modules/imgdiff/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pillow +, mock +, unittestCheckHook +}: + +buildPythonPackage rec { + pname = "imgdiff"; + version = "1.7.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mgedmin"; + repo = "imgdiff"; + rev = version; + hash = "sha256-Y5nUnjihRpVVehhP1LUgfuJN5nCxEJu6P1w99Igpxjs="; + }; + + propagatedBuildInputs = [ + pillow + ]; + + pythonImportsCheck = [ "imgdiff" ]; + + nativeCheckInputs = [ + mock + unittestCheckHook + ]; + + meta = with lib; { + description = "Compare two images side-by-side"; + homepage = "https://github.com/mgedmin/imgdiff"; + changelog = "https://github.com/mgedmin/imgdiff/blob/${src.rev}/CHANGES.rst"; + license = licenses.mit; + maintainers = with maintainers; [ evils ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af2f5703b3bf..d1648bf7475c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4887,6 +4887,8 @@ self: super: with self; { imgaug = callPackage ../development/python-modules/imgaug { }; + imgdiff = callPackage ../development/python-modules/imgdiff { }; + imgsize = callPackage ../development/python-modules/imgsize { }; iminuit = callPackage ../development/python-modules/iminuit { }; From 694ff068f7ba9953414ccec9c2cb0976414a720b Mon Sep 17 00:00:00 2001 From: Evils Date: Thu, 18 May 2023 10:32:36 +0200 Subject: [PATCH 108/222] python310Packages.pytest-image-diff: init at 0.0.11 --- .../pytest-image-diff/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/pytest-image-diff/default.nix diff --git a/pkgs/development/python-modules/pytest-image-diff/default.nix b/pkgs/development/python-modules/pytest-image-diff/default.nix new file mode 100644 index 000000000000..cbe607d0648e --- /dev/null +++ b/pkgs/development/python-modules/pytest-image-diff/default.nix @@ -0,0 +1,43 @@ +{ lib +, python3 +, buildPythonPackage +, fetchFromGitHub +, typing-extensions +, diffimg +, imgdiff +, pytestCheckHook +, recommonmark +}: + +buildPythonPackage rec { + pname = "pytest-image-diff"; + version = "0.0.11"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Apkawa"; + repo = "pytest-image-diff"; + rev = "v${version}"; + hash = "sha256-7GBwxm0YQNN/Gq1yyBIxCEYbM7hmOFa9kUsfbBKQtBQ="; + }; + + propagatedBuildInputs = [ + typing-extensions + diffimg + imgdiff + ]; + + pythonImportsCheck = [ "pytest_image_diff" ]; + + nativeCheckInputs = [ + pytestCheckHook + recommonmark + ]; + + meta = with lib; { + description = "Pytest helps for compare images and regression"; + homepage = "https://github.com/Apkawa/pytest-image-diff"; + license = licenses.mit; + maintainers = with maintainers; [ evils ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1648bf7475c..5424e58339eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9669,6 +9669,8 @@ self: super: with self; { pytest-httpx = callPackage ../development/python-modules/pytest-httpx { }; + pytest-image-diff = callPackage ../development/python-modules/pytest-image-diff { }; + pytest-instafail = callPackage ../development/python-modules/pytest-instafail { }; pytest-isort = callPackage ../development/python-modules/pytest-isort { }; From b035db27f22246bab106d4a906e61a9f71437df6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 03:13:17 +0000 Subject: [PATCH 109/222] python310Packages.pytado: 0.13.0 -> 0.16.0 --- pkgs/development/python-modules/pytado/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index 44d38fb6636a..ddd618d6d14f 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pytado"; - version = "0.13.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "wmalgadey"; repo = "PyTado"; # Upstream hasn't tagged 0.13.0 yet - rev = "2a243174e9ae01ef7adae940ecc6e340992ab28d"; - sha256 = "Y1FxEzs/AF0ZTPdOK/1v+2U2fidfu+AmZbPddJCWIFc="; + rev = "refs/tags/${version}"; + sha256 = "sha256-tpWr+VlkJ9svN9XtBIDEAos4uxYCl6njvUBPIJG++Yg="; }; propagatedBuildInputs = [ From 88bba0cc7bc8e4b4a9cfbfcf13adf0141746e3f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 03:18:04 +0000 Subject: [PATCH 110/222] python310Packages.python-sql: 1.4.1 -> 1.4.2 --- pkgs/development/python-modules/python-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index 783f7654d49e..424c1635f91a 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-sql"; - version = "1.4.1"; + version = "1.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KkcvQLQPlFmdBi6/92BHm2NTX2LQLrnH1nGR4Iq/ctw="; + hash = "sha256-stuHXGcgwblayCyD6lLOu5RMQHvmii7wN8zdi6ucxTw="; }; nativeCheckInputs = [ From e451d21f749299fbffd6f92b0b758d5b6f45bae2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 04:04:04 +0000 Subject: [PATCH 111/222] pathvector: 6.3.0 -> 6.3.2 --- pkgs/tools/networking/pathvector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/pathvector/default.nix b/pkgs/tools/networking/pathvector/default.nix index cd4ebaf2b7a8..f8560793e9dc 100644 --- a/pkgs/tools/networking/pathvector/default.nix +++ b/pkgs/tools/networking/pathvector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pathvector"; - version = "6.3.0"; + version = "6.3.2"; src = fetchFromGitHub { owner = "natesales"; repo = "pathvector"; rev = "v${version}"; - sha256 = "sha256-N4mlEfJWov1utqv+Dy+I2G1kf8t82hFYn74guzrsKF0="; + sha256 = "sha256-TqGasguEAcA5ET2E/uFjgIl7IHI2v9m5EaXpIMG3T8c="; }; vendorHash = "sha256-hgUuntT6jMWI14qDE3Yjm5W8UqQ6CcvoILmSDaVEZac="; From 78aea8e433a6ef7a43542271890552d510494615 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 27 Jun 2023 12:19:26 +0800 Subject: [PATCH 112/222] pantheon.xdg-desktop-portal-pantheon: 7.0.0 -> 7.1.0 https://github.com/elementary/portals/releases/tag/7.1.0 --- .../pantheon/services/xdg-desktop-portal-pantheon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix index 8be2adad40f4..51e0737cfe81 100644 --- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix +++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-pantheon"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "portals"; rev = version; - sha256 = "sha256-Rfo9Z5rCJgk36Db3ce8dYBJswy8owjvRMrJVB/RfwyI="; + sha256 = "sha256-uy/etQiJuaROw8bWg2PUdptNr4I8uqqUZ8BWK6D2bog="; }; nativeBuildInputs = [ From 8b88e2ccfe499af0dbdeec2a0d05168079d8b36e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 25 Jun 2023 16:35:32 +1200 Subject: [PATCH 113/222] lemmy: 0.17.4 -> 0.18.0 --- pkgs/servers/web-apps/lemmy/package.json | 209 ++++++++++-------- pkgs/servers/web-apps/lemmy/pin.json | 10 +- pkgs/servers/web-apps/lemmy/server.nix | 5 + .../servers/web-apps/lemmy/tokio-macros.patch | 37 ++++ 4 files changed, 158 insertions(+), 103 deletions(-) create mode 100644 pkgs/servers/web-apps/lemmy/tokio-macros.patch diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json index a01cf033df30..45d4daf16612 100644 --- a/pkgs/servers/web-apps/lemmy/package.json +++ b/pkgs/servers/web-apps/lemmy/package.json @@ -1,121 +1,134 @@ { "name": "lemmy-ui", + "version": "0.18.0", "description": "An isomorphic UI for lemmy", - "version": "0.17.4", - "author": "Dessalines ", + "repository": "https://github.com/LemmyNet/lemmy-ui", "license": "AGPL-3.0", + "author": "Dessalines ", "scripts": { + "prebuild:dev": "yarn clean && node generate_translations.js", "build:dev": "webpack --mode=development", + "prebuild:prod": "yarn clean && node generate_translations.js", "build:prod": "webpack --mode=production", "clean": "yarn run rimraf dist", "dev": "yarn start", - "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src && prettier --check 'src/**/*.tsx'", - "prebuild:dev": "yarn clean && node generate_translations.js", - "prebuild:prod": "yarn clean && node generate_translations.js", + "lint": "yarn translations:generate && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx \"src/**\" && prettier --check \"src/**/*.{ts,tsx,js,css,scss}\"", "prepare": "husky install", - "start": "yarn build:dev --watch" + "start": "yarn build:dev --watch", + "themes:build": "sass src/assets/css/themes/:src/assets/css/themes", + "themes:watch": "sass --watch src/assets/css/themes/:src/assets/css/themes", + "translations:generate": "node generate_translations.js", + "translations:init": "git submodule init && yarn translations:update", + "translations:update": "git submodule update --remote --recursive" }, - "repository": "https://github.com/LemmyNet/lemmy-ui", - "dependencies": { - "@babel/plugin-proposal-decorators": "^7.21.0", - "@babel/plugin-transform-runtime": "^7.21.0", - "@babel/plugin-transform-typescript": "^7.21.0", - "@babel/preset-env": "7.20.2", - "@babel/preset-typescript": "^7.21.0", - "@babel/runtime": "^7.21.0", - "autosize": "^6.0.1", - "babel-loader": "^9.1.2", - "babel-plugin-inferno": "^6.6.0", - "check-password-strength": "^2.0.7", - "choices.js": "^10.2.0", - "classnames": "^2.3.1", - "clean-webpack-plugin": "^4.0.0", - "copy-webpack-plugin": "^11.0.0", - "css-loader": "^6.7.3", - "emoji-short-name": "^2.0.0", - "express": "~4.18.2", - "html-to-text": "^9.0.4", - "i18next": "^22.4.10", - "inferno": "^8.0.6", - "inferno-create-element": "^8.0.6", - "inferno-helmet": "^5.2.1", - "inferno-hydrate": "^8.0.6", - "inferno-i18next-dess": "0.0.2", - "inferno-router": "^8.0.6", - "inferno-server": "^8.0.6", - "isomorphic-cookie": "^1.2.4", - "jwt-decode": "^3.1.2", - "lemmy-js-client": "0.17.2-rc.1", - "markdown-it": "^13.0.1", - "markdown-it-container": "^3.0.0", - "markdown-it-footnote": "^3.0.3", - "markdown-it-html5-embed": "^1.0.0", - "markdown-it-sub": "^1.0.0", - "markdown-it-sup": "^1.0.0", - "mini-css-extract-plugin": "^2.7.2", - "moment": "^2.29.4", - "node-fetch": "^2.6.1", - "register-service-worker": "^1.7.2", - "run-node-webpack-plugin": "^1.3.0", - "rxjs": "^7.8.0", - "sanitize-html": "^2.10.0", - "sass": "^1.58.3", - "sass-loader": "^13.2.0", - "serialize-javascript": "^6.0.1", - "tippy.js": "^6.3.7", - "toastify-js": "^1.12.0", - "tributejs": "^5.1.3", - "webpack": "5.75.0", - "webpack-cli": "^5.0.1", - "webpack-node-externals": "^3.0.0", - "websocket-ts": "^1.1.1" - }, - "devDependencies": { - "@babel/core": "^7.21.0", - "@types/autosize": "^4.0.0", - "@types/express": "^4.17.17", - "@types/html-to-text": "^9.0.0", - "@types/markdown-it": "^12.2.3", - "@types/markdown-it-container": "^2.0.5", - "@types/node": "^18.14.0", - "@types/node-fetch": "^2.6.2", - "@types/sanitize-html": "^2.8.0", - "@types/serialize-javascript": "^5.0.1", - "@types/toastify-js": "^1.11.1", - "@typescript-eslint/eslint-plugin": "^5.53.0", - "@typescript-eslint/parser": "^5.53.0", - "bootstrap": "^5.2.3", - "bootswatch": "^5.2.3", - "eslint": "^8.34.0", - "eslint-plugin-inferno": "^7.32.1", - "eslint-plugin-prettier": "^4.2.1", - "husky": "^8.0.3", - "import-sort-style-module": "^6.0.0", - "lint-staged": "^13.1.2", - "prettier": "^2.8.4", - "prettier-plugin-import-sort": "^0.0.7", - "prettier-plugin-organize-imports": "^3.2.2", - "prettier-plugin-packagejson": "^2.4.3", - "rimraf": "^4.1.2", - "sortpack": "^2.3.3", - "style-loader": "^3.3.1", - "terser": "^5.16.4", - "typescript": "^4.9.5", - "webpack-dev-server": "4.11.1" - }, - "engines": { - "node": ">=8.9.0" - }, - "engineStrict": true, "lint-staged": { "*.{ts,tsx,js}": [ "prettier --write", "eslint --fix" ], + "*.{css, scss}": [ + "prettier --write" + ], "package.json": [ "sortpack" ] }, + "dependencies": { + "@babel/plugin-proposal-decorators": "^7.21.0", + "@babel/plugin-transform-runtime": "^7.21.4", + "@babel/plugin-transform-typescript": "^7.21.3", + "@babel/preset-env": "7.21.5", + "@babel/preset-typescript": "^7.21.5", + "@babel/runtime": "^7.21.5", + "@emoji-mart/data": "^1.1.0", + "autosize": "^6.0.1", + "babel-loader": "^9.1.2", + "babel-plugin-inferno": "^6.6.0", + "bootstrap": "^5.2.3", + "check-password-strength": "^2.0.7", + "classnames": "^2.3.1", + "clean-webpack-plugin": "^4.0.0", + "copy-webpack-plugin": "^11.0.0", + "cross-fetch": "^3.1.5", + "css-loader": "^6.7.3", + "emoji-mart": "^5.4.0", + "emoji-short-name": "^2.0.0", + "express": "~4.18.2", + "history": "^5.3.0", + "html-to-text": "^9.0.5", + "i18next": "^22.4.15", + "inferno": "^8.1.1", + "inferno-create-element": "^8.1.1", + "inferno-helmet": "^5.2.1", + "inferno-hydrate": "^8.1.1", + "inferno-i18next-dess": "0.0.2", + "inferno-router": "^8.1.1", + "inferno-server": "^8.1.1", + "isomorphic-cookie": "^1.2.4", + "jwt-decode": "^3.1.2", + "lemmy-js-client": "0.18.0-rc.2", + "lodash": "^4.17.21", + "markdown-it": "^13.0.1", + "markdown-it-container": "^3.0.0", + "markdown-it-emoji": "^2.0.2", + "markdown-it-footnote": "^3.0.3", + "markdown-it-html5-embed": "^1.0.0", + "markdown-it-sub": "^1.0.0", + "markdown-it-sup": "^1.0.0", + "mini-css-extract-plugin": "^2.7.5", + "moment": "^2.29.4", + "register-service-worker": "^1.7.2", + "run-node-webpack-plugin": "^1.3.0", + "sanitize-html": "^2.10.0", + "sass": "^1.62.1", + "sass-loader": "^13.2.2", + "serialize-javascript": "^6.0.1", + "service-worker-webpack": "^1.0.0", + "sharp": "^0.32.1", + "tippy.js": "^6.3.7", + "toastify-js": "^1.12.0", + "tributejs": "^5.1.3", + "webpack": "5.82.1", + "webpack-cli": "^5.1.1", + "webpack-node-externals": "^3.0.0" + }, + "devDependencies": { + "@babel/core": "^7.21.8", + "@types/autosize": "^4.0.0", + "@types/bootstrap": "^5.2.6", + "@types/express": "^4.17.17", + "@types/html-to-text": "^9.0.0", + "@types/markdown-it": "^12.2.3", + "@types/markdown-it-container": "^2.0.5", + "@types/node": "^20.1.2", + "@types/sanitize-html": "^2.9.0", + "@types/serialize-javascript": "^5.0.1", + "@types/toastify-js": "^1.11.1", + "@typescript-eslint/eslint-plugin": "^5.59.5", + "@typescript-eslint/parser": "^5.59.5", + "eslint": "^8.40.0", + "eslint-plugin-inferno": "^7.32.2", + "eslint-plugin-jsx-a11y": "^6.7.1", + "eslint-plugin-prettier": "^4.2.1", + "husky": "^8.0.3", + "import-sort-style-module": "^6.0.0", + "lint-staged": "^13.2.2", + "prettier": "^2.8.8", + "prettier-plugin-import-sort": "^0.0.7", + "prettier-plugin-organize-imports": "^3.2.2", + "prettier-plugin-packagejson": "^2.4.3", + "rimraf": "^5.0.0", + "sortpack": "^2.3.4", + "style-loader": "^3.3.2", + "terser": "^5.17.3", + "typescript": "^5.0.4", + "webpack-dev-server": "4.15.0" + }, + "packageManager": "yarn@1.22.19", + "engines": { + "node": ">=8.9.0" + }, + "engineStrict": true, "importSort": { ".js, .jsx, .ts, .tsx": { "style": "module", diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index 59f6c0c8f01d..8522dbb7e015 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,7 +1,7 @@ { - "version": "0.17.4", - "serverSha256": "sha256-nztT6o5Tur64dMWII+wf5CBVJBJ59MGXKdS5OJO0SSc=", - "serverCargoSha256": "sha256-3In2W+cSVtMkaKrn1hWOVL/V/qkKlH30qGPi3rNdpQI=", - "uiSha256": "sha256-Ebc4VzuCJhPoO16qCgSVyYFXH7YcymxcGcN/Sgyg5Gs=", - "uiYarnDepsSha256": "sha256-aZAclSaFZJvuK+FpCBWboGaVEOEJTxq2jnWk0A6iAFw=" + "version": "0.18.0", + "serverSha256": "sha256-KzEelj2/+wfp570Vw1+FoqiYZd1PxELTdopGSeel97E=", + "serverCargoSha256": "sha256-p1ZytuaXouKFkKjsEsaNjndoioTSVVM2pf72qE8/qyM=", + "uiSha256": "sha256-pB6uEL9gDwvsi+FbooKBhTCJ+Qmc6Vl2bBTMiL1hUJI=", + "uiYarnDepsSha256": "sha256-NtluS6Cr39L9nGwNA17c7xsM5xoJraS02a7sp7r9KPI=" } diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 2917d660ba94..c5c9924779e1 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -26,6 +26,11 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; + patches = [ + # `cargo test` fails as `tokio::test` relies on the macros feature which wasn't specified in Cargo.toml + ./tokio-macros.patch + ]; + cargoSha256 = pinData.serverCargoSha256; buildInputs = [ postgresql ] diff --git a/pkgs/servers/web-apps/lemmy/tokio-macros.patch b/pkgs/servers/web-apps/lemmy/tokio-macros.patch new file mode 100644 index 000000000000..a37f0835d1cc --- /dev/null +++ b/pkgs/servers/web-apps/lemmy/tokio-macros.patch @@ -0,0 +1,37 @@ +From f8c83b48774d152f9bc590db83c032235ef502a9 Mon Sep 17 00:00:00 2001 +From: Jan Klass +Date: Sat, 24 Jun 2023 17:57:59 +0200 +Subject: [PATCH] test: Fix missing tokio test macro dependency + +The tests make use of the `#[tokio::test]` macro, but the tokio dependency default feature does not include them. Running cargo test fails. + +By including the `macros` feature on the tokio dependency, cargo test will work. + +--- + +cargo test fails with + +``` +error[E0433]: failed to resolve: could not find `test` in `tokio` + --> src\scheduled_tasks.rs:295:12 + | +295 | #[tokio::test] + | ^^^^ could not find `test` in `tokio` +``` +--- + Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 430deb082c..d4c5ab8ef0 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -89,7 +89,7 @@ anyhow = "1.0.71" + diesel_ltree = "0.3.0" + typed-builder = "0.10.0" + serial_test = "0.9.0" +-tokio = "1.28.2" ++tokio = { version = "1.28.2", features = ["macros"] } + sha2 = "0.10.6" + regex = "1.8.4" + once_cell = "1.18.0" From 4b789ef027a0f62ce83e6c6d34f6e7b96f58e2ab Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Mon, 26 Jun 2023 22:05:06 +0300 Subject: [PATCH 114/222] lemmy: build sharp --- nixos/tests/lemmy.nix | 2 ++ pkgs/servers/web-apps/lemmy/ui.nix | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/nixos/tests/lemmy.nix b/nixos/tests/lemmy.nix index fb64daa80e64..b1a39827b072 100644 --- a/nixos/tests/lemmy.nix +++ b/nixos/tests/lemmy.nix @@ -26,6 +26,8 @@ in site_name = "Lemmy FTW"; admin_email = "mightyiam@example.com"; }; + # https://github.com/LemmyNet/lemmy/blob/50efb1d519c63a7007a07f11cc8a11487703c70d/crates/utils/src/settings/mod.rs#L52 + database.uri = "postgres:///lemmy?host=/run/postgresql&user=lemmy"; }; caddy.enable = true; }; diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix index 6213b246f30f..65076eaa89e4 100644 --- a/pkgs/servers/web-apps/lemmy/ui.nix +++ b/pkgs/servers/web-apps/lemmy/ui.nix @@ -7,6 +7,8 @@ , fetchFromGitHub , fetchYarnDeps , nixosTests +, vips +, nodePackages }: let @@ -21,6 +23,13 @@ let rm build/config.gypi ''; }; + sharp = { + nativeBuildInputs = [ pkg-config nodePackages.semver ]; + buildInputs = [ vips ]; + postInstall = '' + yarn --offline run install + ''; + }; }; name = "lemmy-ui"; @@ -65,6 +74,10 @@ mkYarnPackage { cp -R ./node_modules $out ''; + postInstall = '' + echo 'export const VERSION = "${version}";' > $out/libexec/lemmy-ui/deps/lemmy-ui/src/shared/version.ts + ''; + distPhase = "true"; passthru.updateScript = ./update.sh; From 2ba6d6fb94459db8388dc82d7e4671b7b86b805f Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Tue, 27 Jun 2023 06:36:54 +0300 Subject: [PATCH 115/222] lemmy-ui: write version to correct file --- pkgs/servers/web-apps/lemmy/ui.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/lemmy/ui.nix b/pkgs/servers/web-apps/lemmy/ui.nix index 65076eaa89e4..3377b54c861f 100644 --- a/pkgs/servers/web-apps/lemmy/ui.nix +++ b/pkgs/servers/web-apps/lemmy/ui.nix @@ -64,6 +64,7 @@ mkYarnPackage { export HOME=$PWD/yarn_home ln -sf $PWD/node_modules $PWD/deps/lemmy-ui/ + echo 'export const VERSION = "${version}";' > $PWD/deps/lemmy-ui/src/shared/version.ts yarn --offline build:prod ''; @@ -74,10 +75,6 @@ mkYarnPackage { cp -R ./node_modules $out ''; - postInstall = '' - echo 'export const VERSION = "${version}";' > $out/libexec/lemmy-ui/deps/lemmy-ui/src/shared/version.ts - ''; - distPhase = "true"; passthru.updateScript = ./update.sh; From cab051862741856ec0913747c74ca6d8e12b0e86 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Tue, 27 Jun 2023 06:56:51 +0300 Subject: [PATCH 116/222] lemmy-server: write version to file --- pkgs/servers/web-apps/lemmy/server.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index c5c9924779e1..d37e18224a77 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -31,6 +31,10 @@ rustPlatform.buildRustPackage rec { ./tokio-macros.patch ]; + preConfigure = '' + echo 'pub const VERSION: &str = "${version}";' > crates/utils/src/version.rs + ''; + cargoSha256 = pinData.serverCargoSha256; buildInputs = [ postgresql ] From 95a49014e72a51046f74689ab4cf550d77afdf6f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 27 Jun 2023 12:18:33 +0800 Subject: [PATCH 117/222] sing-box: 1.2.7 -> 1.3.0 --- pkgs/tools/networking/sing-box/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index a93a973e4b39..5b978fb1a823 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -4,21 +4,22 @@ , fetchFromGitHub , installShellFiles , buildPackages +, coreutils , nix-update-script }: buildGoModule rec { pname = "sing-box"; - version = "1.2.7"; + version = "1.3.0"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-+pRG5nq0Be58at61qqu5QciHC2DMvw+wj7u8tZx8+eY="; + hash = "sha256-+zEjuoGFAZhajUCFPZXNr1SoAprjOsHf12nVCbDKOeY="; }; - vendorHash = "sha256-gHPMJ4/W2ZisG/jAtHSLH/NlHgBitg7Bwe95wGJAsOY="; + vendorHash = "sha256-KJEjqcwtsNEByTQjp+TU9Yct/CJD8F9fnGuq9eeGtpQ="; tags = [ "with_quic" @@ -50,6 +51,11 @@ buildGoModule rec { --bash <(${emulator} $out/bin/sing-box completion bash) \ --fish <(${emulator} $out/bin/sing-box completion fish) \ --zsh <(${emulator} $out/bin/sing-box completion zsh ) + + substituteInPlace release/config/sing-box{,@}.service \ + --replace "/usr/bin/sing-box" "$out/bin/sing-box" \ + --replace "/bin/kill" "${coreutils}/bin/kill" + install -Dm444 -t "$out/lib/systemd/system/" release/config/sing-box{,@}.service ''; passthru.updateScript = nix-update-script { }; From 99db658cb603e624d0df3e73cea140600f716bb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 04:58:51 +0000 Subject: [PATCH 118/222] qdrant: 1.2.2 -> 1.3.0 --- pkgs/servers/search/qdrant/Cargo.lock | 694 +++++++++++++------------ pkgs/servers/search/qdrant/default.nix | 7 +- 2 files changed, 370 insertions(+), 331 deletions(-) diff --git a/pkgs/servers/search/qdrant/Cargo.lock b/pkgs/servers/search/qdrant/Cargo.lock index d3080b88205c..fc1bc1af7f19 100644 --- a/pkgs/servers/search/qdrant/Cargo.lock +++ b/pkgs/servers/search/qdrant/Cargo.lock @@ -209,10 +209,10 @@ dependencies = [ "actix-utils", "futures-core", "log", - "openssl", "pin-project-lite", - "tokio-openssl", + "tokio-rustls 0.23.4", "tokio-util", + "webpki-roots", ] [[package]] @@ -363,6 +363,12 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -435,7 +441,7 @@ checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "api" -version = "1.2.2" +version = "1.3.0" dependencies = [ "chrono", "env_logger", @@ -546,7 +552,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1163d9d7c51de51a2b79d6df5e8888d11e9df17c752ce4a285fb6ca1580734e" dependencies = [ - "rustix 0.37.4", + "rustix 0.37.19", "tempfile", "windows-sys 0.48.0", ] @@ -832,13 +838,13 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", "time 0.1.45", @@ -895,9 +901,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.0" +version = "4.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "2686c4115cb0810d9a984776e197823d08ec94f176549a89a9efded477c456dc" dependencies = [ "clap_builder", "clap_derive", @@ -906,9 +912,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "2e53afce1efce6ed1f633cf0e57612fe51db54a1ee4fd8f8503d078fe02d69ae" dependencies = [ "anstream", "anstyle", @@ -919,9 +925,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.0" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" dependencies = [ "heck", "proc-macro2", @@ -970,6 +976,7 @@ dependencies = [ "pprof", "rand 0.8.5", "rmp-serde", + "rstest", "schemars", "segment", "semver", @@ -1039,6 +1046,43 @@ dependencies = [ "winapi", ] +[[package]] +name = "console-api" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e" +dependencies = [ + "prost", + "prost-types", + "tonic", + "tracing-core", +] + +[[package]] +name = "console-subscriber" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57ab2224a0311582eb03adba4caaf18644f7b1f10a760803a803b9b605187fc7" +dependencies = [ + "console-api", + "crossbeam-channel", + "crossbeam-utils", + "futures", + "hdrhistogram", + "humantime", + "parking_lot", + "prost-types", + "serde", + "serde_json", + "thread_local", + "tokio", + "tokio-stream", + "tonic", + "tracing", + "tracing-core", + "tracing-subscriber", +] + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1047,9 +1091,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "constant_time_eq" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "convert_case" @@ -1068,16 +1112,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation-sys" version = "0.8.3" @@ -1128,9 +1162,9 @@ dependencies = [ [[package]] name = "criterion" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9c16c823fba76d9643cc387e9677d9771abe0827561381815215c47f808da9" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ "anes", "cast", @@ -1413,13 +1447,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -1493,26 +1527,11 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -1617,6 +1636,12 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" + [[package]] name = "futures-util" version = "0.3.28" @@ -1644,6 +1669,19 @@ dependencies = [ "byteorder", ] +[[package]] +name = "generator" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3e123d9ae7c02966b4d892e550bdc32164f05853cd40ab570650ad600596a8a" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows", +] + [[package]] name = "generic-array" version = "0.14.6" @@ -1807,6 +1845,19 @@ dependencies = [ "siphasher", ] +[[package]] +name = "hdrhistogram" +version = "7.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8" +dependencies = [ + "base64 0.13.1", + "byteorder", + "flate2", + "nom", + "num-traits", +] + [[package]] name = "heapless" version = "0.7.16" @@ -1904,9 +1955,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.25" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -1928,15 +1979,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" dependencies = [ "http", "hyper", - "rustls 0.20.7", + "rustls 0.21.0", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls 0.24.0", ] [[package]] @@ -1951,19 +2002,6 @@ dependencies = [ "tokio-io-timeout", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "iana-time-zone" version = "0.1.53" @@ -1996,20 +2034,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.2.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2034,11 +2061,12 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.3" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" +checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" dependencies = [ "console", + "instant", "number_prefix", "portable-atomic", "unicode-width", @@ -2079,12 +2107,23 @@ checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" [[package]] name = "io-lifetimes" -version = "1.0.3" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "io-uring" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b7b36074613a723279637061b40db993208908a94f10ccb14436ce735bc0f57" +dependencies = [ + "bitflags", "libc", - "windows-sys 0.42.0", ] [[package]] @@ -2100,8 +2139,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" dependencies = [ "hermit-abi 0.3.1", - "io-lifetimes 1.0.3", - "rustix 0.37.4", + "io-lifetimes 1.0.11", + "rustix 0.37.19", "windows-sys 0.45.0", ] @@ -2169,9 +2208,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.146" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" [[package]] name = "libloading" @@ -2243,9 +2282,9 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "linux-raw-sys" -version = "0.3.0" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "local-channel" @@ -2278,18 +2317,31 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" dependencies = [ "cfg-if", + "generator", + "scoped-tls", + "tracing", + "tracing-subscriber", ] [[package]] -name = "matches" -version = "0.1.10" +name = "matchers" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] [[package]] name = "matchit" @@ -2314,9 +2366,18 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0aa1b505aeecb0adb017db2b6a79a17a38e64f882a201f05e9de8a982cd6096" +checksum = "6d28bba84adfe6646737845bc5ebbfa2c08424eb1c37e94a1fd2a82adb56a872" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180d4b35be83d33392d1d1bfbd2ae1eca7ff5de1a94d3fc87faaa99a069e7cbd" dependencies = [ "libc", ] @@ -2401,24 +2462,6 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "nias" version = "0.5.0" @@ -2474,6 +2517,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-derive" version = "0.3.3" @@ -2495,16 +2548,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.15" @@ -2552,60 +2595,6 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "openssl" -version = "0.10.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "111.25.0+1.1.1t" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" -dependencies = [ - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - [[package]] name = "ordered-float" version = "2.10.0" @@ -2634,6 +2623,12 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "parking_lot" version = "0.12.1" @@ -2686,9 +2681,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "permutation_iterator" @@ -2822,9 +2817,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "0.3.18" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bdd679d533107e090c2704a35982fc06302e30898e63ffa26a81155c012e92" +checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5" [[package]] name = "pprof" @@ -3032,7 +3027,7 @@ dependencies = [ [[package]] name = "qdrant" -version = "1.2.2" +version = "1.3.0" dependencies = [ "actix-cors", "actix-files", @@ -3047,7 +3042,8 @@ dependencies = [ "collection", "colored", "config", - "constant_time_eq 0.2.5", + "console-subscriber", + "constant_time_eq 0.3.0", "env_logger", "futures", "futures-util", @@ -3055,13 +3051,14 @@ dependencies = [ "log", "num-traits", "num_cpus", - "openssl", "parking_lot", "prometheus", "prost", "raft", "raft-proto", "reqwest", + "rustls 0.20.7", + "rustls-pemfile", "rusty-hook", "schemars", "sealed_test", @@ -3082,6 +3079,9 @@ dependencies = [ "tonic", "tower", "tower-layer", + "tracing", + "tracing-subscriber", + "tracing-tracy", "uuid", "validator", "wal", @@ -3298,6 +3298,15 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax", +] + [[package]] name = "regex-syntax" version = "0.6.28" @@ -3306,9 +3315,9 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "reqwest" -version = "0.11.17" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ "base64 0.21.0", "bytes", @@ -3320,23 +3329,20 @@ dependencies = [ "http-body", "hyper", "hyper-rustls", - "hyper-tls", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.20.7", + "rustls 0.21.0", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-native-tls", - "tokio-rustls 0.23.4", + "tokio-rustls 0.24.0", "tokio-util", "tower-service", "url", @@ -3432,6 +3438,32 @@ dependencies = [ "smallvec", ] +[[package]] +name = "rstest" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de1bb486a691878cd320c2f0d319ba91eeaa2e894066d8b5f8f117c000e9d962" +dependencies = [ + "futures", + "futures-timer", + "rstest_macros", + "rustc_version", +] + +[[package]] +name = "rstest_macros" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290ca1a1c8ca7edb7c3283bd44dc35dd54fdec6253a3912e201ba1072018fca8" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.107", + "unicode-ident", +] + [[package]] name = "rust-ini" version = "0.18.0" @@ -3484,8 +3516,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a38f9520be93aba504e8ca974197f46158de5dcaa9fa04b57c57cd6a679d658" dependencies = [ "bitflags", - "errno 0.3.0", - "io-lifetimes 1.0.3", + "errno 0.3.1", + "io-lifetimes 1.0.11", "libc", "linux-raw-sys 0.1.4", "windows-sys 0.45.0", @@ -3493,16 +3525,16 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.4" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c348b5dc624ecee40108aa2922fed8bad89d7fcc2b9f8cb18f632898ac4a37f9" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", - "errno 0.3.0", - "io-lifetimes 1.0.3", + "errno 0.3.1", + "io-lifetimes 1.0.11", "libc", - "linux-raw-sys 0.3.0", - "windows-sys 0.45.0", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", ] [[package]] @@ -3531,11 +3563,11 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", ] [[package]] @@ -3605,16 +3637,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "schannel" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -dependencies = [ - "lazy_static", - "windows-sys 0.36.1", -] - [[package]] name = "schemars" version = "0.8.12" @@ -3643,6 +3665,12 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" version = "1.1.0" @@ -3693,29 +3721,6 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "security-framework" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "segment" version = "0.6.0" @@ -3728,11 +3733,13 @@ dependencies = [ "chrono", "criterion", "fs_extra", + "futures", "geo", "geohash", + "io-uring", "itertools", "log", - "memmap2 0.6.1", + "memmap2 0.7.0", "num-derive", "num-traits", "num_cpus", @@ -3771,9 +3778,9 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" dependencies = [ "serde_derive", ] @@ -3800,9 +3807,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", @@ -3822,9 +3829,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" dependencies = [ "itoa", "ryu", @@ -3887,6 +3894,15 @@ dependencies = [ "digest", ] +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + [[package]] name = "shlex" version = "1.1.0" @@ -4004,7 +4020,6 @@ dependencies = [ "itertools", "log", "num_cpus", - "openssl", "parking_lot", "proptest", "prost", @@ -4102,9 +4117,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.29.0" +version = "0.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f1dc6930a439cc5d154221b5387d153f8183529b07c19aca24ea31e0a167e1" +checksum = "9557d0845b86eea8182f7b10dff120214fb6cd9fd937b6f4917714e546a38695" dependencies = [ "cfg-if", "core-foundation-sys", @@ -4134,15 +4149,16 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" dependencies = [ + "autocfg", "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.4", - "windows-sys 0.45.0", + "rustix 0.37.19", + "windows-sys 0.48.0", ] [[package]] @@ -4195,6 +4211,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + [[package]] name = "tikv-jemalloc-sys" version = "0.5.2+5.3.0-patched" @@ -4281,9 +4307,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.28.1" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", "bytes", @@ -4295,6 +4321,7 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", + "tracing", "windows-sys 0.48.0", ] @@ -4319,28 +4346,6 @@ dependencies = [ "syn 2.0.11", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-openssl" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08f9ffb7809f1b20c1b398d92acf4cc719874b3b2b2d9ea2f09b4a80350878a" -dependencies = [ - "futures-util", - "openssl", - "openssl-sys", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.23.4" @@ -4399,8 +4404,7 @@ dependencies = [ [[package]] name = "tonic" version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +source = "git+https://github.com/qdrant/tonic?branch=v0.9.2-patched#060ab88c87955adc59d46a44b4e3b72cb4cc1522" dependencies = [ "async-stream", "async-trait", @@ -4504,6 +4508,68 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "parking_lot", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracing-tracy" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55c48ef3e655220d4e43a6be44aa84f078c3004357251cab45f9cc15551a593e" +dependencies = [ + "tracing-core", + "tracing-subscriber", + "tracy-client", +] + +[[package]] +name = "tracy-client" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "434ecabbda9f67eeea1eab44d52f4a20538afa3e2c2770f2efc161142b25b608" +dependencies = [ + "loom", + "once_cell", + "tracy-client-sys", +] + +[[package]] +name = "tracy-client-sys" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d99f5fc382239d08b6bf05bb6206a585bfdb988c878f2499081d0f285ef7819" +dependencies = [ + "cc", ] [[package]] @@ -4541,9 +4607,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -4574,12 +4640,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", - "idna 0.3.0", + "idna", "percent-encoding", "serde", ] @@ -4592,9 +4658,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.3" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" dependencies = [ "getrandom 0.2.8", "serde", @@ -4602,11 +4668,11 @@ dependencies = [ [[package]] name = "validator" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ad5bf234c7d3ad1042e5252b7eddb2c4669ee23f32c7dd0e9b7705f07ef591" +checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" dependencies = [ - "idna 0.2.3", + "idna", "lazy_static", "regex", "serde", @@ -4642,6 +4708,12 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" @@ -4666,7 +4738,7 @@ dependencies = [ [[package]] name = "wal" version = "0.1.2" -source = "git+https://github.com/qdrant/wal.git?rev=f3029ad0e1632d5e375db55695e33121df54aa5c#f3029ad0e1632d5e375db55695e33121df54aa5c" +source = "git+https://github.com/qdrant/wal.git?rev=e034a1814ee15941134d442198dc1fd87d767594#e034a1814ee15941134d442198dc1fd87d767594" dependencies = [ "byteorder", "crc", @@ -4675,10 +4747,10 @@ dependencies = [ "env_logger", "fs4", "log", - "memmap2 0.6.1", + "memmap2 0.6.2", "rand 0.8.5", "rand_distr", - "rustix 0.37.4", + "rustix 0.37.19", "serde", ] @@ -4871,16 +4943,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows-targets 0.48.0", ] [[package]] @@ -4958,12 +5026,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -4976,12 +5038,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -4994,12 +5050,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -5012,12 +5062,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -5042,12 +5086,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index 075f46eb065f..45c1131cc9b6 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -11,20 +11,21 @@ rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-1UJZibj7twM/4z9w+ebOI0AVjPZGz7B1BWw0M0pMQ+k="; + sha256 = "sha256-f81CepXjU+w56yGZGJJzwp1IVOQ8vB+5WNC5icVOieA="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "quantization-0.1.0" = "sha256-mhiVicQXj8639bX2mGp9XnjTNVFdd6mnk+B1B1f3ywA="; - "wal-0.1.2" = "sha256-oZ6xij59eIpCGcFL2Ds6E180l1SGIRMOq7OcLc1TpxY="; + "tonic-0.9.2" = "sha256-ZlcDUZy/FhxcgZE7DtYhAubOq8DMSO17T+TCmXar1jE="; + "wal-0.1.2" = "sha256-J+r1SaYa2ZPEfjNeVJkLYERIPLZfll02RyXeS6J/R8U="; }; }; From 578e9e1f40be786160145acaad94fbc3dae3f205 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 05:06:09 +0000 Subject: [PATCH 119/222] cppcheck: 2.10.3 -> 2.11 --- pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index dab9ecee3147..8b8127a4ba80 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.10.3"; + version = "2.11"; src = fetchFromGitHub { owner = "danmar"; repo = "cppcheck"; rev = version; - hash = "sha256-M63uHhyEDmuWrEu7Y3Zks1Eq5WgenSlqWln2DMBj3fU="; + hash = "sha256-Zu1Ly5KsgmjtsVQlBzgB/h+varfkyB73t8bxzqB3a3M="; }; strictDeps = true; From d0f2eb641dd5f780c8c136f5d2013672d3cb0afd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 03:17:11 +0000 Subject: [PATCH 120/222] terraform-providers.bitbucket: 2.33.0 -> 2.34.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1896bafd9031..d8f0d5c370ea 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -164,13 +164,13 @@ "vendorHash": null }, "bitbucket": { - "hash": "sha256-T9e3IQHe6uCdllRTctJg/aG1QmPFR6V4ryw79yX2k/o=", + "hash": "sha256-Sby7Dvu4UWzdbQWa/GLMkDzlK7foaFApy4yLNBOJgck=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.33.0", + "rev": "v2.34.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ebkUF+Xv9diwUYXYt/WK+0tWheqL1cgA665VbGLmvvo=" + "vendorHash": "sha256-AcUw5i3st7VfAnpy/6nTYfTv3rOAN2jm4rUmEKcSrXM=" }, "brightbox": { "hash": "sha256-yKoYjrZs6EOX1pdDuF+LOu/jZ3fidZJBU7yhSp6qSFU=", From 62c4033e53fba6bdee618b8ba9f58884b86fec3a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 03:18:09 +0000 Subject: [PATCH 121/222] terraform-providers.exoscale: 0.49.0 -> 0.50.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d8f0d5c370ea..16876b2ce82a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -363,11 +363,11 @@ "vendorHash": "sha256-2iVEcpESaEdgTcmlQ6Wynuxv8RmPFlhF+BVDSjHmclM=" }, "exoscale": { - "hash": "sha256-DD6CkdZ9KCCkPCgPyWXaAvHfHyn9rYXRsXg9BVJkELM=", + "hash": "sha256-dLA9BWW4ghD1OSZaZtFfv8ipS+2lTeNRr1YD3E8ewpI=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.49.0", + "rev": "v0.50.0", "spdx": "MPL-2.0", "vendorHash": null }, From 72c1b61eae5ce0a2128f5bf69c613af18d4204a2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 03:19:04 +0000 Subject: [PATCH 122/222] terraform-providers.grafana: 1.41.0 -> 1.42.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 16876b2ce82a..7d8e76f84ee5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -474,13 +474,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-5V0TW80GQKa2JHrSf9SlsCrT9jTTQK+SMRa/OCIrthE=", + "hash": "sha256-J5Fn3JGp7jXAA04RJ3FFKqLpB4hekd0yFA8zkfPPQ+4=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v1.41.0", + "rev": "v1.42.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-CRqUSPXap8lXRa/yIDnG11F/D+IdylY3JzkV6bXmzwY=" + "vendorHash": "sha256-8FgjFIgEx3pA6vKo7m9e6gASrpp5cPtN7A2US2GASy8=" }, "gridscale": { "hash": "sha256-OzOI//WXMHzHSbsqLSAfVpt756SbF3Uv0r/7MsVMjzY=", From 521ad9a6d67615506778d47bdce03da383f8d120 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Jun 2023 03:21:47 +0000 Subject: [PATCH 123/222] terraform-providers.vsphere: 2.4.0 -> 2.4.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7d8e76f84ee5..c3ad7f546551 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1234,11 +1234,11 @@ "vendorHash": null }, "vsphere": { - "hash": "sha256-XVMTKYb9RuK5sErVHsP0j5otUEioxp6C7GV7/J6OYVA=", + "hash": "sha256-lWMtsBRAirNI7dNXI7APzS1AbPmkz5fsbpCdd/0XBRc=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.4.0", + "rev": "v2.4.1", "spdx": "MPL-2.0", "vendorHash": "sha256-wKKrBSJkbdqqnDLoS+jhvI26rOzvMWjjsN8wh67Le5U=" }, From d2483a8cc75f007d76e9eec97e75df677c53a433 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 27 Jun 2023 12:46:06 +0800 Subject: [PATCH 124/222] nixos/sing-box: init --- nixos/modules/module-list.nix | 1 + .../modules/services/networking/sing-box.nix | 66 +++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 nixos/modules/services/networking/sing-box.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 43fcc68ded42..6e8f062c1694 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1013,6 +1013,7 @@ ./services/networking/shorewall.nix ./services/networking/shorewall6.nix ./services/networking/shout.nix + ./services/networking/sing-box.nix ./services/networking/sitespeed-io.nix ./services/networking/skydns.nix ./services/networking/smartdns.nix diff --git a/nixos/modules/services/networking/sing-box.nix b/nixos/modules/services/networking/sing-box.nix new file mode 100644 index 000000000000..d32725f77147 --- /dev/null +++ b/nixos/modules/services/networking/sing-box.nix @@ -0,0 +1,66 @@ +{ config, lib, pkgs, utils, ... }: +let + cfg = config.services.sing-box; + settingsFormat = pkgs.formats.json { }; +in +{ + + meta = { + maintainers = with lib.maintainers; [ nickcao ]; + }; + + options = { + services.sing-box = { + enable = lib.mkEnableOption (lib.mdDoc "sing-box universal proxy platform"); + + package = lib.mkPackageOptionMD pkgs "sing-box" { }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + options = { + route = { + geoip.path = lib.mkOption { + type = lib.types.path; + default = "${pkgs.sing-geoip}/share/sing-box/geoip.db"; + defaultText = lib.literalExpression "\${pkgs.sing-geoip}/share/sing-box/geoip.db"; + description = lib.mdDoc '' + The path to the sing-geoip database. + ''; + }; + geosite.path = lib.mkOption { + type = lib.types.path; + default = "${pkgs.sing-geosite}/share/sing-box/geosite.db"; + defaultText = lib.literalExpression "\${pkgs.sing-geosite}/share/sing-box/geosite.db"; + description = lib.mdDoc '' + The path to the sing-geosite database. + ''; + }; + }; + }; + }; + default = { }; + description = lib.mdDoc '' + The sing-box configuration, see https://sing-box.sagernet.org/configuration/ for documentation. + + Options containing secret data should be set to an attribute set + containing the attribute `_secret` - a string pointing to a file + containing the value the option should be set to. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.packages = [ cfg.package ]; + + systemd.services.sing-box = { + preStart = '' + mkdir -p /etc/sing-box + ${utils.genJqSecretsReplacementSnippet cfg.settings "/etc/sing-box/config.json"} + ''; + wantedBy = [ "multi-user.target" ]; + }; + }; + +} From e3d52286b139b7ba041fbb057fbc0a729377ed68 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 27 Jun 2023 12:58:10 +0800 Subject: [PATCH 125/222] nixos/sing-box: add basic test --- nixos/tests/all-tests.nix | 1 + nixos/tests/sing-box.nix | 45 ++++++++++++++++++++++ pkgs/tools/networking/sing-box/default.nix | 6 ++- 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/sing-box.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 6e9c893c809e..e1ecda9af42c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -686,6 +686,7 @@ in { shiori = handleTest ./shiori.nix {}; signal-desktop = handleTest ./signal-desktop.nix {}; simple = handleTest ./simple.nix {}; + sing-box = handleTest ./sing-box.nix {}; slurm = handleTest ./slurm.nix {}; smokeping = handleTest ./smokeping.nix {}; snapcast = handleTest ./snapcast.nix {}; diff --git a/nixos/tests/sing-box.nix b/nixos/tests/sing-box.nix new file mode 100644 index 000000000000..43be89317642 --- /dev/null +++ b/nixos/tests/sing-box.nix @@ -0,0 +1,45 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + + name = "sing-box"; + + meta = { + maintainers = with lib.maintainers; [ nickcao ]; + }; + + nodes.machine = { pkgs, ... }: { + environment.systemPackages = [ pkgs.curl ]; + services.nginx.enable = true; + services.sing-box = { + enable = true; + settings = { + inbounds = [{ + type = "mixed"; + tag = "inbound"; + listen = "127.0.0.1"; + listen_port = 1080; + users = [{ + username = "user"; + password = { _secret = pkgs.writeText "password" "supersecret"; }; + }]; + }]; + outbounds = [{ + type = "direct"; + tag = "outbound"; + }]; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("nginx.service") + machine.wait_for_unit("sing-box.service") + + machine.wait_for_open_port(80) + machine.wait_for_open_port(1080) + + machine.succeed("curl --fail --max-time 10 --proxy http://user:supersecret@localhost:1080 http://localhost") + machine.fail("curl --fail --max-time 10 --proxy http://user:supervillain@localhost:1080 http://localhost") + machine.succeed("curl --fail --max-time 10 --proxy socks5://user:supersecret@localhost:1080 http://localhost") + ''; + +}) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 5b978fb1a823..1e15eaf9a192 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -6,6 +6,7 @@ , buildPackages , coreutils , nix-update-script +, nixosTests }: buildGoModule rec { @@ -58,7 +59,10 @@ buildGoModule rec { install -Dm444 -t "$out/lib/systemd/system/" release/config/sing-box{,@}.service ''; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests = { inherit (nixosTests) sing-box; }; + }; meta = with lib;{ homepage = "https://sing-box.sagernet.org"; From 4b4f5b99faaca456dda93a50cf99a8df459571b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 05:59:30 +0000 Subject: [PATCH 126/222] python310Packages.softlayer: 6.1.4 -> 6.1.7 --- pkgs/development/python-modules/softlayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 032b5827d258..4ae4e85111b2 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "softlayer"; - version = "6.1.4"; + version = "6.1.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "softlayer-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Ofl8MmGn70CJPuPZi0W0GJiMiceMNMACSNVKaOPdQN8="; + hash = "sha256-WL/hv1/eB8/ynSo0XOTOYE2rGWV/4VsgSQsRioR2ACE="; }; postPatch = '' From 15d222d3b572a3a5271e0f816f636956f18d9f80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 06:13:07 +0000 Subject: [PATCH 127/222] python310Packages.ansible-core: 2.15.0 -> 2.15.1 --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 0e4aef282a27..50c67f8f2908 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.15.0"; + version = "2.15.1"; src = fetchPypi { inherit pname version; - hash = "sha256-z2kP1Ou0BZDgDFrNwGJHWMpMWNHksrAuwCagNAcOv00="; + hash = "sha256-7SjrSUPkgABO3Juh6b7peaBlDLL5Nyzkor1XKDjGDSs="; }; # ansible_connection is already wrapped, so don't pass it through From ad19566aca369d5fa49adee78e5ecef708607bcb Mon Sep 17 00:00:00 2001 From: Evils Date: Sun, 14 May 2023 08:09:42 +0200 Subject: [PATCH 128/222] kicad-unstable: 2023-04-14 -> 2023-06-24 new qa_cli test needs pytest-image-diff it also accesses $HOME, so setting that as well and it checks for a valid commit which is exposed to the end-user via kicad-cli version --format=commit so i'm setting the placeholder to the actual commit used mostly to avoid doing a leaveDotGit and rewriting update.sh --- .../science/electronics/kicad/base.nix | 21 +++++++++++++++---- .../science/electronics/kicad/versions.nix | 20 +++++++++--------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 1b0bdc3ae49c..fa9b77037038 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -77,14 +77,13 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString (!stable) '' substituteInPlace cmake/KiCadVersion.cmake \ --replace "unknown" "${builtins.substring 0 10 src.rev}" + + substituteInPlace cmake/CreateGitVersionHeader.cmake \ + --replace "0000000000000000000000000000000000000000" "${src.rev}" ''; makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; - # some ngspice tests attempt to write to $HOME/.cache/ - XDG_CACHE_HOME = "$TMP"; - # failing tests still attempt to create $HOME though - cmakeFlags = [ "-DKICAD_USE_EGL=ON" "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" @@ -165,10 +164,24 @@ stdenv.mkDerivation rec { ++ optional (withNgspice) libngspice ++ optional (debug) valgrind; + # some ngspice tests attempt to write to $HOME/.cache/ + # this could be and was resolved with XDG_CACHE_HOME = "$TMP"; + # but failing tests still attempt to create $HOME + # and the newer CLI tests seem to also use $HOME... + HOME = "$TMP"; + # debug builds fail all but the python test doInstallCheck = !(debug); installCheckTarget = "test"; + pythonForTests = python.withPackages(ps: with ps; [ + numpy + pytest + cairosvg + pytest-image-diff + ]); + nativeInstallCheckInputs = optional (!stable) pythonForTests; + dontStrip = debug; meta = { diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index f9f91856a98c..f0cf6c896ffd 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -25,23 +25,23 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2023-04-14"; + version = "2023-06-24"; src = { - rev = "4a3f77cd9dac9dc5921eb9beaa63d0d3c9c051e5"; - sha256 = "06dsiyvr7zn3cp13w0y63d1qmjlhzsqlvajkximg3pw5mmiljxrr"; + rev = "1c1849ec1a6614247abe4c623c086def2b3192e0"; + sha256 = "0faf4fw7nrfwdrl4pjqdyfzqbvb9jd4nk4aq83v1w358yqyk7zg9"; }; }; libVersion = { - version = "2023-04-14"; + version = "2023-06-24"; libSources = { - symbols.rev = "38d4e7e1ab6a9b5d9eee85f687e60467753b2135"; - symbols.sha256 = "0df6fx9b19v6sxrfyggbisw72y66kiwqi05k8mldsgiw6q55gbkc"; + symbols.rev = "43456780d309682f6da4a6f14710355b06fc4c5d"; + symbols.sha256 = "1ql2w3q3dv13ascw8s0hzwda486763qma7i2m877jw3p78gjhldr"; templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a"; templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; - footprints.rev = "4da055a2d572ff87e7ecea97cf358ed8c1d46dfc"; - footprints.sha256 = "1xb84284dmcb7mbvzlrxb4v4km3ih7gq856h8cglf9jn8wzlnvrk"; - packages3d.rev = "0f43a0962437feb53bd2083e9f39efffb5a5dd90"; - packages3d.sha256 = "1nkk4325jh89vh52ykfnf9pz1k3jk5017gz6r2cia2v4b3jadi31"; + footprints.rev = "6a59a2d3940dbab7b3e8254a5b9bf06cc5330301"; + footprints.sha256 = "0jlz0ln9vzj1av1fmw8ma8kfqlb8w0r9vrfng19bkc3cgh9lvh9x"; + packages3d.rev = "8a2c5c4c85457832f3320902456d066d29561806"; + packages3d.sha256 = "0dmssyhqd94d9wj8w7g7xjan560b2rwcs540sgl0rc77cw2jify8"; }; }; }; From 906d7ed4b3268fd05975116291add4a3747f0471 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 06:31:19 +0000 Subject: [PATCH 129/222] firefox-beta-bin-unwrapped: 115.0b8 -> 115.0b9 --- .../browsers/firefox-bin/beta_sources.nix | 810 +++++++++--------- 1 file changed, 405 insertions(+), 405 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 3b38f6453192..8ee15b2550b1 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1015 +1,1015 @@ { - version = "115.0b8"; + version = "115.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ach/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ach/firefox-115.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "5218f39a816bc70d5cda9e47730fd9624dbb5b6c70fe81d3600de2729b9c7e5b"; + sha256 = "510c76793bc36d8df382a8f0af18c4c08940259aa1819102602a9f6d7d223153"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/af/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/af/firefox-115.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "1e7bcd7b5fe2ea6814c2fc8d478d8c20909cbacb5f4cc7218653847a7b56e7c7"; + sha256 = "d309ee88ae4e260ab0e49ced5e514e9f1575fd6bf7c23d6787128cfd2df9860f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/an/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/an/firefox-115.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "ac9f32cfbd76fe13edb8ad55a34deb4262f5b4e25df4f0ececd7af03d0870507"; + sha256 = "4c84386e819b7531d506edbee04668758f9701a3374fe1ab3cf6ba64efd3f834"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ar/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ar/firefox-115.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "10834e2a62cae38f20a554d06cf9782cd5f6f847ac83efaeb64438f2a7b9b559"; + sha256 = "b7d8b602cba3e9f3ca2b58b84ee43755c89c66d4336dd3e5bf06ef18fc494e18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ast/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ast/firefox-115.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "079a6b68944dd93113da56bf16c65bc9e4ff00bfd747e4b33e27ea00e279bcbf"; + sha256 = "0d54094f7996c1b3ecbe0046718d3ee03a818f432545b4836cac5e4cfebb5095"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/az/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/az/firefox-115.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "db39e7ddfb8119579b1af3abcbb67ca6b0364d095ecda1e7b15936abe87dff5e"; + sha256 = "2e01043bf5f89fdb8ca43a1f0bcd3c737ccf21ae17b28020d60e2156d88c98df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/be/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/be/firefox-115.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "dadb2b044a3d8f11ccda4dbe09f55c3c7f90bdd34b85115daa6686688b2a6e10"; + sha256 = "7564ef95654c4beaf8e4a772eef65538cf00c2906215588d18b0893e0ec12a5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/bg/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/bg/firefox-115.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a1ca8185e2dec8096160d9db81973ec6919588f476eb1aa1d07f16434b0c0ca7"; + sha256 = "cb2fdd4b8193a75f933c6810a4abb610f6344e4b25658c19171c6dd160026d19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/bn/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/bn/firefox-115.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "ac03fde65f7e8e8d55308c6fe7312d3f551a41276cd2cfd613f1674542ae6802"; + sha256 = "bb4e3a1640427e5ab21fe2ae9378f1bcb7a1a4898bbb89ee902cd0a36d079e3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/br/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/br/firefox-115.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "7f7a55aa0c4d44bbe61c3c57e6fa644a5d4d7ec2d676ed177749c79497994858"; + sha256 = "938fb36dc4b82a6d989b1e055a7f1f19dc47c781b8885ba3fc4aee31d7f6bb0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/bs/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/bs/firefox-115.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "7dc82fa9e8a9c6701ea0e1d0f7b181b5828e27722bc6b57790eb1b99bb410327"; + sha256 = "99936dfb34432cdb6bfb6e5b357fc8e06c97a869d0077561b4d661b04fbe47ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ca-valencia/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ca-valencia/firefox-115.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "10d4fe9426020123f2b3a14522b1da29a9981baadc4962d38b0b324ecaf652f1"; + sha256 = "71dc8ae27e2277def4fa9f771ceb39dfd6bf45cacc54b6b1b18938da32731d34"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ca/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ca/firefox-115.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "c9a9a7526f7e54024dc8c5db48f5d16936bdf407925404035e6427963f925276"; + sha256 = "fd811dcee02116e5848432e279ef3fce33326352484281a0301a61e4e8cd46a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/cak/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/cak/firefox-115.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "97fad3f91397eb41512872bbc35a6b17da85d9f57ffdde5c98eed745b1d1e5ad"; + sha256 = "0dd33ee8252d9623ee4b1a950b9664891b008c117a7b2c2a7b9f8b752f1260e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/cs/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/cs/firefox-115.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d8f689a0915ca1312c7c1d85d111a9407fa71cf0d0fb369453b222040b32035e"; + sha256 = "0eb6ce175ba0e0776a8932f879290b21af9de00e40837059ea69d9821331b823"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/cy/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/cy/firefox-115.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "3f18face4365b093a37d7ab1e907ff0c762daf66f874d91f7409ce78e2b333da"; + sha256 = "11635483423a3afeb0720fd32351bb846ca1d53cb26171ed3c2a0e022ecd9356"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/da/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/da/firefox-115.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "f77603241459bce33255b3fe8115d749f9aed30c75e68b9862a761100db5ba2f"; + sha256 = "887212ac489a9102c6490867da2a918b5eb1276be92077dcb71101f421ef722c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/de/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/de/firefox-115.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c7983001bf77c81797a47a4847aa444c58e8db69bf9ca9c32936032fdf805862"; + sha256 = "865eff55d05a25f395a57e76b2f52d70aa4d89f15c5269854eb888eda8fbd62c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/dsb/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/dsb/firefox-115.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "abb1aa32cbda4130e4eabb0290ade7ef67a7289d3992527d1a88632137b140ca"; + sha256 = "2b51fbdb7e3b5449dd02f0fe8977d72a6266c1f21d989b4a07dbb0b30e3c505e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/el/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/el/firefox-115.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "19e3ef5e68733e63f7789808028551b1a51bfb2173d41544201b37bfb1ed2706"; + sha256 = "254f1c5219947b5b1dd3d978fc54bf0ca51a1476dacb4f49625300b821581159"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/en-CA/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/en-CA/firefox-115.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "cca7517fb25863dc02e49b8110f8b2e111eebd23ccc4c7b37704680e032be235"; + sha256 = "93f1d4676f59ffa3bdca9dd7c5bf6657a2f92100d77a306dbb66dc86c0aa4f69"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/en-GB/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/en-GB/firefox-115.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "02252d16f0ab03ea622be23beae4740685de4d39e96b9ae3c9cf58bdb32ef0b3"; + sha256 = "2122d930b0035cb62c933a677fd9d05b4d5ad9dc3fba2fb0263a6ce8c3caa4ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/en-US/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/en-US/firefox-115.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "bc2be8356e5de57d35a1845e1958471d7447a9a9dd7cf2e696bc6cd6ad892676"; + sha256 = "e207d3e22575e751bc3673dafbf28fb6dcbfe0bc4bc48d1c1d9f9618ab34c444"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/eo/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/eo/firefox-115.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "ae47850759edf0dcbde8813fa002cfa8d464a01a2159b995908797f17eebc05f"; + sha256 = "bc9da843dbbe2487ef51e5b6511070499cdfb908572aead33bf63b47ffabac8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/es-AR/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/es-AR/firefox-115.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "6e77411fcd5b422c6699860b0dd2b613862ffd6ac0e30f0694c3c276769002cd"; + sha256 = "f988f81e2b216bd8123a59c3ce43437e243350c96969944f829a64fecc3b2729"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/es-CL/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/es-CL/firefox-115.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "1784a6a54262b352982b3e87cde7a3f5455551ac684fc0d6d9503c51eeb54520"; + sha256 = "1ef7bdb51868e6a128242925bebde9a0566e1eb6e4face624035327b5c0ca3a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/es-ES/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/es-ES/firefox-115.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "ad395b7aa1bcfe0025cf81ebf9967bb76438cb4e7dba1431c063217fc8120497"; + sha256 = "b4daa1c03b1882f2b4c817b12aea2de9a9dc1bc84f72ee409471fdbc0cce13ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/es-MX/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/es-MX/firefox-115.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "6083493916a86df43d9bbfd3ea3244331301800566934e28e522f5de0f1a9a3a"; + sha256 = "d48255dc81b6a766fa8de04b102b1c7fd723f465da56788dbbd66e6286f852d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/et/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/et/firefox-115.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "958059a7ef3d958d9485d058b01d4de1c418e860bcf4aeb239162b4a08f11cae"; + sha256 = "4cdff72ef2db769ff62effd2db70dd7c4caf96b66652897829676af630d013c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/eu/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/eu/firefox-115.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9bd3effdfc3e13baa86542ebd30b9a5448d71b8029199a1a35fc5a0de55a28b3"; + sha256 = "229fa58e82c2d6c38c736a75071184fd84e4d7524ce908adcd8b7f9c3f5cf33b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/fa/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/fa/firefox-115.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "4e94192b6fa29cc7f80fedbb4868ef49f21cdcdfbd69ed0e6762afb3d7a69c9a"; + sha256 = "c3b975defd6ab9e86f94504a729371f5f8aab64abc9d41b7b52655a575884c34"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ff/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ff/firefox-115.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "84714949d622b0c8701949cb77b4b7fe98849cb7cac7b957c9c6a08fcda4ba46"; + sha256 = "f0ff5664eb9c22e1a6db2b07c349138e006f85ce6dfc24213bdbc765ea5d361b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/fi/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/fi/firefox-115.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "ba2c4edb825fc640ea066994ce9b85fd6eb170a105085602b2a54a4bd15491e8"; + sha256 = "724211055dd4441f7130338deb9de03248f5266e862f04764c1648607f6b7412"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/fr/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/fr/firefox-115.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "89e65a5b890f45551e4667f853c891da68b5253a6ff4c54b8dea89cbc58042a0"; + sha256 = "013b84b7d5a3e8ae74fa44fc0487fc5ad65ca90b3503be940931dc64e22ccee5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/fur/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/fur/firefox-115.0b9.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "d709cbb2ea2e84b4e9dd4016e6faffa98c1de6db539339b5ae346eff6d591414"; + sha256 = "021e54b51173006771770f04f043ffb2447d83fe6cff1cd2fc527eadcfe291d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/fy-NL/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/fy-NL/firefox-115.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "8c4c2ef29dc15d68f5d750c70cb7a7757bab3ef0338b16f5dd774a2f9de3eabb"; + sha256 = "0b1c6a8e9a581a64bc50bda4318205266cbd8a7f30208a5c8dcc1a63b9941c3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ga-IE/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ga-IE/firefox-115.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "a6b2a3b3c0bd808148a5563a97a8b62478db6c519513f3b7330c84baf3932a7f"; + sha256 = "e50733b3a3ec8482cbc47f4a85eb9e067a7d1f93ce7909363c2ce523077874ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/gd/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/gd/firefox-115.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "d9569775b5f682c1492adc090dec29a8c2d804c49bbfef2e3428515985c996a4"; + sha256 = "2e0f4e001840118aa4044a343e0291c3f07283595c3bd0fcf1abdb1ef32f123b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/gl/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/gl/firefox-115.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "98696213c9e984c941501d2b1d4adead0bd4bb1666ecfc124967e352d3804b1e"; + sha256 = "2a988f42a301ce8699d715b49c6574e8bb47f9f4cfd5419a3cb5a03f7e3c07a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/gn/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/gn/firefox-115.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "9da425698912493587d1d9b5d094014b9620b6b33f6582df9da24acc9315e793"; + sha256 = "a12d9f73389ad687ac9e7c17ec572c369b483ee1df2ee7f09ea46360dfc4ad96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/gu-IN/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/gu-IN/firefox-115.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "56863b608e2fbe69399adf32e8d1cc8ed6c3a2b44b69475794b53726c0cf69c8"; + sha256 = "54218cf85a03d6b8eb8c9c6eac75e96815bf46f8c406780c2f2bab618d7f8064"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/he/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/he/firefox-115.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "273d5d6a6c5faec6686bdc044d2af8390c24c23d224d4c37b0e1847e41342439"; + sha256 = "b5746ff8b172b268e503c5345a8afe3657e0d3ee904aa45ee02dba9de383596d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/hi-IN/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/hi-IN/firefox-115.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "04e82b782645f3712bfe4d350d415f5d1a2e2fa3af9b5cf5f1f69308fdc9b47c"; + sha256 = "a5e3ee70ae23b1d3e932c41f1a410755ebc48ae388f6bd2f66ce7aa914f6b8b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/hr/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/hr/firefox-115.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "db9f7c31edc42a95a459fcab6ad4a278be75626884f0cd4e47c5a5c64bd218c4"; + sha256 = "e799da2942788d4d89974924688b6562e1bd33d38df8c8281d695e2d515f0dff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/hsb/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/hsb/firefox-115.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "461d383a4cffffbaa66fa50e7d64dfe28472d018098a02e2dcc502cc15212d17"; + sha256 = "ce94f06cd38b893d3e1f12a663b5eced1068d55a59e918b714671c09a8a2f5eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/hu/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/hu/firefox-115.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "35ad61fb256932b35f72de6274ca5c44cac25e4c6b8bc69630656b546c4b5d41"; + sha256 = "a6560e40f1b6d9b7688f6a3cb46d3fb89ea4caf6855d536e30446e4ad43bd7b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/hy-AM/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/hy-AM/firefox-115.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "31472f1d72b5f7d494a69fdfd272650479204f99e5b1fc8f0f863dfed1236e48"; + sha256 = "0b25cb4ca76044b81a2e9c2564be72ee244de126cec012ff6762d1b02955bd0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ia/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ia/firefox-115.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "9404f25a53da6c57ad1298a8e7af636ee609185c552ce9066c65fbf4bc8be5a2"; + sha256 = "af2efecd656af79cf5600281da953322dab739ed0fdefa85024a1e34952bf3b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/id/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/id/firefox-115.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "2fb644ba66192b2d211ab11b3ec4486802789d06edbbc33789139ed8a83101a1"; + sha256 = "9cc94c6c4ddeb15ddae68e36a08844df207ec164d65590f119f50c028baf64e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/is/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/is/firefox-115.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "88f1ccbf9d93dce8d85db406b5c7c3891693f974a4495cb8e4da6dd53b792f99"; + sha256 = "11f8e460d4385cc284d507c0304a4aa003001384074352cdd46c302044c11853"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/it/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/it/firefox-115.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "4954e95d0cd70e87e85c09b8ecbb4606becf8809ebe7cd475065414980ae55d1"; + sha256 = "04d8d31ea6a58f195155e46022c8b5a002c89b438ec5e5e4f9fcea3bb6a51b99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ja/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ja/firefox-115.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9a39e5d68c6a6548a8005a71c5d39439a4380c2fa1838c12955d57012823221c"; + sha256 = "281f906e03320873580048185659382999927d8bdd0fb25fedfe858c61c3db04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ka/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ka/firefox-115.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "cd3c7bd68c776f1476f505967e7a8d0491f2af173154949c718945753248bc5e"; + sha256 = "64df2ccdace25c417a6c72e2b1273280946efc2e4da0aed9abb50b927b925476"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/kab/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/kab/firefox-115.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "ccb975001b51a62560b7bac5ed38fb446b1190e8223fc4170c1770d4e31556d3"; + sha256 = "c38afdfb91754fda548a0d14d7d423d753a43e6c0667e455c24e37ac617d9b5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/kk/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/kk/firefox-115.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a018f928d3f83e535b072b5067845a3ac138fc379247f5967cc7db72b3692bff"; + sha256 = "886bc256f69d330d739c06e7f6e21a005c99a05626121c20d88e3904892b4784"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/km/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/km/firefox-115.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "d63f343cc789d2d9c0589c74ceb23773b279bcf90438f670e4ad5c2f9e0f83e4"; + sha256 = "7e718260b6037375c8f13b13cd98a94145a6337918999a615b6b0baf15faab75"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/kn/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/kn/firefox-115.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "53c55003e6a49332f453fd867d27649307706b2db882a01db0dfbf577596a8fb"; + sha256 = "b11fc444ee04da9f0323903ad290b4faa17dd0e555f6043e42dfd5dca5bc9d66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ko/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ko/firefox-115.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "2f477d7056ea4efc469ccae2196d21cbcae750d41e468cae025f8f9b31729733"; + sha256 = "30f047d0b1f5a259cca3d5c0da55e9f0301e881e3646a9ef1f8c9e6ba4611759"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/lij/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/lij/firefox-115.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "bd72d8f4d923c87adca352a7926bf4d18b597a306707ad3f895d04846e878573"; + sha256 = "d1ccda576621d5e5496887fc81a52eece883d6ceb1da3e86cbc08eecd743d944"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/lt/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/lt/firefox-115.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "0268452510dae461d69c5351a3909c468bc8d52ac73df2c962901f80f410ca79"; + sha256 = "0b47f9e1042d7b03d2a7f67567cb06baaabc61661b3232709be1eac850ffc26f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/lv/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/lv/firefox-115.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "65f3eca8ffaf799ca10dc0abcf8ff3fd007e16853eba0a4fc916d0035e60878c"; + sha256 = "362171044617b5c18a746ad7cb8932fbb5eebf6d4b29327774bab62a1453e1ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/mk/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/mk/firefox-115.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "2da7fa9c7df122803e72c0ff6d96a98681f46582f4d4d0bc6f1591292ed3c321"; + sha256 = "001fb0ebbb91be97a6940982a17b4937dda84ef15b2db4f4aa4f76b2b75ba60f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/mr/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/mr/firefox-115.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "bd949a77b78d77b67499c7afc54d4fb682d5bfae01043633e94a91e15a6b25c6"; + sha256 = "2d8519cd26d9b067e20aaec275700794f7c196e55e21dd419ba3833e384adfb8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ms/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ms/firefox-115.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "e491714c0e4f08f190c35ccd4c1bef0d55a1779e29915a898505f2f0718836e0"; + sha256 = "1bb82e11900d45866b81ad0345dcedf8fb12c6370747eb4694f2a76516444f73"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/my/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/my/firefox-115.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "93ae853aedf21e52b27eb9413a62781c7300ca55c9b287d0224e6df056f9ceb6"; + sha256 = "a0203ef28be4e770395d5466668f502fca6332caa81d7b57baa2e0bd7c841ac2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/nb-NO/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/nb-NO/firefox-115.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "eb21c122ac36c626889f95447556de7b07b4ae0be27a5f5e187a64b48d66b48a"; + sha256 = "b8699bfed61b299a655bd2b7fa8c71484cf0a06326406dc3e4cf958ddc88ba28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ne-NP/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ne-NP/firefox-115.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d9c3cc59b863c8ba1029e50a2cdf5b11d62f1bcc7864fd22c73ae50cdee5e48f"; + sha256 = "badf63a6c1aef23b5b776b059775e25eb166a2892ae4bc46c9c170485d8a458e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/nl/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/nl/firefox-115.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "5e191c63eef8293355f30a5f8ed98dd80cb1fb2622b21e28a7cac54dfe86b425"; + sha256 = "8ddcbf51ecd7426245f42289b1f22dae7b35dffc4af27fef711423832e83e4d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/nn-NO/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/nn-NO/firefox-115.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "104b574ab47fc8108cc5e0708f0b19ef19a5aa133d3695b388b0762d32c7ea18"; + sha256 = "48316a6189cfe7745fc1a6246447c4e2cb043e7ef19aa214d134894324737c6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/oc/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/oc/firefox-115.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "3121f137967c6230237ccc0015372a30dc8667577fb4bac15e51641950f91a02"; + sha256 = "30a57142bbd92442531c9458f0c46ab5e7da8afb8b488425c96d66a5d24e7fb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/pa-IN/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/pa-IN/firefox-115.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "3ec47470f58c4555244d2415e39d167c165934a3a61e5a1605986117bed05b2e"; + sha256 = "f2b20ce4dff272d938634fc17c7df45df0bc57b6dd0be2ecb84ff6f2bc6ad7a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/pl/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/pl/firefox-115.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "6263e7303dcb419eb48739c68018065814023c7f69cb2828938afffcb73b5ff1"; + sha256 = "7fd392d14e9c9f003bbc7113cbfbbbfa1668cde70c930e91d725746c27fb0159"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/pt-BR/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/pt-BR/firefox-115.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "5d31e7e035f3410c74249e99f182fbd48b516a6f0b0f5e801237ee04c663d5a6"; + sha256 = "97b8f3f42fd6b86562237024f4b8ca0887b5025a97b326157ef25e2e8ed44747"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/pt-PT/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/pt-PT/firefox-115.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "0553c68b3d9ef8d05ee6240697ba0ee939c08c699d8106a3019ea35e04dccf75"; + sha256 = "92dc0dea289ff67d9461b0bc144ba3ab69ff8a53609e35d6864704fc97a9dcad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/rm/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/rm/firefox-115.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "ca667c5b7ea4cffa78b48c8087cff0da2f3e3ad094ec606a0bcd85fcbe9d52ba"; + sha256 = "ea5bd1af9073ee6157c5e1ac6bedf2185faa6700032fb80e8dc217e1a006d612"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ro/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ro/firefox-115.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "73f0ff9d8cf83992d9819b48d43a7431c10f47f08e750313ebd5d6ac879b3a36"; + sha256 = "83dd209fb7862dce738c9c57ac4eee73d03b0553ed5e3cae44dcfdb209c78b0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ru/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ru/firefox-115.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "99c658dadb4e8ff94694b4b5824047f488f29850809af6760a7022a0e67e9758"; + sha256 = "300402491d66ecb83f20aa0d45066fd440d11926a6d688cc6732a1722f4e7aed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/sc/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/sc/firefox-115.0b9.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "b057fb2562da1493ea13ba6a18e8fe0e1dc7a4466341a36348ef04b277386cd3"; + sha256 = "96d1a9550bc2c98a9cf74e9097e8d6536b6e7d0713e083c0f1339e7ae7fb9b51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/sco/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/sco/firefox-115.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "abc3ad99bfc2a40919745f0550ee0d6f1e71286f17e6a4c31aa7fc7aaead1a54"; + sha256 = "0cd13100a5384846b09059eb4a4c6977e709f71dfd2789db6de9511726c1fcd4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/si/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/si/firefox-115.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3d14376ca041a1e0528db648dbc83da232c7830e99de5799d43f9ae51bbfde60"; + sha256 = "8205250360fc7d7c952f5d422f04e84da930594919d090d2b8a3d74a3dc0e461"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/sk/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/sk/firefox-115.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "241b2e775d6466da543951641e66990d99737df2b09e4d527725744e87cc80ff"; + sha256 = "450bc0610267bcd4fd12c263db9fbc4684f3984a43a8e2d15f65fdb2cb6e72ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/sl/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/sl/firefox-115.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "d0aac04718a3f29a8ad2bccfcf49f1b6f898dc86173f4dcf69724d2433c33f49"; + sha256 = "9e681239f37f1a88d8715f8ddc4301675878fb828fae2ff65d3458dba8c5f572"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/son/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/son/firefox-115.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "f968cd2b9b6a271aed7ba8f347aab8478477909dba5eb387b7d7073616f6e731"; + sha256 = "762907caed5c70c725c7f157c85b105b427a935c8b099119ca368226b5147ee2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/sq/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/sq/firefox-115.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "25c5d36bf4e8bc717b8c5fac2bedd4011b8974b3d8952997330622e591dc8cd9"; + sha256 = "f56e65aafc7fb2b15d0632005f11bef731cf88e60a1a82868eca6059e59d2716"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/sr/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/sr/firefox-115.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b307e4ccf0a9f7797b21def9d0279aceae7104d46c07b7e81ddce8f5c89a94ef"; + sha256 = "406a9bf48624eef95d9dab857e2d9c5185915eda767996b20069036df5af1105"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/sv-SE/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/sv-SE/firefox-115.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "04b52ddcb02a5f5500a0a6c4322db9d210727784b6f2cf3da26a7e5017a36fe7"; + sha256 = "7668d056d4ffb1aaaa5783dcc2321722338d3ec57099f6cb5065f43809f1597e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/szl/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/szl/firefox-115.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "74ea01abac6b0550604c91d76d03142fe5611cafe64f24e0979c72c5878d0dbb"; + sha256 = "8e56e2f2d5b0366ba0e8caf4d7edb01fc83b2bb3d663bdb4bc11bcc2e2ed84e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ta/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ta/firefox-115.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "447a8f1f40e7eab3ec014cef64d516b5db5e73a5f69f53e0a001df4dcb30724b"; + sha256 = "90619ccdd43c61477ed1e0c3e9f43ce27c4700d8b0fd534e9c714292407f97e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/te/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/te/firefox-115.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "e218a8a0da72b26b22404a4ba34329e9b4b7a4c338d57ed7db08b37ab12c9d26"; + sha256 = "9bb98a9e77b6f94c8c61259a0ecc43b6876eb06f05a661b771d4de5986a37eb6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/tg/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/tg/firefox-115.0b9.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "178f6d80f3fc8c763e9400aadd1c142ccd629c4249dbd0926b917ada7195d701"; + sha256 = "909f8ab90e8d19b7a8dce751fdbc21ef5f2333c7dd7813fdc689dbfa77c34d01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/th/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/th/firefox-115.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "c7bbd086020bd27032f3b645293a0879b8759bd478c0ba649e9cc60dee056010"; + sha256 = "964de2659c7ec8f6c6b2eca42400206723edb3b4e02a0d7b351e1be8d4a045c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/tl/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/tl/firefox-115.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "d9b495b4dd1e2d1bf7d1ac00c07d1c142f4c2a81710178e2e8dc5ff9c4abbb5e"; + sha256 = "6436016bb3676f4558f02a6ccaa70801215af7d20dc0bfd917075445c6f51eef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/tr/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/tr/firefox-115.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "6d338a95e9b7c8706e748c52ac0e097544a44a8ba6e6104fa0e710ff2fbec22d"; + sha256 = "a96beb0a18ff58df5cf340235360d4d58369369dde209e1474df4c88776857b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/trs/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/trs/firefox-115.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "18ea82d8681567099b990bcb8ce87ece0264ea17df2ed7462af2ac21312a73dc"; + sha256 = "9b509f7e44bffce61f994cede3c24343f5da9a9e478c6b79230e5ec11835c099"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/uk/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/uk/firefox-115.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "bd856ce14b3d24f78dd4be87b46bf487300eb2cf66ec1eaac39b91ab063b33bb"; + sha256 = "983377725d245cf7895ca2868ebe8d532d052a0ab5ca7a63599d81bc4b0c66c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/ur/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/ur/firefox-115.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "883c96474995710fc5f3aa165a7348e6f09f2ca0414e205cfca8eff56587144a"; + sha256 = "45cd596fd0be05d268d584546f49f5ed2c4ebb6e17d48011caf0291ce81e91da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/uz/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/uz/firefox-115.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e5f6e41d526747dc718d4ee2714a3a1857d81bbef36cf64d707fd7da13c61ed0"; + sha256 = "b41f3b8f4da96579ea0551ee5cb2c45871a07853bde0da29b6d214d4465373f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/vi/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/vi/firefox-115.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "08a1c5219d7722fa6ee10d89c2c9e3c70c2014b01856de8d8bb4c698ae30ba07"; + sha256 = "2b56996f03e10ebc414372a1180787a1a302f85dade5d2750548e47a0ab964b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/xh/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/xh/firefox-115.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "efe8e8499aa6036f79cee845d09fa7e9c5a529aad67ad53f3c1fa318c70074f5"; + sha256 = "6c4a64b74797d6d50074cacf37506d8b9bccfb17a0c26520132ef2d8db966ed0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/zh-CN/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/zh-CN/firefox-115.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "2b371e83a44269be4006865492a1df27db2da88796d5da4ffe91cc48517309b9"; + sha256 = "06d151e9612f3f785409e62a46b258d8f8ae6200b0abdb632197064370f839c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-x86_64/zh-TW/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-x86_64/zh-TW/firefox-115.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "8a2251374f62baca6f1cfb210bf76ea096f43559f239bf71a666e5cb9f77a779"; + sha256 = "9dd3a69cd54c8fae7e9fa1538be536443d912f93dc18233d690e5b9a3cebd0a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ach/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ach/firefox-115.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "912e8210e72ee276ffa7aab17f981fd3c1d2c1c72300060e10bb4548d7c9a54f"; + sha256 = "7722ac464c3a109414a9db5e45e27dc48d3b0c2dc2f5bfb9aa8af5a23b400883"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/af/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/af/firefox-115.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "06f2fef6fd2d028f3a72a703065569ce39731007f6600438df34135e87d3a849"; + sha256 = "a067ac1b3a7e03515a6a1043522162988954d7257a0be0b7c11e0df07d402cf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/an/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/an/firefox-115.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "6c6f34a20cbae54090971ae627ff751dd7a2e3f913bbd95b52302b33116e72e6"; + sha256 = "ccd10ad9319defcffe5b9ac11d08f91eb09dfbaac2a51f8dff951d534e6497d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ar/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ar/firefox-115.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8b17600b7212f79f66cfce4df60e69b7a0dba63160e7f1091f243433a7c0dafc"; + sha256 = "1c1bed4d23b2afe00db68d4e33c9eae371ddc3a4656a22d29161991989998786"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ast/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ast/firefox-115.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "88577b257fdab1855fd32fd4751a437baa0846b03722a724d36d7296c76c5bc1"; + sha256 = "dbb95d10fa7ad9c98a830caa0452881daa369194e0a646867d480dbce199af5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/az/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/az/firefox-115.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "e70144994a3eb7578f2fb0e91f06e3a7ed269bc5c3e1067b6ca33076c5f27378"; + sha256 = "50c503375cf5783e160b900ec00782d678b682da4980adaaf82f82b68f5330ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/be/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/be/firefox-115.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "7e8cf378d00b02c415a9d8dd87547eaf3311d9d6b6142745e265e123f2218c11"; + sha256 = "8aab4f89253fd926ebcc4605110664c27ea4bf562dbafa92124adf98eae19542"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/bg/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/bg/firefox-115.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "45ba90bb16676286eb5c0c37ba229fdd63736d30099824584e424ed3c4c6be35"; + sha256 = "39db3d06b1dec62bf2503c10e8289593d98cc3b56741934d6320b29c0737121b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/bn/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/bn/firefox-115.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "8cefd7b582ecd90931e4ed70a5bffd9259efe6228e65f7f879569e4c2d8e6bf9"; + sha256 = "6b528105de01a31dfaf51f945295d7698429b9db99298048cca9ac4ed63fad0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/br/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/br/firefox-115.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "4a389c8e7f491902f4b814506d2da6f83493c8384ec8fe37ac65e0efd2adefdd"; + sha256 = "5d4a8e305c1fccb1808b4ea22bc7e30f580a202b3a0e391abc9e931683ea4b93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/bs/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/bs/firefox-115.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "ccba7e7d0908a435faba77cc853ba18f7abdc7a92466d1cf7cd43ba8a746ff8d"; + sha256 = "b7bba5fead8c37e48ca6b38faebb190926b701a890073e845d3e9c7564593d5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ca-valencia/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ca-valencia/firefox-115.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "a6b929b9e26dab0c64c002972df58af1b4eeeff9aceb39789011a1b94038bf24"; + sha256 = "27c67153425a0a6e9bc4c0a0c1b9d63f4f9abef735d750afa6e6e3b712a84bc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ca/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ca/firefox-115.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1ae9aba5e57d00b82bd87fae6e1e2e7e654333e5af4ae79f600bbe4ff207b423"; + sha256 = "d04428f7a3e598a38a591f82e162783c2259b372a010152496ea389e069b5b2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/cak/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/cak/firefox-115.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ae53077dc1de10ccb243ebded6525d1314512a5a41c5e21b8b96fdff97a97a1b"; + sha256 = "8dfe10b60459d922d79b68c85a38246f79293f3a2b597aa29284b6d2e91dd714"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/cs/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/cs/firefox-115.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9f481e5f422bf949f7e1688a151f437aa86d52e0f1c6e7f693f014748b93a30c"; + sha256 = "fbf24c6e55a508b113ea5a2c5afa7966c60a1dd990fad342125c3171d6fb0ec6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/cy/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/cy/firefox-115.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "a8f6b4a8aa68c10065f626649de91744c248abacaa51425ae03758c203f43cff"; + sha256 = "53f10227655886cdd19cc234560d6083679dc8d04b990ab3ff02b4a464e3a0cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/da/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/da/firefox-115.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "9bbdd1468566f4236642296adefdf9a7dec70f03b6759e3c4100bd0adcb08bc5"; + sha256 = "6b4bd530b17aaee820781d34febc737a510e1f72da97293deadc21a5423a3a8a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/de/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/de/firefox-115.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "ad45da6a79e2439d5377164d46240fbc47e59b0fada69b75a4b530069c8d9e7b"; + sha256 = "2dc250bd99f22c9a264064285c8a3c7f1c536bf279f042db66a1971a8ad6c50f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/dsb/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/dsb/firefox-115.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "4c6bb523b5a3d5979450e86c413fbea2e6141f200446126570e22aa762a0433d"; + sha256 = "2467a6542b0e3fb50a17d0419a78b296746c09853fc24bc43713de06642895f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/el/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/el/firefox-115.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "2920d10832aabae104d11a10c54b8f546f2614f071ea6a37b003ff306fd6bde2"; + sha256 = "cabdf1031e5577686653eda4d1559e16e86ab362362a4b4e6c15fb28b7fa166f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/en-CA/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/en-CA/firefox-115.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "1ac84ef25c7a0487b37a6095cab33ef2ff853932545b351e0935f65c7f7ad787"; + sha256 = "097294f731940254df9ac3d3220de2ed0edfb9f6c2cc425ac739d09635d4b4da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/en-GB/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/en-GB/firefox-115.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "af3c2759a32df48f52da31f251042770e106e94ba02eb1951e845a99473f6618"; + sha256 = "69f7e3d8f86757a959dd3929720fd9f9590d84a6c6f061a4f2cf0fd93d20d475"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/en-US/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/en-US/firefox-115.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "ee325ff65b41db10c45213803e481c26e46a3df3018c531ddb26ff9b4d02f049"; + sha256 = "17db82454acfec85214cca759d9c761e3ef420231432e302e3f7446da5ec2b29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/eo/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/eo/firefox-115.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "096db377e774cdd27ce257b27ffadc58fa2913db091fc4c12df53a33c5a4fcd9"; + sha256 = "eff8278e62532b0166531523b5953c249b625446d5156f3abf8b804d2557fee9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/es-AR/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/es-AR/firefox-115.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "bb5060b01de60aab8f9b69b6091fc7e4153a4aac95a6666153a4ee9d622ce1f4"; + sha256 = "1de91577eafe53799aaf87fc2eaaa19eca4fa688d14b9290031148f6feb0b9e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/es-CL/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/es-CL/firefox-115.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "2741659dc8c9263d039ede68a5e19cab4af5e01cdce900fbd99129bcb8efec68"; + sha256 = "77ea0f579513d0314d99e190f177b017a4b6c861e0f24cc91ddf692b638ada22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/es-ES/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/es-ES/firefox-115.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6ea62b9d5233c457c4be231e8a2034e63e5c6680553f561472507581e2e20671"; + sha256 = "11e40a497bf2f99f6df8e8be9e011ea7ea2d8be289fc5885d4c30afce455799a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/es-MX/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/es-MX/firefox-115.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "5637277a79874e03b72ab2f1644c9d1bf0d6474b533acba9094ea10b8e3f84a9"; + sha256 = "6a9e29e8f7b933f66613d9a83cb4a6bfe92f031983b1f665bef2cc54cef789b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/et/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/et/firefox-115.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "dcdaccd8d8b50dd63f1922819ab9b50bff1a207fc5366ffb4d8362b6c7bca947"; + sha256 = "7a16617856e9fab69f5426ce34bb09a1f451e65880e29536f4d85726acd36ab7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/eu/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/eu/firefox-115.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "72fdb437fe2d363619729f0565badd305cae9f7befbec1b4f266d7854f6427de"; + sha256 = "9936194cc21015cc7d5f2cf4dd10e885e2da4686f00b8d0076116c8887b3cd06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/fa/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/fa/firefox-115.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "94aae89ad93869e7d4742376aed5996ff9ac508463bd8f061a67e127356166db"; + sha256 = "eeb32967d113cb3e78a054696b797938b11cb0ff0d6323f1da1c2b324a4cb586"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ff/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ff/firefox-115.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "d26404527545523f57b04c742d21c98155bba43df1968b71652645d2c9163e70"; + sha256 = "55ec4ec797f4c7d9549c5100d4f009f938eab4ff32b399d69f6157df9dd166e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/fi/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/fi/firefox-115.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "3f8c1bbca77425359b900ebb92beadbd7160fd38741828ea39da96d2ee3eb595"; + sha256 = "0a925a1c766e83e2525af187541c68b591b7acbfe43b4360f2643a14def28d4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/fr/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/fr/firefox-115.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "c69b85e321f1753619a858f10d9ffa4f6557d63d8fb9350a812461c299c4a3ea"; + sha256 = "6557e2a0e109dd35b04796c9990fd1c29f6aa85bc2f60cefef57f09761569eed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/fur/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/fur/firefox-115.0b9.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "208ddbccc5aed6797a809dd242d453274ec74b228320c2edb1bf3baf2ea834f8"; + sha256 = "e58a3c293ffa9bfcb644fce70f50e25429c0bf26570d80e87cb3bb6716650ba8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/fy-NL/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/fy-NL/firefox-115.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "41fc48ab953002e9b0d2a44d757986a363c55a71f1f6f92b36843b7bf1c21a15"; + sha256 = "6d565ea3f34c1949127f8f5639898ace824e9770ad60925fe5105869a35e5b8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ga-IE/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ga-IE/firefox-115.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "bccb7dc9f320f8b44cc9c813b814cd7638170bc7bc335800c2660cf00c449c8f"; + sha256 = "8c7b9c4753552f0ac775bd7ada03994ac1c5557453b895a5a1d26ab402b7716a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/gd/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/gd/firefox-115.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "ee784a5861fa982bc6cf31637057538e5bda8bf4abbd52be458b20cf02e75a61"; + sha256 = "dc2a89aebd56ea7d151fb832250efe95e22e704f3931d23cddd23f146602d362"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/gl/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/gl/firefox-115.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "88b5b97857dc4f16d4f23c9dbcd86cc3e17021c7a8449eeed2c9869c1cc9d261"; + sha256 = "f4ef58ce543b53e97e3158595dcb3c88a7af5382d89cf7bb2975c7f1c0bc39c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/gn/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/gn/firefox-115.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "b38bbed9abfb8df4653927d3ad58c692901ef9413282ae59224635650a19516f"; + sha256 = "fd62f025e8ec2e7ac4b71dd51007c3c3adb64781c369e7a8ee62d3a37bc06e83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/gu-IN/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/gu-IN/firefox-115.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "1202b258becdabbea0ca57a456122c071effe7c05be2a048e045395978063aae"; + sha256 = "677e98156c04b463b0f45ea2590c6e49a4b71716261387ac3200a9fce4f2c2d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/he/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/he/firefox-115.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "1d8efc42103a40ee7d514cb165240995bf113f03e995a2474cb7b56d256d5fe2"; + sha256 = "d6d10cf37dbb2b5ab6ff95fd7bef33282059ddb448670a9536b8cdae780520ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/hi-IN/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/hi-IN/firefox-115.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "fc8890468f1a19ee44df530a1376806bd497b6ce35636e852f1c1d0e9ac88d5a"; + sha256 = "b8de70bea44f1f9a8a6fa4f609a795ae2503c58552f0e4b9f482d621e66cb4b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/hr/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/hr/firefox-115.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "2849e55ef74224c3639edaa87b1f9214f8adc0d6942e5b55caf931abd98b3754"; + sha256 = "16bfe2c924e205551096080c2b4785f0a307cc3d0d4fb12a792772e4c1bb1a22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/hsb/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/hsb/firefox-115.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "48672621573497fd9a0be4a5086a4e30c6e238f4bea8eab8e360bc60084ab093"; + sha256 = "6cff433f997635ed5e8ce14ae2cda6a39ab45a7a4fdc4ea261907505449a1989"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/hu/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/hu/firefox-115.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "5efb83adea75696e035fbf3be9d0bf310ef3e8100031e9ff6329c05544142055"; + sha256 = "72ac45d36a3b43189b1ae04e82e04ae73bd8a772433e63bcebf1d746596b2673"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/hy-AM/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/hy-AM/firefox-115.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "6e61559dd20d8ca976f1c63dbd21fe073cd80fde65e8142e50ace6086255c01a"; + sha256 = "ab785aad82d941fe2e1ed1a930e91abb45cce0330f5b624a055d875ddc392d08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ia/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ia/firefox-115.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "fd6516c0edea53b991b68ee158c445764f6489f548f6d33a73fd9a7720c8d2a9"; + sha256 = "27cb55425ab751de1ccee6a6ba54935924e94a43af41019d8346f0cd0d2f7da2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/id/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/id/firefox-115.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "3befedce1e6cd41b24c79e9e0398572f0969860da3791f9dd9a94a04e2601e32"; + sha256 = "ce45f0f804ff3e4d098717f64984c85d9dbd1b1c1e7a7586acef49dac3d518d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/is/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/is/firefox-115.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "42574c5df80341a5d3abc508353fd0e8db83a83894bece6b5b586f522453c1a1"; + sha256 = "10931d71e00e8aef3c935b9bd4fe4bbcfabb2da06c5475cc4de0b99692514c94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/it/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/it/firefox-115.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "7eac77bce8b30a4e625da76f97dfadb2e8b7b71709623c9c2306df77bfc43617"; + sha256 = "0fd72ebe149ea12087de008c8174ddfc494d807c76832dce37e730f5c1b42d20"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ja/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ja/firefox-115.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "4cb695164988059c15e7a03166c1a05dfda72a43cdd706d7195c941b7dc17348"; + sha256 = "4370fefb17abada9810488454b92e59689d4b6df48c93456e0582344d7bcb03a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ka/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ka/firefox-115.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "b10a638aecf2d5e17ebe215816d6d72d769dd0f9efde8ccb99433dd9f77744bd"; + sha256 = "b76bd07cb25809092e9672a81f9fc62a2500ef53ea5c0c2f22ecd226064b26fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/kab/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/kab/firefox-115.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "3f73682d43aae67da6d2d6694fa7fe8b8d2874f47c6087a54ef664beec0ea584"; + sha256 = "605f1907345993befcf1d94fe2158790f7bf0f35db525d6bc5ddd555d89ef39f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/kk/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/kk/firefox-115.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b6d8959ad67b1d84623965f79b869467c49407eeb2abe7a39daddc5c3b3b5616"; + sha256 = "bceaae13d0f321061daf923548abefe0abf1c75059a8725424398b79ad8ac770"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/km/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/km/firefox-115.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "51a3894aaf80f373ffc51457d4daa46970bfd040c730c75f5df90740717889df"; + sha256 = "5d7e4181ab301d85c8a3c5cb8d3ff27a86e9a82a7782c6f4bf6faf32fce7662e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/kn/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/kn/firefox-115.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "22bb00502cc9b04dbda4376f2bfe53a9f25458781bd31048a14308d91ab4953f"; + sha256 = "2def39f486a757d95bb54f779a756dd5142b432e71c4aaafc97605b6ebcef8a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ko/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ko/firefox-115.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "5e38c4f800c1bb1042574d0456a752a0c4a3dc7fb27fa8f74c019716aa956006"; + sha256 = "dfec63d1cd518f9e067909d0b9d80f0f97b774396fa044bf8e443856377232bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/lij/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/lij/firefox-115.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "028a502005d17c346e5ad64466607cb7cbb4bb4933f4f61eea38919b9177181e"; + sha256 = "368e9948aae98152596e109d63836bd2ef5b4cd1144a91663b92d173029af6f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/lt/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/lt/firefox-115.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a2521a166aca824527c2c06811d980225c06dd55f831effbe9e6a712428c2863"; + sha256 = "39dd5826c8fd53fd23af84782af368f4b494a87419a4e622a9f558a0d639b062"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/lv/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/lv/firefox-115.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "a70f53d574576c3a93da5d3aec338cdaad3ee40d762fb9bd29fbd951b42bccbc"; + sha256 = "6ee8ccb7652a2221719b65d6a27de6797e54b99df7c93c6ac8f7537d85968bcc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/mk/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/mk/firefox-115.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "b559f4abf411bd0c8024298fd10d6b0a4e31e3801da1de6160fb9bdc96849492"; + sha256 = "760bf6c31bdff54a26c3b04e798dd7be1c35fc17bfdb2adc9532d3de0e63bcd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/mr/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/mr/firefox-115.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "c92283b76a80e2476cae2af6ac5bc93a6d2102cada5cb99bb4bd24400cf8f951"; + sha256 = "58b987b2182c39a2c8786de1080f45ed897f29cb3442c55e177a0bfdd623983f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ms/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ms/firefox-115.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "4beef1291807d759307a9b39ed8985ee1b39e4b8b2a3f17f3faa1d790839f92f"; + sha256 = "a405ab09b58352670392103712020b247298a0ecfafdc3049fcc37a1b12237a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/my/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/my/firefox-115.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "19b8a0f11498ef60c5115677de97ef2b78e55b136820d6882418f8ac97ae13cf"; + sha256 = "874d23b8ed0fe45441d5a17d4b041e1f19eedc686ee31544c1d6abc92a8bc98b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/nb-NO/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/nb-NO/firefox-115.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "38963288c7563a27a4a2729c212c7cbe055226d2b03f8b4b2a7da79ba2dd0555"; + sha256 = "7aef0b2dfbfca92308a2dd75ee7ae0eebd32375bcf081bafc82bf04bd5e3d649"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ne-NP/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ne-NP/firefox-115.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "9ff9e0d20e43a8d27b9f85e3c710f2beda6465887077c1fb3dc8452262bc123e"; + sha256 = "484155c2b720a002e4d233859b479ad19ffd0556045efe5165770f7031288482"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/nl/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/nl/firefox-115.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "16f72c5b6db127bba5c0bba8d9314f208be1fc118a5982552f91e8916592419d"; + sha256 = "e74cf0b47ed061432f1fc2d54b0a4a3365da267f37361df7d450021af39cfc61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/nn-NO/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/nn-NO/firefox-115.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d70f25b11337e8485e74b378be19406a7d1844d60fc0e5edab3900bcaf69cc3c"; + sha256 = "67e0a825063322cd402c31485aa6e46d52bc6ae9e4f999776c9ff1650f4d08f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/oc/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/oc/firefox-115.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "86e6f8c62e90786378e1f002abd2af113515c4b5e45609c57ec239ba349dff88"; + sha256 = "77d7493f127a1718b2efac7cc58a45912604acec5481644c071f91360dcca57b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/pa-IN/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/pa-IN/firefox-115.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "34d2d818dce3eb74ee42cc50d96ea15c652657c51eedba67740b1bb64370a395"; + sha256 = "02102b595b7de144bf4101b24f7bcfdb9a7f9ceb90a01652e9972d65159dd985"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/pl/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/pl/firefox-115.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "295a4f0be56a7b87f47a92d67d0524a33fd60a98d860d46e4aef73ad92ddd0cf"; + sha256 = "a3fc16a77a37014f801efdb56f8030964a2aeee932020e7a852c20bb895f6647"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/pt-BR/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/pt-BR/firefox-115.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "c6da3529022e479fa30067f80edcb6a127b66689d6282f0c09443acf33265a9e"; + sha256 = "24a60e67589f724df002658b306538b610c1d09a74e644c7ce1acd8ccf952dca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/pt-PT/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/pt-PT/firefox-115.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "0ee3028e7c57e102b8d13d4acfb95b72b070eadb379eedb4bb743699f3ac0ae7"; + sha256 = "b8cd9a6198d25d8bcb6bc3266c71ab20c881900eb4783461a5f074cef8ec89df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/rm/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/rm/firefox-115.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "bbd67d9ef8b657ee680ab48be22746002c92fcd5aaa2a9d637ad4c7757171fff"; + sha256 = "6db4c382bf0d02bf174d078b48d6fc45d1d5162c07f906a8a61a537c06febca1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ro/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ro/firefox-115.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "6243f69769f7fc5c2d86065e69e87177a75a7d9d07bcaabdb6d9c49bf88d0283"; + sha256 = "8c99332857eaf3bc6876a0d652cbe8d96694c83a05760392b5fcd2d0280143c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ru/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ru/firefox-115.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "47d540a887741acde1c74bbd271ae45a7d9ed0e4cb46275276b7612c45e1cf34"; + sha256 = "5306607ff7dfa8eceaa1d06b7d6282d94fcd9077ed6dfb39b7b02f8813af179f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/sc/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/sc/firefox-115.0b9.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "140b0a5c92c5fb6de6235916b2aa84ab9c66475fb32141d4c1d649b28958904e"; + sha256 = "1f687368b037addf4639a04b9c6f7eb0ae90c4713d85a50e287342cd27b5bacd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/sco/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/sco/firefox-115.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "62377577d794ab8e3f4ac671c7622042afbba3674bcb07850a2f30538e930f9d"; + sha256 = "97ac52ac1f64e70ac3bdb1b0b1ef7839e115c69d1550d9f8ef8ba6816f11c8ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/si/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/si/firefox-115.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "da46df03a1232b67567d5741e4aedf98697714b3cd6f171519ed1395408f83bf"; + sha256 = "5012c1e79135ba1e37f874ec8a535ed99cecad60683bc90331bbb9f84fb32954"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/sk/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/sk/firefox-115.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "72e74ffd861735a16bb7840929504e3f1a2d2ee9ed2edef83cadcdcc0180a099"; + sha256 = "bbe539f00d92194fe1938d8afe65964eb3428958ccb2c3c4ec5319d2d336418b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/sl/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/sl/firefox-115.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "cd611fbd993acbac46efc0f7710bee6fb566101178d6914d6a998a56b25cd047"; + sha256 = "e112eeb8265bfe7b5e92acc62c76ed492734fb9c512b6c88e93a085df1dc8f90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/son/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/son/firefox-115.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "fd247c0e13dd43dcf9658445c65083941c8aa37fb6097fc0ecee163e535bd7fa"; + sha256 = "ef40ffe48a85e287483de5f63dbcffcbceb303f80b9e71c68b968b5a02f42ea2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/sq/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/sq/firefox-115.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "10f5c5b2a2fc31c69cec844ec6c7634126520009503472e3710ea5f38542229f"; + sha256 = "8fdae3ecebbe1a99a79c091fe674006c40e699d9d9ad909ea679b07079f0f4dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/sr/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/sr/firefox-115.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "a320b3895216ca73772e4b52da55245f9497b834477e0e1e0810677104397ed2"; + sha256 = "905a8cd0d18c0bb50740e2bde8cbe7f0fca74c3eae139f64f8304a6a18eab32e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/sv-SE/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/sv-SE/firefox-115.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "0e92caf09540d9a945590272f8f8c677770792e3213057d8927f44c8f7f117b7"; + sha256 = "c4eabcdabbc90ac4d2e4c817ed64e8f76c00340a6f3aab4ef0a377ee8d0eb178"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/szl/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/szl/firefox-115.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "c21717a1c340f07921001689d5db5c520d07541460004a15836c1456e69a0c5a"; + sha256 = "5f4adc17000b0754b6d29c2012fbe6281ca24077bf884a764ab4aa0bb4a6b911"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ta/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ta/firefox-115.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "6bbf15db3a8e3b4f844a7b59e215f23f9b6425b5a6e6ed2604075a8a479ade59"; + sha256 = "e33e4cb9dc2c1e7036e247798504b0064245abbf336b9291937901e8f5a92639"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/te/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/te/firefox-115.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "1160695b6fde13d5eb60505aaf920290795eac9a4575baa0e3c5006b60d0902c"; + sha256 = "efbb1607d09ec5bba1a77ad543a8fcec96daee18cd7c75be3fc907983b8315a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/tg/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/tg/firefox-115.0b9.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "f5f04dbef2d71b70417960557aeac3d46a71955966e8f7dc650e3c312ac1f7f0"; + sha256 = "591078a67be8c13572923aec1b48dc3dd7978a038d9a45a8e8b36180a546e561"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/th/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/th/firefox-115.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "7523ea3d3bbd0bbd9e0857774d768804dfd004a420ba18928b2b12d03861fcee"; + sha256 = "c959ab62cf318521093b66fb167775c017a9a9a057a04d59e0b84aee32b31e0c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/tl/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/tl/firefox-115.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "8cc3cd85654c21cb62c42f15ca18a3949722dbd45fd7f7d65991279c8597add3"; + sha256 = "0c7cc3fda95fecfa29ac6f640b8746797ca1d2ef32c7aa44404a4c26268788d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/tr/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/tr/firefox-115.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "43c6e7e5ea41de0f30250183bca3adfb9e0207a9fd57d7bfa4c140d351611eea"; + sha256 = "b2bfc1fa44d87a211ec38ee0a16a2fb3d31b0a95ba45ca6057e2ca6522a8620e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/trs/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/trs/firefox-115.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "901ebc9489c7912f598d9ae8fa8d1e73b8e96106450df5751493aa45cb2b7971"; + sha256 = "c9e69ac635f2a5a655e61d14e658a22b009f957c4e08d8632b52708d99af4110"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/uk/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/uk/firefox-115.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "5c120c049301b55859a286e2755010245b0ca48069bb0fa0eddd27cc915428ba"; + sha256 = "3e9794df9538f560d92cae0ff6a536da14c7f067ef33484ab00f7638112fccd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/ur/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/ur/firefox-115.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "9fd2c59f2f648c31413161bcc0beec67f6ca325a677f751f8e1988ae9c5ff1a7"; + sha256 = "d9a7a64afca9c623730b416f63ebc4607cf262bb6640717a116c472274ff3d5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/uz/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/uz/firefox-115.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "661274e960bb50528176bff2fa2b526a39a0fdd6532b40c2427c5c9e38997b8b"; + sha256 = "5954217fe9f2ea3752ac6bd3784165b865b4b3161300629fe9e5aaa67d0e23cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/vi/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/vi/firefox-115.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b7a6b252f3e34643596f9af2f3bf1c8024a522a6f67af03bc4203406debeca5e"; + sha256 = "81566a919d6211924db850532f72913ce7136c895be6fb4b8af92508096fb116"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/xh/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/xh/firefox-115.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "e8e581b06d7641c4be4807ef8290b2e797462418c07e9f16343b358a1a16dd5c"; + sha256 = "74e649574f50c64ac448c6dc1836effa353c87f1c22077fe6c76e1fd74d48f10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/zh-CN/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/zh-CN/firefox-115.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "8f36fadd4902114d44af1d57f6ed2b7556feac20e0cee029eb0d587e1266d6e6"; + sha256 = "b8cd03bc3301d089d0bf5b1021f6aa7409661907843bfece8f75803b52d491be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b8/linux-i686/zh-TW/firefox-115.0b8.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/115.0b9/linux-i686/zh-TW/firefox-115.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "37f1e59cb09272bda6b167847f20bab394bfc589ca3ea17ae39ade6985b82ed5"; + sha256 = "8a1a1f739ccc28226ad4e038847d063cf3b7139554f87640bf35055bd58490d8"; } ]; } From 022350093894c7d3eff4db1ee3673c34abbd1309 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Tue, 27 Jun 2023 08:43:10 +0200 Subject: [PATCH 130/222] ocamlPackages.duff: fix tarball hash --- pkgs/development/ocaml-modules/duff/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/duff/default.nix b/pkgs/development/ocaml-modules/duff/default.nix index 99261a5b324e..21e916b55e23 100644 --- a/pkgs/development/ocaml-modules/duff/default.nix +++ b/pkgs/development/ocaml-modules/duff/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/duff/releases/download/v${version}/duff-${version}.tbz"; - sha256 = "sha256-0eqpfPWNOHYjkcjXRnZUTUFF0/L9E+TNoOqKCETN5hI="; + sha256 = "sha256-+UU89Ko7aFDv6MxvE/BT6+XyER+vF3zqv7sD5dmtbt4="; }; propagatedBuildInputs = [ fmt ]; From 09d07ca9248c59a9f6ba5c71db10b3890541e762 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 06:58:45 +0000 Subject: [PATCH 131/222] antidote: 1.8.8 -> 1.8.9 --- pkgs/shells/zsh/antidote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/antidote/default.nix b/pkgs/shells/zsh/antidote/default.nix index 12dc89af8fe6..3f77d3ca7803 100644 --- a/pkgs/shells/zsh/antidote/default.nix +++ b/pkgs/shells/zsh/antidote/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation (finalAttrs: { - version = "1.8.8"; + version = "1.8.9"; pname = "antidote"; src = fetchFromGitHub { owner = "mattmc3"; repo = "antidote"; rev = "v${finalAttrs.version}"; - hash = "sha256-UliND3WZkaXWIxWnSINPLylSK+iXyflhwf/JTjwp/wg="; + hash = "sha256-grKbMYPEo/OygTTLm+igGtHJpHWSELVQFRO9HxijHUY="; }; dontPatch = true; From d8cbb74a4eb239a874ba01c75c57e84f73a88b6d Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Sun, 15 Jan 2023 00:10:44 +0100 Subject: [PATCH 132/222] maintainers: add michaelshmitty --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 47d418ba77bc..af7506953f98 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10585,6 +10585,12 @@ githubId = 1699466; name = "Michael Peyton Jones"; }; + michaelshmitty = { + name = "Michael Smith"; + email = "shmitty@protonmail.com"; + github = "michaelshmitty"; + githubId = 114845; + }; michalrus = { email = "m@michalrus.com"; github = "michalrus"; From 7387d919eca09dae3debbb6021cb1235630de44b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 27 Jun 2023 10:37:31 +0300 Subject: [PATCH 133/222] sequoia-sq: Update cargoHash after pname update (#237698) --- pkgs/tools/security/sequoia-sq/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/sequoia-sq/default.nix b/pkgs/tools/security/sequoia-sq/default.nix index 4da70b5155bf..fbb5ff956a4d 100644 --- a/pkgs/tools/security/sequoia-sq/default.nix +++ b/pkgs/tools/security/sequoia-sq/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-uFcmuyz0JsUTvKqCb+3t8JdB4Dn4hJq00jeEhvMNW18="; }; - cargoHash = "sha256-9UQojec2jy9DVwQQplaKuPWYCeRXtWtdzj1d/LLyfJQ="; + cargoHash = "sha256-PWqwTGodQ7LBTgHFB2AWX5wIOVJja2GzPoocX59Dr/0="; nativeBuildInputs = [ pkg-config From d49662f718083f0904d51d45a72c8ebf045b3be3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jun 2023 09:43:39 +0200 Subject: [PATCH 134/222] metasploit: 6.3.21 -> 6.3.22 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 50 +++++++++--------- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 58 ++++++++++----------- 4 files changed, 57 insertions(+), 57 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 3e33c11117b6..06b3bc9d7755 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.21" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.22" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index fb6e882106b8..d7dc2c9d28eb 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: e4402b8b4ae8dfabcbb185c59200c3ae86c0cd6c - ref: refs/tags/6.3.21 + revision: b32d454d51c2a114658ee8b8f8ce571869e0b91e + ref: refs/tags/6.3.22 specs: - metasploit-framework (6.3.21) + metasploit-framework (6.3.22) actionpack (~> 7.0) activerecord (~> 7.0) activesupport (~> 7.0) @@ -34,7 +34,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.141) + metasploit-payloads (= 2.0.143) metasploit_data_models metasploit_payloads-mettle (= 1.0.20) mqtt @@ -102,25 +102,25 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (7.0.5) - actionview (= 7.0.5) - activesupport (= 7.0.5) + actionpack (7.0.5.1) + actionview (= 7.0.5.1) + activesupport (= 7.0.5.1) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.5) - activesupport (= 7.0.5) + actionview (7.0.5.1) + activesupport (= 7.0.5.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.5) - activesupport (= 7.0.5) - activerecord (7.0.5) - activemodel (= 7.0.5) - activesupport (= 7.0.5) - activesupport (7.0.5) + activemodel (7.0.5.1) + activesupport (= 7.0.5.1) + activerecord (7.0.5.1) + activemodel (= 7.0.5.1) + activesupport (= 7.0.5.1) + activesupport (7.0.5.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -131,16 +131,16 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.780.0) + aws-partitions (1.781.0) aws-sdk-core (3.175.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.384.0) + aws-sdk-ec2 (1.386.0) aws-sdk-core (~> 3, >= 3.174.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.81.0) + aws-sdk-iam (1.82.0) aws-sdk-core (~> 3, >= 3.174.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.67.0) @@ -155,7 +155,7 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) - bcrypt (3.1.18) + bcrypt (3.1.19) bcrypt_pbkdf (1.1.0) bindata (2.4.15) bootsnap (1.16.0) @@ -184,7 +184,7 @@ GEM eventmachine (1.2.7) faker (3.2.0) i18n (>= 1.8.11, < 2) - faraday (2.7.6) + faraday (2.7.7) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) @@ -245,7 +245,7 @@ GEM activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) - metasploit-payloads (2.0.141) + metasploit-payloads (2.0.143) metasploit_data_models (6.0.2) activerecord (~> 7.0) activesupport (~> 7.0) @@ -311,9 +311,9 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.5) - actionpack (= 7.0.5) - activesupport (= 7.0.5) + railties (7.0.5.1) + actionpack (= 7.0.5.1) + activesupport (= 7.0.5.1) method_source rake (>= 12.2) thor (~> 1.0) @@ -409,7 +409,7 @@ GEM rack (>= 1, < 3) thor (1.2.2) tilt (2.2.0) - timeout (0.3.2) + timeout (0.4.0) ttfunk (1.7.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 14e40b4aa728..6977e2a67b6d 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.21"; + version = "6.3.22"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-LtgskXFvBoF+I1t3eOXHcLlZjBIq0Rfgs20+QJxl4EM="; + sha256 = "sha256-9G6SXmQrQMvq56JBfCV3OH7X9cLXgEmQWtTehAybU8k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 65a248c1f14d..b5c0f8657dad 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w717izq6k7wl2j6zn4516kg2iwg3zgdzja6b6gpk6y5nccr04hw"; + sha256 = "003y7cdxwzdqx8hgw02kf1b5mp8qr8syx07f35sk3ghhqxp39ksy"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.5.1"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z0xvdal339w7jvk7a5py0c1q5xh588vqrilgxizkvzm3hwf48a2"; + sha256 = "11ihpqcvz3f38ka85zdjkdcvgdbcan81dbr0y9bi784jn1v5ggwa"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.5.1"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cjbk1xl6jl2d6sczpxnr8da7zbmshmrghqhqdcwqqzl6chcy2si"; + sha256 = "12f89hxs4s26ggsg4bnz9qxlcsclcgx9gdsl8dni5jc0gk47h14y"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.5.1"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04x0bz3051linhmi52cfg31nsm4sgg27m7wp9p0cxrxdwc7q0bjl"; + sha256 = "1sfdq2slmsc0ygncl36dq1lmjww1y3b42izrnn62cyisiag28796"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.5.1"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7k5i6531z5il4q1jnbrv7x7zcl3bgnxp5fzl71rzigk6zn53ym"; + sha256 = "0m1sa6djlm9cz6mz3lcbqqahvm6qj75dmq3phpn2ysyxnlz2hr0c"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.5.1"; }; addressable = { groups = ["default"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0plbj6d69j3vi8zwg9q8hkr77b7p7kg8bfqpvv9ghv2zay3igp3v"; + sha256 = "1y9ghr029lf5kbci9xylhqqjfphfx5ds8g1n72x90r9qdzn1wr1z"; type = "gem"; }; - version = "1.780.0"; + version = "1.781.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,20 +124,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0smq6m3xgh81snmckai835ashg1f6p5qq0l6mmwqqg5cgppgi81r"; + sha256 = "1fn9b7asb7rrvcjj9iid3q8q4gd27k2hkiyiiijbjzf76lkm74rs"; type = "gem"; }; - version = "1.384.0"; + version = "1.386.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bqz348kdcfwm4pz79d0rfwn4qaf75icrp8nkiilgnl16zwc2l6b"; + sha256 = "0v13fcm4214js2gy2iwws4zri2dbj1ipkmql8iwy8sa093g59bh8"; type = "gem"; }; - version = "1.81.0"; + version = "1.82.0"; }; aws-sdk-kms = { groups = ["default"]; @@ -184,10 +184,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "048z3fvcknqx7ikkhrcrykxlqmf9bzc7l0y5h1cnvrc9n2qf0k8m"; + sha256 = "14crcsmcsyiskr9xzgzcfz2dr74zg1jvavrrxpf5vnn9q75fakz9"; type = "gem"; }; - version = "3.1.18"; + version = "3.1.19"; }; bcrypt_pbkdf = { groups = ["default"]; @@ -374,10 +374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08rxibzssqv14sgdfh45pdm26nbk54xp84vb5pb1mlyalszz1mc3"; + sha256 = "1ai4cxnymjp7c2xqbfksks82aah0pbyjsl3r2cgc4iimrw2wg8qy"; type = "gem"; }; - version = "2.7.6"; + version = "2.7.7"; }; faraday-net_http = { groups = ["default"]; @@ -634,12 +634,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "e4402b8b4ae8dfabcbb185c59200c3ae86c0cd6c"; - sha256 = "0hz0cnf40gkdngh1gl9a2a65kfbhqzjphxsv4dz821kgf68jrn1f"; + rev = "b32d454d51c2a114658ee8b8f8ce571869e0b91e"; + sha256 = "1jakkc689pnlba84k06pqbsxfziqfwjpqhd2wzmcnh1bcig94vpl"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.21"; + version = "6.3.22"; }; metasploit-model = { groups = ["default"]; @@ -656,10 +656,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cva2kaj000gq3039ignp8wn36lq9b8znrwk98iwg8p4xc0vqa78"; + sha256 = "0y72am25xqa8fip3i1ann6xyap3aik745fl1qfcjix7faakmka8c"; type = "gem"; }; - version = "2.0.141"; + version = "2.0.143"; }; metasploit_data_models = { groups = ["default"]; @@ -1027,10 +1027,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kn3cx00jnb7bjnh1k2q0dxk0r7nl1a0krgyk5ykxw1wcac81wyw"; + sha256 = "1z4lqqbd4i5izsg97mx5yf3gj7y5d07wgvad0jzjghjg12pf142i"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.5.1"; }; rake = { groups = ["default"]; @@ -1458,10 +1458,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; + sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; type = "gem"; }; - version = "0.3.2"; + version = "0.4.0"; }; ttfunk = { groups = ["default"]; From 72c67f4c4f85910d5428ede669e160d95afa3c54 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jun 2023 09:47:16 +0200 Subject: [PATCH 135/222] checkov: 2.3.301 -> 2.3.303 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.3.301...2.3.303 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.3.303 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index c29eaa703ffe..189ba4f8dd17 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.301"; + version = "2.3.303"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-jhyMQZGy9iNbT5M+gp0/oB4Ke3nX3cCX4N8cgRXkbeY="; + hash = "sha256-h9O9hYAQX2CqSwEWs3gWDOOisfWa3taDmSjxSw44Kt4="; }; patches = [ From 51769dee1cd4d924893c2994342093e8b4931c62 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Jun 2023 08:18:50 +0200 Subject: [PATCH 136/222] trufflehog: 3.40.0 -> 3.41.0 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.40.0...v3.41.0 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.41.0 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index fedad019590f..12209fcc361c 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.40.0"; + version = "3.41.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-gPHvkqpNPcOBDN7eNTPrpWhTrhmCRj03gz0bLFKNxAs="; + hash = "sha256-2gbzIMvCzuntue/haYNGtGZMEoQQJg2pxZmoC+KzTDU="; }; - vendorHash = "sha256-bgptNmWChJkz8KaxSCDUDOsQ+Tel5WoIlzatDYgVQbE="; + vendorHash = "sha256-/+mvuicm87Kg3LpJzjuneraYuF+ohJVPQnMTM+4oHDY="; ldflags = [ "-s" From ce00d09031886670f715dcb7f37be8c31ef570cc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 27 Jun 2023 09:54:04 +0200 Subject: [PATCH 137/222] =?UTF-8?q?gajim:=201.7.3=20=E2=86=92=201.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pythonPackages.nbxmpp: 4.2.2 → 4.3.1 pythonPackages.omemo-dr: init at 1.0.0 --- .../instant-messengers/gajim/default.nix | 9 ++++---- .../python-modules/nbxmpp/default.nix | 4 ++-- .../python-modules/omemo-dr/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 4 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/python-modules/omemo-dr/default.nix diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index bc3269721b77..4fc1a9d352e8 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -15,18 +15,17 @@ , enableRST ? true, docutils , enableSpelling ? true, gspell , enableUPnP ? true, gupnp-igd -, enableOmemoPluginDependencies ? true , enableAppIndicator ? true, libappindicator-gtk3 , extraPythonPackages ? ps: [] }: python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.7.3"; + version = "1.8.0"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - hash = "sha256-t8yzWfdsY8pXye7Dn5hME0bOHgf+MzuyVY3hweXc0xg="; + hash = "sha256-EgH8mt0am2l9z4csGHH6rpLqTzFiBRzOPB4NCEP8TUM="; }; format = "pyproject"; @@ -53,9 +52,9 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools packaging gssapi + omemo-dr qrcode ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ] ++ lib.optional enableRST docutils - ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] ++ extraPythonPackages python3.pkgs; nativeCheckInputs = [ xvfb-run dbus ]; @@ -75,7 +74,7 @@ python3.pkgs.buildPythonApplication rec { ${python3.interpreter} -m unittest discover -s test/common -v ''; - # test are broken in 1.7.3 + # test are broken in 1.7.3, 1.8.0 doCheck = false; # necessary for wrapGAppsHook diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index bd8691857fa8..a6001ecd2f31 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "4.2.2"; + version = "4.3.1"; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = version; - hash = "sha256-ZTX8plcsO4zE7ruLtWIvsagQUvwPHuKdPKRwCrFwvgc="; + hash = "sha256-8Fh4sgQps6zUEN8o5ljrDIbRlbSZIMncbqh/qAnyOkw="; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/omemo-dr/default.nix b/pkgs/development/python-modules/omemo-dr/default.nix new file mode 100644 index 000000000000..39adbdc7cc3e --- /dev/null +++ b/pkgs/development/python-modules/omemo-dr/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, cryptography, protobuf }: + +buildPythonPackage rec { + pname = "omemo-dr"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-sP5QI+lHoXt0D7ftSqJGEg1vIdgZtYEulN/JVwUgvmE="; + }; + + propagatedBuildInputs = [ + cryptography + protobuf + ]; + + meta = { + description = "OMEMO Double Ratchet"; + license = lib.licenses.lgpl3; + homepage = "https://dev.gajim.org/gajim/omemo-dr/"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f0c88314eea..a0e29a847fa1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7061,6 +7061,8 @@ self: super: with self; { omegaconf = callPackage ../development/python-modules/omegaconf { }; + omemo-dr = callPackage ../development/python-modules/omemo-dr { }; + ome-zarr = callPackage ../development/python-modules/ome-zarr { }; omnikinverter = callPackage ../development/python-modules/omnikinverter { }; From 748e5887131b4f0549bbcb0bf883ffab508f6113 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jun 2023 09:55:29 +0200 Subject: [PATCH 138/222] trufflehog: 3.41.0 -> 3.41.1 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.41.0...v3.41.1 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.41.1 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 12209fcc361c..c9079518083d 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.41.0"; + version = "3.41.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-2gbzIMvCzuntue/haYNGtGZMEoQQJg2pxZmoC+KzTDU="; + hash = "sha256-U8GNGeBGqL4p35ogV07NZdOYgRVAMW5MMXje/s/zthM="; }; - vendorHash = "sha256-/+mvuicm87Kg3LpJzjuneraYuF+ohJVPQnMTM+4oHDY="; + vendorHash = "sha256-U0qYNJwJpyUwCycwhu1XY83xPKiQdwzc1YuN5JGQE08="; ldflags = [ "-s" From 09b98e7363524d36bfde3e7709068de1bda5725c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jun 2023 09:56:51 +0200 Subject: [PATCH 139/222] python311Packages.skodaconnect: 1.3.5 -> 1.3.6 Diff: https://github.com/lendy007/skodaconnect/compare/refs/tags/1.3.5...1.3.6 Changelog: https://github.com/lendy007/skodaconnect/releases/tag/1.3.6 --- pkgs/development/python-modules/skodaconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index e13bb2b57d80..759f568237a1 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.3.5"; + version = "1.3.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lendy007"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gLk+Dj2x2OHa6VIIoA7FesDKtg180MuCud2nYk9mYpM="; + hash = "sha256-gV/+mt6XxY1UcA1H8zM4pG1ugrDo0m876e3XG1yV32A="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 1c98e07b2b23130cdf48d00e33df18127b230438 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 27 Jun 2023 11:02:48 +0300 Subject: [PATCH 140/222] movit: refactor, add darwin support --- pkgs/development/libraries/movit/default.nix | 37 +++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index de69bd730d25..a8dd555cb9b9 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchurl, SDL2, eigen, libepoxy, fftw, gtest, pkg-config }: +{ lib +, stdenv +, fetchurl +, pkg-config +, SDL2 +, fftw +, gtest +, darwin +, eigen +, libepoxy +}: stdenv.mkDerivation rec { pname = "movit"; @@ -13,10 +23,27 @@ stdenv.mkDerivation rec { GTEST_DIR = "${gtest.src}/googletest"; - propagatedBuildInputs = [ eigen libepoxy ]; + nativeBuildInputs = [ + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL2 fftw gtest ]; + buildInputs = [ + SDL2 + fftw + gtest + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.OpenGL + darwin.libobjc + ]; + + propagatedBuildInputs = [ + eigen + libepoxy + ]; + + env = lib.optionalAttrs stdenv.isDarwin { + NIX_LDFLAGS = "-framework OpenGL"; + }; enableParallelBuilding = true; @@ -25,6 +52,6 @@ stdenv.mkDerivation rec { homepage = "https://movit.sesse.net"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 8295574499593828dd3ea0c8d1d951a40331ec30 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 26 Jun 2023 04:20:00 +0000 Subject: [PATCH 141/222] ocamlPackages.mldoc: 1.5.2 -> 1.5.6 Diff: https://github.com/logseq/mldoc/compare/v1.5.2...2a700b2e4797e47505f423fd47dc07372bd7b04e --- pkgs/development/ocaml-modules/mldoc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix index 7960042ff9cc..7a7e83d3c656 100644 --- a/pkgs/development/ocaml-modules/mldoc/default.nix +++ b/pkgs/development/ocaml-modules/mldoc/default.nix @@ -29,7 +29,7 @@ let in buildDunePackage rec { pname = "mldoc"; - version = "1.5.2"; + version = "1.5.6"; minimalOCamlVersion = "4.10"; @@ -38,8 +38,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "logseq"; repo = "mldoc"; - rev = "v${version}"; - hash = "sha256-FiBlgTTGL5TQkbhpkOCKtBgDDxDs4S88Ps+XAHcNsJ4="; + rev = "2a700b2e4797e47505f423fd47dc07372bd7b04e"; # version not tagged + hash = "sha256-OS06fb/Nz8grztFEVwWiqsQQt2PQjqcgQFxQuAEYC54="; }; buildInputs = [ From e52b401a955dc1a5b85cd9816c20d7c2025d1fad Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 27 Jun 2023 16:08:55 +0800 Subject: [PATCH 142/222] nixos/sing-box: set umask 0077 when generating configuration file --- nixos/modules/services/networking/sing-box.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/sing-box.nix b/nixos/modules/services/networking/sing-box.nix index d32725f77147..a884bcd271ec 100644 --- a/nixos/modules/services/networking/sing-box.nix +++ b/nixos/modules/services/networking/sing-box.nix @@ -56,6 +56,7 @@ in systemd.services.sing-box = { preStart = '' + umask 0077 mkdir -p /etc/sing-box ${utils.genJqSecretsReplacementSnippet cfg.settings "/etc/sing-box/config.json"} ''; From 922e0902c22793b59b3527f7cf787caf9871de78 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 27 Jun 2023 12:20:29 +0800 Subject: [PATCH 143/222] pantheon.switchboard-plug-applications: 6.0.1 -> 7.0.0 https://github.com/elementary/switchboard-plug-applications/releases/tag/7.0.0 --- .../apps/switchboard-plugs/applications/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 776e027cbfff..2f904768f66d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -7,6 +7,7 @@ , pkg-config , vala , libgee +, libhandy , granite , gtk3 , switchboard @@ -15,13 +16,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-applications"; - version = "6.0.1"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "18izmzhqp6x5ivha9yl8gyz9adyrsylw7w5p0cwm1bndgqbi7yh5"; + sha256 = "sha256-M9JMrxhMiDC/qrrnPaBm6Kf3CAkxrhGWwJF8jVm2G5c="; }; nativeBuildInputs = [ @@ -36,6 +37,7 @@ stdenv.mkDerivation rec { granite gtk3 libgee + libhandy switchboard ]; From feebb5e434b01d7ba39b57bf28098c996ecae1a4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 27 Jun 2023 16:33:58 +0800 Subject: [PATCH 144/222] pantheon.gala: Install systemd services They are not useful before we drop --builtin, though this should allow easier testing. --- pkgs/desktops/pantheon/desktop/gala/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 423dcd10f4ab..d9bec11e0da4 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -21,6 +21,7 @@ , gnome-settings-daemon , wrapGAppsHook , gexiv2 +, systemd }: stdenv.mkDerivation rec { @@ -63,12 +64,7 @@ stdenv.mkDerivation rec { libgee mesa # for libEGL mutter - ]; - - mesonFlags = [ - # TODO: enable this and remove --builtin flag from session-settings - # https://github.com/NixOS/nixpkgs/pull/140429 - "-Dsystemd=false" + systemd ]; postPatch = '' From ca58f7abc9f4bbe073cbe2c502090b441f9f9405 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Tue, 27 Jun 2023 11:36:01 +0300 Subject: [PATCH 145/222] teams: fix application icon path (#226903) --- .../networking/instant-messengers/teams/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index f572a4c3f002..1f21891c799e 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -102,6 +102,10 @@ let mv share/teams $out/opt/ mv share $out/share + mkdir -p $out/share/icons/hicolor/512x512/apps + mv $out/share/pixmaps/teams.png $out/share/icons/hicolor/512x512/apps + rmdir $out/share/pixmaps + substituteInPlace $out/share/applications/teams.desktop \ --replace /usr/bin/ "" From 858374d7e3a9ba17375f6f0de8eb27a436d17e13 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Tue, 27 Jun 2023 17:58:32 +0900 Subject: [PATCH 146/222] gnucash: 5.2 -> 5.3 --- pkgs/applications/office/gnucash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 504cd6d0b5c5..ae843bcf0f19 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation rec { pname = "gnucash"; - version = "5.2"; + version = "5.3"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-SCYXa35wu4ifmcIG+v+t2JJijXhSVxXp9xKOz0ixRoA="; + hash = "sha256-FFjLCMWF6unXJL7G8oErzAO76D7SlKRqeJeqqwGm8Vo="; }; nativeBuildInputs = [ From 74ff7795ceefa34f76568e6bffabd6f7ce6c8718 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 27 Jun 2023 12:11:08 +0300 Subject: [PATCH 147/222] libsForQt5.mlt: refactor, add darwin support --- pkgs/development/libraries/mlt/qt-5.nix | 84 +++++++++++++++---------- pkgs/top-level/qt5-packages.nix | 4 +- 2 files changed, 54 insertions(+), 34 deletions(-) diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index dce5f18c4fb6..60ec139d0c04 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -1,34 +1,41 @@ { config , lib +, stdenv , fetchFromGitHub , cmake -, SDL +, pkg-config +, which +, wrapQtAppsHook +, SDL2 , ffmpeg +, fftw , frei0r -, libjack2 , libdv +, libjack2 , libsamplerate , libvorbis , libxml2 , movit -, pkg-config -, sox +, opencv4 , qtbase , qtsvg -, fftw -, vid-stab -, opencv4 -, ladspa-sdk -, gitUpdater -, ladspaPlugins +, rtaudio , rubberband -, mkDerivation -, which +, sox +, vid-stab +, darwin , cudaSupport ? config.cudaSupport or false -, cudaPackages ? {} +, cudaPackages ? { } +, jackrackSupport ? stdenv.isLinux +, ladspa-sdk +, ladspaPlugins +, pythonSupport ? false +, python3 +, swig +, gitUpdater }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "mlt"; version = "7.16.0"; @@ -36,39 +43,47 @@ mkDerivation rec { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "sha256-Ed9CHaeJ8Rkrvfq/dZVOn/5lhHLH7B6A1Qf2xOQfWik="; + hash = "sha256-Ed9CHaeJ8Rkrvfq/dZVOn/5lhHLH7B6A1Qf2xOQfWik="; }; + nativeBuildInputs = [ + cmake + pkg-config + which + wrapQtAppsHook + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc + ] ++ lib.optionals pythonSupport [ + python3 + swig + ]; + buildInputs = [ - SDL + SDL2 ffmpeg + fftw frei0r - libjack2 libdv + libjack2 libsamplerate libvorbis libxml2 movit + opencv4 qtbase qtsvg + rtaudio + rubberband sox - fftw vid-stab - opencv4 + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Accelerate + ] ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart + ] ++ lib.optionals jackrackSupport [ ladspa-sdk ladspaPlugins - rubberband - ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_cudart - ]); - - nativeBuildInputs = [ - cmake - which - pkg-config - ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_nvcc - ]); + ]; outputs = [ "out" "dev" ]; @@ -76,10 +91,13 @@ mkDerivation rec { # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" "-DMOD_OPENCV=ON" + ] ++ lib.optionals pythonSupport [ + "-DSWIG_PYTHON=ON" ]; qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" + ] ++ lib.optionals jackrackSupport [ "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" ]; @@ -99,8 +117,8 @@ mkDerivation rec { meta = with lib; { description = "Open source multimedia framework, designed for television broadcasting"; homepage = "https://www.mltframework.org/"; - license = licenses.gpl3; + license = with licenses; [ lgpl21Plus gpl2Plus ]; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 6de840951521..48a8d6f39778 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -154,7 +154,9 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea maui-core = libsForQt5.callPackage ../development/libraries/maui-core { }; - mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { + stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; + }; phonon = callPackage ../development/libraries/phonon { }; From a1dcb05af666421731519e66ffeae7f183ecc7ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jun 2023 11:11:08 +0200 Subject: [PATCH 148/222] exploitdb: 2023-06-24 -> 2023-06-27 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-06-24...2023-06-27 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 63fe55331111..eada0ac190dd 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-06-24"; + version = "2023-06-27"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-uQQ/TPE+64VeUSbnzNlRBdG1Nv4QcsQvfLyoRH68OhA="; + hash = "sha256-2LPLVy43uHzvWruGCKOKh4pn9/RHIdhpYQnNwG9/+Sw="; }; nativeBuildInputs = [ From 55a1b0ceda33dfd6173dd732ebf21f129af0291a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 09:17:24 +0000 Subject: [PATCH 149/222] flyctl: 0.1.36 -> 0.1.40 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index b3611ae726dc..e75e29027150 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.1.36"; + version = "0.1.40"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-zB+zmOXkbITm+CFB1dg3ELlrN+VDNy3t56hzCyXp0YU="; + hash = "sha256-TqLxx69mnc6fN0TdhFsMjTbTBP9Asr0IFVCJlgnCB+U="; }; - vendorHash = "sha256-g4S0zHSNCaOl2kYwaR074KYSBChYWvZVfWBK/nHI9t8="; + vendorHash = "sha256-Ml+ODoJqRkOiqPqLltpxrMvkTFV+iSoCrdr4PuvkMCY="; subPackages = [ "." ]; From b551e5c6321a15b1b6ffd0688d5382caa1f1e7b7 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 27 Jun 2023 11:20:28 +0200 Subject: [PATCH 150/222] cosign: 2.1.0 -> 2.1.1 https://github.com/sigstore/cosign/releases/tag/v2.1.1 --- pkgs/tools/security/cosign/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index ace88ef0809e..f3e58b1e2a33 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -13,13 +13,13 @@ }: buildGoModule rec { pname = "cosign"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-fZIkRmQAnLTllA0UBOIlbYCfjvEQ9LTXymGJ480gtb0="; + hash = "sha256-5dRrq+mV2fDGTi2WZHlCP8+GH3cBJIE8AHGuch7hv/I="; }; buildInputs = @@ -28,7 +28,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorHash = "sha256-CYDhr9E8xg/mn8yUP6xy5gFl15tNEcUfGUTpmHyDGaY="; + vendorHash = "sha256-y9bUwyQMYw4m7JZ6RpTlcYZOiCoxaQRiWYKNmgzEXJA="; subPackages = [ "cmd/cosign" From e8bf646998283df89ab4ac41820aa360b80a314a Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 22 Jun 2023 05:53:22 +0000 Subject: [PATCH 151/222] gitlab: 16.0.5 -> 16.1.0 https://gitlab.com/gitlab-org/gitlab/-/blob/v16.1.0-ee/CHANGELOG.md --- .../version-management/gitlab/data.json | 16 +- .../gitlab/gitaly/default.nix | 6 +- .../gitlab/gitlab-pages/default.nix | 6 +- .../gitlab/gitlab-shell/default.nix | 6 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../gitlab/remove-hardcoded-locations.patch | 10 +- .../version-management/gitlab/rubyEnv/Gemfile | 56 ++-- .../gitlab/rubyEnv/Gemfile.lock | 173 ++++++------ .../gitlab/rubyEnv/gemset.nix | 250 +++++++++--------- 9 files changed, 276 insertions(+), 251 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 48a59f0c2cfe..488bf1218053 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "16.0.5", - "repo_hash": "sha256-hUEPJMdmR+p7nHWjdS+9SXcgm0LciPC9at+GP9UcUvI=", - "yarn_hash": "0yy04jnfvn5dgciqd105xiwg7chjwp3w6iqbjpylak9h82ci6wlh", + "version": "16.1.0", + "repo_hash": "sha256-sRel6okv2NYV4As3+AudqVvJ1/eLQGJGFvs+BA14wis=", + "yarn_hash": "1cqyf06810ls94nkys0l4p86ni902q32aqjp66m7j1x6ldh248al", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.0.5-ee", + "rev": "v16.1.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.0.5", - "GITLAB_PAGES_VERSION": "16.0.5", - "GITLAB_SHELL_VERSION": "14.20.0", - "GITLAB_WORKHORSE_VERSION": "16.0.5" + "GITALY_SERVER_VERSION": "16.1.0", + "GITLAB_PAGES_VERSION": "16.1.0", + "GITLAB_SHELL_VERSION": "14.23.0", + "GITLAB_WORKHORSE_VERSION": "16.1.0" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 2d44ed033000..38e8a72526f9 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -13,7 +13,7 @@ }: let - version = "16.0.5"; + version = "16.1.0"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -24,10 +24,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-YhqKMFDjjL2I82m51GdKNVO8vdJPppDKZDBQGskpyA4="; + sha256 = "sha256-+Fnj9fgQQtyGMWOL5NkNON/N9p6POjAtpF2O06iKh90="; }; - vendorSha256 = "sha256-KBhTI70eReZGSd7RxwGXcUGa0wDo7q5tU9fUhrLeFO0="; + vendorSha256 = "sha256-6oOFQGPwiMRQrESXsQsGzvWz9bCb0VTYIyyG/C2b3nA="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 64d8650a0b16..8d96d160f756 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.0.5"; + version = "16.1.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-bZwq8nG3QmPCgfuBUQW6LQdi7F1+n2JfzfU3oP+QCJw="; + sha256 = "sha256-vAprB+pDwpr2Wq4aM0wnHlNzUvc1ajasdORwT0LDTTY="; }; - vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo="; + vendorHash = "sha256-SN4r9hcTTQUr3miv2Cm7iBryyh7yG1xx9lCvq3vQwc0="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 5dcb6e88a15c..2d8e52ee66b1 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.20.0"; + version = "14.23.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-5rjrBt0AihSHMYOD6JbXGvvFaUbtYnMHX2Z4K+Svno0="; + sha256 = "sha256-nQJq9aPC5YtTbyiwtzKwDG95PnBr6XdNpSIJkfgvnzU="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-kKbTbOCuAGIbnFXTOZyoVRM5PIackbmND6PrryVvLTM="; + vendorSha256 = "sha256-JEWgOuWvtuaipF8fFTsFbB+sYfaHEYUl9Z8Q1XAuJuE="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 99fbe221d5d3..1f64e343056b 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.0.5"; + version = "16.1.0"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-B9YZkqAMYvTnnWx2tYEF0VZ/+9LZaWS5euQ9ZX2m49E="; + vendorSha256 = "sha256-lKl/V2fti0eqrEoeJNNwvJbZO7z7v+5HlES+dyxxcP4="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index e7d704237aed..1a468724e354 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -53,7 +53,7 @@ index d096174fca3a..02d0f689c523 100644 # Important: keep the satellites.path setting until GitLab 9.0 at # least. This setting is fed to 'rm -rf' in diff --git a/config/puma.rb.example b/config/puma.rb.example -index 9fc354a8fe8..2352ca9b58c 100644 +index 07a6f6a25015..14a718a43202 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -5,12 +5,8 @@ @@ -71,7 +71,7 @@ index 9fc354a8fe8..2352ca9b58c 100644 # Configure "min" to be the minimum number of threads to use to answer # requests and "max" the maximum. -@@ -31,12 +27,12 @@ queue_requests false +@@ -31,11 +27,11 @@ queue_requests false # Bind the server to "url". "tcp://", "unix://" and "ssl://" are the only # accepted protocols. @@ -81,14 +81,12 @@ index 9fc354a8fe8..2352ca9b58c 100644 workers 3 -require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events" --require_relative "/home/git/gitlab/lib/gitlab/cluster/puma_worker_killer_initializer" +require_relative ENV['GITLAB_PATH'] + "lib/gitlab/cluster/lifecycle_events" -+require_relative ENV['GITLAB_PATH'] + "lib/gitlab/cluster/puma_worker_killer_initializer" on_restart do # Signal application hooks that we're about to restart -@@ -80,7 +76,7 @@ if defined?(nakayoshi_fork) - end +@@ -74,7 +70,7 @@ worker_timeout 60 + wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f # Use json formatter -require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter" diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 10c4d6dc8d86..ef5a22d20140 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -25,7 +25,7 @@ gem 'responders', '~> 3.0' gem 'sprockets', '~> 3.7.0' -gem 'view_component', '~> 2.82.0' +gem 'view_component', '~> 3.2.0' # Supported DBs gem 'pg', '~> 1.5.3' @@ -46,9 +46,9 @@ gem 'devise', '~> 4.8.1' gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' gem 'bcrypt', '~> 3.1', '>= 3.1.14' gem 'doorkeeper', '~> 5.6', '>= 5.6.6' -gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.6' +gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.7' gem 'rexml', '~> 3.2.5' -gem 'ruby-saml', '~> 1.13.0' +gem 'ruby-saml', '~> 1.15.0' gem 'omniauth', '~> 2.1.0' gem 'omniauth-auth0', '~> 3.1' gem 'omniauth-azure-activedirectory-v2', '~> 2.0' @@ -61,6 +61,7 @@ gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See ven gem 'omniauth-google-oauth2', '~> 1.1' gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 2.1.0' +gem 'omniauth-shibboleth-redux', '~> 2.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md gem 'omniauth_openid_connect', '~> 0.6.1' @@ -105,13 +106,13 @@ gem 'gpgme', '~> 2.0.22' # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' -gem 'net-ldap', '~> 0.17.1' +gem 'net-ldap', '~> 0.18.0' # API -gem 'grape', '~> 1.5.2' +gem 'grape', '~> 1.7.0' gem 'grape-entity', '~> 0.10.0' gem 'rack-cors', '~> 1.1.1', require: 'rack/cors' -gem 'grape-swagger', '~>1.5.0', group: [:development, :test] +gem 'grape-swagger', '~> 1.6.1', group: [:development, :test] gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test] # GraphQL API @@ -172,9 +173,9 @@ gem 'seed-fu', '~> 2.3.7' gem 'elasticsearch-model', '~> 7.2' gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '7.13.3' -gem 'aws-sdk-core', '~> 3.172.0' +gem 'aws-sdk-core', '~> 3.175.0' gem 'aws-sdk-cloudformation', '~> 1' -gem 'aws-sdk-s3', '~> 1.122.0' +gem 'aws-sdk-s3', '~> 1.126.0' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections @@ -182,7 +183,7 @@ gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive gem 'html-pipeline', '~> 2.14.3' gem 'deckar01-task_list', '2.3.2' gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' -gem 'commonmarker', '~> 0.23.6' +gem 'commonmarker', '~> 0.23.9' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.3.2' @@ -193,9 +194,9 @@ gem 'asciidoctor', '~> 2.0.18' gem 'asciidoctor-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-plantuml', '~> 0.0.16' gem 'asciidoctor-kroki', '~> 0.8.0', require: false -gem 'rouge', '~> 4.1.0' +gem 'rouge', '~> 4.1.2' gem 'truncato', '~> 0.7.12' -gem 'nokogiri', '~> 1.14.3' +gem 'nokogiri', '~> 1.15', '>= 1.15.2' # Calendar rendering gem 'icalendar' @@ -210,8 +211,7 @@ gem 'rack', '~> 2.2.7' gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' group :puma do - gem 'puma', '~> 5.6.5', require: false - gem 'puma_worker_killer', '~> 0.3.1', require: false + gem 'puma', '~> 6.3', require: false gem 'sd_notify', '~> 0.1.0', require: false end @@ -288,10 +288,10 @@ gem 'circuitbox', '2.0.0' # Sanitize user input gem 'sanitize', '~> 6.0' -gem 'babosa', '~> 1.0.4' +gem 'babosa', '~> 2.0' # Sanitizes SVG input -gem 'loofah', '~> 2.21.0' +gem 'loofah', '~> 2.21.3' # Working with license # Detects the open source license the repository includes @@ -323,7 +323,7 @@ gem 'gon', '~> 6.4.0' gem 'request_store', '~> 1.5.1' gem 'base32', '~> 0.3.0' -gem 'gitlab-license', '~> 2.2.1' +gem 'gitlab-license', '~> 2.3' # Protect against bruteforcing gem 'rack-attack', '~> 6.6.1' @@ -336,11 +336,11 @@ gem 'sentry-sidekiq', '~> 5.8.0' # PostgreSQL query parsing # -gem 'pg_query', '~> 2.2', '>= 2.2.1' +gem 'pg_query', '~> 4.2.1' gem 'premailer-rails', '~> 1.10.3' -gem 'gitlab-labkit', '~> 0.32.0' +gem 'gitlab-labkit', '~> 0.33.0' gem 'thrift', '>= 0.16.0' # I18n @@ -363,12 +363,12 @@ gem 'snowplow-tracker', '~> 0.8.0' # Metrics gem 'webrick', '~> 1.8.1', require: false -gem 'prometheus-client-mmap', '~> 0.23', require: 'prometheus/client' +gem 'prometheus-client-mmap', '~> 0.25', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.3.13', require: false + gem 'lefthook', '~> 1.4.2', require: false gem 'rubocop' gem 'solargraph', '~> 0.47.2', require: false @@ -376,7 +376,7 @@ group :development do gem 'lookbook', '~> 2.0', '>= 2.0.1' # Better errors handler - gem 'better_errors', '~> 2.10.0' + gem 'better_errors', '~> 2.10.1' gem 'sprite-factory', '~> 1.7' @@ -386,6 +386,7 @@ end group :development, :test do gem 'deprecation_toolkit', '~> 1.5.1', require: false gem 'bullet', '~> 7.0.2' + gem 'parser', '~> 3.2', '>= 3.2.2.3' gem 'pry-byebug' gem 'pry-rails', '~> 0.3.9' gem 'pry-shell', '~> 0.6.1' @@ -453,7 +454,7 @@ group :test do gem 'rspec-benchmark', '~> 0.6.0' gem 'rspec-parameterized', '~> 1.0', require: false - gem 'capybara', '~> 3.39' + gem 'capybara', '~> 3.39', '>= 3.39.1' gem 'capybara-screenshot', '~> 1.0.26' # 4.9.1 drops Ruby 2.7 support. We can upgrade further after we drop Ruby 2.7 support. gem 'selenium-webdriver', '= 4.9.0' @@ -472,6 +473,8 @@ group :test do # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false + + gem 'gitlab_quality-test_tooling', '~> 0.8.1', require: false end gem 'octokit', '~> 4.15' @@ -506,14 +509,14 @@ gem 'ssh_data', '~> 1.3' gem 'spamcheck', '~> 1.3.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 15.9.0-rc3' +gem 'gitaly', '~> 16.1.0-rc2' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.1.0' gem 'grpc', '~> 1.42.0' -gem 'google-protobuf', '~> 3.22', '>= 3.22.3' +gem 'google-protobuf', '~> 3.23', '>= 3.23.3' gem 'toml-rb', '~> 2.2.0' @@ -587,7 +590,7 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' gem 'arr-pm', '~> 0.0.12' # Remote Development -gem 'devfile', '~> 0.0.17.pre.alpha1' +gem 'devfile', '~> 0.0.19.pre.alpha1' # Apple plist parsing gem 'CFPropertyList', '~> 3.0.0' @@ -599,5 +602,8 @@ gem 'telesignenterprise', '~> 2.2' # BufferedIO patch # Updating this version will require updating scripts/allowed_warnings.txt gem 'net-protocol', '~> 0.1.3' +# Lock this until we make DNS rebinding work with the updated net-http: +# https://gitlab.com/gitlab-org/gitlab/-/issues/413528 +gem 'net-http', '= 0.1.1' gem 'duo_api', '~> 1.3' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 199c806a854c..3aaf6a459309 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -203,7 +203,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.172.0) + aws-sdk-core (3.175.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) @@ -211,8 +211,8 @@ GEM aws-sdk-kms (1.64.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.122.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-s3 (1.126.0) + aws-sdk-core (~> 3, >= 3.174.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sigv4 (1.5.1) @@ -236,7 +236,7 @@ GEM faraday_middleware (~> 1.0, >= 1.0.0.rc1) net-http-persistent (~> 4.0) nokogiri (~> 1, >= 1.10.8) - babosa (1.0.4) + babosa (2.0.0) backport (1.2.0) base32 (0.3.2) batch-loader (2.0.1) @@ -248,7 +248,7 @@ GEM memory_profiler (~> 1) benchmark-perf (0.6.0) benchmark-trend (0.4.0) - better_errors (2.10.0) + better_errors (2.10.1) erubi (>= 1.0.0) rack (>= 0.9.0) rouge (>= 1.0.0) @@ -266,7 +266,7 @@ GEM bundler (>= 1.2.0, < 3) thor (>= 0.18, < 2) byebug (11.1.3) - capybara (3.39.0) + capybara (3.39.1) addressable matrix mini_mime (>= 0.1.3) @@ -307,7 +307,7 @@ GEM coercible (1.0.0) descendants_tracker (~> 0.0.1) colored2 (3.1.2) - commonmarker (0.23.6) + commonmarker (0.23.9) concurrent-ruby (1.2.2) connection_pool (2.3.0) cork (0.3.0) @@ -367,7 +367,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devfile (0.0.17.pre.alpha1) + devfile (0.0.19.pre.alpha1) device_detector (1.0.0) devise (4.8.1) bcrypt (~> 3.0) @@ -393,30 +393,24 @@ GEM unf (>= 0.0.5, < 1.0.0) doorkeeper (5.6.6) railties (>= 5) - doorkeeper-openid_connect (1.8.6) + doorkeeper-openid_connect (1.8.7) doorkeeper (>= 5.5, < 5.7) jwt (>= 2.5) dotenv (2.7.6) - dry-configurable (0.12.0) + dry-core (1.0.0) concurrent-ruby (~> 1.0) - dry-core (~> 0.5, >= 0.5.0) - dry-container (0.7.2) + zeitwerk (~> 2.6) + dry-inflector (1.0.0) + dry-logic (1.5.0) concurrent-ruby (~> 1.0) - dry-configurable (~> 0.1, >= 0.1.3) - dry-core (0.5.0) + dry-core (~> 1.0, < 2) + zeitwerk (~> 2.6) + dry-types (1.7.1) concurrent-ruby (~> 1.0) - dry-equalizer (0.3.0) - dry-inflector (0.2.0) - dry-logic (1.1.0) - concurrent-ruby (~> 1.0) - dry-core (~> 0.5, >= 0.5) - dry-types (1.4.0) - concurrent-ruby (~> 1.0) - dry-container (~> 0.3) - dry-core (~> 0.4, >= 0.4.4) - dry-equalizer (~> 0.3) - dry-inflector (~> 0.1, >= 0.1.2) - dry-logic (~> 1.0, >= 1.0.2) + dry-core (~> 1.0) + dry-inflector (~> 1.0) + dry-logic (~> 1.4) + zeitwerk (~> 2.6) dumb_delegator (1.0.0) duo_api (1.3.0) e2mmap (0.1.0) @@ -581,7 +575,7 @@ GEM rails (>= 3.2.0) git (1.11.0) rchardet (~> 1.8) - gitaly (15.9.0.pre.rc3) + gitaly (16.1.0.pre.rc2) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) @@ -602,15 +596,15 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.32.0) + gitlab-labkit (0.33.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) jaeger-client (~> 1.1.0) opentracing (~> 0.4) - pg_query (~> 2.1) + pg_query (~> 4.2.1) redis (> 3.0.0, < 6.0.0) - gitlab-license (2.2.2) + gitlab-license (2.3.0) gitlab-mail_room (0.0.23) jwt (>= 2.0) net-imap (>= 0.2.1) @@ -630,6 +624,15 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) + gitlab_quality-test_tooling (0.8.1) + activesupport (>= 6.1, < 7.1) + gitlab (~> 4.19) + http (~> 5.0) + nokogiri (~> 1.10) + parallel (>= 1, < 2) + rainbow (>= 3, < 4) + table_print (= 1.5.7) + zeitwerk (>= 2, < 3) globalid (1.1.0) activesupport (>= 5.0) gon (6.4.0) @@ -691,7 +694,7 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - google-protobuf (3.22.3) + google-protobuf (3.23.3) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) @@ -707,7 +710,7 @@ GEM signet (>= 0.16, < 2.a) gpgme (2.0.22) mini_portile2 (~> 2.7) - grape (1.5.2) + grape (1.7.0) activesupport builder dry-types (>= 1.1) @@ -722,7 +725,7 @@ GEM grape (~> 1.3) rake (> 12) ruby2_keywords (~> 0.0.2) - grape-swagger (1.5.0) + grape-swagger (1.6.1) grape (~> 1.3) grape-swagger-entity (0.5.1) grape-entity (>= 0.6.0) @@ -878,7 +881,7 @@ GEM rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.3.13) + lefthook (1.4.2) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -913,9 +916,9 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.21.0) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) lookbook (2.0.1) activemodel css_parser @@ -949,7 +952,7 @@ GEM mini_histogram (0.3.1) mini_magick (4.10.1) mini_mime (1.1.2) - mini_portile2 (2.8.1) + mini_portile2 (2.8.2) minitest (5.11.3) mixlib-cli (2.1.8) mixlib-config (3.0.9) @@ -971,20 +974,23 @@ GEM multi_xml (0.6.0) multipart-post (2.2.3) murmurhash3 (0.1.7) - mustermann (1.1.1) + mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - mustermann-grape (1.0.1) + mustermann-grape (1.0.2) mustermann (>= 1.0.0) nap (1.1.0) neighbor (0.2.3) activerecord (>= 5.2) nenv (0.3.0) + net-http (0.1.1) + net-protocol + uri net-http-persistent (4.0.1) connection_pool (~> 2.2) net-imap (0.3.4) date net-protocol - net-ldap (0.17.1) + net-ldap (0.18.0) net-ntp (2.1.3) net-pop (0.1.2) net-protocol @@ -998,8 +1004,8 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.14.3) - mini_portile2 (~> 2.8.0) + nokogiri (1.15.2) + mini_portile2 (~> 2.8.2) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) @@ -1070,6 +1076,8 @@ GEM omniauth-saml (2.1.0) omniauth (~> 2.0) ruby-saml (~> 1.12) + omniauth-shibboleth-redux (2.0.0) + omniauth (>= 2.0.0) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack @@ -1120,16 +1128,17 @@ GEM expgen (~> 0.1) rainbow (~> 3.1.1) parallel (1.22.1) - parser (3.2.0.0) + parser (3.2.2.3) ast (~> 2.4.1) + racc parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) pg (1.5.3) - pg_query (2.2.1) - google-protobuf (>= 3.19.2) + pg_query (4.2.1) + google-protobuf (>= 3.22.3) plist (3.6.0) png_quantizator (0.2.1) po_to_json (1.0.1) @@ -1145,7 +1154,7 @@ GEM coderay parser unparser - prometheus-client-mmap (0.23.1) + prometheus-client-mmap (0.25.0) rb_sys (~> 0.9) pry (0.14.2) coderay (~> 1.1) @@ -1160,11 +1169,8 @@ GEM tty-markdown tty-prompt public_suffix (5.0.0) - puma (5.6.5) + puma (6.3.0) nio4r (~> 2.0) - puma_worker_killer (0.3.1) - get_process_mem (~> 0.2) - puma (>= 2.7) pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) racc (1.6.2) @@ -1226,7 +1232,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rb_sys (0.9.75) + rb_sys (0.9.78) rbtrace (0.4.14) ffi (>= 1.0.6) msgpack (>= 0.4.3) @@ -1273,7 +1279,7 @@ GEM rexml (3.2.5) rinku (2.0.0) rotp (6.2.0) - rouge (4.1.0) + rouge (4.1.2) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1358,8 +1364,8 @@ GEM ruby-openai (3.7.0) httparty (>= 0.18.1) ruby-progressbar (1.11.0) - ruby-saml (1.13.0) - nokogiri (>= 1.10.5) + ruby-saml (1.15.0) + nokogiri (>= 1.13.10) rexml ruby-statistics (3.0.0) ruby2_keywords (0.0.5) @@ -1503,6 +1509,7 @@ GEM sys-filesystem (1.4.3) ffi (~> 1.1) sysexits (1.2.0) + table_print (1.5.7) tanuki_emoji (0.6.0) telesign (2.2.4) net-http-persistent (>= 3.0.0, < 5.0) @@ -1585,6 +1592,7 @@ GEM unparser (0.6.7) diff-lcs (~> 1.3) parser (>= 3.2.0) + uri (0.12.1) uri_template (0.7.0) valid_email (0.1.3) activemodel @@ -1600,7 +1608,7 @@ GEM activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (2.82.0) + view_component (3.2.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1672,28 +1680,28 @@ DEPENDENCIES autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.172.0) - aws-sdk-s3 (~> 1.122.0) + aws-sdk-core (~> 3.175.0) + aws-sdk-s3 (~> 1.126.0) axe-core-rspec - babosa (~> 1.0.4) + babosa (~> 2.0) base32 (~> 0.3.0) batch-loader (~> 2.0.1) bcrypt (~> 3.1, >= 3.1.14) benchmark-ips (~> 2.11.0) benchmark-memory (~> 0.1) - better_errors (~> 2.10.0) + better_errors (~> 2.10.1) bootsnap (~> 1.16.0) browser (~> 5.3.1) bullet (~> 7.0.2) bundler-audit (~> 0.7.0.1) bundler-checksum (~> 0.1.0)! - capybara (~> 3.39) + capybara (~> 3.39, >= 3.39.1) capybara-screenshot (~> 1.0.26) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) circuitbox (= 2.0.0) cloud_profiler_agent (~> 0.0.0)! - commonmarker (~> 0.23.6) + commonmarker (~> 0.23.9) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 4.0.0) @@ -1705,7 +1713,7 @@ DEPENDENCIES declarative_policy (~> 1.1.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks - devfile (~> 0.0.17.pre.alpha1) + devfile (~> 0.0.19.pre.alpha1) device_detector devise (~> 4.8.1) devise-pbkdf2-encryptable (~> 0.0.0)! @@ -1714,7 +1722,7 @@ DEPENDENCIES diffy (~> 3.4) discordrb-webhooks (~> 3.4) doorkeeper (~> 5.6, >= 5.6.6) - doorkeeper-openid_connect (~> 1.8, >= 1.8.6) + doorkeeper-openid_connect (~> 1.8, >= 1.8.7) duo_api (~> 1.3) ed25519 (~> 1.3.0) elasticsearch-api (= 7.13.3) @@ -1741,13 +1749,13 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 15.9.0.pre.rc3) + gitaly (~> 16.1.0.pre.rc2) gitlab-chronic (~> 0.10.5) gitlab-dangerfiles (~> 3.10.0) gitlab-experiment (~> 0.7.1) gitlab-fog-azure-rm (~> 1.7.0) - gitlab-labkit (~> 0.32.0) - gitlab-license (~> 2.2.1) + gitlab-labkit (~> 0.33.0) + gitlab-license (~> 2.3) gitlab-mail_room (~> 0.0.23) gitlab-markup (~> 1.9.0) gitlab-net-dns (~> 0.9.2) @@ -1755,6 +1763,7 @@ DEPENDENCIES gitlab-styles (~> 10.0.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.2.0) + gitlab_quality-test_tooling (~> 0.8.1) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -1767,12 +1776,12 @@ DEPENDENCIES google-apis-serviceusage_v1 (~> 0.28.0) google-apis-sqladmin_v1beta4 (~> 0.41.0) google-cloud-storage (~> 1.44.0) - google-protobuf (~> 3.22, >= 3.22.3) + google-protobuf (~> 3.23, >= 3.23.3) gpgme (~> 2.0.22) - grape (~> 1.5.2) + grape (~> 1.7.0) grape-entity (~> 0.10.0) grape-path-helpers (~> 1.7.1) - grape-swagger (~> 1.5.0) + grape-swagger (~> 1.6.1) grape-swagger-entity (~> 0.5.1) grape_logging (~> 1.8) graphiql-rails (~> 1.8) @@ -1806,14 +1815,14 @@ DEPENDENCIES knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.11.0) - lefthook (~> 1.3.13) + lefthook (~> 1.4.2) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.15) listen (~> 3.7) lockbox (~> 1.1.1) lograge (~> 0.5) - loofah (~> 2.21.0) + loofah (~> 2.21.3) lookbook (~> 2.0, >= 2.0.1) lru_redux mail (= 2.8.1) @@ -1825,10 +1834,11 @@ DEPENDENCIES minitest (~> 5.11.0) multi_json (~> 1.14.1) neighbor (~> 0.2.3) - net-ldap (~> 0.17.1) + net-http (= 0.1.1) + net-ldap (~> 0.18.0) net-ntp net-protocol (~> 0.1.3) - nokogiri (~> 1.14.3) + nokogiri (~> 1.15, >= 1.15.2) oauth2 (~> 2.0) octokit (~> 4.15) ohai (~> 17.9) @@ -1848,6 +1858,7 @@ DEPENDENCIES omniauth-oauth2-generic (~> 0.2.2) omniauth-salesforce (~> 1.0.5)! omniauth-saml (~> 2.1.0) + omniauth-shibboleth-redux (~> 2.0) omniauth-twitter (~> 1.4) omniauth_crowd (~> 2.4.0)! omniauth_openid_connect (~> 0.6.1) @@ -1856,18 +1867,18 @@ DEPENDENCIES org-ruby (~> 0.9.12) pact (~> 1.63) parallel (~> 1.19) + parser (~> 3.2, >= 3.2.2.3) parslet (~> 1.8) peek (~> 1.1) pg (~> 1.5.3) - pg_query (~> 2.2, >= 2.2.1) + pg_query (~> 4.2.1) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.23) + prometheus-client-mmap (~> 0.25) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.6.1) - puma (~> 5.6.5) - puma_worker_killer (~> 0.3.1) + puma (~> 6.3) rack (~> 2.2.7) rack-attack (~> 6.6.1) rack-cors (~> 1.1.1) @@ -1889,7 +1900,7 @@ DEPENDENCIES responders (~> 3.0) retriable (~> 3.1.2) rexml (~> 3.2.5) - rouge (~> 4.1.0) + rouge (~> 4.1.2) rqrcode-rails3 (~> 0.1.7) rspec-benchmark (~> 0.6.0) rspec-parameterized (~> 1.0) @@ -1902,7 +1913,7 @@ DEPENDENCIES ruby-magic (~> 0.6) ruby-openai (~> 3.7) ruby-progressbar (~> 1.10) - ruby-saml (~> 1.13.0) + ruby-saml (~> 1.15.0) ruby_parser (~> 3.20) rubyzip (~> 2.3.2) rugged (~> 1.5) @@ -1952,7 +1963,7 @@ DEPENDENCIES valid_email (~> 0.1) validates_hostname (~> 1.0.11) version_sorter (~> 2.3) - view_component (~> 2.82.0) + view_component (~> 3.2.0) vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 3.0) @@ -1962,4 +1973,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.4.13 + 2.4.14 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index ac66421c7094..9c71ff591aad 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -401,10 +401,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06scfn1qjfqvgr05ddrcbihlnfi7bffk8r0m5z536w4mm1s3gh6x"; + sha256 = "1fbbzcszpdjy2yzxfvl5fzgn0jgznkwxvqpb46nxv69gqhv3dpsg"; type = "gem"; }; - version = "3.172.0"; + version = "3.175.0"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -423,10 +423,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01cryf8kfkmlsxb327szcwcagsp7lss5gmk6zxlgap65lv8bc7rx"; + sha256 = "17ya49rwjzimqhzsj6vlc4xfvj2sixy04kr4b6ddg3r6y0jrsixi"; type = "gem"; }; - version = "1.122.0"; + version = "1.126.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -499,10 +499,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16dwqn33kmxkqkv51cwiikdkbrdjfsymlnc0rgbjwilmym8a9phq"; + sha256 = "19mqrnyizr1ipdp26vhrg0hwb851bwyvrs6xc29dk3ywljw8s8d6"; type = "gem"; }; - version = "1.0.4"; + version = "2.0.0"; }; backport = { groups = ["default" "development"]; @@ -611,10 +611,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fhi891k7c4l967bacahq2jhnxswfmbpmbsg1yapczwpm1ynmaz3"; + sha256 = "0wqazisnn6hn1wsza412xribpw5wzx6b5z5p4mcpfgizr6xg367p"; type = "gem"; }; - version = "2.10.0"; + version = "2.10.1"; }; bindata = { groups = ["default"]; @@ -720,10 +720,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06b4nlhirsq8ny17s8zgz7qyvl9v41rixj1xkviiiwxlnjz982d3"; + sha256 = "1qhg45jxxy5h90frmajrrh5sirmj29sbfhbf7q0qhjymc0w1p0r5"; type = "gem"; }; - version = "3.39.0"; + version = "3.39.1"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; @@ -911,10 +911,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f3v6ffikj694h925zvfzgx995q6l1ixnqpph3qpnjdsyjpsmbn8"; + sha256 = "074162raa8pc92q6833hgqdlfr3z5jgid9avdz5k25cnls2rqwrf"; type = "gem"; }; - version = "0.23.6"; + version = "0.23.9"; }; concurrent-ruby = { groups = ["default" "development" "test"]; @@ -1163,10 +1163,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v34ivsfpc4d291j89jyg2jz970h94jbz01hdm2jwcmq798yfm98"; + sha256 = "1n4yxjijplg0klcnjdhk7kxmvlb0szchk1ad8flg5hb2j59c8a6r"; type = "gem"; }; - version = "0.0.17.pre.alpha1"; + version = "0.0.19.pre.alpha1"; }; device_detector = { groups = ["default"]; @@ -1300,10 +1300,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00z0n4ix21nvqk74hhz5ab811366pdjx99cn2i26yiwpwr1nbi4d"; + sha256 = "11p7p3b0yb12xfdhxxsifc2mz0rj1hlgi8sbcwjzxvld24rszvbi"; type = "gem"; }; - version = "1.8.6"; + version = "1.8.7"; }; dotenv = { groups = ["default"]; @@ -1315,80 +1315,48 @@ src: }; version = "2.7.6"; }; - dry-configurable = { - dependencies = ["concurrent-ruby" "dry-core"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rvwvxrvcygvgfc3xjrihvdvnr0dh2144s8x80zfgfnz0jd5gac7"; - type = "gem"; - }; - version = "0.12.0"; - }; - dry-container = { - dependencies = ["concurrent-ruby" "dry-configurable"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1npnhs3x2xcwwijpys5c8rpcvymrlab0y8806nr4h425ld5q4wd0"; - type = "gem"; - }; - version = "0.7.2"; - }; dry-core = { - dependencies = ["concurrent-ruby"]; - groups = ["default"]; + dependencies = ["concurrent-ruby" "zeitwerk"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14s45hxcqpp2mbvwlwzn018i8qhcjzgkirigdrv31jd741rpgy9s"; + sha256 = "01gks2hrp7nl3pzb487azvd25dlbrc40d5cpk4n0szwnf2c0k4ks"; type = "gem"; }; - version = "0.5.0"; - }; - dry-equalizer = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rsqpk0gjja6j6pjm0whx2px06cxr3h197vrwxp6k042p52r4v46"; - type = "gem"; - }; - version = "0.3.0"; + version = "1.0.0"; }; dry-inflector = { - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17mkdwglqsd9fg272y3zms7rixjgkb1km1xcb88ir5lxvk1jkky7"; + sha256 = "09hnvna3lg2x36li63988kv664d0zvy7y0z33803yvrdr9hj7lka"; type = "gem"; }; - version = "0.2.0"; + version = "1.0.0"; }; dry-logic = { - dependencies = ["concurrent-ruby" "dry-core"]; - groups = ["default"]; + dependencies = ["concurrent-ruby" "dry-core" "zeitwerk"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17dnc3g9y2nj42rdx2bdvsvvms10vgw4qzjb2iw2gln9hj8b797c"; + sha256 = "05nldkc154r0qzlhss7n5klfiyyz05x2fkq08y13s34py6023vcr"; type = "gem"; }; - version = "1.1.0"; + version = "1.5.0"; }; dry-types = { - dependencies = ["concurrent-ruby" "dry-container" "dry-core" "dry-equalizer" "dry-inflector" "dry-logic"]; - groups = ["default"]; + dependencies = ["concurrent-ruby" "dry-core" "dry-inflector" "dry-logic" "zeitwerk"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1px1r5khlf4lw32gsrnnnsx7dvl2d94axx3h0b6zwxrhvfq3n038"; + sha256 = "1f6dz0hm67rhybh6xq2s3vvr700cp43kf50z2lids62s2i0mh5hj"; type = "gem"; }; - version = "1.4.0"; + version = "1.7.1"; }; dumb_delegator = { groups = ["default" "test"]; @@ -2134,10 +2102,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gja1b2zirv1clavlg6c0c3xc0z2si2xvxcp9cd165q4lwh47ika"; + sha256 = "1bz3i05lr1nzm35xg11blaq78v96sg49aw1yh4hj7wfk3cbdn1q0"; type = "gem"; }; - version = "15.9.0.pre.rc3"; + version = "16.1.0.pre.rc2"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2200,20 +2168,20 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vl64blqz850d5vahwpwyrsvw4iarn578p8bzmcw11imqpnk62pk"; + sha256 = "0nz0g5s65wkicsn9ianqxi7ys2w666n226gfblzllcfy1z9siyyi"; type = "gem"; }; - version = "0.32.0"; + version = "0.33.0"; }; gitlab-license = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07pdi9zcifiw8vjv5zz5jdv2gmaq3rkyxfdkn0j3a0cdh9iwgjrc"; + sha256 = "0ms1kf5nmclsnmd2xa9k273asmb73ivaykwrb3g7sq263j3y7jk0"; type = "gem"; }; - version = "2.2.2"; + version = "2.3.0"; }; gitlab-mail_room = { dependencies = ["jwt" "net-imap" "oauth2"]; @@ -2289,6 +2257,17 @@ src: }; version = "2.2.0"; }; + gitlab_quality-test_tooling = { + dependencies = ["activesupport" "gitlab" "http" "nokogiri" "parallel" "rainbow" "table_print" "zeitwerk"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02xwchhhfv8jkypap5pn1wjkdx92jxk4wsp71i2s0ymnqw98y401"; + type = "gem"; + }; + version = "0.8.1"; + }; globalid = { dependencies = ["activesupport"]; groups = ["default" "development" "test"]; @@ -2535,10 +2514,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xcg53yz44cqhcpb85w3ay80kvnniy0v441c9p08wb6zzia2mnq9"; + sha256 = "1aczvz5jdslr1bfx08xrycp6ggdpaifdlh5hrdyd774mvcl0mg2d"; type = "gem"; }; - version = "3.22.3"; + version = "3.23.3"; }; googleapis-common-protos = { dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"]; @@ -2586,14 +2565,14 @@ src: }; grape = { dependencies = ["activesupport" "builder" "dry-types" "mustermann-grape" "rack" "rack-accept"]; - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0adf01kihxbmh8q84r6zyfgdmpbyb0lwcar3fi8j6bl6qcsbgwqx"; + sha256 = "0lbgysx2d64hsck11jajc4gwikj5nd82809bz0jibrnp4yb1lcw8"; type = "gem"; }; - version = "1.5.2"; + version = "1.7.0"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -2623,10 +2602,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zy84lxrnnslray9rmfgb7ri295wda3cxx3xryz4lr5hd8r5p24w"; + sha256 = "17y6smk7shplblgic4jvi5njhd0x91n1xrvds3l6cjsjfs2d7lhg"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.1"; }; grape-swagger-entity = { dependencies = ["grape-entity" "grape-swagger"]; @@ -3292,10 +3271,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wnz60wh2yb7s5g7an64cw2brl9vvw960xnq4gs3q6drlgmbjl8g"; + sha256 = "0hqffqr2krk6gcjapriwwmdrjz56dczshxafnwrkipyxi51vwgvh"; type = "gem"; }; - version = "1.3.13"; + version = "1.4.2"; }; letter_opener = { dependencies = ["launchy"]; @@ -3410,10 +3389,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nq23yca06rq8qxxymh4nfbx484k2yll54y780b4ilyvmcipyh7c"; + sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; type = "gem"; }; - version = "2.21.0"; + version = "2.21.3"; }; lookbook = { dependencies = ["activemodel" "css_parser" "htmlbeautifier" "htmlentities" "marcel" "railties" "redcarpet" "rouge" "view_component" "yard" "zeitwerk"]; @@ -3598,10 +3577,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; + sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.2"; }; minitest = { groups = ["development" "test"]; @@ -3729,25 +3708,25 @@ src: }; mustermann = { dependencies = ["ruby2_keywords"]; - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a"; + sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd"; type = "gem"; }; - version = "1.1.1"; + version = "3.0.0"; }; mustermann-grape = { dependencies = ["mustermann"]; - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0djlbi7nh161a5mwjdm1ya4hc6lyzc493ah48gn37gk6vyri5kh0"; + sha256 = "1zpmc099rcpxmlfxb71zd6l7f9fcsg1fhi6627r03y1qlgb0jlvg"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; nap = { groups = ["default" "development"]; @@ -3780,6 +3759,17 @@ src: }; version = "0.3.0"; }; + net-http = { + dependencies = ["net-protocol" "uri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11mymfxpsgpwr1qbv8vwj8av9kksqj0632p9s3x35bzrnq4y393m"; + type = "gem"; + }; + version = "0.1.1"; + }; net-http-persistent = { dependencies = ["connection_pool"]; groups = ["default"]; @@ -3807,10 +3797,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; + sha256 = "0xqcffn3c1564c4fizp10dzw2v5g2pabdzrcn25hq05bqhsckbar"; type = "gem"; }; - version = "0.17.1"; + version = "0.18.0"; }; net-ntp = { groups = ["default"]; @@ -3912,10 +3902,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fnw0z8zl8b5k35g9m5hhc1g4s6ajzjinhyxnqjrx7l7p07fw71v"; + sha256 = "1mr2ibfk874ncv0qbdkynay738w2mfinlkhnbd5lyk5yiw5q1p10"; type = "gem"; }; - version = "1.14.3"; + version = "1.15.2"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -4175,6 +4165,17 @@ src: }; version = "2.1.0"; }; + omniauth-shibboleth-redux = { + dependencies = ["omniauth"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qgzp0xaka6vqpx69mw6nbqaqmyqrawi11cyak4gq19l23ym7cz9"; + type = "gem"; + }; + version = "2.0.0"; + }; omniauth-twitter = { dependencies = ["omniauth-oauth" "rack"]; groups = ["default"]; @@ -4344,15 +4345,15 @@ src: version = "1.22.1"; }; parser = { - dependencies = ["ast"]; + dependencies = ["ast" "racc"]; groups = ["coverage" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; + sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h"; type = "gem"; }; - version = "3.2.0.0"; + version = "3.2.2.3"; }; parslet = { groups = ["default" "development" "test"]; @@ -4402,10 +4403,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1slcbzzqdv6104l5h8ql6kj43zmnm16g2dav8bc8dasfpwmrg1k0"; + sha256 = "0cs8c0f903phs3yjjbrhlyaipvmvm95xids06a761hf0s6lj0j5h"; type = "gem"; }; - version = "2.2.1"; + version = "4.2.1"; }; plist = { groups = ["default"]; @@ -4477,10 +4478,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h4w0947zwwg6kbdnvg4vbmrsc8yf5ijb37sg758apks44imym28"; + sha256 = "14m09ysq0l6kih9pdy1mmdabdyjk09hvx4rzqh6phgb34s1w4pfp"; type = "gem"; }; - version = "0.23.1"; + version = "0.25.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -4542,21 +4543,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qzq0c791kacv68hgk9zqsd1p7zx1y1rr9j10rn9yphibb8jj436"; + sha256 = "1v7fmv0n4bhdcwh60dgza44iqai5pg34f5pzm4vh4i5fwx7mpqxh"; type = "gem"; }; - version = "5.6.5"; - }; - puma_worker_killer = { - dependencies = ["get_process_mem" "puma"]; - groups = ["puma"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jk1bhmx5px8y1ip4ky80cq5cwdaybdg4y55shd2vsdmjv938mcw"; - type = "gem"; - }; - version = "0.3.1"; + version = "6.3.0"; }; pyu-ruby-sasl = { groups = ["default"]; @@ -4797,10 +4787,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zx8v677r2gs050z4cdiflp14kp6nx5z285ynj2ach0w0z7jfm23"; + sha256 = "09kszvsa9av8yb8pm9nz6p5jgshin3cqvknlvd1m927qfvdpalk3"; type = "gem"; }; - version = "0.9.75"; + version = "0.9.78"; }; rbtrace = { dependencies = ["ffi" "msgpack" "optimist"]; @@ -5068,10 +5058,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "046xwhfhi2krmbaqmg9vshf01vzld8smczx6dwppinv61ndc2vqg"; + sha256 = "0pym2zjwl6dwdfvbn7rbvmds32r70jx9qddhvvi6pqy6987ack1v"; type = "gem"; }; - version = "4.1.0"; + version = "4.1.2"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -5363,10 +5353,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1706dyk5jdma75bnl9rhmx8vgzjw12ixnj3y32inmpcgzgsvs76k"; + sha256 = "18vnbzin5ypxrgcs9lllg7x311b69dyrdw2w1pwz84438hmxm79s"; type = "gem"; }; - version = "1.13.0"; + version = "1.15.0"; }; ruby-statistics = { groups = ["default" "test"]; @@ -6022,6 +6012,16 @@ src: }; version = "1.2.0"; }; + table_print = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jxmd1yg3h0g27wzfpvq1jnkkf7frwb5wy9m4f47nf4k3wl68rj3"; + type = "gem"; + }; + version = "1.5.7"; + }; tanuki_emoji = { groups = ["default"]; platforms = []; @@ -6463,6 +6463,16 @@ src: }; version = "0.6.7"; }; + uri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vigw7nfszfqgikr6n574k9bfh0rvs74z8xq46rz2zsm8249l8cc"; + type = "gem"; + }; + version = "0.12.1"; + }; uri_template = { groups = ["default"]; platforms = []; @@ -6543,10 +6553,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bwvpkv1iqa8g5cmmllx8fx0nprapzrzfvf1m15rr3wxw5hrbdn8"; + sha256 = "08jc9k4qqazbf5frhdril5084adm90rs1lqbnqq3yfdm2dgaiyhx"; type = "gem"; }; - version = "2.82.0"; + version = "3.2.0"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker"]; From 7d432c1ff9e77b7a6a6918d08cac62c486469708 Mon Sep 17 00:00:00 2001 From: Yaya Date: Mon, 26 Jun 2023 15:23:19 +0000 Subject: [PATCH 152/222] nixos/gitlab: Add an additional folder to systemd-tmpfiles --- nixos/modules/services/misc/gitlab.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 9c18a2eed1c6..8958d375b2b5 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1281,6 +1281,7 @@ in { "d ${gitlabConfig.production.shared.path}/pages 0750 ${cfg.user} ${cfg.group} -" "d ${gitlabConfig.production.shared.path}/registry 0750 ${cfg.user} ${cfg.group} -" "d ${gitlabConfig.production.shared.path}/terraform_state 0750 ${cfg.user} ${cfg.group} -" + "d ${gitlabConfig.production.shared.path}/ci_secure_files 0750 ${cfg.user} ${cfg.group} -" "L+ /run/gitlab/config - - - - ${cfg.statePath}/config" "L+ /run/gitlab/log - - - - ${cfg.statePath}/log" "L+ /run/gitlab/tmp - - - - ${cfg.statePath}/tmp" From b5fcbad5fb9cb47f6947ad42c9fa4cf2119dc562 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Mon, 19 Jun 2023 23:44:17 +0300 Subject: [PATCH 153/222] nixos/lemmy: handle database creation better --- nixos/modules/services/web-apps/lemmy.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix index 1580716b1c4e..dd335302fa47 100644 --- a/nixos/modules/services/web-apps/lemmy.nix +++ b/nixos/modules/services/web-apps/lemmy.nix @@ -202,7 +202,7 @@ in environment = { LEMMY_CONFIG_LOCATION = "${settingsFormat.generate "config.hjson" cfg.settings}"; - LEMMY_DATABASE_URL = mkIf (cfg.database.uri != null) cfg.database.uri; + LEMMY_DATABASE_URL = if cfg.database.uri != null then cfg.database.uri else (mkIf (cfg.database.createLocally) "postgres:///lemmy?host=/run/postgresql&user=lemmy"); }; documentation = [ From 14d3e5685a702c6eb4777eb6ba682324bbf3a187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 12 Jun 2023 13:02:00 +0200 Subject: [PATCH 154/222] lib/types: add pathInStore --- lib/types.nix | 9 +++++++++ nixos/doc/manual/development/option-types.section.md | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/lib/types.nix b/lib/types.nix index d27d5750dfab..ddd37f260c9a 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -461,6 +461,7 @@ rec { # - strings with context, e.g. "${pkgs.foo}" or (toString pkgs.foo) # - hardcoded store path literals (/nix/store/hash-foo) or strings without context # ("/nix/store/hash-foo"). These get a context added to them using builtins.storePath. + # If you don't need a *top-level* store path, consider using pathInStore instead. package = mkOptionType { name = "package"; descriptionClass = "noun"; @@ -491,6 +492,14 @@ rec { merge = mergeEqualOption; }; + pathInStore = mkOptionType { + name = "pathInStore"; + description = "path in the Nix store"; + descriptionClass = "noun"; + check = x: isStringLike x && builtins.match "${builtins.storeDir}/[^.].*" (toString x) != null; + merge = mergeEqualOption; + }; + listOf = elemType: mkOptionType rec { name = "listOf"; description = "list of ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}"; diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md index 9e156ebff9d3..44bb3b4782e1 100644 --- a/nixos/doc/manual/development/option-types.section.md +++ b/nixos/doc/manual/development/option-types.section.md @@ -20,6 +20,11 @@ merging is handled. coerced to a string. Even if derivations can be considered as paths, the more specific `types.package` should be preferred. +`types.pathInStore` + +: A path that is contained in the Nix store. This can be a top-level store + path like `pkgs.hello` or a descendant like `"${pkgs.hello}/bin/hello"`. + `types.package` : A top-level store path. This can be an attribute set pointing From 0179d9f7e608b6e54fd1399689b335db360fc9e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 12 Jun 2023 00:35:39 +0200 Subject: [PATCH 155/222] nixos/top-level: change extraDependencies from package to pathInStore Allows adding subdirectory flake inputs that aren't top-level store paths. --- nixos/modules/system/activation/top-level.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index c4427149d9c9..68eb0469d8ea 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -260,10 +260,10 @@ in }; system.extraDependencies = mkOption { - type = types.listOf types.package; + type = types.listOf types.pathInStore; default = []; description = lib.mdDoc '' - A list of packages that should be included in the system + A list of paths that should be included in the system closure but generally not visible to users. This option has also been used for build-time checks, but the From 18111335ed4e9bd80243987b30d8c7705a95c8e1 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 26 Jun 2023 12:50:01 +0200 Subject: [PATCH 156/222] lib/tests/modules.sh: Test types.pathInStore Add missing test cases. I think the .links case should be rejected even though it's technically a path in the store. --- lib/tests/modules.sh | 10 ++++++++++ lib/tests/modules/types.nix | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 lib/tests/modules/types.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index a60228198fd7..c81febb4156f 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -63,6 +63,16 @@ checkConfigOutput '^"one two"$' config.result ./shorthand-meta.nix checkConfigOutput '^true$' config.result ./test-mergeAttrDefinitionsWithPrio.nix +# types.pathInStore +checkConfigOutput '".*/store/5lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"' config.pathInStore.ok1 ./types.nix +checkConfigOutput '".*/store/xfb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"' config.pathInStore.ok2 ./types.nix +checkConfigOutput '".*/store/xfb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash"' config.pathInStore.ok3 ./types.nix +checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ""' config.pathInStore.bad1 ./types.nix +checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store"' config.pathInStore.bad2 ./types.nix +checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store/"' config.pathInStore.bad3 ./types.nix +checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store/.links"' config.pathInStore.bad4 ./types.nix +checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: "/foo/bar"' config.pathInStore.bad5 ./types.nix + # Check boolean option. checkConfigOutput '^false$' config.enable ./declare-enable.nix checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix diff --git a/lib/tests/modules/types.nix b/lib/tests/modules/types.nix new file mode 100644 index 000000000000..576db6b5b9ef --- /dev/null +++ b/lib/tests/modules/types.nix @@ -0,0 +1,24 @@ +{ lib, ... }: +let + inherit (builtins) + storeDir; + inherit (lib) + types + mkOption + ; +in +{ + options = { + pathInStore = mkOption { type = types.lazyAttrsOf types.pathInStore; }; + }; + config = { + pathInStore.ok1 = "${storeDir}/5lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"; + pathInStore.ok2 = "${storeDir}/xfb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"; + pathInStore.ok3 = "${storeDir}/xfb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash"; + pathInStore.bad1 = ""; + pathInStore.bad2 = "${storeDir}"; + pathInStore.bad3 = "${storeDir}/"; + pathInStore.bad4 = "${storeDir}/.links"; # technically true, but not reasonable + pathInStore.bad5 = "/foo/bar"; + }; +} From 4bdff8cbbb3ff52fc26cc74d1526617aac6ba22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 26 Jun 2023 13:20:01 +0200 Subject: [PATCH 157/222] lib/tests: remove experimental-features Now that the lib is tested with Nix 2.3, this isn't needed any more and causes warnings. --- lib/tests/release.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 5bade7112f19..805f7a7e95d6 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -38,9 +38,6 @@ let export PAGER=cat cacheDir=$TEST_ROOT/binary-cache - mkdir -p $NIX_CONF_DIR - echo "experimental-features = nix-command" >> $NIX_CONF_DIR/nix.conf - nix-store --init cp -r ${../.} lib From 6124241ef16e5cbe40aa394a460d437280425698 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 27 Jun 2023 13:22:05 +0300 Subject: [PATCH 158/222] racket: unbreak on darwin --- pkgs/development/interpreters/racket/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index b746cf28f986..eac454d39005 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -9,7 +9,6 @@ , libGL , libGLU , libjpeg -, xorg , ncurses , libpng, libtool, mpfr, openssl, pango, poppler , readline, sqlite @@ -25,7 +24,7 @@ let fontDirectories = [ freefont_ttf ]; }; - libPath = lib.makeLibraryPath [ + libPath = lib.makeLibraryPath ([ cairo fontconfig glib @@ -33,8 +32,6 @@ let gtk3 gsettings-desktop-schemas libedit - libGL - libGLU libjpeg libpng mpfr @@ -44,7 +41,10 @@ let poppler readline sqlite - ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ + libGL + libGLU + ]); in From b3033a3dfa9dc42f344eb5a7baf291c2bf2594bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 10:22:54 +0000 Subject: [PATCH 159/222] python310Packages.steamship: 2.17.7 -> 2.17.11 --- pkgs/development/python-modules/steamship/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/steamship/default.nix b/pkgs/development/python-modules/steamship/default.nix index a8807bb9f175..f43ba68f5794 100644 --- a/pkgs/development/python-modules/steamship/default.nix +++ b/pkgs/development/python-modules/steamship/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "steamship"; - version = "2.17.7"; + version = "2.17.11"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NkSyX+ajNFwkgO0Lq4UfrvjADgHXiT2oLp2RCQDJv0w="; + hash = "sha256-Jy7ORAMnrBSeDZob3KcAnqhLBI1az/g6s30BYPA0bTE="; }; pythonRelaxDeps = [ From 83d96bc9bcd817b7f77084df86f834fe101ebd7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 10:27:08 +0000 Subject: [PATCH 160/222] sftpgo: 2.5.1 -> 2.5.2 --- pkgs/servers/sftpgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix index 0a3a859ce62a..cf643f708eb7 100644 --- a/pkgs/servers/sftpgo/default.nix +++ b/pkgs/servers/sftpgo/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; rev = "refs/tags/v${version}"; - hash = "sha256-wFJ1PKGzEvB0fIqGbqoI4qmA485YJtD6Y4VVyKHSUoM="; + hash = "sha256-yGbnnva3Uhdl8Pii6DvHzF8PugLDdGsjm+Izf7lh0HI="; }; - vendorHash = "sha256-0GfJw/RPfPGf0yds3QUpi3GLrDE3IXexBatReqU10Pg="; + vendorHash = "sha256-9x421lU9K1qfJroIu+obxD3H1R+8QUawlnQnPFQ0P6o="; ldflags = [ "-s" From 30874bced705e3679e5ab044895e51c89c6921ba Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Tue, 27 Jun 2023 11:53:46 +0200 Subject: [PATCH 161/222] anuko-time-tracker: init at 1.22.19.5806 --- .../web-apps/anuko-time-tracker/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/servers/web-apps/anuko-time-tracker/default.nix diff --git a/pkgs/servers/web-apps/anuko-time-tracker/default.nix b/pkgs/servers/web-apps/anuko-time-tracker/default.nix new file mode 100644 index 000000000000..583f2db81938 --- /dev/null +++ b/pkgs/servers/web-apps/anuko-time-tracker/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, nixosTests +, php +}: + +stdenvNoCC.mkDerivation rec { + pname = "anuko-time-tracker"; + version = "1.22.19.5806"; + + # Project commits directly into master and has no release schedule. + # Fortunately the current version is defined in the 'APP_VERSION' constant in + # /initialize.php so we use its value and set the rev to the commit sha of when the + # constant was last updated. + src = fetchFromGitHub { + owner = "anuko"; + repo = "timetracker"; + rev = "43a19fcb51a21f6e3169084ac81308a6ef751e63"; + hash = "sha256-ZRF9FFbntYY01JflCXkYZyXfyu/x7LNdyOB94UkVFR0="; + }; + + # There's nothing to build. + dontBuild = true; + + installPhase = '' + mkdir $out/ + cp -R ./* $out + ''; + + passthru.tests = { + inherit (nixosTests) anuko-time-tracker; + }; + + meta = { + description = "Simple, easy to use, open source time tracking system"; + license = lib.licenses.sspl; + homepage = "https://github.com/anuko/timetracker/"; + platforms = php.meta.platforms; + maintainers = with lib.maintainers; [ michaelshmitty ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b85950f1e450..98ecb19473d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25452,6 +25452,8 @@ with pkgs; alps = callPackage ../servers/alps { }; + anuko-time-tracker = callPackage ../servers/web-apps/anuko-time-tracker { }; + apache-directory-server = callPackage ../servers/ldap/apache-directory-server { }; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { From 7532dbaa32f661f8f8743e24629516f853e39f9e Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Tue, 27 Jun 2023 12:30:06 +0200 Subject: [PATCH 162/222] nixos/anuko-time-tracker: init --- .../manual/release-notes/rl-2311.section.md | 2 + nixos/modules/module-list.nix | 1 + .../services/web-apps/anuko-time-tracker.nix | 354 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/anuko-time-tracker.nix | 17 + 5 files changed, 375 insertions(+) create mode 100644 nixos/modules/services/web-apps/anuko-time-tracker.nix create mode 100644 nixos/tests/anuko-time-tracker.nix diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 00d52376b18a..70613c392a37 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -16,6 +16,8 @@ - [GoToSocial](https://gotosocial.org/), an ActivityPub social network server, written in Golang. Available as [services.gotosocial](#opt-services.gotosocial.enable). +- [Anuko Time Tracker](https://github.com/anuko/timetracker), a simple, easy to use, open source time tracking system. Available as [services.anuko-time-tracker](#opt-services.anuko-time-tracker.enable). + - [sitespeed-io](https://sitespeed.io), a tool that can generate metrics (timings, diagnostics) for websites. Available as [services.sitespeed-io](#opt-services.sitespeed-io.enable). - [Apache Guacamole](https://guacamole.apache.org/), a cross-platform, clientless remote desktop gateway. Available as [services.guacamole-server](#opt-services.guacamole-server.enable) and [services.guacamole-client](#opt-services.guacamole-client.enable) services. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 43fcc68ded42..ebf52804d4ec 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1168,6 +1168,7 @@ ./services/wayland/cage.nix ./services/web-apps/akkoma.nix ./services/web-apps/alps.nix + ./services/web-apps/anuko-time-tracker.nix ./services/web-apps/atlassian/confluence.nix ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix diff --git a/nixos/modules/services/web-apps/anuko-time-tracker.nix b/nixos/modules/services/web-apps/anuko-time-tracker.nix new file mode 100644 index 000000000000..c50a0328e34d --- /dev/null +++ b/nixos/modules/services/web-apps/anuko-time-tracker.nix @@ -0,0 +1,354 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.services.anuko-time-tracker; + configFile = let + smtpPassword = if cfg.settings.email.smtpPasswordFile == null + then "''" + else "trim(file_get_contents('${cfg.settings.email.smtpPasswordFile}'))"; + + in pkgs.writeText "config.php" '' + "; + }; + + mode = lib.mkOption { + type = lib.types.str; + description = lib.mdDoc "Mail sending mode. Can be 'mail' or 'smtp'."; + default = "smtp"; + }; + + smtpHost = lib.mkOption { + type = lib.types.str; + description = lib.mdDoc "MTA hostname."; + default = "localhost"; + }; + + smtpPort = lib.mkOption { + type = lib.types.int; + description = lib.mdDoc "MTA port."; + default = 25; + }; + + smtpUser = lib.mkOption { + type = lib.types.str; + description = lib.mdDoc "MTA authentication username."; + default = ""; + }; + + smtpAuth = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc "MTA requires authentication."; + }; + + smtpPasswordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/var/lib/anuko-time-tracker/secrets/smtp-password"; + description = lib.mdDoc '' + Path to file containing the MTA authentication password. + ''; + }; + + smtpDebug = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc "Debug mail sending."; + }; + }; + + defaultLanguage = lib.mkOption { + type = lib.types.str; + description = lib.mdDoc '' + Defines Anuko Time Tracker default language. It is used on Time Tracker login page. + After login, a language set for user group is used. + Empty string means the language is defined by user browser. + ''; + default = ""; + example = "nl"; + }; + + defaultCurrency = lib.mkOption { + type = lib.types.str; + description = lib.mdDoc '' + Defines a default currency symbol for new groups. + Use €, £, a more specific dollar like US$, CAD, etc. + ''; + default = "$"; + example = "€"; + }; + + exportDecimalDuration = lib.mkOption { + type = lib.types.bool; + default = true; + description = lib.mdDoc '' + Defines whether time duration values are decimal in CSV and XML data + exports (1.25 vs 1:15). + ''; + }; + + reportFooter = lib.mkOption { + type = lib.types.bool; + default = true; + description = lib.mdDoc "Defines whether to use a footer on reports."; + }; + }; + }; + + config = lib.mkIf cfg.enable { + + assertions = [ + { + assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; + message = '' + cannot be specified if + is set to true. + ''; + } + { + assertion = cfg.settings.email.smtpAuth -> (cfg.settings.email.smtpPasswordFile != null); + message = '' + needs to be set if + is enabled. + ''; + } + ]; + + services.phpfpm = { + pools.anuko-time-tracker = { + inherit (cfg) user; + group = config.services.nginx.group; + settings = { + "listen.owner" = config.services.nginx.user; + "listen.group" = config.services.nginx.group; + } // cfg.poolConfig; + }; + }; + + services.nginx = lib.mkIf (cfg.virtualHost != null) { + enable = true; + virtualHosts = { + "${cfg.virtualHost}" = { + root = lib.mkForce "${package}"; + locations."/".index = "index.php"; + locations."~ [^/]\\.php(/|$)" = { + extraConfig = '' + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + fastcgi_pass unix:${config.services.phpfpm.pools.anuko-time-tracker.socket}; + ''; + }; + }; + }; + }; + + services.mysql = lib.mkIf cfg.database.createLocally { + enable = lib.mkDefault true; + package = lib.mkDefault pkgs.mariadb; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [{ + name = cfg.database.user; + ensurePermissions = { + "${cfg.database.name}.*" = "ALL PRIVILEGES"; + }; + }]; + }; + + systemd = { + services = { + anuko-time-tracker-setup-database = lib.mkIf cfg.database.createLocally { + description = "Set up Anuko Time Tracker database"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + wantedBy = [ "phpfpm-anuko-time-tracker.service" ]; + after = [ "mysql.service" ]; + script = + let + mysql = "${config.services.mysql.package}/bin/mysql"; + in + '' + if [ ! -f ${cfg.dataDir}/.dbexists ]; then + # Load database schema provided with package + ${mysql} ${cfg.database.name} < ${cfg.package}/mysql.sql + + touch ${cfg.dataDir}/.dbexists + fi + ''; + }; + }; + tmpfiles.rules = [ + "d ${cfg.dataDir} 0750 ${cfg.user} ${config.services.nginx.group} -" + "d ${cfg.dataDir}/templates_c 0750 ${cfg.user} ${config.services.nginx.group} -" + ]; + }; + + users.users."${cfg.user}" = { + isSystemUser = true; + group = config.services.nginx.group; + }; + }; + + meta.maintainers = with lib.maintainers; [ michaelshmitty ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 6e9c893c809e..068e3ce7b248 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -107,6 +107,7 @@ in { allTerminfo = handleTest ./all-terminfo.nix {}; alps = handleTest ./alps.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; + anuko-time-tracker = handleTest ./anuko-time-tracker.nix {}; apcupsd = handleTest ./apcupsd.nix {}; apfs = runTest ./apfs.nix; apparmor = handleTest ./apparmor.nix {}; diff --git a/nixos/tests/anuko-time-tracker.nix b/nixos/tests/anuko-time-tracker.nix new file mode 100644 index 000000000000..18c3bf5cf695 --- /dev/null +++ b/nixos/tests/anuko-time-tracker.nix @@ -0,0 +1,17 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "anuko-time-tracker"; + meta = { + maintainers = with pkgs.lib.maintainers; [ michaelshmitty ]; + }; + nodes = { + machine = { + services.anuko-time-tracker.enable = true; + }; + }; + testScript = '' + start_all() + machine.wait_for_unit("phpfpm-anuko-time-tracker") + machine.wait_for_open_port(80); + machine.wait_until_succeeds("curl -s --fail -L http://localhost/time.php | grep 'Anuko Time Tracker'") + ''; +}) From f510fe06494ab157d8793f84dd759e6d5c13d3fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 10:59:28 +0000 Subject: [PATCH 163/222] prboom-plus: 2.6.2 -> 2.6.66 --- pkgs/games/doom-ports/prboom-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/doom-ports/prboom-plus/default.nix b/pkgs/games/doom-ports/prboom-plus/default.nix index a249a4585bd8..15875296fff8 100644 --- a/pkgs/games/doom-ports/prboom-plus/default.nix +++ b/pkgs/games/doom-ports/prboom-plus/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "prboom-plus"; - version = "2.6.2"; + version = "2.6.66"; src = fetchFromGitHub { owner = "coelckers"; repo = "prboom-plus"; rev = "v${version}"; - sha256 = "iK70PMRLJiZHcK1jCQ2s88LgEMbcfG2pXjwCDVG7zUM="; + sha256 = "sha256-moU/bZ2mS1QfKPP6HaAwWP1nRNZ4Ue5DFl9zBBrJiHw="; }; sourceRoot = "source/prboom2"; From a3d60923a5427ad6a772270b040638ca44b8152e Mon Sep 17 00:00:00 2001 From: nikstur Date: Sat, 24 Jun 2023 00:01:21 +0200 Subject: [PATCH 164/222] erofs-utils: enable running on darwin --- .../filesystems}/erofs-utils/default.nix | 13 ++++++++----- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) rename pkgs/{os-specific/linux => tools/filesystems}/erofs-utils/default.nix (60%) diff --git a/pkgs/os-specific/linux/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix similarity index 60% rename from pkgs/os-specific/linux/erofs-utils/default.nix rename to pkgs/tools/filesystems/erofs-utils/default.nix index d84edfc56d95..a10addbfa51e 100644 --- a/pkgs/os-specific/linux/erofs-utils/default.nix +++ b/pkgs/tools/filesystems/erofs-utils/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, libuuid, lz4 }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4 +, fuseSupport ? stdenv.isLinux +}: stdenv.mkDerivation rec { pname = "erofs-utils"; @@ -12,14 +14,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ fuse libuuid lz4 ]; + buildInputs = [ util-linux lz4 ] + ++ lib.optionals fuseSupport [ fuse ]; - configureFlags = [ "--enable-fuse" ]; + configureFlags = lib.optionals fuseSupport [ "--enable-fuse" ]; meta = with lib; { description = "Userspace utilities for linux-erofs file system"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ ehmry ]; - platforms = platforms.linux; + maintainers = with maintainers; [ ehmry nikstur ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5fb3bd21c77..7d128f6518a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7135,6 +7135,8 @@ with pkgs; ecmtools = callPackage ../tools/cd-dvd/ecm-tools { }; + erofs-utils = callPackage ../tools/filesystems/erofs-utils { }; + e2tools = callPackage ../tools/filesystems/e2tools { }; e2fsprogs = callPackage ../tools/filesystems/e2fsprogs { }; @@ -26935,8 +26937,6 @@ with pkgs; dstat = callPackage ../os-specific/linux/dstat { }; - erofs-utils = callPackage ../os-specific/linux/erofs-utils { }; - evdev-proto = callPackage ../os-specific/bsd/freebsd/evdev-proto { }; fscryptctl = callPackage ../os-specific/linux/fscryptctl { }; From cb60478cda33eb6b19965e55b347333bb6c3cef5 Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Tue, 27 Jun 2023 11:11:24 +0000 Subject: [PATCH 165/222] paraview: 5.11.0 -> 5.11.1 (#239529) --- pkgs/applications/graphics/paraview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 54f956981ee9..c50a0ebb7490 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,7 +6,7 @@ }: let - version = "5.11.0"; + version = "5.11.1"; docFiles = [ (fetchurl { @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - sha256 = "sha256-WvkKGl5lG+apX6m4ULVZZVtDsSUjEVXe/seh95b+LmI="; + hash = "sha256-LatNHfiAqB2kqzERRnYae0WIXBb4nXQ79Be4kuh8NFQ="; fetchSubmodules = true; }; From 2a8350d78aadb9916651cc7d07cd4af8bb4b1f19 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 27 Jun 2023 14:27:34 +0300 Subject: [PATCH 166/222] libsForQt5.mlt: add more modules --- pkgs/development/libraries/mlt/qt-5.nix | 35 +++++++++++++++---------- pkgs/top-level/qt5-packages.nix | 4 +-- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 60ec139d0c04..bb66003dda3d 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -5,8 +5,6 @@ , cmake , pkg-config , which -, wrapQtAppsHook -, SDL2 , ffmpeg , fftw , frei0r @@ -17,8 +15,6 @@ , libxml2 , movit , opencv4 -, qtbase -, qtsvg , rtaudio , rubberband , sox @@ -26,12 +22,18 @@ , darwin , cudaSupport ? config.cudaSupport or false , cudaPackages ? { } -, jackrackSupport ? stdenv.isLinux +, enableJackrack ? stdenv.isLinux , ladspa-sdk , ladspaPlugins -, pythonSupport ? false +, enablePython ? false , python3 , swig +, enableQt ? true +, libsForQt5 +, enableSDL1 ? stdenv.isLinux +, SDL +, enableSDL2 ? true +, SDL2 , gitUpdater }: @@ -50,16 +52,16 @@ stdenv.mkDerivation rec { cmake pkg-config which - wrapQtAppsHook ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc - ] ++ lib.optionals pythonSupport [ + ] ++ lib.optionals enablePython [ python3 swig + ] ++ lib.optionals enableQt [ + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - SDL2 ffmpeg fftw frei0r @@ -70,8 +72,6 @@ stdenv.mkDerivation rec { libxml2 movit opencv4 - qtbase - qtsvg rtaudio rubberband sox @@ -80,9 +80,16 @@ stdenv.mkDerivation rec { darwin.apple_sdk_11_0.frameworks.Accelerate ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart - ] ++ lib.optionals jackrackSupport [ + ] ++ lib.optionals enableJackrack [ ladspa-sdk ladspaPlugins + ] ++ lib.optionals enableQt [ + libsForQt5.qtbase + libsForQt5.qtsvg + ] ++ lib.optionals enableSDL1 [ + SDL + ] ++ lib.optionals enableSDL2 [ + SDL2 ]; outputs = [ "out" "dev" ]; @@ -91,13 +98,13 @@ stdenv.mkDerivation rec { # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" "-DMOD_OPENCV=ON" - ] ++ lib.optionals pythonSupport [ + ] ++ lib.optionals enablePython [ "-DSWIG_PYTHON=ON" ]; qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" - ] ++ lib.optionals jackrackSupport [ + ] ++ lib.optionals enableJackrack [ "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" ]; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 48a8d6f39778..fe5c65cb52fe 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -154,9 +154,7 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea maui-core = libsForQt5.callPackage ../development/libraries/maui-core { }; - mlt = callPackage ../development/libraries/mlt/qt-5.nix { - stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; - }; + mlt = pkgs.darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt/qt-5.nix { }; phonon = callPackage ../development/libraries/phonon { }; From 646da2dca1b6da7e661788543bb4b5878a85c42a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 11:43:07 +0000 Subject: [PATCH 167/222] python310Packages.empty-files: 0.0.3 -> 0.0.4 --- pkgs/development/python-modules/empty-files/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/empty-files/default.nix b/pkgs/development/python-modules/empty-files/default.nix index e539d0fea813..3c875da847a4 100644 --- a/pkgs/development/python-modules/empty-files/default.nix +++ b/pkgs/development/python-modules/empty-files/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "empty-files"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "approvals"; repo = "EmptyFiles.Python"; - rev = "v${version}"; - hash = "sha256-K4rlVO1X1AWxYI3EqLsyQ5/Ist/jlwFrmOM4aMojtKU="; + rev = "refs/tags/v${version}"; + hash = "sha256-sXatMH2QEGxzDGszAoFXUoPzB00rYaQIasz93vsfyz8="; }; propagatedBuildInputs = [ From d9ed65a691659b572e7abf12ae11b5c38803139f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 11:55:44 +0000 Subject: [PATCH 168/222] rust-analyzer-unwrapped: 2023-06-19 -> 2023-06-26 --- 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 0f022fe26f32..044f19e93229 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-06-19"; - cargoSha256 = "sha256-aQZkiIRD5r5MSENjrtD2qM/h3ByYfYgOxYx62RgLX7o="; + version = "2023-06-26"; + cargoSha256 = "sha256-ZA2FaEc2RHYhPllhf4ztpboEabglJRF2mfAJSoqLHtY="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-dzTROlAzRR8LIHEud2brANXDV8be1jsBV8aQynxj4UI="; + sha256 = "sha256-5Jn/Nj/xgcjTT289Itng55GLUBTEIULPndl/XrGkUwQ="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; From ce6932ffba9f897727355e46d81b1d84de9fa331 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Thu, 15 Jun 2023 23:00:59 +0200 Subject: [PATCH 169/222] flameshot: Include patch to fix wayland/sway scale-issue --- pkgs/tools/misc/flameshot/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index 137b6cf998d6..0d5458bfe227 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -6,6 +6,7 @@ , qttools , qtsvg , nix-update-script +, fetchpatch }: mkDerivation rec { @@ -19,6 +20,15 @@ mkDerivation rec { sha256 = "sha256-omyMN8d+g1uYsEw41KmpJCwOmVWLokEfbW19vIvG79w="; }; + patches = [ + # https://github.com/flameshot-org/flameshot/pull/3166 + (fetchpatch { + name = "10-fix-wayland.patch"; + url = "https://github.com/flameshot-org/flameshot/commit/5fea9144501f7024344d6f29c480b000b2dcd5a6.patch"; + sha256 = "sha256-SnjVbFMDKD070vR4vGYrwLw6scZAFaQA4b+MbI+0W9E="; + }) + ]; + passthru = { updateScript = nix-update-script { }; }; From 06707cf89660ce60e45344d353c552fff1a0e709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Tue, 27 Jun 2023 14:17:40 +0200 Subject: [PATCH 170/222] mullvad-browser: 12.0.7 -> 12.5 --- .../networking/browsers/mullvad-browser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 753005a118f9..d166f044f7be 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -78,12 +78,12 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "12.0.7"; + version = "12.5"; sources = { x86_64-linux = fetchurl { url = "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz"; - hash = "sha256-8TcC39A9VFyhFb+pfefzvwJqXq1yF7C2YDcbCyEa0yo="; + hash = "sha256-RTDFi+vMkzRtDFgv9sP1bfIeWzzXR307aoMhNiT6vRs="; }; }; From 3acba1d88ee3c8b703d25d51e7470492c160e609 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 12:21:12 +0000 Subject: [PATCH 171/222] python310Packages.py3status: 3.50 -> 3.51 --- pkgs/development/python-modules/py3status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 10eed66a24b0..9d44aff94394 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.50"; + version = "3.51"; src = fetchPypi { inherit pname version; - hash = "sha256-LUFLc7GNEoPIAsTQDhVTt0/NqhwaZHBRLoHF+2nqTUg="; + hash = "sha256-x4MftAC1TyR4FEvl+ytwCYg2cm5qAG/X/MJUhJRGlkU="; }; propagatedBuildInputs = [ From f44d53e50499c0097c0eb7e57badb96d22419609 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 27 Jun 2023 15:33:57 +0300 Subject: [PATCH 172/222] mlt: alias to libsForQt5.mlt --- pkgs/development/libraries/mlt/default.nix | 65 ---------------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 pkgs/development/libraries/mlt/default.nix diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix deleted file mode 100644 index f57ac10468b7..000000000000 --- a/pkgs/development/libraries/mlt/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper -, SDL, ffmpeg_4, frei0r, libjack2, libdv, libsamplerate, libexif -, libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 -, gtk2, gitUpdater, libebur128, rubberband -, jack2, ladspa-sdk, swig, which, ncurses -, enablePython ? false, python3 -}: - -stdenv.mkDerivation rec { - pname = "mlt"; - version = "6.26.0"; - - src = fetchFromGitHub { - owner = "mltframework"; - repo = "mlt"; - rev = "v${version}"; - sha256 = "FPXROiX7A6oB1VMipw3slyhk7q4fO6m9amohnC67lnA="; - }; - - buildInputs = [ - SDL ffmpeg_4 frei0r libjack2 libdv libsamplerate libvorbis libxml2.dev - movit sox libexif gtk2 fftw libebur128 opencv4 SDL2 jack2 - ladspa-sdk rubberband - ] ++ lib.optional enablePython ncurses; - - nativeBuildInputs = [ pkg-config makeWrapper which ] - ++ lib.optionals enablePython [ python3 swig ]; - - strictDeps = true; - - # Mostly taken from: - # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine - configureFlags = [ - "--avformat-swscale" "--enable-gpl" "--enable-gpl3" "--enable-opengl" - ] ++ lib.optional enablePython "--swig-languages=python"; - - enableParallelBuilding = true; - outPythonPath = lib.optionalString enablePython "$(toPythonPath $out)"; - - postInstall = '' - wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 - - # Remove an unnecessary reference to movit.dev. - s=${movit.dev}/include - t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) - sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" - '' + lib.optionalString enablePython '' - mkdir -p ${outPythonPath}/mlt - cp -a src/swig/python/_mlt.so ${outPythonPath}/mlt/ - cp -a src/swig/python/mlt.py ${outPythonPath}/mlt/__init__.py - sed -i ${outPythonPath}/mlt/__init__.py -e "s|return importlib.import_module('_mlt')|return importlib.import_module('mlt._mlt')|g" - ''; - - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; - - meta = with lib; { - description = "Open source multimedia framework, designed for television broadcasting"; - homepage = "https://www.mltframework.org"; - license = with licenses; [ gpl3Only gpl2Only lgpl21Only ]; - maintainers = with maintainers; [ peti ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4e05f6a4dce..4c0acc1b6d96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23349,7 +23349,7 @@ with pkgs; mlc = callPackage ../tools/system/mlc { }; - mlt = callPackage ../development/libraries/mlt { }; + mlt = libsForQt5.mlt; mlib = callPackage ../development/libraries/mlib { }; From de30489be8b5495f4fe4f729153b710dc50640b3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 27 Jun 2023 15:34:01 +0300 Subject: [PATCH 173/222] flowblade: 2.8.0.3 -> 2.10.0.2 --- pkgs/applications/video/flowblade/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/flowblade/default.nix b/pkgs/applications/video/flowblade/default.nix index 2e50dfa12185..36f347432753 100644 --- a/pkgs/applications/video/flowblade/default.nix +++ b/pkgs/applications/video/flowblade/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "flowblade"; - version = "2.8.0.3"; + version = "2.10.0.2"; src = fetchFromGitHub { owner = "jliljebl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/EkI3qiceB5eKTVQnpG+z4e6yaE9hDtn6I+iN/J+h/g="; + sha256 = "sha256-lXMVtWsTyMaGIpEglHvnUgDSaFlnWtB3lSyg6ljNIdQ="; }; buildInputs = [ @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { makeWrapper $out/flowblade/flowblade $out/bin/flowblade \ --set FREI0R_PATH ${frei0r}/lib/frei0r-1 \ --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa \ + --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" \ ''${gappsWrapperArgs[@]} runHook postInstall From bb545d1dc649564eec6539a492ac0995657e61bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 12:41:59 +0000 Subject: [PATCH 174/222] python310Packages.trimesh: 3.22.0 -> 3.22.1 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index cb8cce77fd72..881697ea777b 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.22.0"; + version = "3.22.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-KuE8EVl4VbIFRlddd+Cqvj+aLWU/9ZMgmgyem9inY3Q="; + hash = "sha256-9AVG1CFOFnlIAsoKlJ0QzVSx9aYwsIGa/dr08OFsZLI="; }; nativeBuildInputs = [ setuptools ]; From 4f0bb7e9be72ac97622b2f7e40b944913b0e8ad4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 12:49:12 +0000 Subject: [PATCH 175/222] python310Packages.bitbox02: 6.1.1 -> 6.2.0 --- pkgs/development/python-modules/bitbox02/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix index 91872700b4f2..2e2230f0b586 100644 --- a/pkgs/development/python-modules/bitbox02/default.nix +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitbox02"; - version = "6.1.1"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - hash = "sha256-mVA0CdbGGJn44R6xHnophmsnVMsCwDrPNM3vmXVa7dg="; + hash = "sha256-zt4G45nJjtU2/tbYpCEgjaoA+Xtpe9g2OpQaxfMzCb8="; }; propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ]; From 654dd3076953fea8cfd9f78d4263fc5455be15fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 27 Jun 2023 15:23:41 +0200 Subject: [PATCH 176/222] topgrade: 11.0.2 -> 12.0.0 Diff: https://github.com/topgrade-rs/topgrade/compare/v11.0.2...v12.0.0 Changelog: https://github.com/topgrade-rs/topgrade/releases/tag/v12.0.0 --- pkgs/tools/misc/topgrade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 4e94957c5b12..a8f6750c831e 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "11.0.2"; + version = "12.0.0"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-0pMaFEkzyZkZ7bkPK4hJDjCo/OWYreG+/zyaPl1sNso="; + hash = "sha256-l8/X2PGdUZa9r0E95wpbvag6XW5jV+7H8TJMm/D4yqk="; }; - cargoHash = "sha256-RqJKwk3MeSYx4kfyzF55A7GltM5PZynHbRYCFFj9JkQ="; + cargoHash = "sha256-W+NrhHxPDo+WfNMxDmmPlCdTB/YavLDQ2+JEMDF9qJ4="; nativeBuildInputs = [ installShellFiles From aff8f10c659228b32d20de5996b8455ff3b00f4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 13:31:05 +0000 Subject: [PATCH 177/222] eclint: 0.3.8 -> 0.4.0 --- pkgs/development/tools/eclint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/eclint/default.nix b/pkgs/development/tools/eclint/default.nix index 86ee5a6f384a..4c957011d867 100644 --- a/pkgs/development/tools/eclint/default.nix +++ b/pkgs/development/tools/eclint/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eclint"; - version = "0.3.8"; + version = "0.4.0"; src = fetchFromGitLab { owner = "greut"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wAT+lc8cFf9zOZ72EwIeE2z5mCjGN8vpRoS1k15X738="; + sha256 = "sha256-/WSxhdPekCNgeWf+ObIOblCUj3PyJvykGyCXrFmCXLA="; }; - vendorHash = "sha256-6aIE6MyNDOLRxn+CYSCVNj4Q50HywSh/Q0WxnxCEtg8="; + vendorHash = "sha256-hdMBd0QI2uWktBV+rH73rCnnkIlw2zDT9OabUuWIGks="; ldflags = [ "-X main.version=${version}" ]; From 5f702e92207a43e189a180950f6dc6f8c4d22cfd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 27 Jun 2023 16:33:46 +0300 Subject: [PATCH 178/222] mlt: build without qt5 --- pkgs/development/libraries/mlt/{qt-5.nix => default.nix} | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/qt5-packages.nix | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/development/libraries/mlt/{qt-5.nix => default.nix} (99%) diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/default.nix similarity index 99% rename from pkgs/development/libraries/mlt/qt-5.nix rename to pkgs/development/libraries/mlt/default.nix index bb66003dda3d..71fb4214b833 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -28,7 +28,7 @@ , enablePython ? false , python3 , swig -, enableQt ? true +, enableQt ? false , libsForQt5 , enableSDL1 ? stdenv.isLinux , SDL diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c3be6463d55..e1f6443a4afd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23351,7 +23351,7 @@ with pkgs; mlc = callPackage ../tools/system/mlc { }; - mlt = libsForQt5.mlt; + mlt = darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt { }; mlib = callPackage ../development/libraries/mlib { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index fe5c65cb52fe..58c2e2001839 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -154,7 +154,9 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea maui-core = libsForQt5.callPackage ../development/libraries/maui-core { }; - mlt = pkgs.darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt/qt-5.nix { }; + mlt = pkgs.mlt.override { + enableQt = true; + }; phonon = callPackage ../development/libraries/phonon { }; From fa8d1c88c0f121ff664798eed9f08d700a8a974c Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 27 Jun 2023 09:43:55 -0400 Subject: [PATCH 179/222] gql: 0.1.0 -> 0.2.0 Diff: https://github.com/AmrDeveloper/GQL/compare/0.1.0...0.2.0 Changelog: https://github.com/AmrDeveloper/GQL/releases/tag/0.2.0 --- pkgs/applications/version-management/gql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/applications/version-management/gql/default.nix index c0c9f133e0a6..6329b08beef4 100644 --- a/pkgs/applications/version-management/gql/default.nix +++ b/pkgs/applications/version-management/gql/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-UEfluWgoSuPnHGsoPcVLuAqmJsqCJL2B29UsQeZctuE="; + hash = "sha256-3x4ExSEs22wFP4Z5cY9+F8yyVc5voHAT1odnyzkSlhc="; }; - cargoHash = "sha256-y49pnx1OkUu7yKnwTGpPGv3ULUPpj/Z4bOPVIO3nS0E="; + cargoHash = "sha256-Xmf64yRyWrqYO/ydxEblChVPKnR47Uc55FVAY3DU7no="; nativeBuildInputs = [ pkg-config From 8bf17b92eae4500415bdd56d1d8f7a779da85f97 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 27 Jun 2023 09:50:48 -0400 Subject: [PATCH 180/222] sccache: 0.5.3 -> 0.5.4 Diff: https://github.com/mozilla/sccache/compare/v0.5.3...v0.5.4 Changelog: https://github.com/mozilla/sccache/releases/tag/v0.5.4 --- pkgs/development/tools/misc/sccache/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 7511f47f9a6b..f268a95614fe 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { - version = "0.5.3"; + version = "0.5.4"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = "v${version}"; - sha256 = "sha256-oyuXpb0K2lUnjenYrSHhJ+JaRzfoSSkbPyzA4xersQY="; + sha256 = "sha256-CaZM8c1dref98VL240PEUQE8XtWAvVlQSGnPQspg+jw="; }; - cargoSha256 = "sha256-StPUajNtHLd8YcjUDTd+X75PeldWltV9Wp/L3QhB3Vs="; + cargoSha256 = "sha256-F4lnE5ig3UnZJOdxpnGLesDP3rgEOFzZO0WGQ8mtj+o="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; From 84150943cfd407a70820288fa9399731210ab028 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 27 Jun 2023 09:56:13 -0400 Subject: [PATCH 181/222] frogmouth: 0.6.0 -> 0.7.0 Diff: https://github.com/Textualize/frogmouth/compare/v0.6.0...v0.7.0 Changelog: https://github.com/Textualize/frogmouth/blob/v0.7.0/ChangeLog.md --- pkgs/tools/text/frogmouth/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/frogmouth/default.nix b/pkgs/tools/text/frogmouth/default.nix index 658d06564966..649e5001438b 100644 --- a/pkgs/tools/text/frogmouth/default.nix +++ b/pkgs/tools/text/frogmouth/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "frogmouth"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Textualize"; repo = "frogmouth"; rev = "v${version}"; - hash = "sha256-BgJdcdIgYNZUJLWDgUWIDyiSSAkLdePYus3IYQo/QpY="; + hash = "sha256-XKIGZ100aK5ZCsPxxakXhymYXXFYo7S+chMFs7jwXtw="; }; nativeBuildInputs = [ @@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "httpx" "xdg" ]; From 569ee885332893165af11f231214419914b87b5a Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 27 Jun 2023 22:15:01 +0900 Subject: [PATCH 182/222] python3Packages.langchainplus-sdk: 0.0.16 -> 0.0.17 --- pkgs/development/python-modules/langchainplus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchainplus-sdk/default.nix b/pkgs/development/python-modules/langchainplus-sdk/default.nix index e741990ae518..a3aff49b4059 100644 --- a/pkgs/development/python-modules/langchainplus-sdk/default.nix +++ b/pkgs/development/python-modules/langchainplus-sdk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "langchainplus-sdk"; - version = "0.0.16"; + version = "0.0.17"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "langchainplus_sdk"; - hash = "sha256-L8Bn3QOO3PGAhtNC2ixpCYTE03+b+mhP/MrqNLQ+2yg="; + hash = "sha256-ZSDIZKI9ytvm+3IzoRc0f2rMMnJal3WOWTVHBMUN4wM="; }; nativeBuildInputs = [ From 534528c1c650e18ef1fdc9a4f2c28fe0a68eb7a8 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 27 Jun 2023 22:16:08 +0900 Subject: [PATCH 183/222] python3Packages.langchain: 0.0.207 -> 0.0.216 Diff: https://github.com/hwchase17/langchain/compare/refs/tags/v0.0.207...v0.0.216 Changelog: https://github.com/hwchase17/langchain/releases/tag/v0.0.216 --- pkgs/development/python-modules/langchain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 139380b3c77a..07cc537d019f 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.0.207"; + version = "0.0.216"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -86,7 +86,7 @@ buildPythonPackage rec { owner = "hwchase17"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-/gPkgHcHHyFAhPF4hqEMkOaHV9Z1159ZdB2lwtsJEKE="; + hash = "sha256-g01EMquASxXl9drLhKtTwG9+gSa17aBq0c8UXcErCjI="; }; postPatch = '' From a18dd04d467001c4a02d853cba3b269416e15da2 Mon Sep 17 00:00:00 2001 From: Ch1keen Date: Tue, 27 Jun 2023 23:42:59 +0900 Subject: [PATCH 184/222] ronin: 2.0.1 to 2.0.3 --- pkgs/tools/security/ronin/Gemfile | 4 + pkgs/tools/security/ronin/Gemfile.lock | 97 +++++++---- pkgs/tools/security/ronin/default.nix | 27 +-- pkgs/tools/security/ronin/gemset.nix | 224 ++++++++++++++++++------- 4 files changed, 238 insertions(+), 114 deletions(-) diff --git a/pkgs/tools/security/ronin/Gemfile b/pkgs/tools/security/ronin/Gemfile index c96b9c6f6f52..94dd203e9e08 100644 --- a/pkgs/tools/security/ronin/Gemfile +++ b/pkgs/tools/security/ronin/Gemfile @@ -2,4 +2,8 @@ source "https://rubygems.org" +gem "net-ftp" +gem "net-imap" +gem "net-pop" +gem "net-smtp" gem "ronin" diff --git a/pkgs/tools/security/ronin/Gemfile.lock b/pkgs/tools/security/ronin/Gemfile.lock index afef9eed8bec..a085fb531b37 100644 --- a/pkgs/tools/security/ronin/Gemfile.lock +++ b/pkgs/tools/security/ronin/Gemfile.lock @@ -1,46 +1,50 @@ GEM remote: https://rubygems.org/ specs: - activemodel (7.0.4.3) - activesupport (= 7.0.4.3) - activerecord (7.0.4.3) - activemodel (= 7.0.4.3) - activesupport (= 7.0.4.3) - activesupport (7.0.4.3) + activemodel (7.0.5.1) + activesupport (= 7.0.5.1) + activerecord (7.0.5.1) + activemodel (= 7.0.5.1) + activesupport (= 7.0.5.1) + activesupport (7.0.5.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.2) + addressable (2.8.4) public_suffix (>= 2.0.2, < 6.0) - async (2.5.0) + async (2.6.2) console (~> 1.10) + fiber-annotation io-event (~> 1.1) timers (~> 4.1) - async-io (1.34.3) + async-io (1.35.0) async chars (0.3.2) combinatorics (0.4.4) command_kit (0.4.0) command_mapper (0.3.1) concurrent-ruby (1.2.2) - connection_pool (2.4.0) - console (1.16.2) + connection_pool (2.4.1) + console (1.17.2) + fiber-annotation fiber-local + date (3.3.3) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) fake_io (0.1.0) + fiber-annotation (0.2.0) fiber-local (1.0.0) hexdump (1.0.0) http-cookie (1.0.5) domain_name (~> 0.5) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) io-console (0.6.0) - io-event (1.1.7) - irb (1.6.3) + io-event (1.2.2) + irb (1.7.0) reline (>= 0.3.0) - mechanize (2.8.5) + mechanize (2.9.1) addressable (~> 2.8) domain_name (~> 0.5, >= 0.5.20190701) http-cookie (~> 1.0, >= 1.0.3) @@ -54,15 +58,27 @@ GEM mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2023.0218.1) - mini_portile2 (2.8.1) - minitest (5.18.0) + mini_portile2 (2.8.2) + minitest (5.18.1) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) + net-ftp (0.2.0) + net-protocol + time net-http-digest_auth (1.4.1) net-http-persistent (4.0.2) connection_pool (~> 2.2) - nokogiri (1.14.2) - mini_portile2 (~> 2.8.0) + net-imap (0.3.6) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.3.3) + net-protocol + nokogiri (1.15.2) + mini_portile2 (~> 2.8.2) racc (~> 1.4) nokogiri-diff (0.2.0) nokogiri (~> 1.5) @@ -71,16 +87,16 @@ GEM nokogiri (~> 1.0) open_namespace (0.4.1) public_suffix (5.0.1) - racc (1.6.2) - rack (2.2.6.4) - rack-protection (3.0.5) + racc (1.7.1) + rack (2.2.7) + rack-protection (3.0.6) rack rack-user_agent (0.5.3) rack (>= 1.5) woothee (>= 1.0.0) - reline (0.3.3) + reline (0.3.5) io-console (~> 0.5) - ronin (2.0.1) + ronin (2.0.3) async-io (~> 1.0) open_namespace (~> 0.4) ronin-code-asm (~> 1.0) @@ -98,21 +114,21 @@ GEM wordlist (~> 1.0) ronin-code-asm (1.0.0) ruby-yasm (~> 0.3) - ronin-code-sql (2.0.0) + ronin-code-sql (2.1.0) ronin-support (~> 1.0) ronin-core (0.1.1) command_kit (~> 0.4) irb (~> 1.0) reline (~> 0.1) - ronin-db (0.1.0) + ronin-db (0.1.1) ronin-core (~> 0.1) ronin-db-activerecord (~> 0.1) ronin-support (~> 1.0) sqlite3 (~> 1.0) - ronin-db-activerecord (0.1.0) + ronin-db-activerecord (0.1.1) activerecord (~> 7.0) uri-query_params (~> 0.6) - ronin-exploits (1.0.1) + ronin-exploits (1.0.2) ronin-code-sql (~> 2.0) ronin-core (~> 0.1) ronin-payloads (~> 0.1, >= 0.1.1) @@ -125,7 +141,7 @@ GEM combinatorics (~> 0.4) ronin-core (~> 0.1) ronin-support (~> 1.0) - ronin-payloads (0.1.1) + ronin-payloads (0.1.3) ronin-code-asm (~> 1.0) ronin-core (~> 0.1) ronin-post_ex (~> 0.1) @@ -135,9 +151,9 @@ GEM fake_io (~> 0.1) hexdump (~> 1.0) ronin-core (~> 0.1) - ronin-repos (0.1.0) + ronin-repos (0.1.1) ronin-core (~> 0.1) - ronin-support (1.0.1) + ronin-support (1.0.2) addressable (~> 2.0) chars (~> 0.3, >= 0.3.2) combinatorics (~> 0.4) @@ -146,7 +162,7 @@ GEM ronin-vulns (0.1.2) ronin-core (~> 0.1) ronin-support (~> 1.0, >= 1.0.1) - ronin-web (1.0.1) + ronin-web (1.0.2) mechanize (~> 2.0) nokogiri (~> 1.4) nokogiri-diff (~> 0.2) @@ -172,17 +188,20 @@ GEM command_mapper (~> 0.1) ruby2_keywords (0.0.5) rubyntlm (0.6.3) - sinatra (3.0.5) + sinatra (3.0.6) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.5) + rack-protection (= 3.0.6) tilt (~> 2.0) spidr (0.7.0) nokogiri (~> 1.3) - sqlite3 (1.6.2) + sqlite3 (1.6.3) mini_portile2 (~> 2.8.0) tdiff (0.3.4) - tilt (2.1.0) + tilt (2.2.0) + time (0.2.2) + date + timeout (0.4.0) timers (4.3.5) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -199,7 +218,11 @@ PLATFORMS ruby DEPENDENCIES + net-ftp + net-imap + net-pop + net-smtp ronin BUNDLED WITH - 2.3.7 + 2.4.10 diff --git a/pkgs/tools/security/ronin/default.nix b/pkgs/tools/security/ronin/default.nix index 8116d5c355f6..bdde1df36996 100644 --- a/pkgs/tools/security/ronin/default.nix +++ b/pkgs/tools/security/ronin/default.nix @@ -1,18 +1,19 @@ -{ pkgs, lib, bundlerApp, bundlerUpdateScript }: +{ lib, bundlerEnv, bundlerUpdateScript, defaultGemConfig, yasm }: -bundlerApp { - pname = "ronin"; +bundlerEnv { + name = "ronin"; gemdir = ./.; - exes = [ - "ronin" - "ronin-db" - "ronin-exploits" - "ronin-fuzzer" - "ronin-payloads" - "ronin-repos" - "ronin-vulns" - "ronin-web" - ]; + + gemConfig = defaultGemConfig // { + ronin-code-asm = attrs: { + dontBuild = false; + postPatch = '' + substituteInPlace lib/ronin/code/asm/program.rb \ + --replace "YASM::Command.run(" "YASM::Command.run( + command_path: '${yasm}/bin/yasm'," + ''; + }; + }; passthru.updateScript = bundlerUpdateScript "ronin"; diff --git a/pkgs/tools/security/ronin/gemset.nix b/pkgs/tools/security/ronin/gemset.nix index 5940d6a853b0..c979749c7d3a 100644 --- a/pkgs/tools/security/ronin/gemset.nix +++ b/pkgs/tools/security/ronin/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ymhsxgdb68zgf4zp07g2bymmpgn0b9r38avn9pagz1p5zy1ql9v"; + sha256 = "12f89hxs4s26ggsg4bnz9qxlcsclcgx9gdsl8dni5jc0gk47h14y"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.5.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01wb98i2zsbb4jcb4i6z72vb05wiks4hv9chc66h1rsxrv0zi4dv"; + sha256 = "1sfdq2slmsc0ygncl36dq1lmjww1y3b42izrnn62cyisiag28796"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.5.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp"; + sha256 = "0m1sa6djlm9cz6mz3lcbqqahvm6qj75dmq3phpn2ysyxnlz2hr0c"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.5.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -38,21 +38,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0km8qw6qzximlg9iz24acqbpbzjw0r05bgavc6zqs3282xkyhimy"; + sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.4"; }; async = { - dependencies = ["console" "io-event" "timers"]; + dependencies = ["console" "fiber-annotation" "io-event" "timers"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gj166ij131c5d53dj51ad8v25dsrn9xym3vx8wkma1n40x3d6la"; + sha256 = "0gk3mbwrzyrc1a5669x8cw83qkddjyg42dxwdx3xb4rf7rwnzdx3"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.2"; }; async-io = { dependencies = ["async"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10qxdz7hi136gp4pgzmw49vp8mz4fk89lc2319lp3d8iqn8w1swj"; + sha256 = "1cx4kgyr8yhg0rfcasmny9sbxjxvf07dmcw85yzismadfli1sndz"; type = "gem"; }; - version = "1.34.3"; + version = "1.35.0"; }; chars = { groups = ["default"]; @@ -120,21 +120,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dndngqvkm2ih3wqn5ilf9980c1cc57lqn5lywx3myalzpilq05z"; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; console = { - dependencies = ["fiber-local"]; + dependencies = ["fiber-annotation" "fiber-local"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y1bv3kd1l9p0k5n3anvvjxdrcq113pyngz2g29i9mvdgbbx7kq2"; + sha256 = "1kxcxm3ynrsv6d60r2pzbw6rzdbg506hn3536pflaf747c5y2db7"; type = "gem"; }; - version = "1.16.2"; + version = "1.17.2"; + }; + date = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + type = "gem"; + }; + version = "3.3.3"; }; domain_name = { dependencies = ["unf"]; @@ -157,6 +167,16 @@ }; version = "0.1.0"; }; + fiber-annotation = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00vcmynyvhny8n4p799rrhcx0m033hivy0s1gn30ix8rs7qsvgvs"; + type = "gem"; + }; + version = "0.2.0"; + }; fiber-local = { groups = ["default"]; platforms = []; @@ -194,10 +214,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.1"; }; io-console = { groups = ["default"]; @@ -214,10 +234,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mk579b88kvv5r4as0f6niq02176c6lmph305ml4piklgx6a1fsa"; + sha256 = "0j36a76mbcvp5516liiv01z5gz3f64waiqgskj1zrxqbwyirx5h7"; type = "gem"; }; - version = "1.1.7"; + version = "1.2.2"; }; irb = { dependencies = ["reline"]; @@ -225,10 +245,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h9s07n5v3z029v18924ws9vdkdc80n6llp9ccx77yg1krv2g0f3"; + sha256 = "0z7ksjik7phf6ygshg9bp6ldd38dfgxmgr73yipkpqq7b426hclq"; type = "gem"; }; - version = "1.6.3"; + version = "1.7.0"; }; mechanize = { dependencies = ["addressable" "domain_name" "http-cookie" "mime-types" "net-http-digest_auth" "net-http-persistent" "nokogiri" "rubyntlm" "webrick" "webrobots"]; @@ -236,10 +256,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1adjnzvq3rxqz7xf3qr7c0p85ccfwmn0l3fcmch6cjwz0i9vc5ah"; + sha256 = "08lcl3qwgi8r3q0hm5ysmj7j5xqb289kqrd15w09anirj36jc80z"; type = "gem"; }; - version = "2.8.5"; + version = "2.9.1"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -267,20 +287,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; + sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.2"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; + sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb"; type = "gem"; }; - version = "5.18.0"; + version = "5.18.1"; }; mustermann = { dependencies = ["ruby2_keywords"]; @@ -293,6 +313,17 @@ }; version = "3.0.0"; }; + net-ftp = { + dependencies = ["net-protocol" "time"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bqy9xg5225x102873j1qqq1bvnwfbi8lnf4357mpq6wimnw9pf9"; + type = "gem"; + }; + version = "0.2.0"; + }; net-http-digest_auth = { groups = ["default"]; platforms = []; @@ -314,16 +345,60 @@ }; version = "4.0.2"; }; + net-imap = { + dependencies = ["date" "net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k1qyjr9lkk5y3483k6wk6d9h1jx4v5hzby1mf0pj3b4kr2arxbm"; + type = "gem"; + }; + version = "0.3.6"; + }; + net-pop = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; + type = "gem"; + }; + version = "0.1.2"; + }; + net-protocol = { + dependencies = ["timeout"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + type = "gem"; + }; + version = "0.2.1"; + }; + net-smtp = { + dependencies = ["net-protocol"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + type = "gem"; + }; + version = "0.3.3"; + }; nokogiri = { dependencies = ["mini_portile2" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1djq4rp4m967mn6sxmiw75vz24gfp0w602xv22kk1x3cmi5afrf7"; + sha256 = "1mr2ibfk874ncv0qbdkynay738w2mfinlkhnbd5lyk5yiw5q1p10"; type = "gem"; }; - version = "1.14.2"; + version = "1.15.2"; }; nokogiri-diff = { dependencies = ["nokogiri" "tdiff"]; @@ -372,20 +447,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; + sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.1"; }; rack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk"; + sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; type = "gem"; }; - version = "2.2.6.4"; + version = "2.2.7"; }; rack-protection = { dependencies = ["rack"]; @@ -393,10 +468,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis"; + sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8"; type = "gem"; }; - version = "3.0.5"; + version = "3.0.6"; }; rack-user_agent = { dependencies = ["rack" "woothee"]; @@ -415,10 +490,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zpz436h6gxyh000bdsm1m53kb5zgl97cfb45rxk2w5z2fgl30f3"; + sha256 = "0k5rqi4b7qnwxslc54k0nnfg97842i6hmjnyy79pqyydwwcjhj0i"; type = "gem"; }; - version = "0.3.3"; + version = "0.3.5"; }; ronin = { dependencies = ["async-io" "open_namespace" "ronin-code-asm" "ronin-code-sql" "ronin-core" "ronin-db" "ronin-exploits" "ronin-fuzzer" "ronin-payloads" "ronin-repos" "ronin-support" "ronin-vulns" "ronin-web" "rouge" "wordlist"]; @@ -426,10 +501,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10jnlhacvcqhfd31hi1208xhmxv8fqa3yz6nwc0g1bb5271v2j16"; + sha256 = "0z56vz0ndakxyngivpa6zn4ja2g5lzaz51aws9778bpcai5i300x"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.3"; }; ronin-code-asm = { dependencies = ["ruby-yasm"]; @@ -448,10 +523,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mdnjvfvazyn0pnsjm1vdj906wmh97vvvi8mizjkvvipxkzizr40"; + sha256 = "1z6ynbrbzlkab1fbhccghr2xm6dak9xb2djqjlc6nai3fdhid1v8"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; ronin-core = { dependencies = ["command_kit" "irb" "reline"]; @@ -470,10 +545,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0ybr2pw7can5sgnibmmlh97aicq1m31l8ldsswj56fkrjjn7r1"; + sha256 = "0x2mmwbmhc2fh4lk7nx6jbp894mg4aa6n35pkiaf8n527kksa9cd"; type = "gem"; }; - version = "0.1.0"; + version = "0.1.1"; }; ronin-db-activerecord = { dependencies = ["activerecord" "uri-query_params"]; @@ -481,10 +556,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13a39x9dwr4ismfrz2vf4yv7abmx9vzgfdj0diiz79ysfmbmj6a4"; + sha256 = "1vygs09ib2dsna1w2lgv4f1qxa6q1niyqvihy4f49f9ppk52mwhh"; type = "gem"; }; - version = "0.1.0"; + version = "0.1.1"; }; ronin-exploits = { dependencies = ["ronin-code-sql" "ronin-core" "ronin-payloads" "ronin-post_ex" "ronin-repos" "ronin-support" "ronin-vulns" "uri-query_params"]; @@ -492,10 +567,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0niw585sg40wj23d9j0l98bnhyxvlaif92s7dynznf7x4igmp9rj"; + sha256 = "078p7fkrgzkjip11wgcvifc5xwcysfy3r1qsh5pid97ysp1qg477"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; ronin-fuzzer = { dependencies = ["combinatorics" "ronin-core" "ronin-support"]; @@ -514,10 +589,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z8k5g9r0bi8mhkmzbgx4lpw1civnmc6adl5hy0k3dp9wm3qs002"; + sha256 = "15n2nfrrf695i2fk1vr3f84sgnnhn6v2dhdmfxzrdknr5fckvbic"; type = "gem"; }; - version = "0.1.1"; + version = "0.1.3"; }; ronin-post_ex = { dependencies = ["fake_io" "hexdump" "ronin-core"]; @@ -536,10 +611,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "054zm9bcri9gklsr7xh1z8qqzm7a6n0j8m7mm0553hr1mnpah94p"; + sha256 = "0c453qw7xr4vsq2y5dlnihfmzy95q3xjbfl5cm1y0xwzdm7ibbzx"; type = "gem"; }; - version = "0.1.0"; + version = "0.1.1"; }; ronin-support = { dependencies = ["addressable" "chars" "combinatorics" "hexdump" "uri-query_params"]; @@ -547,10 +622,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pysnsgdn8hxn2wikgs0x3kcz0r4a1n5fdsys6c1z0kmslh4f52k"; + sha256 = "0ds32mk7s96gsi3q0m2ljgl122glalya1cbjx1xjjq8wbrbsxdjr"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; ronin-vulns = { dependencies = ["ronin-core" "ronin-support"]; @@ -569,10 +644,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wzd7dibc7lkqvw0kqx4py6srqd3ic2mbr7jzyq7d7wrx4inbpgs"; + sha256 = "06rh7hrkj4yl6pn1m3isfim2sk5vb3ap3rba91bw7drcqsra7fmw"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; ronin-web-server = { dependencies = ["rack" "rack-user_agent" "ronin-support" "sinatra" "webrick"]; @@ -653,10 +728,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ryfja9yd3fq8n1p5yi3qnd0pjk7bkycmxxmbb1bj0axlr1pdv20"; + sha256 = "1q0ghxfqgjhg2dq9699mn5qx6m6q2cgldg312kh41pzwwy71a7hx"; type = "gem"; }; - version = "3.0.5"; + version = "3.0.6"; }; spidr = { dependencies = ["nokogiri"]; @@ -675,10 +750,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i47n6nkyigkyag00yqf9f3nj11bm1lb0ds5nkvkdvm7lxbna5jq"; + sha256 = "0h95kr5529qv786mfk8r2jjdsdi6v7v3k3dpz69mrcc9i0vpdd37"; type = "gem"; }; - version = "1.6.2"; + version = "1.6.3"; }; tdiff = { groups = ["default"]; @@ -695,10 +770,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qmhi6d9przjzhsyk9g5pq2j75c656msh6xzprqd2mxgphf23jxs"; + sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; + }; + time = { + dependencies = ["date"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13pzdsgf3v06mymzipcpa7p80shyw328ybn775nzpnhc6n8y9g30"; + type = "gem"; + }; + version = "0.2.2"; + }; + timeout = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; + type = "gem"; + }; + version = "0.4.0"; }; timers = { groups = ["default"]; From 75a1eb09fe1221b3c4f9be4c40a97cd15bd2e1d8 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Tue, 27 Jun 2023 16:44:00 +0200 Subject: [PATCH 185/222] _1password-gui-beta: 8.10.8-13 -> 8.10.8-42 --- pkgs/applications/misc/1password-gui/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 0d8fc9b9df07..22d18aad24c9 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,7 +9,7 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.7" else "8.10.8-13.BETA"; + version = if channel == "stable" then "8.10.7" else "8.10.8-42.BETA"; sources = { stable = { @@ -33,19 +33,19 @@ let beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-+Gg4OJXjdufEBNa3+qBXz0/NfPDXDfuiCYjMEDHnOKo="; + sha256 = "sha256-nPstDndWuPMSGJlbyniEfljdEy+TOB9zWMJ+db7xCx4="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - sha256 = "sha256-xDwwxo4UsoPzcxFblYeZ9QIDIJ6f6vGBxYySqP9o/A0="; + sha256 = "sha256-waJjvqF6OXGrf90srvvZ+hyxapcQApGTsxTzNMX9V3s="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - sha256 = "sha256-NphHgeMrjBqApU5crNj1JOTTXD4kXoO067feVs/YxuA="; + sha256 = "sha256-i9hbnjXx2/RWJ9YvrFDOGbi7dpiHtxWsN0HAZPOhK8o="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - sha256 = "sha256-M1MnSbZ6qsT7Ke5e8/4ppCxlXekulJnm9Zb5+4tt8Vg="; + sha256 = "sha256-tat2x2J4/yKhWp4sWCEqU+SSZaNRx8WTcCJAAbo1Kpk="; }; }; }; From e87cb08ecff62fe0a8026e6b66b8050d1d50a008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Tue, 27 Jun 2023 09:08:27 -0600 Subject: [PATCH 186/222] mill: add zenithal as maintainer --- pkgs/development/tools/build-managers/mill/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index a028bbb07826..ff38657334da 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { SBT, but can also be extended to support any other language or platform via modules (written in Java or Scala) or through an external subprocesses. ''; - maintainers = with maintainers; [ scalavision ]; + maintainers = with maintainers; [ scalavision zenithal ]; platforms = lib.platforms.all; }; } From 335cab2c8105dcf047bd9fbaffd49d409618ee70 Mon Sep 17 00:00:00 2001 From: Jacob Moody Date: Tue, 27 Jun 2023 10:25:34 -0500 Subject: [PATCH 187/222] wlr-protocols: 2021-11-01 -> 2022-09-05 --- pkgs/development/libraries/wlroots/protocols.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wlroots/protocols.nix b/pkgs/development/libraries/wlroots/protocols.nix index d2ff39d7d574..87234d208da3 100644 --- a/pkgs/development/libraries/wlroots/protocols.nix +++ b/pkgs/development/libraries/wlroots/protocols.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "wlr-protocols"; - version = "unstable-2021-11-01"; + version = "unstable-2022-09-05"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlr-protocols"; - rev = "d998ee6fc64ea7e066014023653d1271b7702c09"; - sha256 = "1vw8b10d1pwsj6f4sr3imvwsy55d3435sp068sj4hdszkxc6axsr"; + rev = "4264185db3b7e961e7f157e1cc4fd0ab75137568"; + sha256 = "Ztc07RLg+BZPondP/r6Jo3Fw1QY/z1QsFvdEuOqQshA="; }; strictDeps = true; From 546a7cfcec0a821a4b105d4e4dd97df6cbc81a25 Mon Sep 17 00:00:00 2001 From: Basti Date: Tue, 27 Jun 2023 15:41:11 +0000 Subject: [PATCH 188/222] vscode-extensions.brandonkirbyson.solarized-palenight: init at 1.0.1 (#237981) --- .../editors/vscode/extensions/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2ad08d6fa71b..82a847ea0821 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -587,6 +587,22 @@ let }; }; + brandonkirbyson.solarized-palenight = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "solarized-palenight"; + publisher = "BrandonKirbyson"; + version = "1.0.1"; + sha256 = "sha256-vVbaHSaBX6QzpnYMQlpPsJU1TQYJEBe8jq95muzwN0o="; + }; + meta = { + description = " A solarized-palenight theme for vscode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=BrandonKirbyson.solarized-palenight"; + homepage = "https://github.com/BrandonKirbyson/Solarized-Palenight"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sebtm ]; + }; + }; + brettm12345.nixfmt-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "nixfmt-vscode"; From 249c7b9d90f85cb9003b73aad88035f1fee10772 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 16:03:02 +0000 Subject: [PATCH 189/222] spdx-license-list-data: 3.20 -> 3.21 --- pkgs/data/misc/spdx-license-list-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix index 2cbcad3fb880..44b5e7423d59 100644 --- a/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.20"; + version = "3.21"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - hash = "sha256-qMVUP1EpeeO+i5RfnAt/Idz+pR9dVyCT4Ss9lEJgj6k="; + hash = "sha256-dv8aC4giD0JqaYN19eCHzEbmwXhqX+ZrKrwit9tzf5Y="; }; # List of file formats to package. From d7bbbfbff0fe82c996f31fb6c4d45fe3ec97f4e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jun 2023 18:03:58 +0200 Subject: [PATCH 190/222] python311Packages.camel-converter: 3.0.0 -> 3.0.1 (#240060) Diff: https://github.com/sanders41/camel-converter/compare/refs/tags/v3.0.0...v3.0.1 Changelog: https://github.com/sanders41/camel-converter/releases/tag/v3.0.1 --- pkgs/development/python-modules/camel-converter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/camel-converter/default.nix b/pkgs/development/python-modules/camel-converter/default.nix index 3d2f9e7b40e6..a5386b8b047b 100644 --- a/pkgs/development/python-modules/camel-converter/default.nix +++ b/pkgs/development/python-modules/camel-converter/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "camel-converter"; - version = "3.0.0"; + version = "3.0.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "sanders41"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SUuSaQU6o2OtjDNrDcO3nS0EZH2ammEkP7AEp4H5ysI="; + hash = "sha256-t0wZ03xMNuBEUeXC+DizNSVJmnlt2SH9f0qw6F4UXg8="; }; postPatch = '' From 3b70992e660befa8b4b6070a353aedb645071b26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 08:09:31 +0000 Subject: [PATCH 191/222] python310Packages.msgspec: 0.15.1 -> 0.16.0 --- pkgs/development/python-modules/msgspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index 133d2edc39cb..23118e77a472 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.15.1"; + version = "0.16.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-U3mCnp7MojWcw1pZExG6pYAToVjzGXqc2TeDyhm39TY="; + hash = "sha256-FhYNQ6ODLJSdXRzEwmE5CLxzeImBKj6brx2CBeVC7BM="; }; # Requires libasan to be accessible From 0d9bbeda51c6481b78d9d187946ba58b857d6bee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jun 2023 09:59:24 +0200 Subject: [PATCH 192/222] python311Packages.vsure: 2.6.1 -> 2.6.2 --- pkgs/development/python-modules/vsure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix index b51622ed077d..4b92d9b58444 100644 --- a/pkgs/development/python-modules/vsure/default.nix +++ b/pkgs/development/python-modules/vsure/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "vsure"; - version = "2.6.1"; + version = "2.6.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-D6Q76L1BVx5hpFSShP1rUOmgTogEO+6Jj5x8GaepC+c="; + hash = "sha256-8AqxLIrsFtAazH+ZqhXbkYNhlAhQ5XL/tNFRAGLh2kk="; }; propagatedBuildInputs = [ From fbcf9076d2d669e2176c479edcbce885498404f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jun 2023 10:02:30 +0200 Subject: [PATCH 193/222] python311Packages.vsure: add changelog to meta --- pkgs/development/python-modules/vsure/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix index 4b92d9b58444..b204c6c79bff 100644 --- a/pkgs/development/python-modules/vsure/default.nix +++ b/pkgs/development/python-modules/vsure/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , click +, pythonOlder , requests }: @@ -10,6 +11,8 @@ buildPythonPackage rec { version = "2.6.2"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; hash = "sha256-8AqxLIrsFtAazH+ZqhXbkYNhlAhQ5XL/tNFRAGLh2kk="; @@ -30,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for working with verisure devices"; homepage = "https://github.com/persandstrom/python-verisure"; + changelog = "https://github.com/persandstrom/python-verisure#version-history"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 222222fd76fddfd90ed8fdb35552a77f589b8304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 23 May 2023 22:10:44 +0200 Subject: [PATCH 194/222] python310Packages.fastnumbers: disable hypothesis too slow healthcheck through upstream defined profiles log lines I have: last 10 log lines: > tests/test_fastnumbers.py:1330: in test_given_unicode_digit_returns_true > @parametrize("func", get_funcs(funcs), ids=funcs) > E hypothesis.errors.FailedHealthCheck: Data generation is extremely slow: Only produced 9 valid examples in 1.26 seconds (0 invalid ones and 0 exceeded maximum size). Try decreasing size of the data you're generating (with e.g. max_size or max_leaves parameters). > E See https://hypothesis.readthedocs.io/en/latest/healthchecks.html for more information about this. If you want to disable just this health check, add HealthCheck.too_slow to the suppress_health_check settings for this test. > ---------------------------------- Hypothesis ---------------------------------- > You can add @seed(21402865096374572269346745328342401108) to this test or run pytest with --hypothesis-seed=21402865096374572269346745328342401108 to reproduce this failure. > =========================== short test summary info ============================ > FAILED tests/test_fastnumbers.py::TestCheckingFunctions::test_given_unicode_digit_returns_true[check_int] - hypothesis.errors.FailedHealthCheck: Data generation is extremely slow: Onl... > ============ 1 failed, 1838 passed, 1 skipped in 383.89s (0:06:23) ============= > /nix/store/37p8gq9zijbw6pj3lpi1ckqiv18j2g62-stdenv-linux/setup: line 1594: pop_var_context: head of shell_variables not a function context For full logs, run 'nix log /nix/store/avsxawhbbrfmp0128i5qfsqkzxka343z-python3.10-fastnumbers-5.0.1.drv'. --- pkgs/development/python-modules/fastnumbers/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/fastnumbers/default.nix b/pkgs/development/python-modules/fastnumbers/default.nix index e3a91b366d3f..7be3e25698ba 100644 --- a/pkgs/development/python-modules/fastnumbers/default.nix +++ b/pkgs/development/python-modules/fastnumbers/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildPythonPackage -, fastnumbers , fetchFromGitHub , hypothesis , numpy @@ -43,6 +42,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--hypothesis-profile=standard" + ]; + pythonImportsCheck = [ "fastnumbers" ]; From 5293bbdbef16445fa4fe94a3747efce1f9c19b9d Mon Sep 17 00:00:00 2001 From: William Veal Phan Date: Tue, 27 Jun 2023 18:19:10 +0200 Subject: [PATCH 195/222] sbt: 1.9.0 -> 1.9.1 (#240143) following release https://github.com/sbt/sbt/releases/tag/v1.9.1 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 2678e3735dfd..c8696d75c51b 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-zFWTSOr5z75s4i9omx5EDI4FtOSc1r6jmHZHd7N5SMQ="; + hash = "sha256-KcylFTzJYxXW5CN3flgAuDHkVyO0dzLCB6Zu+lyk/Cs="; }; postPatch = '' From 9ec300ecdb009e425d1ad0034ebbf18ca8fd0ade Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Tue, 27 Jun 2023 18:20:40 +0200 Subject: [PATCH 196/222] portfolio: 0.64.0 -> 0.64.1 (#240009) --- pkgs/applications/office/portfolio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 1940b54be656..c8750719698c 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.64.0"; + version = "0.64.1"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-8LebPYIML3YV8DsoLPQiH4Q6ETBTgZ7IpeGJDN2R7ro="; + hash = "sha256-R3Cj24dZ2wD1c29zRLGnuJm3wfc9+n/sNNW316HT9N4="; }; nativeBuildInputs = [ From 658499ef7e627e27342db62abed82132c0478140 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 28 Jun 2023 00:21:48 +0800 Subject: [PATCH 197/222] dcrd: 1.5.2 -> 1.8.0 (#239893) --- pkgs/applications/blockchains/dcrd/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/blockchains/dcrd/default.nix b/pkgs/applications/blockchains/dcrd/default.nix index e959eca48aeb..75c00719215d 100644 --- a/pkgs/applications/blockchains/dcrd/default.nix +++ b/pkgs/applications/blockchains/dcrd/default.nix @@ -2,20 +2,18 @@ buildGoModule rec { pname = "dcrd"; - version = "1.5.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "decred"; repo = "dcrd"; rev = "refs/tags/release-v${version}"; - sha256 = "14pxajc8si90hnddilfm09kmljwxq6i6p53fk0g09jp000cbklkl"; + hash = "sha256-ZNBSIzx07zJrBxas7bHpZ8ZPDWJ4d7jumpKYj5Qmzlo="; }; - vendorSha256 = "03aw6mcvp1vr01ppxy673jf5hdryd5032cxndlkaiwg005mxp1dy"; + vendorHash = "sha256-++IPB2IadXd1LC5r6f1a0UqsTG/McAf7KQAw8WKKoaE="; - doCheck = false; - - subPackages = [ "." "cmd/dcrctl" "cmd/promptsecret" ]; + subPackages = [ "." "cmd/promptsecret" ]; meta = { homepage = "https://decred.org"; From d3a2557f7c6ba2da80f919802259b7ecb6c98776 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 28 Jun 2023 00:22:10 +0800 Subject: [PATCH 198/222] dcrwallet: 1.6.0 -> 1.8.0 (#239894) --- pkgs/applications/blockchains/dcrwallet/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/blockchains/dcrwallet/default.nix b/pkgs/applications/blockchains/dcrwallet/default.nix index 2266a1e4c260..d66147ca52bf 100644 --- a/pkgs/applications/blockchains/dcrwallet/default.nix +++ b/pkgs/applications/blockchains/dcrwallet/default.nix @@ -2,18 +2,16 @@ buildGoModule rec { pname = "dcrwallet"; - version = "1.6.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "decred"; repo = "dcrwallet"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-WUfmv+laOwR/fc4osAFzPKqHQR+wOtSdLEsysICnuvg="; + rev = "release-v${version}"; + hash = "sha256-ffY5IvSGu4Q7EdJpfdsIKxxjkm6FD0DR9ItnaO90SBc="; }; - vendorSha256 = "sha256-9IRNlULvARIZu6dWaKrvx6fiDJ80SBLINhK/9tW9k/0="; - - doCheck = false; + vendorHash = "sha256-dduHuMa5UPf73lfirTHSrYnOUbc2IyULpstZPGUJzuc="; subPackages = [ "." ]; From b0caf7e507db3f5ccf95b6f18d16cda31872277c Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 27 Jun 2023 18:27:39 +0200 Subject: [PATCH 199/222] nifi: 1.21.0 -> 1.22.0 (#239554) * nifi: 1.21.0 -> 1.22.0 Fixes CVE-2023-34468 and CVE-2023-34212. Advisories: https://nifi.apache.org/security.html#1.22.0 Release notes: https://cwiki.apache.org/confluence/display/NIFI/Release+Notes#ReleaseNotes-Version1.22.0 * Update pkgs/servers/web-apps/nifi/default.nix --------- Co-authored-by: Pol Dellaiera --- pkgs/servers/web-apps/nifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix index 87cfe7e21f5a..734ced245056 100644 --- a/pkgs/servers/web-apps/nifi/default.nix +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nifi"; - version = "1.21.0"; + version = "1.22.0"; src = fetchzip { url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip"; - sha256 = "sha256-AnDvZ9SV+VFdsP6KoqZIPNinAe2erT/IBY4c6i+2iTQ="; + hash = "sha256-IzTGsD6nL7UrXuHrJc8Dt1C6r137UjT/V4vES2m/8cg="; }; nativeBuildInputs = [ makeWrapper ]; From dcfe5eb6a9c33328193ecdf9c8c6ad8e1977d637 Mon Sep 17 00:00:00 2001 From: Peter Sanford Date: Tue, 27 Jun 2023 09:47:11 -0700 Subject: [PATCH 200/222] ghidra: add aarch64-linux platform --- pkgs/tools/security/ghidra/build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index d3e41984453c..9f705b1c12a0 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -171,7 +171,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A software reverse engineering (SRE) suite of tools developed by NSA's Research Directorate in support of the Cybersecurity mission"; homepage = "https://ghidra-sre.org/"; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with sourceTypes; [ fromSource binaryBytecode # deps From 0cd76cf948e2bea87877c9bd91ba472e07bfc240 Mon Sep 17 00:00:00 2001 From: Sergey Kazenyuk Date: Mon, 29 May 2023 13:53:30 +0300 Subject: [PATCH 201/222] kodiPackages.libretro-fuse: init at 1.6.0.34 --- .../kodi/addons/libretro-fuse/default.nix | 31 +++++++++++++++++++ pkgs/top-level/kodi-packages.nix | 4 ++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/video/kodi/addons/libretro-fuse/default.nix diff --git a/pkgs/applications/video/kodi/addons/libretro-fuse/default.nix b/pkgs/applications/video/kodi/addons/libretro-fuse/default.nix new file mode 100644 index 000000000000..776341b60796 --- /dev/null +++ b/pkgs/applications/video/kodi/addons/libretro-fuse/default.nix @@ -0,0 +1,31 @@ +{ lib, buildKodiBinaryAddon, fetchFromGitHub, libretro, fuse }: + +buildKodiBinaryAddon rec { + pname = "libretro-fuse"; + namespace = "game.libretro.fuse"; + version = "1.6.0.34"; + + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "game.libretro.fuse"; + rev = "${version}-Nexus"; + hash = "sha256-MimwEV7YD6pMshxqbKTVbLDsPmMbqSy4HPnxwmKswpc="; + }; + + extraCMakeFlags = [ + "-DFUSE_LIB=${fuse}/lib/retroarch/cores/fuse_libretro.so" + ]; + + extraBuildInputs = [ fuse ]; + propagatedBuildInputs = [ + libretro + ]; + + meta = with lib; { + homepage = "https://github.com/kodi-game/game.libretro.fuse"; + description = "Sinclair - ZX Spectrum (Fuse) GameClient for Kodi"; + platforms = platforms.all; + license = licenses.gpl3Only; + maintainers = with maintainers; teams.kodi.members ++ [ kazenyuk ]; + }; +} diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 8cb51cd5afb7..c975cf135e5b 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -3,7 +3,7 @@ with lib; let - inherit (libretro) genesis-plus-gx mgba snes9x twenty-fortyeight; + inherit (libretro) fuse genesis-plus-gx mgba snes9x twenty-fortyeight; in let self = rec { @@ -64,6 +64,8 @@ let self = rec { libretro-2048 = callPackage ../applications/video/kodi/addons/libretro-2048 { inherit twenty-fortyeight; }; + libretro-fuse = callPackage ../applications/video/kodi/addons/libretro-fuse { inherit fuse; }; + libretro-genplus = callPackage ../applications/video/kodi/addons/libretro-genplus { inherit genesis-plus-gx; }; libretro-mgba = callPackage ../applications/video/kodi/addons/libretro-mgba { inherit mgba; }; From e994574e925cb0e9b4887001992f758544896375 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 27 Jun 2023 08:07:07 +0200 Subject: [PATCH 202/222] mpv: add test "mpv-scripts-should-not-collide" --- pkgs/applications/video/mpv/wrapper.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index 0dd735071f00..b427318121ef 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -1,8 +1,11 @@ # Arguments that this derivation gets when it is created with `callPackage` { stdenv +, buildEnv , lib , makeWrapper +, mpvScripts , symlinkJoin +, writeTextDir , yt-dlp }: @@ -71,6 +74,20 @@ let passthru.unwrapped = mpv; + passthru.tests.mpv-scripts-should-not-collide = buildEnv { + name = "mpv-scripts-env"; + paths = lib.pipe mpvScripts [ + # filters "override" "overrideDerivation" "recurseForDerivations" + (lib.filterAttrs (key: script: lib.isDerivation script)) + # replaces unfree and meta.broken scripts with decent placeholders + (lib.mapAttrsToList (key: script: + if (builtins.tryEval script.outPath).success + then script + else writeTextDir "share/mpv/scripts/${script.scriptName}" "placeholder of ${script.name}" + )) + ]; + }; + postBuild = '' # wrapProgram can't operate on symlinks rm "$out/bin/mpv" From 4cf26c31eb7cc19ecb490a85ccc4c776cbee224b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 17:13:16 +0000 Subject: [PATCH 203/222] kubebuilder: 3.10.0 -> 3.11.0 --- .../applications/networking/cluster/kubebuilder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index 0b5d1446a76c..20b96a1958f3 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-W1FjmhZWBt/ThkSHHGAR4p1Vxal4WOCutlsHIDZeRZM="; + hash = "sha256-R4piek1mhMy5QPB6weR3F7PiIq0LvwkRAnIndbar9tg="; }; - vendorHash = "sha256-/Kvn3KwSB/mxgBKM+383QHCnVTOt06ZP3gt7FGqA5aM="; + vendorHash = "sha256-5XUYmAfFH6UlLF09PqcSLUxkgZ5iHZGj0Vurab+Jl1g="; subPackages = ["cmd"]; From e821954ae8bcdde41ced35d221e178fd8786f1d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 17:21:32 +0000 Subject: [PATCH 204/222] csfml: 2.5.1 -> 2.5.2 --- pkgs/development/libraries/csfml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix index 3aebe23ee38c..397d5186a1c4 100644 --- a/pkgs/development/libraries/csfml/default.nix +++ b/pkgs/development/libraries/csfml/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "csfml"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "SFML"; repo = "CSFML"; rev = version; - sha256 = "sha256-a46V5CakKVygNfr3/nZwlsCyqNsbti4a3cr7itK5QfI="; + sha256 = "sha256-A5C/4SnxUX7mW1wkPWJWX3dwMhrJ79DkBuZ7UYzTOqE="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ sfml ]; From 122abb5f99dd3fc1fa7e1df1d9f8281aaad4117f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 27 Jun 2023 18:24:42 +0100 Subject: [PATCH 205/222] cachix: 1.5 -> 1.6 --- .../haskell-modules/configuration-common.nix | 2 ++ .../haskell-modules/configuration-nix.nix | 19 ++++++----- .../hercules-ci-agent-cachix-1.6.patch | 32 +++++++++++++++++++ 3 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/haskell-modules/patches/hercules-ci-agent-cachix-1.6.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d8e391dfd7b7..136003ee912c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1670,6 +1670,8 @@ self: super: { sha256 = "sha256-J8N4+HUQ6vlJBCwCyxv8Fv5HSbtiim64Qh1n9CaRe1o="; stripLen = 1; }) + # https://github.com/hercules-ci/hercules-ci-agent/pull/526 + ./patches/hercules-ci-agent-cachix-1.6.patch ]) (self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ]) ]; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ef1fa745116f..91c099abc3c3 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -988,29 +988,29 @@ self: super: builtins.intersectAttrs super { domaindriven-core = dontCheck super.domaindriven-core; cachix-api = overrideCabal (drv: { - version = "1.5"; + version = "1.6"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.5"; - sha256 = "sha256-bt8FFtDSJpBckx3dIjW5Xdvj8aVCm78R3VTpjK5F3Ac="; + rev = "v1.6"; + sha256 = "sha256-54ujAZYNigAn1oJAfupUtZHa0WRQbCQGLEfLmkw8iFc="; }; postUnpack = "sourceRoot=$sourceRoot/cachix-api"; postPatch = '' - sed -i 's/1.4.2/1.5/' cachix-api.cabal + sed -i 's/1.5/1.6/' cachix-api.cabal ''; }) super.cachix-api; cachix = overrideCabal (drv: { - version = "1.5"; + version = "1.6"; src = pkgs.fetchFromGitHub { owner = "cachix"; repo = "cachix"; - rev = "v1.5"; - sha256 = "sha256-bt8FFtDSJpBckx3dIjW5Xdvj8aVCm78R3VTpjK5F3Ac="; + rev = "v1.6"; + sha256 = "sha256-54ujAZYNigAn1oJAfupUtZHa0WRQbCQGLEfLmkw8iFc="; }; postUnpack = "sourceRoot=$sourceRoot/cachix"; postPatch = '' - sed -i 's/1.4.2/1.5/' cachix.cabal + sed -i 's/1.5/1.6/' cachix.cabal ''; }) (lib.pipe (super.cachix.override { @@ -1021,8 +1021,7 @@ self: super: builtins.intersectAttrs super { [ (addBuildTool self.hercules-ci-cnix-store.nixPackage) (addBuildTool pkgs.pkg-config) - (addBuildDepend self.inline-c-cpp) - (addBuildDepend self.hercules-ci-cnix-store) + (addBuildDepend self.ascii-progress) ] ); diff --git a/pkgs/development/haskell-modules/patches/hercules-ci-agent-cachix-1.6.patch b/pkgs/development/haskell-modules/patches/hercules-ci-agent-cachix-1.6.patch new file mode 100644 index 000000000000..71145a3a3e4a --- /dev/null +++ b/pkgs/development/haskell-modules/patches/hercules-ci-agent-cachix-1.6.patch @@ -0,0 +1,32 @@ +diff --git a/hercules-ci-agent/hercules-ci-agent/Hercules/Agent/Cachix.hs b/hercules-ci-agent/hercules-ci-agent/Hercules/Agent/Cachix.hs +index 849d9bc..972bc90 100644 +--- hercules-ci-agent/hercules-ci-agent/Hercules/Agent/Cachix.hs ++++ hercules-ci-agent/hercules-ci-agent/Hercules/Agent/Cachix.hs +@@ -17,6 +17,7 @@ import Hercules.Agent.Log + import Hercules.CNix.Store (StorePath) + import Hercules.Error + import qualified Hercules.Formats.CachixCache as CachixCache ++import qualified Data.Conduit as Conduit + import Protolude + + push :: Text -> [StorePath] -> Int -> App () +@@ -36,6 +37,9 @@ push cache paths workers = withNamedContext "cache" cache $ do + Cachix.Push.PushParams + { pushParamsName = Agent.Cachix.pushCacheName pushCache, + pushParamsSecret = Agent.Cachix.pushCacheSecret pushCache, ++#if MIN_VERSION_cachix(1,6,0) ++ pushOnClosureAttempt = \_ missing -> return missing, ++#endif + pushParamsStore = nixStore, + pushParamsClientEnv = clientEnv, + pushParamsStrategy = \storePath -> +@@ -59,6 +63,9 @@ push cache paths workers = withNamedContext "cache" cache $ do + compressionLevel = 2, + #else + withXzipCompressor = Cachix.Push.defaultWithXzipCompressor, ++#endif ++#if MIN_VERSION_cachix(1,6,0) ++ onUncompressedNARStream = \_ _ -> Conduit.awaitForever Conduit.yield, + #endif + omitDeriver = False + } From 625da206cc38a05bf07d40244d0b0fb4e32fcd01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 17:42:38 +0000 Subject: [PATCH 206/222] kluctl: 2.20.4 -> 2.20.6 --- pkgs/applications/networking/cluster/kluctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kluctl/default.nix b/pkgs/applications/networking/cluster/kluctl/default.nix index 8e1c938d776d..c8bd51aeb7fc 100644 --- a/pkgs/applications/networking/cluster/kluctl/default.nix +++ b/pkgs/applications/networking/cluster/kluctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kluctl"; - version = "2.20.4"; + version = "2.20.6"; src = fetchFromGitHub { owner = "kluctl"; repo = "kluctl"; rev = "v${version}"; - hash = "sha256-Z3tXfzbVs0FWTsi6vbM6BNQBLeCseWn4yBR5PNeRz2s="; + hash = "sha256-B8+HKqIuJaH+6ViBxWfiAAmXieQKcwAW565SwUpIJKI="; }; - vendorHash = "sha256-z0eiWU5CFMfK6fz+LUtxtSP/MAuVn7iOHB+A7Uv2OQY="; + vendorHash = "sha256-x5Zy8H7DzxU+uBCUL6edv8x2LwiIjXl5UrRUMDtUEk8="; ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; From e9402819db2a24b2dbc8be760f0c6e9bfe5e6094 Mon Sep 17 00:00:00 2001 From: "\"Bernardo Meurer\"" <"bernardo@meurer.org"> Date: Tue, 27 Jun 2023 14:06:42 -0400 Subject: [PATCH 207/222] vimPlugins.nvim-lsp-notify: init at 2023-03-19 --- pkgs/applications/editors/vim/plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 33669a2a0d88..230f48f65cb1 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -574,6 +574,7 @@ https://github.com/ethanholz/nvim-lastplace/,HEAD, https://github.com/kosayoda/nvim-lightbulb/,, https://github.com/josa42/nvim-lightline-lsp/,, https://github.com/mfussenegger/nvim-lint/,, +https://github.com/mrded/nvim-lsp-notify/,HEAD, https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,, https://github.com/neovim/nvim-lspconfig/,, https://github.com/RishabhRD/nvim-lsputils/,, From 6a26d8ea6444777254f06651adc00018b6c3b115 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 18:08:06 +0000 Subject: [PATCH 208/222] earthly: 0.7.8 -> 0.7.9 --- pkgs/development/tools/earthly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 54094754425f..ffda60813218 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.7.8"; + version = "0.7.9"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-zLv0wuAM6d84Z2jCf89KDIIqX+Hiiw40g3DnTZxVTYY="; + sha256 = "sha256-KShHkqhPlC5MXHVd81ipacyDxWXyl3xFvWpe+7DHqsM="; }; - vendorHash = "sha256-NUm+vkJsT78pxrPqwDofPlrc6jQMTFjsRF7uPUPhDGQ="; + vendorHash = "sha256-0KAnj/PizBC1obz09EAVWUPO0aFw5QUSTENMd7aIo1Y="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; From 5c32e0ba7cf62bfcecff4b82e026de790bea394d Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Tue, 27 Jun 2023 14:27:33 -0400 Subject: [PATCH 209/222] prefetch-yarn-deps: add --fixup-lockfile flag to fixup a yarn.lock (#214062) The flag iterates through the lockfile entries, rewrites `resolved` URLs to those that will be in the cache (like `fixup_yarn_lock` from yarn2nix), removes `integrity` for git deps whose hash won't match the reproducible repacking that the fetcher does, writes the amended lockfile, and exits. --- .../node/fetch-yarn-deps/common.js | 17 +++++ .../node/fetch-yarn-deps/default.nix | 5 +- .../node/fetch-yarn-deps/fixup.js | 74 +++++++++++++++++++ .../node/fetch-yarn-deps/index.js | 15 +--- 4 files changed, 95 insertions(+), 16 deletions(-) create mode 100644 pkgs/build-support/node/fetch-yarn-deps/common.js create mode 100755 pkgs/build-support/node/fetch-yarn-deps/fixup.js diff --git a/pkgs/build-support/node/fetch-yarn-deps/common.js b/pkgs/build-support/node/fetch-yarn-deps/common.js new file mode 100644 index 000000000000..8e0d1b0e470b --- /dev/null +++ b/pkgs/build-support/node/fetch-yarn-deps/common.js @@ -0,0 +1,17 @@ +const path = require('path') + +// This has to match the logic in pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js +// so that fixup_yarn_lock produces the same paths +const urlToName = url => { + const isCodeloadGitTarballUrl = url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/') + + if (url.startsWith('git+') || isCodeloadGitTarballUrl) { + return path.basename(url) + } else { + return url + .replace(/https:\/\/(.)*(.com)\//g, '') // prevents having long directory names + .replace(/[@/%:-]/g, '_') // replace @ and : and - and % characters with underscore + } +} + +module.exports = { urlToName }; diff --git a/pkgs/build-support/node/fetch-yarn-deps/default.nix b/pkgs/build-support/node/fetch-yarn-deps/default.nix index 4cf2507706ae..f3b5a6bd163b 100644 --- a/pkgs/build-support/node/fetch-yarn-deps/default.nix +++ b/pkgs/build-support/node/fetch-yarn-deps/default.nix @@ -21,8 +21,8 @@ in { mkdir libexec tar --strip-components=1 -xf ${yarnpkg-lockfile-tar} package/index.js mv index.js libexec/yarnpkg-lockfile.js - cp ${./index.js} libexec/index.js - patchShebangs libexec/index.js + cp ${./.}/*.js libexec/ + patchShebangs libexec runHook postBuild ''; @@ -34,6 +34,7 @@ in { cp -r libexec $out makeWrapper $out/libexec/index.js $out/bin/prefetch-yarn-deps \ --prefix PATH : ${lib.makeBinPath [ coreutils nix-prefetch-git nix ]} + makeWrapper $out/libexec/fixup.js $out/bin/fixup-yarn-lock runHook postInstall ''; diff --git a/pkgs/build-support/node/fetch-yarn-deps/fixup.js b/pkgs/build-support/node/fetch-yarn-deps/fixup.js new file mode 100755 index 000000000000..8b91e7efa63f --- /dev/null +++ b/pkgs/build-support/node/fetch-yarn-deps/fixup.js @@ -0,0 +1,74 @@ +#!/usr/bin/env node +'use strict' + +const fs = require('fs') +const process = require('process') +const lockfile = require('./yarnpkg-lockfile.js') +const { urlToName } = require('./common.js') + +const fixupYarnLock = async (lockContents, verbose) => { + const lockData = lockfile.parse(lockContents) + + const fixedData = Object.fromEntries( + Object.entries(lockData.object) + .map(([dep, pkg]) => { + const [ url, hash ] = pkg.resolved.split("#", 2) + + if (hash || url.startsWith("https://codeload.github.com")) { + if (verbose) console.log(`Removing integrity for git dependency ${dep}`) + delete pkg.integrity + } + + if (verbose) console.log(`Rewriting URL ${url} for dependency ${dep}`) + pkg.resolved = urlToName(url) + + return [dep, pkg] + }) + ) + + if (verbose) console.log('Done') + + return fixedData +} + +const showUsage = async () => { + process.stderr.write(` +syntax: fixup-yarn-lock [path to yarn.lock] [options] + +Options: + -h --help Show this help + -v --verbose Verbose output +`) + process.exit(1) +} + +const main = async () => { + const args = process.argv.slice(2) + let next, lockFile, verbose + while (next = args.shift()) { + if (next == '--verbose' || next == '-v') { + verbose = true + } else if (next == '--help' || next == '-h') { + showUsage() + } else if (!lockFile) { + lockFile = next + } else { + showUsage() + } + } + let lockContents + try { + lockContents = await fs.promises.readFile(lockFile || 'yarn.lock', 'utf-8') + } catch { + showUsage() + } + + const fixedData = await fixupYarnLock(lockContents, verbose) + await fs.promises.writeFile(lockFile || 'yarn.lock', lockfile.stringify(fixedData)) +} + +main() + .catch(e => { + console.error(e) + process.exit(1) + }) diff --git a/pkgs/build-support/node/fetch-yarn-deps/index.js b/pkgs/build-support/node/fetch-yarn-deps/index.js index b66e1220218d..9f95e1697030 100755 --- a/pkgs/build-support/node/fetch-yarn-deps/index.js +++ b/pkgs/build-support/node/fetch-yarn-deps/index.js @@ -10,6 +10,7 @@ const path = require('path') const lockfile = require('./yarnpkg-lockfile.js') const { promisify } = require('util') const url = require('url') +const { urlToName } = require('./common.js') const execFile = promisify(child_process.execFile) @@ -19,20 +20,6 @@ const exec = async (...args) => { return res } -// This has to match the logic in pkgs/development/tools/yarn2nix-moretea/yarn2nix/lib/urlToName.js -// so that fixup_yarn_lock produces the same paths -const urlToName = url => { - const isCodeloadGitTarballUrl = url.startsWith('https://codeload.github.com/') && url.includes('/tar.gz/') - - if (url.startsWith('git+') || isCodeloadGitTarballUrl) { - return path.basename(url) - } else { - return url - .replace(/https:\/\/(.)*(.com)\//g, '') // prevents having long directory names - .replace(/[@/%:-]/g, '_') // replace @ and : and - and % characters with underscore - } -} - const downloadFileHttps = (fileName, url, expectedHash, hashType = 'sha1') => { return new Promise((resolve, reject) => { https.get(url, (res) => { From 669aef1f0e2c81b7c72f71f669f4f23d6de312da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 18:29:13 +0000 Subject: [PATCH 210/222] karmor: 0.13.3 -> 0.13.7 --- pkgs/applications/networking/cluster/karmor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix index c0c718197441..e6c559388063 100644 --- a/pkgs/applications/networking/cluster/karmor/default.nix +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "karmor"; - version = "0.13.3"; + version = "0.13.7"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-BhGe4CMd0YgWc4EAyig5wmLgHJxNc8ppsUMBeRaIJEE="; + hash = "sha256-IZUDVw41AfugqVG2hsxoKO7zl1FraVzME/GUxZwaAG4="; }; vendorHash = "sha256-VT0CiaG5AODAL6nhoPmpulPApgTUiH0mXI6mS1eK14k="; From e30b53b990354deb1a18f186dc5130c1525ef718 Mon Sep 17 00:00:00 2001 From: Jens Binkert Date: Tue, 27 Jun 2023 20:45:11 +0200 Subject: [PATCH 211/222] evdi: unstable-20221013 -> 1.13.1 (#239883) --- .../linux/evdi/0000-fix-drm-path.patch | 31 +++++++++++++++++++ pkgs/os-specific/linux/evdi/default.nix | 20 ++++++++---- 2 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch diff --git a/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch b/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch new file mode 100644 index 000000000000..a389b73185dd --- /dev/null +++ b/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch @@ -0,0 +1,31 @@ +diff --git a/module/Makefile b/module/Makefile +index fe573de..c8022c8 100644 +--- a/module/Makefile ++++ b/module/Makefile +@@ -50,7 +50,7 @@ ifneq ($(KERNELRELEASE),) + # inside kbuild + # Note: this can be removed once it is in kernel tree and Kconfig is properly used + CONFIG_DRM_EVDI := m +-ccflags-y := -isystem include/uapi/drm include/drm $(CFLAGS) $(EL8FLAG) $(EL9FLAG) $(RPIFLAG) ++ccflags-y := -isystem include/uapi/drm $(CFLAGS) $(EL8FLAG) $(EL9FLAG) $(RPIFLAG) + evdi-y := evdi_platform_drv.o evdi_platform_dev.o evdi_sysfs.o evdi_modeset.o evdi_connector.o evdi_encoder.o evdi_drm_drv.o evdi_fb.o evdi_gem.o evdi_painter.o evdi_params.o evdi_cursor.o evdi_debug.o evdi_i2c.o + evdi-$(CONFIG_COMPAT) += evdi_ioc32.o + obj-$(CONFIG_DRM_EVDI) := evdi.o +diff --git a/module/evdi_drm.h b/module/evdi_drm.h +index 29b8427..5012693 100644 +--- a/module/evdi_drm.h ++++ b/module/evdi_drm.h +@@ -12,12 +12,11 @@ + + #ifdef __KERNEL__ + #include ++#include + #else + #include + #endif + +-#include "drm.h" +- + /* Output events sent from driver to evdi lib */ + #define DRM_EVDI_EVENT_UPDATE_READY 0x80000000 + #define DRM_EVDI_EVENT_DPMS 0x80000001 diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index f8f4f400ade2..18b53e540d11 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -1,21 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, kernel, libdrm }: - +{ lib, stdenv, fetchFromGitHub, kernel, libdrm, python3 }: +let + python3WithLibs = python3.withPackages (ps: with ps; [ + pybind11 + ]); +in stdenv.mkDerivation rec { pname = "evdi"; - version = "unstable-2022-10-13"; + version = "1.13.1"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "bdc258b25df4d00f222fde0e3c5003bf88ef17b5"; - hash = "sha256-mt+vEp9FFf7smmE2PzuH/3EYl7h89RBN1zTVvv2qJ/o="; + rev = "v${version}"; + hash = "sha256-Or4hhnFOtC8vmB4kFUHbFHn2wg/NsUMY3d2Tiea6YbY="; }; env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare"; nativeBuildInputs = kernel.moduleBuildDependencies; - buildInputs = [ kernel libdrm ]; + buildInputs = [ kernel libdrm python3WithLibs ]; makeFlags = kernel.makeFlags ++ [ "KVER=${kernel.modDirVersion}" @@ -31,6 +35,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + patches = [ + ./0000-fix-drm-path.patch + ]; + meta = with lib; { description = "Extensible Virtual Display Interface"; maintainers = with maintainers; [ eyjhb ]; From 2ef15a4ef3fa5fdc2e78bc4f2f6eb8fc010b288a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 27 Jun 2023 20:45:38 +0200 Subject: [PATCH 212/222] code-server: 4.14.0 -> 4.14.1 (#240001) --- .../code-server/build-vscode-nogit.patch | 27 +++++++++++++++---- pkgs/servers/code-server/default.nix | 12 ++------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/code-server/build-vscode-nogit.patch b/pkgs/servers/code-server/build-vscode-nogit.patch index ec726c68d438..335349e4651a 100644 --- a/pkgs/servers/code-server/build-vscode-nogit.patch +++ b/pkgs/servers/code-server/build-vscode-nogit.patch @@ -1,8 +1,15 @@ diff --git a/ci/build/build-vscode.sh b/ci/build/build-vscode.sh -index a72549fb..3aed1ad5 100755 +index a72549fb..b1b6074b 100755 --- a/ci/build/build-vscode.sh +++ b/ci/build/build-vscode.sh -@@ -58,7 +58,6 @@ main() { +@@ -52,13 +52,12 @@ main() { + # since Code tries to get the commit from the `.git` directory which will fail + # as it is a submodule. + export BUILD_SOURCEVERSION +- BUILD_SOURCEVERSION=$(git rev-parse HEAD) ++ BUILD_SOURCEVERSION=none + + # Add the date, our name, links, and enable telemetry (this just makes # telemetry available; telemetry can still be disabled by flag or setting). # This needs to be done before building as Code will read this file and embed # it into the client-side code. @@ -10,11 +17,21 @@ index a72549fb..3aed1ad5 100755 cp product.json product.original.json # Since jq has no inline edit. jq --slurp '.[0] * .[1]' product.original.json <( cat << EOF -@@ -105,7 +104,6 @@ EOF +@@ -105,17 +104,12 @@ EOF # Reset so if you develop after building you will not be stuck with the wrong # commit (the dev client will use `oss-dev` but the dev server will still use # product.json which will have `stable-$commit`). - git checkout product.json - + popd - + + pushd lib/vscode-reh-web-linux-x64 + # Make sure Code took the version we set in the environment variable. Not + # having a version will break display languages. +- if ! jq -e .commit product.json; then +- echo "'commit' is missing from product.json" +- exit 1 +- fi + popd + + # These provide a `code-server` command in the integrated terminal to open \ No newline at end of file diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index 1dca87d86439..e7890f8802f0 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -54,19 +54,17 @@ let sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild ''; - - commit = "2798322b03e7f446f59c5142215c11711ed7a427"; in stdenv.mkDerivation (finalAttrs: { pname = "code-server"; - version = "4.14.0"; + version = "4.14.1"; src = fetchFromGitHub { owner = "coder"; repo = "code-server"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-MJ/FCYAdWNG0joTAdvIWYqAplOoRiDRWvE9bM/V3QHo="; + hash = "sha256-j7pFh731C8HUGT+M/JvnJoDZoPH9AdfA9TxxSx1vuBM="; }; yarnCache = stdenv.mkDerivation { @@ -131,12 +129,6 @@ stdenv.mkDerivation (finalAttrs: { export HOME=$PWD patchShebangs ./ci - - # inject git commit - substituteInPlace ./ci/build/build-vscode.sh \ - --replace '$(git rev-parse HEAD)' "${commit}" - substituteInPlace ./ci/build/build-release.sh \ - --replace '$(git rev-parse HEAD)' "${commit}" ''; configurePhase = '' From 71f6b1eaaad9e91e7b40a5805d279e6929ea04a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jun 2023 20:57:57 +0200 Subject: [PATCH 213/222] python310Packages.bitbox02: add changelog to meta --- pkgs/development/python-modules/bitbox02/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix index 2e2230f0b586..1adf76f5cf3a 100644 --- a/pkgs/development/python-modules/bitbox02/default.nix +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Firmware code of the BitBox02 hardware wallet"; homepage = "https://github.com/digitalbitbox/bitbox02-firmware/"; + changelog = "https://github.com/digitalbitbox/bitbox02-firmware/blob/py-bitbox02-${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; From 2489436aef1b3dbf4cd948108a1e62948c54d327 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 19:22:22 +0000 Subject: [PATCH 214/222] python310Packages.xknx: 2.10.0 -> 2.11.1 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 3f5fbe9f7fb0..ba03f1bf04c2 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "2.10.0"; + version = "2.11.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3eSS3V1EgLRf8lB3icG4pNGq0VbXjfgwEQ91mMRKyAE="; + hash = "sha256-9H5LQX6uXWr9pQ/WosNl1LrcbR+MAwVtZv8Cdb+WFvg="; }; nativeBuildInputs = [ From 3fc6acc8210a732a0b818bc34dc11d750f274404 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 19:38:43 +0000 Subject: [PATCH 215/222] python310Packages.statsmodels: 0.13.5 -> 0.14.0 --- pkgs/development/python-modules/statsmodels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 704d53963d4a..4d05e36ad8bc 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.13.5"; + version = "0.14.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WTUmrK4cD9oOpsSEOfZ8OUMJTFQv52n4uQ/p5sbMSHE="; + hash = "sha256-aHXH1onpZtlI8V64FqtWFvSShwaxgM9HD9WQerb2R6Q="; }; nativeBuildInputs = [ From e705bd923b5107e6288302fe6e1ca26bf700388b Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 10 May 2023 14:27:35 +0200 Subject: [PATCH 216/222] fastnetmon-advanced: link gobgp binaries to /bin --- pkgs/servers/fastnetmon-advanced/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/fastnetmon-advanced/default.nix b/pkgs/servers/fastnetmon-advanced/default.nix index 53c1ef11e25c..2907d890a136 100644 --- a/pkgs/servers/fastnetmon-advanced/default.nix +++ b/pkgs/servers/fastnetmon-advanced/default.nix @@ -40,6 +40,9 @@ stdenv.mkDerivation rec { cp -r opt/fastnetmon/app/bin $out/bin cp -r opt/fastnetmon/libraries $out/libexec/fastnetmon + ln -s $out/libexec/fastnetmon/libraries/gobgp_2_27_0/gobgpd $out/bin/fnm-gobgpd + ln -s $out/libexec/fastnetmon/libraries/gobgp_2_27_0/gobgp $out/bin/fnm-gobgp + addAutoPatchelfSearchPath $out/libexec/fastnetmon/libraries ''; @@ -48,6 +51,8 @@ stdenv.mkDerivation rec { set +o pipefail $out/bin/fastnetmon 2>&1 | grep "Can't open log file" $out/bin/fcli 2>&1 | grep "Please run this tool with root rights" + $out/bin/fnm-gobgp --help 2>&1 | grep "Available Commands" + $out/bin/fnm-gobgpd --help 2>&1 | grep "Application Options" ''; meta = with lib; { From 8b2049f93b517e16ddb874c9b0691caa99f67844 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 27 Jun 2023 21:55:50 +0200 Subject: [PATCH 217/222] fastnetmon-advanced: 2.0.337 -> 2.0.342 --- pkgs/servers/fastnetmon-advanced/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/fastnetmon-advanced/default.nix b/pkgs/servers/fastnetmon-advanced/default.nix index 2907d890a136..35c1707a2d5a 100644 --- a/pkgs/servers/fastnetmon-advanced/default.nix +++ b/pkgs/servers/fastnetmon-advanced/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastnetmon-advanced"; - version = "2.0.337"; + version = "2.0.342"; src = fetchurl { url = "https://repo.fastnetmon.com/fastnetmon_ubuntu_jammy/pool/fastnetmon/f/fastnetmon/fastnetmon_${version}_amd64.deb"; - hash = "sha256-lYXJ0Q0iUiWk/n/I71BsKnnoRJh3a2EJT3EWV4+pQbM="; + hash = "sha256-H4e7ftuL39xxDYs2zVhgVI8voDBR2TQLWlWSBg3At2s="; }; nativeBuildInputs = [ @@ -40,8 +40,11 @@ stdenv.mkDerivation rec { cp -r opt/fastnetmon/app/bin $out/bin cp -r opt/fastnetmon/libraries $out/libexec/fastnetmon - ln -s $out/libexec/fastnetmon/libraries/gobgp_2_27_0/gobgpd $out/bin/fnm-gobgpd - ln -s $out/libexec/fastnetmon/libraries/gobgp_2_27_0/gobgp $out/bin/fnm-gobgp + readlink usr/sbin/gobgpd + readlink usr/bin/gobgp + + ln -s $(readlink usr/sbin/gobgpd | sed "s:/opt/fastnetmon:$out/libexec/fastnetmon:") $out/bin/fnm-gobgpd + ln -s $(readlink usr/bin/gobgp | sed "s:/opt/fastnetmon:$out/libexec/fastnetmon:") $out/bin/fnm-gobgp addAutoPatchelfSearchPath $out/libexec/fastnetmon/libraries ''; From ddbc7690eecad2a5d35835900df22f780d780fba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jun 2023 21:00:35 +0200 Subject: [PATCH 218/222] python310Packages.bitbox02: add format - disable on unsupported Python releases --- .../python-modules/bitbox02/default.nix | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix index 1adf76f5cf3a..8f3cd06b4b1c 100644 --- a/pkgs/development/python-modules/bitbox02/default.nix +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -1,19 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi, base58, ecdsa, hidapi, noiseprotocol, protobuf, semver, typing-extensions }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, base58 +, ecdsa +, hidapi +, noiseprotocol +, protobuf +, semver +, typing-extensions +}: buildPythonPackage rec { pname = "bitbox02"; version = "6.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-zt4G45nJjtU2/tbYpCEgjaoA+Xtpe9g2OpQaxfMzCb8="; }; - propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ]; + propagatedBuildInputs = [ + base58 + ecdsa + hidapi + noiseprotocol + protobuf + semver + typing-extensions + ]; # does not contain tests doCheck = false; - pythonImportsCheck = [ "bitbox02" ]; + + pythonImportsCheck = [ + "bitbox02" + ]; meta = with lib; { description = "Firmware code of the BitBox02 hardware wallet"; From a835a56b54a03628557c333c1fbd5a7221301c61 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 27 Jun 2023 23:04:28 +0200 Subject: [PATCH 219/222] code-server: restore previous patch (#240194) Also add a note about the `commit` value and how to get it. --- .../code-server/build-vscode-nogit.patch | 27 ++++--------------- pkgs/servers/code-server/default.nix | 24 +++++++++++++++++ 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/pkgs/servers/code-server/build-vscode-nogit.patch b/pkgs/servers/code-server/build-vscode-nogit.patch index 335349e4651a..ec726c68d438 100644 --- a/pkgs/servers/code-server/build-vscode-nogit.patch +++ b/pkgs/servers/code-server/build-vscode-nogit.patch @@ -1,15 +1,8 @@ diff --git a/ci/build/build-vscode.sh b/ci/build/build-vscode.sh -index a72549fb..b1b6074b 100755 +index a72549fb..3aed1ad5 100755 --- a/ci/build/build-vscode.sh +++ b/ci/build/build-vscode.sh -@@ -52,13 +52,12 @@ main() { - # since Code tries to get the commit from the `.git` directory which will fail - # as it is a submodule. - export BUILD_SOURCEVERSION -- BUILD_SOURCEVERSION=$(git rev-parse HEAD) -+ BUILD_SOURCEVERSION=none - - # Add the date, our name, links, and enable telemetry (this just makes +@@ -58,7 +58,6 @@ main() { # telemetry available; telemetry can still be disabled by flag or setting). # This needs to be done before building as Code will read this file and embed # it into the client-side code. @@ -17,21 +10,11 @@ index a72549fb..b1b6074b 100755 cp product.json product.original.json # Since jq has no inline edit. jq --slurp '.[0] * .[1]' product.original.json <( cat << EOF -@@ -105,17 +104,12 @@ EOF +@@ -105,7 +104,6 @@ EOF # Reset so if you develop after building you will not be stuck with the wrong # commit (the dev client will use `oss-dev` but the dev server will still use # product.json which will have `stable-$commit`). - git checkout product.json - + popd - - pushd lib/vscode-reh-web-linux-x64 - # Make sure Code took the version we set in the environment variable. Not - # having a version will break display languages. -- if ! jq -e .commit product.json; then -- echo "'commit' is missing from product.json" -- exit 1 -- fi - popd - - # These provide a `code-server` command in the integrated terminal to open \ No newline at end of file + diff --git a/pkgs/servers/code-server/default.nix b/pkgs/servers/code-server/default.nix index e7890f8802f0..b5fe5a0675d8 100644 --- a/pkgs/servers/code-server/default.nix +++ b/pkgs/servers/code-server/default.nix @@ -54,6 +54,24 @@ let sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild ''; + + # Comment from @code-asher, the code-server maintainer + # See https://github.com/NixOS/nixpkgs/pull/240001#discussion_r1244303617 + # + # If the commit is missing it will break display languages (Japanese, Spanish, + # etc). For some reason VS Code has a hard dependency on the commit being set + # for that functionality. + # The commit is also used in cache busting. Without the commit you could run + # into issues where the browser is loading old versions of assets from the + # cache. + # Lastly, it can be helpful for the commit to be accurate in bug reports + # especially when they are built outside of our CI as sometimes the version + # numbers can be unreliable (since they are arbitrarily provided). + # + # To compute the commit when upgrading this derivation, do: + # `$ git rev-parse ` where is the git revision of the `src` + # Example: `$ git rev-parse v4.14.1` + commit = "5c199629305a0b935b4388b7db549f77eae82b5a"; in stdenv.mkDerivation (finalAttrs: { pname = "code-server"; @@ -129,6 +147,12 @@ stdenv.mkDerivation (finalAttrs: { export HOME=$PWD patchShebangs ./ci + + # inject git commit + substituteInPlace ./ci/build/build-vscode.sh \ + --replace '$(git rev-parse HEAD)' "${commit}" + substituteInPlace ./ci/build/build-release.sh \ + --replace '$(git rev-parse HEAD)' "${commit}" ''; configurePhase = '' From ba786a3964a5a198a6143d1db831f0933a84fd6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 15:47:18 +0000 Subject: [PATCH 220/222] jwt-cli: 5.0.3 -> 6.0.0 --- pkgs/tools/security/jwt-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index 20c172fc5017..d49d5289c44c 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jwt-cli"; - version = "5.0.3"; + version = "6.0.0"; src = fetchFromGitHub { owner = "mike-engel"; repo = pname; rev = version; - sha256 = "01aqqjynfcrn3m36hfjwcfh870imcd0hj5gifxzpnjiqjwpvys59"; + sha256 = "sha256-EzXpiJGTAlTDHJwl7FwIsDHMqStj2PLD1PHmv0flBKc="; }; - cargoSha256 = "1n4gmqmi975cd2zyrf0yi4gbxjjg9f99xa191mgmrdyyij7id3cf"; + cargoHash = "sha256-l1W+eYuKnMPN2wPhYPXo5ixUz2bX+FZnDazk+FbxquU="; buildInputs = lib.optional stdenv.isDarwin Security; From 238e2c8052cef7d6316f08738b5feeb46e761d60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 22:45:51 +0000 Subject: [PATCH 221/222] mob: 4.4.3 -> 4.4.5 --- pkgs/applications/misc/mob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index c54aa5e1dd7c..74ab67739d02 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "mob"; - version = "4.4.3"; + version = "4.4.5"; src = fetchFromGitHub { owner = "remotemobprogramming"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XWXoY/e/xceO3sOGvA2hrdvbdb8nomMg7AGUW090I74="; + sha256 = "sha256-/Kr5K0QkjARWKR8YhDsOQ2CoUzUu5LWUq6smhB0yDCM="; }; vendorHash = null; From 5ab7121e8c2d3776791991c29f891e589bdbe3e2 Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Tue, 27 Jun 2023 15:48:12 -0700 Subject: [PATCH 222/222] wasm-pack: 0.12.0 -> 0.12.1 --- pkgs/development/tools/wasm-pack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index 770a1232196a..d805b529d678 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "wasm-pack"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-pack"; rev = "refs/tags/v${version}"; - hash = "sha256-Sfcf/Dko2lAfkfYdeanLAqhbUgeKtGBxx4timZi2kCk="; + hash = "sha256-L4mCgUPG4cgTUpCoaIUOTONBOggXn5vMyPKj48B3MMk="; }; - cargoHash = "sha256-bl1KDFNvpNtkbKqiBRbmQLo1/oqLl7u7gNHLhhm8ETI="; + cargoHash = "sha256-mqQRQXaUW6mreE7UUEA0zhhaaGGKLRUngH9QLxcaIdY="; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;