From 368b64a478d46de6f172344aa3657be53107e727 Mon Sep 17 00:00:00 2001 From: Stig Brautaset Date: Sun, 29 Jan 2023 18:32:56 +0000 Subject: [PATCH 001/136] ox-rss: init at version 20230129 The recipes-archive-melpa.json already has what is required. --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 6ce924adf11c..d34c7055defe 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -393,6 +393,8 @@ let orgit-forge = buildWithGit super.orgit-forge; + ox-rss = buildWithGit super.ox-rss; + # upstream issue: missing file header mhc = super.mhc.override { inherit (self.melpaPackages) calfw; From 59ba175a2beb4f41651da9e33539ad35fd07a51b Mon Sep 17 00:00:00 2001 From: alyaeanyx Date: Thu, 9 Mar 2023 06:45:20 +0100 Subject: [PATCH 002/136] gladtex: init at unstable-2023-01-22 --- .../tools/typesetting/tex/gladtex/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/typesetting/tex/gladtex/default.nix diff --git a/pkgs/tools/typesetting/tex/gladtex/default.nix b/pkgs/tools/typesetting/tex/gladtex/default.nix new file mode 100644 index 000000000000..2d2cd37442f7 --- /dev/null +++ b/pkgs/tools/typesetting/tex/gladtex/default.nix @@ -0,0 +1,24 @@ +{ lib +, fetchFromGitHub +, python3Packages +}: + +python3Packages.buildPythonPackage rec { + pname = "gladtex"; + version = "unstable-2023-01-22"; + + src = fetchFromGitHub { + owner = "humenda"; + repo = "GladTeX"; + rev = "f84e63836622ff1325dfddc7c5649f11a795afa0"; + sha256 = "sha256-B5sNEmLO4iIJRDgcPhr9LFKV77dPJws8ITNz4R+FE08="; + }; + + meta = with lib; { + description = "Embed LaTeX formulas into HTML documents as SVG images"; + homepage = "https://humenda.github.io/GladTeX"; + license = licenses.lgpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ alyaeanyx ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac5d63845a59..a5180d730770 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4732,6 +4732,8 @@ with pkgs; dblatexFull = dblatex.override { enableAllFeatures = true; }; + gladtex = callPackage ../tools/typesetting/tex/gladtex { }; + latexrun = callPackage ../tools/typesetting/tex/latexrun { }; lkproof = callPackage ../tools/typesetting/tex/lkproof { }; From 875626cf077617c0646699c521e62c2ab01003b0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 Mar 2023 18:54:51 +0100 Subject: [PATCH 003/136] python310Packages.phonenumbers: 8.13.6 -> 8.13.7 Changelog: https://github.com/daviddrysdale/python-phonenumbers/blob/v8.13.7/python/HISTORY.md --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 23e0e08d8be3..e768bb25290b 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.6"; + version = "8.13.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+L2Sl1unRjt4KK4vleEDe34KuPAj6ej/t8Vg/X9dZtc="; + hash = "sha256-JTuw4BJQ0hoR8rQrPm4WG39ssqxEDi4qlcHacdIh7ho="; }; nativeCheckInputs = [ From 99bc90e3019cd79de82b41481fe1cc2ef4900caa Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 14 Mar 2023 23:28:48 +0100 Subject: [PATCH 004/136] lib.strings: Deprecate path prefix/suffix/infix arguments lib.{hasPrefix,hasInfix,hasSuffix} would otherwise return an always-false result, which can be very unexpected: nix-repl> lib.strings.hasPrefix ./lib ./lib/meta.nix false --- lib/strings.nix | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index 68d930950662..963d937947f2 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -2,7 +2,9 @@ { lib }: let -inherit (builtins) length; + inherit (builtins) length; + + inherit (lib.trivial) warnIf; in @@ -238,7 +240,17 @@ rec { # Prefix to check for pref: # Input string - str: substring 0 (stringLength pref) str == pref; + str: + # Before 23.05, paths would be copied to the store before converting them + # to strings and comparing. This was surprising and confusing. + warnIf + (isPath pref) + '' + lib.strings.hasPrefix: The first argument (${toString pref}) is a path value, but only strings are supported. + There is almost certainly a bug in the calling code, since this function always returns `false` in such a case. + This function also copies the path to the Nix store, which may not be what you want. + This behavior is deprecated and will throw an error in the future.'' + (substring 0 (stringLength pref) str == pref); /* Determine whether a string has given suffix. @@ -258,8 +270,20 @@ rec { let lenContent = stringLength content; lenSuffix = stringLength suffix; - in lenContent >= lenSuffix && - substring (lenContent - lenSuffix) lenContent content == suffix; + in + # Before 23.05, paths would be copied to the store before converting them + # to strings and comparing. This was surprising and confusing. + warnIf + (isPath suffix) + '' + lib.strings.hasSuffix: The first argument (${toString suffix}) is a path value, but only strings are supported. + There is almost certainly a bug in the calling code, since this function always returns `false` in such a case. + This function also copies the path to the Nix store, which may not be what you want. + This behavior is deprecated and will throw an error in the future.'' + ( + lenContent >= lenSuffix + && substring (lenContent - lenSuffix) lenContent content == suffix + ); /* Determine whether a string contains the given infix @@ -276,7 +300,16 @@ rec { => false */ hasInfix = infix: content: - builtins.match ".*${escapeRegex infix}.*" "${content}" != null; + # Before 23.05, paths would be copied to the store before converting them + # to strings and comparing. This was surprising and confusing. + warnIf + (isPath infix) + '' + lib.strings.hasInfix: The first argument (${toString infix}) is a path value, but only strings are supported. + There is almost certainly a bug in the calling code, since this function always returns `false` in such a case. + This function also copies the path to the Nix store, which may not be what you want. + This behavior is deprecated and will throw an error in the future.'' + (builtins.match ".*${escapeRegex infix}.*" "${content}" != null); /* Convert a string to a list of characters (i.e. singleton strings). This allows you to, e.g., map a function over each character. However, From 5e8b9de7285497e4ef749eb9c55916dd26fecb88 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 14 Mar 2023 23:29:08 +0100 Subject: [PATCH 005/136] lib.strings.normalizePath: Deprecate for path values There's no need to call this function on path data types, and it's confusing with the new lib.path library functions --- lib/strings.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/strings.nix b/lib/strings.nix index 963d937947f2..be4e8ece5936 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -207,7 +207,20 @@ rec { normalizePath "/a//b///c/" => "/a/b/c/" */ - normalizePath = s: (builtins.foldl' (x: y: if y == "/" && hasSuffix "/" x then x else x+y) "" (stringToCharacters s)); + normalizePath = s: + warnIf + (isPath s) + '' + lib.strings.normalizePath: The argument (${toString s}) is a path value, but only strings are supported. + Path values are always normalised in Nix, so there's no need to call this function on them. + This function also copies the path to the Nix store and returns the store path, the same as "''${path}" will, which may not be what you want. + This behavior is deprecated and will throw an error in the future.'' + ( + builtins.foldl' + (x: y: if y == "/" && hasSuffix "/" x then x else x+y) + "" + (stringToCharacters s) + ); /* Depending on the boolean `cond', return either the given string or the empty string. Useful to concatenate against a bigger string. From 61012f6daf61e2cca664c333453a8b868908dc97 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 15 Mar 2023 19:49:33 +0100 Subject: [PATCH 006/136] lib.strings.remove{Prefix,Suffix}: Deprecate for path prefix/suffix arguments See also parent commits --- lib/strings.nix | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index be4e8ece5936..46a62522e1f4 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -601,14 +601,23 @@ rec { prefix: # Input string str: - let + # Before 23.05, paths would be copied to the store before converting them + # to strings and comparing. This was surprising and confusing. + warnIf + (isPath prefix) + '' + lib.strings.removePrefix: The first argument (${toString prefix}) is a path value, but only strings are supported. + There is almost certainly a bug in the calling code, since this function never removes any prefix in such a case. + This function also copies the path to the Nix store, which may not be what you want. + This behavior is deprecated and will throw an error in the future.'' + (let preLen = stringLength prefix; sLen = stringLength str; in - if hasPrefix prefix str then + if substring 0 preLen str == prefix then substring preLen (sLen - preLen) str else - str; + str); /* Return a string without the specified suffix, if the suffix matches. @@ -625,14 +634,23 @@ rec { suffix: # Input string str: - let + # Before 23.05, paths would be copied to the store before converting them + # to strings and comparing. This was surprising and confusing. + warnIf + (isPath suffix) + '' + lib.strings.removeSuffix: The first argument (${toString suffix}) is a path value, but only strings are supported. + There is almost certainly a bug in the calling code, since this function never removes any suffix in such a case. + This function also copies the path to the Nix store, which may not be what you want. + This behavior is deprecated and will throw an error in the future.'' + (let sufLen = stringLength suffix; sLen = stringLength str; in if sufLen <= sLen && suffix == substring (sLen - sufLen) sufLen str then substring 0 (sLen - sufLen) str else - str; + str); /* Return true if string v1 denotes a version older than v2. From e81872b9f437de3a1d3cb91fc44a329cd88f450f Mon Sep 17 00:00:00 2001 From: Lars Strojny Date: Sat, 18 Mar 2023 13:20:34 +0100 Subject: [PATCH 007/136] Set PHP_INI_SCAN_DIR only if not set MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only set PHP_INI_SCAN_DIR if it isn’t set yet. This is so that users can provide there own PHP_INI_SCAN_DIR, e.g. to restart the current PHP process without xdebug. For example, composer/xdebug-handler uses this mechanism to turn off xdebug (https://github.com/composer/xdebug-handler/blob/cf19e3380ffd84cea4a2cbfcc599ea07ef01f18a/src/XdebugHandler.php#L441) --- pkgs/development/interpreters/php/generic.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 74dedcfe2d18..eb75606273b4 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -170,19 +170,19 @@ let ln -s ${extraInit} $out/lib/php.ini if test -e $out/bin/php; then - wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/php --set-default PHP_INI_SCAN_DIR $out/lib fi if test -e $out/bin/php-fpm; then - wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/php-fpm --set-default PHP_INI_SCAN_DIR $out/lib fi if test -e $out/bin/phpdbg; then - wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/phpdbg --set-default PHP_INI_SCAN_DIR $out/lib fi if test -e $out/bin/php-cgi; then - wrapProgram $out/bin/php-cgi --set PHP_INI_SCAN_DIR $out/lib + wrapProgram $out/bin/php-cgi --set-default PHP_INI_SCAN_DIR $out/lib fi ''; }; From 8751764236e5d85cc394652288cda7a63fe78f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 22 Mar 2023 11:23:21 +0100 Subject: [PATCH 008/136] lib/modules: better error for invalid option declarations Make `byName` aware of whether it's processing options or config to give slightly more accurate error messages. --- lib/modules.nix | 12 ++++++++---- lib/tests/modules.sh | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 051dbe2ef896..9c3e2085e378 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -567,15 +567,19 @@ rec { zipAttrsWith (n: concatLists) (map (module: let subtree = module.${attr}; in if !(builtins.isAttrs subtree) then - throw '' - You're trying to declare a value of type `${builtins.typeOf subtree}' - rather than an attribute-set for the option + throw (if attr == "config" then '' + You're trying to define a value of type `${builtins.typeOf subtree}' + rather than an attribute set for the option `${builtins.concatStringsSep "." prefix}'! This usually happens if `${builtins.concatStringsSep "." prefix}' has option definitions inside that are not matched. Please check how to properly define this option by e.g. referring to `man 5 configuration.nix'! - '' + '' else '' + An option declaration for `${builtins.concatStringsSep "." prefix}' has type + `${builtins.typeOf subtree}' rather than an attribute set. + Did you mean to define this outside of `options'? + '') else mapAttrs (n: f module) subtree ) modules); diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 8081b186a2f9..c1cf0a94a1b3 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -189,7 +189,7 @@ checkConfigOutput '^"foo"$' config.submodule.foo ./declare-submoduleWith-special ## shorthandOnlyDefines config behaves as expected checkConfigOutput '^true$' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-shorthand.nix checkConfigError 'is not of type `boolean' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-noshorthand.nix -checkConfigError "You're trying to declare a value of type \`bool'\n\s*rather than an attribute-set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix +checkConfigError "You're trying to define a value of type \`bool'\n\s*rather than an attribute set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix checkConfigOutput '^true$' config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-noshorthand.nix ## submoduleWith should merge all modules in one swoop From bd0ec2e61b2a3163f751aabd3df4827753a755d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 22 Mar 2023 20:33:52 +0100 Subject: [PATCH 009/136] python310Packages.bc-detect-secrets: 1.4.14 -> 1.4.15 --- pkgs/development/python-modules/bc-detect-secrets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index 8efa3f375a61..98a14ade57c3 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.4.14"; + version = "1.4.15"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-WgUbVpn5KoayiWv3sYp+hZxqfQg73k0pXkxgUK8wrPg="; + hash = "sha256-zTRrWgbuSRK1zRurv3a2G1gZ6LCzmVQh8eFFa3g6eSE="; }; propagatedBuildInputs = [ From db18f3498e3053a1d4c4a274856041ac0f16e3a0 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Fri, 24 Mar 2023 18:35:57 +0100 Subject: [PATCH 010/136] python3Packages.rustworkx: init at 0.12.1 --- .../python-modules/rustworkx/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/rustworkx/default.nix diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix new file mode 100644 index 000000000000..09f15fdc1c94 --- /dev/null +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -0,0 +1,47 @@ +{ fetchFromGitHub +, buildPythonPackage +, rustPlatform +, setuptools-rust +, numpy +, fixtures +, networkx +, libiconv +, stdenv +, lib +}: + +buildPythonPackage rec { + pname = "rustworkx"; + version = "0.12.1"; + + src = fetchFromGitHub { + owner = "Qiskit"; + repo = pname; + rev = version; + hash = "sha256-d/KCxhJdyzhTjwJZ+GsXJE4ww30iPaXcPngpCi4hBZw="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-imhiPj763iumRQb+oeBOpICD1nCvzZx+3yQWu1QRRQQ="; + }; + + nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + + buildInputs = [ numpy ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + + checkInputs = [ fixtures networkx ]; + + pythonImportsCheck = [ "rustworkx" ]; + + meta = with lib; { + description = "A high performance Python graph library implemented in Rust."; + homepage = "https://github.com/Qiskit/rustworkx"; + license = licenses.asl20; + maintainers = with maintainers; [ raitobezarius ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7ed831a95adf..4a537263b58e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12071,6 +12071,8 @@ self: super: with self; { tzlocal = callPackage ../development/python-modules/tzlocal { }; + rustworkx = callPackage ../development/python-modules/rustworkx { }; + uamqp = callPackage ../development/python-modules/uamqp { openssl = pkgs.openssl_1_1; inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork CoreFoundation Security; From 788df5456baac036c9acc1bcb34be02914e4f7c6 Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 28 Feb 2023 07:13:39 +0100 Subject: [PATCH 011/136] kicad: 7.0.0 -> 7.0.1 remove now integrated patches --- .../science/electronics/kicad/base.nix | 14 ------------- .../science/electronics/kicad/versions.nix | 20 +++++++++---------- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 697c27842081..3833a5e72918 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -22,7 +22,6 @@ , libXdmcp , lndir , unixODBC -, fetchpatch , util-linux , libselinux @@ -72,19 +71,6 @@ stdenv.mkDerivation rec { patches = [ # upstream issue 12941 (attempted to upstream, but appreciably unacceptable) ./writable.patch - ] - ++ optionals (stable) # the 2 wxGTK ones should in the next stable point release - [ - (fetchpatch { # for wxGTK 3.2.2.1's .1 field - name = "support wxWidgets subrelease field"; - url = "https://gitlab.com/kicad/code/kicad/-/commit/b536580119c59fde78e38d8d6388f2540ecb6cf9.diff"; - hash = "sha256-F+J5oZO0BsT1VWKpx0KGA7ecn5/PBgCw8uiScihM+54="; - }) - (fetchpatch { # for wxGTK 3.2.2.1's .1 field, but for wxPython - name = "relax wxPython check to just major.minor"; - url = "https://gitlab.com/kicad/code/kicad/-/commit/1e8cc6855d6a8fc1f9dfc933224c3a10fb759f9c.diff"; - hash = "sha256-CGNgxZ7QiVLkaauNl7Pmcl152lwyDZqA/HSyFdOswwU="; - }) ]; # tagged releases don't have "unknown" diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 4562e8447624..f686dc3ed1fc 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "7.0.0"; + version = "7.0.1"; src = { - rev = "da2b9df05c3ccd5ec104cf8cd8ded34f5dd25216"; - sha256 = "1zgpj1rvf97qv36hg4dja46pbzyixlh2g04wlh7cizcrs16b9mzw"; + rev = "3b83917a115be1ce2f33a73039f59f8784b5c2e7"; + sha256 = "021safxvyq9qzs08jy3jvpazmhvix4kyl05s9y9hwmyzdmdl2smn"; }; }; libVersion = { - version = "7.0.0"; + version = "7.0.1"; libSources = { - symbols.rev = "08a25991d07924b263cbf87c6e513feac2b2169f"; - symbols.sha256 = "1r87xr1453dpfglkg1m4p5d7kcv9gxls1anwk3vp2yppnwz24ydm"; + symbols.rev = "adfe3c06b5750d81580ed44e669b578f49c205eb"; + symbols.sha256 = "14c5gci13m30xv0cmic5jxsmfx9lq3fnd8hyq3mmgkrw7443zy30"; templates.rev = "66d76556d9e81f8a5be74457686d211c666ed200"; templates.sha256 = "02i279269mhq7wjhb1yqk90820ncssxl9n7b20qr2r4fmm7jpvxv"; - footprints.rev = "a0388d07e4a37e8db13a716efb3ad4750c839f9c"; - footprints.sha256 = "1akhifnjm8jvqsvscn2rr1wpzrls73bpdc6sk40355r1in2djmry"; - packages3d.rev = "bbee2295519bcf469d97f5e06bcf7175cddd2037"; - packages3d.sha256 = "1qw5xm0wbhv6gqvd8mn0jp4abjbizrkx79r6y8f6911mkzi47r6n"; + footprints.rev = "1cf5a1d979cffebd62464c1bb0d7b09c5ee3b8c3"; + footprints.sha256 = "0k0z40wmaq665hjxb6kp1yl3v7clxz49r6ki0chyphsxv1cnixmy"; + packages3d.rev = "e54b5b6368d03f396098448bcce37f2e432dac33"; + packages3d.sha256 = "0nzi7ijfb3rjm98kaa9va2mkh0nfzpq4vfhxkq8j18qhx24h5c8v"; }; }; }; From d8020e1e17ef13b5bcc5aaad3d8d3e77edccd9c4 Mon Sep 17 00:00:00 2001 From: Evils Date: Sat, 18 Mar 2023 01:21:22 +0100 Subject: [PATCH 012/136] kicad: remove withOCC and more cmakeFlags cleanup OCC is no longer optional RPATH apparently no longer contains references to /build/ KICAD_SCRIPTING_WXPYTHON is ON by default sort some of the options a bit and remove stray lndir --- .../science/electronics/kicad/base.nix | 26 +++++-------------- .../science/electronics/kicad/default.nix | 3 +-- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 3833a5e72918..decbd8acb03c 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -20,7 +20,6 @@ , pcre , libpthreadstubs , libXdmcp -, lndir , unixODBC , util-linux @@ -47,7 +46,6 @@ , baseName , kicadSrc , kicadVersion -, withOCC , withNgspice , withScripting , withI18n @@ -84,39 +82,30 @@ stdenv.mkDerivation rec { makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; cmakeFlags = [ - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" "-DKICAD_USE_EGL=ON" "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" # upstream issue 12491 - ] - ++ optionals (withScripting) [ - "-DKICAD_SCRIPTING_WXPYTHON=ON" + "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" ] ++ optionals (!withScripting) [ "-DKICAD_SCRIPTING_WXPYTHON=OFF" ] ++ optional (!withNgspice) "-DKICAD_SPICE=OFF" - ++ optional (!withOCC) "-DKICAD_USE_OCC=OFF" - ++ optionals (withOCC) [ - "-DKICAD_USE_OCC=ON" - "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" + ++ optionals (withI18n) [ + "-DKICAD_BUILD_I18N=ON" + ] + ++ optionals (!doInstallCheck) [ + "-DKICAD_BUILD_QA_TESTS=OFF" ] ++ optionals (debug) [ "-DCMAKE_BUILD_TYPE=Debug" "-DKICAD_STDLIB_DEBUG=ON" "-DKICAD_USE_VALGRIND=ON" ] - ++ optionals (!doInstallCheck) [ - "-DKICAD_BUILD_QA_TESTS=OFF" - ] ++ optionals (sanitizeAddress) [ "-DKICAD_SANITIZE_ADDRESS=ON" ] ++ optionals (sanitizeThreads) [ "-DKICAD_SANITIZE_THREADS=ON" - ] - ++ optionals (withI18n) [ - "-DKICAD_BUILD_I18N=ON" ]; nativeBuildInputs = [ @@ -124,7 +113,6 @@ stdenv.mkDerivation rec { doxygen graphviz pkg-config - lndir ] # wanted by configuration on linux, doesn't seem to affect performance # no effect on closure size @@ -163,10 +151,10 @@ stdenv.mkDerivation rec { python unixODBC libdeflate + opencascade-occt ] ++ optional (withScripting) wxPython ++ optional (withNgspice) libngspice - ++ optional (withOCC) opencascade-occt ++ optional (debug) valgrind; # debug builds fail all but the python test diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index c7eb9d69522c..3fadda710f75 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -14,7 +14,6 @@ , pname ? "kicad" , stable ? true -, withOCC ? true , withNgspice ? !stdenv.isDarwin , libngspice , withScripting ? true @@ -117,7 +116,7 @@ stdenv.mkDerivation rec { inherit stable baseName; inherit kicadSrc kicadVersion; inherit wxGTK python wxPython; - inherit withOCC withNgspice withScripting withI18n; + inherit withNgspice withScripting withI18n; inherit debug sanitizeAddress sanitizeThreads; }; From 7f3a08710a6b50ea53ddaa1fe77cefcc894fc793 Mon Sep 17 00:00:00 2001 From: Evils Date: Fri, 24 Mar 2023 13:52:22 +0100 Subject: [PATCH 013/136] kicad: add requests runtime dependency required for some of the plugins --- pkgs/applications/science/electronics/kicad/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 3fadda710f75..50628a3e1f01 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { dontFixup = true; pythonPath = optionals (withScripting) - [ wxPython python.pkgs.six ]; + [ wxPython python.pkgs.six python.pkgs.requests ]; nativeBuildInputs = [ makeWrapper ] ++ optionals (withScripting) From 40ee8d66cd703e44eae0e26752ac3207a6140ec2 Mon Sep 17 00:00:00 2001 From: guangtao Date: Sun, 26 Mar 2023 01:04:29 -0700 Subject: [PATCH 014/136] nvidia-container-toolkit: 1.5.0 -> 1.9.0 --- .../nvidia-container-runtime/default.nix | 71 ----------------- .../nvidia-container-toolkit/default.nix | 76 +++++++++++++++---- pkgs/top-level/all-packages.nix | 12 ++- 3 files changed, 67 insertions(+), 92 deletions(-) delete mode 100644 pkgs/applications/virtualization/nvidia-container-runtime/default.nix diff --git a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix deleted file mode 100644 index 71621d6cd942..000000000000 --- a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ lib -, glibc -, fetchFromGitHub -, makeWrapper -, buildGoPackage -, linkFarm -, writeShellScript -, containerRuntimePath -, configTemplate -}: -let - isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [ - { - name = "runc"; - path = containerRuntimePath; - } - ]; - warnIfXdgConfigHomeIsSet = writeShellScript "warn_if_xdg_config_home_is_set" '' - set -eo pipefail - - if [ -n "$XDG_CONFIG_HOME" ]; then - echo >&2 "$(tput setaf 3)warning: \$XDG_CONFIG_HOME=$XDG_CONFIG_HOME$(tput sgr 0)" - fi - ''; -in -buildGoPackage rec { - pname = "nvidia-container-runtime"; - version = "3.5.0"; - - src = fetchFromGitHub { - owner = "NVIDIA"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-+LZjsN/tKqsPJamoI8xo9LFv14c3e9vVlSP4NJhElcs="; - }; - - goPackagePath = "github.com/nvidia/nvidia-container-runtime"; - ldflags = [ "-s" "-w" ]; - nativeBuildInputs = [ makeWrapper ]; - - postInstall = '' - mkdir -p $out/etc/nvidia-container-runtime - - # nvidia-container-runtime invokes docker-runc or runc if that isn't - # available on PATH. - # - # Also set XDG_CONFIG_HOME if it isn't already to allow overriding - # configuration. This in turn allows users to have the nvidia container - # runtime enabled for any number of higher level runtimes like docker and - # podman, i.e., there's no need to have mutually exclusivity on what high - # level runtime can enable the nvidia runtime because each high level - # runtime has its own config.toml file. - wrapProgram $out/bin/nvidia-container-runtime \ - --run "${warnIfXdgConfigHomeIsSet}" \ - --prefix PATH : ${isolatedContainerRuntimePath} \ - --set-default XDG_CONFIG_HOME $out/etc - - cp ${configTemplate} $out/etc/nvidia-container-runtime/config.toml - - substituteInPlace $out/etc/nvidia-container-runtime/config.toml \ - --subst-var-by glibcbin ${lib.getBin glibc} - ''; - - meta = with lib; { - homepage = "https://github.com/NVIDIA/nvidia-container-runtime"; - description = "NVIDIA container runtime"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ cpcloud ]; - }; -} diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index febd5e4cb1a8..9d32d9864ac0 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -1,35 +1,83 @@ { lib -, fetchFromGitHub -, buildGoModule +, glibc +, fetchFromGitLab , makeWrapper -, nvidia-container-runtime +, buildGoPackage +, linkFarm +, writeShellScript +, containerRuntimePath +, configTemplate +, libnvidia-container }: -buildGoModule rec { - pname = "nvidia-container-toolkit"; - version = "1.5.0"; +let + isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [ + { + name = "runc"; + path = containerRuntimePath; + } + ]; + warnIfXdgConfigHomeIsSet = writeShellScript "warn_if_xdg_config_home_is_set" '' + set -eo pipefail - src = fetchFromGitHub { - owner = "NVIDIA"; + if [ -n "$XDG_CONFIG_HOME" ]; then + echo >&2 "$(tput setaf 3)warning: \$XDG_CONFIG_HOME=$XDG_CONFIG_HOME$(tput sgr 0)" + fi + ''; +in +buildGoPackage rec { + pname = "container-toolkit/container-toolkit"; + version = "1.9.0"; + + src = fetchFromGitLab { + owner = "nvidia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YvwqnwYOrlSE6PmNNZ5xjEaEcXdHKcakIwua+tOvIJ0="; + sha256 = "sha256-b4mybNB5FqizFTraByHk5SCsNO66JaISj18nLgLN7IA="; }; - vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7"; + goPackagePath = "github.com/NVIDIA/nvidia-container-toolkit"; + ldflags = [ "-s" "-w" ]; + nativeBuildInputs = [ makeWrapper ]; + preBuild = '' + # replace the default hookDefaultFilePath to the $out path + substituteInPlace go/src/github.com/NVIDIA/nvidia-container-toolkit/cmd/nvidia-container-runtime/main.go \ + --replace '/usr/bin/nvidia-container-runtime-hook' '${placeholder "out"}/bin/nvidia-container-runtime-hook' + ''; + postInstall = '' - mv $out/bin/{pkg,${pname}} + mkdir -p $out/etc/nvidia-container-runtime + + # nvidia-container-runtime invokes docker-runc or runc if that isn't + # available on PATH. + # + # Also set XDG_CONFIG_HOME if it isn't already to allow overriding + # configuration. This in turn allows users to have the nvidia container + # runtime enabled for any number of higher level runtimes like docker and + # podman, i.e., there's no need to have mutually exclusivity on what high + # level runtime can enable the nvidia runtime because each high level + # runtime has its own config.toml file. + wrapProgram $out/bin/nvidia-container-runtime \ + --run "${warnIfXdgConfigHomeIsSet}" \ + --prefix PATH : ${isolatedContainerRuntimePath}:${libnvidia-container}/bin \ + --set-default XDG_CONFIG_HOME $out/etc + + cp ${configTemplate} $out/etc/nvidia-container-runtime/config.toml + + substituteInPlace $out/etc/nvidia-container-runtime/config.toml \ + --subst-var-by glibcbin ${lib.getBin glibc} + ln -s $out/bin/nvidia-container-{toolkit,runtime-hook} wrapProgram $out/bin/nvidia-container-toolkit \ - --add-flags "-config ${nvidia-container-runtime}/etc/nvidia-container-runtime/config.toml" + --add-flags "-config ${placeholder "out"}/etc/nvidia-container-runtime/config.toml" ''; meta = with lib; { - homepage = "https://github.com/NVIDIA/nvidia-container-toolkit"; - description = "NVIDIA container runtime hook"; + homepage = "https://gitlab.com/nvidia/container-toolkit/container-toolkit"; + description = "NVIDIA Container Toolkit"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ cpcloud ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8bf2e05194f..e751dbbc067d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22756,17 +22756,15 @@ with pkgs; mkNvidiaContainerPkg = { name, containerRuntimePath, configTemplate, additionalPaths ? [] }: let - nvidia-container-runtime = callPackage ../applications/virtualization/nvidia-container-runtime { - inherit containerRuntimePath configTemplate; + nvidia-container-toolkit = callPackage ../applications/virtualization/nvidia-container-toolkit { + inherit containerRuntimePath configTemplate libnvidia-container; }; + libnvidia-container =(callPackage ../applications/virtualization/libnvidia-container { }); in symlinkJoin { inherit name; paths = [ - (callPackage ../applications/virtualization/libnvidia-container { }) - nvidia-container-runtime - (callPackage ../applications/virtualization/nvidia-container-toolkit { - inherit nvidia-container-runtime; - }) + libnvidia-container + nvidia-container-toolkit ] ++ additionalPaths; }; From 6d097e33856c8359274dab4c07ee376a593cc51a Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Thu, 30 Mar 2023 07:55:31 +0200 Subject: [PATCH 015/136] xwayland 22.1.8 -> 23.1.1 Some notable changes since Xwayland 22.1 include: - Support for linux_dmabuf v4 protocol, - Support for wl_pointer.axis_v120 (high-resolution scrolling), - Support for xwayland_shell protocol, - Improved "rootful" mode for using Xwayland as a nested Xserver, - Improved emulated XRandR support exposing the output names, - Support for byte-swapped clients is now disabled by default. Link: https://lists.x.org/archives/xorg-announce/2023-February/003330.html --- pkgs/servers/x11/xorg/xwayland.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index a4635177f2ff..a6c270182f75 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "22.1.8"; + version = "23.1.1"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - sha256 = "sha256-0R7u5zKQuI6o2kKn2TUN7fq6hWzkrkTljARa2eyqL3M="; + sha256 = "sha256-+5Rh9cuf6l4H6RiCMRsMiLQ+iEOwF+usBeta9pqjTBU="; }; depsBuildBuild = [ From 4f0de9463ab4e87eca136e8320480dcf10031acf Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 21 Mar 2023 09:11:13 +0100 Subject: [PATCH 016/136] kicad-unstable: 2023-02-14 -> 2023-03-29 includes a fix for upstream issue 14346 (attempting to installing pcbnew.py outside of $out) --- .../science/electronics/kicad/base.nix | 3 +++ .../science/electronics/kicad/versions.nix | 20 +++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index decbd8acb03c..40fdc5b30d91 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -86,6 +86,9 @@ stdenv.mkDerivation rec { "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" # upstream issue 12491 "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" ] + ++ optionals (!stable) [ # workaround for https://gitlab.com/kicad/code/kicad/-/issues/14346 + "-DPYTHON_SITE_PACKAGE_PATH=${placeholder "out"}/lib/python${lib.versions.majorMinor python.version}/site-packages" + ] ++ optionals (!withScripting) [ "-DKICAD_SCRIPTING_WXPYTHON=OFF" ] diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index f686dc3ed1fc..b102da24a3d4 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -25,23 +25,23 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2023-02-14"; + version = "2023-03-29"; src = { - rev = "29c4482bc898f627cebcd5f64e063e8a813a5445"; - sha256 = "1hs1p79skmrn2k7qrpnkynzkk2g8ry20lqivzfqg87c56rd1522y"; + rev = "d5bc223ff2cd1fbf4e923e23b5bb442bb54faa95"; + sha256 = "0pbzmv9vh4bzhsxj46gjkgh7kk6a0v8gijvkmb56fy5i8xv2ixkn"; }; }; libVersion = { - version = "2023-02-14"; + version = "2023-03-29"; libSources = { - symbols.rev = "3ad8b98287ddf528ce8ff07bbe70aed85cb4410a"; - symbols.sha256 = "1p0wa3bhw2qgdvb5vzwvrbhkb6sqpc93d754rbcs2xh79d75l9nn"; + symbols.rev = "36fc1c88921bf32ebf667e027dfe63cca649fd95"; + symbols.sha256 = "177mqvjf3knldnl7pf1abv4pmlgi5cg02ggfwbc655jq4x6x8fkz"; templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a"; templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; - footprints.rev = "a168dd18ea63c2df948c2de3026dc19730cb70cf"; - footprints.sha256 = "0y3cl9fcyi8z4yrn0kfgfy28gn9ngrdvnpgbpwykbbp8fpx401nk"; - packages3d.rev = "a0919e5e805157bccd65af313806de3833c1673e"; - packages3d.sha256 = "1yizw9g3skz7i9x9iwbnn3gk3lnh10krf6xg32plb2plxfynz3cw"; + footprints.rev = "dc4574eb65136d95a7775d09412d5159f8d7832c"; + footprints.sha256 = "1iz4wyiysdii378c3pjgkgwh1cssxbh5jkbhvj7rmi2vmgngl6nc"; + packages3d.rev = "e54b5b6368d03f396098448bcce37f2e432dac33"; + packages3d.sha256 = "0nzi7ijfb3rjm98kaa9va2mkh0nfzpq4vfhxkq8j18qhx24h5c8v"; }; }; }; From 23849267ee0f3c84aa36f644d3d279b280e9f647 Mon Sep 17 00:00:00 2001 From: Evils Date: Thu, 23 Mar 2023 06:12:55 +0100 Subject: [PATCH 017/136] kicad-unstable: fix ngspice tests --- .../science/electronics/kicad/base.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 40fdc5b30d91..eb65b6881ae2 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -81,18 +81,26 @@ stdenv.mkDerivation rec { makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; + # some ngspice tests attempt to write to $HOME/.cache/ + XDG_CACHE_HOME = "$TMP"; + # failing tests still attempt to create $HOME though + cmakeFlags = [ "-DKICAD_USE_EGL=ON" - "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" # upstream issue 12491 "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" ] - ++ optionals (!stable) [ # workaround for https://gitlab.com/kicad/code/kicad/-/issues/14346 - "-DPYTHON_SITE_PACKAGE_PATH=${placeholder "out"}/lib/python${lib.versions.majorMinor python.version}/site-packages" + ++ optionals (stable) [ + # https://gitlab.com/kicad/code/kicad/-/issues/12491 + # should be resolved in the next release + "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'" ] + ++ optionals (!stable) [ # workaround for https://gitlab.com/kicad/code/kicad/-/issues/14346 + "-DPYTHON_SITE_PACKAGE_PATH=${placeholder "out"}/${python.sitePackages}/" + ] + ++ optional (stable && !withNgspice) "-DKICAD_SPICE=OFF" ++ optionals (!withScripting) [ "-DKICAD_SCRIPTING_WXPYTHON=OFF" ] - ++ optional (!withNgspice) "-DKICAD_SPICE=OFF" ++ optionals (withI18n) [ "-DKICAD_BUILD_I18N=ON" ] From d8cd324e3c2b1b6b1259403beb3a02de2cc51440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 31 Mar 2023 11:14:58 -0700 Subject: [PATCH 018/136] python310Packages.cython_3: 3.0.0a11 -> 3.0.0b2 Changelog: https://github.com/cython/cython/blob/3.0.0b2/CHANGES.rst --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2311f6b64082..eb9c46c5c9ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2208,10 +2208,10 @@ self: super: with self; { cython = callPackage ../development/python-modules/Cython { }; cython_3 = self.cython.overridePythonAttrs (old: rec { - version = "3.0.0a11"; + version = "3.0.0b2"; src = old.src.override { inherit version; - hash = "sha256-5GckkfsxVGuau2Nnf2OOc4CF3JMhOYFwlW72+/wOFyY="; + hash = "sha256-bEKAZWV56STBGURyR2ZLsi+v7cfezKWTqOogvdV9Z1U="; }; patches = [ ]; }); From cc1f75044bc97dd832d4c33f991d74fba1d403ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 31 Mar 2023 11:17:13 -0700 Subject: [PATCH 019/136] python310Packages.rapidfuzz: 2.13.7 -> 2.14.0 Diff: https://github.com/maxbachmann/RapidFuzz/compare/refs/tags/v2.13.7...v2.14.0 Changelog: https://github.com/maxbachmann/RapidFuzz/blob/refs/tags/v2.14.0/CHANGELOG.rst --- pkgs/development/python-modules/rapidfuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 00abec7fda31..5d226835b79f 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "2.13.7"; + version = "2.14.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-ZovXYOoLriAmJHptolD135qCn7XHeVvzLJNzI08mqwY="; + hash = "sha256-qZfVr1V7YBuMoFiMwRoEVosof6kCSiIb944gXzPn4P0="; }; nativeBuildInputs = [ From d857988d21be667385c3841f0ce7df7c9ec153fb Mon Sep 17 00:00:00 2001 From: Chuck Z Date: Fri, 31 Mar 2023 13:19:53 -0600 Subject: [PATCH 020/136] anki-bin: add commandLineArgs to package arguments anki-bin is built with buildFHSUserEnv on Linux, which makes using overrides to pass in command line arguments impossible. This commit adds the commandLineArgs argument to the package inputs and appends the string to the runscript, allowing pkgs.override to add flags to pass to anki when the derivation is built. This is useful when anki's desired directory isn't the default, allowing users to specify the directory in their overlays instead of adding a flag everytime they call the program. --- pkgs/games/anki/bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index c2a988d16876..d824475f8fd8 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg, zstd }: +{ fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg, zstd, commandLineArgs ? "" }: let pname = "anki-bin"; @@ -57,7 +57,7 @@ let targetPkgs = pkgs: (with pkgs; [ xorg.libxkbfile krb5 ]); runScript = writeShellScript "anki-wrapper.sh" '' - exec ${unpacked}/bin/anki + exec ${unpacked}/bin/anki ${ lib.strings.escapeShellArg commandLineArgs } ''; extraInstallCommands = '' From 5f2678d7d3dff2956b53fcd69c8dd22ac39e8521 Mon Sep 17 00:00:00 2001 From: Charles Zhang Date: Fri, 31 Mar 2023 14:21:30 -0600 Subject: [PATCH 021/136] Update pkgs/games/anki/bin.nix Co-authored-by: Norbert Melzer --- pkgs/games/anki/bin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index d824475f8fd8..76da2825571a 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -57,7 +57,7 @@ let targetPkgs = pkgs: (with pkgs; [ xorg.libxkbfile krb5 ]); runScript = writeShellScript "anki-wrapper.sh" '' - exec ${unpacked}/bin/anki ${ lib.strings.escapeShellArg commandLineArgs } + exec ${unpacked}/bin/anki ${ lib.strings.escapeShellArgs commandLineArgs } ''; extraInstallCommands = '' From 052d58934700a81b270edc148c76e50e8ce90956 Mon Sep 17 00:00:00 2001 From: Charles Zhang Date: Fri, 31 Mar 2023 14:21:40 -0600 Subject: [PATCH 022/136] Update pkgs/games/anki/bin.nix Co-authored-by: Norbert Melzer --- pkgs/games/anki/bin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 76da2825571a..cb07fcde442b 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg, zstd, commandLineArgs ? "" }: +{ fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg, zstd, commandLineArgs ? [] }: let pname = "anki-bin"; From e48d50d23b4f9819827db21d5e8bb4446fc7dc91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Mar 2023 23:02:27 +0000 Subject: [PATCH 023/136] python310Packages.django-auth-ldap: 4.1.0 -> 4.2.0 --- pkgs/development/python-modules/django-auth-ldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index 4631c13b6bd0..57e7f45a2a81 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "4.1.0"; + version = "4.2.0"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-d/dJ07F4B86OtWqcnI5XRv8xZWf4HVumE0ldnHSVqUk="; + hash = "sha256-qsceZbCovc/FzQi3CZfuPNw3eG/9XZdbfiz6R1ldQn8="; }; nativeBuildInputs = [ From 59ef8c5a199a6ea8c9269d607fb31954e2396671 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 1 Apr 2023 04:20:00 +0000 Subject: [PATCH 024/136] zsv: 0.3.5-alpha -> 0.3.6-alpha https://github.com/liquidaty/zsv/releases/tag/v0.3.6-alpha --- pkgs/development/tools/zsv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/zsv/default.nix b/pkgs/development/tools/zsv/default.nix index 639b9bcb4b26..7c262ba2035a 100644 --- a/pkgs/development/tools/zsv/default.nix +++ b/pkgs/development/tools/zsv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsv"; - version = "0.3.5-alpha"; + version = "0.3.6-alpha"; src = fetchFromGitHub { owner = "liquidaty"; repo = "zsv"; rev = "v${version}"; - hash = "sha256-HW/w2bJVnTELh36rUfGIzAsc6e+PTBGsAdHDz7gFAdI="; + hash = "sha256-P4xgWmNPBmuB87jsQvoyuRFCYkD4n/mTd04ZPfaf5ZE="; }; nativeBuildInputs = [ perl ]; From cfc3d04a275b41b84292c77bd1a9d3eee27897da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Apr 2023 17:53:11 +0200 Subject: [PATCH 025/136] python310Packages.ansible-doctor: 2.0.2 -> 2.0.3 Changelog: https://github.com/thegeeklab/ansible-doctor/releases/tag/v2.0.3 --- pkgs/development/python-modules/ansible-doctor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-doctor/default.nix b/pkgs/development/python-modules/ansible-doctor/default.nix index 6321693202d8..473625e67aad 100644 --- a/pkgs/development/python-modules/ansible-doctor/default.nix +++ b/pkgs/development/python-modules/ansible-doctor/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ansible-doctor"; - version = "2.0.2"; + version = "2.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = "ansible-doctor"; rev = "refs/tags/v${version}"; - hash = "sha256-hbHQbYc/cOqbeubAMa0J+UtI00jtyG/WUBe0xcSaGSI="; + hash = "sha256-rhXhz6aUQ9hw83cfHmOLXMyyLQc7pSCGgurFhuglKjU="; }; pythonRelaxDeps = true; From 1b3f8f6b9c98065d8ef47f52302db6a3902fa541 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Apr 2023 08:59:20 +0000 Subject: [PATCH 026/136] dex-oidc: 2.35.3 -> 2.36.0 --- pkgs/servers/dex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 3c82f71c09a2..01d71f73a6c9 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dex"; - version = "2.35.3"; + version = "2.36.0"; src = fetchFromGitHub { owner = "dexidp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sYEdlEEpO0JDPHuGC457IPUcpp5PO2BLX/Gvd/vJvWQ="; + sha256 = "sha256-EIkK+X08FJKTFU4V19cGSH1yGesUfS7AibQ3zGUFyWI="; }; - vendorSha256 = "sha256-2rg99+Zv+Lj6udhld0BwFrpVsyGC0IfX5Xqc7dRN13o="; + vendorHash = "sha256-Rsz7UnBlZdPRTrq3nfFaSVwok8wLDtd6aT1sEK+++vg="; subPackages = [ "cmd/dex" From 71a3a77c2a97b7aadf35b4c9b0e066bb96fec56c Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 2 Apr 2023 14:58:35 +0200 Subject: [PATCH 027/136] qrcp: 0.9.1 -> 0.10.0 --- pkgs/tools/networking/qrcp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/tools/networking/qrcp/default.nix index 6d619b28e6bd..c98c7ff4e618 100644 --- a/pkgs/tools/networking/qrcp/default.nix +++ b/pkgs/tools/networking/qrcp/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "qrcp"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "claudiodangelis"; repo = "qrcp"; rev = version; - sha256 = "sha256-oXtFkjCnbfjV15XWkmmJmhG82GyaY4FAcF5NrGnxHm0="; + sha256 = "sha256-pGFqKnOZhwuyN0lHmQPLQ4bJhMsMYoxbh0oEJdK1wAQ="; }; - vendorSha256 = "1hn8c72fvih6ws1y2c4963pww3ld64m0yh3pmx62hwcy83bhb0v4"; + vendorSha256 = "sha256-XVBDPhQsnUdftS+jZ1zWZlfSbFXxXrKSqiGTPpLq5i0="; subPackages = [ "." ]; From c7117a1e192836afed90f424f38ed00591d26c4f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 2 Apr 2023 15:17:10 +0200 Subject: [PATCH 028/136] =?UTF-8?q?ocamlPackages.bwd:=202.0.0=20=E2=86=92?= =?UTF-8?q?=204.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/bwd/default.nix | 5 +++-- pkgs/development/ocaml-modules/cooltt/default.nix | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/bwd/default.nix b/pkgs/development/ocaml-modules/bwd/default.nix index aa762502a598..bff1de9bc865 100644 --- a/pkgs/development/ocaml-modules/bwd/default.nix +++ b/pkgs/development/ocaml-modules/bwd/default.nix @@ -2,15 +2,16 @@ buildDunePackage rec { pname = "bwd"; - version = "2.0.0"; + version = "2.1.0"; minimalOCamlVersion = "4.12"; + duneVersion = "3"; src = fetchFromGitHub { owner = "RedPRL"; repo = "ocaml-bwd"; rev = version; - sha256 = "sha256:0zgi8an53z6wr6nzz0zlmhx19zhqy1w2vfy1sq3sikjwh74jjq60"; + hash = "sha256-ucXOBjD1behL2h8CZv64xtRjCPkajZic7G1oxxDmEXY="; }; doCheck = true; diff --git a/pkgs/development/ocaml-modules/cooltt/default.nix b/pkgs/development/ocaml-modules/cooltt/default.nix index 837a06a2fdee..b19e01ceb345 100644 --- a/pkgs/development/ocaml-modules/cooltt/default.nix +++ b/pkgs/development/ocaml-modules/cooltt/default.nix @@ -49,6 +49,8 @@ let sha256 = "sha256:1xb754fha4s0bgjfqjxzqljvalmkfdwdn5y4ycsp51wiah235bsy"; }; + duneVersion = "3"; + propagatedBuildInputs = [ bwd ]; doCheck = true; From 0d7be800f78e91a19c7218257885260bb558c097 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 2 Apr 2023 15:17:15 +0200 Subject: [PATCH 029/136] ocamlPackages.algaeff: init at 0.2.1 --- .../ocaml-modules/algaeff/default.nix | 26 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/algaeff/default.nix diff --git a/pkgs/development/ocaml-modules/algaeff/default.nix b/pkgs/development/ocaml-modules/algaeff/default.nix new file mode 100644 index 000000000000..7877d255a0af --- /dev/null +++ b/pkgs/development/ocaml-modules/algaeff/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildDunePackage +, fetchFromGitHub +}: + +buildDunePackage rec { + pname = "algaeff"; + version = "0.2.1"; + + minimalOCamlVersion = "5.0"; + duneVersion = "3"; + + src = fetchFromGitHub { + owner = "RedPRL"; + repo = pname; + rev = version; + hash = "sha256-jpnJhF+LN2ef6QPLcCHxcMg3Fr3GSLOnJkZ9ZUIOrlY="; + }; + + meta = { + description = "Reusable Effects-Based Components"; + homepage = "https://github.com/RedPRL/algaeff"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3f8667af9ae7..bbe5c59e1f48 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -18,6 +18,8 @@ let alcotest-mirage = callPackage ../development/ocaml-modules/alcotest/mirage.nix {}; + algaeff = callPackage ../development/ocaml-modules/algaeff { }; + alsa = callPackage ../development/ocaml-modules/alsa { }; angstrom = callPackage ../development/ocaml-modules/angstrom { }; From da8413266703b3b3df1a9ba3014b4d9b907f3836 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 2 Apr 2023 15:17:18 +0200 Subject: [PATCH 030/136] =?UTF-8?q?ocamlPackages.yuujinchou:=202.0.0=20?= =?UTF-8?q?=E2=86=92=204.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/yuujinchou/default.nix | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/yuujinchou/default.nix b/pkgs/development/ocaml-modules/yuujinchou/default.nix index 5a78809d9099..5f0c0965b27b 100644 --- a/pkgs/development/ocaml-modules/yuujinchou/default.nix +++ b/pkgs/development/ocaml-modules/yuujinchou/default.nix @@ -1,24 +1,41 @@ -{ lib, fetchFromGitHub, buildDunePackage, qcheck-alcotest }: +{ lib, ocaml, fetchFromGitHub, buildDunePackage +, algaeff, bwd +, qcheck-alcotest +}: + +let params = if lib.versionAtLeast ocaml.version "5.0" then { + version = "4.0.0"; + hash = "sha256-yNLN5bBe4aft9Rl5VHmlOYTlnCdR2NgDWsc3uJHaZy4="; + propagatedBuildInputs = [ algaeff bwd ]; + } else { + version = "2.0.0"; + hash = "sha256:1nhz44cyipy922anzml856532m73nn0g7iwkg79yzhq6yb87109w"; + } +; in buildDunePackage rec { pname = "yuujinchou"; - version = "2.0.0"; + inherit (params) version; minimalOCamlVersion = "4.12"; + duneVersion = "3"; src = fetchFromGitHub { owner = "RedPRL"; repo = pname; rev = version; - sha256 = "sha256:1nhz44cyipy922anzml856532m73nn0g7iwkg79yzhq6yb87109w"; + inherit (params) hash; }; + propagatedBuildInputs = params.propagatedBuildInputs or []; + + doCheck = true; checkInputs = [ qcheck-alcotest ]; meta = { description = "Name pattern combinators"; - inherit (src.meta) homepage; + homepage = "https://github.com/RedPRL/yuujinchou"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.vbgl ]; }; From 3865ffaf69bdfc9729814b7b85a938c43ec996c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Apr 2023 20:01:29 +0000 Subject: [PATCH 031/136] dbmate: 2.1.0 -> 2.2.0 --- pkgs/development/tools/database/dbmate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 89a12d52dfc9..809c63f14e5d 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dbmate"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "sha256-yqxFty6nguYpl/7HYuLLUAkKrxD4ICg5bh+StEocL7s="; + sha256 = "sha256-K81AyhQfM1hBoA1gpU1MdcdkUnn2YKyig+fExVsMwMI="; }; vendorHash = "sha256-NZ2HVFViU8Vzwyo33cueNJwdCT4exZlB7g4WgoWKZBE="; From 0b4c7a3d4103829e4da3e90066e4d2bd5a514895 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 3 Apr 2023 09:33:03 +0800 Subject: [PATCH 032/136] vsmtp: 2.1.1 -> 2.2.1 Diff: https://github.com/viridIT/vsmtp/compare/v2.1.1...v2.2.1 --- pkgs/servers/mail/vsmtp/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/vsmtp/default.nix b/pkgs/servers/mail/vsmtp/default.nix index 63447dffb309..a6fc770cf5e0 100644 --- a/pkgs/servers/mail/vsmtp/default.nix +++ b/pkgs/servers/mail/vsmtp/default.nix @@ -8,19 +8,25 @@ rustPlatform.buildRustPackage rec { pname = "vsmtp"; - version = "2.1.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "viridIT"; repo = "vsmtp"; rev = "v${version}"; - hash = "sha256-iyjtSeus1gctylYfXAEqpwZNPg/KU/lXv82Wi0h5mAM="; + hash = "sha256-dRw5Q6bejaAJCnoR9j2wBU+L+p1pk1Tnxtm0WcRyOaY="; }; - cargoHash = "sha256-N4cxAFAFtYnd1/wdomm0VYosDY5uy+0z9pRGThSMbG4="; + cargoHash = "sha256-RYHn9kZZApgXWTExAHl9ZnCsuvqnnb67unmvd4Pnwz0="; nativeBuildInputs = [ installShellFiles ]; + buildFeatures = [ + "telemetry" + "journald" + "syslog" + ]; + # tests do not run well in the nix sandbox doCheck = false; From 05fc4507389b5431e5accd9bdb17ba03ef73b7ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 2 Apr 2023 21:14:56 -0700 Subject: [PATCH 033/136] python310Packages.tensorflow: mark insecure --- .../python-modules/tensorflow/default.nix | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 0b0946f11012..80088c1c7018 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -448,6 +448,27 @@ let maintainers = with maintainers; [ jyp abbradar ]; platforms = with platforms; linux ++ darwin; broken = !(xlaSupport -> cudaSupport); + knownVulnerabilities = [ + "CVE-2023-27579" + "CVE-2023-25801" + "CVE-2023-25676" + "CVE-2023-25675" + "CVE-2023-25674" + "CVE-2023-25673" + "CVE-2023-25671" + "CVE-2023-25670" + "CVE-2023-25669" + "CVE-2023-25668" + "CVE-2023-25667" + "CVE-2023-25665" + "CVE-2023-25666" + "CVE-2023-25664" + "CVE-2023-25663" + "CVE-2023-25662" + "CVE-2023-25660" + "CVE-2023-25659" + "CVE-2023-25658" + ]; } // lib.optionalAttrs stdenv.isDarwin { timeout = 86400; # 24 hours maxSilent = 14400; # 4h, double the default of 7200s From 71c95adf30bea8e400aaf2b8c567db587d7de7e7 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Sun, 2 Apr 2023 20:49:35 +0200 Subject: [PATCH 034/136] ntfy-sh: 2.1.2 -> 2.3.1 Release notes: https://docs.ntfy.sh/releases/#ntfy-server-v231 Diff: https://github.com/binwiederhier/ntfy/compare/v2.1.2...v2.3.1 --- pkgs/tools/misc/ntfy-sh/default.nix | 7 +- pkgs/tools/misc/ntfy-sh/node-packages.nix | 1035 +++++++++++---------- 2 files changed, 559 insertions(+), 483 deletions(-) diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index e29afc59f665..baf3601767ae 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -10,16 +10,16 @@ let in buildGoModule rec { pname = "ntfy-sh"; - version = "2.1.2"; + version = "2.3.1"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - sha256 = "sha256-pBwlFkkXDgPhGfn2bhwuJTGQz+O0ADhPUU2Fogl98zA="; + sha256 = "sha256-A3kL/1Q7BFGfzVn4wFrQf9VS+2rOgS4u8o1uEQI2vcw="; }; - vendorSha256 = "sha256-XePJaXD83731r5CJG1PHnpU6s+443yq8mrqx7ZPU8Gs="; + vendorSha256 = "sha256-0bmZmBYEHGIP9vd8O5rz0JyuKUu9VHeb8ErZ6VNsfxQ="; doCheck = false; @@ -32,6 +32,7 @@ buildGoModule rec { python3 python3Packages.mkdocs-material python3Packages.mkdocs-minify + python3Packages.mkdocs-simple-hooks ]; postPatch = '' diff --git a/pkgs/tools/misc/ntfy-sh/node-packages.nix b/pkgs/tools/misc/ntfy-sh/node-packages.nix index 266de2e8de38..c615f693b41b 100644 --- a/pkgs/tools/misc/ntfy-sh/node-packages.nix +++ b/pkgs/tools/misc/ntfy-sh/node-packages.nix @@ -22,49 +22,49 @@ let sha512 = "P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA=="; }; }; - "@babel/code-frame-7.18.6" = { + "@babel/code-frame-7.21.4" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.18.6"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; - sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz"; + sha512 = "LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g=="; }; }; - "@babel/compat-data-7.21.0" = { + "@babel/compat-data-7.21.4" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.21.0"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz"; - sha512 = "gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.4.tgz"; + sha512 = "/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g=="; }; }; - "@babel/core-7.21.0" = { + "@babel/core-7.21.4" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.21.0"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz"; - sha512 = "PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.21.4.tgz"; + sha512 = "qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA=="; }; }; - "@babel/eslint-parser-7.19.1" = { + "@babel/eslint-parser-7.21.3" = { name = "_at_babel_slash_eslint-parser"; packageName = "@babel/eslint-parser"; - version = "7.19.1"; + version = "7.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz"; - sha512 = "AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ=="; + url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.21.3.tgz"; + sha512 = "kfhmPimwo6k4P8zxNs8+T7yR44q1LdpsZdE1NkCsVlfiuTPRfnGgjaF8Qgug9q9Pou17u6wneYF0lDCZJATMFg=="; }; }; - "@babel/generator-7.21.1" = { + "@babel/generator-7.21.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.21.1"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz"; - sha512 = "1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz"; + sha512 = "NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -85,31 +85,31 @@ let sha512 = "yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw=="; }; }; - "@babel/helper-compilation-targets-7.20.7" = { + "@babel/helper-compilation-targets-7.21.4" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.20.7"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz"; - sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz"; + sha512 = "Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg=="; }; }; - "@babel/helper-create-class-features-plugin-7.21.0" = { + "@babel/helper-create-class-features-plugin-7.21.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.21.0"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz"; - sha512 = "Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz"; + sha512 = "46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.21.0" = { + "@babel/helper-create-regexp-features-plugin-7.21.4" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.21.0"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz"; - sha512 = "N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz"; + sha512 = "M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA=="; }; }; "@babel/helper-define-polyfill-provider-0.3.3" = { @@ -166,13 +166,13 @@ let sha512 = "Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q=="; }; }; - "@babel/helper-module-imports-7.18.6" = { + "@babel/helper-module-imports-7.21.4" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.18.6"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; - sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz"; + sha512 = "orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg=="; }; }; "@babel/helper-module-transforms-7.21.2" = { @@ -301,13 +301,13 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.21.2" = { + "@babel/parser-7.21.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.21.2"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz"; - sha512 = "URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz"; + sha512 = "alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -535,13 +535,13 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-flow-7.18.6" = { + "@babel/plugin-syntax-flow-7.21.4" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; - version = "7.18.6"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz"; - sha512 = "LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.21.4.tgz"; + sha512 = "l9xd3N+XG4fZRxEP3vXdK6RW7vN1Uf5dxzRC/09wV86wqZ/YYQooBIGNsiRdfNR3/q2/5pPzV4B54J/9ctX5jw=="; }; }; "@babel/plugin-syntax-import-assertions-7.20.0" = { @@ -571,13 +571,13 @@ let sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; }; - "@babel/plugin-syntax-jsx-7.18.6" = { + "@babel/plugin-syntax-jsx-7.21.4" = { name = "_at_babel_slash_plugin-syntax-jsx"; packageName = "@babel/plugin-syntax-jsx"; - version = "7.18.6"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz"; - sha512 = "6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz"; + sha512 = "5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ=="; }; }; "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { @@ -652,13 +652,13 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-syntax-typescript-7.20.0" = { + "@babel/plugin-syntax-typescript-7.21.4" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.20.0"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz"; - sha512 = "rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.21.4.tgz"; + sha512 = "xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA=="; }; }; "@babel/plugin-transform-arrow-functions-7.20.7" = { @@ -715,13 +715,13 @@ let sha512 = "Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ=="; }; }; - "@babel/plugin-transform-destructuring-7.20.7" = { + "@babel/plugin-transform-destructuring-7.21.3" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.20.7"; + version = "7.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz"; - sha512 = "Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz"; + sha512 = "bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA=="; }; }; "@babel/plugin-transform-dotall-regex-7.18.6" = { @@ -859,13 +859,13 @@ let sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; }; }; - "@babel/plugin-transform-parameters-7.20.7" = { + "@babel/plugin-transform-parameters-7.21.3" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.20.7"; + version = "7.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz"; - sha512 = "WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz"; + sha512 = "Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ=="; }; }; "@babel/plugin-transform-property-literals-7.18.6" = { @@ -877,13 +877,13 @@ let sha512 = "cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg=="; }; }; - "@babel/plugin-transform-react-constant-elements-7.20.2" = { + "@babel/plugin-transform-react-constant-elements-7.21.3" = { name = "_at_babel_slash_plugin-transform-react-constant-elements"; packageName = "@babel/plugin-transform-react-constant-elements"; - version = "7.20.2"; + version = "7.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.20.2.tgz"; - sha512 = "KS/G8YI8uwMGKErLFOHS/ekhqdHhpEloxs43NecQHVgo2QuQSyJhGIY1fL8UGl9wy5ItVwwoUL4YxVqsplGq2g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.21.3.tgz"; + sha512 = "4DVcFeWe/yDYBLp0kBmOGFJ6N2UYg7coGid1gdxb4co62dy/xISDMaYBXBVXEDhfgMk7qkbcYiGtwd5Q/hwDDQ=="; }; }; "@babel/plugin-transform-react-display-name-7.18.6" = { @@ -940,13 +940,13 @@ let sha512 = "oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA=="; }; }; - "@babel/plugin-transform-runtime-7.21.0" = { + "@babel/plugin-transform-runtime-7.21.4" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.21.0"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.0.tgz"; - sha512 = "ReY6pxwSzEU0b3r2/T/VhqMKg/AkceBT19X0UptA3/tYi5Pe2eXgEUH+NNMC5nok6c6XQz5tyVTUpuezRfSMSg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.4.tgz"; + sha512 = "1J4dhrw1h1PqnNNpzwxQ2UBymJUF8KuPjAAnlLwZcGhHAIqUigFW7cdK6GHoB64ubY4qXQNYknoUeks4Wz7CUA=="; }; }; "@babel/plugin-transform-shorthand-properties-7.18.6" = { @@ -994,13 +994,13 @@ let sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; }; }; - "@babel/plugin-transform-typescript-7.21.0" = { + "@babel/plugin-transform-typescript-7.21.3" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.21.0"; + version = "7.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.0.tgz"; - sha512 = "xo///XTPp3mDzTtrqXoBlK9eiAYW3wv9JXglcn/u1bi60RW11dEUxIgA8cbnDhutS1zacjMRmAwxE0gMklLnZg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.3.tgz"; + sha512 = "RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw=="; }; }; "@babel/plugin-transform-unicode-escapes-7.18.10" = { @@ -1021,13 +1021,13 @@ let sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; }; }; - "@babel/preset-env-7.20.2" = { + "@babel/preset-env-7.21.4" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.20.2"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz"; - sha512 = "1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.21.4.tgz"; + sha512 = "2W57zHs2yDLm6GD5ZpvNn71lZ0B/iypSdIeq25OurDKji6AdzV07qp4s3n1/x5BqtiGaTrPN3nerlSCaC5qNTw=="; }; }; "@babel/preset-modules-0.1.5" = { @@ -1048,13 +1048,13 @@ let sha512 = "zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg=="; }; }; - "@babel/preset-typescript-7.21.0" = { + "@babel/preset-typescript-7.21.4" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.21.0"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.21.0.tgz"; - sha512 = "myc9mpoVA5m1rF8K8DgLEatOYFDpwC+RkMkjZ0Du6uI62YvDe8uxIEYVs/VCdSJ097nlALiU/yBC7//3nI+hNg=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.21.4.tgz"; + sha512 = "sMLNWY37TCdRH/bJ6ZeeOH1nPuanED7Ai9Y/vH31IPqalioJ6ZNFUWONsakhv4r4n+I6gm5lmoE0olkgib/j/A=="; }; }; "@babel/regjsgen-0.8.0" = { @@ -1084,22 +1084,22 @@ let sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.21.2" = { + "@babel/traverse-7.21.4" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.21.2"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz"; - sha512 = "ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.4.tgz"; + sha512 = "eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q=="; }; }; - "@babel/types-7.21.2" = { + "@babel/types-7.21.4" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.21.2"; + version = "7.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz"; - sha512 = "3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz"; + sha512 = "rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA=="; }; }; "@bcoe/v8-coverage-0.2.3" = { @@ -1246,13 +1246,13 @@ let sha512 = "c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g=="; }; }; - "@csstools/selector-specificity-2.1.1" = { + "@csstools/selector-specificity-2.2.0" = { name = "_at_csstools_slash_selector-specificity"; packageName = "@csstools/selector-specificity"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.1.1.tgz"; - sha512 = "jwx+WCqszn53YHOfvFMJJRd/B2GqkCBt+1MJSG6o5/s8+ytHMvDZXsJgUEWLk12UnLd7HYKac4BYU5i/Ron1Cw=="; + url = "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz"; + sha512 = "+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw=="; }; }; "@emotion/babel-plugin-11.10.6" = { @@ -1372,22 +1372,40 @@ let sha512 = "AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg=="; }; }; - "@eslint/eslintrc-2.0.0" = { - name = "_at_eslint_slash_eslintrc"; - packageName = "@eslint/eslintrc"; - version = "2.0.0"; + "@eslint-community/eslint-utils-4.4.0" = { + name = "_at_eslint-community_slash_eslint-utils"; + packageName = "@eslint-community/eslint-utils"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz"; - sha512 = "fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A=="; + url = "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz"; + sha512 = "1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA=="; }; }; - "@eslint/js-8.35.0" = { + "@eslint-community/regexpp-4.5.0" = { + name = "_at_eslint-community_slash_regexpp"; + packageName = "@eslint-community/regexpp"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz"; + sha512 = "vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ=="; + }; + }; + "@eslint/eslintrc-2.0.2" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz"; + sha512 = "3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ=="; + }; + }; + "@eslint/js-8.37.0" = { name = "_at_eslint_slash_js"; packageName = "@eslint/js"; - version = "8.35.0"; + version = "8.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz"; - sha512 = "JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw=="; + url = "https://registry.npmjs.org/@eslint/js/-/js-8.37.0.tgz"; + sha512 = "x5vzdtOOGgFVDCUs81QRB2+liax8rFg3+7hqM+QhBG0/G3F1ZsoYl97UrqgHgQ9KKT7G6c4V+aTUCgu/n22v1A=="; }; }; "@humanwhocodes/config-array-0.11.8" = { @@ -1642,22 +1660,22 @@ let sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; }; }; - "@mui/base-5.0.0-alpha.119" = { + "@mui/base-5.0.0-alpha.123" = { name = "_at_mui_slash_base"; packageName = "@mui/base"; - version = "5.0.0-alpha.119"; + version = "5.0.0-alpha.123"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.119.tgz"; - sha512 = "XA5zhlYfXi67u613eIF0xRmktkatx6ERy3h+PwrMN5IcWFbgiL1guz8VpdXON+GWb8+G7B8t5oqTFIaCqaSAeA=="; + url = "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.123.tgz"; + sha512 = "pxzcAfET3I6jvWqS4kijiLMn1OmdMw+mGmDa0SqmDZo3bXXdvLhpCCPqCkULG3UykhvFCOcU5HclOX3JCA+Zhg=="; }; }; - "@mui/core-downloads-tracker-5.11.11" = { + "@mui/core-downloads-tracker-5.11.15" = { name = "_at_mui_slash_core-downloads-tracker"; packageName = "@mui/core-downloads-tracker"; - version = "5.11.11"; + version = "5.11.15"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.11.tgz"; - sha512 = "0YK0K9GfW1ysw9z4ztWAjLW+bktf+nExMyn2+EQe1Ijb0kF2kz1kIOmb4+di0/PsXG70uCuw4DhEIdNd+JQkRA=="; + url = "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.15.tgz"; + sha512 = "Q0e2oBsjHyIWWj1wLzl14btunvBYC0yl+px7zL9R69tF87uenj6q72ieS369BJ6jxYpJwvXfR6/f+TC+ZUsKKg=="; }; }; "@mui/icons-material-5.11.11" = { @@ -1669,22 +1687,22 @@ let sha512 = "Eell3ADmQVE8HOpt/LZ3zIma8JSvPh3XgnhwZLT0k5HRqZcd6F/QDHc7xsWtgz09t+UEFvOYJXjtrwKmLdwwpw=="; }; }; - "@mui/material-5.11.11" = { + "@mui/material-5.11.15" = { name = "_at_mui_slash_material"; packageName = "@mui/material"; - version = "5.11.11"; + version = "5.11.15"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/material/-/material-5.11.11.tgz"; - sha512 = "sSe0dmKjB1IGOYt32Pcha+cXV3IIrX5L5mFAF9LDRssp/x53bluhgLLbkc8eTiJvueVvo6HAyze6EkFEYLQRXQ=="; + url = "https://registry.npmjs.org/@mui/material/-/material-5.11.15.tgz"; + sha512 = "E5RbLq9/OvRKmGyeZawdnmFBCvhKkI/Zqgr0xFqW27TGwKLxObq/BreJc6Uu5Sbv8Fjj34vEAbRx6otfOyxn5w=="; }; }; - "@mui/private-theming-5.11.11" = { + "@mui/private-theming-5.11.13" = { name = "_at_mui_slash_private-theming"; packageName = "@mui/private-theming"; - version = "5.11.11"; + version = "5.11.13"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.11.11.tgz"; - sha512 = "yLgTkjNC1mpye2SOUkc+zQQczUpg8NvQAETvxwXTMzNgJK1pv4htL7IvBM5vmCKG7IHAB3hX26W2u6i7bxwF3A=="; + url = "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.11.13.tgz"; + sha512 = "PJnYNKzW5LIx3R+Zsp6WZVPs6w5sEKJ7mgLNnUXuYB1zo5aX71FVLtV7geyPXRcaN2tsoRNK7h444ED0t7cIjA=="; }; }; "@mui/styled-engine-5.11.11" = { @@ -1696,13 +1714,13 @@ let sha512 = "wV0UgW4lN5FkDBXefN8eTYeuE9sjyQdg5h94vtwZCUamGQEzmCOtir4AakgmbWMy0x8OLjdEUESn9wnf5J9MOg=="; }; }; - "@mui/system-5.11.11" = { + "@mui/system-5.11.15" = { name = "_at_mui_slash_system"; packageName = "@mui/system"; - version = "5.11.11"; + version = "5.11.15"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/system/-/system-5.11.11.tgz"; - sha512 = "a9gaOAJBjpzypDfhbGZQ8HzdcxdxsKkFvbp1aAWZhFHBPdehEkARNh7mj851VfEhD/GdffYt85PFKFKdUta5Eg=="; + url = "https://registry.npmjs.org/@mui/system/-/system-5.11.15.tgz"; + sha512 = "vCatoWCTnAPquoNifHbqMCMnOElEbLosVUeW0FQDyjCq+8yMABD9E6iY0s14O7iq1wD+qqU7rFAuDIVvJ/AzzA=="; }; }; "@mui/types-7.2.3" = { @@ -1714,13 +1732,13 @@ let sha512 = "tZ+CQggbe9Ol7e/Fs5RcKwg/woU+o8DCtOnccX6KmbBc7YrfqMYEYuaIcXHuhpT880QwNkZZ3wQwvtlDFA2yOw=="; }; }; - "@mui/utils-5.11.11" = { + "@mui/utils-5.11.13" = { name = "_at_mui_slash_utils"; packageName = "@mui/utils"; - version = "5.11.11"; + version = "5.11.13"; src = fetchurl { - url = "https://registry.npmjs.org/@mui/utils/-/utils-5.11.11.tgz"; - sha512 = "neMM5rrEXYQrOrlxUfns/TGgX4viS8K2zb9pbQh11/oUUYFlGI32Tn+PHePQx7n6Fy/0zq6WxdBFC9VpnJ5JrQ=="; + url = "https://registry.npmjs.org/@mui/utils/-/utils-5.11.13.tgz"; + sha512 = "5ltA58MM9euOuUcnvwFJqpLdEugc9XFsRR8Gt4zZNb31XzMfSKJPR4eumulyhsOTK1rWf7K4D63NKFPfX0AxqA=="; }; }; "@nicolo-ribaudo/eslint-scope-5-internals-5.1.1-v1" = { @@ -1768,22 +1786,22 @@ let sha512 = "j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA=="; }; }; - "@popperjs/core-2.11.6" = { + "@popperjs/core-2.11.7" = { name = "_at_popperjs_slash_core"; packageName = "@popperjs/core"; - version = "2.11.6"; + version = "2.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz"; - sha512 = "50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="; + url = "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz"; + sha512 = "Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw=="; }; }; - "@remix-run/router-1.3.3" = { + "@remix-run/router-1.5.0" = { name = "_at_remix-run_slash_router"; packageName = "@remix-run/router"; - version = "1.3.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/router/-/router-1.3.3.tgz"; - sha512 = "YRHie1yQEj0kqqCTCJEfHqYSSNlZQ696QJG+MMiW4mxSl9I0ojz/eRhJS4fs88Z5i6D1SmoF9d3K99/QOhI8/w=="; + url = "https://registry.npmjs.org/@remix-run/router/-/router-1.5.0.tgz"; + sha512 = "bkUDCp8o1MvFO+qxkODcbhSqRa6P2GXgrGZVpt0dCXNW2HCSCqYI0ZoAqEOSAjRWmmlKcYgFvN4B4S+zo/f8kg=="; }; }; "@rollup/plugin-babel-5.3.1" = { @@ -2083,13 +2101,13 @@ let sha512 = "h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw=="; }; }; - "@types/eslint-8.21.1" = { + "@types/eslint-8.37.0" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.21.1"; + version = "8.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.21.1.tgz"; - sha512 = "rc9K8ZpVjNcLs8Fp0dkozd5Pt2Apk1glO4Vgz8ix1u6yFByxfqo5Yavpy65o+93TAe24jr7v+eSBtFLvOQtCRQ=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.37.0.tgz"; + sha512 = "Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ=="; }; }; "@types/eslint-scope-3.7.4" = { @@ -2227,13 +2245,13 @@ let sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; }; }; - "@types/node-18.14.6" = { + "@types/node-18.15.11" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.14.6"; + version = "18.15.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz"; - sha512 = "93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz"; + sha512 = "E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q=="; }; }; "@types/parse-json-4.0.0" = { @@ -2290,13 +2308,13 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/react-18.0.28" = { + "@types/react-18.0.32" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "18.0.28"; + version = "18.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.0.28.tgz"; - sha512 = "RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew=="; + url = "https://registry.npmjs.org/@types/react/-/react-18.0.32.tgz"; + sha512 = "gYGXdtPQ9Cj0w2Fwqg5/ak6BcK3Z15YgjSqtyDizWUfx7mQ8drs0NBUzRRsAdoFVTO8kJ8L2TL8Skm7OFPnLUw=="; }; }; "@types/react-is-17.0.3" = { @@ -2335,13 +2353,13 @@ let sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; - "@types/scheduler-0.16.2" = { + "@types/scheduler-0.16.3" = { name = "_at_types_slash_scheduler"; packageName = "@types/scheduler"; - version = "0.16.2"; + version = "0.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz"; - sha512 = "hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="; + url = "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz"; + sha512 = "5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ=="; }; }; "@types/semver-7.3.13" = { @@ -2416,13 +2434,13 @@ let sha512 = "AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ=="; }; }; - "@types/yargs-17.0.22" = { + "@types/yargs-17.0.24" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "17.0.22"; + version = "17.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.22.tgz"; - sha512 = "pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz"; + sha512 = "6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw=="; }; }; "@types/yargs-parser-21.0.0" = { @@ -2434,85 +2452,85 @@ let sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; }; }; - "@typescript-eslint/eslint-plugin-5.54.0" = { + "@typescript-eslint/eslint-plugin-5.57.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.54.0"; + version = "5.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.0.tgz"; - sha512 = "+hSN9BdSr629RF02d7mMtXhAJvDTyCbprNYJKrXETlul/Aml6YZwd90XioVbjejQeHbb3R8Dg0CkRgoJDxo8aw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.57.0.tgz"; + sha512 = "itag0qpN6q2UMM6Xgk6xoHa0D0/P+M17THnr4SVgqn9Rgam5k/He33MA7/D7QoJcdMxHFyX7U9imaBonAX/6qA=="; }; }; - "@typescript-eslint/experimental-utils-5.54.0" = { + "@typescript-eslint/experimental-utils-5.57.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "5.54.0"; + version = "5.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.54.0.tgz"; - sha512 = "rRYECOTh5V3iWsrOzXi7h1jp3Bi9OkJHrb3wECi3DVqMGTilo9wAYmCbT+6cGdrzUY3MWcAa2mESM6FMik6tVw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.57.0.tgz"; + sha512 = "0RnrwGQ7MmgtOSnzB/rSGYr2iXENi6L+CtPzX3g5ovo0HlruLukSEKcc4s+q0IEc+DLTDc7Edan0Y4WSQ/bFhw=="; }; }; - "@typescript-eslint/parser-5.54.0" = { + "@typescript-eslint/parser-5.57.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.54.0"; + version = "5.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.54.0.tgz"; - sha512 = "aAVL3Mu2qTi+h/r04WI/5PfNWvO6pdhpeMRWk9R7rEV4mwJNzoWf5CCU5vDKBsPIFQFjEq1xg7XBI2rjiMXQbQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.57.0.tgz"; + sha512 = "orrduvpWYkgLCyAdNtR1QIWovcNZlEm6yL8nwH/eTxWLd8gsP+25pdLHYzL2QdkqrieaDwLpytHqycncv0woUQ=="; }; }; - "@typescript-eslint/scope-manager-5.54.0" = { + "@typescript-eslint/scope-manager-5.57.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.54.0"; + version = "5.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.0.tgz"; - sha512 = "VTPYNZ7vaWtYna9M4oD42zENOBrb+ZYyCNdFs949GcN8Miwn37b8b7eMj+EZaq7VK9fx0Jd+JhmkhjFhvnovhg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.57.0.tgz"; + sha512 = "NANBNOQvllPlizl9LatX8+MHi7bx7WGIWYjPHDmQe5Si/0YEYfxSljJpoTyTWFTgRy3X8gLYSE4xQ2U+aCozSw=="; }; }; - "@typescript-eslint/type-utils-5.54.0" = { + "@typescript-eslint/type-utils-5.57.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.54.0"; + version = "5.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.54.0.tgz"; - sha512 = "WI+WMJ8+oS+LyflqsD4nlXMsVdzTMYTxl16myXPaCXnSgc7LWwMsjxQFZCK/rVmTZ3FN71Ct78ehO9bRC7erYQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.57.0.tgz"; + sha512 = "kxXoq9zOTbvqzLbdNKy1yFrxLC6GDJFE2Yuo3KqSwTmDOFjUGeWSakgoXT864WcK5/NAJkkONCiKb1ddsqhLXQ=="; }; }; - "@typescript-eslint/types-5.54.0" = { + "@typescript-eslint/types-5.57.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.54.0"; + version = "5.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.0.tgz"; - sha512 = "nExy+fDCBEgqblasfeE3aQ3NuafBUxZxgxXcYfzYRZFHdVvk5q60KhCSkG0noHgHRo/xQ/BOzURLZAafFpTkmQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.57.0.tgz"; + sha512 = "mxsod+aZRSyLT+jiqHw1KK6xrANm19/+VFALVFP5qa/aiJnlP38qpyaTd0fEKhWvQk6YeNZ5LGwI1pDpBRBhtQ=="; }; }; - "@typescript-eslint/typescript-estree-5.54.0" = { + "@typescript-eslint/typescript-estree-5.57.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.54.0"; + version = "5.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.0.tgz"; - sha512 = "X2rJG97Wj/VRo5YxJ8Qx26Zqf0RRKsVHd4sav8NElhbZzhpBI8jU54i6hfo9eheumj4oO4dcRN1B/zIVEqR/MQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.0.tgz"; + sha512 = "LTzQ23TV82KpO8HPnWuxM2V7ieXW8O142I7hQTxWIHDcCEIjtkat6H96PFkYBQqGFLW/G/eVVOB9Z8rcvdY/Vw=="; }; }; - "@typescript-eslint/utils-5.54.0" = { + "@typescript-eslint/utils-5.57.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.54.0"; + version = "5.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.54.0.tgz"; - sha512 = "cuwm8D/Z/7AuyAeJ+T0r4WZmlnlxQ8wt7C7fLpFlKMR+dY6QO79Cq1WpJhvZbMA4ZeZGHiRWnht7ZJ8qkdAunw=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.57.0.tgz"; + sha512 = "ps/4WohXV7C+LTSgAL5CApxvxbMkl9B9AUZRtnEFonpIxZDIT7wC1xfvuJONMidrkB9scs4zhtRyIwHh4+18kw=="; }; }; - "@typescript-eslint/visitor-keys-5.54.0" = { + "@typescript-eslint/visitor-keys-5.57.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.54.0"; + version = "5.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.0.tgz"; - sha512 = "xu4wT7aRCakGINTLGeyGqDn+78BwFlggwBjnHa1ar/KaGagnmwLYmlrXIrgAaQ3AE1Vd6nLfKASm7LrFHNbKGA=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.0.tgz"; + sha512 = "ery2g3k0hv5BLiKpPuwYt9KBkAp2ugT6VvyShXdLOkax895EC55sP0Tx5L0fZaQueiK3fBLvHVvEl3jFS5ia+g=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -2731,15 +2749,6 @@ let sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; }; }; - "acorn-node-1.8.2" = { - name = "acorn-node"; - packageName = "acorn-node"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz"; - sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A=="; - }; - }; "acorn-walk-7.2.0" = { name = "acorn-walk"; packageName = "acorn-walk"; @@ -2884,6 +2893,15 @@ let sha512 = "Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="; }; }; + "any-promise-1.3.0" = { + name = "any-promise"; + packageName = "any-promise"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; + sha512 = "7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="; + }; + }; "anymatch-3.1.3" = { name = "anymatch"; packageName = "anymatch"; @@ -2929,6 +2947,15 @@ let sha512 = "R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ=="; }; }; + "array-buffer-byte-length-1.0.0" = { + name = "array-buffer-byte-length"; + packageName = "array-buffer-byte-length"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz"; + sha512 = "LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A=="; + }; + }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -3046,13 +3073,13 @@ let sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; }; }; - "autoprefixer-10.4.13" = { + "autoprefixer-10.4.14" = { name = "autoprefixer"; packageName = "autoprefixer"; - version = "10.4.13"; + version = "10.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz"; - sha512 = "49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz"; + sha512 = "FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ=="; }; }; "available-typed-arrays-1.0.5" = { @@ -3262,13 +3289,13 @@ let sha512 = "jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw=="; }; }; - "bonjour-service-1.1.0" = { + "bonjour-service-1.1.1" = { name = "bonjour-service"; packageName = "bonjour-service"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.0.tgz"; - sha512 = "LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q=="; + url = "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz"; + sha512 = "Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg=="; }; }; "boolbase-1.0.0" = { @@ -3433,13 +3460,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001460" = { + "caniuse-lite-1.0.30001473" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001460"; + version = "1.0.30001473"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001460.tgz"; - sha512 = "Bud7abqjvEjipUkpLs4D7gR0l8hBYBHoa+tGtKJHvT2AYzLp1z7EmVkUT4ERpVUfca8S2HGIVs883D8pUH1ZzQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001473.tgz"; + sha512 = "ewDad7+D2vlyy+E4UJuVfiBsU69IL+8oVmTuZnH5Q6CIUbxNfI50uVpRHbUPDD6SUaN2o0Lh4DhTrvLG/Tn1yg=="; }; }; "case-sensitive-paths-webpack-plugin-2.4.0" = { @@ -3658,6 +3685,15 @@ let sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; }; + "commander-4.1.1" = { + name = "commander"; + packageName = "commander"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"; + sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; + }; + }; "commander-7.2.0" = { name = "commander"; packageName = "commander"; @@ -3793,31 +3829,31 @@ let sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; }; }; - "core-js-3.29.0" = { + "core-js-3.29.1" = { name = "core-js"; packageName = "core-js"; - version = "3.29.0"; + version = "3.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.29.0.tgz"; - sha512 = "VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.29.1.tgz"; + sha512 = "+jwgnhg6cQxKYIIjGtAHq2nwUOolo9eoFZ4sHfUH09BLXBgxnH4gA0zEd+t+BO2cNB8idaBtZFcFTRjQJRJmAw=="; }; }; - "core-js-compat-3.29.0" = { + "core-js-compat-3.29.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.29.0"; + version = "3.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.29.0.tgz"; - sha512 = "ScMn3uZNAFhK2DGoEfErguoiAHhV2Ju+oJo/jK08p7B3f3UhocUrCCkTvnZaiS+edl5nlIoiBXKcwMc6elv4KQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.29.1.tgz"; + sha512 = "QmchCua884D8wWskMX8tW5ydINzd8oSJVx38lx/pVkFGqztxt73GYre3pm/hyYq8bPf+MW5In4I/uRShFDsbrA=="; }; }; - "core-js-pure-3.29.0" = { + "core-js-pure-3.29.1" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.29.0"; + version = "3.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.29.0.tgz"; - sha512 = "v94gUjN5UTe1n0yN/opTihJ8QBWD2O8i19RfTZR7foONPWArnjB96QA/wk5ozu1mm6ja3udQCzOzwQXTxi3xOQ=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.29.1.tgz"; + sha512 = "4En6zYVi0i0XlXHVz/bi6l1XDjCqkKRq765NXuX+SnaIatlE96Odt5lMLjdxUiNI1v9OXI5DSLWYPlmTfkTktg=="; }; }; "core-util-is-1.0.3" = { @@ -3883,13 +3919,13 @@ let sha512 = "VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ=="; }; }; - "css-declaration-sorter-6.3.1" = { + "css-declaration-sorter-6.4.0" = { name = "css-declaration-sorter"; packageName = "css-declaration-sorter"; - version = "6.3.1"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz"; - sha512 = "fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w=="; + url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz"; + sha512 = "jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew=="; }; }; "css-has-pseudo-3.0.4" = { @@ -3991,13 +4027,13 @@ let sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="; }; }; - "cssdb-7.4.1" = { + "cssdb-7.5.3" = { name = "cssdb"; packageName = "cssdb"; - version = "7.4.1"; + version = "7.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/cssdb/-/cssdb-7.4.1.tgz"; - sha512 = "0Q8NOMpXJ3iTDDbUv9grcmQAfdDx4qz+fN/+Md2FGbevT+6+bJNQ2LjB2YIUlLbpBTM32idU1Sb+tb/uGt6/XQ=="; + url = "https://registry.npmjs.org/cssdb/-/cssdb-7.5.3.tgz"; + sha512 = "NQNRhrEnS6cW+RU/foLphb6xI/MDA70bI3Cy6VxJU8ilxgyTYz1X9zUzFGVTG5nGPylcKAGIt/UNc4deT56lQQ=="; }; }; "cssesc-3.0.0" = { @@ -4072,13 +4108,13 @@ let sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; - "csstype-3.1.1" = { + "csstype-3.1.2" = { name = "csstype"; packageName = "csstype"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz"; - sha512 = "DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="; + url = "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz"; + sha512 = "I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="; }; }; "damerau-levenshtein-1.0.8" = { @@ -4162,13 +4198,13 @@ let sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; }; }; - "deepmerge-4.3.0" = { + "deepmerge-4.3.1" = { name = "deepmerge"; packageName = "deepmerge"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz"; - sha512 = "z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og=="; + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz"; + sha512 = "3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="; }; }; "default-gateway-6.0.3" = { @@ -4198,15 +4234,6 @@ let sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="; }; }; - "defined-1.0.1" = { - name = "defined"; - packageName = "defined"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz"; - sha512 = "hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q=="; - }; - }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -4270,15 +4297,6 @@ let sha512 = "5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q=="; }; }; - "detective-5.2.1" = { - name = "detective"; - packageName = "detective"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz"; - sha512 = "v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw=="; - }; - }; "dexie-3.2.3" = { name = "dexie"; packageName = "dexie"; @@ -4288,13 +4306,13 @@ let sha512 = "iHayBd4UYryDCVUNa3PMsJMEnd8yjyh5p7a+RFeC8i8n476BC9wMhVvqiImq5zJZJf5Tuer+s4SSj+AA3x+ZbQ=="; }; }; - "dexie-react-hooks-1.1.1" = { + "dexie-react-hooks-1.1.3" = { name = "dexie-react-hooks"; packageName = "dexie-react-hooks"; - version = "1.1.1"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/dexie-react-hooks/-/dexie-react-hooks-1.1.1.tgz"; - sha512 = "Cam5JP6PxHN564RvWEoe8cqLhosW0O4CAZ9XEVYeGHJBa6KEJlOpd9CUpV3kmU9dm2MrW97/lk7qkf1xpij7gA=="; + url = "https://registry.npmjs.org/dexie-react-hooks/-/dexie-react-hooks-1.1.3.tgz"; + sha512 = "bXXE1gfYtfuVYTNiOlyam+YVaO8KaqacgRuxFuP37YtpS6o/jxT6KOl5h+hhqY36s0UavlHWbL+HWJFMcQumIg=="; }; }; "didyoumean-1.2.2" = { @@ -4342,13 +4360,13 @@ let sha512 = "z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="; }; }; - "dns-packet-5.4.0" = { + "dns-packet-5.5.0" = { name = "dns-packet"; packageName = "dns-packet"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz"; - sha512 = "EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g=="; + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-5.5.0.tgz"; + sha512 = "USawdAUzRkV6xrqTjiAEp6M9YagZEzWcSUaZTcIFAiyQWW1SoI6KyId8y2+/71wbgHKQAKd+iupLv4YvEwYWvA=="; }; }; "doctrine-2.1.0" = { @@ -4504,22 +4522,22 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "ejs-3.1.8" = { + "ejs-3.1.9" = { name = "ejs"; packageName = "ejs"; - version = "3.1.8"; + version = "3.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz"; - sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; + url = "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz"; + sha512 = "rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ=="; }; }; - "electron-to-chromium-1.4.320" = { + "electron-to-chromium-1.4.348" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.320"; + version = "1.4.348"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.320.tgz"; - sha512 = "h70iRscrNluMZPVICXYl5SSB+rBKo22XfuIS1ER0OQxQZpKTnFpuS6coj7wY9M/3trv7OR88rRMOlKmRvDty7Q=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.348.tgz"; + sha512 = "gM7TdwuG3amns/1rlgxMbeeyNoBFPa+4Uu0c7FeROWh4qWmvSOnvcslKmWy51ggLKZ2n/F/4i2HJ+PVNxH9uCQ=="; }; }; "emittery-0.10.2" = { @@ -4612,13 +4630,13 @@ let sha512 = "Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ=="; }; }; - "es-abstract-1.21.1" = { + "es-abstract-1.21.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.21.1"; + version = "1.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz"; - sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz"; + sha512 = "y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -4729,13 +4747,13 @@ let sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; }; }; - "eslint-8.35.0" = { + "eslint-8.37.0" = { name = "eslint"; packageName = "eslint"; - version = "8.35.0"; + version = "8.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz"; - sha512 = "BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.37.0.tgz"; + sha512 = "NU3Ps9nI05GUoVMxcZx1J8CNR6xOvUT4jAUMH5+z8lpp3aEdPVCImKw6PWG4PY+Vfkpr+jvMpxs/qoE7wq0sPw=="; }; }; "eslint-config-react-app-7.0.1" = { @@ -4846,15 +4864,6 @@ let sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw=="; }; }; - "eslint-utils-3.0.0" = { - name = "eslint-utils"; - packageName = "eslint-utils"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"; - sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; - }; - }; "eslint-visitor-keys-2.1.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -4864,13 +4873,13 @@ let sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; }; }; - "eslint-visitor-keys-3.3.0" = { + "eslint-visitor-keys-3.4.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"; - sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz"; + sha512 = "HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ=="; }; }; "eslint-webpack-plugin-3.2.0" = { @@ -4882,13 +4891,13 @@ let sha512 = "avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w=="; }; }; - "espree-9.4.1" = { + "espree-9.5.1" = { name = "espree"; packageName = "espree"; - version = "9.4.1"; + version = "9.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz"; - sha512 = "XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg=="; + url = "https://registry.npmjs.org/espree/-/espree-9.5.1.tgz"; + sha512 = "5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg=="; }; }; "esprima-4.0.1" = { @@ -5215,13 +5224,13 @@ let sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="; }; }; - "fork-ts-checker-webpack-plugin-6.5.2" = { + "fork-ts-checker-webpack-plugin-6.5.3" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.2.tgz"; - sha512 = "m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz"; + sha512 = "SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ=="; }; }; "form-data-3.0.1" = { @@ -5395,6 +5404,15 @@ let sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; }; }; + "glob-7.1.6" = { + name = "glob"; + packageName = "glob"; + version = "7.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + }; + }; "glob-7.2.3" = { name = "glob"; packageName = "glob"; @@ -5494,13 +5512,13 @@ let sha512 = "d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="; }; }; - "graceful-fs-4.2.10" = { + "graceful-fs-4.2.11" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.10"; + version = "4.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"; + sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="; }; }; "grapheme-splitter-1.0.4" = { @@ -5881,13 +5899,13 @@ let sha512 = "MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="; }; }; - "immer-9.0.19" = { + "immer-9.0.21" = { name = "immer"; packageName = "immer"; - version = "9.0.19"; + version = "9.0.21"; src = fetchurl { - url = "https://registry.npmjs.org/immer/-/immer-9.0.19.tgz"; - sha512 = "eY+Y0qcsB4TZKwgQzLaE/lqYMlKhv5J9dyd2RhhtGhNo2njPXDqU9XPfcNfa3MIDsdtZt5KlkIsirlo4dHsWdQ=="; + url = "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz"; + sha512 = "bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA=="; }; }; "import-fresh-3.3.0" = { @@ -6718,6 +6736,15 @@ let sha512 = "CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g=="; }; }; + "jiti-1.18.2" = { + name = "jiti"; + packageName = "jiti"; + version = "1.18.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz"; + sha512 = "QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg=="; + }; + }; "js-base64-3.7.5" = { name = "js-base64"; packageName = "js-base64"; @@ -6727,13 +6754,13 @@ let sha512 = "3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA=="; }; }; - "js-sdsl-4.3.0" = { + "js-sdsl-4.4.0" = { name = "js-sdsl"; packageName = "js-sdsl"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz"; - sha512 = "mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="; + url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz"; + sha512 = "FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg=="; }; }; "js-tokens-4.0.0" = { @@ -6925,6 +6952,15 @@ let sha512 = "qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ=="; }; }; + "launch-editor-2.6.0" = { + name = "launch-editor"; + packageName = "launch-editor"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz"; + sha512 = "JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ=="; + }; + }; "leven-3.1.0" = { name = "leven"; packageName = "leven"; @@ -7258,13 +7294,13 @@ let sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; }; }; - "mini-css-extract-plugin-2.7.2" = { + "mini-css-extract-plugin-2.7.5" = { name = "mini-css-extract-plugin"; packageName = "mini-css-extract-plugin"; - version = "2.7.2"; + version = "2.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz"; - sha512 = "EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw=="; + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.5.tgz"; + sha512 = "9HaR++0mlgom81s95vvNjxkg52n2b5s//3ZTI1EtzFb98awsLSivs2LMsVqnQ3ay0PVhqWcGNyDaTE961FOcjQ=="; }; }; "minimalistic-assert-1.0.1" = { @@ -7348,13 +7384,22 @@ let sha512 = "2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg=="; }; }; - "nanoid-3.3.4" = { + "mz-2.7.0" = { + name = "mz"; + packageName = "mz"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; + sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; + }; + }; + "nanoid-3.3.6" = { name = "nanoid"; packageName = "nanoid"; - version = "3.3.4"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"; - sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"; + sha512 = "BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="; }; }; "natural-compare-1.4.0" = { @@ -8869,22 +8914,22 @@ let sha512 = "F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A=="; }; }; - "react-router-6.8.2" = { + "react-router-6.10.0" = { name = "react-router"; packageName = "react-router"; - version = "6.8.2"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-router/-/react-router-6.8.2.tgz"; - sha512 = "lF7S0UmXI5Pd8bmHvMdPKI4u4S5McxmHnzJhrYi9ZQ6wE+DA8JN5BzVC5EEBuduWWDaiJ8u6YhVOCmThBli+rw=="; + url = "https://registry.npmjs.org/react-router/-/react-router-6.10.0.tgz"; + sha512 = "Nrg0BWpQqrC3ZFFkyewrflCud9dio9ME3ojHCF/WLsprJVzkq3q3UeEhMCAW1dobjeGbWgjNn/PVF6m46ANxXQ=="; }; }; - "react-router-dom-6.8.2" = { + "react-router-dom-6.10.0" = { name = "react-router-dom"; packageName = "react-router-dom"; - version = "6.8.2"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.8.2.tgz"; - sha512 = "N/oAF1Shd7g4tWy+75IIufCGsHBqT74tnzHQhbiUTYILYF0Blk65cg+HPZqwC+6SqEyx033nKqU7by38v3lBZg=="; + url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.10.0.tgz"; + sha512 = "E5dfxRPuXKJqzwSe/qGcqdwa18QiWC6f3H3cWXM24qj4N0/beCIf/CWTipop2xm7mR0RCS99NnaqPNjHtrAzCg=="; }; }; "react-scripts-5.0.1" = { @@ -8923,13 +8968,13 @@ let sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; }; }; - "readable-stream-3.6.1" = { + "readable-stream-3.6.2" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz"; - sha512 = "+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"; + sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="; }; }; "readdirp-3.6.0" = { @@ -9004,22 +9049,13 @@ let sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; }; }; - "regexpp-3.2.0" = { - name = "regexpp"; - packageName = "regexpp"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"; - sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; - }; - }; - "regexpu-core-5.3.1" = { + "regexpu-core-5.3.2" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.1.tgz"; - sha512 = "nCOzW2V/X15XpLsK2rlgdwrysrBq+AauCn+omItIz4R1pIcmeot5zvjdmOBRLzEH/CkC6IxMJVmxDe3QcMuNVQ=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz"; + sha512 = "RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ=="; }; }; "regjsparser-0.9.1" = { @@ -9733,6 +9769,15 @@ let sha512 = "6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg=="; }; }; + "string.prototype.trim-1.2.7" = { + name = "string.prototype.trim"; + packageName = "string.prototype.trim"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz"; + sha512 = "p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg=="; + }; + }; "string.prototype.trimend-1.0.6" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; @@ -9832,13 +9877,13 @@ let sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; }; }; - "style-loader-3.3.1" = { + "style-loader-3.3.2" = { name = "style-loader"; packageName = "style-loader"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz"; - sha512 = "GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ=="; + url = "https://registry.npmjs.org/style-loader/-/style-loader-3.3.2.tgz"; + sha512 = "RHs/vcrKdQK8wZliteNK4NKzxvLBzpuHMqYmUVWeKa6MkaIQ97ZTOS0b+zapZhy6GcrgWnvWYCMHRirC3FsUmw=="; }; }; "stylehacks-5.1.1" = { @@ -9859,6 +9904,15 @@ let sha512 = "GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA=="; }; }; + "sucrase-3.31.0" = { + name = "sucrase"; + packageName = "sucrase"; + version = "3.31.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sucrase/-/sucrase-3.31.0.tgz"; + sha512 = "6QsHnkqyVEzYcaiHsOKkzOtOgdJcb8i54x6AV2hDwyZcY9ZyykGZVw6L/YN98xC0evwTP6utsWWrKRaa8QlfEQ=="; + }; + }; "supports-color-5.5.0" = { name = "supports-color"; packageName = "supports-color"; @@ -9940,13 +9994,13 @@ let sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; }; }; - "tailwindcss-3.2.7" = { + "tailwindcss-3.3.1" = { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.2.7"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.2.7.tgz"; - sha512 = "B6DLqJzc21x7wntlH/GsZwEXTBttVSl1FtCzC8WP4oBc/NKef7kaax5jeihkkCEWc831/5NDJ9gRNDK6NEioQQ=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.1.tgz"; + sha512 = "Vkiouc41d4CEq0ujXl6oiGFQ7bA3WEhUZdTgXAhtKxSy49OmKs8rEfQmupsfF0IGW8fv2iQkp1EVUuapCFrZ9g=="; }; }; "tapable-1.1.3" = { @@ -9994,22 +10048,22 @@ let sha512 = "un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ=="; }; }; - "terser-5.16.5" = { + "terser-5.16.8" = { name = "terser"; packageName = "terser"; - version = "5.16.5"; + version = "5.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.16.5.tgz"; - sha512 = "qcwfg4+RZa3YvlFh0qjifnzBHjKGNbtDo9yivMqMFDy9Q6FSaQWSB/j1xKhsoUFJIqDOM3TsN6D5xbrMrFcHbg=="; + url = "https://registry.npmjs.org/terser/-/terser-5.16.8.tgz"; + sha512 = "QI5g1E/ef7d+PsDifb+a6nnVgC4F22Bg6T0xrBrz6iloVB4PUkkunp6V8nzoOOZJIzjWVdAGqCdlKlhLq/TbIA=="; }; }; - "terser-webpack-plugin-5.3.6" = { + "terser-webpack-plugin-5.3.7" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "5.3.6"; + version = "5.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz"; - sha512 = "kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz"; + sha512 = "AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw=="; }; }; "test-exclude-6.0.0" = { @@ -10030,6 +10084,24 @@ let sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; }; + "thenify-3.3.1" = { + name = "thenify"; + packageName = "thenify"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz"; + sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="; + }; + }; + "thenify-all-1.6.0" = { + name = "thenify-all"; + packageName = "thenify-all"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; + sha512 = "RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA=="; + }; + }; "throat-6.0.2" = { name = "throat"; packageName = "throat"; @@ -10138,6 +10210,15 @@ let sha512 = "c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA=="; }; }; + "ts-interface-checker-0.1.13" = { + name = "ts-interface-checker"; + packageName = "ts-interface-checker"; + version = "0.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz"; + sha512 = "Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="; + }; + }; "tsconfig-paths-3.14.2" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; @@ -10534,13 +10615,13 @@ let sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="; }; }; - "webpack-5.75.0" = { + "webpack-5.77.0" = { name = "webpack"; packageName = "webpack"; - version = "5.75.0"; + version = "5.77.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz"; - sha512 = "piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.77.0.tgz"; + sha512 = "sbGNjBr5Ya5ss91yzjeJTLKyfiwo5C628AFjEa6WSXcZa4E+F57om3Cc8xLb1Jh0b243AWuSYRf3dn7HVeFQ9Q=="; }; }; "webpack-dev-middleware-5.3.3" = { @@ -10552,13 +10633,13 @@ let sha512 = "hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA=="; }; }; - "webpack-dev-server-4.11.1" = { + "webpack-dev-server-4.13.2" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.11.1"; + version = "4.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz"; - sha512 = "lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.13.2.tgz"; + sha512 = "5i6TrGBRxG4vnfDpB6qSQGfnB6skGBXNL5/542w2uRGLimX6qeE5BQMLrzIC3JYV/xlGOv+s+hTleI9AZKUQNw=="; }; }; "webpack-manifest-plugin-4.1.1" = { @@ -10912,13 +10993,13 @@ let sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; - "ws-8.12.1" = { + "ws-8.13.0" = { name = "ws"; packageName = "ws"; - version = "8.12.1"; + version = "8.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.12.1.tgz"; - sha512 = "1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew=="; + url = "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz"; + sha512 = "x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="; }; }; "xml-name-validator-3.0.0" = { @@ -10939,15 +11020,6 @@ let sha512 = "JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="; }; }; - "xtend-4.0.2" = { - name = "xtend"; - packageName = "xtend"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; - sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; - }; - }; "y18n-5.0.8" = { name = "y18n"; packageName = "y18n"; @@ -11020,33 +11092,33 @@ let dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@apideck/better-ajv-errors-0.3.6" - sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.21.0" - (sources."@babel/core-7.21.0" // { + sources."@babel/code-frame-7.21.4" + sources."@babel/compat-data-7.21.4" + (sources."@babel/core-7.21.4" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/eslint-parser-7.19.1" // { + (sources."@babel/eslint-parser-7.21.3" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.21.1" // { + (sources."@babel/generator-7.21.4" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; }) sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" - (sources."@babel/helper-compilation-targets-7.20.7" // { + (sources."@babel/helper-compilation-targets-7.21.4" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.21.0" - sources."@babel/helper-create-regexp-features-plugin-7.21.0" + sources."@babel/helper-create-class-features-plugin-7.21.4" + sources."@babel/helper-create-regexp-features-plugin-7.21.4" (sources."@babel/helper-define-polyfill-provider-0.3.3" // { dependencies = [ sources."semver-6.3.0" @@ -11057,7 +11129,7 @@ let sources."@babel/helper-function-name-7.21.0" sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-member-expression-to-functions-7.21.0" - sources."@babel/helper-module-imports-7.18.6" + sources."@babel/helper-module-imports-7.21.4" sources."@babel/helper-module-transforms-7.21.2" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.20.2" @@ -11072,7 +11144,7 @@ let sources."@babel/helper-wrap-function-7.20.5" sources."@babel/helpers-7.21.0" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.21.2" + sources."@babel/parser-7.21.4" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" @@ -11098,11 +11170,11 @@ let sources."@babel/plugin-syntax-decorators-7.21.0" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.18.6" + sources."@babel/plugin-syntax-flow-7.21.4" sources."@babel/plugin-syntax-import-assertions-7.20.0" sources."@babel/plugin-syntax-import-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.18.6" + sources."@babel/plugin-syntax-jsx-7.21.4" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" @@ -11111,14 +11183,14 @@ let sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-typescript-7.20.0" + sources."@babel/plugin-syntax-typescript-7.21.4" sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" sources."@babel/plugin-transform-block-scoping-7.21.0" sources."@babel/plugin-transform-classes-7.21.0" sources."@babel/plugin-transform-computed-properties-7.20.7" - sources."@babel/plugin-transform-destructuring-7.20.7" + sources."@babel/plugin-transform-destructuring-7.21.3" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" @@ -11134,16 +11206,16 @@ let sources."@babel/plugin-transform-named-capturing-groups-regex-7.20.5" sources."@babel/plugin-transform-new-target-7.18.6" sources."@babel/plugin-transform-object-super-7.18.6" - sources."@babel/plugin-transform-parameters-7.20.7" + sources."@babel/plugin-transform-parameters-7.21.3" sources."@babel/plugin-transform-property-literals-7.18.6" - sources."@babel/plugin-transform-react-constant-elements-7.20.2" + sources."@babel/plugin-transform-react-constant-elements-7.21.3" sources."@babel/plugin-transform-react-display-name-7.18.6" sources."@babel/plugin-transform-react-jsx-7.21.0" sources."@babel/plugin-transform-react-jsx-development-7.18.6" sources."@babel/plugin-transform-react-pure-annotations-7.18.6" sources."@babel/plugin-transform-regenerator-7.20.5" sources."@babel/plugin-transform-reserved-words-7.18.6" - (sources."@babel/plugin-transform-runtime-7.21.0" // { + (sources."@babel/plugin-transform-runtime-7.21.4" // { dependencies = [ sources."semver-6.3.0" ]; @@ -11153,22 +11225,22 @@ let sources."@babel/plugin-transform-sticky-regex-7.18.6" sources."@babel/plugin-transform-template-literals-7.18.9" sources."@babel/plugin-transform-typeof-symbol-7.18.9" - sources."@babel/plugin-transform-typescript-7.21.0" + sources."@babel/plugin-transform-typescript-7.21.3" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" - (sources."@babel/preset-env-7.20.2" // { + (sources."@babel/preset-env-7.21.4" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" sources."@babel/preset-react-7.18.6" - sources."@babel/preset-typescript-7.21.0" + sources."@babel/preset-typescript-7.21.4" sources."@babel/regjsgen-0.8.0" sources."@babel/runtime-7.21.0" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.21.2" - sources."@babel/types-7.21.2" + sources."@babel/traverse-7.21.4" + sources."@babel/types-7.21.4" sources."@bcoe/v8-coverage-0.2.3" sources."@csstools/normalize.css-12.0.0" sources."@csstools/postcss-cascade-layers-1.1.1" @@ -11185,7 +11257,7 @@ let sources."@csstools/postcss-text-decoration-shorthand-1.0.0" sources."@csstools/postcss-trigonometric-functions-1.0.2" sources."@csstools/postcss-unset-value-1.0.2" - sources."@csstools/selector-specificity-2.1.1" + sources."@csstools/selector-specificity-2.2.0" sources."@emotion/babel-plugin-11.10.6" sources."@emotion/cache-11.10.5" sources."@emotion/hash-0.9.0" @@ -11199,14 +11271,16 @@ let sources."@emotion/use-insertion-effect-with-fallbacks-1.0.0" sources."@emotion/utils-1.2.0" sources."@emotion/weak-memoize-0.3.0" - (sources."@eslint/eslintrc-2.0.0" // { + sources."@eslint-community/eslint-utils-4.4.0" + sources."@eslint-community/regexpp-4.5.0" + (sources."@eslint/eslintrc-2.0.2" // { dependencies = [ sources."argparse-2.0.1" sources."globals-13.20.0" sources."js-yaml-4.1.0" ]; }) - sources."@eslint/js-8.35.0" + sources."@eslint/js-8.37.0" sources."@humanwhocodes/config-array-0.11.8" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" @@ -11295,23 +11369,23 @@ let sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" sources."@leichtgewicht/ip-codec-2.0.4" - (sources."@mui/base-5.0.0-alpha.119" // { + (sources."@mui/base-5.0.0-alpha.123" // { dependencies = [ sources."react-is-18.2.0" ]; }) - sources."@mui/core-downloads-tracker-5.11.11" + sources."@mui/core-downloads-tracker-5.11.15" sources."@mui/icons-material-5.11.11" - (sources."@mui/material-5.11.11" // { + (sources."@mui/material-5.11.15" // { dependencies = [ sources."react-is-18.2.0" ]; }) - sources."@mui/private-theming-5.11.11" + sources."@mui/private-theming-5.11.13" sources."@mui/styled-engine-5.11.11" - sources."@mui/system-5.11.11" + sources."@mui/system-5.11.15" sources."@mui/types-7.2.3" - (sources."@mui/utils-5.11.11" // { + (sources."@mui/utils-5.11.13" // { dependencies = [ sources."react-is-18.2.0" ]; @@ -11330,8 +11404,8 @@ let sources."source-map-0.7.4" ]; }) - sources."@popperjs/core-2.11.6" - sources."@remix-run/router-1.3.3" + sources."@popperjs/core-2.11.7" + sources."@remix-run/router-1.5.0" sources."@rollup/plugin-babel-5.3.1" sources."@rollup/plugin-node-resolve-11.2.1" sources."@rollup/plugin-replace-2.4.2" @@ -11369,7 +11443,7 @@ let sources."@types/bonjour-3.5.10" sources."@types/connect-3.4.35" sources."@types/connect-history-api-fallback-1.3.5" - sources."@types/eslint-8.21.1" + sources."@types/eslint-8.37.0" sources."@types/eslint-scope-3.7.4" sources."@types/estree-1.0.0" sources."@types/express-4.17.17" @@ -11383,19 +11457,19 @@ let sources."@types/json-schema-7.0.11" sources."@types/json5-0.0.29" sources."@types/mime-3.0.1" - sources."@types/node-18.14.6" + sources."@types/node-18.15.11" sources."@types/parse-json-4.0.0" sources."@types/prettier-2.7.2" sources."@types/prop-types-15.7.5" sources."@types/q-1.5.5" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/react-18.0.28" + sources."@types/react-18.0.32" sources."@types/react-is-17.0.3" sources."@types/react-transition-group-4.4.5" sources."@types/resolve-1.17.1" sources."@types/retry-0.12.0" - sources."@types/scheduler-0.16.2" + sources."@types/scheduler-0.16.3" sources."@types/semver-7.3.13" sources."@types/serve-index-1.9.1" sources."@types/serve-static-1.15.1" @@ -11405,20 +11479,20 @@ let sources."@types/ws-8.5.4" sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.0" - sources."@typescript-eslint/eslint-plugin-5.54.0" - sources."@typescript-eslint/experimental-utils-5.54.0" - sources."@typescript-eslint/parser-5.54.0" - sources."@typescript-eslint/scope-manager-5.54.0" - sources."@typescript-eslint/type-utils-5.54.0" - sources."@typescript-eslint/types-5.54.0" - sources."@typescript-eslint/typescript-estree-5.54.0" - (sources."@typescript-eslint/utils-5.54.0" // { + sources."@typescript-eslint/eslint-plugin-5.57.0" + sources."@typescript-eslint/experimental-utils-5.57.0" + sources."@typescript-eslint/parser-5.57.0" + sources."@typescript-eslint/scope-manager-5.57.0" + sources."@typescript-eslint/type-utils-5.57.0" + sources."@typescript-eslint/types-5.57.0" + sources."@typescript-eslint/typescript-estree-5.57.0" + (sources."@typescript-eslint/utils-5.57.0" // { dependencies = [ sources."eslint-scope-5.1.1" sources."estraverse-4.3.0" ]; }) - sources."@typescript-eslint/visitor-keys-5.54.0" + sources."@typescript-eslint/visitor-keys-5.57.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -11446,11 +11520,6 @@ let }) sources."acorn-import-assertions-1.8.0" sources."acorn-jsx-5.3.2" - (sources."acorn-node-1.8.2" // { - dependencies = [ - sources."acorn-7.4.1" - ]; - }) sources."acorn-walk-7.2.0" sources."address-1.2.2" sources."adjust-sourcemap-loader-4.0.0" @@ -11471,10 +11540,12 @@ let sources."ansi-html-community-0.0.8" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" + sources."any-promise-1.3.0" sources."anymatch-3.1.3" sources."arg-5.0.2" sources."argparse-1.0.10" sources."aria-query-5.1.3" + sources."array-buffer-byte-length-1.0.0" sources."array-flatten-2.1.2" sources."array-includes-3.1.6" sources."array-union-2.1.0" @@ -11487,7 +11558,7 @@ let sources."async-3.2.4" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - sources."autoprefixer-10.4.13" + sources."autoprefixer-10.4.14" sources."available-typed-arrays-1.0.5" sources."axe-core-4.6.3" sources."axobject-query-3.1.1" @@ -11534,7 +11605,7 @@ let sources."ms-2.0.0" ]; }) - sources."bonjour-service-1.1.0" + sources."bonjour-service-1.1.1" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -11554,7 +11625,7 @@ let sources."camelcase-6.3.0" sources."camelcase-css-2.0.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001460" + sources."caniuse-lite-1.0.30001473" sources."case-sensitive-paths-webpack-plugin-2.4.0" (sources."chalk-2.4.2" // { dependencies = [ @@ -11606,16 +11677,16 @@ let sources."convert-source-map-1.9.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.29.0" - sources."core-js-compat-3.29.0" - sources."core-js-pure-3.29.0" + sources."core-js-3.29.1" + sources."core-js-compat-3.29.1" + sources."core-js-pure-3.29.1" sources."core-util-is-1.0.3" sources."cosmiconfig-7.1.0" sources."cross-fetch-3.1.5" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."css-blank-pseudo-3.0.3" - sources."css-declaration-sorter-6.3.1" + sources."css-declaration-sorter-6.4.0" sources."css-has-pseudo-3.0.4" sources."css-loader-6.7.3" (sources."css-minimizer-webpack-plugin-3.4.1" // { @@ -11636,7 +11707,7 @@ let ]; }) sources."css-what-3.4.2" - sources."cssdb-7.4.1" + sources."cssdb-7.5.3" sources."cssesc-3.0.0" sources."cssnano-5.1.15" sources."cssnano-preset-default-5.2.14" @@ -11654,7 +11725,7 @@ let sources."cssom-0.3.8" ]; }) - sources."csstype-3.1.1" + sources."csstype-3.1.2" sources."damerau-levenshtein-1.0.8" (sources."data-urls-2.0.0" // { dependencies = [ @@ -11668,11 +11739,10 @@ let sources."dedent-0.7.0" sources."deep-equal-2.2.0" sources."deep-is-0.1.4" - sources."deepmerge-4.3.0" + sources."deepmerge-4.3.1" sources."default-gateway-6.0.3" sources."define-lazy-prop-2.0.0" sources."define-properties-1.2.0" - sources."defined-1.0.1" sources."delayed-stream-1.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" @@ -11684,15 +11754,14 @@ let sources."ms-2.0.0" ]; }) - sources."detective-5.2.1" sources."dexie-3.2.3" - sources."dexie-react-hooks-1.1.1" + sources."dexie-react-hooks-1.1.3" sources."didyoumean-1.2.2" sources."diff-sequences-27.5.1" sources."dir-glob-3.0.1" sources."dlv-1.1.3" sources."dns-equal-1.0.0" - sources."dns-packet-5.4.0" + sources."dns-packet-5.5.0" sources."doctrine-3.0.0" sources."dom-converter-0.2.0" sources."dom-helpers-5.2.1" @@ -11722,8 +11791,8 @@ let sources."dotenv-expand-5.1.0" sources."duplexer-0.1.2" sources."ee-first-1.1.1" - sources."ejs-3.1.8" - sources."electron-to-chromium-1.4.320" + sources."ejs-3.1.9" + sources."electron-to-chromium-1.4.348" sources."emittery-0.8.1" sources."emoji-regex-9.2.2" sources."emojis-list-3.0.0" @@ -11732,7 +11801,7 @@ let sources."entities-2.2.0" sources."error-ex-1.3.2" sources."error-stack-parser-2.1.4" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" sources."es-array-method-boxes-properly-1.0.0" sources."es-get-iterator-1.1.3" sources."es-module-lexer-0.9.3" @@ -11751,7 +11820,7 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-8.35.0" // { + (sources."eslint-8.37.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."argparse-2.0.1" @@ -11799,12 +11868,7 @@ let sources."eslint-plugin-react-hooks-4.6.0" sources."eslint-plugin-testing-library-5.10.2" sources."eslint-scope-7.1.1" - (sources."eslint-utils-3.0.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - ]; - }) - sources."eslint-visitor-keys-3.3.0" + sources."eslint-visitor-keys-3.4.0" (sources."eslint-webpack-plugin-3.2.0" // { dependencies = [ sources."ajv-8.12.0" @@ -11816,7 +11880,7 @@ let sources."supports-color-8.1.1" ]; }) - sources."espree-9.4.1" + sources."espree-9.5.1" sources."esprima-4.0.1" sources."esquery-1.5.0" sources."esrecurse-4.3.0" @@ -11870,7 +11934,7 @@ let sources."flatted-3.2.7" sources."follow-redirects-1.15.2" sources."for-each-0.3.3" - (sources."fork-ts-checker-webpack-plugin-6.5.2" // { + (sources."fork-ts-checker-webpack-plugin-6.5.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -11915,7 +11979,7 @@ let sources."globalthis-1.0.3" sources."globby-11.1.0" sources."gopd-1.0.1" - sources."graceful-fs-4.2.10" + sources."graceful-fs-4.2.11" sources."grapheme-splitter-1.0.4" sources."gzip-size-6.0.0" sources."handle-thing-2.0.1" @@ -11971,7 +12035,7 @@ let sources."idb-7.1.1" sources."identity-obj-proxy-3.0.0" sources."ignore-5.2.4" - sources."immer-9.0.19" + sources."immer-9.0.21" sources."import-fresh-3.3.0" sources."import-local-3.1.0" sources."imurmurhash-0.1.4" @@ -12210,7 +12274,7 @@ let }) sources."@jest/test-result-28.1.3" sources."@jest/types-28.1.3" - sources."@types/yargs-17.0.22" + sources."@types/yargs-17.0.24" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -12260,8 +12324,9 @@ let sources."supports-color-8.1.1" ]; }) + sources."jiti-1.18.2" sources."js-base64-3.7.5" - sources."js-sdsl-4.3.0" + sources."js-sdsl-4.4.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" (sources."jsdom-16.7.0" // { @@ -12285,6 +12350,7 @@ let sources."klona-2.0.6" sources."language-subtag-registry-0.3.22" sources."language-tags-1.0.5" + sources."launch-editor-2.6.0" sources."leven-3.1.0" sources."levn-0.4.1" sources."lilconfig-2.1.0" @@ -12324,7 +12390,7 @@ let sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" - (sources."mini-css-extract-plugin-2.7.2" // { + (sources."mini-css-extract-plugin-2.7.5" // { dependencies = [ sources."ajv-8.12.0" sources."ajv-keywords-5.1.0" @@ -12338,7 +12404,8 @@ let sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."multicast-dns-7.2.5" - sources."nanoid-3.3.4" + sources."mz-2.7.0" + sources."nanoid-3.3.6" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" sources."negotiator-0.6.3" @@ -12558,12 +12625,12 @@ let sources."react-infinite-scroll-component-6.1.0" sources."react-is-16.13.1" sources."react-refresh-0.11.0" - sources."react-router-6.8.2" - sources."react-router-dom-6.8.2" + sources."react-router-6.10.0" + sources."react-router-dom-6.10.0" sources."react-scripts-5.0.1" sources."react-transition-group-4.4.5" sources."read-cache-1.0.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."readdirp-3.6.0" sources."recursive-readdir-2.2.3" sources."regenerate-1.4.2" @@ -12572,8 +12639,7 @@ let sources."regenerator-transform-0.15.1" sources."regex-parser-2.2.11" sources."regexp.prototype.flags-1.4.3" - sources."regexpp-3.2.0" - sources."regexpu-core-5.3.1" + sources."regexpu-core-5.3.2" (sources."regjsparser-0.9.1" // { dependencies = [ sources."jsesc-0.5.0" @@ -12711,6 +12777,7 @@ let ]; }) sources."string.prototype.matchall-4.0.8" + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.1.1" // { @@ -12724,9 +12791,15 @@ let sources."strip-comments-2.0.1" sources."strip-final-newline-2.0.0" sources."strip-json-comments-3.1.1" - sources."style-loader-3.3.1" + sources."style-loader-3.3.2" sources."stylehacks-5.1.1" sources."stylis-4.1.3" + (sources."sucrase-3.31.0" // { + dependencies = [ + sources."commander-4.1.1" + sources."glob-7.1.6" + ]; + }) sources."supports-color-5.5.0" (sources."supports-hyperlinks-2.3.0" // { dependencies = [ @@ -12738,7 +12811,7 @@ let sources."svg-parser-2.0.4" sources."svgo-1.3.2" sources."symbol-tree-3.2.4" - (sources."tailwindcss-3.2.7" // { + (sources."tailwindcss-3.3.1" // { dependencies = [ sources."color-name-1.1.4" ]; @@ -12751,14 +12824,16 @@ let ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.16.5" // { + (sources."terser-5.16.8" // { dependencies = [ sources."commander-2.20.3" ]; }) - sources."terser-webpack-plugin-5.3.6" + sources."terser-webpack-plugin-5.3.7" sources."test-exclude-6.0.0" sources."text-table-0.2.0" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" sources."throat-6.0.2" sources."throttle-debounce-2.3.0" sources."thunky-1.1.0" @@ -12773,6 +12848,7 @@ let }) sources."tr46-0.0.3" sources."tryer-1.0.1" + sources."ts-interface-checker-0.1.13" (sources."tsconfig-paths-3.14.2" // { dependencies = [ sources."json5-1.0.2" @@ -12817,7 +12893,7 @@ let sources."watchpack-2.4.0" sources."wbuf-1.7.3" sources."webidl-conversions-3.0.1" - (sources."webpack-5.75.0" // { + (sources."webpack-5.77.0" // { dependencies = [ sources."@types/estree-0.0.51" sources."eslint-scope-5.1.1" @@ -12832,13 +12908,13 @@ let sources."schema-utils-4.0.0" ]; }) - (sources."webpack-dev-server-4.11.1" // { + (sources."webpack-dev-server-4.13.2" // { dependencies = [ sources."ajv-8.12.0" sources."ajv-keywords-5.1.0" sources."json-schema-traverse-1.0.0" sources."schema-utils-4.0.0" - sources."ws-8.12.1" + sources."ws-8.13.0" ]; }) (sources."webpack-manifest-plugin-4.1.1" // { @@ -12903,7 +12979,6 @@ let sources."ws-7.5.9" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" - sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yallist-3.1.1" sources."yaml-1.10.2" From fb372a28d899a9d79def6debd0b081b3ce7314c8 Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 3 Apr 2023 16:50:06 +0800 Subject: [PATCH 035/136] libviperfx: mark meta.sourceProvenance --- pkgs/development/libraries/libviperfx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libviperfx/default.nix b/pkgs/development/libraries/libviperfx/default.nix index 3c980823f410..580329754b66 100644 --- a/pkgs/development/libraries/libviperfx/default.nix +++ b/pkgs/development/libraries/libviperfx/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.unfreeRedistributable; maintainers = with maintainers; [ rewine ]; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } From a476a6dc8d45edda1820c021708dc4bbb9bdac36 Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 3 Apr 2023 16:52:32 +0800 Subject: [PATCH 036/136] wpsoffice: mark meta.sourceProvenance --- pkgs/applications/office/wpsoffice/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 44a16df595ea..0685f52820a3 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation rec { description = "Office suite, formerly Kingsoft Office"; homepage = "https://www.wps.com"; platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; hydraPlatforms = [ ]; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mlatus th0rgal rewine ]; From 8fd99e12128381ee4efdc1c13e09f2e41795c500 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 3 Apr 2023 13:17:02 +0200 Subject: [PATCH 037/136] python3Packages.jiwer: init at 3.0.1 --- .../python-modules/jiwer/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/jiwer/default.nix diff --git a/pkgs/development/python-modules/jiwer/default.nix b/pkgs/development/python-modules/jiwer/default.nix new file mode 100644 index 000000000000..42c9192255f8 --- /dev/null +++ b/pkgs/development/python-modules/jiwer/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, rapidfuzz +, click +}: + +buildPythonPackage rec { + pname = "jiwer"; + version = "3.0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jitsi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-bH5TE6mcSG+WqvjW8Sd/o5bCBJmv9zurFEG2cVY/vYQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + rapidfuzz + click + ]; + + pythonImportsCheck = [ "jiwer" ]; + + meta = with lib; { + description = "JiWER is a simple and fast python package to evaluate an automatic speech recognition system"; + homepage = "https://github.com/jitsi/jiwer"; + license = licenses.asl20; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 267dc6f25fc6..3ddbaaf436a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5000,6 +5000,8 @@ self: super: with self; { jira = callPackage ../development/python-modules/jira { }; + jiwer = callPackage ../development/python-modules/jiwer { }; + jmespath = callPackage ../development/python-modules/jmespath { }; jmp = callPackage ../development/python-modules/jmp { }; From e00db8e1fe3b0553e433133af4ba4bfd358cab16 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 3 Apr 2023 14:37:31 +0900 Subject: [PATCH 038/136] fishPlugins.fzf-fish: 9.3 -> 9.7 --- pkgs/shells/fish/plugins/fzf-fish.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index 2480b9ea93cb..a97c8f4ff075 100644 --- a/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/pkgs/shells/fish/plugins/fzf-fish.nix @@ -1,31 +1,35 @@ -{ lib, stdenv, buildFishPlugin, fetchFromGitHub, fd, fzf, util-linux, clownfish, fishtape_3 }: - +{ lib, stdenv, pkgs, buildFishPlugin, fetchFromGitHub, fd, util-linux, procps, clownfish, fishtape_3, }: +let + # we want `pkgs.fzf`, not `fishPlugins.fzf` + inherit (pkgs) fzf; +in buildFishPlugin rec { pname = "fzf.fish"; - version = "9.2"; + version = "9.7"; src = fetchFromGitHub { owner = "PatrickF1"; repo = "fzf.fish"; rev = "v${version}"; - sha256 = "sha256-XmRGe39O3xXmTvfawwT2mCwLIyXOlQm7f40mH5tzz+s="; + sha256 = "sha256-haNSqXJzLL3JGvD4JrASVmhLJz6i9lna6/EdojXdFOo="; }; - nativeCheckInputs = [ fzf fd util-linux ]; + nativeCheckInputs = [ fzf fd util-linux procps ]; checkPlugins = [ clownfish fishtape_3 ]; checkFunctionDirs = [ "./functions" ]; checkPhase = '' # Disable git tests which inspect the project's git repo, which isn't # possible since we strip the impure .git from our build input rm -r tests/*git* + rm -r tests/preview_changed_file/modified_path_with_spaces.fish + rm -r tests/preview_changed_file/renamed_path_modifications.fish # Disable tests that are failing, probably because of our wrappers rm -r tests/configure_bindings - rm -r tests/search_shell_variables + rm -r tests/search_variables # Disable tests that are failing, because there is not 'rev' command rm tests/preview_file/custom_file_preview.fish - '' + ( if stdenv.isDarwin then ''script /dev/null fish -c "fishtape tests/*/*.fish"'' else ''script -c 'fish -c "fishtape tests/*/*.fish"' '' From f95d6c4cc2dba9fa77044d644668ef6847353c60 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 3 Apr 2023 22:37:06 +0900 Subject: [PATCH 039/136] fishPlugins.fzf-fish: add natsukium to maintainers --- pkgs/shells/fish/plugins/fzf-fish.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index a97c8f4ff075..f2f7fcd65409 100644 --- a/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/pkgs/shells/fish/plugins/fzf-fish.nix @@ -39,6 +39,6 @@ buildFishPlugin rec { description = "Augment your fish command line with fzf key bindings"; homepage = "https://github.com/PatrickF1/fzf.fish"; license = licenses.mit; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ pacien natsukium ]; }; } From 0030956979fc9054322bcb03d26f6bb186ffacda Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 3 Apr 2023 13:48:09 +0200 Subject: [PATCH 040/136] linuxPackages.apfs: 0.3.0 -> 0.3.1 https://github.com/linux-apfs/linux-apfs-rw/releases/tag/v0.3.1 --- pkgs/os-specific/linux/apfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index e6961684d0e4..1f0cc74f9814 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -6,7 +6,7 @@ }: let - tag = "0.3.0"; + tag = "0.3.1"; in stdenv.mkDerivation { pname = "apfs"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "linux-apfs"; repo = "linux-apfs-rw"; rev = "v${tag}"; - sha256 = "sha256-ABFqkiIJuFapFsUIFHfw8+TujePZm7ZX/qHuFO2KdnQ="; + sha256 = "sha256-KYPZsCAEqJl0VjV/TmJWi20Y7yApIJH0YMwQIL80Ep4="; }; hardeningDisable = [ "pic" ]; From 0b0cc93e79e2699700f44415eb2fa498db3be6b2 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 3 Apr 2023 17:07:16 +0200 Subject: [PATCH 041/136] remove myself (erictapen) from packages which I don't use anymore --- nixos/modules/services/databases/neo4j.nix | 2 +- nixos/modules/services/networking/unifi.nix | 2 +- pkgs/applications/gis/qgis/unwrapped-ltr.nix | 2 +- pkgs/applications/gis/qgis/unwrapped.nix | 2 +- .../networking/instant-messengers/signal-cli/default.nix | 2 +- pkgs/applications/networking/mailreaders/meli/default.nix | 2 +- .../haskell-modules/configuration-hackage2nix/main.yaml | 3 --- pkgs/development/libraries/libassuan/default.nix | 2 +- pkgs/development/libraries/libepoxy/default.nix | 2 +- pkgs/development/libraries/mapnik/default.nix | 2 +- .../python-modules/jupyterhub-systemdspawner/default.nix | 2 +- pkgs/development/python-modules/nbclient/default.nix | 2 +- pkgs/development/python-modules/osmpythontools/default.nix | 2 +- pkgs/development/python-modules/python-louvain/default.nix | 2 +- pkgs/development/python-modules/python-mapnik/default.nix | 2 +- pkgs/development/python-modules/pyvis/default.nix | 2 +- pkgs/development/python-modules/tlslite-ng/default.nix | 2 +- pkgs/servers/unifi/default.nix | 2 +- 18 files changed, 17 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index d78ff8390e4d..090502424028 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -636,6 +636,6 @@ in { }; meta = { - maintainers = with lib.maintainers; [ patternspandemic jonringer erictapen ]; + maintainers = with lib.maintainers; [ patternspandemic jonringer ]; }; } diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 91eb385518c3..73adf5572b35 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -194,5 +194,5 @@ in (mkRenamedOptionModule [ "services" "unifi" "openPorts" ] [ "services" "unifi" "openFirewall" ]) ]; - meta.maintainers = with lib.maintainers; [ erictapen pennae ]; + meta.maintainers = with lib.maintainers; [ pennae ]; } diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index a2e01303970a..a53ad337d542 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -157,6 +157,6 @@ in mkDerivation rec { homepage = "https://www.qgis.org"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ lsix sikmir erictapen willcohen ]; + maintainers = with lib.maintainers; [ lsix sikmir willcohen ]; }; } diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 18603e38ec53..8c6fe7b85dd5 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -157,6 +157,6 @@ in mkDerivation rec { homepage = "https://www.qgis.org"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ lsix sikmir erictapen willcohen ]; + maintainers = with lib.maintainers; [ lsix sikmir willcohen ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 4d46c9870f06..baca7bd39439 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/AsamK/signal-cli"; description = "Command-line and dbus interface for communicating with the Signal messaging service"; license = licenses.gpl3; - maintainers = with maintainers; [ ivan erictapen ]; + maintainers = with maintainers; [ ivan ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index 285fbdf35707..becc61937593 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec { description = "Experimental terminal mail client aiming for configurability and extensibility with sane defaults"; homepage = "https://meli.delivery"; license = licenses.gpl3; - maintainers = with maintainers; [ _0x4A6F matthiasbeyer erictapen ]; + maintainers = with maintainers; [ _0x4A6F matthiasbeyer ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 465754bf57bc..b81b4a89948e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -192,9 +192,6 @@ package-maintainers: - vulkan-utils erictapen: - hakyll - - hakyll-contrib-hyphenation - - webify - - squeal-postgresql Gabriel439: - annah - bench diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index e2fbb3f9287c..a807226f75ab 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "http://gnupg.org"; license = licenses.lgpl2Plus; platforms = platforms.all; - maintainers = [ maintainers.erictapen ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index da10cf22cf18..3eb1d47c98d1 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { description = "A library for handling OpenGL function pointer management"; homepage = "https://github.com/anholt/libepoxy"; license = licenses.mit; - maintainers = with maintainers; [ goibhniu erictapen ]; + maintainers = with maintainers; [ goibhniu ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index f8da6e9ae03e..8d0f5565947b 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An open source toolkit for developing mapping applications"; homepage = "https://mapnik.org"; - maintainers = with maintainers; [ hrdinka erictapen ]; + maintainers = with maintainers; [ hrdinka ]; license = licenses.lgpl21Plus; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index 31f33821b954..7aeaa6cdb237 100644 --- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -45,6 +45,6 @@ buildPythonPackage rec { description = "JupyterHub Spawner using systemd for resource isolation"; homepage = "https://github.com/jupyterhub/systemdspawner"; license = licenses.bsd3; - maintainers = with maintainers; [ costrouc erictapen ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 605ecf1d6058..6f0d85ff9203 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -68,7 +68,7 @@ let nbclient = buildPythonPackage rec { homepage = "https://github.com/jupyter/nbclient"; description = "A client library for executing notebooks"; license = licenses.bsd3; - maintainers = [ maintainers.erictapen ]; + maintainers = [ ]; }; }; in nbclient diff --git a/pkgs/development/python-modules/osmpythontools/default.nix b/pkgs/development/python-modules/osmpythontools/default.nix index 5ceef2be3784..7545d9c01006 100644 --- a/pkgs/development/python-modules/osmpythontools/default.nix +++ b/pkgs/development/python-modules/osmpythontools/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { homepage = "https://github.com/mocnik-science/osm-python-tools"; license = licenses.gpl3Only; changelog = "https://raw.githubusercontent.com/mocnik-science/osm-python-tools/v${version}/version-history.md"; - maintainers = with maintainers; [ das-g erictapen ]; + maintainers = with maintainers; [ das-g ]; }; } diff --git a/pkgs/development/python-modules/python-louvain/default.nix b/pkgs/development/python-modules/python-louvain/default.nix index 214ebf60a309..32bd611e704a 100644 --- a/pkgs/development/python-modules/python-louvain/default.nix +++ b/pkgs/development/python-modules/python-louvain/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/taynaud/python-louvain"; description = "Louvain Community Detection"; license = licenses.bsd3; - maintainers = with maintainers; [ erictapen ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 8c623f286f14..18df3e4d5655 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -134,7 +134,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for Mapnik"; - maintainers = with maintainers; [ erictapen ]; + maintainers = with maintainers; [ ]; homepage = "https://mapnik.org"; license = licenses.lgpl21Plus; }; diff --git a/pkgs/development/python-modules/pyvis/default.nix b/pkgs/development/python-modules/pyvis/default.nix index 5c9f054d7645..c4698744531b 100644 --- a/pkgs/development/python-modules/pyvis/default.nix +++ b/pkgs/development/python-modules/pyvis/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/WestHealth/pyvis"; description = "Python package for creating and visualizing interactive network graphs"; license = licenses.bsd3; - maintainers = with maintainers; [ erictapen ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix index 37751890c7b3..c6146140163c 100644 --- a/pkgs/development/python-modules/tlslite-ng/default.nix +++ b/pkgs/development/python-modules/tlslite-ng/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { description = "Pure python implementation of SSL and TLS."; homepage = "https://pypi.python.org/pypi/tlslite-ng"; license = licenses.lgpl2; - maintainers = [ maintainers.erictapen ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index b88509555ba6..a62c4d23d238 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -38,7 +38,7 @@ let sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = platforms.unix; - maintainers = with maintainers; [ erictapen globin patryk27 pennae ]; + maintainers = with maintainers; [ globin patryk27 pennae ]; }; }); From 4b6210095f2fc5dab6a9319c7b28a93eba5b8a4d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 19:03:53 +0200 Subject: [PATCH 042/136] python310Packages.xiaomi-ble: 0.16.4 -> 0.17.0 Diff: https://github.com/Bluetooth-Devices/xiaomi-ble/compare/refs/tags/v0.16.4...v0.17.0 Changelog: https://github.com/Bluetooth-Devices/xiaomi-ble/releases/tag/v0.17.0 --- pkgs/development/python-modules/xiaomi-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index aa59481b8ed4..22fe3f178b27 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.16.4"; + version = "0.17.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ye/BuVKLNSC0zJzDyuairbrmZgQ+sX0y9bHWEfb/MJE="; + hash = "sha256-sXmwLXbFNckw9lCZ4V5hyZyDnStTp2x4InmoBz3c++w="; }; nativeBuildInputs = [ From 3bd29fe7504735a7790ad2ed130890ad2c3418ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 15:43:23 +0200 Subject: [PATCH 043/136] dnstwist: 20221213 -> 20230402 Diff: https://github.com/elceef/dnstwist/compare/refs/tags/20221213...20230402 Changelog: https://github.com/elceef/dnstwist/releases/tag/20230402 --- pkgs/tools/networking/dnstwist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnstwist/default.nix b/pkgs/tools/networking/dnstwist/default.nix index 3c70713bedbc..a3a0079c9e6d 100644 --- a/pkgs/tools/networking/dnstwist/default.nix +++ b/pkgs/tools/networking/dnstwist/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "dnstwist"; - version = "20221213"; + version = "20230402"; format = "setuptools"; src = fetchFromGitHub { owner = "elceef"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-xYZGrlrEdot2l1SkXcT2IbeRWouaN6C+WwbBSHXhAtw="; + hash = "sha256-WZj33QpiRo4C1p18Y/S6YQtCu7154w78HQZQsxV7QJ4="; }; propagatedBuildInputs = with python3.pkgs; [ From 205fa27e47f81d19cda764b19544fd4ce5a887f7 Mon Sep 17 00:00:00 2001 From: Hugh O'Brien Date: Mon, 3 Apr 2023 13:11:03 -0400 Subject: [PATCH 044/136] cdecrypt: init at 4.8 --- pkgs/development/tools/cdecrypt/default.nix | 29 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/cdecrypt/default.nix diff --git a/pkgs/development/tools/cdecrypt/default.nix b/pkgs/development/tools/cdecrypt/default.nix new file mode 100644 index 000000000000..ef14ac5b4090 --- /dev/null +++ b/pkgs/development/tools/cdecrypt/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "cdecrypt"; + version = "4.8"; + + src = fetchFromGitHub { + owner = "VitaSmith"; + repo = "cdecrypt"; + rev = "refs/tags/v${version}"; + hash = "sha256-PyT60RDyp1/Co/7WHC0+KrsnrDeTJ605x1pt4OmlGYg="; + }; + + installPhase = '' + install -Dm755 cdecrypt $out/bin/cdecrypt + ''; + + meta = with lib; { + description = "A utility that decrypts Wii U NUS content files"; + homepage = "https://github.com/VitaSmith/cdecrypt"; + changelog = "https://github.com/VitaSmith/cdecrypt/releases/tag/v${version}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hughobrien ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61947c4afdf0..c63338987041 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -402,6 +402,8 @@ with pkgs; cereal = callPackage ../development/libraries/cereal { }; + cdecrypt = callPackage ../development/tools/cdecrypt { }; + certgraph = callPackage ../tools/security/certgraph { }; cewl = callPackage ../tools/security/cewl { }; From 30d1f10b2d4831970c0dbb1d1e5588d3dc4caa99 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 19:57:30 +0200 Subject: [PATCH 045/136] python310Packages.shtab: 1.5.8 -> 1.6.0 Diff: https://github.com/iterative/shtab/compare/refs/tags/v1.5.8...v1.6.0 Changelog: https://github.com/iterative/shtab/releases/tag/v1.6.0 --- pkgs/development/python-modules/shtab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index 7a8877369448..3f4ba3fb99ce 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "shtab"; - version = "1.5.8"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FVV8AKe3PG387jarWYbXWxwVUAX6sM89KM8MuOr5cRw="; + hash = "sha256-CR6fUDLjwUu2pD/1crUDPjU22evybUAfBA/YF/zf1mk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From d10dffebb213847cc50065a6c9701a949308e041 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 20:26:43 +0200 Subject: [PATCH 046/136] python310Packages.python-gvm: 23.2.0 -> 23.4.0 Diff: https://github.com/greenbone/python-gvm/compare/refs/tags/v23.2.0...v23.4.0 --- pkgs/development/python-modules/python-gvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index c8171d9e312e..d6e95d433662 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "23.2.0"; + version = "23.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6EmmiJjadC6zJM4+HhL8w2Xw1p7pG5LI0TS53bH61Tc="; + hash = "sha256-qpPoE5QSm6JwBG3842gjxGeSd87yY2/T/HFi4k8U/qY="; }; nativeBuildInputs = [ From 22855521b77ede16d69bbe04d1cb7cbee578a080 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 20:28:08 +0200 Subject: [PATCH 047/136] python310Packages.msgspec: 0.13.1 -> 0.14.0 Diff: https://github.com/jcrist/msgspec/compare/refs/tags/0.13.1...0.14.0 Changelog: https://github.com/jcrist/msgspec/releases/tag/0.14.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 10e0e6b23e8a..075089f02724 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.13.1"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Sq0hV5ZftUCIR/6QOWvdfzg8UHYLZXo5ba5ydTnjqPg="; + hash = "sha256-adjLXMHJx9sP5qbg9sw+fV2h843KuG1NKqNyX3gEkVY="; }; # Requires libasan to be accessible From 057ca085321d1ccefaa4c6f4ae885ba4dba85642 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 20:29:25 +0200 Subject: [PATCH 048/136] python310Packages.mkdocstrings-python: 0.8.3 -> 0.9.0 Diff: https://github.com/mkdocstrings/python/compare/0.8.3...0.9.0 Changelog: https://github.com/mkdocstrings/python/blob/0.9.0/CHANGELOG.md --- .../python-modules/mkdocstrings-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 92673a752f65..d71b3a08e7ca 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "0.8.3"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = version; - hash = "sha256-JGk6oJQ6mcLtn7SDtltsLPT+CxPZNRbq8bnY9pMcXHc="; + hash = "sha256-PM6J21yT5paukDB8uJkcIyy+miYwN4+gk8Ej1xI8Q1A="; }; nativeBuildInputs = [ From d2b00b0f55702aca18e65be77857adabf2c3553c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 20:36:01 +0200 Subject: [PATCH 049/136] python310Packages.meilisearch: 0.25.0 -> 0.26.0 Diff: https://github.com/meilisearch/meilisearch-python/compare/refs/tags/v0.25.0...v0.26.0 Changelog: https://github.com/meilisearch/meilisearch-python/releases/tag/v0.26.0 --- .../python-modules/meilisearch/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix index c9abb3770151..c7167d902de5 100644 --- a/pkgs/development/python-modules/meilisearch/default.nix +++ b/pkgs/development/python-modules/meilisearch/default.nix @@ -3,13 +3,14 @@ , camel-converter , fetchFromGitHub , pythonOlder +, setuptools , requests }: buildPythonPackage rec { pname = "meilisearch"; - version = "0.25.0"; - format = "setuptools"; + version = "0.26.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,9 +18,13 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-tN6rjUozN+VqUAm4vHN3RDQoNmkPE49pSUl+zuei9lc="; + hash = "sha256-DhArrKIA9S/huO3QRjZNZ2xOpHybZgj6tIBKfRX6ZYg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ camel-converter requests From a320db8d294eca7e14087e83677d4bf6808386f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 20:40:54 +0200 Subject: [PATCH 050/136] python310Packages.griffe: 0.25.5 -> 0.26.0 Changelog: https://github.com/mkdocstrings/griffe/blob/0.26.0/CHANGELOG.md --- pkgs/development/python-modules/griffe/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 8dfabb097296..c6f968029115 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -5,14 +5,15 @@ , colorama , fetchFromGitHub , git -, pdm-pep517 +, jsonschema +, pdm-backend , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "griffe"; - version = "0.25.5"; + version = "0.26.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0+n5v93ERcQDKNtXxSZYfCUMTRzcbtQEXl023KSxfrE="; + hash = "sha256-p5JYBVvKvqKdYIYFh8ZiEgepJips9jg/6ao5yZ/fbcs="; }; postPatch = '' @@ -32,7 +33,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = [ @@ -43,6 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ git + jsonschema pytestCheckHook ]; From 6c9c6208970b26927aaadca0aa991eb0b8a46d90 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 20:41:54 +0200 Subject: [PATCH 051/136] python310Packages.google-cloud-bigquery-logging: 1.2.0 -> 1.2.1 Changelog: https://github.com/googleapis/python-bigquery-logging/blob/v1.2.1/CHANGELOG.md --- .../python-modules/google-cloud-bigquery-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 2c2e5fe6766d..674fa63c86e4 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OsQeBJMvq/NOC6T7N4jyrsKzcazOAn838CDjfDq7dZA="; + hash = "sha256-zTVOt3175ruIHatHTemOAt9VF4pvJn/fQIvm/DXXw9M="; }; propagatedBuildInputs = [ From 5151d75738784ee1c1a174948626d922a58953b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 20:44:07 +0200 Subject: [PATCH 052/136] python310Packages.fastapi-mail: 1.2.6 -> 1.2.7 Diff: https://github.com/sabuhish/fastapi-mail/compare/refs/tags/1.2.6...1.2.7 Changelog: https://github.com/sabuhish/fastapi-mail/releases/tag/1.2.7 --- pkgs/development/python-modules/fastapi-mail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index dc1d232bf0f5..395e427c5405 100644 --- a/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/pkgs/development/python-modules/fastapi-mail/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "fastapi-mail"; - version = "1.2.6"; + version = "1.2.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "sabuhish"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PL/0swFiAG8HlvxnsEqwEEec1CIsA3qFer3LKyS2y/Y="; + hash = "sha256-zZjC8tNM6rjpgbMw4MHPVr1UOEhjlgCFcZMvSDmKfzs="; }; postPatch = '' From 6de4b3404f80a2ea0ee357d0ad1c1fb85e95b28e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 20:45:08 +0200 Subject: [PATCH 053/136] python310Packages.faraday-plugins: 1.10.0 -> 1.11.0 Diff: https://github.com/infobyte/faraday_plugins/compare/refs/tags/1.10.0...1.11.0 Changelog: https://github.com/infobyte/faraday_plugins/releases/tag/1.11.0 --- pkgs/development/python-modules/faraday-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index 4bc9d1b239a3..2a1e0f7afc99 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.10.0"; + version = "1.11.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-bVuysEr8VVFgA4OZ7N7UlL2FigbyLVyPr1HHwkshSMU="; + hash = "sha256-rbmD+UeMzsccYq7AzANziUZCgKtShRe/fJersODMrF8="; }; postPatch = '' From 7ef9ebc27baf1002d2d6fbbf3bbce9387383d676 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 20:46:52 +0200 Subject: [PATCH 054/136] python310Packages.easyenergy: 0.2.3 -> 0.3.0 Diff: https://github.com/klaasnicolaas/python-easyenergy/compare/refs/tags/v0.2.3...v0.3.0 Changelog: https://github.com/klaasnicolaas/python-easyenergy/releases/tag/v0.3.0 --- pkgs/development/python-modules/easyenergy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/easyenergy/default.nix b/pkgs/development/python-modules/easyenergy/default.nix index cf16b6ac1424..0ff5caa6661f 100644 --- a/pkgs/development/python-modules/easyenergy/default.nix +++ b/pkgs/development/python-modules/easyenergy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "easyenergy"; - version = "0.2.3"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-easyenergy"; rev = "refs/tags/v${version}"; - hash = "sha256-xDrfOiAAH6qD7qv0ERlQDJ2+CXJiHgvNhxbSlbhpdtw="; + hash = "sha256-J+iWmbuaEErrMxF62rf/L8Rkqo7/7RDXv0CmIuywbjI="; }; postPatch = '' From 8c119d2641a390d8eab2dfe87db57023a0cddff1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 20:48:05 +0200 Subject: [PATCH 055/136] python310Packages.adafruit-platformdetect: 3.42.0 -> 3.43.0 Changelog: https://github.com/adafruit/Adafruit_Python_PlatformDetect/releases/tag/3.43.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index f92071b27a82..72dfbe23656b 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.42.0"; + version = "3.43.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-nFpPJKQv7UNsza1PAcTsZNVp9nFVa/pHlvNRVM4UIUY="; + hash = "sha256-7JsdHeYjPSXGdnvs67haOYqX+le+RmivfXPtxDT6BJ8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 47efd9d5700a89b9e7258a332c45432656829243 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 20:51:39 +0200 Subject: [PATCH 056/136] python310Packages.aiocoap: 0.4.5 -> 0.4.7 Diff: https://github.com/chrysn/aiocoap/compare/refs/tags/0.4.5...0.4.7 Changelog: https://github.com/chrysn/aiocoap/blob/0.4.7/NEWS --- pkgs/development/python-modules/aiocoap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index bf6070ad1cf8..4feb6fc185c4 100644 --- a/pkgs/development/python-modules/aiocoap/default.nix +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiocoap"; - version = "0.4.5"; + version = "0.4.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "chrysn"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-t2yfWWfkJmOr14XdLsIV48HMgVRaEnUO4IG2jQHbKWA="; + hash = "sha256-4iwoPfmIwk+PlWUp60aqA5qZgzyj34pnZHf9uH5UhnY="; }; propagatedBuildInputs = [ From c9deaf22c435861510396314f4b30f446c4e1f6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 2 Apr 2023 21:16:57 -0700 Subject: [PATCH 057/136] python310Packages.tensorflow-bin: mark insecure --- .../python-modules/tensorflow/bin.nix | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix index c9ed92712166..4b3d3d0ec6c4 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/bin.nix @@ -201,5 +201,26 @@ in buildPythonPackage { license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar cdepillabout ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + knownVulnerabilities = optionals (versionOlder packages.version "2.12.0") [ + "CVE-2023-27579" + "CVE-2023-25801" + "CVE-2023-25676" + "CVE-2023-25675" + "CVE-2023-25674" + "CVE-2023-25673" + "CVE-2023-25671" + "CVE-2023-25670" + "CVE-2023-25669" + "CVE-2023-25668" + "CVE-2023-25667" + "CVE-2023-25665" + "CVE-2023-25666" + "CVE-2023-25664" + "CVE-2023-25663" + "CVE-2023-25662" + "CVE-2023-25660" + "CVE-2023-25659" + "CVE-2023-25658" + ]; }; } From 3a864570ba808663ea7d7072d6fe9aea93baeeb3 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Mon, 3 Apr 2023 21:11:54 +0200 Subject: [PATCH 058/136] gotestwaf: 0.3.1 -> 0.4.0 diff: https://github.com/wallarm/gotestwaf/compare/v0.3.1...v0.4.0 --- pkgs/tools/security/gotestwaf/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index 7783cbf4688f..7f16e07299fa 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -5,16 +5,19 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "wallarm"; repo = pname; rev = "v${version}"; - sha256 = "0c627bxx0mlxhc1fsd2k3x1lm5855pl215m88la662d70559z6k8"; + hash = "sha256-waYX7DMyLW0eSzpFRyiCJQdYLFGaAKSlvGYrdcRfCl4="; }; - vendorSha256 = null; + vendorHash = null; + + # Some tests require networking as of v0.4.0 + doCheck = false; postFixup = '' # Rename binary From dd2afe681227be4b98f06cf603b11b310c440bef Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Mon, 3 Apr 2023 21:11:54 +0200 Subject: [PATCH 059/136] gotestwaf: fix version self-reporting Note: Upstream uses `git describe --tags`, so we have to prefix the version string with the letter `v` just like we do in `src.rev` See https://github.com/wallarm/gotestwaf/blob/6905eb273c44e6f5c25d04ed4ae48ec4d89e7a96/Dockerfile#L50 --- pkgs/tools/security/gotestwaf/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index 7f16e07299fa..6ff958aa53d4 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -1,6 +1,8 @@ { lib , buildGoModule , fetchFromGitHub +, gotestwaf +, testers }: buildGoModule rec { @@ -19,11 +21,21 @@ buildGoModule rec { # Some tests require networking as of v0.4.0 doCheck = false; + ldflags = [ + "-X github.com/wallarm/gotestwaf/internal/version.Version=v${version}" + ]; + postFixup = '' # Rename binary mv $out/bin/cmd $out/bin/${pname} ''; + passthru.tests.version = testers.testVersion { + command = "gotestwaf --version"; + package = gotestwaf; + version = "v${version}"; + }; + meta = with lib; { description = "Tool for API and OWASP attack simulation"; homepage = "https://github.com/wallarm/gotestwaf"; From 1b5ba6d5bd22ae637b30013fd016900b8a49e94e Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 1 Apr 2023 18:19:09 +0200 Subject: [PATCH 060/136] emacs.pkgs.jinx: build .so file Co-authored-by: Jian Lin <75130626+jian-lin@users.noreply.github.com> --- .../emacs/elisp-packages/elpa-packages.nix | 25 +++++++++++++++++ .../emacs/elisp-packages/melpa-packages.nix | 27 +++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 1ffdb3365503..d1f9dbd3a4a5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -106,6 +106,31 @@ self: let }; }); + jinx = super.jinx.overrideAttrs (old: { + dontUnpack = false; + + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ + pkgs.pkg-config + ]; + + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant2 ]; + + postBuild = '' + NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE" + $CC -shared -o jinx-mod.so jinx-mod.c -lenchant-2 + ''; + + postInstall = (old.postInstall or "") + "\n" + '' + outd=$out/share/emacs/site-lisp/elpa/jinx-* + install -m444 -t $outd jinx-mod.so + rm $outd/jinx-mod.c $outd/emacs-module.h + ''; + + meta = old.meta // { + maintainers = [ lib.maintainers.DamienCassou ]; + }; + }); + plz = super.plz.overrideAttrs ( old: { dontUnpack = false; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 33d489b60aba..7efe6a68b0f6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -314,6 +314,33 @@ let ivy-rtags = fix-rtags super.ivy-rtags; + jinx = super.jinx.overrideAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ + pkgs.pkg-config + ]; + + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.enchant2 ]; + + postBuild = '' + pushd working/jinx + NIX_CFLAGS_COMPILE="$($PKG_CONFIG --cflags enchant-2) $NIX_CFLAGS_COMPILE" + $CC -shared -o jinx-mod.so jinx-mod.c -lenchant-2 + popd + ''; + + postInstall = (old.postInstall or "") + "\n" + '' + pushd source + outd=$(echo $out/share/emacs/site-lisp/elpa/jinx-*) + install -m444 --target-directory=$outd jinx-mod.so + rm $outd/jinx-mod.c $outd/emacs-module.h + popd + ''; + + meta = old.meta // { + maintainers = [ lib.maintainers.DamienCassou ]; + }; + }); + libgit = super.libgit.overrideAttrs(attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ pkgs.cmake ]; buildInputs = attrs.buildInputs ++ [ pkgs.libgit2 ]; From fcf6c6eb394513fc238490e2aabaebfc8bed28fb Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 3 Apr 2023 20:00:00 +0200 Subject: [PATCH 061/136] freenet: fix build by pinning gradle_7 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1f44d0b9895..c26c6f7e894f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30372,7 +30372,9 @@ with pkgs; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - freenet = callPackage ../applications/networking/p2p/freenet { }; + freenet = callPackage ../applications/networking/p2p/freenet { + gradle = gradle_7; + }; freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix { }; From 130219aa1957033cdaada05f0e6c5531d3ec37c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 23:26:09 +0200 Subject: [PATCH 062/136] python310Packages.iocextract: init at 1.15.1 --- .../python-modules/iocextract/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/iocextract/default.nix diff --git a/pkgs/development/python-modules/iocextract/default.nix b/pkgs/development/python-modules/iocextract/default.nix new file mode 100644 index 000000000000..46ff17b9894b --- /dev/null +++ b/pkgs/development/python-modules/iocextract/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, regex +}: + +buildPythonPackage rec { + pname = "iocextract"; + version = "1.15.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "InQuest"; + repo = "python-iocextract"; + rev = "refs/tags/v${version}"; + hash = "sha256-muto8lr3sP44bLFIoAuPeS8pRv7pNP1JFKaAJV01TZY="; + }; + + propagatedBuildInputs = [ + regex + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "iocextract" + ]; + + pytestFlagsArray = [ + "tests.py" + ]; + + meta = with lib; { + description = "Module to extract Indicator of Compromises (IOC)"; + homepage = "https://github.com/InQuest/python-iocextract"; + changelog = "https://github.com/InQuest/python-iocextract/releases/tag/v${version}"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1f44d0b9895..a3f88d6e2117 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8627,6 +8627,8 @@ with pkgs; ioccheck = callPackage ../tools/security/ioccheck { }; + iocextract = with python3Packages; toPythonApplication iocextract; + ioping = callPackage ../tools/system/ioping { }; ior = callPackage ../tools/system/ior { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 267dc6f25fc6..4c24b1fb8f2f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4800,6 +4800,8 @@ self: super: with self; { iocapture = callPackage ../development/python-modules/iocapture { }; + iocextract = callPackage ../development/python-modules/iocextract { }; + ionhash = callPackage ../development/python-modules/ionhash { }; iotawattpy = callPackage ../development/python-modules/iotawattpy { }; From 069b47722b3b2976e88526420a3735a028d155ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 20:00:11 +0200 Subject: [PATCH 063/136] python310Packages.peaqevcore: 13.4.14 -> 13.4.15 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index eb261ce327a9..f92c44eae783 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "13.4.14"; + version = "13.4.15"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BTRv/vzOo5/Ak8J0wnVMxUbeYmPHAZfsISQ6eMkhHeU="; + hash = "sha256-Cd1fn9oFuoeDh27bbbtOTi4ByxcDmxQlDiDStVokSkM="; }; postPatch = '' From 0d4a1f299be2622d84fdd312b2d7d23d382b6327 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Apr 2023 23:44:05 +0200 Subject: [PATCH 064/136] python310Packages.peaqevcore: 13.4.15 -> 15.0.2 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index f92c44eae783..4e8875ba89bd 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "13.4.15"; + version = "15.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Cd1fn9oFuoeDh27bbbtOTi4ByxcDmxQlDiDStVokSkM="; + hash = "sha256-UH9QlfOzMGxoLgsoVr/+OqI53YGDMXfilW9sIM3EsD8="; }; postPatch = '' From 4249504385852e1e53df9bd4fe0f97dcbbb4e050 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Tue, 4 Apr 2023 00:07:13 +0200 Subject: [PATCH 065/136] lutris: remove wine dependency --- pkgs/applications/misc/lutris/default.nix | 2 -- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 35dbf1fcb440..e70fe0a19c9c 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -44,7 +44,6 @@ , p7zip , xgamma , libstrangle -, wine , fluidsynth , xorgserver , xorg @@ -64,7 +63,6 @@ let p7zip xgamma libstrangle - wine fluidsynth xorgserver xorg.setxkbmap diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1f44d0b9895..087ef1ee1115 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31743,9 +31743,7 @@ with pkgs; luppp = callPackage ../applications/audio/luppp { }; - lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { - wine = wineWowPackages.staging; - }; + lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { }; lutris = callPackage ../applications/misc/lutris/fhsenv.nix { buildFHSUserEnv = buildFHSUserEnvBubblewrap; }; From c8613122a080456ae6a134cdaed2464a7faad309 Mon Sep 17 00:00:00 2001 From: shanemikel <6720672+shanemikel@users.noreply.github.com> Date: Thu, 30 Mar 2023 23:09:54 -0700 Subject: [PATCH 066/136] Remove maintainer from `tools/typesetting/htmldoc` --- pkgs/tools/typesetting/htmldoc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index c3e5c66ba56f..911d3eba87e9 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://michaelrsweet.github.io/htmldoc"; changelog = "https://github.com/michaelrsweet/htmldoc/releases/tag/v${version}"; license = licenses.gpl2Only; - maintainers = with maintainers; [ shanemikel ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; longDescription = '' From ce2fcc00e0abbb8ad85ceb6d7cd897d4782efd7b Mon Sep 17 00:00:00 2001 From: shanemikel <6720672+shanemikel@users.noreply.github.com> Date: Tue, 28 Mar 2023 01:25:57 -0700 Subject: [PATCH 067/136] Remove maintainer from `maintainer-list.nix` --- maintainers/maintainer-list.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 072f8c95194d..effcb8e3c955 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13792,12 +13792,6 @@ github = "ShamrockLee"; githubId = 44064051; }; - shanemikel = { - email = "shanepearlman@pm.me"; - github = "shanemikel"; - githubId = 6720672; - name = "Shane Pearlman"; - }; shanesveller = { email = "shane@sveller.dev"; github = "shanesveller"; From 5c5dc43305f18857eb6b32ab165dc795f359716f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 3 Apr 2023 17:29:46 -0700 Subject: [PATCH 068/136] python310Packages.psycopg: fix build with Cython 3.0.0b1 --- pkgs/development/python-modules/psycopg/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 1b84cc6140c8..7dbc28594eb6 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , fetchurl , pythonOlder , substituteAll @@ -48,6 +49,11 @@ let libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}"; libc = "${stdenv.cc.libc}/lib/libc.so.6"; }) + (fetchpatch { + name = "cython-3.0.0b1-compat.patch"; + url = "https://github.com/psycopg/psycopg/commit/573446a14312f36257ed9dcfb8eb2756b69d5d9b.patch"; + hash = "sha256-NWItarNb/Yyfj1avb/SXTkinVGxvWUGH8y6tR/zhVmE="; + }) ]; baseMeta = { From 230939de785c26295fc038c04e5672b94d0fef24 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 3 Apr 2023 22:19:47 +0000 Subject: [PATCH 069/136] python311Packages.psycopg: Propagate typing-extensions unconditionally Fixes: #224492 --- pkgs/development/python-modules/psycopg/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 1b84cc6140c8..26129e826720 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -148,7 +148,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ psycopg-c - ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo From a182101ae7dd15e8e79f046a2a7579540c88efed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 3 Apr 2023 17:40:03 -0700 Subject: [PATCH 070/136] lisp-modules: don't use mysql-client alias --- pkgs/development/lisp-modules/ql.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index 40b0956d38df..4cc028e9f206 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -56,7 +56,7 @@ let nativeLibs = [ pkgs.glib pkgs.gobject-introspection ]; }); cl-mysql = super.cl-mysql.overrideLispAttrs (o: { - nativeLibs = [ pkgs.mysql-client ]; + nativeLibs = [ pkgs.mysql.client ]; }); clsql-postgresql = super.clsql-postgresql.overrideLispAttrs (o: { nativeLibs = [ pkgs.postgresql.lib ]; @@ -68,7 +68,7 @@ let nativeLibs = [ pkgs.webkitgtk ]; }); dbd-mysql = super.dbd-mysql.overrideLispAttrs (o: { - nativeLibs = [ pkgs.mysql-client ]; + nativeLibs = [ pkgs.mysql.client ]; }); lla = super.lla.overrideLispAttrs (o: { nativeLibs = [ pkgs.openblas ]; From f60d291f64d4e722c582bbe060b6a664a8ab35fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 3 Apr 2023 17:59:11 -0700 Subject: [PATCH 071/136] lisp-modules: don't use mysql alias --- pkgs/development/lisp-modules/ql.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index 4cc028e9f206..a7f6573ad93a 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -56,7 +56,7 @@ let nativeLibs = [ pkgs.glib pkgs.gobject-introspection ]; }); cl-mysql = super.cl-mysql.overrideLispAttrs (o: { - nativeLibs = [ pkgs.mysql.client ]; + nativeLibs = [ pkgs.mariadb.client ]; }); clsql-postgresql = super.clsql-postgresql.overrideLispAttrs (o: { nativeLibs = [ pkgs.postgresql.lib ]; @@ -68,7 +68,7 @@ let nativeLibs = [ pkgs.webkitgtk ]; }); dbd-mysql = super.dbd-mysql.overrideLispAttrs (o: { - nativeLibs = [ pkgs.mysql.client ]; + nativeLibs = [ pkgs.mariadb.client ]; }); lla = super.lla.overrideLispAttrs (o: { nativeLibs = [ pkgs.openblas ]; From c5f2c2c17e844b6053a604ac6130097e224ddb06 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Mon, 3 Apr 2023 20:04:42 +0900 Subject: [PATCH 072/136] k3s_1_23: drop deprecated k3s version This version is no longer supported, as of roughly 1 week ago, according to [k8s upstream docs](https://kubernetes.io/releases/patch-releases/#non-active-branch-history). There's additional discussion about the future of k3s versioning in #222604. This gets the simple uncontroversial change out of the way first to ensure people can't accidentally pick this unsupported version. --- .../cluster/k3s/1_23/chart-versions.nix | 10 - .../networking/cluster/k3s/1_23/default.nix | 331 ------------------ pkgs/top-level/all-packages.nix | 1 - 3 files changed, 342 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/k3s/1_23/chart-versions.nix delete mode 100644 pkgs/applications/networking/cluster/k3s/1_23/default.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_23/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_23/chart-versions.nix deleted file mode 100644 index 8c40604d0f1c..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_23/chart-versions.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-20.3.1+up20.3.0.tgz"; - sha256 = "1775vjldvqvhzdbzanxhbaqbmkih09yb91im651q8bc7z5sb9ckn"; - }; - traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-20.3.1+up20.3.0.tgz"; - sha256 = "1rj0f0n0vgjcbzfwzhqmsd501i2f6vw145w9plbp8gwdyzmg2nc6"; - }; -} diff --git a/pkgs/applications/networking/cluster/k3s/1_23/default.nix b/pkgs/applications/networking/cluster/k3s/1_23/default.nix deleted file mode 100644 index d19ae321ad65..000000000000 --- a/pkgs/applications/networking/cluster/k3s/1_23/default.nix +++ /dev/null @@ -1,331 +0,0 @@ -{ stdenv -, lib -, makeWrapper -, socat -, iptables -, iproute2 -, ipset -, bridge-utils -, btrfs-progs -, conntrack-tools -, buildGoModule -, runc -, rsync -, kmod -, libseccomp -, pkg-config -, ethtool -, util-linux -, fetchFromGitHub -, fetchurl -, fetchzip -, fetchgit -, zstd -, yq-go -, sqlite -, nixosTests -, k3s -, pkgsBuildBuild -}: - -with lib; - -# k3s is a kinda weird derivation. One of the main points of k3s is the -# simplicity of it being one binary that can perform several tasks. -# However, when you have a good package manager (like nix), that doesn't -# actually make much of a difference; you don't really care if it's one binary -# or 10 since with a good package manager, installing and running it is -# identical. -# Since upstream k3s packages itself as one large binary with several -# "personalities" (in the form of subcommands like 'k3s agent' and 'k3s -# kubectl'), it ends up being easiest to mostly mimic upstream packaging, with -# some exceptions. -# K3s also carries patches to some packages (such as containerd and cni -# plugins), so we intentionally use the k3s versions of those binaries for k3s, -# even if the upstream version of those binaries exist in nixpkgs already. In -# the end, that means we have a thick k3s binary that behaves like the upstream -# one for the most part. -# However, k3s also bundles several pieces of unpatched software, from the -# strongswan vpn software, to iptables, to socat, conntrack, busybox, etc. -# Those pieces of software we entirely ignore upstream's handling of, and just -# make sure they're in the path if desired. -let - k3sVersion = "1.23.16+k3s1"; # k3s git tag - k3sCommit = "64b0feeb36c2a26976a364a110f23ebcf971f976"; # k3s git commit at the above version - k3sRepoSha256 = "sha256-H6aaYa5OYAaD5hjSi8+RNXiP1zhRZCgKXQA6eU7AWBk="; - k3sVendorSha256 = "sha256-+xygljXp27NahsHSgoigMANBQCRwGFYwGHQEwlI9YsQ="; - - # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/download#L29-L32 - # see also https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/manifests/traefik.yaml#L8-L16 - # At the time of writing, there are two traefik charts, and that's it - charts = import ./chart-versions.nix; - - # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/version.sh#L54 - k3sRootVersion = "0.12.1"; - k3sRootSha256 = "sha256-xCXbarWztnvW2xn3cGa84hie3OevVZeGEDWh+Uf3RBw="; - - # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/version.sh#L47 - k3sCNIVersion = "1.1.1-k3s1"; - k3sCNISha256 = "sha256-1Br7s+iMtfiPjM0EcNPuFdSlp9dVPjSG1UGuiPUfq5I="; - - # taken from go.mod, the 'github.com/containerd/containerd' line - # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` - # https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/go.mod#L9 - containerdVersion = "1.5.16-k3s2-1-22"; - containerdSha256 = "sha256-PRrp05Jgx368Ox4hTC66lbCInWuex0OtAuCY4l8geqA="; - - # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag - # https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/go.mod#L19 - criCtlVersion = "1.22.0-k3s1"; - - baseMeta = k3s.meta; - - # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40 - versionldflags = [ - "-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}" - "-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}" - "-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}" - "-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}" - "-X k8s.io/client-go/pkg/version.gitTreeState=clean" - "-X k8s.io/client-go/pkg/version.buildDate=1970-01-01T01:01:01Z" - "-X k8s.io/component-base/version.gitVersion=v${k3sVersion}" - "-X k8s.io/component-base/version.gitCommit=${k3sCommit}" - "-X k8s.io/component-base/version.gitTreeState=clean" - "-X k8s.io/component-base/version.buildDate=1970-01-01T01:01:01Z" - "-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=v${criCtlVersion}" - "-X github.com/containerd/containerd/version.Version=v${containerdVersion}" - "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd" - ]; - - # bundled into the k3s binary - traefikChart = fetchurl charts.traefik; - traefik-crdChart = fetchurl charts.traefik-crd; - - # so, k3s is a complicated thing to package - # This derivation attempts to avoid including any random binaries from the - # internet. k3s-root is _mostly_ binaries built to be bundled in k3s (which - # we don't care about doing, we can add those as build or runtime - # dependencies using a real package manager). - # In addition to those binaries, it's also configuration though (right now - # mostly strongswan configuration), and k3s does use those files. - # As such, we download it in order to grab 'etc' and bundle it into the final - # k3s binary. - k3sRoot = fetchzip { - # Note: marked as apache 2.0 license - url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; - sha256 = k3sRootSha256; - stripRoot = false; - }; - k3sCNIPlugins = buildGoModule rec { - pname = "k3s-cni-plugins"; - version = k3sCNIVersion; - vendorSha256 = null; - - subPackages = [ "." ]; - - src = fetchFromGitHub { - owner = "rancher"; - repo = "plugins"; - rev = "v${version}"; - sha256 = k3sCNISha256; - }; - - postInstall = '' - mv $out/bin/plugins $out/bin/cni - ''; - - meta = baseMeta // { - description = "CNI plugins, as patched by rancher for k3s"; - }; - }; - # Grab this separately from a build because it's used by both stages of the - # k3s build. - k3sRepo = fetchgit { - url = "https://github.com/k3s-io/k3s"; - rev = "v${k3sVersion}"; - sha256 = k3sRepoSha256; - }; - # Stage 1 of the k3s build: - # Let's talk about how k3s is structured. - # One of the ideas of k3s is that there's the single "k3s" binary which can - # do everything you need, from running a k3s server, to being a worker node, - # to running kubectl. - # The way that actually works is that k3s is a single go binary that contains - # a bunch of bindata that it unpacks at runtime into directories (either the - # user's home directory or /var/lib/rancher if run as root). - # This bindata includes both binaries and configuration. - # In order to let nixpkgs do all its autostripping/patching/etc, we split this into two derivations. - # First, we build all the binaries that get packed into the thick k3s binary - # (and output them from one derivation so they'll all be suitably patched up). - # Then, we bundle those binaries into our thick k3s binary and use that as - # the final single output. - # This approach was chosen because it ensures the bundled binaries all are - # correctly built to run with nix (we can lean on the existing buildGoModule - # stuff), and we can again lean on that tooling for the final k3s binary too. - # Other alternatives would be to manually run the - # strip/patchelf/remove-references step ourselves in the installPhase of the - # derivation when we've built all the binaries, but haven't bundled them in - # with generated bindata yet. - - k3sServer = buildGoModule rec { - pname = "k3s-server"; - version = k3sVersion; - - src = k3sRepo; - vendorSha256 = k3sVendorSha256; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libseccomp sqlite.dev ]; - - subPackages = [ "cmd/server" ]; - ldflags = versionldflags; - - tags = [ "libsqlite3" "linux" ]; - - # create the multicall symlinks for k3s - postInstall = '' - mv $out/bin/server $out/bin/k3s - pushd $out - # taken verbatim from https://github.com/k3s-io/k3s/blob/v1.23.16%2Bk3s1/scripts/build#L123-L131 - ln -s k3s ./bin/k3s-agent - ln -s k3s ./bin/k3s-server - ln -s k3s ./bin/k3s-etcd-snapshot - ln -s k3s ./bin/k3s-secrets-encrypt - ln -s k3s ./bin/k3s-certificate - ln -s k3s ./bin/k3s-completion - ln -s k3s ./bin/kubectl - ln -s k3s ./bin/crictl - ln -s k3s ./bin/ctr - popd - ''; - - meta = baseMeta // { - description = "The various binaries that get packaged into the final k3s binary"; - }; - }; - k3sContainerd = buildGoModule { - pname = "k3s-containerd"; - version = containerdVersion; - src = fetchFromGitHub { - owner = "k3s-io"; - repo = "containerd"; - rev = "v${containerdVersion}"; - sha256 = containerdSha256; - }; - vendorSha256 = null; - buildInputs = [ btrfs-progs ]; - subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; - ldflags = versionldflags; - }; -in -buildGoModule rec { - pname = "k3s"; - version = k3sVersion; - - src = k3sRepo; - vendorSha256 = k3sVendorSha256; - - postPatch = '' - # Nix prefers dynamically linked binaries over static binary. - - substituteInPlace scripts/package-cli \ - --replace '"$LDFLAGS $STATIC" -o' \ - '"$LDFLAGS" -o' \ - --replace "STATIC=\"-extldflags \'-static\'\"" \ - "" - - # Upstream codegen fails with trimpath set. Removes "trimpath" for 'go generate': - - substituteInPlace scripts/package-cli \ - --replace '"''${GO}" generate' \ - 'GOFLAGS="" \ - GOOS="${pkgsBuildBuild.go.GOOS}" \ - GOARCH="${pkgsBuildBuild.go.GOARCH}" \ - CC="${pkgsBuildBuild.stdenv.cc}/bin/cc" \ - "''${GO}" generate' - ''; - - # Important utilities used by the kubelet, see - # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 - # Note the list in that issue is stale and some aren't relevant for k3s. - k3sRuntimeDeps = [ - kmod - socat - iptables - iproute2 - ipset - bridge-utils - ethtool - util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388 - conntrack-tools - ]; - - buildInputs = k3sRuntimeDeps; - - nativeBuildInputs = [ - makeWrapper - rsync - yq-go - zstd - ]; - - # embedded in the final k3s cli - propagatedBuildInputs = [ - k3sCNIPlugins - k3sContainerd - k3sServer - runc - ]; - - # We override most of buildPhase due to peculiarities in k3s's build. - # Specifically, it has a 'go generate' which runs part of the package. See - # this comment: - # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 - # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. - buildPhase = '' - patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload - - # copy needed 'go generate' inputs into place - mkdir -p ./bin/aux - rsync -a --no-perms ${k3sServer}/bin/ ./bin/ - ln -vsf ${runc}/bin/runc ./bin/runc - ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni - ln -vsf ${k3sContainerd}/bin/* ./bin/ - rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/ - mkdir -p ./build/static/charts - - cp ${traefikChart} ./build/static/charts - cp ${traefik-crdChart} ./build/static/charts - - export ARCH=$GOARCH - export DRONE_TAG="v${k3sVersion}" - export DRONE_COMMIT="${k3sCommit}" - # use ./scripts/package-cli to run 'go generate' + 'go build' - - ./scripts/package-cli - mkdir -p $out/bin - ''; - - # Otherwise it depends on 'getGoDirs', which is normally set in buildPhase - doCheck = false; - - installPhase = '' - # wildcard to match the arm64 build too - install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s - wrapProgram $out/bin/k3s \ - --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ - --prefix PATH : "$out/bin" - ''; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null - ''; - - # Fix-Me: Needs to be adapted specifically for 1.23 - # passthru.updateScript = ./update.sh; - - passthru.tests = k3s.passthru.mkTests k3sVersion; - - meta = baseMeta; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7c62d3ee5c0..b560ca9dfe37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31281,7 +31281,6 @@ with pkgs; jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; - k3s_1_23 = callPackage ../applications/networking/cluster/k3s/1_23 { }; k3s_1_24 = callPackage ../applications/networking/cluster/k3s/1_24 { }; k3s_1_25 = callPackage ../applications/networking/cluster/k3s/1_25 { }; k3s_1_26 = callPackage ../applications/networking/cluster/k3s/1_26 { }; From 82aeb5ec4094859b7c29f099dd12d8373983d45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 29 Mar 2023 16:21:17 -0700 Subject: [PATCH 073/136] abcmidi: 2023.03.15 -> 2023.03.24 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index fd153b8f768d..d4bc6f9ec957 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2023.03.15"; + version = "2023.03.24"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-hLKaPfMZ5nmKRREvto2qd07mj88wEWADfFHNC+FZjIE="; + hash = "sha256-IL26aGB4j3IHw+T5YuDQE0bzCd0DtfwiuwNyGk+lcqo="; }; meta = with lib; { From dcf9f37aef4143eb2b89c561150b4117598ff0a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 28 Mar 2023 11:54:55 -0700 Subject: [PATCH 074/136] celeste: 0.4.6 -> 0.5.2 Diff: https://github.com/hwittenborn/celeste/compare/v0.4.6...v0.5.2 Changelog: https://github.com/hwittenborn/celeste/blob/v0.5.2/CHANGELOG.md --- pkgs/applications/networking/sync/celeste/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/celeste/default.nix b/pkgs/applications/networking/sync/celeste/default.nix index 701172cbd28b..0e0b36263831 100644 --- a/pkgs/applications/networking/sync/celeste/default.nix +++ b/pkgs/applications/networking/sync/celeste/default.nix @@ -29,16 +29,16 @@ let }; in rustPlatform.buildRustPackage rec { pname = "celeste"; - version = "0.4.6"; + version = "0.5.2"; src = fetchFromGitHub { owner = "hwittenborn"; repo = "celeste"; rev = "v${version}"; - hash = "sha256-VEyQlycpqsGKqtV/QvqBfVHqQhl/H6HsWPRDBtQO3qM="; + hash = "sha256-pFtyfKGPlwum/twGXi/e82BjINy6/MMvvmVfrwWHTQg="; }; - cargoHash = "sha256-fqt0XklJJAXi2jO7eo0tIwRo2Y3oM56qYwoaelKY8iU="; + cargoHash = "sha256-wcgu4KApkn68Tpk3PQ9Tkxif++/8CmS4f8AOOpCA/X8="; patches = [ (substituteAll { From 98d2146331f49640ebb3e852e78cca0aa023e020 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 3 Apr 2023 15:10:30 +0800 Subject: [PATCH 075/136] beancount-language-server: 1.3.0 -> 1.3.1 --- .../language-servers/beancount-language-server/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/language-servers/beancount-language-server/default.nix b/pkgs/development/tools/language-servers/beancount-language-server/default.nix index dfe591389ef9..9eb1d746c216 100644 --- a/pkgs/development/tools/language-servers/beancount-language-server/default.nix +++ b/pkgs/development/tools/language-servers/beancount-language-server/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "beancount-language-server"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "polarmutex"; repo = "beancount-language-server"; rev = "v${version}"; - sha256 = "sha256-X3Mun5ZooipUkkcgEOC7ou0d1upABjmMs9MegPBXPyQ="; + hash = "sha256-9IkbEOG6xcmpowsLj/RHnMFGQxh02JMQsTVli4hvs/M="; }; - cargoHash = "sha256-OI/MGcFOJHEZJfqCz/+CxHB3VSn6joS7L7FqRYrS4us="; + cargoHash = "sha256-qhN2//hhCaKpm0HAiUL/CfdrtvAXgR34vXBECB8UDxE="; doInstallCheck = true; postInstallCheck = '' @@ -28,4 +28,3 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ polarmutex ]; }; } - From cebe5de8aff7c8de800a8c8636b339e11ba695bc Mon Sep 17 00:00:00 2001 From: ran xiao Date: Mon, 3 Apr 2023 21:17:57 +1000 Subject: [PATCH 076/136] python3.pkgs.pyarrow: fix build --- pkgs/development/python-modules/pyarrow/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index a330a9392876..399931db4b00 100644 --- a/pkgs/development/python-modules/pyarrow/default.nix +++ b/pkgs/development/python-modules/pyarrow/default.nix @@ -17,6 +17,7 @@ , pytest-lazy-fixture , pkg-config , scipy +, fetchpatch , setuptools-scm }: @@ -84,6 +85,15 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; + # fix on current master + patches = [ + (fetchpatch { + url = "https://github.com/apache/arrow/commit/bce43175aa8cfb4534d3efbcc092f697f25f0f5a.patch"; + hash = "sha256-naOAQjQgSKIoCAGCKr7N4dCkOMtweAdfggGOQKDY3k0="; + stripLen = 1; + }) + ]; + preBuild = '' export PYARROW_PARALLEL=$NIX_BUILD_CORES ''; From baee1005c9d5cf320d52be41e9ad905b2de7397b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 20 Mar 2023 10:23:06 +0800 Subject: [PATCH 077/136] tdesktop: 4.6.5 -> 4.7.1 Diff: https://github.com/telegramdesktop/tdesktop/compare/v4.6.5...v4.7.1 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v4.7.1 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- .../instant-messengers/telegram/tdesktop/tg_owt.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 648af9a92dec..835e2197e181 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.6.5"; + version = "4.7.1"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0c65ry82ffmh1qzc2lnsyjs78r9jllv62p9vglpz0ikg86zf36sk"; + sha256 = "1qv8029xzp2j1j58b1lkw3q53cwaaazvp2la80mfbjv348c29iyk"; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 713069ff95a3..6e57a81dc296 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2023-01-05"; + version = "unstable-2023-03-14"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "5098730b9eb6173f0b52068fe2555b7c1015123a"; - sha256 = "0dnh0l9qb9q43cvm4wfgmgqp48grqqz9fb7f48nvys1b6pzhh3pk"; + rev = "1a18da2ed4d5ce134e984d1586b915738e0da257"; + sha256 = "18srnl688ng8grfpmgcjpdyr4cw87yjdvyw94b2jjq5jmnq9n3a3"; fetchSubmodules = true; }; From b6641c2209354eb38d1f52c74cf89296cd0553a0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 4 Apr 2023 09:55:34 +0800 Subject: [PATCH 078/136] tdesktop: override glibmm_2_68 to version 2.76.0 --- .../instant-messengers/telegram/tdesktop/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 835e2197e181..6b47401c5580 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub , fetchpatch +, fetchurl , callPackage , pkg-config , cmake @@ -70,6 +71,13 @@ let cxxStandard = "20"; }; }; + glibmm = glibmm_2_68.overrideAttrs (_: { + version = "2.76.0"; + src = fetchurl { + url = "mirror://gnome/sources/glibmm/2.76/glibmm-2.76.0.tar.xz"; + sha256 = "sha256-hjfYDOq9lP3dbkiXCggqJkVY1KuCaE4V/8h+fvNGKrI="; + }; + }); in stdenv.mkDerivation rec { pname = "telegram-desktop"; @@ -140,7 +148,7 @@ stdenv.mkDerivation rec { range-v3 tl-expected hunspell - glibmm_2_68 + glibmm webkitgtk_4_1 jemalloc rnnoise From b9e9319236b0744d6b4ebe919caac8015db16657 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 4 Apr 2023 04:20:00 +0000 Subject: [PATCH 079/136] git-gone: 0.4.3 -> 0.5.0 https://github.com/swsnr/git-gone/releases/tag/v0.5.0 --- .../version-management/git-gone/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix index fd93c337eac0..fb97bf9467cf 100644 --- a/pkgs/applications/version-management/git-gone/default.nix +++ b/pkgs/applications/version-management/git-gone/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { - owner = "lunaryorn"; + owner = "swsnr"; repo = "git-gone"; rev = "v${version}"; - sha256 = "sha256-pHtFLJGZYlxvQxqG/LWoWeQDxa8i3ws0olAtuoyHXTM="; + hash = "sha256-bb7xeLxo/qk2yKctaX1JXzru1+tGTt8DmDVH6ZaARkU="; }; - cargoSha256 = "sha256-BfUR/9WBgyUlKZ80qtqX6+AK7hRBCCsEG/IWjbcDU3c="; + cargoHash = "sha256-tngsqAnQ2Um0UCSqBvrnpbDygF6CvL2fi0o9MVY0f4g="; nativeBuildInputs = [ installShellFiles ]; @@ -29,8 +29,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cleanup stale Git branches of merge requests"; - homepage = "https://github.com/lunaryorn/git-gone"; - changelog = "https://github.com/lunaryorn/git-gone/raw/v${version}/CHANGELOG.md"; + homepage = "https://github.com/swsnr/git-gone"; + changelog = "https://github.com/swsnr/git-gone/raw/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; From 34adc9e4e30210200c322bae2965faa5c35a86de Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 4 Apr 2023 04:20:00 +0000 Subject: [PATCH 080/136] millet: 0.8.6 -> 0.8.7 --- .../tools/language-servers/millet/Cargo.lock | 103 +++++++++--------- .../tools/language-servers/millet/default.nix | 6 +- 2 files changed, 53 insertions(+), 56 deletions(-) diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index 3a911a5d7605..ff5974a8065b 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -16,7 +16,7 @@ name = "analysis" version = "0.1.0" dependencies = [ "config", - "diagnostic-util", + "diagnostic", "elapsed", "fmt-util", "input", @@ -67,7 +67,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "char-name" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "cm-syntax" @@ -83,7 +83,7 @@ dependencies = [ [[package]] name = "code-h2-md-map" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "fast-hash", ] @@ -134,12 +134,9 @@ dependencies = [ ] [[package]] -name = "diagnostic-util" +name = "diagnostic" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" -dependencies = [ - "text-pos", -] +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "diff" @@ -156,7 +153,7 @@ checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" [[package]] name = "elapsed" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "log", ] @@ -176,13 +173,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys", ] [[package]] @@ -198,7 +195,7 @@ dependencies = [ [[package]] name = "event-parse" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "drop_bomb", "rowan", @@ -208,7 +205,7 @@ dependencies = [ [[package]] name = "fast-hash" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "rustc-hash", ] @@ -216,7 +213,7 @@ dependencies = [ [[package]] name = "fmt-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "form_urlencoded" @@ -263,7 +260,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "identifier-case" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "idna" @@ -278,7 +275,7 @@ dependencies = [ [[package]] name = "idx" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "indexmap" @@ -296,7 +293,7 @@ version = "0.1.0" dependencies = [ "cm-syntax", "config", - "diagnostic-util", + "diagnostic", "fast-hash", "mlb-hir", "mlb-syntax", @@ -327,9 +324,9 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e" +checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" dependencies = [ "hermit-abi", "io-lifetimes", @@ -357,7 +354,7 @@ dependencies = [ "anyhow", "config", "crossbeam-channel", - "diagnostic-util", + "diagnostic", "elapsed", "fast-hash", "input", @@ -383,9 +380,9 @@ checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "log" @@ -442,7 +439,7 @@ version = "0.1.0" dependencies = [ "analysis", "config", - "diagnostic-util", + "diagnostic", "env_logger", "input", "paths", @@ -475,7 +472,7 @@ name = "mlb-statics" version = "0.1.0" dependencies = [ "config", - "diagnostic-util", + "diagnostic", "fast-hash", "mlb-hir", "once_cell", @@ -554,7 +551,7 @@ dependencies = [ [[package]] name = "paths" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "fast-hash", "glob", @@ -565,7 +562,7 @@ dependencies = [ [[package]] name = "pattern-match" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "fast-hash", ] @@ -596,9 +593,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.54" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -661,9 +658,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.36.11" +version = "0.37.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" +checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" dependencies = [ "bitflags", "errno", @@ -681,29 +678,29 @@ checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "serde" -version = "1.0.158" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.158" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn 2.0.10", + "syn 2.0.13", ] [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ "itoa", "ryu", @@ -718,7 +715,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.10", + "syn 2.0.13", ] [[package]] @@ -782,7 +779,7 @@ dependencies = [ name = "sml-lex" version = "0.1.0" dependencies = [ - "diagnostic-util", + "diagnostic", "lex-util", "sml-syntax", ] @@ -797,7 +794,7 @@ name = "sml-lower" version = "0.1.0" dependencies = [ "config", - "diagnostic-util", + "diagnostic", "fast-hash", "lex-util", "num-traits", @@ -824,7 +821,7 @@ version = "0.1.0" name = "sml-parse" version = "0.1.0" dependencies = [ - "diagnostic-util", + "diagnostic", "event-parse", "fast-hash", "sml-fixity", @@ -845,7 +842,7 @@ version = "0.1.0" dependencies = [ "code-h2-md-map", "config", - "diagnostic-util", + "diagnostic", "drop_bomb", "elapsed", "fast-hash", @@ -904,7 +901,7 @@ dependencies = [ [[package]] name = "str-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "smol_str", ] @@ -922,9 +919,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.10" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" dependencies = [ "proc-macro2", "quote", @@ -934,7 +931,7 @@ dependencies = [ [[package]] name = "syntax-gen" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "fast-hash", "identifier-case", @@ -959,7 +956,7 @@ dependencies = [ "analysis", "cm-syntax", "config", - "diagnostic-util", + "diagnostic", "env_logger", "fast-hash", "input", @@ -980,7 +977,7 @@ dependencies = [ [[package]] name = "text-pos" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "fast-hash", "text-size-util", @@ -995,7 +992,7 @@ checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a" [[package]] name = "text-size-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" dependencies = [ "text-size", ] @@ -1018,7 +1015,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "token" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "toml" @@ -1057,7 +1054,7 @@ dependencies = [ [[package]] name = "topo-sort" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "ungrammar" @@ -1104,7 +1101,7 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "uniq" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#9f18d44407b438d5de8f1540963d532cfd8b5587" +source = "git+https://github.com/azdavis/language-util.git#14721e8e4c56b2eaffb259a8845653b898bf4caa" [[package]] name = "url" diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 9ba339270181..e1a9dfe2b279 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-TWxhppR3G1u3YkyeIHKBWprqOn22YhRIORkAVaFR/RY="; + hash = "sha256-kHw7hyOH/GAFRh0TErFMXU3NBge2AwpJr8oXbtnWCfc="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "char-name-0.1.0" = "sha256-4DX/o1CjZ08mDXXPy87GNXiikP9L9nyhR7qYzCPVtAY="; + "char-name-0.1.0" = "sha256-8biNETzXhR3GE5Ywrbcd4199h3ipwwZbtpZOQGOYA1g="; "rowan-0.15.10" = "sha256-yOaUq2tQEiNgQB7qB8fFzfnwUWagu72MIPHmaTX0B0Y="; "sml-libs-0.1.0" = "sha256-6jbRMqlW5sL0x0i4qatduXvLHhrkUE7gsSwC6JYwiHQ="; }; From adcbb9f514e42f37bdb30f865616d247152d8d84 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 4 Apr 2023 04:20:00 +0000 Subject: [PATCH 081/136] blesh: 2022-07-29 -> 0.3.4 https://github.com/akinomyoga/ble.sh/releases/tag/v0.3.4 --- pkgs/shells/bash/blesh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/bash/blesh/default.nix b/pkgs/shells/bash/blesh/default.nix index caadb94f4f1f..c7789a8b0737 100644 --- a/pkgs/shells/bash/blesh/default.nix +++ b/pkgs/shells/bash/blesh/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "blesh"; - version = "unstable-2022-07-29"; + version = "0.3.4"; src = fetchzip { - url = "https://github.com/akinomyoga/ble.sh/releases/download/nightly/ble-nightly-20220729+a22e145.tar.xz"; - sha256 = "088jv02y40pjcfzgrbx8n6aksznfh6zl0j5siwfw3pmwn3i16njw"; + url = "https://github.com/akinomyoga/ble.sh/releases/download/v${version}/ble-${version}.tar.xz"; + sha256 = "sha256-MGCQirZvqGfjTTsbDfihY2il/u2suWBaZ6dX8mF1zLk="; }; dontBuild = true; From 2593f5e033501ad7cb07ebab43bb33b4801959be Mon Sep 17 00:00:00 2001 From: Ruixi-rebirth Date: Tue, 4 Apr 2023 12:26:37 +0800 Subject: [PATCH 082/136] chatgpt-cli: 0.6.0-beta -> 1.0.2 --- pkgs/tools/misc/chatgpt-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chatgpt-cli/default.nix b/pkgs/tools/misc/chatgpt-cli/default.nix index 0818e860b5ce..fcfea81e7f2d 100644 --- a/pkgs/tools/misc/chatgpt-cli/default.nix +++ b/pkgs/tools/misc/chatgpt-cli/default.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "chatgpt"; - version = "0.6.0-beta"; + version = "1.0.2"; src = fetchFromGitHub { owner = "j178"; repo = pname; rev = "v${version}"; - hash = "sha256-qIa0eU3aFyDC5cm/J/BmZfcJe1DARqAtmpUMqlaqsF4="; + hash = "sha256-7PQ390KX/+Yu730pluO+jL1NNZ1yB1CO+YTj41/OByo="; }; - vendorHash = "sha256-JlBAPHtMm5mq91aOtsNMDu48net9i3W/AxCiKalYkm4="; + vendorHash = "sha256-MSqCFcBY6z16neinGsxH+YFA7R2p+4kwolgqGxjQVq4="; subPackages = [ "." ]; From 2cc4e028292753cba509edf1f3841ce2096928a9 Mon Sep 17 00:00:00 2001 From: ocfox Date: Tue, 4 Apr 2023 12:32:52 +0800 Subject: [PATCH 083/136] python3Packages.cyclonedx-python-lib: 3.1.5 -> 4.0.0 --- .../python-modules/cyclonedx-python-lib/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index c2340dbced0e..e8ba85c3a98a 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -6,9 +6,10 @@ , jsonschema , lxml , packageurl-python +, py-serializable +, pythonRelaxDepsHook , poetry-core , pytestCheckHook -, python , pythonOlder , requirements-parser , sortedcontainers @@ -21,7 +22,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "3.1.5"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -30,11 +31,12 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4lA8OdmvQD94jTeDf+Iz7ZyEQ9fZzCxnXQG9Ir8FKhk="; + hash = "sha256-xXtUEunPYiuVh+1o4xoFutGstZ918ju5xK5zLvgbLHc="; }; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -44,6 +46,7 @@ buildPythonPackage rec { setuptools sortedcontainers toml + py-serializable types-setuptools types-toml ]; @@ -60,6 +63,10 @@ buildPythonPackage rec { "cyclonedx" ]; + pythonRelaxDeps = [ + "py-serializable" + ]; + preCheck = '' export PYTHONPATH=tests''${PYTHONPATH+:$PYTHONPATH} ''; From bde478a52f239ae334fb8e99b694e0555ec00f2b Mon Sep 17 00:00:00 2001 From: devins2518 Date: Tue, 4 Apr 2023 00:51:54 -0400 Subject: [PATCH 084/136] discord: remove maintainer (#224577) --- .../networking/instant-messengers/discord/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index b7becb715bc8..dc03e8120ce7 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -49,7 +49,7 @@ let downloadPage = "https://discordapp.com/download"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ MP2E devins2518 artturin infinidoge ]; + maintainers = with maintainers; [ MP2E artturin infinidoge ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; package = From 9ddfa473f5fc3e2dc24dfdb141bb333a30c932c6 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 4 Apr 2023 04:52:36 +0000 Subject: [PATCH 085/136] proteus: init at 1.2 (#224221) --- pkgs/applications/audio/proteus/default.nix | 52 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/applications/audio/proteus/default.nix diff --git a/pkgs/applications/audio/proteus/default.nix b/pkgs/applications/audio/proteus/default.nix new file mode 100644 index 000000000000..1b2da324bdab --- /dev/null +++ b/pkgs/applications/audio/proteus/default.nix @@ -0,0 +1,52 @@ +{ lib, stdenv, fetchFromGitHub, autoPatchelfHook, cmake, pkg-config +, alsa-lib, freetype, libjack2 +, libX11, libXext, libXcursor, libXinerama, libXrandr, libXrender +}: + +stdenv.mkDerivation rec { + pname = "proteus"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "GuitarML"; + repo = "Proteus"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-WhJh+Sx64JYxQQ1LXpDUwXeodFU1EZ0TmMhn+6w0hQg="; + }; + + nativeBuildInputs = [ autoPatchelfHook cmake pkg-config ]; + buildInputs = [ + alsa-lib freetype libjack2 + libX11 libXext libXcursor libXinerama libXrandr libXrender + ]; + # JUCE loads most dependencies at runtime: + runtimeDependencies = map lib.getLib buildInputs; + + env.NIX_CFLAGS_COMPILE = toString [ + # Support JACK output in the standalone application: + "-DJUCE_JACK" + # Accomodate -flto: + "-ffat-lto-objects" + ]; + + # The default "make install" only installs JUCE, which should not be installed, and does not install proteus. + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp -rT Proteus_artefacts/*/Standalone $out/bin + cp -rT Proteus_artefacts/*/LV2 $out/lib/lv2 + cp -rT Proteus_artefacts/*/VST3 $out/lib/vst3 + + runHook postInstall + ''; + + meta = with lib; { + description = "Guitar amp and pedal capture plugin using neural networks"; + homepage = "https://github.com/GuitarML/Proteus"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f86365b45c6..52ac6cff2b42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33048,6 +33048,8 @@ with pkgs; properties-cpp = callPackage ../development/libraries/properties-cpp { }; + proteus = callPackage ../applications/audio/proteus { }; + protonmail-bridge = callPackage ../applications/networking/protonmail-bridge { buildGoModule = buildGo119Module; # go 1.20 build failure }; From 1e02fa2d81fa6d7c4384bc0672a7648ce2f1050b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 4 Apr 2023 07:23:50 +0200 Subject: [PATCH 086/136] =?UTF-8?q?ocamlPackages.jsonm:=201.0.1=20?= =?UTF-8?q?=E2=86=92=201.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/jsonm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index f90a252264ff..a6e136eddfc4 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-jsonm"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "https://erratique.ch/software/jsonm/releases/jsonm-${version}.tbz"; - sha256 = "1176dcmxb11fnw49b7yysvkjh0kpzx4s48lmdn5psq9vshp5c29w"; + hash = "sha256-6ikjn+tAUyAd8+Hm0nws4SOIKsRljhyL6plYvhGKe9Y="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; From d9c613d746e0b88ec9afc558368dd5422aff8448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 3 Apr 2023 17:05:21 +0200 Subject: [PATCH 087/136] mediawiki: add support for postgresql --- nixos/modules/services/web-apps/mediawiki.nix | 56 ++++++++++---- nixos/tests/mediawiki.nix | 73 +++++++++++++------ 2 files changed, 92 insertions(+), 37 deletions(-) diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index 07f296748629..357c2d4a1283 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -46,6 +46,15 @@ let done ''; + dbAddr = if cfg.database.socket == null then + "${cfg.database.host}:${toString cfg.database.port}" + else if cfg.database.type == "mysql" then + "${cfg.database.host}:${cfg.database.socket}" + else if cfg.database.type == "postgres" then + "${cfg.database.socket}" + else + throw "Unsupported database type: ${cfg.database.type} for socket: ${cfg.database.socket}"; + mediawikiConfig = pkgs.writeText "LocalSettings.php" '' cfg.database.type == "mysql"; - message = "services.mediawiki.createLocally is currently only supported for database type 'mysql'"; + { assertion = cfg.database.createLocally -> (cfg.database.type == "mysql" || cfg.database.type == "postgres"); + message = "services.mediawiki.createLocally is currently only supported for database type 'mysql' and 'postgres'"; } { assertion = cfg.database.createLocally -> cfg.database.user == user; message = "services.mediawiki.database.user must be set to ${user} if services.mediawiki.database.createLocally is set true"; @@ -374,15 +390,23 @@ in Vector = "${cfg.package}/share/mediawiki/skins/Vector"; }; - services.mysql = mkIf cfg.database.createLocally { + services.mysql = mkIf (cfg.database.type == "mysql" && cfg.database.createLocally) { enable = true; package = mkDefault pkgs.mariadb; ensureDatabases = [ cfg.database.name ]; - ensureUsers = [ - { name = cfg.database.user; - ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; - } - ]; + ensureUsers = [{ + name = cfg.database.user; + ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; + }]; + }; + + services.postgresql = mkIf (cfg.database.type == "postgres" && cfg.database.createLocally) { + enable = true; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [{ + name = cfg.database.user; + ensurePermissions = { "DATABASE \"${cfg.database.name}\"" = "ALL PRIVILEGES"; }; + }]; }; services.phpfpm.pools.mediawiki = { @@ -431,7 +455,8 @@ in systemd.services.mediawiki-init = { wantedBy = [ "multi-user.target" ]; before = [ "phpfpm-mediawiki.service" ]; - after = optional cfg.database.createLocally "mysql.service"; + after = optional (cfg.database.type == "mysql" && cfg.database.createLocally) "mysql.service" + ++ optional (cfg.database.type == "postgres" && cfg.database.createLocally) "postgresql.service"; script = '' if ! test -e "${stateDir}/secret.key"; then tr -dc A-Za-z0-9 /dev/null | head -c 64 > ${stateDir}/secret.key @@ -442,7 +467,7 @@ in ${pkgs.php}/bin/php ${pkg}/share/mediawiki/maintenance/install.php \ --confpath /tmp \ --scriptpath / \ - --dbserver ${cfg.database.host}${optionalString (cfg.database.socket != null) ":${cfg.database.socket}"} \ + --dbserver "${dbAddr}" \ --dbport ${toString cfg.database.port} \ --dbname ${cfg.database.name} \ ${optionalString (cfg.database.tablePrefix != null) "--dbprefix ${cfg.database.tablePrefix}"} \ @@ -464,7 +489,8 @@ in }; }; - systemd.services.httpd.after = optional (cfg.database.createLocally && cfg.database.type == "mysql") "mysql.service"; + systemd.services.httpd.after = optional (cfg.database.createLocally && cfg.database.type == "mysql") "mysql.service" + ++ optional (cfg.database.createLocally && cfg.database.type == "postgres") "postgresql.service"; users.users.${user} = { group = group; diff --git a/nixos/tests/mediawiki.nix b/nixos/tests/mediawiki.nix index 7f31d6aadfa2..1ae82d65b3cb 100644 --- a/nixos/tests/mediawiki.nix +++ b/nixos/tests/mediawiki.nix @@ -1,28 +1,57 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: { - name = "mediawiki"; - meta.maintainers = [ lib.maintainers.aanderse ]; +{ + system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; }, +}: - nodes.machine = - { ... }: - { services.mediawiki.enable = true; - services.mediawiki.virtualHost.hostName = "localhost"; - services.mediawiki.virtualHost.adminAddr = "root@example.com"; - services.mediawiki.passwordFile = pkgs.writeText "password" "correcthorsebatterystaple"; - services.mediawiki.extensions = { - Matomo = pkgs.fetchzip { - url = "https://github.com/DaSchTour/matomo-mediawiki-extension/archive/v4.0.1.tar.gz"; - sha256 = "0g5rd3zp0avwlmqagc59cg9bbkn3r7wx7p6yr80s644mj6dlvs1b"; - }; - ParserFunctions = null; +let + shared = { + services.mediawiki.enable = true; + services.mediawiki.virtualHost.hostName = "localhost"; + services.mediawiki.virtualHost.adminAddr = "root@example.com"; + services.mediawiki.passwordFile = pkgs.writeText "password" "correcthorsebatterystaple"; + services.mediawiki.extensions = { + Matomo = pkgs.fetchzip { + url = "https://github.com/DaSchTour/matomo-mediawiki-extension/archive/v4.0.1.tar.gz"; + sha256 = "0g5rd3zp0avwlmqagc59cg9bbkn3r7wx7p6yr80s644mj6dlvs1b"; }; + ParserFunctions = null; }; + }; - testScript = '' - start_all() + testLib = import ../lib/testing-python.nix { + inherit system pkgs; + extraConfigurations = [ shared ]; + }; +in +{ + mysql = testLib.makeTest { + name = "mediawiki-mysql"; + nodes.machine = { + services.mediawiki.database.type = "mysql"; + }; + testScript = '' + start_all() - machine.wait_for_unit("phpfpm-mediawiki.service") + machine.wait_for_unit("phpfpm-mediawiki.service") - page = machine.succeed("curl -fL http://localhost/") - assert "MediaWiki has been installed" in page - ''; -}) + page = machine.succeed("curl -fL http://localhost/") + assert "MediaWiki has been installed" in page + ''; + }; + + postgresql = testLib.makeTest { + name = "mediawiki-postgres"; + nodes.machine = { + services.mediawiki.database.type = "postgres"; + }; + testScript = '' + start_all() + + machine.wait_for_unit("phpfpm-mediawiki.service") + + page = machine.succeed("curl -fL http://localhost/") + assert "MediaWiki has been installed" in page + ''; + }; +} From 955503e407f074daf23ecf605b4c0544242d3771 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 4 Apr 2023 10:06:15 +1000 Subject: [PATCH 088/136] vimv-rs: 1.7.7 -> 1.8.0 --- pkgs/tools/misc/vimv-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vimv-rs/default.nix b/pkgs/tools/misc/vimv-rs/default.nix index 2a0b51b03fbc..dd19b2e89c2f 100644 --- a/pkgs/tools/misc/vimv-rs/default.nix +++ b/pkgs/tools/misc/vimv-rs/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "vimv-rs"; - version = "1.7.7"; + version = "1.8.0"; src = fetchCrate { inherit version; crateName = "vimv"; - sha256 = "sha256-Y8xFoI/1zpaeT9jMuOME/g2vTLenhNSwGepncc1Ji+0="; + hash = "sha256-HEWhWPLFIEo+sOz0pbvhoFRNhYh/x0ohqDs48sHgHHk="; }; - cargoHash = "sha256-yJHOeIjbWQTxLkkVv+YALrAhP5HBZpmbPDiLd+/bWZA="; + cargoHash = "sha256-ghO8HrHk5rjUiNbutWnrQLAd8vtVKV6pK12XZuSudSs="; buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; From 33c156c32e08b2e772008cb29b394f277563e9a7 Mon Sep 17 00:00:00 2001 From: Vinny Meller Date: Tue, 4 Apr 2023 01:58:08 -0500 Subject: [PATCH 089/136] vimPlugins.blamer-nvim: init at 2021-11-17 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7945186b40de..b7d7bf3ea89f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -941,6 +941,18 @@ final: prev: meta.homepage = "https://github.com/sblumentritt/bitbake.vim/"; }; + blamer-nvim = buildVimPluginFrom2Nix { + pname = "blamer.nvim"; + version = "2021-11-17"; + src = fetchFromGitHub { + owner = "APZelos"; + repo = "blamer.nvim"; + rev = "f4eb22a9013642c411725fdda945ae45f8d93181"; + sha256 = "1czjagkfjw57f2nvjjgbma1gcy1ylcd68dyfc5ivr2wc6fdw5lks"; + }; + meta.homepage = "https://github.com/APZelos/blamer.nvim/"; + }; + blueballs-neovim = buildVimPluginFrom2Nix { pname = "blueballs-neovim"; version = "2021-11-28"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index e821e4007292..28d61f02be20 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -77,6 +77,7 @@ https://github.com/vim-scripts/bats.vim/,, https://github.com/rbgrouleff/bclose.vim/,, https://github.com/max397574/better-escape.nvim/,, https://github.com/sblumentritt/bitbake.vim/,, +https://github.com/APZelos/blamer.nvim/,HEAD, https://github.com/blueballs-theme/blueballs-neovim/,, https://github.com/nat-418/boole.nvim/,HEAD, https://github.com/turbio/bracey.vim/,, From 1e36c703b14366c0f4cabfd60d2f9884f330a812 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Tue, 4 Apr 2023 11:06:26 +0900 Subject: [PATCH 090/136] spotify: 1.1.84.716.gc5f8b819 -> 1.1.99.878.g1e4ccc6e --- pkgs/applications/audio/spotify/default.nix | 8 ++++---- pkgs/applications/audio/spotify/update.sh | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index a0a17a93e1fa..94099abf53f6 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -13,14 +13,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.1.84.716.gc5f8b819"; + version = "1.1.99.878.g1e4ccc6e"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "60"; + rev = "62"; deps = [ alsa-lib @@ -75,7 +75,7 @@ stdenv.mkDerivation { # fetch from snapcraft instead of the debian repository most repos fetch from. # That is a bit more cumbersome. But the debian repository only keeps the last - # two versions, while snapcraft should provide versions indefinately: + # two versions, while snapcraft should provide versions indefinitely: # https://forum.snapcraft.io/t/how-can-a-developer-remove-her-his-app-from-snap-store/512 # This is the next-best thing, since we're not allowed to re-distribute @@ -83,7 +83,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "1209b956822d8bb661daa2c88616bed403ec26dc22c6b866cecff59235c56112284c2f99aa06352fc0df6fcd15225a6ad60afd3b4ff4d7b948ab83e70ab31a71"; + sha512 = "339r2q13nnpwi7gjd1axc6z2gycfm9gwz3x9dnqyaqd1g3rw7nk6nfbp6bmpkr68lfq1jfgvqwnimcgs84rsi7nmgsiabv3cz0673wv"; }; nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ]; diff --git a/pkgs/applications/audio/spotify/update.sh b/pkgs/applications/audio/spotify/update.sh index a8836214f2fc..0f19b1e295af 100755 --- a/pkgs/applications/audio/spotify/update.sh +++ b/pkgs/applications/audio/spotify/update.sh @@ -78,6 +78,7 @@ sed --regexp-extended \ # try to build the updated version # +export NIXPKGS_ALLOW_UNFREE=1 if ! nix-build -A spotify "$nixpkgs"; then echo "The updated spotify failed to build." exit 1 From b5872242a60774a96953d04695d74956889fb3be Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Tue, 4 Apr 2023 11:14:10 +0900 Subject: [PATCH 091/136] spotify: Add support for `NIXOS_OZONE_WL` --- pkgs/applications/audio/spotify/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 94099abf53f6..b615cf0f2c0a 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, wrapGAppsHook, openssl, freetype +{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeShellWrapper, wrapGAppsHook, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curlWithGnuTls, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon @@ -86,7 +86,7 @@ stdenv.mkDerivation { sha512 = "339r2q13nnpwi7gjd1axc6z2gycfm9gwz3x9dnqyaqd1g3rw7nk6nfbp6bmpkr68lfq1jfgvqwnimcgs84rsi7nmgsiabv3cz0673wv"; }; - nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ]; + nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ]; dontStrip = true; dontPatchELF = true; @@ -144,13 +144,14 @@ stdenv.mkDerivation { --set-rpath $rpath $out/share/spotify/spotify librarypath="${lib.makeLibraryPath deps}:$libdir" - wrapProgram $out/share/spotify/spotify \ + wrapProgramShell $out/share/spotify/spotify \ ''${gappsWrapperArgs[@]} \ ${lib.optionalString (deviceScaleFactor != null) '' --add-flags "--force-device-scale-factor=${toString deviceScaleFactor}" \ ''} \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${gnome.zenity}/bin" + --prefix PATH : "${gnome.zenity}/bin" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" # fix Icon line in the desktop file (#48062) sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop" From 1f874da97bae36f8594f1a839cd265113d097de1 Mon Sep 17 00:00:00 2001 From: ocfox Date: Tue, 4 Apr 2023 16:26:56 +0800 Subject: [PATCH 092/136] vimPlugins.vim-wakatime: fix build as vim plugin --- pkgs/applications/editors/vim/plugins/overrides.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 579d01558dda..e6646d8c20c1 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1354,6 +1354,13 @@ self: super: { vim-wakatime = super.vim-wakatime.overrideAttrs (old: { buildInputs = [ python3 ]; + patchPhase = '' + substituteInPlace plugin/wakatime.vim \ + --replace 'autocmd BufEnter,VimEnter' \ + 'autocmd VimEnter' \ + --replace 'autocmd CursorMoved,CursorMovedI' \ + 'autocmd CursorMoved,CursorMovedI,BufEnter' + ''; }); vim-xdebug = super.vim-xdebug.overrideAttrs (old: { From 09a6672bbfc240b6154474b135ba583c929859e4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 4 Oct 2022 15:26:29 +0200 Subject: [PATCH 093/136] elasticsearch6*: remove --- nixos/tests/elk.nix | 15 ---- pkgs/servers/search/elasticsearch/6.x.nix | 76 ------------------- pkgs/servers/search/elasticsearch/plugins.nix | 13 ---- pkgs/top-level/aliases.nix | 5 ++ pkgs/top-level/all-packages.nix | 20 +---- 5 files changed, 7 insertions(+), 122 deletions(-) delete mode 100644 pkgs/servers/search/elasticsearch/6.x.nix diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index f42be00f23b8..5c332cb5f2ee 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -268,14 +268,6 @@ let ''; }) { inherit pkgs system; }; in { - ELK-6 = mkElkTest "elk-6-oss" { - name = "elk-6-oss"; - elasticsearch = pkgs.elasticsearch6-oss; - logstash = pkgs.logstash6-oss; - kibana = pkgs.kibana6-oss; - journalbeat = pkgs.journalbeat6; - metricbeat = pkgs.metricbeat6; - }; # We currently only package upstream binaries. # Feel free to package an SSPL licensed source-based package! # ELK-7 = mkElkTest "elk-7-oss" { @@ -287,13 +279,6 @@ in { # metricbeat = pkgs.metricbeat7; # }; unfree = lib.dontRecurseIntoAttrs { - ELK-6 = mkElkTest "elk-6" { - elasticsearch = pkgs.elasticsearch6; - logstash = pkgs.logstash6; - kibana = pkgs.kibana6; - journalbeat = pkgs.journalbeat6; - metricbeat = pkgs.metricbeat6; - }; ELK-7 = mkElkTest "elk-7" { elasticsearch = pkgs.elasticsearch7; logstash = pkgs.logstash7; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/6.x.nix deleted file mode 100644 index 87750f196f3f..000000000000 --- a/pkgs/servers/search/elasticsearch/6.x.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ elk6Version -, enableUnfree ? true -, lib, stdenv -, fetchurl -, makeWrapper -, jre_headless -, util-linux, gnugrep, coreutils -, libxcrypt -, autoPatchelfHook -, zlib -}: - -with lib; - -stdenv.mkDerivation (rec { - version = elk6Version; - pname = "elasticsearch${optionalString (!enableUnfree) "-oss"}"; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/elasticsearch/${pname}-${version}.tar.gz"; - sha256 = - if enableUnfree - then "1hkcgqsrnnx3zjpgar4424mxfaxrx0zbrp7n7n0dlbhphshwnkmd" - else "1pglg60aigy31xmpfchnxcc04nd18zwc3av4m0kyp00yk5mnlyqm"; - }; - - patches = [ ./es-home-6.x.patch ]; - - postPatch = '' - substituteInPlace bin/elasticsearch-env --replace \ - "ES_CLASSPATH=\"\$ES_HOME/lib/*\"" \ - "ES_CLASSPATH=\"$out/lib/*\"" - - substituteInPlace bin/elasticsearch-cli --replace \ - "ES_CLASSPATH=\"\$ES_CLASSPATH:\$ES_HOME/\$additional_classpath_directory/*\"" \ - "ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\"" - ''; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre_headless util-linux ] - ++ optionals enableUnfree [ zlib libxcrypt ]; - - installPhase = '' - mkdir -p $out - cp -R bin config lib modules plugins $out - - chmod -x $out/bin/*.* - - wrapProgram $out/bin/elasticsearch \ - --prefix PATH : "${makeBinPath [ util-linux gnugrep coreutils ]}" \ - --set JAVA_HOME "${jre_headless}" - - wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}" - ''; - - passthru = { inherit enableUnfree; }; - - meta = { - description = "Open Source, Distributed, RESTful Search Engine"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = if enableUnfree then licenses.elastic else licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ apeschar basvandijk ]; - }; -} // optionalAttrs enableUnfree { - dontPatchELF = true; - nativeBuildInputs = [ makeWrapper ] - ++ optional stdenv.isLinux autoPatchelfHook; - runtimeDependencies = [ zlib ]; - postFixup = lib.optionalString stdenv.isLinux '' - for exe in $(find $out/modules/x-pack-ml/platform/linux-x86_64/bin -executable -type f); do - echo "patching $exe..." - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exe" - done - ''; -}) diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index cb595de6a13e..616a85f7fdd9 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -39,7 +39,6 @@ in url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = if version == "7.17.4" then "a4e881d86694ae70ab6b18f72ea700415971200145d33d438e57c0374d9fc16f" - else if version == "6.8.21" then "06b1pavyggzfp4wwdql0q9nm3r7i9px9cagp4yh4nhxhnk4w5fiq" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -56,7 +55,6 @@ in url = "https://github.com/vhyza/elasticsearch-${pluginName}/releases/download/v${version}/elasticsearch-${pluginName}-${version}-plugin.zip"; sha256 = if version == "7.17.3" then "1835f374230cb17193859cee22ac90e3d7a67fb41a55fd4578e840d708287a08" - else if version == "6.8.21" then "0m80cn7vkcvk95v4pdmi6vk5ww7p01k0hj2iqb9g870vs6x2qjzv" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -73,7 +71,6 @@ in url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = if version == "7.17.4" then "1c8175b2dac54277c1f41981fb4a784829e74e6e74268381fe0c27bc6652704b" - else if version == "6.8.21" then "07w8s4a5gvr9lzjzf629y8rx3kvs6zd1vl07ksw1paghp42yb354" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -90,7 +87,6 @@ in url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = if version == "7.17.4" then "702e446997bde5cb38af120a1cb4271d976fdd23444be49e53b6be3801d845a9" - else if version == "6.8.21" then "1kdpbrasxwr3dn21zjrklp1s389rwa51fairygdwl8px9liwwfa5" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -107,7 +103,6 @@ in url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = if version == "7.17.4" then "7d1574a585a9db0988ee248159d51f62cce5578a8c082096ef3e26efdb24aee7" - else if version == "6.8.21" then "0v31yyhjcdlqnjw1f9kihh7z3c6d31whc57hqqd1dn579n4s9rlz" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -124,7 +119,6 @@ in url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; sha256 = if version == "7.17.4" then "cad923a662db705d40ca29698aa118e9e4cc50ae564c426a76d5acb777a4f57c" - else if version == "6.8.21" then "0sfh1az30q4f34zxig2fz8wn9gk53fmmxyg5pbi1svn9761p5awq" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -141,7 +135,6 @@ in url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; sha256 = if version == "7.17.4" then "a50be4cea5c68ad7615f87d672ba160d027fdfde2be0578bb2dabd6384cc8108" - else if version == "6.8.21" then "00lwj00rfdk6850gk1n86chiz2w6afpqn7jn588jdbwv41qh5mrv" else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { @@ -158,7 +151,6 @@ in version = # https://docs.search-guard.com/latest/search-guard-versions if esVersion == "7.17.3" then "${esVersion}-53.1.0" - else if esVersion == "6.8.21" then "${esVersion}-25.6" else throw "unsupported version ${esVersion} for plugin ${pluginName}"; src = if esVersion == "7.17.3" then @@ -166,11 +158,6 @@ in url = "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip"; sha256 = "b49b24f7b74043cb5bab93f18316ea71656a7668e61bf063ccaa7b0ee2302a31"; } - else if esVersion == "6.8.21" then - fetchurl { - url = "https://maven.search-guard.com/search-guard-release/com/floragunn/search-guard-6/${version}/search-guard-6-${version}.zip"; - sha256 = "19nj513wigwd0mzq747zax4fzvv5vi24f7j0636rydd9iv9cyhg2"; - } else throw "unsupported version ${version} for plugin ${pluginName}"; meta = with lib; { homepage = "https://search-guard.com"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0c927419f42e..967426b95a74 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -411,6 +411,11 @@ mapAliases ({ elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # Added 2021-01-17 elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 + elasticsearch6 = throw "elasticsearch6 has been removed because it reached end of life"; # Added 2022-10-04 + elasticsearch6-oss = throw "elasticsearch6-oss has been removed because it reached end of life"; # Added 2022-10-04 + elasticsearch6Plugins = throw "elasticsearch6Plugins has been removed because it reached end of life"; # Added 2022-10-04 + elasticsearch7Plugins = elasticsearchPlugins; + # Electron electron_3 = throw "electron_3 has been removed in favor of newer versions"; # added 2022-01-06 electron_4 = throw "electron_4 has been removed in favor of newer versions"; # added 2022-01-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7c62d3ee5c0..e459e2930c9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7152,36 +7152,20 @@ with pkgs; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. # When updating make sure to update all plugins or they will break! - elk6Version = "6.8.21"; elk7Version = "7.17.4"; - elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { - util-linux = util-linuxMinimal; - jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; - elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix { - enableUnfree = false; - util-linux = util-linuxMinimal; - jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { util-linux = util-linuxMinimal; jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - elasticsearch = elasticsearch6; - elasticsearch-oss = elasticsearch6-oss; + elasticsearch = elasticsearch7; + elasticsearch-oss = elasticsearch7-oss; elasticsearchPlugins = recurseIntoAttrs ( callPackage ../servers/search/elasticsearch/plugins.nix { elasticsearch = elasticsearch-oss; } ); - elasticsearch6Plugins = elasticsearchPlugins.override { - elasticsearch = elasticsearch6-oss; - }; - elasticsearch7Plugins = elasticsearchPlugins.override { - elasticsearch = elasticsearch7; - }; elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { }; From 76ad0b1b7db9fd4cb62a176caa1e47a5b5671b33 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 4 Oct 2022 15:28:59 +0200 Subject: [PATCH 094/136] logstash6*: remove --- pkgs/tools/misc/logstash/6.x.nix | 71 -------------------------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 11 +---- 3 files changed, 3 insertions(+), 81 deletions(-) delete mode 100644 pkgs/tools/misc/logstash/6.x.nix diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix deleted file mode 100644 index ef5d04ee4765..000000000000 --- a/pkgs/tools/misc/logstash/6.x.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ elk6Version -, enableUnfree ? true -, lib, stdenv -, fetchurl -, makeWrapper -, nixosTests -, jre -}: - -let this = stdenv.mkDerivation rec { - version = elk6Version; - pname = "logstash${lib.optionalString (!enableUnfree) "-oss"}"; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz"; - sha256 = - if enableUnfree - then "0hij1byw5b3xmk3vshr9p7gxwbjrywr7ylps05ydc2dmnz8q2a79" - else "1fa236pvhj7spys54nqi3k64rwzf6zi6gaccmqg4p4sh92jzsybv"; - }; - - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - dontPatchShebangs = true; - - nativeBuildInputs = [ - makeWrapper - ]; - - buildInputs = [ - jre - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out - cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out - - patchShebangs $out/bin/logstash - patchShebangs $out/bin/logstash-plugin - - wrapProgram $out/bin/logstash \ - --set JAVA_HOME "${jre}" - - wrapProgram $out/bin/logstash-plugin \ - --set JAVA_HOME "${jre}" - runHook postInstall - ''; - - meta = with lib; { - description = "A data pipeline that helps you process logs and other event data from a variety of systems"; - homepage = "https://www.elastic.co/products/logstash"; - sourceProvenance = with sourceTypes; [ - fromSource - binaryBytecode # source bundles dependencies as jars - binaryNativeCode # bundled jruby includes native code - ]; - license = if enableUnfree then licenses.elastic else licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ wjlroe offline basvandijk ]; - }; - passthru.tests = - lib.optionalAttrs (!enableUnfree) ( - assert this.drvPath == nixosTests.elk.ELK-6.elkPackages.logstash.drvPath; - { - elk = nixosTests.elk.ELK-6; - } - ); -}; -in this diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 967426b95a74..463584a5b8dc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -957,6 +957,8 @@ mapAliases ({ loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 lobster-two = google-fonts; # Added 2021-07-22 + logstash6 = throw "logstash6 has been removed because it reached end of life"; # Added 2022-10-04 + logstash6-oss = throw "logstash6 has been removed because it reached end of life"; # Added 2022-10-04 love_0_7 = throw "love_0_7 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 love_0_8 = throw "love_0_8 was removed because it is a very old version and no longer used by any package in nixpkgs"; # Added 2022-01-15 love_0_9 = throw "love_0_9 was removed because was broken for a long time and no longer used by any package in nixpkgs"; # Added 2022-01-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e459e2930c9e..cb99c75d8d80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9101,15 +9101,6 @@ with pkgs; lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; - logstash6 = callPackage ../tools/misc/logstash/6.x.nix { - # https://www.elastic.co/support/matrix#logstash-and-jvm - jre = jdk11_headless; - }; - logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { - enableUnfree = false; - # https://www.elastic.co/support/matrix#logstash-and-jvm - jre = jdk11_headless; - }; logstash7 = callPackage ../tools/misc/logstash/7.x.nix { # https://www.elastic.co/support/matrix#logstash-and-jvm jre = jdk11_headless; @@ -9119,7 +9110,7 @@ with pkgs; # https://www.elastic.co/support/matrix#logstash-and-jvm jre = jdk11_headless; }; - logstash = logstash6; + logstash = logstash7; logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { }; From 426fbcb5a6f110b4bc76a5cd2818e5254dbef8ba Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 4 Oct 2022 15:32:16 +0200 Subject: [PATCH 095/136] *beat6: remove --- pkgs/misc/logging/beats/6.x.nix | 54 --------------------------------- pkgs/top-level/aliases.nix | 7 ++++- pkgs/top-level/all-packages.nix | 14 +++------ 3 files changed, 10 insertions(+), 65 deletions(-) delete mode 100644 pkgs/misc/logging/beats/6.x.nix diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix deleted file mode 100644 index 1c3e4adccf82..000000000000 --- a/pkgs/misc/logging/beats/6.x.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, fetchFromGitHub, fetchpatch, elk6Version, buildGoPackage, libpcap, nixosTests, systemd }: - -let beat = package : extraArgs : buildGoPackage (rec { - name = "${package}-${version}"; - version = elk6Version; - - src = fetchFromGitHub { - owner = "elastic"; - repo = "beats"; - rev = "v${version}"; - sha256 = "1vnw9clsc10cfpjf6vxvc6m507b2q17sgsl079iwqbp4v0286il7"; - }; - - goPackagePath = "github.com/elastic/beats"; - - subPackages = [ package ]; - - patches = [ - (fetchpatch { - # Build fix for aarch64, possibly other systems, merged in beats 7.x https://github.com/elastic/beats/pull/9493 - url = "https://github.com/elastic/beats/commit/5d796571de1aa2a299393d2045dacc2efac41a04.diff"; - sha256 = "sha256:0b79fljbi5xd3h8iiv1m38ad0zhmj09f187asc0m9rxlqrz2l9r2"; - }) - ]; - - meta = with lib; { - homepage = "https://www.elastic.co/products/beats"; - license = licenses.asl20; - maintainers = with maintainers; [ fadenb basvandijk dfithian ]; - platforms = platforms.linux; - }; - } // extraArgs); -in rec { - filebeat6 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; - heartbeat6 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; - metricbeat6 = beat "metricbeat" { - meta.description = "Lightweight shipper for metrics"; - passthru.tests = - assert metricbeat6.drvPath == nixosTests.elk.ELK-6.elkPackages.metricbeat.drvPath; - { - elk = nixosTests.elk.ELK-6; - }; - }; - journalbeat6 = beat "journalbeat" { - meta.description = '' - Journalbeat is an open source data collector to read and forward - journal entries from Linuxes with systemd. - ''; - buildInputs = [ systemd.dev ]; - postFixup = let libPath = lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' - patchelf --set-rpath ${libPath} "$out/bin/journalbeat" - ''; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 463584a5b8dc..15414418637a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -474,6 +474,7 @@ mapAliases ({ ffadoFull = throw "'ffadoFull' has been renamed to/replaced by 'ffado'"; # Converted to throw 2022-02-22 ffmpeg-sixel = throw "ffmpeg-sixel has been removed, because it was an outdated/unmaintained fork of ffmpeg"; # Added 2022-03-23"; ffmpeg_3 = throw "ffmpeg_3 was removed from nixpkgs, because it was an outdated and insecure release"; # added 2022-01-17 + filebeat6 = throw "filebeat6 has been removed because it reached end of life"; # Added 2022-10-04 finger_bsd = bsd-finger; fingerd_bsd = bsd-fingerd; firefox-esr-68 = throw "Firefox 68 ESR was removed because it reached end of life with its final release 68.12esr on 2020-08-25"; @@ -662,6 +663,7 @@ mapAliases ({ haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 hdr-plus = throw "hdr-plus has been removed because it is unmaintained, often breaks and no longer consumed as a dependency"; # Added 2022-11-08 heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05 + heartbeat6 = throw "heartbeat6 has been removed because it reached end of life"; # Added 2022-10-04 heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22 heme = throw "heme has been removed: upstream is gone"; # added 2022-02-06 hepmc = hepmc2; # Added 2019-08-05 @@ -732,7 +734,9 @@ mapAliases ({ jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version"; # Added 2021-04-26 jira-cli = throw "jira-cli was removed because it is no longer maintained"; # Added 2023-02-28 joseki = throw "'joseki' has been renamed to/replaced by 'apache-jena-fuseki'"; # Converted to throw 2022-02-22 - journalbeat7 = throw "journalbeat has been removed upstream. Use filebeat with the journald input instead"; + journalbeat = throw "journalbeat7 has been removed upstream. Use filebeat with the journald input instead"; # Added 2022-10-04 + journalbeat6 = throw "journalbeat6 has been removed because it reached end of life"; # Added 2022-10-04 + journalbeat7 = throw "journalbeat7 has been removed upstream. Use filebeat with the journald input instead"; # Added 2022-10-04 # Julia julia_07 = throw "julia_07 has been deprecated in favor of the latest LTS version"; # Added 2020-09-15 @@ -997,6 +1001,7 @@ mapAliases ({ mesos = throw "mesos has been removed from nixpkgs, as it's unmaintained"; # Added 2020-08-15 mess = mame; # Added 2019-10-30 metal = throw "metal has been removed due to lack of maintainers"; + metricbeat6 = throw "metricbeat6 has been removed because it reached end of life"; # Added 2022-10-04 mididings = throw "mididings has been removed from nixpkgs as it doesn't support recent python3 versions and its upstream stopped maintaining it"; # Added 2022-01-12 midoriWrapper = throw "'midoriWrapper' has been renamed to/replaced by 'midori'"; # Converted to throw 2022-02-22 mime-types = mailcap; # Added 2022-01-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb99c75d8d80..1e40b662ff91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3777,22 +3777,16 @@ with pkgs; bchunk = callPackage ../tools/cd-dvd/bchunk { }; - inherit (callPackages ../misc/logging/beats/6.x.nix { }) - filebeat6 - heartbeat6 - metricbeat6 - journalbeat6; - inherit (callPackages ../misc/logging/beats/7.x.nix { }) filebeat7 heartbeat7 metricbeat7 packetbeat7; - filebeat = filebeat6; - heartbeat = heartbeat6; - metricbeat = metricbeat6; - journalbeat = journalbeat6; + filebeat = filebeat7; + heartbeat = heartbeat7; + metricbeat = metricbeat7; + packetbeat = packetbeat7; bfr = callPackage ../tools/misc/bfr { }; From 3acb3d73ae12e38dc69909b23efa36918232bd87 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 4 Oct 2022 15:59:54 +0200 Subject: [PATCH 096/136] elasticsearch-oss: remove --- nixos/tests/graylog.nix | 1 - nixos/tests/parsedmarc/default.nix | 4 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 +---- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/nixos/tests/graylog.nix b/nixos/tests/graylog.nix index 23f426fc7af9..3f7cc3a91439 100644 --- a/nixos/tests/graylog.nix +++ b/nixos/tests/graylog.nix @@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { services.mongodb.enable = true; services.elasticsearch.enable = true; - services.elasticsearch.package = pkgs.elasticsearch-oss; services.elasticsearch.extraConf = '' network.publish_host: 127.0.0.1 network.bind_host: 127.0.0.1 diff --git a/nixos/tests/parsedmarc/default.nix b/nixos/tests/parsedmarc/default.nix index 837cf9d7e6dc..1feadcb7f39b 100644 --- a/nixos/tests/parsedmarc/default.nix +++ b/nixos/tests/parsedmarc/default.nix @@ -84,8 +84,6 @@ in }; }; - services.elasticsearch.package = pkgs.elasticsearch-oss; - environment.systemPackages = [ (sendEmail "dmarc@localhost") pkgs.jq @@ -158,8 +156,6 @@ in }; }; - services.elasticsearch.package = pkgs.elasticsearch-oss; - environment.systemPackages = [ pkgs.jq ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 15414418637a..2f61cd10a6a5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -411,6 +411,7 @@ mapAliases ({ elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # Added 2021-01-17 elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 + elasticsearch-oss = throw "elasticsearch-oss has been removed because there is no oss version of elasticsearch anymore. Use opensearch instead."; # Added 2022-10-04 elasticsearch6 = throw "elasticsearch6 has been removed because it reached end of life"; # Added 2022-10-04 elasticsearch6-oss = throw "elasticsearch6-oss has been removed because it reached end of life"; # Added 2022-10-04 elasticsearch6Plugins = throw "elasticsearch6Plugins has been removed because it reached end of life"; # Added 2022-10-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e40b662ff91..eacd780a2f99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7153,12 +7153,9 @@ with pkgs; jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch = elasticsearch7; - elasticsearch-oss = elasticsearch7-oss; elasticsearchPlugins = recurseIntoAttrs ( - callPackage ../servers/search/elasticsearch/plugins.nix { - elasticsearch = elasticsearch-oss; - } + callPackage ../servers/search/elasticsearch/plugins.nix {} ); elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { }; From 8b4505a841c83cd4112a475d4e334d0404dda6d2 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 16 Feb 2023 18:12:19 +0100 Subject: [PATCH 097/136] nixos/rl-2305: mention elk6 removal --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 97a29a388575..56612794a306 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -154,6 +154,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `lib.systems.examples.ghcjs` and consequently `pkgsCross.ghcjs` now use the target triplet `javascript-unknown-ghcjs` instead of `js-unknown-ghcjs`. This has been done to match an [upstream decision](https://gitlab.haskell.org/ghc/ghc/-/commit/6636b670233522f01d002c9b97827d00289dbf5c) to follow Cabal's platform naming more closely. Nixpkgs will also reject `js` as an architecture name. +- The old unsupported version 6.x of the ELK-stack and Elastic beats have been removed. Use OpenSearch instead. + - The `cosmoc` package has been removed. The upstream scripts in `cosmocc` should be used instead. - Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually. From 4c874b81b59da9ca1702365354e0fd922154994f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Batuhan=20Apayd=C4=B1n?= Date: Tue, 4 Apr 2023 11:19:50 +0300 Subject: [PATCH 098/136] skopeo: 1.11.1 --> 1.11.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Batuhan Apaydın --- pkgs/development/tools/skopeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index f39f7510c1bf..eac4106e07ab 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-wTOcluPSguF6ZnKHlLelM5R2dIF9nd66qu7u/48uNyU="; + hash = "sha256-+FYq6Far8zFlIsaPtt/1mvfjMHb0gc4rat+M+aK+XW4="; }; outputs = [ "out" "man" ]; From 0b7f87614bcf9882b46a3df538c357eba6517f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Batuhan=20Apayd=C4=B1n?= Date: Tue, 4 Apr 2023 11:20:04 +0300 Subject: [PATCH 099/136] skopeo: add developer-guy to maintainers list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Batuhan Apaydın --- pkgs/development/tools/skopeo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index eac4106e07ab..357a236f782c 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -72,7 +72,7 @@ buildGoModule rec { changelog = "https://github.com/containers/skopeo/releases/tag/${src.rev}"; description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/containers/skopeo"; - maintainers = with maintainers; [ lewo ] ++ teams.podman.members; + maintainers = with maintainers; [ lewo developer-guy ] ++ teams.podman.members; license = licenses.asl20; }; } From 7d6f837b80a6b7714d51357ad7fa07a1cca3e25b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Apr 2023 11:32:35 +0200 Subject: [PATCH 100/136] harmonia: 0.6.0 -> 0.6.1 --- pkgs/tools/package-management/harmonia/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/harmonia/default.nix b/pkgs/tools/package-management/harmonia/default.nix index 034b09620c82..e71319bf50dd 100644 --- a/pkgs/tools/package-management/harmonia/default.nix +++ b/pkgs/tools/package-management/harmonia/default.nix @@ -9,19 +9,19 @@ rustPlatform.buildRustPackage rec { pname = "harmonia"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-BD61xBNlHvw3gsgfU2FgNsGpqkHbGZ+qvVfBYgQ1TJY="; + hash = "sha256-fT9CJ/WAH5ESU4Ja062U/qNWDmhEfHI1XctnFjgBJ+A="; }; - cargoHash = "sha256-xok7LutDrrN+lg+Nj8bG/XjMytybo+DOrd7o64PXBIE="; + cargoHash = "sha256-rcA94i7JDUBH2JrbWbEQLBMV9R1rBXnS3pNEmbOUr9c="; nativeBuildInputs = [ - pkg-config + pkg-config nix ]; buildInputs = [ From f5f0feca54fbd8840403de84caa386c96d47e144 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Apr 2023 12:52:28 +0200 Subject: [PATCH 101/136] python310Packages.bc-detect-secrets: 1.4.15 -> 1.4.16 --- pkgs/development/python-modules/bc-detect-secrets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index 98a14ade57c3..dab2f6e5bbb5 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.4.15"; + version = "1.4.16"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; rev = "refs/tags/${version}"; - hash = "sha256-zTRrWgbuSRK1zRurv3a2G1gZ6LCzmVQh8eFFa3g6eSE="; + hash = "sha256-PBpxhZPFO4X4dhSYWG2TtHgaNx/SCQlnr2D57uB0kr4="; }; propagatedBuildInputs = [ From 344ebdf2e4ee1b62e7bd59fcc142bc313499308e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Apr 2023 12:54:49 +0200 Subject: [PATCH 102/136] python310Packages.fakeredis: 2.10.2 -> 2.10.3 Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.10.3 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index b71ba532c2e6..367c0f8b813e 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.10.2"; + version = "2.10.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-ZQC8KNHM6Nnytkr6frZMl5mBVPkpduWZwwooCPymbFY="; + hash = "sha256-qd8tofR5FdfV/A37gfNRYALf5rUMh7ldhS/hETUHo/k="; }; nativeBuildInputs = [ From b46f7fb47ca16eb44ccf715c261ca6979ad247de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Apr 2023 11:11:20 +0000 Subject: [PATCH 103/136] sing-box: 1.2.1 -> 1.2.2 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 7b4dccd0f30e..589692a2de7f 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-0JQlyDeRvmpkBQ69Y7nXUHDVa1NbX7k7ZgdfNfFTO3I="; + hash = "sha256-IHYg3X1LBH7Ne83j0caJHHkBDMy7EcMKSFd0U5sHabI="; }; - vendorHash = "sha256-BofHamNzBxQI148eRxGYylcyaktD4Xg7c6m4WiK0hP0="; + vendorHash = "sha256-J9KGtAZ+J7EJKJOEEH44bhG8Gln8Gv87ryB3nswxDO0="; tags = [ "with_quic" From a1510d8fa4433b5daa143abdeee7e72d85ebc382 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 03:06:45 +0000 Subject: [PATCH 104/136] =?UTF-8?q?terraform-providers.cloudfoundry:=200.5?= =?UTF-8?q?0.6=20=E2=86=92=200.50.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 66ec78fb4eb9..54d186e6eb44 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -228,11 +228,11 @@ "vendorHash": "sha256-9YmvaKPZVu+Fi0zlmJbKcU2iw2WUdzZJzgWPfkI1C24=" }, "cloudfoundry": { - "hash": "sha256-/2MUyn5+lpIp/UeT/7hfwLKF/mXTgtlJSs/B7lzXFys=", + "hash": "sha256-MKhsUGuDpKfYFf9Vk0uVrP/Z4hnQyO+2WiqWXO9EAC0=", "homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry", "owner": "cloudfoundry-community", "repo": "terraform-provider-cloudfoundry", - "rev": "v0.50.6", + "rev": "v0.50.7", "spdx": "MPL-2.0", "vendorHash": "sha256-nBp/0HhflaoDzdHY6t42/gq3x6092ERIlNKv8ggahKE=" }, From 1afb9035e9856de028eae94f3b48b6c69783c8e6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 03:06:53 +0000 Subject: [PATCH 105/136] =?UTF-8?q?terraform-providers.cloudamqp:=201.24.2?= =?UTF-8?q?=20=E2=86=92=201.25.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 54d186e6eb44..f2d32c83c302 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -210,13 +210,13 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-/KttKu5KDmjFhJ7Z8vVlLJjtgNQOa93Wjv2r65DZjjk=", + "hash": "sha256-sXt0q6eKWk1BRm0GDsXKl/Rr3mro7FZkQcSIDan1df4=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.24.2", + "rev": "v1.25.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-V5nI7B45VJb7j7AoPrKQknJbVW5C9oyDs9q2u8LXD+M=" + "vendorHash": "sha256-w7Rsr3UgijW/3RMKzhMyWCvn5b1R1oqRs87/ZPO7jHs=" }, "cloudflare": { "hash": "sha256-jf2NAhiavSWsKTRIJF8Ypm7tobzvTlESKEkDRre4ZVo=", From 17a7c5008287fca629d222b85b0a6e654a1362f7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 03:08:44 +0000 Subject: [PATCH 106/136] =?UTF-8?q?terraform-providers.github:=205.18.3=20?= =?UTF-8?q?=E2=86=92=205.19.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f2d32c83c302..d7c1ce9bc70d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -420,11 +420,11 @@ "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-5HOGOISVozkwJU1/CRpzBOqChWEG3TTNrE5tssgWtH8=", + "hash": "sha256-QsytXQ1bf9/OI4+XyZ+lBIuwTwAbdSOdquH1oyp6rOE=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.18.3", + "rev": "v5.19.0", "spdx": "MIT", "vendorHash": null }, From bef20f18bf1b64fa7b95ec8393b12e4bde673883 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 03:11:04 +0000 Subject: [PATCH 107/136] =?UTF-8?q?terraform-providers.scaleway:=202.14.1?= =?UTF-8?q?=20=E2=86=92=202.15.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d7c1ce9bc70d..e38594b74361 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -973,13 +973,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-Ru3jcpnZR3guA3kGxO3iS/ZADtekTOy48kPFpv84wp8=", + "hash": "sha256-cHleY4quCLquw4XH0TmvQ+TO0XP+ikclCvd0LASgC2w=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.14.1", + "rev": "v2.15.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-7uatC3EI9IEgGEAaYWUNzPStGqtf+0vp8Liuru9NMZI=" + "vendorHash": "sha256-BIXxAGvF4+MjfU5X9/wNLUgzcVkiuz60EGXU/mNyqd8=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", From e7cd1fd2747d0aef6ea409117c5ad0656d26c6ea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 03:11:50 +0000 Subject: [PATCH 108/136] =?UTF-8?q?terraform-providers.snowflake:=200.60.0?= =?UTF-8?q?=20=E2=86=92=200.61.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e38594b74361..eacec99c8c03 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1036,11 +1036,11 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-rNKb1jmpVmId2ftuQ/+cCYyRNGmdsQj5UswRrVxlMe0=", + "hash": "sha256-IAS0IJwWBmZi0x32ZMWFRyiiPZrnL6z1SGQ3AxuFAd8=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.60.0", + "rev": "v0.61.0", "spdx": "MIT", "vendorHash": "sha256-INAtZefgxjNpf/PWGLn8SS2PxKu3SBhY+06cEnr9V3g=" }, From eb423a400e1013af3c8c73ad504edae675870506 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Apr 2023 03:12:41 +0000 Subject: [PATCH 109/136] =?UTF-8?q?terraform-providers.vultr:=202.12.1=20?= =?UTF-8?q?=E2=86=92=202.13.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index eacec99c8c03..ffef357a4383 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1245,11 +1245,11 @@ "vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI=" }, "vultr": { - "hash": "sha256-5pI/jLG8UdMxgubvp5SJDW49C6iHKXOtlnr3EuzwtsQ=", + "hash": "sha256-fEeKvV2t38gD5SLYAgEOJJSPjTcIhCtIYmOYMFiwcYg=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.12.1", + "rev": "v2.13.0", "spdx": "MPL-2.0", "vendorHash": null }, From 21131995d9c949758ec4e37ff590a3cd3d9a0ce1 Mon Sep 17 00:00:00 2001 From: Ali Caglayan Date: Mon, 3 Apr 2023 02:18:47 +0200 Subject: [PATCH 110/136] coqPackages.serapi: 8.16.0+0.16.3 -> 8.17.0+0.17.0 Signed-off-by: Ali Caglayan --- pkgs/development/coq-modules/serapi/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index 260f6fb0a9d3..ac09d26935af 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -2,6 +2,7 @@ let release = { + "8.17.0+0.17.0".sha256 = "sha256-I81qvaXpJfXcbFw8vyzYLzlnhPg1QD0lTqAFXhoZ0rI="; "8.16.0+0.16.3".sha256 = "sha256-22Kawp8jAsgyBTppwN5vmN7zEaB1QfPs0qKxd6x/7Uc="; "8.15.0+0.15.0".sha256 = "1vh99ya2dq6a8xl2jrilgs0rpj4j227qx8zvzd2v5xylx0p4bbrp"; "8.14.0+0.14.0".sha256 = "1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d"; @@ -12,12 +13,13 @@ let }; in -(with lib; mkCoqDerivation rec { +(with lib; mkCoqDerivation { pname = "serapi"; inherit version release; defaultVersion = with versions; lib.switch coq.version [ + { case = isEq "8.17"; out = "8.17.0+0.17.0"; } { case = isEq "8.16"; out = "8.16.0+0.16.3"; } { case = isEq "8.15"; out = "8.15.0+0.15.0"; } { case = isEq "8.14"; out = "8.14.0+0.14.0"; } @@ -39,6 +41,7 @@ in ppx_deriving_yojson ppx_import ppx_sexp_conv + ppx_hash sexplib yojson zarith # needed because of Coq @@ -54,7 +57,7 @@ in homepage = "https://github.com/ejgallego/coq-serapi"; description = "SerAPI is a library for machine-to-machine interaction with the Coq proof assistant"; license = licenses.lgpl21Plus; - maintainers = [ maintainers.Zimmi48 ]; + maintainers = with maintainers; [ alizter Zimmi48 ]; }; }).overrideAttrs(o: let inherit (o) version; in { From 6462ef85d8caefd4a27a09164c53017241547214 Mon Sep 17 00:00:00 2001 From: Ali Caglayan Date: Mon, 3 Apr 2023 02:08:58 +0200 Subject: [PATCH 111/136] coqPackages.coq-lsp: 0.1.6.1 for Coq 8.17 Signed-off-by: Ali Caglayan --- pkgs/development/coq-modules/coq-lsp/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/coq-lsp/default.nix b/pkgs/development/coq-modules/coq-lsp/default.nix index e75171a94384..00a56496a2d7 100644 --- a/pkgs/development/coq-modules/coq-lsp/default.nix +++ b/pkgs/development/coq-modules/coq-lsp/default.nix @@ -8,10 +8,12 @@ mkCoqDerivation rec { useDune = true; release."0.1.6.1+8.16".sha256 = "sha256-aX8/pN4fVYaF7ZEPYfvYpEZLiQM++ZG1fAhiLftQ9Aw="; + release."0.1.6.1+8.17".sha256 = "sha256-je+OlKM7x3vYB36sl406GREAWB4ePmC0ewHS6rCmWfk="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "0.1.6.1+8.16"; } + { case = isEq "8.17"; out = "0.1.6.1+8.17"; } ] null; nativeBuildInputs = [ makeWrapper ]; @@ -30,7 +32,7 @@ mkCoqDerivation rec { description = "Language Server Protocol and VS Code Extension for Coq"; homepage = "https://github.com/ejgallego/coq-lsp"; changelog = "https://github.com/ejgallego/coq-lsp/blob/${defaultVersion}/CHANGES.md"; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ alizter marsam ]; license = licenses.lgpl21Only; }; } From acd90cdb0716e1d7bbee72d35120f23310bf2069 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Tue, 4 Apr 2023 13:33:32 +0200 Subject: [PATCH 112/136] mozart: use llvmPackages_8 instead of llvmPackages_5 Following issue #44372 logic, we want to get rid of older LLVMs. --- pkgs/development/compilers/mozart/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index b901e7c34891..fb47000ea080 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -7,7 +7,7 @@ , boost169 , pinnedBoost ? boost169 , llvmPackages -, llvmPackages_5 +, llvmPackages_8 , gmp , emacs , jre_headless @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { "-DCMAKE_C_COMPILER=${llvmPackages.clang}/bin/clang" "-DBoost_USE_STATIC_LIBS=OFF" "-DMOZART_BOOST_USE_STATIC_LIBS=OFF" - "-DCMAKE_PROGRAM_PATH=${llvmPackages_5.clang}/bin" + "-DCMAKE_PROGRAM_PATH=${llvmPackages_8.clang}/bin" # Rationale: Nix's cc-wrapper needs to see a compile flag (like -c) to # infer that it is not a linking call, and stop trashing the command line # with linker flags. @@ -71,9 +71,9 @@ in stdenv.mkDerivation rec { buildInputs = [ pinnedBoost - llvmPackages_5.llvm - llvmPackages_5.clang - llvmPackages_5.clang-unwrapped + llvmPackages_8.llvm + llvmPackages_8.clang + llvmPackages_8.clang-unwrapped gmp emacs jre_headless From 2f27b9cb0ced564c66ed16a18de271518b966acd Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Tue, 4 Apr 2023 14:48:59 +0200 Subject: [PATCH 113/136] qgis-ltr: 3.22.16 -> 3.28.5 --- pkgs/applications/gis/qgis/ltr.nix | 1 + pkgs/applications/gis/qgis/unwrapped-ltr.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/qgis/ltr.nix b/pkgs/applications/gis/qgis/ltr.nix index 5db9a26ae758..d34e1e69833b 100644 --- a/pkgs/applications/gis/qgis/ltr.nix +++ b/pkgs/applications/gis/qgis/ltr.nix @@ -18,6 +18,7 @@ in symlinkJoin rec { pythonInputs = qgis-ltr-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-ltr-unwrapped.py.pkgs); postBuild = '' + # unpackPhase buildPythonPath "$pythonInputs" diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index a53ad337d542..ecce1cfdccea 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -73,14 +73,14 @@ let six ]; in mkDerivation rec { - version = "3.22.16"; + version = "3.28.5"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-6UpWVEyh94Oo6eI/dEmDuJHRwpPtkEsksjE90iAUgo8="; + hash = "sha256-3fQB0oCIZSVEVMZzmeyvw8/Ew+JjzAFnTIsnsklAayI="; }; passthru = { From 00aab4510243df735824d004a9fe569787dd57dc Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Tue, 4 Apr 2023 15:02:20 +0200 Subject: [PATCH 114/136] mozart: Simplify build thanks to the new sources format --- pkgs/development/compilers/mozart/default.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index fb47000ea080..8f68487ecf70 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -7,7 +7,6 @@ , boost169 , pinnedBoost ? boost169 , llvmPackages -, llvmPackages_8 , gmp , emacs , jre_headless @@ -42,23 +41,9 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper unzip ]; - # We cannot compile with both gcc and clang, but we need clang during the - # process, so we compile everything with clang. - # BUT, we need clang4 for parsing, and a more recent clang for compiling. cmakeFlags = [ - "-DCMAKE_CXX_COMPILER=${llvmPackages.clang}/bin/clang++" - "-DCMAKE_C_COMPILER=${llvmPackages.clang}/bin/clang" "-DBoost_USE_STATIC_LIBS=OFF" "-DMOZART_BOOST_USE_STATIC_LIBS=OFF" - "-DCMAKE_PROGRAM_PATH=${llvmPackages_8.clang}/bin" - # Rationale: Nix's cc-wrapper needs to see a compile flag (like -c) to - # infer that it is not a linking call, and stop trashing the command line - # with linker flags. - # As it does not recognise -emit-ast, we pass -c immediately overridden - # by -emit-ast. - # The remaining is just the default flags that we cannot reuse and need - # to repeat here. - "-DMOZART_GENERATOR_FLAGS='-c;-emit-ast;--std=c++0x;-Wno-invalid-noreturn;-Wno-return-type;-Wno-braced-scalar-init'" # We are building with clang, as nix does not support having clang and # gcc together as compilers and we need clang for the sources generation. # However, clang emits tons of warnings about gcc's atomic-base library. @@ -71,9 +56,6 @@ in stdenv.mkDerivation rec { buildInputs = [ pinnedBoost - llvmPackages_8.llvm - llvmPackages_8.clang - llvmPackages_8.clang-unwrapped gmp emacs jre_headless From 5ac23f930cc5aeadc48e4d5827b645cf14ecdcfe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Apr 2023 15:38:22 +0200 Subject: [PATCH 115/136] python310Packages.lupa: 1.14.1 -> 2.0 --- pkgs/development/python-modules/lupa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix index b5f40446bde7..6e3467290082 100644 --- a/pkgs/development/python-modules/lupa/default.nix +++ b/pkgs/development/python-modules/lupa/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "lupa"; - version = "1.14.1"; + version = "2.0"; src = fetchPypi { inherit pname version; - hash = "sha256-0P1OYK0Un+JckFMOKg4DKkKm8EVfKcoO24Fw1ux1HG4="; + hash = "sha256-rT/vSGvnrd3TSf6anDk3iQYTEs+Y68UztIm+NPSEy3k="; }; nativeBuildInputs = [ cython ]; From 9ca9baab512ca0bddd64029d55beafa93c85c988 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Apr 2023 15:43:18 +0200 Subject: [PATCH 116/136] python310Packages.lupa: add changelog to meta --- pkgs/development/python-modules/lupa/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix index 6e3467290082..8851028d10a3 100644 --- a/pkgs/development/python-modules/lupa/default.nix +++ b/pkgs/development/python-modules/lupa/default.nix @@ -20,6 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Lua in Python"; homepage = "https://github.com/scoder/lupa"; + changelog = "https://github.com/scoder/lupa/blob/lupa-${version}/CHANGES.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From a32219871ee0044f8cf033fbeb9506304deb9867 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Apr 2023 15:45:22 +0200 Subject: [PATCH 117/136] python310Packages.lupa: disable on unsupported Python releases - add format --- pkgs/development/python-modules/lupa/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lupa/default.nix b/pkgs/development/python-modules/lupa/default.nix index 8851028d10a3..b2123b92eb1f 100644 --- a/pkgs/development/python-modules/lupa/default.nix +++ b/pkgs/development/python-modules/lupa/default.nix @@ -2,20 +2,28 @@ , buildPythonPackage , cython , fetchPypi +, pythonOlder }: buildPythonPackage rec { pname = "lupa"; version = "2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-rT/vSGvnrd3TSf6anDk3iQYTEs+Y68UztIm+NPSEy3k="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + cython + ]; - pythonImportsCheck = [ "lupa" ]; + pythonImportsCheck = [ + "lupa" + ]; meta = with lib; { description = "Lua in Python"; From d273fa8bb6e90fe98deb10323a909b7fcb9e5d78 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 4 Apr 2023 16:36:02 +0200 Subject: [PATCH 118/136] python3.pkgs.picobox: 2.2.0 -> 3.0.0 This brings python 3.11 support. Upstream also switched to pyproject and hatch, which still needs SETUPTOOLS_SCM_PRETEND_VERSION to be set. New release was reported in https://github.com/ikalnytskyi/picobox/issues/55 --- .../python-modules/picobox/default.nix | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/picobox/default.nix b/pkgs/development/python-modules/picobox/default.nix index de0bdb14725b..176c86e84f07 100644 --- a/pkgs/development/python-modules/picobox/default.nix +++ b/pkgs/development/python-modules/picobox/default.nix @@ -3,15 +3,17 @@ , fetchFromGitHub , fetchpatch , flask +, hatchling +, hatch-vcs , isPy27 , pytestCheckHook -, pythonAtLeast -, setuptools-scm }: buildPythonPackage rec { pname = "picobox"; - version = "2.2.0"; + version = "3.0.0"; + + format = "pyproject"; disabled = isPy27; @@ -19,26 +21,14 @@ buildPythonPackage rec { owner = "ikalnytskyi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-B2A8GMhBFU/mb/JiiqtP+HvpPj5FYwaYO3gQN2QI6z0="; + hash = "sha256-LQiSurL+eFRJ9iQheoo66o44BlfBtAatk8deuMFROcc="; }; - patches = [ - (fetchpatch { - # already in master, but no new release yet. - # https://github.com/ikalnytskyi/picobox/issues/55 - url = "https://github.com/ikalnytskyi/picobox/commit/1fcc4a0c26a7cd50ee3ef6694139177b5dfb2be0.patch"; - hash = "sha256-/NIEzTFlZ5wG7jHT/YdySYoxT/UhSk29Up9/VqjG/jg="; - includes = [ - "tests/test_box.py" - "tests/test_stack.py" - ]; - }) - ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ - setuptools-scm + hatchling + hatch-vcs ]; nativeCheckInputs = [ From a143b6f42494c1f1e9dbf446ebcf53741d1d3b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 4 Apr 2023 12:43:28 +0100 Subject: [PATCH 119/136] gptcommit: 0.1.15 -> 0.5.6 --- pkgs/development/tools/gptcommit/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gptcommit/default.nix b/pkgs/development/tools/gptcommit/default.nix index 1485b8165649..f6d079074f5b 100644 --- a/pkgs/development/tools/gptcommit/default.nix +++ b/pkgs/development/tools/gptcommit/default.nix @@ -10,7 +10,7 @@ let pname = "gptcommit"; - version = "0.1.15"; + version = "0.5.6"; in rustPlatform.buildRustPackage { inherit pname version; @@ -19,13 +19,16 @@ rustPlatform.buildRustPackage { owner = "zurawiki"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ykcKvJJg+K2mDiz7hDYzoL1CYI1zOidlqz4xLUY1NW0="; + sha256 = "sha256-ZrJRXmtwHLUqaYhoAD9lo9k9t06TMGMLf33kgvbC0m8="; }; - cargoSha256 = "sha256-/BASGNwfdAHLKdceRQe4GNfLy6uanHwH0yohGO7V60Q="; + cargoSha256 = "sha256-625OFsFNNwILAFUC5eWcNETt7F1KpYE1N/Gf8pv9Gbw="; nativeBuildInputs = [ pkg-config ]; + # 0.5.6 release has failing tests + doCheck = false; + buildInputs = lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals stdenv.isLinux [ openssl ]; passthru = { From 2b21a945d997dbd79248d290a043f471ccdfffd7 Mon Sep 17 00:00:00 2001 From: Vinny Meller Date: Tue, 4 Apr 2023 10:41:00 -0500 Subject: [PATCH 120/136] vimPlugins.autosave-nvim: init at 2022-10-13 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b7d7bf3ea89f..891e2454a08a 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -809,6 +809,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/autoload_cscope.vim/"; }; + autosave-nvim = buildVimPluginFrom2Nix { + pname = "autosave.nvim"; + version = "2022-10-13"; + src = fetchFromGitHub { + owner = "nullishamy"; + repo = "autosave.nvim"; + rev = "406a09c1ce679bc6fbde47d6ec61c753632b55f0"; + sha256 = "0f3rp80hwf6v2kw2hg5jysz9j4946bmwpbk6hxpw89b1vcgny66v"; + }; + meta.homepage = "https://github.com/nullishamy/autosave.nvim/"; + }; + awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; version = "2022-05-04"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e6646d8c20c1..e15d497a80ad 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -121,6 +121,10 @@ self: super: { + autosave-nvim = super.autosave-nvim.overrideAttrs(old: { + dependencies = with super; [ plenary-nvim ]; + }); + barbecue-nvim = super.barbecue-nvim.overrideAttrs (old: { dependencies = with self; [ nvim-lspconfig nvim-navic nvim-web-devicons ]; meta = { diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 28d61f02be20..ee905498624f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -66,6 +66,7 @@ https://github.com/pocco81/auto-save.nvim/,HEAD, https://github.com/rmagatti/auto-session/,, https://github.com/m4xshen/autoclose.nvim/,HEAD, https://github.com/vim-scripts/autoload_cscope.vim/,, +https://github.com/nullishamy/autosave.nvim/,HEAD, https://github.com/rafi/awesome-vim-colorschemes/,, https://github.com/ayu-theme/ayu-vim/,, https://github.com/taybart/b64.nvim/,HEAD, From 460168712363202aaecc2bf608598f1a8957e43d Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Tue, 4 Apr 2023 14:49:33 +0200 Subject: [PATCH 121/136] buildFishPlugin: check if any .fish file exists in source --- pkgs/shells/fish/plugins/build-fish-plugin.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/plugins/build-fish-plugin.nix b/pkgs/shells/fish/plugins/build-fish-plugin.nix index b5d813133c5b..807d5835f1ee 100644 --- a/pkgs/shells/fish/plugins/build-fish-plugin.nix +++ b/pkgs/shells/fish/plugins/build-fish-plugin.nix @@ -45,9 +45,11 @@ stdenv.mkDerivation (drvAttrs // { source="$1" target="$out/share/fish/vendor_$2.d" - [ -d $source ] || return 0 + # Check if any .fish file exists in $source + [ -n "$(shopt -s nullglob; echo $source/*.fish)" ] || return 0 + mkdir -p $target - cp -r $source/*.fish "$target/" + cp $source/*.fish "$target/" } install_vendor_files completions completions From 1f6987ce7e4a1c88d3b38ff568a81822ed2c27e9 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Tue, 4 Apr 2023 14:01:21 +0200 Subject: [PATCH 122/136] fishPlugins.forgit: unstable-2022-10-14 -> 23.04.0 Diff: https://github.com/wfxr/forgit/compare/2872548075e63bc83a0b960e2813b16571998563...23.04.0 --- pkgs/shells/fish/plugins/forgit.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index 3c746c6fd612..80a40aff0e99 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -1,22 +1,20 @@ -{ lib, buildFishPlugin, fetchFromGitHub, git, fzf }: +{ lib, buildFishPlugin, fetchFromGitHub }: buildFishPlugin rec { pname = "forgit"; - version = "unstable-2022-10-14"; - - preFixup = '' - substituteInPlace $out/share/fish/vendor_conf.d/forgit.plugin.fish \ - --replace "fzf " "${fzf}/bin/fzf " \ - --replace "git " "${git}/bin/git " - ''; + version = "23.04.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; - rev = "2872548075e63bc83a0b960e2813b16571998563"; - sha256 = "sha256-NKL4c4k9Nath8NQ3sWUTGUzp517jRX4v0qVaKMJSMrw="; + rev = version; + sha256 = "sha256-3lvYIuzuJw0CQlaAQG6hAyfUgSXM+3BOmKRVDNFUN/U="; }; + postInstall = '' + cp -r bin $out/share/fish/vendor_conf.d/ + ''; + meta = with lib; { description = "A utility tool powered by fzf for using git interactively."; homepage = "https://github.com/wfxr/forgit"; From 3f1bafb686905c1e97a7762c13ebd925d0c03b74 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Tue, 4 Apr 2023 16:15:00 +0200 Subject: [PATCH 123/136] plasma: 5.27.3 -> 5.27.4(.1) --- pkgs/desktops/plasma-5/fetch.sh | 2 +- pkgs/desktops/plasma-5/srcs.nix | 480 ++++++++++++++++---------------- 2 files changed, 237 insertions(+), 245 deletions(-) diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 9040a5d3bf76..df8ab23740ad 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.4/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index b056b1766739..221239f0235d 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,483 +4,475 @@ { aura-browser = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/aura-browser-5.27.3.tar.xz"; - sha256 = "00ysfwf4r9x5csyxws7c7fazvcpr6240f8wshrg9dqsp5bwd86bl"; - name = "aura-browser-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/aura-browser-5.27.4.tar.xz"; + sha256 = "0m69p3pnb4kwpibqi8p4kg15sd47298hbhxgkj6ijpbd0422p4c9"; + name = "aura-browser-5.27.4.tar.xz"; }; }; bluedevil = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/bluedevil-5.27.3.tar.xz"; - sha256 = "1n8v2vdjp3mby2p9dpf53rjzsjwgw5z63s4lhm17090a152jwc1b"; - name = "bluedevil-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/bluedevil-5.27.4.tar.xz"; + sha256 = "18wnr31rdpk70g7l3ig03kw99ss6qkfjmhqysrkyd6m1dpsp260h"; + name = "bluedevil-5.27.4.tar.xz"; }; }; breeze = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/breeze-5.27.3.tar.xz"; - sha256 = "12krg073i08dly13zhy8jxpw6asdl7cc1dvafp48gr4irsygar3p"; - name = "breeze-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/breeze-5.27.4.tar.xz"; + sha256 = "008rdgyn10wdm393hgxvshfcqrxg6y5yr6xi0nzj4y0cd6yhxn32"; + name = "breeze-5.27.4.tar.xz"; }; }; breeze-grub = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/breeze-grub-5.27.3.tar.xz"; - sha256 = "0mpjvll5ca0rg4nxsplqynrnc6bmlwg9m2xdvgbljpa7yiwymw06"; - name = "breeze-grub-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/breeze-grub-5.27.4.tar.xz"; + sha256 = "0ymivw0pwia1vbf45pr04f825r8w6gsgn450s5x35144vg6lqkqb"; + name = "breeze-grub-5.27.4.tar.xz"; }; }; breeze-gtk = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/breeze-gtk-5.27.3.tar.xz"; - sha256 = "0ydz7xrmjfwq4nmdrazhyzm8n0jlqi3p8srydk2ivcjaq24v3f9p"; - name = "breeze-gtk-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/breeze-gtk-5.27.4.tar.xz"; + sha256 = "17wr4ri1jxsfx8pcm41mp0fsszlf6wi80gxlkixghrc04p6pv5nb"; + name = "breeze-gtk-5.27.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/breeze-plymouth-5.27.3.tar.xz"; - sha256 = "0kqls4ss7m0dxzhqm747b2wig4nfbwcj1fi7qdwqy4lf1fw3r4sm"; - name = "breeze-plymouth-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/breeze-plymouth-5.27.4.tar.xz"; + sha256 = "1fzidj0dqmr5baphffr5fyxww7v6bigfvbj1hndhk5silm28krkv"; + name = "breeze-plymouth-5.27.4.tar.xz"; }; }; discover = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/discover-5.27.3.tar.xz"; - sha256 = "1nqav8zh6290c5jxjs1vfgxxbq5szzln7skhqvx0v0mkd1889i48"; - name = "discover-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/discover-5.27.4.tar.xz"; + sha256 = "0rpr0c87nlm3fanv5fxs930rp5mrw357cfar6d81mwacmp86d7yw"; + name = "discover-5.27.4.tar.xz"; }; }; drkonqi = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/drkonqi-5.27.3.tar.xz"; - sha256 = "1p1mv0qbnbpj640sv4w965jry4w9179w0mvq1avv2hkpj6mx7jy3"; - name = "drkonqi-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/drkonqi-5.27.4.tar.xz"; + sha256 = "1lcidwcsm216acr6ybhyma64gl37n1pn7y8ilkh2iilwm1fwwfnn"; + name = "drkonqi-5.27.4.tar.xz"; }; }; flatpak-kcm = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/flatpak-kcm-5.27.3.tar.xz"; - sha256 = "1zjv7p8r3bic9jkla629n9a1g347d7mv22w0znpiah4xcdzci49n"; - name = "flatpak-kcm-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/flatpak-kcm-5.27.4.tar.xz"; + sha256 = "0i917li4cm8p0qq28m4jfasy5lph58spf9bfsbp3ka1x7i25cqdd"; + name = "flatpak-kcm-5.27.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/kactivitymanagerd-5.27.3.tar.xz"; - sha256 = "097fx3rqilqihgs4miylgx7vwgmrrwac7c1g9l7ydc20ihx4l434"; - name = "kactivitymanagerd-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kactivitymanagerd-5.27.4.tar.xz"; + sha256 = "0wnsj5mbzjc3bylzyhgj8bw0qsf5c9jcyxmfr0h7w4hj414zvqfr"; + name = "kactivitymanagerd-5.27.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/kde-cli-tools-5.27.3.tar.xz"; - sha256 = "191sz7v39fzhhpf81hjdxhw08p45fx83s1mfyyd3w39bfmv038m1"; - name = "kde-cli-tools-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kde-cli-tools-5.27.4.tar.xz"; + sha256 = "06dl811mwssjylgkn74wjhxi98q1qacf5c2m0jfyny7hbphgv565"; + name = "kde-cli-tools-5.27.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/kde-gtk-config-5.27.3.tar.xz"; - sha256 = "04bix5d6n480qwfkhihss3nqpra3kcp939ppa4kws5ry1s759b5a"; - name = "kde-gtk-config-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kde-gtk-config-5.27.4.tar.xz"; + sha256 = "1qi0cbx9yilbxs19nbh8iplj5hi19mllk63ldyah2vn5bgwavxcq"; + name = "kde-gtk-config-5.27.4.tar.xz"; }; }; kdecoration = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/kdecoration-5.27.3.tar.xz"; - sha256 = "1nzym6qf7pqsk03qs3583lisf9vzcy13mwwhcjpri0bng57ih3h7"; - name = "kdecoration-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kdecoration-5.27.4.tar.xz"; + sha256 = "0vpshfjb2m1m4lx4sh1mhfpx70wvy6laaids9q1cip3k22i24ps1"; + name = "kdecoration-5.27.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/kdeplasma-addons-5.27.3.tar.xz"; - sha256 = "17rvsxg1fsbm5vyrm4sq4q0x720wj2y89i9n5w4v41fygarbia8w"; - name = "kdeplasma-addons-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kdeplasma-addons-5.27.4.tar.xz"; + sha256 = "128zjkbvxkibh1d5d1m5xsg3f6hrkgs1f0k371bk8dpki1wsb0ka"; + name = "kdeplasma-addons-5.27.4.tar.xz"; }; }; kgamma5 = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/kgamma5-5.27.3.tar.xz"; - sha256 = "0z5ngivlg9zz844k55m2sxvzpjdivlggml38l0rzcqpzdqaab2fy"; - name = "kgamma5-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kgamma5-5.27.4.tar.xz"; + sha256 = "00jq6pc40k1dd6g38bjyb52z8xf3iz9s2n0bwvqaddcngw5wb0aa"; + name = "kgamma5-5.27.4.tar.xz"; }; }; khotkeys = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/khotkeys-5.27.3.tar.xz"; - sha256 = "1sq6p22bikjdxbb43l9s8rgzamyl83h00y5ksp281287k3swn6z6"; - name = "khotkeys-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/khotkeys-5.27.4.tar.xz"; + sha256 = "08qhj9m5dkg1vgjyzm93ns8c5yvbwfa5r6z7xgn0filvlzg284l4"; + name = "khotkeys-5.27.4.tar.xz"; }; }; kinfocenter = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/kinfocenter-5.27.3.tar.xz"; - sha256 = "12wqryghhvs1a1l80k7zmwldyclvp3c2cdaaank7xwy3nyrnnzw4"; - name = "kinfocenter-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kinfocenter-5.27.4.tar.xz"; + sha256 = "15g4czd8pm4vliaax8kgy8zdgxqj73x1icy4gc09y4zwqhaclxb8"; + name = "kinfocenter-5.27.4.tar.xz"; }; }; kmenuedit = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/kmenuedit-5.27.3.tar.xz"; - sha256 = "126wcw38abnwpfcapkbhk8xi2m5gp7qshvayzh23xdajg0lkh47p"; - name = "kmenuedit-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kmenuedit-5.27.4.tar.xz"; + sha256 = "1cx7ih68by4slrxrgf8yh49fxszfrzgfhrajk8xjgq9s34nvgarp"; + name = "kmenuedit-5.27.4.tar.xz"; }; }; kpipewire = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/kpipewire-5.27.3.tar.xz"; - sha256 = "0b95jjkfpkvc2ld3x6p7nw6kn6fkqba9q7x95ywvgag2b00jdb56"; - name = "kpipewire-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kpipewire-5.27.4.tar.xz"; + sha256 = "0r9ii0mwv2d8nlq3p0g5hsp3m0j8my17ji1an7hzw5pajf340lx6"; + name = "kpipewire-5.27.4.tar.xz"; }; }; kscreen = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/kscreen-5.27.3.tar.xz"; - sha256 = "0ddxd0rmzq6bp00nw65z854pc8dsgiqdvwhkfrs9cprjdprnf3n1"; - name = "kscreen-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kscreen-5.27.4.tar.xz"; + sha256 = "1vf5lhbm1r55l1y06sib1fdv5mbmd77ns1xmq3f0ff7mfabj8vs5"; + name = "kscreen-5.27.4.tar.xz"; }; }; kscreenlocker = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/kscreenlocker-5.27.3.tar.xz"; - sha256 = "0m48bjrq95psmd11hny15nwqb4ypbfp7sik40hzzx216pqs9ma8s"; - name = "kscreenlocker-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kscreenlocker-5.27.4.tar.xz"; + sha256 = "14bip40nkkj6xhmws14hqzjmw23348dpvip4vad8fdgyndcpznm9"; + name = "kscreenlocker-5.27.4.tar.xz"; }; }; ksshaskpass = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/ksshaskpass-5.27.3.tar.xz"; - sha256 = "0bgnxx0k62a26pkq2alvb8r9kqyd80wnxci3sxa7rppdx8z3ahd5"; - name = "ksshaskpass-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/ksshaskpass-5.27.4.tar.xz"; + sha256 = "0spl7v7narfpvx37f1fqyk9mbsqhymy7jvd3gbxyln0x31j041d9"; + name = "ksshaskpass-5.27.4.tar.xz"; }; }; ksystemstats = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/ksystemstats-5.27.3.tar.xz"; - sha256 = "0rk34pav5zkw01h51m97i7jhq2wslhzap3wdp32v1xgsgmjlhs22"; - name = "ksystemstats-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/ksystemstats-5.27.4.tar.xz"; + sha256 = "1knykvf6ygg75y7qj8087v8sg6m54ywsk8v9d5yc7f0g8mhqkmhz"; + name = "ksystemstats-5.27.4.tar.xz"; }; }; kwallet-pam = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/kwallet-pam-5.27.3.tar.xz"; - sha256 = "1nqzx8pxk9yqqxpmra3mi8m61b7vl03vjpmnyrlh7krzynfjj672"; - name = "kwallet-pam-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kwallet-pam-5.27.4.tar.xz"; + sha256 = "0v0jzkmdbwry6k70nk4gmzv758744q4qi50gry9bcz619imkz8ff"; + name = "kwallet-pam-5.27.4.tar.xz"; }; }; kwayland-integration = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/kwayland-integration-5.27.3.tar.xz"; - sha256 = "0jkgkzh9zp1yb72npzgfbhq79zmgwzf7vzw8xxbz3vsmk3rih0fd"; - name = "kwayland-integration-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kwayland-integration-5.27.4.tar.xz"; + sha256 = "027y4r02g26mv5a76s2yr0fxyx7dq81md41lgjnr3gg0jdm8ajpp"; + name = "kwayland-integration-5.27.4.tar.xz"; }; }; kwin = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/kwin-5.27.3.tar.xz"; - sha256 = "1ry0mwah77ly1b4ywhiprjq5aqrb0njawqik11997q0k720i4b78"; - name = "kwin-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kwin-5.27.4.tar.xz"; + sha256 = "1d76m6vp9kg4qgr62ppb5wyi7g49j84kzb75zqkq5racsr9r0i2q"; + name = "kwin-5.27.4.tar.xz"; }; }; kwrited = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/kwrited-5.27.3.tar.xz"; - sha256 = "1m2qcqnsq3nbqa00y0fa0bnya8j7741pp3zgn58hjvhfbrh52262"; - name = "kwrited-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/kwrited-5.27.4.tar.xz"; + sha256 = "1z07fjw3b8q7cgy7vvlh1bmx4qm609mipgm5wjf6lb63ss04nfpd"; + name = "kwrited-5.27.4.tar.xz"; }; }; layer-shell-qt = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/layer-shell-qt-5.27.3.tar.xz"; - sha256 = "1rvjkw11nxcj0fl9b45hfv20xaqq87jvfrxz72xkmixnsv3wv70f"; - name = "layer-shell-qt-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/layer-shell-qt-5.27.4.tar.xz"; + sha256 = "1znhwg86wnjrmw5lfbwarl2va90zf4b0lpafia73q0i39g0ysfiv"; + name = "layer-shell-qt-5.27.4.tar.xz"; }; }; libkscreen = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/libkscreen-5.27.3.tar.xz"; - sha256 = "0py6x6l0bc64wakd3x6j4lmcnqzjxx0a4qr2p3i94rrx68b73mw5"; - name = "libkscreen-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/libkscreen-5.27.4.tar.xz"; + sha256 = "0zps0z0j4yln2yda4sj15rn3i6y3qipb5yb4q90qm5a0iiggp7d8"; + name = "libkscreen-5.27.4.tar.xz"; }; }; libksysguard = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/libksysguard-5.27.3.tar.xz"; - sha256 = "07xvs6pr605p9mjm6s8f5x53lyv2mscxvm4xfa0y056ngipvpwiz"; - name = "libksysguard-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/libksysguard-5.27.4.tar.xz"; + sha256 = "1y7q4bkgpg1j9yw9glm0566fbx6vf9ccz9f46vg3zfjwa468s4p0"; + name = "libksysguard-5.27.4.tar.xz"; }; }; milou = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/milou-5.27.3.tar.xz"; - sha256 = "07vf2mi6jnmw28r8bw5qj7f7467ja5mhsdp1k8hb32ivls92sv7b"; - name = "milou-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/milou-5.27.4.tar.xz"; + sha256 = "1a2p3y3zcmjigwywl7k7mgwvilpyjzjnbylx8zadp0051yw6f3sd"; + name = "milou-5.27.4.tar.xz"; }; }; oxygen = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/oxygen-5.27.3.tar.xz"; - sha256 = "1drmjf8bgzm9gzpy887wbyi4zd71vlilhx7057qr8df6sbnzh4ch"; - name = "oxygen-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/oxygen-5.27.4.tar.xz"; + sha256 = "1sz3rnsz8qabln3jn5bg1f5vgijgmm13242k65kiksvigfdrc3p2"; + name = "oxygen-5.27.4.tar.xz"; }; }; oxygen-sounds = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/oxygen-sounds-5.27.3.tar.xz"; - sha256 = "1kppckhyll3v973jg2csp5z3ryxbipp9jpg6hfqrw1rqkv83rf8d"; - name = "oxygen-sounds-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/oxygen-sounds-5.27.4.tar.xz"; + sha256 = "1v44jcy0zkvpqkc6yih55j6xmb0g3pd26szk95mpjkn7jxsav8wy"; + name = "oxygen-sounds-5.27.4.tar.xz"; }; }; plank-player = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plank-player-5.27.3.tar.xz"; - sha256 = "0iv26dics4w89j9xfms9bi4fs9b1cq4wnjgz1jv5w6834imvplrw"; - name = "plank-player-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plank-player-5.27.4.tar.xz"; + sha256 = "0650v644nvbnl9b0caa83pbq8y7jrklqzqxdlcrml6km85avhx5n"; + name = "plank-player-5.27.4.tar.xz"; }; }; plasma-bigscreen = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-bigscreen-5.27.3.tar.xz"; - sha256 = "0vp1n2048d9f15hnfiz2jkkk209n6zn6z45s9xa4a622xrqbvr3x"; - name = "plasma-bigscreen-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-bigscreen-5.27.4.tar.xz"; + sha256 = "18jdgk3aydk394r91c279fnlhyrvmklqznxjikq25mx449wa3acp"; + name = "plasma-bigscreen-5.27.4.tar.xz"; }; }; plasma-browser-integration = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-browser-integration-5.27.3.tar.xz"; - sha256 = "10ivly31xb2s1d2cizjppm805qxdh8lij8cry46fbgg51r5w1qnd"; - name = "plasma-browser-integration-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-browser-integration-5.27.4.tar.xz"; + sha256 = "0rpljxnir2nbh4ww5ycgpdrj739cr1dg46mmfqj65h8yn60zfynk"; + name = "plasma-browser-integration-5.27.4.tar.xz"; }; }; plasma-desktop = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-desktop-5.27.3.tar.xz"; - sha256 = "1q9lyc213fyvrjv816mhm0b0dzsjqy2m2hli9a70cy5i36id3pg2"; - name = "plasma-desktop-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-desktop-5.27.4.tar.xz"; + sha256 = "0068wcm586gv31aqjgppj1n5a81jv10q01spsxl24c91y7aiqkxr"; + name = "plasma-desktop-5.27.4.tar.xz"; }; }; plasma-disks = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-disks-5.27.3.tar.xz"; - sha256 = "0m9wdqf1k346kbpc6c2d5z2xiqiyp598k1973g06jr1af0b2pi9f"; - name = "plasma-disks-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-disks-5.27.4.tar.xz"; + sha256 = "08w3x7hd3wkgj41g9xcaylsz8lsjv1d4pgmzq7dy436vwbiaxx4p"; + name = "plasma-disks-5.27.4.tar.xz"; }; }; plasma-firewall = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-firewall-5.27.3.tar.xz"; - sha256 = "0qd40ihgd60znxmsr6s7vpr9af8r5dbasm4yjld4p7250pjvvn01"; - name = "plasma-firewall-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-firewall-5.27.4.tar.xz"; + sha256 = "1b538c9jngyj5zg6bvih2x7nskzdn8g9g04bxdjnayldj2hb979l"; + name = "plasma-firewall-5.27.4.tar.xz"; }; }; plasma-integration = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-integration-5.27.3.tar.xz"; - sha256 = "13lrg0r4zq71wvfah8brm53v9cbsn7zpknafi948nq3smbd1h196"; - name = "plasma-integration-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-integration-5.27.4.tar.xz"; + sha256 = "0bl99gr2clqs6wxlx0652gcypgxqw9s34yxvhc9df0fn53v9b84s"; + name = "plasma-integration-5.27.4.tar.xz"; }; }; plasma-mobile = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-mobile-5.27.3.tar.xz"; - sha256 = "0rf09rqc2avcma61r6ngc6bc1lmrivrvi7rkv73mrw8klnh3vf9f"; - name = "plasma-mobile-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-mobile-5.27.4.tar.xz"; + sha256 = "1a05lnhnxnizzs9fswsrlddwb0629xfl3wmm2rw635gqldd0f66m"; + name = "plasma-mobile-5.27.4.tar.xz"; }; }; plasma-nano = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-nano-5.27.3.tar.xz"; - sha256 = "11ivbr03dv75ryp0lcmj9iyw7y2x7pplybglpavmfz2ryq2vsy93"; - name = "plasma-nano-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-nano-5.27.4.tar.xz"; + sha256 = "1z70bj5s3qkx2rbrbn9xqf4vzyj7yx9vq9givcagncxnldi1x3pa"; + name = "plasma-nano-5.27.4.tar.xz"; }; }; plasma-nm = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-nm-5.27.3.tar.xz"; - sha256 = "02646jl8qq28b11hgxg73xycb2biy6girxkgpxnpdb1gxmfmfnvn"; - name = "plasma-nm-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-nm-5.27.4.tar.xz"; + sha256 = "0jr1a4d9qj43925abr36nvc9fhvyd58qhdg4w5i805p533wbzrif"; + name = "plasma-nm-5.27.4.tar.xz"; }; }; plasma-pa = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-pa-5.27.3.tar.xz"; - sha256 = "177hwsr75xif0r36hib1gh6bjyljnilb4s9zyzvr5z1lwiz10y91"; - name = "plasma-pa-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-pa-5.27.4.tar.xz"; + sha256 = "1rpjscmfb7i9h50m9xglxf4rgca63y0i8x341jgmf5kmpm9lad7d"; + name = "plasma-pa-5.27.4.tar.xz"; }; }; plasma-remotecontrollers = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-remotecontrollers-5.27.3.tar.xz"; - sha256 = "04am5shh882k86yic1ca42j60l2rnqn9487i30k0332kzd0wir1w"; - name = "plasma-remotecontrollers-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-remotecontrollers-5.27.4.tar.xz"; + sha256 = "0l9n0q318720yx02whrp9qfhhwcnw261sdvyw78y9c3n4v22k31n"; + name = "plasma-remotecontrollers-5.27.4.tar.xz"; }; }; plasma-sdk = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-sdk-5.27.3.tar.xz"; - sha256 = "0rsz846x3rldz950zm31aj8192b0h5d33fvizmgxnxjibxxf2q24"; - name = "plasma-sdk-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-sdk-5.27.4.tar.xz"; + sha256 = "08fv6rnb7vc3wxkwk3xrrvb3k1gac7sncjdvk0lik6y1c7ilk27r"; + name = "plasma-sdk-5.27.4.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-systemmonitor-5.27.3.tar.xz"; - sha256 = "122rw8nfzhk0808d1bk54ld41b45616fg3hca9jg4ib6k7nka367"; - name = "plasma-systemmonitor-5.27.3.tar.xz"; - }; - }; - plasma-tests = { - version = "5.27.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-tests-5.27.3.tar.xz"; - sha256 = "1ijh1lfr81bwdw8nla55n6snxkmmz95qf3j8wbf61v64r9n3w2zp"; - name = "plasma-tests-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-systemmonitor-5.27.4.tar.xz"; + sha256 = "1sy38lmkrvma4kkf96n68f65hdjvpyaszx13hynhrplsgn24fj19"; + name = "plasma-systemmonitor-5.27.4.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-thunderbolt-5.27.3.tar.xz"; - sha256 = "17hs1mrr7lkd9nkxs9269bs3hs4c8qxg3ksirksrgnbz4zas1m55"; - name = "plasma-thunderbolt-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-thunderbolt-5.27.4.tar.xz"; + sha256 = "1zzl59qyajf8xcxxs5lijx85v8gm3y4izf3qd502smq2841hbxi8"; + name = "plasma-thunderbolt-5.27.4.tar.xz"; }; }; plasma-vault = { - version = "5.27.3"; + version = "5.27.4.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-vault-5.27.3.tar.xz"; - sha256 = "0ilpkdd0nfg9z2klyf5s02npmqr1ypb0wgm584zi27q048hnicls"; - name = "plasma-vault-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-vault-5.27.4.1.tar.xz"; + sha256 = "1bh2662ghdq5qkvn4347yc2dh6c616qiax4k4yylkf37czqdil77"; + name = "plasma-vault-5.27.4.1.tar.xz"; }; }; plasma-welcome = { - version = "5.27.3"; + version = "5.27.4.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-welcome-5.27.3.tar.xz"; - sha256 = "1m6mpzbcyy7cimhcsbbmk1v86pibcrp86b22dh7pwgrg309ihsm4"; - name = "plasma-welcome-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-welcome-5.27.4.1.tar.xz"; + sha256 = "0rg80rc07q63z0ds4q8lf9yrv3ys9cvjcfwx39ibjy9nrkismrca"; + name = "plasma-welcome-5.27.4.1.tar.xz"; }; }; plasma-workspace = { - version = "5.27.3"; + version = "5.27.4.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-workspace-5.27.3.tar.xz"; - sha256 = "0g710y1l2hpxnjg6r1k60dkvn6gf98fg5yhx72wa2y1in3nkglzl"; - name = "plasma-workspace-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-workspace-5.27.4.1.tar.xz"; + sha256 = "19b5mydi995aa634v57dlc769nmbz6mb2hs8c620gzabjnn0cffb"; + name = "plasma-workspace-5.27.4.1.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.27.3"; + version = "5.27.4.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plasma-workspace-wallpapers-5.27.3.tar.xz"; - sha256 = "1ppsi5ic6yp9wnqwmz37jsmjs3l5jxafjarxa0xasalg69k10k4c"; - name = "plasma-workspace-wallpapers-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plasma-workspace-wallpapers-5.27.4.1.tar.xz"; + sha256 = "0sv58kp088vxqd5dfs3hvc93xlydk7nyxm1ly0xy377r2v3pnkg4"; + name = "plasma-workspace-wallpapers-5.27.4.1.tar.xz"; }; }; plymouth-kcm = { - version = "5.27.3"; + version = "5.27.4.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/plymouth-kcm-5.27.3.tar.xz"; - sha256 = "09p6ii29lq08h8999zb1ddbaa4l7piykcr5xmhwir75pi7gnnacg"; - name = "plymouth-kcm-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/plymouth-kcm-5.27.4.1.tar.xz"; + sha256 = "0x20dswpy1vg1rh01m7pbicd1fn0rbh5gfaqdlizdcpnd6gjjfh5"; + name = "plymouth-kcm-5.27.4.1.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.27.3"; + version = "1-5.27.4.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/polkit-kde-agent-1-5.27.3.tar.xz"; - sha256 = "1axgqg07xm12qrrww8jvbh8yvhi7pf2x4ssq65qja0zz9kxiahcx"; - name = "polkit-kde-agent-1-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/polkit-kde-agent-1-5.27.4.1.tar.xz"; + sha256 = "1ikhrs17ffrsji6phwxhz8b6gxldksjb4625zpin8vkf07v9brr6"; + name = "polkit-kde-agent-1-5.27.4.1.tar.xz"; }; }; powerdevil = { - version = "5.27.3"; + version = "5.27.4.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/powerdevil-5.27.3.tar.xz"; - sha256 = "16bcnm56g5amwygzkdz0sy396dfn47n6wiynnvr7nfhpzbfx81y8"; - name = "powerdevil-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/powerdevil-5.27.4.1.tar.xz"; + sha256 = "0s6k7kcfa717lcjdlx61h21ldk4fg67is6r2vzcq0507gp3r8jb4"; + name = "powerdevil-5.27.4.1.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.27.3"; + version = "5.27.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/qqc2-breeze-style-5.27.3.tar.xz"; - sha256 = "13hd2f08cb6gjdyns1qfszq7sn1ckr78l3lhl6g6yiab3jn1v6b4"; - name = "qqc2-breeze-style-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/qqc2-breeze-style-5.27.4.tar.xz"; + sha256 = "0x96xa5j3726i4ci6g51hk364hhcq9xip4jrb1qssb9l0v1324n4"; + name = "qqc2-breeze-style-5.27.4.tar.xz"; }; }; sddm-kcm = { - version = "5.27.3"; + version = "5.27.4.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/sddm-kcm-5.27.3.tar.xz"; - sha256 = "0hicpzsyym1r3amd6crz964gk19rhg5z9g87fr6i77r77iavb1ds"; - name = "sddm-kcm-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/sddm-kcm-5.27.4.1.tar.xz"; + sha256 = "0l85mk8mj3g5fga6z93w5k88pkpf8wrx6vaf4f1q9lgy2dkm4ylp"; + name = "sddm-kcm-5.27.4.1.tar.xz"; }; }; systemsettings = { - version = "5.27.3"; + version = "5.27.4.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/systemsettings-5.27.3.tar.xz"; - sha256 = "0gjh9hny0h2x5cqqsn5scm1k9hjfl3vgpmsjqqc66hb1ac8a9g04"; - name = "systemsettings-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/systemsettings-5.27.4.1.tar.xz"; + sha256 = "03kk2bangg9nixdwpyrp2k4wgv3r3d3ymklqfx37b7c25wpiv7az"; + name = "systemsettings-5.27.4.1.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.27.3"; + version = "5.27.4.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.3/xdg-desktop-portal-kde-5.27.3.tar.xz"; - sha256 = "0d47kx9y4bfylmn3q4s11vg6fzz1yjlcbxmpgpd9al8nils2ifnd"; - name = "xdg-desktop-portal-kde-5.27.3.tar.xz"; + url = "${mirror}/stable/plasma/5.27.4/xdg-desktop-portal-kde-5.27.4.1.tar.xz"; + sha256 = "0hrxlql13yab3w778wgdsr92g65q81qk5dvlqnn0fdc9lbfw5ipg"; + name = "xdg-desktop-portal-kde-5.27.4.1.tar.xz"; }; }; } From a3cff1f0527ba7a5be7ac7a802002c3dab267a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Ren=C3=A9=20Rideau?= Date: Tue, 4 Apr 2023 13:17:56 -0400 Subject: [PATCH 124/136] solc: 0.8.13 -> 0.8.19 (#219240) --- pkgs/development/compilers/solc/default.nix | 25 +++++++++++++-------- pkgs/development/compilers/solc/tests.patch | 14 ++++++++++++ 2 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/compilers/solc/tests.patch diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 9a3e68a1b73b..cd75f3d6c394 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -4,10 +4,11 @@ , cmake , coreutils , fetchpatch +, jq , ncurses , python3 , z3Support ? true -, z3 ? null +, z3_4_11 ? null , cvc4Support ? gccStdenv.isLinux , cvc4 ? null , cln ? null @@ -16,8 +17,9 @@ # compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin, # general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS +let z3 = z3_4_11; in -assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.6.0"; +assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.11.0"; assert cvc4Support -> cvc4 != null && cln != null && gmp != null; let @@ -28,11 +30,11 @@ let sha256 = "1vbhi503rgwarf275ajfdb8vpdcbn1f7917wjkf8jghqwb1c24lq"; }; - range3Version = "0.11.0"; + range3Version = "0.12.0"; range3Url = "https://github.com/ericniebler/range-v3/archive/${range3Version}.tar.gz"; range3 = fetchzip { url = range3Url; - sha256 = "18230bg4rq9pmm5f8f65j444jpq56rld4fhmpham8q3vr1c1bdjh"; + sha256 = "sha256-bRSX91+ROqG1C3nB9HSQaKgLzOHEFy9mrD2WW3PRBWU="; }; fmtlibVersion = "8.0.1"; @@ -43,7 +45,7 @@ let }; pname = "solc"; - version = "0.8.13"; + version = "0.8.19"; meta = with lib; { description = "Compiler for Ethereum smart contract language Solidity"; homepage = "https://github.com/ethereum/solidity"; @@ -57,9 +59,13 @@ let # upstream suggests avoid using archive generated by github src = fetchzip { url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - hash = "sha256-cFC9M65kSYgYq9rhBXZKEdfvIMbMaDiDwdPmU8v9s7k="; + sha256 = "sha256-xh/QPYNEWxPtDaVmBeIE/Ch98g0ox9gJ/lR6ziOu+bg="; }; + patches = [ + ./tests.patch + ]; + postPatch = '' substituteInPlace cmake/jsoncpp.cmake \ --replace "${jsoncppUrl}" ${jsoncpp} @@ -84,7 +90,7 @@ let buildInputs = [ boost ] ++ lib.optionals z3Support [ z3 ] ++ lib.optionals cvc4Support [ cvc4 cln gmp ]; - nativeCheckInputs = [ ncurses python3 ]; + nativeCheckInputs = [ jq ncurses (python3.withPackages (ps: with ps; [ colorama deepdiff devtools docopt docutils requests sphinx tabulate z3 ])) ]; # contextlib2 glob2 textwrap3 traceback2 urllib3 # tests take 60+ minutes to complete, only run as part of passthru tests doCheck = false; @@ -96,7 +102,8 @@ let for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh ./test/*.py; do patchShebangs "$i" done - TERM=xterm ./scripts/tests.sh ${lib.optionalString z3Support "--no-smt"} + ## TODO: reenable tests below after adding evmone and hera and their dependencies to nixpkgs + #TERM=xterm ./scripts/tests.sh ${lib.optionalString z3Support "--no-smt"} popd ''; @@ -113,7 +120,7 @@ let src = pkgs.fetchurl { url = "https://github.com/ethereum/solidity/releases/download/v${version}/solc-macos"; - sha256 = "sha256-FNTvAT6oKtlekf2Um3+nt4JxpIP/GnnEPWzFi4JvW+o="; + sha256 = "sha256-OMhSOrZ+Cz4hxIGJ1r+5mtaHm5zgLg2ALsi+WYuyYi0="; }; dontUnpack = true; diff --git a/pkgs/development/compilers/solc/tests.patch b/pkgs/development/compilers/solc/tests.patch new file mode 100644 index 000000000000..45e3c7581474 --- /dev/null +++ b/pkgs/development/compilers/solc/tests.patch @@ -0,0 +1,14 @@ +diff --git a/test/lsp.py b/test/lsp.py +index 669951ca4..11007ae82 100755 +--- a/test/lsp.py ++++ b/test/lsp.py +@@ -28,7 +28,8 @@ else: + import tty + # Turn off user input buffering so we get the input immediately, + # not only after a line break +- tty.setcbreak(sys.stdin.fileno()) ++ if os.isatty(sys.stdin.fileno()): ++ tty.setcbreak(sys.stdin.fileno()) + + + # Type for the pure test name without .sol suffix or sub directory From e507ac4bdb0d81711900f6c9eefa78ebc28327f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Apr 2023 20:49:34 +0200 Subject: [PATCH 125/136] sysdig: also update driver --- pkgs/os-specific/linux/sysdig/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 70179065acc9..2157806e18dd 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -19,13 +19,8 @@ let driver = fetchFromGitHub { owner = "falcosecurity"; repo = "libs"; - rev = "3.0.1+driver"; - sha256 = "sha256-bK9wv17bVl93rOqw7JICnMOM0fDtPIErfMmUmNKOD5c="; - }; - # Workaround for scap-driver compilation error on kernel 6.2: https://github.com/falcosecurity/libs/issues/918 - driverPatch = fetchpatch { - url = "https://github.com/falcosecurity/libs/commit/b8ec3e8637c850066d01543616fe413e8deb9e1f.patch"; - hash = "sha256-s7iHbOjVqHSWRY4gktZldgrU5OClqRmbqmDtUgFIeh0="; + rev = libsRev; + sha256 = libsSha256; }; in @@ -73,7 +68,6 @@ stdenv.mkDerivation rec { chmod -R +w libs cp -r ${driver} driver-src chmod -R +w driver-src - patch -p1 -d driver-src < ${driverPatch} cmakeFlagsArray+=( "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" "-DVALIJSON_INCLUDE=${valijson}/include" From cd1e297b9327ff3242227264977e4bea2b747d81 Mon Sep 17 00:00:00 2001 From: Ali Caglayan Date: Tue, 4 Apr 2023 14:15:33 +0200 Subject: [PATCH 126/136] dune_3: 3.7.0 -> 3.7.1 Signed-off-by: Ali Caglayan --- pkgs/development/tools/ocaml/dune/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 06d2323af7cd..74e3ce56ec93 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "sha256-4tY3ydCAMY/t9ecdKin7NnYk+CrEom6D3ys6A1UFKLg="; + sha256 = "sha256-rfw48UwBiKKtgNYUUdAR0nq4g5txdJLXrUL3y5EcVMM="; }; nativeBuildInputs = [ ocaml findlib ]; From 92dd06ae1d8d710250b644bd776bb4f174044a39 Mon Sep 17 00:00:00 2001 From: Kiran Ostrolenk Date: Sun, 19 Feb 2023 22:13:03 +0000 Subject: [PATCH 127/136] nu_scripts: init at unstable-2023-03-16 --- pkgs/shells/nushell/nu_scripts/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/shells/nushell/nu_scripts/default.nix diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix new file mode 100644 index 000000000000..68c5dccd4226 --- /dev/null +++ b/pkgs/shells/nushell/nu_scripts/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "nu_scripts"; + version = "unstable-2023-03-16"; + + src = fetchFromGitHub { + owner = "nushell"; + repo = pname; + rev = "00b0039653be5dd2e6567ce8feea82064d27ae11"; + sha256 = "0m17cj5wzp94f01kwgs1dh76zwsl2irr7b06i9sb5skqxmmdnjnz"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/nu_scripts + mv ./* $out/share/nu_scripts + + runHook postInstall + ''; + + meta = { + description = "A place to share Nushell scripts with each other"; + homepage = "https://github.com/nushell/nu_scripts"; + license = lib.licenses.free; + + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.CardboardTurkey ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9d5e0e82f94..cca980259525 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26800,6 +26800,8 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) AppKit Security; }; + nu_scripts = callPackage ../shells/nushell/nu_scripts { }; + nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { } else unixtools.nettools; From 2831eb0a083a08ccc76ae9b3727db66cb16b46ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Apr 2023 20:40:49 +0000 Subject: [PATCH 128/136] tbls: 1.63.0 -> 1.64.0 --- pkgs/tools/misc/tbls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index 2fd8e30e6336..ec2e5b634e37 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "tbls"; - version = "1.63.0"; + version = "1.64.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-r0jCuSTNx5BVkJshPSAO5Wwz1C2Lw2AYXYA46cMB+qY="; + hash = "sha256-XHHoPaT+qo2UBfYvslFhhSmo7a9YsBX3Ay+piOBVTxc="; }; vendorHash = "sha256-YrDQSySBplYgakgvb6BwK1AK6h0Usy8MvCndHSSYrlQ="; From 246567a3ad88e3119c2001e2fe78be233474cde0 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Tue, 4 Apr 2023 12:24:35 +0200 Subject: [PATCH 129/136] josm: 18678 -> 18700 --- pkgs/applications/misc/josm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 91db91efa09d..ffcf26f7c003 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18678"; + version = "18700"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-p0HjjF4SLPsD/KcAPNyHasuGrDPSQ/2KHjX1R2eywNo="; + hash = "sha256-rJw38pOHi+OIjIKgglU0Y2Tlc/b8K9f04ru2IH0CUJ0="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-YlSFHx37RkdTlQ3/ZAqj+ezv+cSVifsxR7s6S7pDd4o="; + hash = "sha256-RTRe2GZz5B9QEYF04PiKtKJkWu0Em5WBqK4dVQVHK0g="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-Cga17ymUROJb5scpyOlo6JIgQ77yHavI0ciUpZN+jLk="; + sha256 = "sha256-/zdOaiyuvSwdVZcnw0ghDj2I+YKpFLc12fjZUMtRtVg="; }; }; in From 4a9c7011a18c90d9dee37fd1a994ac76a91de928 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 5 Apr 2023 07:21:19 +1000 Subject: [PATCH 130/136] gh: 2.25.1 -> 2.26.0 Diff: https://github.com/cli/cli/compare/v2.25.1...v2.26.0 Changelog: https://github.com/cli/cli/releases/tag/v2.26.0 --- pkgs/applications/version-management/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 1d284681e440..4c97160f0d1a 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.25.1"; + version = "2.26.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-CE3Ds9z5CB49Hb9IVuDKwRjGwuw+0d5zBpw2IVsO7Tc="; + hash = "sha256-PsZSlLI6ZcHsKWIwETJKPdNWin4YySGNpgH2Yc7rdF8="; }; - vendorHash = "sha256-nn2DzjcXHiuSaiEuWNZTAZ3+OKrEpRzUPzqmH+gZ9sY="; + vendorHash = "sha256-+8/cA0UxyVu7nyLhHYBWmn8Vs0O/EYepqTAOVU4gwt4="; nativeBuildInputs = [ installShellFiles ]; From 54cb3a75a9a2f8e99f417b817f3301ff5a400ee7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 5 Apr 2023 07:25:05 +1000 Subject: [PATCH 131/136] vimv-rs: 1.8.0 -> 2.0.0 --- pkgs/tools/misc/vimv-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vimv-rs/default.nix b/pkgs/tools/misc/vimv-rs/default.nix index dd19b2e89c2f..a0da6f236e44 100644 --- a/pkgs/tools/misc/vimv-rs/default.nix +++ b/pkgs/tools/misc/vimv-rs/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "vimv-rs"; - version = "1.8.0"; + version = "2.0.0"; src = fetchCrate { inherit version; crateName = "vimv"; - hash = "sha256-HEWhWPLFIEo+sOz0pbvhoFRNhYh/x0ohqDs48sHgHHk="; + hash = "sha256-dc1jN9phrTfLwa6Dx1liXNu49V2qjpiuHqn4KQnPYWQ="; }; - cargoHash = "sha256-ghO8HrHk5rjUiNbutWnrQLAd8vtVKV6pK12XZuSudSs="; + cargoHash = "sha256-1Oa4R85w5FyC6rjoZe53bJIykSSkUv2X3LQvK4w+qs0="; buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; From 4c40162cb5a4317df6250308c93761cc29d09c40 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 5 Apr 2023 07:31:41 +1000 Subject: [PATCH 132/136] clusterctl: 1.4.0 -> 1.4.1 Diff: https://github.com/kubernetes-sigs/cluster-api/compare/v1.4.0...v1.4.1 Changelog: https://github.com/kubernetes-sigs/cluster-api/releases/tag/v1.4.1 --- pkgs/applications/networking/cluster/clusterctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index dd389a374c50..7564a2c0c96b 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-K67TpHpA4gCyJbdTKKRGnHzY+gM3wN6GIxxfFW+zyYI="; + hash = "sha256-ST/3zoZgeG0P8TwxHEKucZ7DHoD6e6Qx47jv6e+r4Rs="; }; - vendorHash = "sha256-b3bvLkBl8I/MJe16fRvjpYX2MbZhuG3loACArtZ5mg0="; + vendorHash = "sha256-ZJFpzBeC048RZ6YfjXQPyohCO1WagxXvBBacifkfkjE="; subPackages = [ "cmd/clusterctl" ]; From dc2c96df1d5ee5da69f16b4b3f3f88eb010c63e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Apr 2023 19:48:18 +0000 Subject: [PATCH 133/136] gmic: 3.2.2 -> 3.2.3 --- pkgs/tools/graphics/gmic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index af3e31e37489..19b04054eedd 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "3.2.2"; + version = "3.2.3"; outputs = [ "out" "lib" "dev" "man" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "GreycLab"; repo = "gmic"; rev = "v.${version}"; - hash = "sha256-XLDnIs7IRIhQtz+qgdNypJODk6WJRPQ2M6LU6DJ+T7I="; + hash = "sha256-slEyZoYSNFrZ0d8a+mnJeqWQLqcJTPrkfpDpdag/vLA="; }; # TODO: build this from source @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gmic_stdlib = fetchurl { name = "gmic_stdlib.h"; url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h"; - hash = "sha256-lABUPhwlzoRODX7z8arOEU0JJszcXREhZ20WRToKNY4="; + hash = "sha256-ExMCxFkkctqrdSy5M/TXD5GBRmRA9YEdsYW8nWiTEYY="; }; nativeBuildInputs = [ From b3c599ebb62ec6a637ecf13370a1c8e14560e84b Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Tue, 4 Apr 2023 16:28:04 -0400 Subject: [PATCH 134/136] cimg: 3.2.2 -> 3.2.3 --- pkgs/development/libraries/cimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index b0173d3fa8ae..f47bf7a36a24 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-koXew0Lwb7wW8MQctTjxpo7TNVtrS5MzxQFfUS1gwZs="; + hash = "sha256-DFTqx4v3Hf2HyT02yBLo4n1yKPuPVz1oa2C5LsIeyCY="; }; outputs = [ "out" "doc" ]; From 0bb829166035c9559851a96c813a21aa4be54c42 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Tue, 4 Apr 2023 16:29:06 -0400 Subject: [PATCH 135/136] gmic-qt: 3.2.2 -> 3.2.3 --- pkgs/tools/graphics/gmic-qt/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index ef301c2b7abe..d81fe16a9109 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -2,7 +2,6 @@ , stdenv , variant ? "standalone" , fetchzip -, fetchpatch , cmake , pkg-config , ninja @@ -47,21 +46,13 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps stdenv.mkDerivation rec { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.2.2"; + version = "3.2.3"; src = fetchzip { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - hash = "sha256-Z6FU0BRTiOIoM6ViYgcwOifat4/IISFJXvyC8PwR5mA="; + hash = "sha256-OTdf9BtaRak/jv1GknidDAkdxf99saBqj6EMoRJDIuo="; }; - patches = [ - (fetchpatch { - name = "gmic-3.2.2-cmake-fixes.patch"; - url = "https://github.com/c-koi/gmic-qt/compare/5379307f9e484ad171b8d09e3572b93d120a9159..420e85e005401d942a3ca5f5c39ee3c867fe8bdd.diff"; - hash = "sha256-l2y9EFtE3nv8NBSSn6Wo0pLRoYO2hoyb5HZk0QmlSpk="; - }) - ]; - sourceRoot = "source/gmic-qt"; nativeBuildInputs = [ From 6dba375c3c3cbed024b39d28fd4611db03654f27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Apr 2023 04:35:22 +0000 Subject: [PATCH 136/136] ventoy-bin-full: 1.0.89 -> 1.0.90 --- pkgs/tools/cd-dvd/ventoy-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 0bfb1456fc51..3de0397d0634 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -51,13 +51,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ventoy-bin"; - version = "1.0.89"; + version = "1.0.90"; src = let inherit (finalAttrs) version; in fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - hash = "sha256-dPBMABzmITUenOe57BD5EmofZeXC9v6IpW7m+OhhYdA="; + hash = "sha256-UJ4kgtF2lIZn37p1SDkvCyHmuBSFSHmMHKLD4/ZorbQ="; }; patches = [