From 52e9ddd3457998c0dd6d7c694d303adb0a4f6cad Mon Sep 17 00:00:00 2001 From: Joscha Loos Date: Tue, 29 Nov 2022 16:17:25 +0100 Subject: [PATCH 01/74] 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 02/74] 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 03/74] 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 04/74] 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 05/74] 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 c7695805ca3f39cf1285e3db2478b315333c023b Mon Sep 17 00:00:00 2001 From: Georges Date: Sat, 6 May 2023 10:33:41 +0200 Subject: [PATCH 06/74] 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 07/74] 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 08/74] 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 051fe7c2227563698ffff9844ea3229dd87d7dad Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Wed, 14 Jun 2023 11:55:14 +0100 Subject: [PATCH 09/74] 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 10/74] 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 cfe665eb266ee4728a70d4e13a540ecebd5948de Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Fri, 16 Jun 2023 19:00:55 +0100 Subject: [PATCH 11/74] 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 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 12/74] 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 13/74] 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 14/74] 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 8f3b487ee41e2786b9bcf25b5499b729089d5c04 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Thu, 22 Jun 2023 17:09:40 +0200 Subject: [PATCH 15/74] 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 16/74] 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 17/74] 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 9589a3cda769694f1a0a8b21ec1d96482eaad37a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 25 Jun 2023 23:22:34 +0800 Subject: [PATCH 18/74] 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 19/74] 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 20/74] 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 de1ca081be5489f00ae56c036a27090fdd30cd13 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Thu, 22 Jun 2023 17:08:20 +0200 Subject: [PATCH 21/74] 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 bee727f27d477fbc1d8d28d4660bbb2ed10ff18f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Jun 2023 06:20:05 +0000 Subject: [PATCH 22/74] 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 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 23/74] 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 5f10b0db4156e27e74c43bbaa639fb65e6f1d02a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 26 Jun 2023 23:57:00 +0800 Subject: [PATCH 24/74] 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 03ca5a47c10b16996c5249493835ebfe99624a87 Mon Sep 17 00:00:00 2001 From: pennae Date: Mon, 26 Jun 2023 21:13:11 +0200 Subject: [PATCH 25/74] 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 78aea8e433a6ef7a43542271890552d510494615 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 27 Jun 2023 12:19:26 +0800 Subject: [PATCH 26/74] 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 27/74] 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 28/74] 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 29/74] 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 30/74] 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 99db658cb603e624d0df3e73cea140600f716bb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Jun 2023 04:58:51 +0000 Subject: [PATCH 31/74] 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 72c67f4c4f85910d5428ede669e160d95afa3c54 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jun 2023 09:47:16 +0200 Subject: [PATCH 32/74] 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 33/74] 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 748e5887131b4f0549bbcb0bf883ffab508f6113 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jun 2023 09:55:29 +0200 Subject: [PATCH 34/74] 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 35/74] 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 e52b401a955dc1a5b85cd9816c20d7c2025d1fad Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 27 Jun 2023 16:08:55 +0800 Subject: [PATCH 36/74] 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 37/74] 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 38/74] 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 a1dcb05af666421731519e66ffeae7f183ecc7ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jun 2023 11:11:08 +0200 Subject: [PATCH 39/74] 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 b551e5c6321a15b1b6ffd0688d5382caa1f1e7b7 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 27 Jun 2023 11:20:28 +0200 Subject: [PATCH 40/74] 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 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 41/74] 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 42/74] 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 43/74] 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 a3d60923a5427ad6a772270b040638ca44b8152e Mon Sep 17 00:00:00 2001 From: nikstur Date: Sat, 24 Jun 2023 00:01:21 +0200 Subject: [PATCH 44/74] 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 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 45/74] 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 46/74] 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 47/74] 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 48/74] 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 49/74] 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 50/74] 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 51/74] 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 52/74] 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 53/74] 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 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 54/74] 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 55/74] 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 56/74] 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 8bf17b92eae4500415bdd56d1d8f7a779da85f97 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 27 Jun 2023 09:50:48 -0400 Subject: [PATCH 57/74] 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 569ee885332893165af11f231214419914b87b5a Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 27 Jun 2023 22:15:01 +0900 Subject: [PATCH 58/74] 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 59/74] 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 60/74] 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 61/74] _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 335cab2c8105dcf047bd9fbaffd49d409618ee70 Mon Sep 17 00:00:00 2001 From: Jacob Moody Date: Tue, 27 Jun 2023 10:25:34 -0500 Subject: [PATCH 62/74] 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 63/74] 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 d7bbbfbff0fe82c996f31fb6c4d45fe3ec97f4e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Jun 2023 18:03:58 +0200 Subject: [PATCH 64/74] 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 65/74] 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 66/74] 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 67/74] 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 68/74] 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 69/74] 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 70/74] 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 71/74] 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 72/74] 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 73/74] 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 e994574e925cb0e9b4887001992f758544896375 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 27 Jun 2023 08:07:07 +0200 Subject: [PATCH 74/74] 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"