From 4c65cfcf285e25a6d96925b0ec07b0457537bf59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Oct 2022 05:34:48 +0000 Subject: [PATCH 001/326] ksmbd-tools: 3.4.5 -> 3.4.6 --- pkgs/os-specific/linux/ksmbd-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ksmbd-tools/default.nix b/pkgs/os-specific/linux/ksmbd-tools/default.nix index d0a1f1f4e684..5a58c198c0e4 100644 --- a/pkgs/os-specific/linux/ksmbd-tools/default.nix +++ b/pkgs/os-specific/linux/ksmbd-tools/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ksmbd-tools"; - version = "3.4.5"; + version = "3.4.6"; src = fetchFromGitHub { owner = "cifsd-team"; repo = pname; rev = version; - sha256 = "sha256-sSCLXNdVUAdk+GnFlVx/BsAzyfz0KDdugJ1isrOztgs="; + sha256 = "sha256-zquHhr+Zf4jR/TlVA0Zea3eZ9JjRjYXefcYIQs76gSw="; }; buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5; From 59957c54b45bde06a179b9a596d003c50bec88f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Oct 2022 23:33:11 +0000 Subject: [PATCH 002/326] mavproxy: 1.8.57 -> 1.8.59 --- pkgs/applications/science/robotics/mavproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 712374ef7520..c7a7315f70de 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.57"; + version = "1.8.59"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tsx3oVXPIa3OtbLWj3QWrW9leL9/jsdbbLG+Wd3nxn4="; + sha256 = "sha256-XY0d9q4nSuPflN4ZX+nT4RKFy6i4Cd2lNWvWaJQzWW8="; }; postPatch = '' From 5386e77490c31c67a49a3395b0a3e3d18369a4a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Oct 2022 05:21:49 +0000 Subject: [PATCH 003/326] tvm: 0.9.0 -> 0.10.0 --- pkgs/development/compilers/tvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix index 05d2f8696df2..e2245f800ad0 100644 --- a/pkgs/development/compilers/tvm/default.nix +++ b/pkgs/development/compilers/tvm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tvm"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "apache"; repo = "incubator-tvm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-lzLrd4vNK1c7BwWS0H5x1uDdZ3moUl+zWHb8G6gs8hw="; + sha256 = "sha256-v3F+qncs3PFkRllrdWvrle/ofg9thX4BJlvILQz9B6A="; }; nativeBuildInputs = [ cmake ]; From 018c1658d0700dedc883d376c3a626f1849d97fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Oct 2022 22:56:49 +0000 Subject: [PATCH 004/326] starboard: 0.15.10 -> 0.15.11 --- pkgs/applications/networking/cluster/starboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index e20a5ebd1af4..3b25ecaa3101 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.15.10"; + version = "0.15.11"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SuOfRLCEASgiLsy0xeuA1z55+vSMb4VGZuk+OVLSWJA="; + sha256 = "sha256-HgMGwumLL0z3l1/UEoJleoKsErFvznddFc9mJuco9fA="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-uTDeYzq8XyjHHXfPQzN/ipHfqsPweedKhQQ8CkvqKIM="; + vendorSha256 = "sha256-WThZpum6sEYyDkwGKo3onMLy6hpmMJ/o6+5olX5nEjk="; nativeBuildInputs = [ installShellFiles ]; From 2b433fd380cf9e7264d450220c38c731f18c2a9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Oct 2022 04:27:10 +0000 Subject: [PATCH 005/326] ceph-csi: 3.7.1 -> 3.7.2 --- pkgs/tools/filesystems/ceph-csi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ceph-csi/default.nix b/pkgs/tools/filesystems/ceph-csi/default.nix index f3f66d7b08f9..05a2ac8d306f 100644 --- a/pkgs/tools/filesystems/ceph-csi/default.nix +++ b/pkgs/tools/filesystems/ceph-csi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "ceph-csi"; - version = "3.7.1"; + version = "3.7.2"; nativeBuildInputs = [ go ]; buildInputs = [ ceph ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "ceph"; repo = "ceph-csi"; rev = "v${version}"; - sha256 = "sha256-VlOKN2PjHM0MdDz6t/AAjcFx4F15+7p3+25tLkRQH1Q="; + sha256 = "sha256-8RbuM+lXkwO5Z1H+SKDGHyNNYYC8VVG9feX46SHC/Q0="; }; preConfigure = '' From b7b567d302cf63339220dcd784971161d7a47cf5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 22 Oct 2022 02:11:31 +0000 Subject: [PATCH 006/326] sharedown: 5.0.2 -> 5.1.0 --- pkgs/tools/misc/sharedown/default.nix | 4 +- pkgs/tools/misc/sharedown/yarn.lock | 503 +++++++------------------ pkgs/tools/misc/sharedown/yarndeps.nix | 496 ++++++------------------ 3 files changed, 262 insertions(+), 741 deletions(-) diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index da61b00527a7..ecb2d83d43e7 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -17,13 +17,13 @@ stdenvNoCC.mkDerivation rec { pname = "Sharedown"; - version = "5.0.2"; + version = "5.1.0"; src = fetchFromGitHub { owner = "kylon"; repo = pname; rev = version; - sha256 = "sha256-N5jnjiD3R+uTRgHHocVVxYQ7GzUTz0fZAQGIXzcVTtA="; + sha256 = "sha256-cD+xq2LVaTZGjFj+SleQlNT3sAV6N4nG4RVbH015OOA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/sharedown/yarn.lock b/pkgs/tools/misc/sharedown/yarn.lock index e9e3d218a308..fc30e71aaf5f 100644 --- a/pkgs/tools/misc/sharedown/yarn.lock +++ b/pkgs/tools/misc/sharedown/yarn.lock @@ -44,6 +44,11 @@ minimatch "^3.0.4" plist "^3.0.4" +"@fortawesome/fontawesome-free@^6.2.0": + version "6.2.0" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz#ba3510825b332816fe7190f28827f8cb33a298b5" + integrity sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ== + "@malept/cross-spawn-promise@^1.1.0": version "1.1.1" resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" @@ -111,14 +116,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "18.7.16" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.16.tgz#0eb3cce1e37c79619943d2fd903919fc30850601" - integrity sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg== + version "18.11.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.3.tgz#78a6d7ec962b596fc2d2ec102c4dd3ef073fea6a" + integrity sha512-fNjDQzzOsZeKZu5NATgXUPsaFaTxeRgFXoosrHivTl8RGeV733OLawXsGfEk9a8/tySyZUyiZ6E8LcjPFZ2y1A== "@types/node@^16.11.26": - version "16.11.58" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.58.tgz#0a3698dee3492617a8d5fe7998d18d7520b63026" - integrity sha512-uMVxJ111wpHzkx/vshZFb6Qni3BOMnlWLq7q9jrwej7Yw/KvjsEbpxCCxw+hLKxexFMc8YmpG8J9tnEe/rKsIg== + version "16.11.68" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.68.tgz#30ee923f4d940793e0380f5ce61c0bd4b7196b6c" + integrity sha512-JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ== "@types/plist@^3.0.1": version "3.0.2" @@ -139,9 +144,9 @@ integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^17.0.1": - version "17.0.12" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.12.tgz#0745ff3e4872b4ace98616d4b7e37ccbd75f9526" - integrity sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ== + version "17.0.13" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76" + integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg== dependencies: "@types/yargs-parser" "*" @@ -174,13 +179,6 @@ ajv@^6.10.0, ajv@^6.12.0: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ansi-align@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" - integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== - dependencies: - string-width "^4.1.0" - ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" @@ -198,10 +196,10 @@ app-builder-bin@4.0.0: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== -app-builder-lib@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.3.3.tgz#78b9dbb0bd8a69842461edd77a3226d0547c5939" - integrity sha512-m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ== +app-builder-lib@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8" + integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" @@ -209,13 +207,13 @@ app-builder-lib@23.3.3: "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chromium-pickle-js "^0.2.0" debug "^4.3.4" ejs "^3.1.7" electron-osx-sign "^0.6.0" - electron-publish "23.3.3" + electron-publish "23.6.0" form-data "^4.0.0" fs-extra "^10.1.0" hosted-git-info "^4.1.0" @@ -282,13 +280,14 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -axios@^0.27.2: - version "0.27.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" - integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== +axios@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35" + integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA== dependencies: - follow-redirects "^1.14.9" + follow-redirects "^1.15.0" form-data "^4.0.0" + proxy-from-env "^1.1.0" balanced-match@^1.0.0: version "1.0.2" @@ -326,24 +325,10 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== -bootstrap@5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.1.tgz#45f97ff05cbe828bad807b014d8425f3aeb8ec3a" - integrity sha512-UQi3v2NpVPEi1n35dmRRzBJFlgvWHYwyem6yHhuT6afYF+sziEt46McRbT//kVXZ7b1YUYEVGdXEH74Nx3xzGA== - -boxen@^5.0.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" - integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== - dependencies: - ansi-align "^3.0.0" - camelcase "^6.2.0" - chalk "^4.1.0" - cli-boxes "^2.2.1" - string-width "^4.2.2" - type-fest "^0.20.2" - widest-line "^3.1.0" - wrap-ansi "^7.0.0" +bootstrap@5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.2.tgz#834e053eed584a65e244d8aa112a6959f56e27a0" + integrity sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ== brace-expansion@^1.1.7: version "1.1.11" @@ -401,25 +386,25 @@ buffer@^5.1.0, buffer@^5.2.1, buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@9.0.3: - version "9.0.3" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz#6c62c493ba2b73c2af92432db4013b5a327f02b2" - integrity sha512-SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA== +builder-util-runtime@9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60" + integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw== dependencies: debug "^4.3.4" sax "^1.2.4" -builder-util@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.3.3.tgz#449ee57ec1ffc7e59f7a3a8a1a33d25cf5e39e43" - integrity sha512-MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA== +builder-util@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9" + integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ== dependencies: "7zip-bin" "~5.1.1" "@types/debug" "^4.1.6" "@types/fs-extra" "^9.0.11" app-builder-bin "4.0.0" bluebird-lst "^1.0.9" - builder-util-runtime "9.0.3" + builder-util-runtime "9.1.1" chalk "^4.1.1" cross-spawn "^7.0.3" debug "^4.3.4" @@ -445,12 +430,7 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" -camelcase@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" - integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== - -chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.2, chalk@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -473,20 +453,10 @@ chromium-pickle-js@^0.2.0: resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== - ci-info@^3.2.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.4.0.tgz#b28484fd436cbc267900364f096c9dc185efb251" - integrity sha512-t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug== - -cli-boxes@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" - integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== + version "3.5.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f" + integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw== cli-truncate@^2.1.0: version "2.1.0" @@ -505,13 +475,13 @@ clipboardy@2.3.0: execa "^1.0.0" is-wsl "^2.1.1" -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== dependencies: string-width "^4.2.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" wrap-ansi "^7.0.0" clone-response@^1.0.2: @@ -575,18 +545,6 @@ config-chain@^1.1.11: ini "^1.3.4" proto-list "~1.2.1" -configstore@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" - integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== - dependencies: - dot-prop "^5.2.0" - graceful-fs "^4.1.2" - make-dir "^3.0.0" - unique-string "^2.0.0" - write-file-atomic "^3.0.0" - xdg-basedir "^4.0.0" - core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -626,11 +584,6 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -crypto-random-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" - integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== - debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -692,10 +645,10 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -devtools-protocol@0.0.1036444: - version "0.0.1036444" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1036444.tgz#a570d3cdde61527c82f9b03919847b8ac7b1c2b9" - integrity sha512-0y4f/T8H9lsESV9kKP1HDUXgHxCdniFeJh6Erq+FbdOEvp/Ydp9t8kcAAM5gOd17pMrTDlFWntoHtzzeTUWKNw== +devtools-protocol@0.0.1045489: + version "0.0.1045489" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1045489.tgz#f959ad560b05acd72d55644bc3fb8168a83abf28" + integrity sha512-D+PTmWulkuQW4D1NTiCRCFxF7pQPn0hgp4YyX4wAQ6xYXKOadSWPR3ENGDQ47MW/Ewc9v2rpC/UEEGahgBYpSQ== dir-compare@^2.4.0: version "2.4.0" @@ -707,14 +660,14 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dmg-builder@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.3.3.tgz#b37547f8403c3e9f7c60265a93d902f5b0c395ea" - integrity sha512-ECwAjt+ZWyOvddrkDx1xRD6IVUCZb5SV6vSMHZd+Va3G2sUXHrnglR1cGDKRF4oYRQm8SYVrpLZKbi8npyDcAQ== +dmg-builder@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948" + integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA== dependencies: - app-builder-lib "23.3.3" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" fs-extra "^10.0.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" @@ -735,13 +688,6 @@ dmg-license@^1.0.11: smart-buffer "^4.0.2" verror "^1.10.0" -dot-prop@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" - integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== - dependencies: - is-obj "^2.0.0" - dotenv-expand@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" @@ -764,23 +710,23 @@ ejs@^3.1.7: dependencies: jake "^10.8.5" -electron-builder@^23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.3.3.tgz#88d4e584a99b9e36ca4e8432b1163a1ef877355f" - integrity sha512-mFYYdhoFPKevP6y5uaaF3dusmB2OtQ/HnwwpyOePeU7QDS0SEIAUokQsHUanAiJAZcBqtY7iyLBgX18QybdFFw== +electron-builder@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz#c79050cbdce90ed96c5feb67c34e9e0a21b5331b" + integrity sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw== dependencies: "@types/yargs" "^17.0.1" - app-builder-lib "23.3.3" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chalk "^4.1.1" - dmg-builder "23.3.3" + dmg-builder "23.6.0" fs-extra "^10.0.0" is-ci "^3.0.0" lazy-val "^1.0.5" read-config-file "6.2.0" - update-notifier "^5.1.0" - yargs "^17.0.1" + simple-update-notifier "^1.0.7" + yargs "^17.5.1" electron-osx-sign@^0.6.0: version "0.6.0" @@ -794,23 +740,23 @@ electron-osx-sign@^0.6.0: minimist "^1.2.0" plist "^3.0.1" -electron-publish@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.3.3.tgz#c4125fbb00620acb854f6e994fd3ab3115662ddd" - integrity sha512-1dX17eE5xVXedTxjC+gjsP74oC0+sIHgqysp0ryTlF9+yfQUyXjBk6kcK+zhtBA2SsHMSglDtM+JPxDD/WpPTQ== +electron-publish@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9" + integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chalk "^4.1.1" fs-extra "^10.0.0" lazy-val "^1.0.5" mime "^2.5.2" -electron@^20.1.2: - version "20.1.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-20.1.3.tgz#8a4e3f6945fa7ed06ba54d0f987737b0e057ceb4" - integrity sha512-DXBHzAwcpCor9MrxG9QA3Zt0sNcQbJ8ZJCYTC6xpuPe5wugBa6RF3hXqDUYdD2yOCUhjLbD3VASWn0+5LdYT3g== +electron@^21.0.1: + version "21.2.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-21.2.0.tgz#8eb65d69b36aa8dac0ee7330eab70181df211c8b" + integrity sha512-oKV4fo8l6jlOZ1cYZ4RpZz02ZxLuBo3SO7DH+FrJ8uDyCirP+eVJ/qlzu23odtNe0P7S/mYAZbC6abZHWoqtLg== dependencies: "@electron/get" "^1.14.1" "@types/node" "^16.11.26" @@ -848,11 +794,6 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== -escape-goat@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" - integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== - escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" @@ -921,15 +862,10 @@ filelist@^1.0.1: dependencies: minimatch "^5.0.1" -follow-redirects@^1.14.9: - version "1.15.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" - integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== - -font-awesome@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" - integrity sha512-U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg== +follow-redirects@^1.15.0: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== form-data@^4.0.0: version "4.0.0" @@ -996,9 +932,9 @@ get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598" - integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA== + version "1.1.3" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" + integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -1047,13 +983,6 @@ global-agent@^3.0.0: semver "^7.3.2" serialize-error "^7.0.1" -global-dirs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" - integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== - dependencies: - ini "2.0.0" - global-tunnel-ng@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" @@ -1088,7 +1017,7 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: +graceful-fs@^4.1.6, graceful-fs@^4.2.0: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== @@ -1115,11 +1044,6 @@ has-symbols@^1.0.3: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== -has-yarn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" - integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -1176,16 +1100,6 @@ ieee754@^1.1.13: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A== - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== - inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -1199,23 +1113,11 @@ inherits@2, inherits@^2.0.3, inherits@^2.0.4: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" - integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== - ini@^1.3.4, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -is-ci@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" - integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== - dependencies: - ci-info "^2.0.0" - is-ci@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" @@ -1233,39 +1135,11 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-installed-globally@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" - integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== - dependencies: - global-dirs "^3.0.0" - is-path-inside "^3.0.2" - -is-npm@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" - integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== - -is-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" - integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== - -is-path-inside@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== -is-typedarray@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== - is-wsl@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" @@ -1273,11 +1147,6 @@ is-wsl@^2.1.1: dependencies: is-docker "^2.0.0" -is-yarn-global@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" - integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== - isbinaryfile@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" @@ -1368,13 +1237,6 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" -latest-version@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" - integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== - dependencies: - package-json "^6.3.0" - lazy-val@^1.0.4, lazy-val@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" @@ -1402,13 +1264,6 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -make-dir@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -1465,9 +1320,9 @@ minimatch@^5.0.1: brace-expansion "^2.0.1" minimist@^1.2.0, minimist@^1.2.3: - version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== minipass@^3.0.0: version "3.3.4" @@ -1515,9 +1370,9 @@ nice-try@^1.0.4: integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== node-abi@^3.3.0: - version "3.24.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.24.0.tgz#b9d03393a49f2c7e147d0c99f180e680c27c1599" - integrity sha512-YPG3Co0luSu6GwOBsmIdGW6Wx0NyNDLg/hriIyDllVsNwnI6UeqaWShxC3lbH4LtEQUgoLP3XR1ndXiDAWvmRw== + version "3.28.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.28.0.tgz#b0df8b317e1c4f2f323756c5fc8ffccc5bca4718" + integrity sha512-fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A== dependencies: semver "^7.3.5" @@ -1580,16 +1435,6 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow== -package-json@^6.3.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" - integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== - dependencies: - got "^9.6.0" - registry-auth-token "^4.0.0" - registry-url "^5.0.0" - semver "^6.2.0" - path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -1656,7 +1501,7 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== -proxy-from-env@1.1.0: +proxy-from-env@1.1.0, proxy-from-env@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== @@ -1674,31 +1519,33 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -pupa@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" - integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== - dependencies: - escape-goat "^2.0.0" - -puppeteer@17.1.2: - version "17.1.2" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-17.1.2.tgz#1e8ea8b0eee0e6afc5d95e2db6ae828a51ad63c9" - integrity sha512-xgFOxUl4hRjwQpODZSeJlE/rUzi8OmHtc3T4ir4CRYGzVmaTVHAl8VGpI0ooy752u2DFeMxvQdHmxNnLqPImIg== +puppeteer-core@19.0.0: + version "19.0.0" + resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.0.0.tgz#8d0198550e04c7d5e0847200ba257b2a777dbd3b" + integrity sha512-OljQ9W5M4cBX68vnOAGbcRkVENDHn6lfj6QYoGsnLQsxPAh6ExTQAhHauwdFdQkhYdDExZFWlKArnBONzeHY+g== dependencies: cross-fetch "3.1.5" debug "4.3.4" - devtools-protocol "0.0.1036444" + devtools-protocol "0.0.1045489" extract-zip "2.0.1" https-proxy-agent "5.0.1" - progress "2.0.3" proxy-from-env "1.1.0" rimraf "3.0.2" tar-fs "2.1.1" unbzip2-stream "1.4.3" - ws "8.8.1" + ws "8.9.0" -rc@1.2.8, rc@^1.2.7, rc@^1.2.8: +puppeteer@19.0.0: + version "19.0.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.0.0.tgz#848986e6ecec37b19cd5a7327ad2fcf1f1cb83fd" + integrity sha512-3Ga5IVerQQ2hKU9q7T28RmcUsd8F2kL6cYuPcPCzeclSjmHhGydPBZL/KJKC02sG6J6Wfry85uiWpbkjQ5qBiw== + dependencies: + https-proxy-agent "5.0.1" + progress "2.0.3" + proxy-from-env "1.1.0" + puppeteer-core "19.0.0" + +rc@^1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -1728,20 +1575,6 @@ readable-stream@^3.1.1, readable-stream@^3.4.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" -registry-auth-token@^4.0.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac" - integrity sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg== - dependencies: - rc "1.2.8" - -registry-url@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" - integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== - dependencies: - rc "^1.2.8" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -1800,30 +1633,28 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== -semver-diff@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" - integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== - dependencies: - semver "^6.3.0" - semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: +semver@^6.2.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== +semver@^7.3.2, semver@^7.3.5, semver@^7.3.7: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== dependencies: lru-cache "^6.0.0" +semver@~7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== + serialize-error@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" @@ -1855,7 +1686,7 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -signal-exit@^3.0.0, signal-exit@^3.0.2: +signal-exit@^3.0.0: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== @@ -1874,6 +1705,13 @@ simple-get@^4.0.0: once "^1.3.1" simple-concat "^1.0.0" +simple-update-notifier@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz#7edf75c5bdd04f88828d632f762b2bc32996a9cc" + integrity sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew== + dependencies: + semver "~7.0.0" + slice-ansi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" @@ -1911,7 +1749,7 @@ stat-mode@^1.0.0: resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -2052,18 +1890,6 @@ type-fest@^0.13.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== - -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== - dependencies: - is-typedarray "^1.0.0" - unbzip2-stream@1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" @@ -2072,13 +1898,6 @@ unbzip2-stream@1.4.3: buffer "^5.2.1" through "^2.3.8" -unique-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" - integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== - dependencies: - crypto-random-string "^2.0.0" - universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -2089,26 +1908,6 @@ universalify@^2.0.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== -update-notifier@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" - integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== - dependencies: - boxen "^5.0.0" - chalk "^4.1.0" - configstore "^5.0.1" - has-yarn "^2.1.0" - import-lazy "^2.1.0" - is-ci "^2.0.0" - is-installed-globally "^0.4.0" - is-npm "^5.0.0" - is-yarn-global "^0.3.0" - latest-version "^5.1.0" - pupa "^2.1.1" - semver "^7.3.4" - semver-diff "^3.1.1" - xdg-basedir "^4.0.0" - uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -2169,13 +1968,6 @@ which@^2.0.1: dependencies: isexe "^2.0.0" -widest-line@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" - integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== - dependencies: - string-width "^4.0.0" - wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -2190,25 +1982,10 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -write-file-atomic@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" - integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== - dependencies: - imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" - -ws@8.8.1: - version "8.8.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0" - integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA== - -xdg-basedir@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" - integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== +ws@8.9.0: + version "8.9.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz#2a994bb67144be1b53fe2d23c53c028adeb7f45e" + integrity sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg== xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: version "15.1.1" @@ -2230,12 +2007,12 @@ yargs-parser@^21.0.0: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@^17.0.1: - version "17.5.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e" - integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA== +yargs@^17.5.1: + version "17.6.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c" + integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g== dependencies: - cliui "^7.0.2" + cliui "^8.0.1" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" diff --git a/pkgs/tools/misc/sharedown/yarndeps.nix b/pkgs/tools/misc/sharedown/yarndeps.nix index 23daea0448c3..b22d280d8a0a 100644 --- a/pkgs/tools/misc/sharedown/yarndeps.nix +++ b/pkgs/tools/misc/sharedown/yarndeps.nix @@ -33,6 +33,14 @@ sha512 = "7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ=="; }; } + { + name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.0.tgz"; + path = fetchurl { + name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz"; + sha512 = "CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ=="; + }; + } { name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; path = fetchurl { @@ -114,19 +122,19 @@ }; } { - name = "_types_node___node_18.7.16.tgz"; + name = "_types_node___node_18.11.3.tgz"; path = fetchurl { - name = "_types_node___node_18.7.16.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.7.16.tgz"; - sha512 = "EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg=="; + name = "_types_node___node_18.11.3.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.3.tgz"; + sha512 = "fNjDQzzOsZeKZu5NATgXUPsaFaTxeRgFXoosrHivTl8RGeV733OLawXsGfEk9a8/tySyZUyiZ6E8LcjPFZ2y1A=="; }; } { - name = "_types_node___node_16.11.58.tgz"; + name = "_types_node___node_16.11.68.tgz"; path = fetchurl { - name = "_types_node___node_16.11.58.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.58.tgz"; - sha512 = "uMVxJ111wpHzkx/vshZFb6Qni3BOMnlWLq7q9jrwej7Yw/KvjsEbpxCCxw+hLKxexFMc8YmpG8J9tnEe/rKsIg=="; + name = "_types_node___node_16.11.68.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.68.tgz"; + sha512 = "JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ=="; }; } { @@ -154,11 +162,11 @@ }; } { - name = "_types_yargs___yargs_17.0.12.tgz"; + name = "_types_yargs___yargs_17.0.13.tgz"; path = fetchurl { - name = "_types_yargs___yargs_17.0.12.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.12.tgz"; - sha512 = "Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ=="; + name = "_types_yargs___yargs_17.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz"; + sha512 = "9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg=="; }; } { @@ -193,14 +201,6 @@ sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; } - { - name = "ansi_align___ansi_align_3.0.1.tgz"; - path = fetchurl { - name = "ansi_align___ansi_align_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz"; - sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; - }; - } { name = "ansi_regex___ansi_regex_5.0.1.tgz"; path = fetchurl { @@ -226,11 +226,11 @@ }; } { - name = "app_builder_lib___app_builder_lib_23.3.3.tgz"; + name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.3.3.tgz"; - sha512 = "m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ=="; + name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz"; + sha512 = "dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA=="; }; } { @@ -306,11 +306,11 @@ }; } { - name = "axios___axios_0.27.2.tgz"; + name = "axios___axios_1.1.3.tgz"; path = fetchurl { - name = "axios___axios_0.27.2.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz"; - sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; + name = "axios___axios_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz"; + sha512 = "00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA=="; }; } { @@ -362,19 +362,11 @@ }; } { - name = "bootstrap___bootstrap_5.2.1.tgz"; + name = "bootstrap___bootstrap_5.2.2.tgz"; path = fetchurl { - name = "bootstrap___bootstrap_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.1.tgz"; - sha512 = "UQi3v2NpVPEi1n35dmRRzBJFlgvWHYwyem6yHhuT6afYF+sziEt46McRbT//kVXZ7b1YUYEVGdXEH74Nx3xzGA=="; - }; - } - { - name = "boxen___boxen_5.1.2.tgz"; - path = fetchurl { - name = "boxen___boxen_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz"; - sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; + name = "bootstrap___bootstrap_5.2.2.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.2.tgz"; + sha512 = "dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ=="; }; } { @@ -450,19 +442,19 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_9.0.3.tgz"; + name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_9.0.3.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz"; - sha512 = "SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA=="; + name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz"; + sha512 = "azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw=="; }; } { - name = "builder_util___builder_util_23.3.3.tgz"; + name = "builder_util___builder_util_23.6.0.tgz"; path = fetchurl { - name = "builder_util___builder_util_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-23.3.3.tgz"; - sha512 = "MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA=="; + name = "builder_util___builder_util_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz"; + sha512 = "QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ=="; }; } { @@ -473,14 +465,6 @@ sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; } - { - name = "camelcase___camelcase_6.3.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz"; - sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; - }; - } { name = "chalk___chalk_4.1.2.tgz"; path = fetchurl { @@ -514,27 +498,11 @@ }; } { - name = "ci_info___ci_info_2.0.0.tgz"; + name = "ci_info___ci_info_3.5.0.tgz"; path = fetchurl { - name = "ci_info___ci_info_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; - }; - } - { - name = "ci_info___ci_info_3.4.0.tgz"; - path = fetchurl { - name = "ci_info___ci_info_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.4.0.tgz"; - sha512 = "t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug=="; - }; - } - { - name = "cli_boxes___cli_boxes_2.2.1.tgz"; - path = fetchurl { - name = "cli_boxes___cli_boxes_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz"; - sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; + name = "ci_info___ci_info_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz"; + sha512 = "yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw=="; }; } { @@ -554,11 +522,11 @@ }; } { - name = "cliui___cliui_7.0.4.tgz"; + name = "cliui___cliui_8.0.1.tgz"; path = fetchurl { - name = "cliui___cliui_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; - sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; + name = "cliui___cliui_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz"; + sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; }; } { @@ -641,14 +609,6 @@ sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; }; } - { - name = "configstore___configstore_5.0.1.tgz"; - path = fetchurl { - name = "configstore___configstore_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; - sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; - }; - } { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { @@ -689,14 +649,6 @@ sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; } - { - name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; - path = fetchurl { - name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; - sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; - }; - } { name = "debug___debug_4.3.4.tgz"; path = fetchurl { @@ -778,11 +730,11 @@ }; } { - name = "devtools_protocol___devtools_protocol_0.0.1036444.tgz"; + name = "devtools_protocol___devtools_protocol_0.0.1045489.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.1036444.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1036444.tgz"; - sha512 = "0y4f/T8H9lsESV9kKP1HDUXgHxCdniFeJh6Erq+FbdOEvp/Ydp9t8kcAAM5gOd17pMrTDlFWntoHtzzeTUWKNw=="; + name = "devtools_protocol___devtools_protocol_0.0.1045489.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1045489.tgz"; + sha512 = "D+PTmWulkuQW4D1NTiCRCFxF7pQPn0hgp4YyX4wAQ6xYXKOadSWPR3ENGDQ47MW/Ewc9v2rpC/UEEGahgBYpSQ=="; }; } { @@ -794,11 +746,11 @@ }; } { - name = "dmg_builder___dmg_builder_23.3.3.tgz"; + name = "dmg_builder___dmg_builder_23.6.0.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.3.3.tgz"; - sha512 = "ECwAjt+ZWyOvddrkDx1xRD6IVUCZb5SV6vSMHZd+Va3G2sUXHrnglR1cGDKRF4oYRQm8SYVrpLZKbi8npyDcAQ=="; + name = "dmg_builder___dmg_builder_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz"; + sha512 = "jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA=="; }; } { @@ -809,14 +761,6 @@ sha512 = "ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q=="; }; } - { - name = "dot_prop___dot_prop_5.3.0.tgz"; - path = fetchurl { - name = "dot_prop___dot_prop_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; - sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; - }; - } { name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; path = fetchurl { @@ -850,11 +794,11 @@ }; } { - name = "electron_builder___electron_builder_23.3.3.tgz"; + name = "electron_builder___electron_builder_23.6.0.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.3.3.tgz"; - sha512 = "mFYYdhoFPKevP6y5uaaF3dusmB2OtQ/HnwwpyOePeU7QDS0SEIAUokQsHUanAiJAZcBqtY7iyLBgX18QybdFFw=="; + name = "electron_builder___electron_builder_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz"; + sha512 = "y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw=="; }; } { @@ -866,19 +810,19 @@ }; } { - name = "electron_publish___electron_publish_23.3.3.tgz"; + name = "electron_publish___electron_publish_23.6.0.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.3.3.tgz"; - sha512 = "1dX17eE5xVXedTxjC+gjsP74oC0+sIHgqysp0ryTlF9+yfQUyXjBk6kcK+zhtBA2SsHMSglDtM+JPxDD/WpPTQ=="; + name = "electron_publish___electron_publish_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz"; + sha512 = "jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg=="; }; } { - name = "electron___electron_20.1.3.tgz"; + name = "electron___electron_21.2.0.tgz"; path = fetchurl { - name = "electron___electron_20.1.3.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-20.1.3.tgz"; - sha512 = "DXBHzAwcpCor9MrxG9QA3Zt0sNcQbJ8ZJCYTC6xpuPe5wugBa6RF3hXqDUYdD2yOCUhjLbD3VASWn0+5LdYT3g=="; + name = "electron___electron_21.2.0.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-21.2.0.tgz"; + sha512 = "oKV4fo8l6jlOZ1cYZ4RpZz02ZxLuBo3SO7DH+FrJ8uDyCirP+eVJ/qlzu23odtNe0P7S/mYAZbC6abZHWoqtLg=="; }; } { @@ -929,14 +873,6 @@ sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; } - { - name = "escape_goat___escape_goat_2.1.1.tgz"; - path = fetchurl { - name = "escape_goat___escape_goat_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; - sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; - }; - } { name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; path = fetchurl { @@ -1018,19 +954,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.15.1.tgz"; + name = "follow_redirects___follow_redirects_1.15.2.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.15.1.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz"; - sha512 = "yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="; - }; - } - { - name = "font_awesome___font_awesome_4.7.0.tgz"; - path = fetchurl { - name = "font_awesome___font_awesome_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz"; - sha512 = "U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg=="; + name = "follow_redirects___follow_redirects_1.15.2.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz"; + sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; }; } { @@ -1106,11 +1034,11 @@ }; } { - name = "get_intrinsic___get_intrinsic_1.1.2.tgz"; + name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz"; - sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; + name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; + sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; }; } { @@ -1153,14 +1081,6 @@ sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; }; } - { - name = "global_dirs___global_dirs_3.0.0.tgz"; - path = fetchurl { - name = "global_dirs___global_dirs_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz"; - sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; - }; - } { name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; path = fetchurl { @@ -1225,14 +1145,6 @@ sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; } - { - name = "has_yarn___has_yarn_2.1.0.tgz"; - path = fetchurl { - name = "has_yarn___has_yarn_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; - sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; - }; - } { name = "has___has_1.0.3.tgz"; path = fetchurl { @@ -1297,22 +1209,6 @@ sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; } - { - name = "import_lazy___import_lazy_2.1.0.tgz"; - path = fetchurl { - name = "import_lazy___import_lazy_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; - sha512 = "m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A=="; - }; - } - { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - path = fetchurl { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; - }; - } { name = "inflight___inflight_1.0.6.tgz"; path = fetchurl { @@ -1329,14 +1225,6 @@ sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } - { - name = "ini___ini_2.0.0.tgz"; - path = fetchurl { - name = "ini___ini_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz"; - sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; - }; - } { name = "ini___ini_1.3.8.tgz"; path = fetchurl { @@ -1345,14 +1233,6 @@ sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; } - { - name = "is_ci___is_ci_2.0.0.tgz"; - path = fetchurl { - name = "is_ci___is_ci_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; - sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; - }; - } { name = "is_ci___is_ci_3.0.1.tgz"; path = fetchurl { @@ -1377,38 +1257,6 @@ sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; } - { - name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; - path = fetchurl { - name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; - sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; - }; - } - { - name = "is_npm___is_npm_5.0.0.tgz"; - path = fetchurl { - name = "is_npm___is_npm_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz"; - sha512 = "WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="; - }; - } - { - name = "is_obj___is_obj_2.0.0.tgz"; - path = fetchurl { - name = "is_obj___is_obj_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; - sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; - }; - } - { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - path = fetchurl { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; - }; - } { name = "is_stream___is_stream_1.1.0.tgz"; path = fetchurl { @@ -1417,14 +1265,6 @@ sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="; }; } - { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - path = fetchurl { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; - }; - } { name = "is_wsl___is_wsl_2.2.0.tgz"; path = fetchurl { @@ -1433,14 +1273,6 @@ sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; } - { - name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; - path = fetchurl { - name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; - sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; - }; - } { name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; path = fetchurl { @@ -1553,14 +1385,6 @@ sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; } - { - name = "latest_version___latest_version_5.1.0.tgz"; - path = fetchurl { - name = "latest_version___latest_version_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; - sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; - }; - } { name = "lazy_val___lazy_val_1.0.5.tgz"; path = fetchurl { @@ -1601,14 +1425,6 @@ sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } - { - name = "make_dir___make_dir_3.1.0.tgz"; - path = fetchurl { - name = "make_dir___make_dir_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; - sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; - }; - } { name = "matcher___matcher_3.0.0.tgz"; path = fetchurl { @@ -1682,11 +1498,11 @@ }; } { - name = "minimist___minimist_1.2.6.tgz"; + name = "minimist___minimist_1.2.7.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz"; - sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; + name = "minimist___minimist_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz"; + sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; }; } { @@ -1754,11 +1570,11 @@ }; } { - name = "node_abi___node_abi_3.24.0.tgz"; + name = "node_abi___node_abi_3.28.0.tgz"; path = fetchurl { - name = "node_abi___node_abi_3.24.0.tgz"; - url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.24.0.tgz"; - sha512 = "YPG3Co0luSu6GwOBsmIdGW6Wx0NyNDLg/hriIyDllVsNwnI6UeqaWShxC3lbH4LtEQUgoLP3XR1ndXiDAWvmRw=="; + name = "node_abi___node_abi_3.28.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.28.0.tgz"; + sha512 = "fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A=="; }; } { @@ -1841,14 +1657,6 @@ sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; }; } - { - name = "package_json___package_json_6.5.0.tgz"; - path = fetchurl { - name = "package_json___package_json_6.5.0.tgz"; - url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; - sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; - }; - } { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { @@ -1954,19 +1762,19 @@ }; } { - name = "pupa___pupa_2.1.1.tgz"; + name = "puppeteer_core___puppeteer_core_19.0.0.tgz"; path = fetchurl { - name = "pupa___pupa_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz"; - sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; + name = "puppeteer_core___puppeteer_core_19.0.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.0.0.tgz"; + sha512 = "OljQ9W5M4cBX68vnOAGbcRkVENDHn6lfj6QYoGsnLQsxPAh6ExTQAhHauwdFdQkhYdDExZFWlKArnBONzeHY+g=="; }; } { - name = "puppeteer___puppeteer_17.1.2.tgz"; + name = "puppeteer___puppeteer_19.0.0.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_17.1.2.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-17.1.2.tgz"; - sha512 = "xgFOxUl4hRjwQpODZSeJlE/rUzi8OmHtc3T4ir4CRYGzVmaTVHAl8VGpI0ooy752u2DFeMxvQdHmxNnLqPImIg=="; + name = "puppeteer___puppeteer_19.0.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.0.0.tgz"; + sha512 = "3Ga5IVerQQ2hKU9q7T28RmcUsd8F2kL6cYuPcPCzeclSjmHhGydPBZL/KJKC02sG6J6Wfry85uiWpbkjQ5qBiw=="; }; } { @@ -1993,22 +1801,6 @@ sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; } - { - name = "registry_auth_token___registry_auth_token_4.2.2.tgz"; - path = fetchurl { - name = "registry_auth_token___registry_auth_token_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz"; - sha512 = "PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg=="; - }; - } - { - name = "registry_url___registry_url_5.1.0.tgz"; - path = fetchurl { - name = "registry_url___registry_url_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; - sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; - }; - } { name = "require_directory___require_directory_2.1.1.tgz"; path = fetchurl { @@ -2081,14 +1873,6 @@ sha512 = "YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="; }; } - { - name = "semver_diff___semver_diff_3.1.1.tgz"; - path = fetchurl { - name = "semver_diff___semver_diff_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; - sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; - }; - } { name = "semver___semver_5.7.1.tgz"; path = fetchurl { @@ -2106,11 +1890,19 @@ }; } { - name = "semver___semver_7.3.7.tgz"; + name = "semver___semver_7.3.8.tgz"; path = fetchurl { - name = "semver___semver_7.3.7.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; + name = "semver___semver_7.3.8.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz"; + sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; + }; + } + { + name = "semver___semver_7.0.0.tgz"; + path = fetchurl { + name = "semver___semver_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; } { @@ -2177,6 +1969,14 @@ sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; } + { + name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz"; + path = fetchurl { + name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz"; + sha512 = "BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew=="; + }; + } { name = "slice_ansi___slice_ansi_3.0.0.tgz"; path = fetchurl { @@ -2385,22 +2185,6 @@ sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; }; } - { - name = "type_fest___type_fest_0.20.2.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.20.2.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; - }; - } - { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; - path = fetchurl { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; - }; - } { name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; path = fetchurl { @@ -2409,14 +2193,6 @@ sha512 = "mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg=="; }; } - { - name = "unique_string___unique_string_2.0.0.tgz"; - path = fetchurl { - name = "unique_string___unique_string_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; - sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; - }; - } { name = "universalify___universalify_0.1.2.tgz"; path = fetchurl { @@ -2433,14 +2209,6 @@ sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; }; } - { - name = "update_notifier___update_notifier_5.1.0.tgz"; - path = fetchurl { - name = "update_notifier___update_notifier_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz"; - sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; - }; - } { name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { @@ -2513,14 +2281,6 @@ sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; } - { - name = "widest_line___widest_line_3.1.0.tgz"; - path = fetchurl { - name = "widest_line___widest_line_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; - sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; - }; - } { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; path = fetchurl { @@ -2538,27 +2298,11 @@ }; } { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + name = "ws___ws_8.9.0.tgz"; path = fetchurl { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; - sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; - }; - } - { - name = "ws___ws_8.8.1.tgz"; - path = fetchurl { - name = "ws___ws_8.8.1.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz"; - sha512 = "bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA=="; - }; - } - { - name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; - path = fetchurl { - name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; - sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; + name = "ws___ws_8.9.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz"; + sha512 = "Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg=="; }; } { @@ -2594,11 +2338,11 @@ }; } { - name = "yargs___yargs_17.5.1.tgz"; + name = "yargs___yargs_17.6.0.tgz"; path = fetchurl { - name = "yargs___yargs_17.5.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz"; - sha512 = "t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA=="; + name = "yargs___yargs_17.6.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz"; + sha512 = "8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g=="; }; } { From 358b3e70b3c5dbef80c1a6b44d8dccdafa947552 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Oct 2022 19:18:41 +0000 Subject: [PATCH 007/326] levant: 0.3.1 -> 0.3.2 --- pkgs/applications/networking/cluster/levant/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/levant/default.nix b/pkgs/applications/networking/cluster/levant/default.nix index afee16bf8f8f..07d9c360de7e 100644 --- a/pkgs/applications/networking/cluster/levant/default.nix +++ b/pkgs/applications/networking/cluster/levant/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "levant"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "levant"; rev = "v${version}"; - sha256 = "sha256-ujybD4nSHC/w2Pfu43eSO6rNJjXFAvc81T05icWFvbs="; + sha256 = "sha256-UI8PVvTqk8D4S9kq3sgxrm8dkRokpgkLyTN6pzUXNV0="; }; - vendorSha256 = "sha256-pKxj0qz7adSuPpiXu4+2KBO3JZu8zZ8ycPF5LosF4T8="; + vendorSha256 = "sha256-MzKttGfuIg0Pp/iz68EpXuk4I+tFozhIabKlsWuvJ48="; # The tests try to connect to a Nomad cluster. doCheck = false; From 9898a043196f1bc6ecc671a8bb1768e0ee636e8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Oct 2022 05:15:15 +0000 Subject: [PATCH 008/326] xmrig-mo: 6.18.0-mo1 -> 6.18.1-mo1 --- pkgs/applications/misc/xmrig/moneroocean.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index c9af439b447b..538bf3507a7b 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.18.0-mo1"; + version = "6.18.1-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-Ma5wXaQBAVWJsL2wVOHxQ2aSAG9wOywk/abtUi03JvY="; + sha256 = "sha256-ZHSDJLZ+5WTqJwSWT05VuN7VAK/aD0dimVFiZ39IWvg="; }; meta = with lib; { From e62ea07dfe3961c33f2cf60f6614de6f9b9b537d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Oct 2022 18:20:02 +0000 Subject: [PATCH 009/326] igmpproxy: 0.3 -> 0.4 --- pkgs/tools/networking/igmpproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/igmpproxy/default.nix b/pkgs/tools/networking/igmpproxy/default.nix index 9f9249649078..73d47c14177f 100644 --- a/pkgs/tools/networking/igmpproxy/default.nix +++ b/pkgs/tools/networking/igmpproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "igmpproxy"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "pali"; repo = "igmpproxy"; rev = version; - sha256 = "sha256-B7mq+5pKWMO4dJeFPB7tiyjDQjj90g/kmYB2ApBE3Ic="; + sha256 = "sha256-kv8XtZ/z8zPHYSZ4k4arn2Y+L2xegr2DwhvlguJV820="; }; nativeBuildInputs = [ autoreconfHook ]; From 3a97df3b573371a9824594fa7a6d52c81be286ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Oct 2022 04:53:19 +0000 Subject: [PATCH 010/326] proxmark3-rrg: 4.14831 -> 4.15864 --- pkgs/tools/security/proxmark3/proxmark3-rrg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix index c473ccf02a5c..a366dbf8224d 100644 --- a/pkgs/tools/security/proxmark3/proxmark3-rrg.nix +++ b/pkgs/tools/security/proxmark3/proxmark3-rrg.nix @@ -7,13 +7,13 @@ mkDerivation rec { pname = "proxmark3-rrg"; - version = "4.14831"; + version = "4.15864"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "proxmark3"; rev = "v${version}"; - sha256 = "sha256-s0D04V6vlGW7SVkJwzMKaVfXQoT3Wi0lu7RC61Es89A="; + sha256 = "sha256-vFebyXKC/vf8W8fGkTpSGTA0ZmfwnXSuuiOjV/u9240="; }; nativeBuildInputs = [ pkg-config gcc-arm-embedded ]; From dd9d6a0dc91e8d1463dfd34cf587a741bf5520b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Oct 2022 08:53:33 +0000 Subject: [PATCH 011/326] duo-unix: 1.12.1 -> 2.0.0 --- pkgs/tools/security/duo-unix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/duo-unix/default.nix b/pkgs/tools/security/duo-unix/default.nix index 2b42fb171f34..c4aebe10497e 100644 --- a/pkgs/tools/security/duo-unix/default.nix +++ b/pkgs/tools/security/duo-unix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "duo-unix"; - version = "1.12.1"; + version = "2.0.0"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "sha256-oufVgjJHV4ew50gd529b3MvVtBoebcDUGZUn0rHP4ZE="; + sha256 = "sha256-D5D3SJdKxv5iccNypfshcvrnHdk2D+h8c1Gnm87lzgY="; }; buildInputs = [ pam openssl zlib ]; From 5f8fd0aee5207707ee693952bd016afe161eec51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Oct 2022 10:03:55 +0000 Subject: [PATCH 012/326] guile-sdl2: 0.7.0 -> 0.8.0 --- pkgs/development/guile-modules/guile-sdl2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index c4ec4904f9aa..0ae8424b597d 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "guile-sdl2"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-h0osCURnYTUQFrKw0i7Jd+QCI8piR1NUE2lbxPv87aQ="; + hash = "sha256-V/XrpFrqOxS5mAphtIt2e3ewflK+HdLFEqOmix98p+w="; }; nativeBuildInputs = [ From af07c21e647eb3db2ace1c0f3fa7f8f27c7dd711 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Oct 2022 18:05:51 +0000 Subject: [PATCH 013/326] goa: 3.10.0 -> 3.10.2 --- pkgs/development/tools/goa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index bbbdbe5bab75..da4d07bb7889 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.10.0"; + version = "3.10.2"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "sha256-Z/J1L6fYuim6LkVh+LDrr3FLTZO7uQwHXRg0YTofkWA="; + sha256 = "sha256-cVCzuOZf2zFY01+t20sRArEFinWqvZ461jJIQIyf0yI="; }; - vendorSha256 = "sha256-r/1huS/6qqS6TuqPQkwqKuYwye5DYQWYfBS1IcXWRgk="; + vendorSha256 = "sha256-xLn7qGmBtNSnIZ7Gn4h/Aa037V0lO1jT/8P9PB7bH5o="; subPackages = [ "cmd/goa" ]; From 04576575657eeb14fb29451ca31ee88afc81d81d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 04:33:05 +0000 Subject: [PATCH 014/326] libwhich: 1.1.0 -> 1.2.0 --- pkgs/development/tools/misc/libwhich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/development/tools/misc/libwhich/default.nix index aeda5271142a..aee79b826444 100644 --- a/pkgs/development/tools/misc/libwhich/default.nix +++ b/pkgs/development/tools/misc/libwhich/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libwhich"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "vtjnash"; repo = pname; rev = "v${version}"; - sha256 = "0s0pqai61jszmi495k621rdlf288ij67adkz72hwqqarqp54idhb"; + sha256 = "sha256-JNIWdI12sL3TZqVA3GeH0KbgqFDbMsEdecea3392Goc="; }; installPhase = '' From 947aab9cbd63bfb59f129c24f54339cf3b931697 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 16:55:40 +0000 Subject: [PATCH 015/326] vcluster: 0.12.2 -> 0.12.3 --- pkgs/applications/networking/cluster/vcluster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index 2d24365466b7..84edb644afde 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PkayQ1sLjnA+1Xatgs0EvZTCTfWV5uoYYtnKX8OAwYQ="; + sha256 = "sha256-7yyOpF/eIeJinTe0sHPWLLBUbKYDhphmW8qkOdYOdXM="; }; vendorSha256 = null; From 9b58e5e7732ffe3f6904d5540dbd4d87622102db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 18:30:33 +0000 Subject: [PATCH 016/326] xl2tpd: 1.3.17 -> 1.3.18 --- pkgs/tools/networking/xl2tpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix index 2f270f8161fa..0661d4913596 100644 --- a/pkgs/tools/networking/xl2tpd/default.nix +++ b/pkgs/tools/networking/xl2tpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xl2tpd"; - version = "1.3.17"; + version = "1.3.18"; src = fetchFromGitHub { owner = "xelerance"; repo = "xl2tpd"; rev = "v${version}"; - sha256 = "sha256-ibHiQn6YBd80rXIxZeUSTNs9KOJXVGRlUIr753mLURk="; + sha256 = "sha256-Uc3PeTf/ow9p8noPcMLdT6S5dks9igDU6CC9koy+ff4="; }; buildInputs = [ libpcap ]; From 7ec4378b73ff742bbe1e930a24cb47f7b7e1d5f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Nov 2022 03:32:14 +0000 Subject: [PATCH 017/326] gretl: 2022b -> 2022c --- pkgs/applications/science/math/gretl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index 5e1ac5d17733..a2624c29662e 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gretl"; - version = "2022b"; + version = "2022c"; src = fetchurl { url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; - sha256 = "sha256-A+LyWPSUBBvnnyBrVSAUCiny24UAztUwy1nmRoDaGjI="; + sha256 = "sha256-4QAQTNqbfIX6K3CdtKcVONtCWrkTRvGl2ZXGR1eyQdA="; }; buildInputs = [ From 7c4d5c3e35839fc2f69fb8f73745bc80daf6bd88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Nov 2022 01:01:54 +0000 Subject: [PATCH 018/326] matterircd: 0.25.1 -> 0.26.1 --- pkgs/servers/mattermost/matterircd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index bc78495a5013..f46eba6f608f 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "matterircd"; - version = "0.25.1"; + version = "0.26.1"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "sha256-qglr0QN0ca6waxhwEFgYP9RHvTJ4YVn90vl+crcktao="; + sha256 = "sha256-yC5b3OEylIOS4lWz+ZiHHy3ShLjkaNzDt4dX1E87iR0="; }; vendorSha256 = null; From d77a58165e09f2ef8d5578ce837c12ddb0120ab5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Nov 2022 03:08:09 +0000 Subject: [PATCH 019/326] lyra: 1.6 -> 1.6.1 --- pkgs/development/libraries/lyra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lyra/default.nix b/pkgs/development/libraries/lyra/default.nix index bc2661548888..bb0c61ba1251 100644 --- a/pkgs/development/libraries/lyra/default.nix +++ b/pkgs/development/libraries/lyra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lyra"; - version = "1.6"; + version = "1.6.1"; src = fetchFromGitHub { owner = "bfgroup"; repo = "lyra"; rev = version; - sha256 = "sha256-5k4b1JVrGDmT65tSWo6AkqvNpN+6n8wZgqEuXLL7stI="; + sha256 = "sha256-tS2SPLiKaL8C35AmOXyJPstFUfynkE/A53rurqiySbI="; }; nativeBuildInputs = [ meson ninja ]; From 6660854ac93a2d9aeccd1e03e6c489fc77005a5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Nov 2022 16:16:59 +0000 Subject: [PATCH 020/326] convimg: 8.10.2 -> 9.0 --- pkgs/tools/misc/convimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/convimg/default.nix b/pkgs/tools/misc/convimg/default.nix index e82eb0419668..dd73cced3bf2 100644 --- a/pkgs/tools/misc/convimg/default.nix +++ b/pkgs/tools/misc/convimg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "convimg"; - version = "8.10.2"; + version = "9.0"; src = fetchFromGitHub { owner = "mateoconlechuga"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mXwgTltYSBgBm2z1gDRCFqJbRoEuDbQAIoDlr2Kjmi0="; + sha256 = "sha256-AfluBLuD//EJplzzIQymyRsmPQMFjVk33HO+Vwv8Wzo="; fetchSubmodules = true; }; From 8ad4b1c66cc99eb570ede29bbe9a9ce78a7728d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Nov 2022 19:54:25 +0000 Subject: [PATCH 021/326] mmc-utils: unstable-2022-09-27 -> unstable-2022-11-09 --- pkgs/os-specific/linux/mmc-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index c28c55091ef2..925901d22676 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "unstable-2022-09-27"; + version = "unstable-2022-11-09"; src = fetchzip rec { url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz"; - passthru.rev = "dfc3b6ecda84d21418fb4408b39c5c71db4c6458"; - sha256 = "G4sBwRW8NOq7CGTADvXgMbcVInStSueGfGsb4ApVaSk="; + passthru.rev = "c62dd8e415b12cc7f9a362db23cd384caf77ff03"; + sha256 = "zTrMounPmos+9Reyfa3xS5/5/tyMs0WapSmzqdXUBNk="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ]; From d61793a3d70ec2318dc2b8ce93cb22f9ca90302b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Nov 2022 09:21:26 +0000 Subject: [PATCH 022/326] confluent-platform: 7.2.1 -> 7.3.0 --- pkgs/servers/confluent-platform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 61c9d40c1424..aa01d3157167 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "confluent-platform"; - version = "7.2.1"; + version = "7.3.0"; src = fetchurl { url = "https://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}.tar.gz"; - sha256 = "sha256-vflWZjW8RwaDOwEFy8GHRfcmsHcRKxs8WwFfT66SIM4="; + sha256 = "sha256-j120gSIky0CHNgzaVnodMAniecRX0RpU6+il86nxdrQ="; }; nativeBuildInputs = [ makeWrapper ]; From da4686fe49d451d62058f560b65f1480b65b29bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Nov 2022 06:50:32 +0000 Subject: [PATCH 023/326] writefreely: 0.13.1 -> 0.13.2 --- pkgs/applications/misc/writefreely/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/writefreely/default.nix b/pkgs/applications/misc/writefreely/default.nix index 0f9631edbfaa..f54c80e398a1 100644 --- a/pkgs/applications/misc/writefreely/default.nix +++ b/pkgs/applications/misc/writefreely/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "writefreely"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "writeas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qYceijC/u8G9vr7uhApWWyWD9P65pLJCTjePEvh+oXA="; + sha256 = "sha256-GnuqYgiwXdKM+os5RzuUYe9ADOhZaxou5dD7GCEE1Ns="; }; - vendorSha256 = "sha256-CBPvtc3K9hr1oEmC+yUe3kPSWx20k6eMRqoxsf3NfCE="; + vendorSha256 = "sha256-IBer+8FP+IWWJPnaugr8zzQA9mSVFzP0Nofgl/PhtzQ="; nativeBuildInputs = [ go-bindata ]; From 3b07d6b7280ddbd3b20236370de021b025488a69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Nov 2022 10:28:53 +0000 Subject: [PATCH 024/326] alembic: 1.8.3 -> 1.8.4 --- pkgs/development/libraries/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 667d334c9026..c7bc4894e15b 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "sha256-QnqUD8KmMDmEZ1REoKN70SwVICOdyGPZsB/lU9nojj4="; + sha256 = "sha256-8dQhOQN0t2Y2kC2wOpQUqbu6Woy4DUmiLqXjf1D+mxE="; }; outputs = [ "bin" "dev" "out" "lib" ]; From 899d0b6b09f0cb4b5b4c3ed897b5f485ae5d1459 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Nov 2022 12:22:06 +0000 Subject: [PATCH 025/326] chafa: 1.12.3 -> 1.12.4 --- pkgs/tools/misc/chafa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 55b83f7de332..75ff4467d710 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.12.3"; + version = "1.12.4"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "sha256-Aejm3VR4f69jDdG16vud2sj/9jQ8n5f34oed1SGEcXo="; + sha256 = "sha256-rW3QHf7T3mXWxTCcUPriu+iZohbwGNxWRmquXdSMPQk="; }; nativeBuildInputs = [ autoconf From c58a3b82cfc0c2dfbde67471dd9f14b720a20e9e Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Wed, 16 Nov 2022 12:09:47 +0100 Subject: [PATCH 026/326] p3x-onenote: 2020.10.111 -> 2022.10.117 --- pkgs/applications/office/p3x-onenote/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/office/p3x-onenote/default.nix b/pkgs/applications/office/p3x-onenote/default.nix index 1653e9ec8223..43b511c74a6b 100644 --- a/pkgs/applications/office/p3x-onenote/default.nix +++ b/pkgs/applications/office/p3x-onenote/default.nix @@ -1,23 +1,19 @@ { lib, stdenv, appimageTools, desktop-file-utils, fetchurl }: let - version = "2020.10.111"; + version = "2022.10.117"; name = "p3x-onenote-${version}"; plat = { aarch64-linux = "-arm64"; armv7l-linux = "-armv7l"; - i386-linux = "-i386"; - i686-linux = "-i386"; x86_64-linux = ""; }.${stdenv.hostPlatform.system}; sha256 = { - aarch64-linux = "0a3c0w1312l6k2jvn7cn8priibnh8wg0184zjcli29f9ds1afl5s"; - armv7l-linux = "172m2d94zzm8q61pvnjy01cl5fg11ad9hfh1han0gycnv3difniy"; - i386-linux = "12m0i5sb15sbysp5fvhbj4k36950m7kpjr12n88r5fpkyh13ihsp"; - i686-linux = "12m0i5sb15sbysp5fvhbj4k36950m7kpjr12n88r5fpkyh13ihsp"; - x86_64-linux = "0bn48r55l5dh8zcf8ijh3z6hlyp3s6fvfyqc1csvnslm63dfkzcq"; + aarch64-linux = "0plpwymm1bgzbzwk2689lw1fadxdwxzzn5dmayk1ayxz1k3pj9wi"; + armv7l-linux = "1pvr8f1ccl4nyfmshn3v3jfaa5x519rsy57g4pdapffj10vpbkb8"; + x86_64-linux = "12j2py8yb81ngahbkbi7269izpc5aydd432cbv0sw45ighhyqhmr"; }.${stdenv.hostPlatform.system}; src = fetchurl { From c03413b11d26cb235958bf18cdfc1d736e8fabf3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Nov 2022 12:02:21 +0000 Subject: [PATCH 027/326] ablog: 0.10.29 -> 0.10.33 --- pkgs/applications/misc/ablog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ablog/default.nix b/pkgs/applications/misc/ablog/default.nix index e578caad529b..36811b343357 100644 --- a/pkgs/applications/misc/ablog/default.nix +++ b/pkgs/applications/misc/ablog/default.nix @@ -6,11 +6,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "ablog"; - version = "0.10.29"; + version = "0.10.33"; src = fetchPypi { inherit pname version; - sha256 = "sha256-q2zoXCmnzzjXSBGFKzondOQRz7CjZp0wCiXxbgpXHIA="; + sha256 = "sha256-vCkLX64aPAem0QvKI1iUNAHWEJZlAOIb1DA9U7xPJkU="; }; propagatedBuildInputs = [ From 0c621bc41b0e44570235bcf88673bff77752a466 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Nov 2022 19:33:13 +0000 Subject: [PATCH 028/326] linode-cli: 5.25.0 -> 5.26.1 --- pkgs/tools/virtualization/linode-cli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index e75541d5ee28..e25fcb3a19bc 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -11,10 +11,10 @@ }: let - sha256 = "0lngwmb9j3nzwhkhq4r9sy82gwjry14lvjjgm8vfivbbakjdl7xp"; + sha256 = "0r5by5d6wr5zbsaj211s99qg28nr7wm8iri6jxnksx5b375dah6g"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.139.0"; - specSha256 = "1z050vm049gb8vynp34iz9jpxwbpmbf5vbs1jsirwqbfhr1skslz"; + specVersion = "4.140.0"; + specSha256 = "0ay54m4aa8bmmpjc7s66rfzqzk4w25h48b9a665y29g67ybb432g"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; sha256 = specSha256; @@ -24,7 +24,7 @@ in buildPythonApplication rec { pname = "linode-cli"; - version = "5.25.0"; + version = "5.26.1"; src = fetchFromGitHub { owner = "linode"; From 1c76a4a915de8c92261afa968c218279bcea35dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 01:47:21 +0000 Subject: [PATCH 029/326] sasutils: 0.3.12 -> 0.3.13 --- pkgs/os-specific/linux/sasutils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/sasutils/default.nix b/pkgs/os-specific/linux/sasutils/default.nix index fd1a6f0b049b..743a3ed95540 100644 --- a/pkgs/os-specific/linux/sasutils/default.nix +++ b/pkgs/os-specific/linux/sasutils/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "sasutils"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "stanford-rc"; repo = pname; - rev = "v${version}"; - sha256 = "0kh5pcc2shdmrvqqi2y1zamzsfvk56pqgwqgqhjfz4r6yfpm04wl"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-cPCmmJkhr4+STVHa7e3LZGZFd8KPkECMAVurhuG8H1s="; }; nativeBuildInputs = [ installShellFiles ]; From e95eaa9583b3ae8df48e6834aae2a018731a2baf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 22:48:32 +0000 Subject: [PATCH 030/326] clight: 4.8 -> 4.9 --- pkgs/applications/misc/clight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index 3592de5f1c65..4ca37673feeb 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clight"; - version = "4.8"; + version = "4.9"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clight"; rev = version; - sha256 = "sha256-nDI5Rq1iPVkj25HRpxmS9zxNDUy+9YsSwbZnEwYt86E="; + sha256 = "sha256-m1oKjyy7fMK6mIf5FRuWCbfAM8qlHXRR/rwHsCZADiY="; }; # dbus-1.pc has datadir=/etc From 357d12c3376801f1ff64872daf89491c43c669bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 22:48:37 +0000 Subject: [PATCH 031/326] clightd: 5.6 -> 5.7 --- pkgs/applications/misc/clight/clightd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index d596a2444667..0ca80417df26 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "5.6"; + version = "5.7"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "sha256-PxYOI/2ZOz3JSGCPIXfm3WfGZ19D8JhhdNS3FVuXus8="; + sha256 = "sha256-4daM6Z67d52v2LmzqSZ6RSAHznyZNEqvAdWCuVFi0Kw="; }; # dbus-1.pc has datadir=/etc From 5aaf1c286d7328d9497468e39eb192551b336601 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Nov 2022 07:10:12 +0000 Subject: [PATCH 032/326] apktool: 2.6.1 -> 2.7.0 --- pkgs/development/tools/apktool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 2538bf76afe6..5ea63e2837aa 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "apktool"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "sha256-vCuah6xahpBbbKNDwhoNs7w3vdURVLyc32VSPZWJXTQ="; + sha256 = "sha256-wRtetRjZrCqxjpWcvgh0mQeQcrBNVnzcrlzrRH+afn0="; }; dontUnpack = true; From f797afbc26ae566604fd210845e8ec34b4c637eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Nov 2022 11:03:18 +0000 Subject: [PATCH 033/326] cider: 1.5.7 -> 1.6.0 --- pkgs/applications/audio/cider/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/cider/default.nix b/pkgs/applications/audio/cider/default.nix index 7deb21bcef28..dfbe70194bbe 100644 --- a/pkgs/applications/audio/cider/default.nix +++ b/pkgs/applications/audio/cider/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "cider"; - version = "1.5.7"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/ciderapp/cider-releases/releases/download/v${version}/Cider-${version}.AppImage"; - sha256 = "sha256-fWpt7YxqEDa1U4CwyVZwgbiwe0lrh64v0cJG9pbNMUU="; + sha256 = "sha256-fbeUl+vQpEdP17m3koblKv9z4CRpLNYtVQf7bs8ZP1M="; }; extraInstallCommands = From ecff940084427ea47c58c512962259f8a897e441 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Dec 2022 00:08:39 +0000 Subject: [PATCH 034/326] mautrix-signal: 0.4.1 -> 0.4.2 --- pkgs/servers/mautrix-signal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 5322947642cd..7aada1e2eed5 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonPackage rec { pname = "mautrix-signal"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; rev = "refs/tags/v${version}"; - sha256 = "sha256-WcyBv7b1JxiZJSqxgAUUgTa5Q/aNzU9SfXfdXKVuuXQ="; + sha256 = "sha256-UbetU1n9zD/mVFaJc9FECDq/Zell1TI/aYPsGXGB8Js="; }; propagatedBuildInputs = with python3.pkgs; [ From 0683de6bc3fec1a37b0753981bc923129cf2e3dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Dec 2022 01:05:12 +0000 Subject: [PATCH 035/326] openttd-nml: 0.7.0 -> 0.7.1 --- pkgs/games/openttd/nml.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/nml.nix b/pkgs/games/openttd/nml.nix index 666e284cfe1d..5859f5132849 100644 --- a/pkgs/games/openttd/nml.nix +++ b/pkgs/games/openttd/nml.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "openttd-nml"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "OpenTTD"; repo = "nml"; rev = "refs/tags/${version}"; - hash = "sha256-tmipHRe6qXoSLNbc0OEKxBJZrmTX3DEiuSfQeWRj1sU="; + hash = "sha256-+TJZ6/JazxzXyKawFE4GVh0De1LTUI95vXQwryJ2NDk="; }; propagatedBuildInputs = with python3.pkgs; [ From 3587d6881d59ef58262acada598e0fb1cde0e9ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Dec 2022 05:15:54 +0000 Subject: [PATCH 036/326] imgurbash2: 3.2 -> 3.3 --- pkgs/tools/graphics/imgurbash2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index 30848d7d0dc9..6c0e827a8488 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgurbash2"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "ram-on"; repo = "imgurbash2"; rev = version; - sha256 = "10zs6p17psl1vq5vpkfkf9nrlmibk6v1ds3yxbf1rip1zaqlwxg6"; + sha256 = "sha256-7J3LquzcYX0wBR6kshz7VuPv/TftTzKFdWcgsML2DnI="; }; installPhase = '' From cb01b2339e6f7d2064e13e81cb85f0a45e8d7df4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Dec 2022 06:25:28 +0000 Subject: [PATCH 037/326] ledger2beancount: 2.6 -> 2.7 --- pkgs/tools/text/ledger2beancount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ledger2beancount/default.nix b/pkgs/tools/text/ledger2beancount/default.nix index caa6335d4526..32a0f5863880 100644 --- a/pkgs/tools/text/ledger2beancount/default.nix +++ b/pkgs/tools/text/ledger2beancount/default.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "ledger2beancount"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "beancount"; repo = "ledger2beancount"; rev = version; - sha256 = "sha256-0Br+zuSUYrNP+ZL/FtNoaYoYBYho5kVfxu0tqKJSuBk="; + sha256 = "sha256-2LIP3ljK1HMAwjk2ueIf9pFL+UUnGDgx9GYNtRztdFY="; }; dontBuild = true; From 31ee0083e056f985724a5109b97c72922524574e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Dec 2022 10:07:23 +0000 Subject: [PATCH 038/326] moolticute: 0.55.0 -> 1.00.1 --- pkgs/applications/misc/moolticute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index f714b026a835..1525fb86f828 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.55.0"; + version = "1.00.1"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-up78503+YqUB2fR9B6W6plYksTJzTj5pkmFJ5eL/mLY="; + sha256 = "sha256-oENMr3d2vFisEFl7gYBQQ0XRBeogAYOfBE5th463laI="; }; outputs = [ "out" "udev" ]; From 47d8482d3965aec965177efa717d3799e4bf5940 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Dec 2022 23:58:28 +0000 Subject: [PATCH 039/326] ryzenadj: 0.11.1 -> 0.12.0 --- pkgs/os-specific/linux/ryzenadj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ryzenadj/default.nix b/pkgs/os-specific/linux/ryzenadj/default.nix index b533643752ae..0af52023b232 100644 --- a/pkgs/os-specific/linux/ryzenadj/default.nix +++ b/pkgs/os-specific/linux/ryzenadj/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pciutils, cmake }: stdenv.mkDerivation rec { pname = "ryzenadj"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "FlyGoat"; repo = "RyzenAdj"; rev = "v${version}"; - sha256 = "sha256-tfki+7W2RbqzEHG/Ibton/V5koT89emdQ7aX8WDUzdI="; + sha256 = "sha256-otw2U3Qh6NR6lJU1ldMR6Y5ia4Qk5tHAe/oY0YxJQUg="; }; nativeBuildInputs = [ pciutils cmake ]; From e8c45fa6469579a23c898c65b67cc570d8cf8eab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Dec 2022 23:34:39 +0000 Subject: [PATCH 040/326] stellar-core: 19.4.0 -> 19.6.0 --- pkgs/applications/blockchains/stellar-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index fbbd05be46ed..8f3fd4b1c886 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "stellar-core"; - version = "19.4.0"; + version = "19.6.0"; src = fetchFromGitHub { owner = "stellar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pgwLCtlj2Ak34KfE+ffIxQ1Z4Epxm3f1Y2aqYOIlLUc="; + sha256 = "sha256-lDefmPZM8ow6t5CpNBxef+9BoT773p5UgeMhgF+em2w="; fetchSubmodules = true; }; From 70227a2bc73b65a3f2e095d4f6d80030eea4446d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Dec 2022 02:43:28 +0000 Subject: [PATCH 041/326] tilt: 0.30.9 -> 0.30.13 --- pkgs/applications/networking/cluster/tilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 339564f52a04..19aaa36c7eb6 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.30.9"; + version = "0.30.13"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vZthFaIsgpZ2aap9kRSH//AHHnOpekPIkwpz9Tt0lI4="; + sha256 = "sha256-W67aQIXp2TOtZuccjQUGC9gNtvdyUNWuU7VM2LOFkCg="; }; vendorSha256 = null; From b601531bd5a63aaee240793958753bdbefe3ade8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Dec 2022 03:04:10 +0000 Subject: [PATCH 042/326] tofi: 0.7.0 -> 0.8.1 --- pkgs/applications/misc/tofi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tofi/default.nix b/pkgs/applications/misc/tofi/default.nix index 947b5c336bbf..9438201d45a8 100644 --- a/pkgs/applications/misc/tofi/default.nix +++ b/pkgs/applications/misc/tofi/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "tofi"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "philj56"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KLHZrfoQ6x3EeKWo/TMp30rEIqdq16i8YLr4zFHbnSc="; + sha256 = "sha256-HhkXypRGerWWHrR4maR3AtayWSy5qhl/LYwBHWGKboU="; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols ]; From 75fcc792f7c67556d05e3a434547e6fba865ce26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Dec 2022 07:15:58 +0000 Subject: [PATCH 043/326] upterm: 0.9.0 -> 0.10.0 --- pkgs/tools/misc/upterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix index cfe1c570c765..f1a28f1af407 100644 --- a/pkgs/tools/misc/upterm/default.nix +++ b/pkgs/tools/misc/upterm/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "upterm"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "owenthereal"; repo = "upterm"; rev = "v${version}"; - hash = "sha256-ywwqX4aw9vc2kptYZisArTpdz7Cf49Z0jMdP90KXejs="; + hash = "sha256-wjbptcGy3wOZPm/11El7Xqz6NrR8G19V9zfU5pKFGuk="; }; vendorSha256 = null; From f7d7b00db455e1c6caa437e7ac14cd4fad307a35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Dec 2022 07:29:04 +0000 Subject: [PATCH 044/326] easeprobe: 1.9.0 -> 2.0.0 --- pkgs/tools/misc/easeprobe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/easeprobe/default.nix b/pkgs/tools/misc/easeprobe/default.nix index 1bc8dec1ee1c..b0f85d7fc147 100644 --- a/pkgs/tools/misc/easeprobe/default.nix +++ b/pkgs/tools/misc/easeprobe/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "easeprobe"; - version = "1.9.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "megaease"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iw24TuK5nbHabzRdaJ8X/MzRPNP35M8RjhKnZZXjVfA="; + sha256 = "sha256-y9R2OgK+slQUvUMS3E6aX8WVCQ1fSMAruGKggxYRniA="; }; - vendorSha256 = "sha256-bfqP57YS2KD6CuFytJyWYCFl0Cx/JJgc1CeW13yBUoo="; + vendorSha256 = "sha256-ZfqBSPnIm2GHPREowHmEEPnOovYjoarxrkPeYmZBkIc="; subPackages = [ "cmd/easeprobe" ]; From b2be70d8ecfabbd751b866af6f7624a933a952dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Dec 2022 13:23:32 +0000 Subject: [PATCH 045/326] eventstat: 0.04.13 -> 0.05.00 --- pkgs/os-specific/linux/eventstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix index 9a2c20ca38aa..03ab973c8b99 100644 --- a/pkgs/os-specific/linux/eventstat/default.nix +++ b/pkgs/os-specific/linux/eventstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "eventstat"; - version = "0.04.13"; + version = "0.05.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-psamt9omhakiO3Kx2EzofPL2VAsva7XKQTZmn6zKefA="; + hash = "sha256-yGEFegUpWNBsrGZJjWud3aOsRJgXsOJmXkgpXcsPHo0="; }; buildInputs = [ ncurses ]; From b2fb7f31e8fe51916502699538a336d3a6a33ff1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Dec 2022 01:52:14 +0000 Subject: [PATCH 046/326] matrix-synapse-tools.synadm: 0.37.1 -> 0.38 --- pkgs/servers/matrix-synapse/tools/synadm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/tools/synadm.nix b/pkgs/servers/matrix-synapse/tools/synadm.nix index 776a88833e22..3fe9c33e8e24 100644 --- a/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -4,12 +4,12 @@ with python3Packages; buildPythonApplication rec { pname = "synadm"; - version = "0.37.1"; + version = "0.38"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6RlgPiYxbnTGJBpNIM1dzAuGTbvydnXkfywSsI0G/oc="; + sha256 = "sha256-l1KRUnjzj1/MEb1nxV6hMaxi15q7baG+iiK2yatZYRc="; }; postPatch = '' From 1dcc1a0dfa23f0784af50e891697ca4ee2459dc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Dec 2022 17:06:32 +0000 Subject: [PATCH 047/326] norouter: 0.6.4 -> 0.6.5 --- pkgs/tools/networking/norouter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/norouter/default.nix b/pkgs/tools/networking/norouter/default.nix index e0f6a8f3aee2..8c65089cdf58 100644 --- a/pkgs/tools/networking/norouter/default.nix +++ b/pkgs/tools/networking/norouter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "norouter"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "norouter"; repo = pname; rev = "v${version}"; - sha256 = "0h5jzxm4fw50781zj76r5ksnxkzsnrygrykpa913v9nd24c09c7m"; + sha256 = "sha256-EY/Yfyaz2DeQKHJ4awpQDbrVkse9crIZlLzfviPy3Tk="; }; - vendorSha256 = "sha256-DZ2kcNV8AzNogAUTaeus4rz9gCFo0wm306jcz/cAj0M="; + vendorSha256 = "sha256-RxrmYfEm1Maq8byoLXUr5RfXcwgqpCcAq5enMnl9V9E="; subPackages = [ "cmd/norouter" ]; doInstallCheck = true; From 52c5fa4bd3e2f2b174cc69ef1c40eec9bb9913b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Dec 2022 19:56:44 +0000 Subject: [PATCH 048/326] postfixadmin: 3.3.11 -> 3.3.13 --- pkgs/servers/postfixadmin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/postfixadmin/default.nix b/pkgs/servers/postfixadmin/default.nix index cd60f3d9dadb..be879fa03062 100644 --- a/pkgs/servers/postfixadmin/default.nix +++ b/pkgs/servers/postfixadmin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "postfixadmin"; - version = "3.3.11"; + version = "3.3.13"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-jOO0AVcCmBxHLaWQOwvt7OFKAcAYPTVHTdQz1ZaYIqE="; + sha256 = "sha256-46bc34goAcRvaiyW7z0AvIcd8n61TL6vgLQ+y7nNKBQ="; }; installPhase = '' From bfd1c45e54bd9823b083c10537cf677462fc2c28 Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Sat, 10 Dec 2022 20:13:08 -0800 Subject: [PATCH 049/326] nixos/hardware/device-tree: fix application of overlays Previously whenever an overlay was found to be incompatible with a base device tree blob, the entire base dtb would be skipped in favor of processing the next one. This had the unfortunate effect where overlays would not fully be applied if any incompatibility was found. For example, this is an issue with build device trees specific for one flavor of raspberry pi if the overlay was not compatible _everywhere_. The solution is to forego the `continue` keyword if an overlay is in compatible and instead use a compound conditional statement to skip incompatible overlays but continue trying to apply it to any remaining dtbs. --- .../os-specific/linux/device-tree/default.nix | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/device-tree/default.nix b/pkgs/os-specific/linux/device-tree/default.nix index 8b8cca911a93..fb8e92f23306 100644 --- a/pkgs/os-specific/linux/device-tree/default.nix +++ b/pkgs/os-specific/linux/device-tree/default.nix @@ -22,21 +22,19 @@ with lib; { # skip incompatible and non-matching overlays if [[ ! "$dtbCompat" =~ "$overlayCompat" ]]; then - echo -n "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")" - continue - fi - ${optionalString (o.filter != null) '' - if [[ "''${dtb//${o.filter}/}" == "$dtb" ]]; then - echo -n "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")" - continue - fi + echo "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")" + elif ${if (o.filter == null) then "false" else '' + [[ "''${dtb//${o.filter}/}" == "$dtb" ]] ''} - - echo -n "Applying overlay ${o.name} to $(basename "$dtb")... " - mv "$dtb"{,.in} - fdtoverlay -o "$dtb" -i "$dtb.in" "${o.dtboFile}" - echo "ok" - rm "$dtb.in" + then + echo "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")" + else + echo -n "Applying overlay ${o.name} to $(basename "$dtb")... " + mv "$dtb"{,.in} + fdtoverlay -o "$dtb" -i "$dtb.in" "${o.dtboFile}" + echo "ok" + rm "$dtb.in" + fi '')} done From d68f54c1473fa3537a9f9d8f5d71cef0c6630681 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Dec 2022 06:53:21 +0000 Subject: [PATCH 050/326] sssd: 2.8.1 -> 2.8.2 --- pkgs/os-specific/linux/sssd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 30311bbd58c4..1d38c8d3eb23 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "sssd"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "SSSD"; repo = pname; rev = version; - sha256 = "sha256-TbeofUQAQNM/Nxzgl8GP2+Y4iR7bVXm4dQaPkYMSdqc="; + sha256 = "sha256-nEMfwOvWd3FRk+1RS1NPT+LcfWi4lDLCGYqH7KuPw7o="; }; postPatch = '' From f2f5ecb76bf72975390130f661768b4d40ad753c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Dec 2022 12:27:08 +0000 Subject: [PATCH 051/326] temporalite: 0.2.0 -> 0.3.0 --- .../applications/networking/cluster/temporalite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/temporalite/default.nix b/pkgs/applications/networking/cluster/temporalite/default.nix index 8a4d53797f5b..a842a896285a 100644 --- a/pkgs/applications/networking/cluster/temporalite/default.nix +++ b/pkgs/applications/networking/cluster/temporalite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "temporalite"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "temporalio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rLEkWg5LNVb7i/2IARKGuP9ugaVJA9pwYbKLm0QLmOc="; + sha256 = "sha256-IEB9AFEt8U2zXYfbChfL/UH1rNSLPnfS396/cPE8UdE="; }; - vendorSha256 = "sha256-vjuwh/HRRYfB6J49rfJxif12nYPnbBodWF9hTiGygS8="; + vendorSha256 = "sha256-w86/XCMRGBmXM+oQ5+0qiX0fdwiKXvsmEkApuRLUOiA="; subPackages = [ "cmd/temporalite" ]; From 66049fdec2fa1afd9ba2f44acc79d667a13bca03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Dec 2022 02:42:47 +0000 Subject: [PATCH 052/326] audiowaveform: 1.6.0 -> 1.7.0 --- pkgs/tools/audio/audiowaveform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/audiowaveform/default.nix b/pkgs/tools/audio/audiowaveform/default.nix index 15981b0fc6e1..adf80f4c0998 100644 --- a/pkgs/tools/audio/audiowaveform/default.nix +++ b/pkgs/tools/audio/audiowaveform/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "audiowaveform"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "bbc"; repo = "audiowaveform"; rev = version; - sha256 = "sha256-ZkkGRohcydi2C1S7J0+yGWsqK7ivxQmFuq1NGNiPPNY="; + sha256 = "sha256-Q0SPTBk2102AmmJftYprPWbYcAqgfeoOYWH6x2mqByA="; }; nativeBuildInputs = [ cmake gtest ]; From 9d04c2cdb03f54a55a500dccb88b0ea412f0afa4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Dec 2022 09:41:59 +0000 Subject: [PATCH 053/326] dyncall: 1.3 -> 1.4 --- pkgs/development/libraries/dyncall/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index 3197e3abed9e..75841b5d0d71 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "dyncall"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "https://www.dyncall.org/r${version}/dyncall-${version}.tar.gz"; - # https://www.dyncall.org/r1.3/SHA256 - sha256 = "sha256-q/Ys/DHr1/IWWNqhNwp3gcxRQxYrwIaDhKwH3vnj05A="; + # https://www.dyncall.org/r1.4/SHA256 + sha256 = "sha256-FEN9u+87bckkg/ZQfq+CWrl5ZKie7K6Ms0emvsnDKq4="; }; # XXX: broken tests, failures masked, lets avoid crashing a bunch for now :) From 8570864ba0b9585a4b36e7e5d091450e72208bd9 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 12 Dec 2022 22:25:23 +0000 Subject: [PATCH 054/326] python3Packages.jpylyzer: skip test_testfiles by default still available as a passthru test though Fixes #205780 --- .../python-modules/jpylyzer/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix index e161b3ffc502..48388d9b0d80 100644 --- a/pkgs/development/python-modules/jpylyzer/default.nix +++ b/pkgs/development/python-modules/jpylyzer/default.nix @@ -5,6 +5,10 @@ , six , lxml , pytestCheckHook +, doFullCheck ? false # weird filenames cause issues on some filesystems + +# for passthru.tests +, jpylyzer }: let @@ -33,12 +37,12 @@ in buildPythonPackage rec { checkInputs = [ pytestCheckHook lxml ]; - # don't depend on testFiles on darwin as it may not be extractable due to - # weird filenames - preCheck = lib.optionalString (!stdenv.isDarwin) '' + # don't depend on testFiles unless doFullCheck as it may not be extractable + # on some filesystems due to weird filenames + preCheck = lib.optionalString doFullCheck '' sed -i '/^testFilesDir = /ctestFilesDir = "${testFiles}"' tests/unit/test_testfiles.py ''; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals (!doFullCheck) [ "tests/unit/test_testfiles.py" ]; @@ -46,6 +50,10 @@ in buildPythonPackage rec { disallowedReferences = [ testFiles ]; + passthru.tests = { + withFullCheck = jpylyzer.override { doFullCheck = true; }; + }; + meta = with lib; { description = "JP2 (JPEG 2000 Part 1) image validator and properties extractor"; homepage = "https://jpylyzer.openpreservation.org/"; From 82d9fb7d15a819590a07bc5cfa62fd1755500f7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Dec 2022 03:53:39 +0000 Subject: [PATCH 055/326] grandorgue: 3.9.0-1 -> 3.9.4-1 --- pkgs/applications/audio/grandorgue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 5fe2ca2ce645..1b20f306166f 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.9.0-1"; + version = "3.9.4-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-+LWEjoke7f+6f4K4jO9nCG88Mdg9C49+v3FboM9/NkU="; + sha256 = "sha256-10gcVxMLhMXUblvJYLj0TTwGFl1YHI7HU3TfHXtJ+24="; }; postPatch = '' From f969c61a95e8f390f952ea4b67d15eeb922daaa0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Dec 2022 11:50:23 +0000 Subject: [PATCH 056/326] roswell: 22.12.14.112 -> 22.12.14.113 --- pkgs/development/tools/roswell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/roswell/default.nix b/pkgs/development/tools/roswell/default.nix index d58a7b49bb6d..2d1b2ffa0810 100644 --- a/pkgs/development/tools/roswell/default.nix +++ b/pkgs/development/tools/roswell/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "roswell"; - version = "22.12.14.112"; + version = "22.12.14.113"; src = fetchFromGitHub { owner = "roswell"; repo = pname; rev = "v${version}"; - hash = "sha256-Aqgv2WPmQDuBR4/OgjPeC+kzHL3DrImL24z7fbsfGRo="; + hash = "sha256-tNOkZcdjwvrsleWMtcQ76KMBnssnuYQU3gqXnBVPN6w="; }; patches = [ From f163ec78a3dd54cfd69e407dfe016ae053ed9ed5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Dec 2022 10:05:21 +0000 Subject: [PATCH 057/326] MIDIVisualizer: 6.5 -> 7.0 --- pkgs/applications/audio/midi-visualizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midi-visualizer/default.nix index a50e5dcd6690..bfaaa870cb34 100644 --- a/pkgs/applications/audio/midi-visualizer/default.nix +++ b/pkgs/applications/audio/midi-visualizer/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "MIDIVisualizer"; - version = "6.5"; + version = "7.0"; src = fetchFromGitHub { owner = "kosua20"; repo = pname; rev = "v${version}"; - sha256 = "sha256-thRcRJ88bz3jwu6rKaQxt2MkBSf5Ri1jygkKDguP2eE="; + sha256 = "sha256-wfPSPH+E9cErVvfJZqHttFtjiUYJopM/u6w6NpRHifE="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper]; From 77ff62438226498540dafe681e13cc8ef1551c8c Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 15 Dec 2022 14:39:18 +0000 Subject: [PATCH 058/326] throttled: 0.9.2 -> 0.10.0 --- nixos/modules/services/hardware/throttled.nix | 6 +++--- pkgs/tools/system/throttled/default.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/hardware/throttled.nix b/nixos/modules/services/hardware/throttled.nix index 99735ff6519d..2d801a7e838f 100644 --- a/nixos/modules/services/hardware/throttled.nix +++ b/nixos/modules/services/hardware/throttled.nix @@ -22,10 +22,10 @@ in { # The upstream package has this in Install, but that's not enough, see the NixOS manual systemd.services.lenovo_fix.wantedBy = [ "multi-user.target" ]; - environment.etc."lenovo_fix.conf".source = + environment.etc."throttled.conf".source = if cfg.extraConfig != "" - then pkgs.writeText "lenovo_fix.conf" cfg.extraConfig - else "${pkgs.throttled}/etc/lenovo_fix.conf"; + then pkgs.writeText "throttled.conf" cfg.extraConfig + else "${pkgs.throttled}/etc/throttled.conf"; # Kernel 5.9 spams warnings whenever userspace writes to CPU MSRs. # See https://github.com/erpalma/throttled/issues/215 diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix index 2729a16b8687..efbc9ed3dd3f 100644 --- a/pkgs/tools/system/throttled/default.nix +++ b/pkgs/tools/system/throttled/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "throttled"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "erpalma"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4aDa6REDHO7gr1czIv6NlepeMVJI93agxJjE2vHiEmk="; + sha256 = "sha256-0MsPp6y4r/uZB2SplKV+SAiJoxIs2jgOQmQoQQ2ZKwI="; }; nativeBuildInputs = [ python3Packages.wrapPython ]; @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { ]; # The upstream unit both assumes the install location, and tries to run in a virtualenv - postPatch = ''sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/lenovo_fix.py|' -i systemd/lenovo_fix.service''; + postPatch = ''sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/throttled.py|' -i systemd/throttled.service''; installPhase = '' runHook preInstall - install -D -m755 -t $out/bin lenovo_fix.py - install -D -t $out/bin lenovo_fix.py mmio.py + install -D -m755 -t $out/bin throttled.py + install -D -t $out/bin throttled.py mmio.py install -D -m644 -t $out/etc etc/* install -D -m644 -t $out/lib/systemd/system systemd/* runHook postInstall From 4f67556113644a04d9b60094bcb396fcbd83cd52 Mon Sep 17 00:00:00 2001 From: JB Gosselin <1536838+dennajort@users.noreply.github.com> Date: Thu, 15 Dec 2022 13:28:53 -0500 Subject: [PATCH 059/326] lima: 0.13.0 -> 0.14.1 --- .../applications/virtualization/lima/default.nix | 16 ++++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 03d049477b5d..129927acedc8 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -1,31 +1,39 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles , qemu +, xcbuild +, sigtool , makeWrapper }: buildGoModule rec { pname = "lima"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-alE7fUVxJRkLMtdia5ruHxh9nlWIubM0J6iIrmpreRM="; + sha256 = "sha256-C1qJ3SAxtFSxbGrDlLvYDzUwdiJDcegzx5uXCSYNVJQ="; }; - vendorSha256 = "sha256-Kb2R8USWOWRFMjQO3tjdl5UHOzzb2B3ld+5vO2gF3KY="; + vendorSha256 = "sha256-MaAdX7TKfBzvzz8r+cfKCSul/QZ0/AgHnBwhu0ZR0gY="; - nativeBuildInputs = [ makeWrapper installShellFiles ]; + nativeBuildInputs = [ makeWrapper installShellFiles ] + ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; # clean fails with read only vendor dir postPatch = '' substituteInPlace Makefile --replace 'binaries: clean' 'binaries:' ''; + # It attaches entitlements with codesign and strip removes those, + # voiding the entitlements and making it non-operational. + dontStrip = stdenv.isDarwin; + buildPhase = '' runHook preBuild make "VERSION=v${version}" binaries diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 887b29613371..8fa2336e1762 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36777,7 +36777,9 @@ with pkgs; colima = callPackage ../applications/virtualization/colima { }; - lima = callPackage ../applications/virtualization/lima { }; + lima = callPackage ../applications/virtualization/lima { + inherit (darwin) sigtool; + }; logtop = callPackage ../tools/misc/logtop { }; From d499bc244735c776305ac0658b2539f979313f5f Mon Sep 17 00:00:00 2001 From: amesgen Date: Thu, 15 Dec 2022 20:25:36 +0100 Subject: [PATCH 060/326] tandem-aligner: init at unstable-2022-09-17 --- .../biology/tandem-aligner/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/science/biology/tandem-aligner/default.nix diff --git a/pkgs/applications/science/biology/tandem-aligner/default.nix b/pkgs/applications/science/biology/tandem-aligner/default.nix new file mode 100644 index 000000000000..f74ba9d2e443 --- /dev/null +++ b/pkgs/applications/science/biology/tandem-aligner/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, zlib +}: + +stdenv.mkDerivation { + pname = "TandemAligner"; + version = "unstable-2022-09-17"; + + src = fetchFromGitHub { + owner = "seryrzu"; + repo = "tandem_aligner"; + rev = "ac6004f108ad20477045f4d0b037d96051a9df70"; + hash = "sha256-iMDj1HZ8LzmZckuAM3lbG3eSJSd/5JGVA6SBs7+AgX8="; + }; + + sourceRoot = "source/tandem_aligner"; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ zlib ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp src/projects/tandem_aligner/tandem_aligner $out/bin + runHook postInstall + ''; + + doCheck = true; + + # adapted from target test_launch in Makefile + checkPhase = '' + runHook preCheck + mkdir -p $TMPDIR/test_launch + src/projects/tandem_aligner/tandem_aligner \ + --first $src/tandem_aligner/test_dataset/first.fasta \ + --second $src/tandem_aligner/test_dataset/second.fasta \ + -o $TMPDIR/test_launch \ + --debug + grep -q "Thank you for using TandemAligner!" $TMPDIR/test_launch/tandem_aligner.log + diff $TMPDIR/test_launch/cigar.txt $src/tandem_aligner/test_dataset/true_cigar.txt + runHook postCheck + ''; + + meta = { + description = "A parameter-free algorithm for sequence alignment"; + homepage = "https://github.com/seryrzu/tandem_aligner"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ amesgen ]; + platforms = lib.platforms.linux; + mainProgram = "tandem_aligner"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cbf5a28d14e..8e1584c1527e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35555,6 +35555,8 @@ with pkgs; svaba = callPackage ../applications/science/biology/svaba { }; + tandem-aligner = callPackage ../applications/science/biology/tandem-aligner { }; + tebreak = callPackage ../applications/science/biology/tebreak { }; treemix = callPackage ../applications/science/biology/treemix { }; From 946dd76d6ddc4bd1a77c746ff4b85ffe1c1c27ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Dec 2022 22:58:45 +0000 Subject: [PATCH 061/326] ecs-agent: 1.66.2 -> 1.67.2 --- pkgs/applications/virtualization/ecs-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 88c5f3779df6..58c303a46c40 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.66.2"; + version = "1.67.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-mZzDvD+40YiC8cBpLlYd7K1p5UBYpso9OMCDijopuik="; + hash = "sha256-iSL5ogS8BLcxge3eo+kCqtsGmj7P1wbi+/84nA9fO2Q="; }; vendorHash = null; From dc05102a83562c077518e9758c0f97851b887883 Mon Sep 17 00:00:00 2001 From: JB Gosselin <1536838+dennajort@users.noreply.github.com> Date: Fri, 16 Dec 2022 11:17:18 -0500 Subject: [PATCH 062/326] add _output cleaning before build --- pkgs/applications/virtualization/lima/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 129927acedc8..23d34f9d6e11 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -36,6 +36,7 @@ buildGoModule rec { buildPhase = '' runHook preBuild + rm -rf _output make "VERSION=v${version}" binaries runHook postBuild ''; From 1a5fda5f2b8dae7917ec323b81ccae92910fdd9e Mon Sep 17 00:00:00 2001 From: JB Gosselin <1536838+dennajort@users.noreply.github.com> Date: Fri, 16 Dec 2022 11:49:22 -0500 Subject: [PATCH 063/326] remove rm, add --force to codesign --- pkgs/applications/virtualization/lima/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 23d34f9d6e11..4025d7e4e48a 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -28,6 +28,7 @@ buildGoModule rec { # clean fails with read only vendor dir postPatch = '' substituteInPlace Makefile --replace 'binaries: clean' 'binaries:' + substituteInPlace Makefile --replace 'codesign --entitlements vz.entitlements -s -' 'codesign --force --entitlements vz.entitlements -s -' ''; # It attaches entitlements with codesign and strip removes those, @@ -36,7 +37,6 @@ buildGoModule rec { buildPhase = '' runHook preBuild - rm -rf _output make "VERSION=v${version}" binaries runHook postBuild ''; From 470662f51b04519cb0d54eac378d22f3c48668fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 07:45:23 +0000 Subject: [PATCH 064/326] fast-downward: 22.06.1 -> 22.12.0 --- pkgs/applications/science/logic/fast-downward/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix index ba0f3ee2e255..98db5682e7e7 100644 --- a/pkgs/applications/science/logic/fast-downward/default.nix +++ b/pkgs/applications/science/logic/fast-downward/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fast-downward"; - version = "22.06.1"; + version = "22.12.0"; src = fetchFromGitHub { owner = "aibasel"; repo = "downward"; rev = "release-${version}"; - sha256 = "sha256-SBksyZoLR1MtyJUbGigGIbT72qVpN+nznU/bmJGYRz8="; + sha256 = "sha256-GwZ5BGzLRMgWNBaA7M2D2p9OxvdyWqm+sTwxGpcI/qY="; }; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; From 169f6939cb3b7908065d56547fa1fe057827e3f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Dec 2022 08:12:07 +0000 Subject: [PATCH 065/326] garble: 0.7.2 -> 0.8.0 --- pkgs/development/tools/garble/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/garble/default.nix b/pkgs/development/tools/garble/default.nix index 0d01de127edf..e7fedc3305e1 100644 --- a/pkgs/development/tools/garble/default.nix +++ b/pkgs/development/tools/garble/default.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "garble"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "burrowers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T6iUhfBcHlz9oUuovwU4ljHh4y6PRd3sRhwG6RwuspM="; + sha256 = "sha256-f7coWG1CS4UL8GGqwADx5CvIk2sPONPlWW+JgRhFsb8="; }; - vendorSha256 = "sha256-lGU9jbeOM8tSYZGIqQhH5I2RlBGnqrA6JUQpuHrLwKU="; + vendorSha256 = "sha256-SOdIlu0QrQokl9j9Ff594+1K6twU1mCuECFQaVKaPV4="; # Used for some of the tests. checkInputs = [git]; From 788a5c31da627258a538b1d7feee7ba61b666c3b Mon Sep 17 00:00:00 2001 From: JB Gosselin <1536838+dennajort@users.noreply.github.com> Date: Sun, 18 Dec 2022 01:13:08 +0100 Subject: [PATCH 066/326] Combine `substituteInPlace` on `Makefile` Co-authored-by: Sandro --- pkgs/applications/virtualization/lima/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 4025d7e4e48a..92b8de106639 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -27,8 +27,9 @@ buildGoModule rec { # clean fails with read only vendor dir postPatch = '' - substituteInPlace Makefile --replace 'binaries: clean' 'binaries:' - substituteInPlace Makefile --replace 'codesign --entitlements vz.entitlements -s -' 'codesign --force --entitlements vz.entitlements -s -' + substituteInPlace Makefile \ + --replace 'binaries: clean' 'binaries:' \ + --replace 'codesign --entitlements vz.entitlements -s -' 'codesign --force --entitlements vz.entitlements -s -' ''; # It attaches entitlements with codesign and strip removes those, From 5dfd314513703b4d127ab56734f93eea2ddbec24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Dec 2022 04:23:24 +0000 Subject: [PATCH 067/326] kubelogin: 0.0.24 -> 0.0.25 --- pkgs/applications/networking/cluster/kubelogin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 0197fe79c742..45f0ee66f61e 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.24"; + version = "0.0.25"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xHMUS08gtfN72sMkGZ+2Cazgkd2HgvHSKqugYg+j1So="; + sha256 = "sha256-28snlCqvQ0aF7DHjeHWyjOYuy2wHd2EqEDqmst9MQLc="; }; vendorSha256 = "sha256-mjIB0ITf296yDQJP46EI6pLYkZfyU3yzD9iwP0iIXvQ="; From 22cc969c3164ac732834493cc42d027cfd2cb976 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Dec 2022 07:15:12 +0000 Subject: [PATCH 068/326] yad: 12.1 -> 12.3 --- pkgs/tools/misc/yad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index 7c2343c556b1..4b6d18483929 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "12.1"; + version = "12.3"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "sha256-9WgTsjerV9k1sHnhob3xviRDfHa6W+szzGs0AGBJG+g="; + sha256 = "sha256-VaeA83Wk5N3uLf8Eb606w3KPwV/3be5D39wW2JuSdp0="; }; configureFlags = [ From 2e299d2ae6e14b9d08ff4a4eb0be7ad78077b145 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Dec 2022 12:16:23 +0000 Subject: [PATCH 069/326] slint-lsp: 0.3.0 -> 0.3.3 --- pkgs/development/tools/misc/slint-lsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index 23fc5cc25e37..19f8929ff58d 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/pkgs/development/tools/misc/slint-lsp/default.nix @@ -25,14 +25,14 @@ let in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; - version = "0.3.0"; + version = "0.3.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-dZYkiYrotW8td5dxnPSvDzkWf+xV4ceISVLRZx2goXo="; + sha256 = "sha256-0JOA+T6GJnMUSK+oldZ+8XtgrDDLkccUKYYzjMExM7M="; }; - cargoSha256 = "sha256-9zbA9JXfLdosCU6gVsrsAyiyX8Qh6x5wMw1W4QKqbp4="; + cargoSha256 = "sha256-282IAKbou3+0CYMcAhPNr35N3ugrN/fY82KTzyoTy2o="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] From c7e56f306cf57c16fc6fce0df2243debf4f4dbce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Dec 2022 17:56:16 +0000 Subject: [PATCH 070/326] page: 4.4.0 -> 4.6.0 --- pkgs/tools/misc/page/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/page/default.nix b/pkgs/tools/misc/page/default.nix index be0a407dca5c..1468b350f5f8 100644 --- a/pkgs/tools/misc/page/default.nix +++ b/pkgs/tools/misc/page/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "page"; - version = "4.4.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "I60R"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FNxOWR6An/d3dyCcsfBX7XSwiFlOfdrJ1Tp4qrYrvSk="; + sha256 = "sha256-iK8XRPT/0PG3szIRkHvUIdgJC1XsuBbDKk25RvwSViQ="; }; nativeBuildInputs = [ installShellFiles ]; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh $completions_dir/_page ''; - cargoSha256 = "sha256-K2z85YN85JWgv8imQIm6b02tnQEVB6OiwJ2692wH3nw="; + cargoSha256 = "sha256-OZvsZijrIeVxqf58P16Woanf0JsJIENX72n28wMtq14="; meta = with lib; { description = "Use neovim as pager"; From 0eb2db2162126eae57ec49efa992aed3a148ad5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Dec 2022 23:25:39 +0000 Subject: [PATCH 071/326] python310Packages.flowlogs_reader: 3.2.0 -> 4.0.0 --- pkgs/development/python-modules/flowlogs_reader/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/flowlogs_reader/default.nix b/pkgs/development/python-modules/flowlogs_reader/default.nix index 7045841245d3..232bbaad73ca 100644 --- a/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flowlogs-reader"; - version = "3.2.0"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,8 +20,8 @@ buildPythonPackage rec { owner = "obsrvbl"; repo = pname; # https://github.com/obsrvbl/flowlogs-reader/issues/57 - rev = "fac4c6c63348ff67fd0a8f51d391ba7c9f59e5ed"; - hash = "sha256-bGb2CLp33aIr0R/lBPWAF3CbtVTWpqmcvYgZ6bcARTc="; + rev = "refs/tags/v${version}"; + hash = "sha256-PGyuzOhq1TC/nGsGJYQYTDpcsYzcwNPiaHWd66tfzQQ="; }; propagatedBuildInputs = [ From a72c69e4ed6966ebbafbacd6eb4e58bdb99003a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Dec 2022 02:59:41 +0000 Subject: [PATCH 072/326] wasabiwallet: 2.0.2 -> 2.0.2.1 --- pkgs/applications/blockchains/wasabiwallet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 30edd74d031d..c4c8de947f1d 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.2"; + version = "2.0.2.1"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-0DFl+UFxQckRM2qXFqDpKaRQ5sIMUbNj7l3zKPKAOnQ="; + sha256 = "sha256-kvUwWRZZmalJQL65tRNdgTg7ZQHhmIbfmsfHbHBYz7w="; }; dontBuild = true; From d4dc5b1fff966a38010c28d052cd6732547cce5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Dec 2022 03:24:50 +0000 Subject: [PATCH 073/326] meshcentral: 1.1.0 -> 1.1.2 --- pkgs/tools/admin/meshcentral/default.nix | 6 +- pkgs/tools/admin/meshcentral/package.json | 4 +- pkgs/tools/admin/meshcentral/yarn.lock | 1162 +++++++++++++++++---- pkgs/tools/admin/meshcentral/yarn.nix | 936 ++++++++++++++--- 4 files changed, 1750 insertions(+), 358 deletions(-) diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index d8e0d9e2a77c..f87c649b3d65 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -1,11 +1,11 @@ { lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs-16_x, jq, dos2unix }: yarn2nix-moretea.mkYarnPackage { - version = "1.1.0"; + version = "1.1.2"; src = fetchzip { - url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.0.tgz"; - sha256 = "1g7wgph35h8vi44yn4niv1jq2d8v9xrwps9k4bfjyd6470gg2sfc"; + url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.2.tgz"; + sha256 = "0fhmvh10wlf17fwxdclra06z1bq5bg6n53smzwni1v1h4967hhk3"; }; patches = [ ./fix-js-include-paths.patch ]; diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json index 851165c6cd74..44e37f8f1b38 100644 --- a/pkgs/tools/admin/meshcentral/package.json +++ b/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "1.1.0", + "version": "1.1.2", "keywords": [ "Remote Device Management", "Remote Device Monitoring", @@ -98,7 +98,7 @@ "aedes": "0.39.0", "mysql": "*", "@mysql/xdevapi": "*", - "mongodb": "4.9.1", + "mongodb": "4.12.1", "saslprep": "*", "pg": "8.7.1", "pgtools": "0.3.2", diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock index b463dbfce561..5735c798bb6b 100644 --- a/pkgs/tools/admin/meshcentral/yarn.lock +++ b/pkgs/tools/admin/meshcentral/yarn.lock @@ -10,10 +10,756 @@ "@jridgewell/gen-mapping" "^0.1.0" "@jridgewell/trace-mapping" "^0.3.9" +"@aws-crypto/ie11-detection@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@aws-crypto/ie11-detection/-/ie11-detection-2.0.2.tgz#9c39f4a5558196636031a933ec1b4792de959d6a" + integrity sha512-5XDMQY98gMAf/WRTic5G++jfmS/VLM0rwpiOpaainKi4L0nqWMSB1SzsrEG5rjFZGYN6ZAefO+/Yta2dFM0kMw== + dependencies: + tslib "^1.11.1" + +"@aws-crypto/sha256-browser@2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz#741c9024df55ec59b51e5b1f5d806a4852699fb5" + integrity sha512-rYXOQ8BFOaqMEHJrLHul/25ckWH6GTJtdLSajhlqGMx0PmSueAuvboCuZCTqEKlxR8CQOwRarxYMZZSYlhRA1A== + dependencies: + "@aws-crypto/ie11-detection" "^2.0.0" + "@aws-crypto/sha256-js" "^2.0.0" + "@aws-crypto/supports-web-crypto" "^2.0.0" + "@aws-crypto/util" "^2.0.0" + "@aws-sdk/types" "^3.1.0" + "@aws-sdk/util-locate-window" "^3.0.0" + "@aws-sdk/util-utf8-browser" "^3.0.0" + tslib "^1.11.1" + +"@aws-crypto/sha256-js@2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz#f1f936039bdebd0b9e2dd834d65afdc2aac4efcb" + integrity sha512-VZY+mCY4Nmrs5WGfitmNqXzaE873fcIZDu54cbaDaaamsaTOP1DBImV9F4pICc3EHjQXujyE8jig+PFCaew9ig== + dependencies: + "@aws-crypto/util" "^2.0.0" + "@aws-sdk/types" "^3.1.0" + tslib "^1.11.1" + +"@aws-crypto/sha256-js@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.2.tgz#c81e5d378b8a74ff1671b58632779986e50f4c99" + integrity sha512-iXLdKH19qPmIC73fVCrHWCSYjN/sxaAvZ3jNNyw6FclmHyjLKg0f69WlC9KTnyElxCR5MO9SKaG00VwlJwyAkQ== + dependencies: + "@aws-crypto/util" "^2.0.2" + "@aws-sdk/types" "^3.110.0" + tslib "^1.11.1" + +"@aws-crypto/supports-web-crypto@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.2.tgz#9f02aafad8789cac9c0ab5faaebb1ab8aa841338" + integrity sha512-6mbSsLHwZ99CTOOswvCRP3C+VCWnzBf+1SnbWxzzJ9lR0mA0JnY2JEAhp8rqmTE0GPFy88rrM27ffgp62oErMQ== + dependencies: + tslib "^1.11.1" + +"@aws-crypto/util@^2.0.0", "@aws-crypto/util@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-2.0.2.tgz#adf5ff5dfbc7713082f897f1d01e551ce0edb9c0" + integrity sha512-Lgu5v/0e/BcrZ5m/IWqzPUf3UYFTy/PpeED+uc9SWUR1iZQL8XXbGQg10UfllwwBryO3hFF5dizK+78aoXC1eA== + dependencies: + "@aws-sdk/types" "^3.110.0" + "@aws-sdk/util-utf8-browser" "^3.0.0" + tslib "^1.11.1" + +"@aws-sdk/abort-controller@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/abort-controller/-/abort-controller-3.226.0.tgz#3adffb8ee5af57ddb154e8544a8eeec76ad32271" + integrity sha512-cJVzr1xxPBd08voknXvR0RLgtZKGKt6WyDpH/BaPCu3rfSqWCDZKzwqe940eqosjmKrxC6pUZNKASIqHOQ8xxQ== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/client-cognito-identity@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.236.0.tgz#bec1a6625d1b34b0014a8ded15d70557643ee7e9" + integrity sha512-lWGuTVA+q3h1KS3nxTWeRGOfsuQ+GNwq5IxFJ8ko441mpwo5A2t6u25Z+G6t5Eh+q4EcoxMX64HYA+cu91lr7g== + dependencies: + "@aws-crypto/sha256-browser" "2.0.0" + "@aws-crypto/sha256-js" "2.0.0" + "@aws-sdk/client-sts" "3.236.0" + "@aws-sdk/config-resolver" "3.234.0" + "@aws-sdk/credential-provider-node" "3.236.0" + "@aws-sdk/fetch-http-handler" "3.226.0" + "@aws-sdk/hash-node" "3.226.0" + "@aws-sdk/invalid-dependency" "3.226.0" + "@aws-sdk/middleware-content-length" "3.226.0" + "@aws-sdk/middleware-endpoint" "3.226.0" + "@aws-sdk/middleware-host-header" "3.226.0" + "@aws-sdk/middleware-logger" "3.226.0" + "@aws-sdk/middleware-recursion-detection" "3.226.0" + "@aws-sdk/middleware-retry" "3.235.0" + "@aws-sdk/middleware-serde" "3.226.0" + "@aws-sdk/middleware-signing" "3.226.0" + "@aws-sdk/middleware-stack" "3.226.0" + "@aws-sdk/middleware-user-agent" "3.226.0" + "@aws-sdk/node-config-provider" "3.226.0" + "@aws-sdk/node-http-handler" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/smithy-client" "3.234.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/url-parser" "3.226.0" + "@aws-sdk/util-base64" "3.208.0" + "@aws-sdk/util-body-length-browser" "3.188.0" + "@aws-sdk/util-body-length-node" "3.208.0" + "@aws-sdk/util-defaults-mode-browser" "3.234.0" + "@aws-sdk/util-defaults-mode-node" "3.234.0" + "@aws-sdk/util-endpoints" "3.226.0" + "@aws-sdk/util-retry" "3.229.0" + "@aws-sdk/util-user-agent-browser" "3.226.0" + "@aws-sdk/util-user-agent-node" "3.226.0" + "@aws-sdk/util-utf8-browser" "3.188.0" + "@aws-sdk/util-utf8-node" "3.208.0" + tslib "^2.3.1" + +"@aws-sdk/client-sso-oidc@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.236.0.tgz#501cc3f69bdfc1b538b3b89d1166bc80dd86a461" + integrity sha512-9TuigSXGafVto+GjKsVkhNLlnSgNWzRL5/ClZ5lY3dWrcDEJGZjFwwRB3ICerFQJBdDfsYwjNjJPhYEHzdyBfQ== + dependencies: + "@aws-crypto/sha256-browser" "2.0.0" + "@aws-crypto/sha256-js" "2.0.0" + "@aws-sdk/config-resolver" "3.234.0" + "@aws-sdk/fetch-http-handler" "3.226.0" + "@aws-sdk/hash-node" "3.226.0" + "@aws-sdk/invalid-dependency" "3.226.0" + "@aws-sdk/middleware-content-length" "3.226.0" + "@aws-sdk/middleware-endpoint" "3.226.0" + "@aws-sdk/middleware-host-header" "3.226.0" + "@aws-sdk/middleware-logger" "3.226.0" + "@aws-sdk/middleware-recursion-detection" "3.226.0" + "@aws-sdk/middleware-retry" "3.235.0" + "@aws-sdk/middleware-serde" "3.226.0" + "@aws-sdk/middleware-stack" "3.226.0" + "@aws-sdk/middleware-user-agent" "3.226.0" + "@aws-sdk/node-config-provider" "3.226.0" + "@aws-sdk/node-http-handler" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/smithy-client" "3.234.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/url-parser" "3.226.0" + "@aws-sdk/util-base64" "3.208.0" + "@aws-sdk/util-body-length-browser" "3.188.0" + "@aws-sdk/util-body-length-node" "3.208.0" + "@aws-sdk/util-defaults-mode-browser" "3.234.0" + "@aws-sdk/util-defaults-mode-node" "3.234.0" + "@aws-sdk/util-endpoints" "3.226.0" + "@aws-sdk/util-retry" "3.229.0" + "@aws-sdk/util-user-agent-browser" "3.226.0" + "@aws-sdk/util-user-agent-node" "3.226.0" + "@aws-sdk/util-utf8-browser" "3.188.0" + "@aws-sdk/util-utf8-node" "3.208.0" + tslib "^2.3.1" + +"@aws-sdk/client-sso@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.236.0.tgz#eba16f73abb9639bfdafeeb64d5c9771db2a4cc9" + integrity sha512-2E/XHiVSRI+L2SlVscmV/+z4A2iWF6BTUjVBFBGMmsailvGDV6XKPFocTBsHI64G25/SYkhMdELvjn5jHLKBGQ== + dependencies: + "@aws-crypto/sha256-browser" "2.0.0" + "@aws-crypto/sha256-js" "2.0.0" + "@aws-sdk/config-resolver" "3.234.0" + "@aws-sdk/fetch-http-handler" "3.226.0" + "@aws-sdk/hash-node" "3.226.0" + "@aws-sdk/invalid-dependency" "3.226.0" + "@aws-sdk/middleware-content-length" "3.226.0" + "@aws-sdk/middleware-endpoint" "3.226.0" + "@aws-sdk/middleware-host-header" "3.226.0" + "@aws-sdk/middleware-logger" "3.226.0" + "@aws-sdk/middleware-recursion-detection" "3.226.0" + "@aws-sdk/middleware-retry" "3.235.0" + "@aws-sdk/middleware-serde" "3.226.0" + "@aws-sdk/middleware-stack" "3.226.0" + "@aws-sdk/middleware-user-agent" "3.226.0" + "@aws-sdk/node-config-provider" "3.226.0" + "@aws-sdk/node-http-handler" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/smithy-client" "3.234.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/url-parser" "3.226.0" + "@aws-sdk/util-base64" "3.208.0" + "@aws-sdk/util-body-length-browser" "3.188.0" + "@aws-sdk/util-body-length-node" "3.208.0" + "@aws-sdk/util-defaults-mode-browser" "3.234.0" + "@aws-sdk/util-defaults-mode-node" "3.234.0" + "@aws-sdk/util-endpoints" "3.226.0" + "@aws-sdk/util-retry" "3.229.0" + "@aws-sdk/util-user-agent-browser" "3.226.0" + "@aws-sdk/util-user-agent-node" "3.226.0" + "@aws-sdk/util-utf8-browser" "3.188.0" + "@aws-sdk/util-utf8-node" "3.208.0" + tslib "^2.3.1" + +"@aws-sdk/client-sts@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.236.0.tgz#8f3d793d627edf72ae80ffc50e7982b6cbcfd3f7" + integrity sha512-ruEALU0oPwsA8xZ/HBCoUO9rsyhPyalj20GMGpzVaNcf1dr1jMTThDQvQvvjAHjY3W56mI7ApxjK+D+gok55aw== + dependencies: + "@aws-crypto/sha256-browser" "2.0.0" + "@aws-crypto/sha256-js" "2.0.0" + "@aws-sdk/config-resolver" "3.234.0" + "@aws-sdk/credential-provider-node" "3.236.0" + "@aws-sdk/fetch-http-handler" "3.226.0" + "@aws-sdk/hash-node" "3.226.0" + "@aws-sdk/invalid-dependency" "3.226.0" + "@aws-sdk/middleware-content-length" "3.226.0" + "@aws-sdk/middleware-endpoint" "3.226.0" + "@aws-sdk/middleware-host-header" "3.226.0" + "@aws-sdk/middleware-logger" "3.226.0" + "@aws-sdk/middleware-recursion-detection" "3.226.0" + "@aws-sdk/middleware-retry" "3.235.0" + "@aws-sdk/middleware-sdk-sts" "3.226.0" + "@aws-sdk/middleware-serde" "3.226.0" + "@aws-sdk/middleware-signing" "3.226.0" + "@aws-sdk/middleware-stack" "3.226.0" + "@aws-sdk/middleware-user-agent" "3.226.0" + "@aws-sdk/node-config-provider" "3.226.0" + "@aws-sdk/node-http-handler" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/smithy-client" "3.234.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/url-parser" "3.226.0" + "@aws-sdk/util-base64" "3.208.0" + "@aws-sdk/util-body-length-browser" "3.188.0" + "@aws-sdk/util-body-length-node" "3.208.0" + "@aws-sdk/util-defaults-mode-browser" "3.234.0" + "@aws-sdk/util-defaults-mode-node" "3.234.0" + "@aws-sdk/util-endpoints" "3.226.0" + "@aws-sdk/util-retry" "3.229.0" + "@aws-sdk/util-user-agent-browser" "3.226.0" + "@aws-sdk/util-user-agent-node" "3.226.0" + "@aws-sdk/util-utf8-browser" "3.188.0" + "@aws-sdk/util-utf8-node" "3.208.0" + fast-xml-parser "4.0.11" + tslib "^2.3.1" + +"@aws-sdk/config-resolver@3.234.0": + version "3.234.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/config-resolver/-/config-resolver-3.234.0.tgz#29d8936b713b7ee59b26b335d4f6715d644fc089" + integrity sha512-uZxy4wzllfvgCQxVc+Iqhde0NGAnfmV2hWR6ejadJaAFTuYNvQiRg9IqJy3pkyDPqXySiJ8Bom5PoJfgn55J/A== + dependencies: + "@aws-sdk/signature-v4" "3.226.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/util-config-provider" "3.208.0" + "@aws-sdk/util-middleware" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-cognito-identity@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.236.0.tgz#7936ce9a7ceaeff9045d85b3e69af9865c467bfc" + integrity sha512-PDsUZ7gmSCwraDDYnmoSkmrA1tpmvDBDjNPUVe6E+/8tDw3SWiL2efGR6r8ajFh9m+6jF6B8Wy+YB3u3yjAjWQ== + dependencies: + "@aws-sdk/client-cognito-identity" "3.236.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-env@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.226.0.tgz#0bcb89a9abc166b3a48f5c255b9fcabc4cb80daf" + integrity sha512-sd8uK1ojbXxaZXlthzw/VXZwCPUtU3PjObOfr3Evj7MPIM2IH8h29foOlggx939MdLQGboJf9gKvLlvKDWtJRA== + dependencies: + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-imds@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.226.0.tgz#0a4558449eb261412b0490ea1c3242eb91659759" + integrity sha512-//z/COQm2AjYFI1Lb0wKHTQSrvLFTyuKLFQGPJsKS7DPoxGOCKB7hmYerlbl01IDoCxTdyL//TyyPxbZEOQD5Q== + dependencies: + "@aws-sdk/node-config-provider" "3.226.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/url-parser" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-ini@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.236.0.tgz#10270be0de0cd34b1a82187248ade3779ff02005" + integrity sha512-W5vMEauWgFCzvf4Hks6ToU5dhbN87gyijmwp/l9AkKKvuJ25LkveAhk8xz3bydJThHdgWNEuBMyfmlVWmdybIg== + dependencies: + "@aws-sdk/credential-provider-env" "3.226.0" + "@aws-sdk/credential-provider-imds" "3.226.0" + "@aws-sdk/credential-provider-process" "3.226.0" + "@aws-sdk/credential-provider-sso" "3.236.0" + "@aws-sdk/credential-provider-web-identity" "3.226.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/shared-ini-file-loader" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-node@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.236.0.tgz#288f10f65c8b94d8f20f431e77febbe6c285ab42" + integrity sha512-ktRPwmqw2P4dDzs/nJYTnuesSYqpDUEtqm2KSCKNT/fobzgfsrESLk3a7TY4l6N3muxQtKwguIa9Lulhe82+wg== + dependencies: + "@aws-sdk/credential-provider-env" "3.226.0" + "@aws-sdk/credential-provider-imds" "3.226.0" + "@aws-sdk/credential-provider-ini" "3.236.0" + "@aws-sdk/credential-provider-process" "3.226.0" + "@aws-sdk/credential-provider-sso" "3.236.0" + "@aws-sdk/credential-provider-web-identity" "3.226.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/shared-ini-file-loader" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-process@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.226.0.tgz#bcd73a6d31d1b3181917d56e54aacbee242b077f" + integrity sha512-iUDMdnrTvbvaCFhWwqyXrhvQ9+ojPqPqXhwZtY1X/Qaz+73S9gXBPJHZaZb2Ke0yKE1Ql3bJbKvmmxC/qLQMng== + dependencies: + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/shared-ini-file-loader" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-sso@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.236.0.tgz#98deadb0b689546bd5e93fc73dc6d6c87fe1c562" + integrity sha512-HLeVsFHd8QLQwhjwhdlBhXOFIa33mzqmxOqe2Qr4FVD5IR1/G4zLpSWSwtYjpvWRZs2oWSg6XI7vSyeQttPmHg== + dependencies: + "@aws-sdk/client-sso" "3.236.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/shared-ini-file-loader" "3.226.0" + "@aws-sdk/token-providers" "3.236.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-web-identity@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.226.0.tgz#2b7d20f93a40e2243c7e3857f54b103d19a946fb" + integrity sha512-CCpv847rLB0SFOHz2igvUMFAzeT2fD3YnY4C8jltuJoEkn0ITn1Hlgt13nTJ5BUuvyti2mvyXZHmNzhMIMrIlw== + dependencies: + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-providers@^3.186.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.236.0.tgz#52c6f0e5baa1f0eab1f39171b47102806809d504" + integrity sha512-z7RU5E9xlk6KX16jJxByn8xa8mv8pPZoqAPkavCsFJS6pOYTtQJYYdjrUK/2EmOmbPpc62P6mqVP7qTVQKgafw== + dependencies: + "@aws-sdk/client-cognito-identity" "3.236.0" + "@aws-sdk/client-sso" "3.236.0" + "@aws-sdk/client-sts" "3.236.0" + "@aws-sdk/credential-provider-cognito-identity" "3.236.0" + "@aws-sdk/credential-provider-env" "3.226.0" + "@aws-sdk/credential-provider-imds" "3.226.0" + "@aws-sdk/credential-provider-ini" "3.236.0" + "@aws-sdk/credential-provider-node" "3.236.0" + "@aws-sdk/credential-provider-process" "3.226.0" + "@aws-sdk/credential-provider-sso" "3.236.0" + "@aws-sdk/credential-provider-web-identity" "3.226.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/shared-ini-file-loader" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/fetch-http-handler@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.226.0.tgz#350f78fc18fe9cb0a889ef4870838a8fcfa8855c" + integrity sha512-JewZPMNEBXfi1xVnRa7pVtK/zgZD8/lQ/YnD8pq79WuMa2cwyhDtr8oqCoqsPW+WJT5ScXoMtuHxN78l8eKWgg== + dependencies: + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/querystring-builder" "3.226.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/util-base64" "3.208.0" + tslib "^2.3.1" + +"@aws-sdk/hash-node@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/hash-node/-/hash-node-3.226.0.tgz#252d98bcbb1e13c8f26d9d416db03cf8cceac185" + integrity sha512-MdlJhJ9/Espwd0+gUXdZRsHuostB2WxEVAszWxobP0FTT9PnicqnfK7ExmW+DUAc0ywxtEbR3e0UND65rlSTVw== + dependencies: + "@aws-sdk/types" "3.226.0" + "@aws-sdk/util-buffer-from" "3.208.0" + tslib "^2.3.1" + +"@aws-sdk/invalid-dependency@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/invalid-dependency/-/invalid-dependency-3.226.0.tgz#74586f60859ed1813985e3d642066cc46d2e9d40" + integrity sha512-QXOYFmap8g9QzRjumcRCIo2GEZkdCwd7ePQW0OABWPhKHzlJ74vvBxywjU3s39EEBEluWXtZ7Iufg6GxZM4ifw== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/is-array-buffer@3.201.0": + version "3.201.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/is-array-buffer/-/is-array-buffer-3.201.0.tgz#06e557adc284fac2f26071c2944ae01f61b95854" + integrity sha512-UPez5qLh3dNgt0DYnPD/q0mVJY84rA17QE26hVNOW3fAji8W2wrwrxdacWOxyXvlxWsVRcKmr+lay1MDqpAMfg== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/middleware-content-length@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-content-length/-/middleware-content-length-3.226.0.tgz#6cc952049f6e3cdc3a3778c9dce9f2aee942b5fe" + integrity sha512-ksUzlHJN2JMuyavjA46a4sctvnrnITqt2tbGGWWrAuXY1mel2j+VbgnmJUiwHKUO6bTFBBeft5Vd1TSOb4JmiA== + dependencies: + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-endpoint@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.226.0.tgz#d776480be4b5a9534c2805b7425be05497f840b7" + integrity sha512-EvLFafjtUxTT0AC9p3aBQu1/fjhWdIeK58jIXaNFONfZ3F8QbEYUPuF/SqZvJM6cWfOO9qwYKkRDbCSTYhprIg== + dependencies: + "@aws-sdk/middleware-serde" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/signature-v4" "3.226.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/url-parser" "3.226.0" + "@aws-sdk/util-config-provider" "3.208.0" + "@aws-sdk/util-middleware" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-host-header@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.226.0.tgz#1e1ecb034929e0dbc532ae501fd93781438f9a24" + integrity sha512-haVkWVh6BUPwKgWwkL6sDvTkcZWvJjv8AgC8jiQuSl8GLZdzHTB8Qhi3IsfFta9HAuoLjxheWBE5Z/L0UrfhLA== + dependencies: + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-logger@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.226.0.tgz#37fd0e62f555befd526b03748c3aab60dcefecf3" + integrity sha512-m9gtLrrYnpN6yckcQ09rV7ExWOLMuq8mMPF/K3DbL/YL0TuILu9i2T1W+JuxSX+K9FMG2HrLAKivE/kMLr55xA== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-recursion-detection@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.226.0.tgz#e149b9138e94d2fa70e7752ba6b1ccb537009706" + integrity sha512-mwRbdKEUeuNH5TEkyZ5FWxp6bL2UC1WbY+LDv6YjHxmSMKpAoOueEdtU34PqDOLrpXXxIGHDFmjeGeMfktyEcA== + dependencies: + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-retry@3.235.0": + version "3.235.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-retry/-/middleware-retry-3.235.0.tgz#c0d938db85a771812204ed5e981eaf5eef6b580b" + integrity sha512-50WHbJGpD3SNp9763MAlHqIhXil++JdQbKejNpHg7HsJne/ao3ub+fDOfx//mMBjpzBV25BGd5UlfL6blrClSg== + dependencies: + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/service-error-classification" "3.229.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/util-middleware" "3.226.0" + "@aws-sdk/util-retry" "3.229.0" + tslib "^2.3.1" + uuid "^8.3.2" + +"@aws-sdk/middleware-sdk-sts@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.226.0.tgz#e8a8cf42bba8963259546120cde1e408628863f9" + integrity sha512-NN9T/qoSD1kZvAT+VLny3NnlqgylYQcsgV3rvi/8lYzw/G/2s8VS6sm/VTWGGZhx08wZRv20MWzYu3bftcyqUg== + dependencies: + "@aws-sdk/middleware-signing" "3.226.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/signature-v4" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-serde@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-serde/-/middleware-serde-3.226.0.tgz#c837ef33b34bec2af19a1c177a0c02a1ae20da5e" + integrity sha512-nPuOOAkSfx9TxzdKFx0X2bDlinOxGrqD7iof926K/AEflxGD1DBdcaDdjlYlPDW2CVE8LV/rAgbYuLxh/E/1VA== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-signing@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.226.0.tgz#ebb1d142ac2767466f2e464bb7dba9837143b4d1" + integrity sha512-E6HmtPcl+IjYDDzi1xI2HpCbBq2avNWcjvCriMZWuTAtRVpnA6XDDGW5GY85IfS3A8G8vuWqEVPr8JcYUcjfew== + dependencies: + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/signature-v4" "3.226.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/util-middleware" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-stack@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-stack/-/middleware-stack-3.226.0.tgz#b0408370270188103987c457c758f9cf7651754f" + integrity sha512-85wF29LvPvpoed60fZGDYLwv1Zpd/cM0C22WSSFPw1SSJeqO4gtFYyCg2squfT3KI6kF43IIkOCJ+L7GtryPug== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/middleware-user-agent@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.226.0.tgz#26653189f3e8da86514f77688a80d0ad445c0799" + integrity sha512-N1WnfzCW1Y5yWhVAphf8OPGTe8Df3vmV7/LdsoQfmpkCZgLZeK2o0xITkUQhRj1mbw7yp8tVFLFV3R2lMurdAQ== + dependencies: + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/node-config-provider@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/node-config-provider/-/node-config-provider-3.226.0.tgz#a9e21512ef824142bb928a0b2f85b39a75b8964d" + integrity sha512-B8lQDqiRk7X5izFEUMXmi8CZLOKCTWQJU9HQf3ako+sF0gexo4nHN3jhoRWyLtcgC5S3on/2jxpAcqtm7kuY3w== + dependencies: + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/shared-ini-file-loader" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/node-http-handler@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/node-http-handler/-/node-http-handler-3.226.0.tgz#373886e949d214a99a3521bd6c141fa17b0e89fe" + integrity sha512-xQCddnZNMiPmjr3W7HYM+f5ir4VfxgJh37eqZwX6EZmyItFpNNeVzKUgA920ka1VPz/ZUYB+2OFGiX3LCLkkaA== + dependencies: + "@aws-sdk/abort-controller" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/querystring-builder" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/property-provider@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/property-provider/-/property-provider-3.226.0.tgz#ef0ff37c319dc37a52f08fa7544f861308a3bbd8" + integrity sha512-TsljjG+Sg0LmdgfiAlWohluWKnxB/k8xenjeozZfzOr5bHmNHtdbWv6BtNvD/R83hw7SFXxbJHlD5H4u9p2NFg== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/protocol-http@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/protocol-http/-/protocol-http-3.226.0.tgz#0af7bdc331508e556b722aad0cb78eefa93466e3" + integrity sha512-zWkVqiTA9RXL6y0hhfZc9bcU4DX2NI6Hw9IhQmSPeM59mdbPjJlY4bLlMr5YxywqO3yQ/ylNoAfrEzrDjlOSRg== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/querystring-builder@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/querystring-builder/-/querystring-builder-3.226.0.tgz#11cd751abeac66f1f9349225454bac3e39808926" + integrity sha512-LVurypuNeotO4lmirKXRC4NYrZRAyMJXuwO0f2a5ZAUJCjauwYrifKue6yCfU7bls7gut7nfcR6B99WBYpHs3g== + dependencies: + "@aws-sdk/types" "3.226.0" + "@aws-sdk/util-uri-escape" "3.201.0" + tslib "^2.3.1" + +"@aws-sdk/querystring-parser@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/querystring-parser/-/querystring-parser-3.226.0.tgz#ba6a26727c98d46c95180e6cdc463039c5e4740d" + integrity sha512-FzB+VrQ47KAFxiPt2YXrKZ8AOLZQqGTLCKHzx4bjxGmwgsjV8yIbtJiJhZLMcUQV4LtGeIY9ixIqQhGvnZHE4A== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/service-error-classification@3.229.0": + version "3.229.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/service-error-classification/-/service-error-classification-3.229.0.tgz#768f1eb92775ca2cc99c6451a2303a0008a28fc1" + integrity sha512-dnzWWQ0/NoWMUZ5C0DW3dPm0wC1O76Y/SpKbuJzWPkx1EYy6r8p32Ly4D9vUzrKDbRGf48YHIF2kOkBmu21CLg== + +"@aws-sdk/shared-ini-file-loader@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.226.0.tgz#d0ade86834b1803ce4b9dcab459e57e0376fd6cf" + integrity sha512-661VQefsARxVyyV2FX9V61V+nNgImk7aN2hYlFKla6BCwZfMng+dEtD0xVGyg1PfRw0qvEv5LQyxMVgHcUSevA== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/signature-v4@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4/-/signature-v4-3.226.0.tgz#100390b5c5b55a9b0abd05b06fceb36cfa0ecf98" + integrity sha512-/R5q5agdPd7HJB68XMzpxrNPk158EHUvkFkuRu5Qf3kkkHebEzWEBlWoVpUe6ss4rP9Tqcue6xPuaftEmhjpYw== + dependencies: + "@aws-sdk/is-array-buffer" "3.201.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/util-hex-encoding" "3.201.0" + "@aws-sdk/util-middleware" "3.226.0" + "@aws-sdk/util-uri-escape" "3.201.0" + tslib "^2.3.1" + +"@aws-sdk/smithy-client@3.234.0": + version "3.234.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/smithy-client/-/smithy-client-3.234.0.tgz#8f0021e021f0e52730ed0a8f271f839eb63bc374" + integrity sha512-8AtR/k4vsFvjXeQbIzq/Wy7Nbk48Ou0wUEeVYPHWHPSU8QamFWORkOwmKtKMfHAyZvmqiAPeQqHFkq+UJhWyyQ== + dependencies: + "@aws-sdk/middleware-stack" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/token-providers@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.236.0.tgz#c98ad2abad2a3686dbe849d680572f11ce965605" + integrity sha512-gmHuWuQgl6+2UfdbOvtsns/byZQnPGjyQ88/SlKgnX2EcDd31ENb8wRa9gfIEwvx6rTB2ve1NAhuliydB9AomQ== + dependencies: + "@aws-sdk/client-sso-oidc" "3.236.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/shared-ini-file-loader" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/types@3.226.0", "@aws-sdk/types@^3.1.0", "@aws-sdk/types@^3.110.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.226.0.tgz#3dba2ba223fbb8ac1ebc84de0e036ce69a81d469" + integrity sha512-MmmNHrWeO4man7wpOwrAhXlevqtOV9ZLcH4RhnG5LmRce0RFOApx24HoKENfFCcOyCm5LQBlsXCqi0dZWDWU0A== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/url-parser@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/url-parser/-/url-parser-3.226.0.tgz#f53d1f868b27fe74aca091a799f2af56237b15a2" + integrity sha512-p5RLE0QWyP0OcTOLmFcLdVgUcUEzmEfmdrnOxyNzomcYb0p3vUagA5zfa1HVK2azsQJFBv28GfvMnba9bGhObg== + dependencies: + "@aws-sdk/querystring-parser" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/util-base64@3.208.0": + version "3.208.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-base64/-/util-base64-3.208.0.tgz#36b430e5396251f761590f7c2f0c5c12193f353c" + integrity sha512-PQniZph5A6N7uuEOQi+1hnMz/FSOK/8kMFyFO+4DgA1dZ5pcKcn5wiFwHkcTb/BsgVqQa3Jx0VHNnvhlS8JyTg== + dependencies: + "@aws-sdk/util-buffer-from" "3.208.0" + tslib "^2.3.1" + +"@aws-sdk/util-body-length-browser@3.188.0": + version "3.188.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.188.0.tgz#e1d949318c10a621b38575a9ef01e39f9857ddb0" + integrity sha512-8VpnwFWXhnZ/iRSl9mTf+VKOX9wDE8QtN4bj9pBfxwf90H1X7E8T6NkiZD3k+HubYf2J94e7DbeHs7fuCPW5Qg== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-body-length-node@3.208.0": + version "3.208.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-body-length-node/-/util-body-length-node-3.208.0.tgz#baabd1fa1206ff2bd4ce3785122d86eb3258dd20" + integrity sha512-3zj50e5g7t/MQf53SsuuSf0hEELzMtD8RX8C76f12OSRo2Bca4FLLYHe0TZbxcfQHom8/hOaeZEyTyMogMglqg== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-buffer-from@3.208.0": + version "3.208.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-buffer-from/-/util-buffer-from-3.208.0.tgz#285e86f6dc9030148a4147d65239e75cb254a1b0" + integrity sha512-7L0XUixNEFcLUGPeBF35enCvB9Xl+K6SQsmbrPk1P3mlV9mguWSDQqbOBwY1Ir0OVbD6H/ZOQU7hI/9RtRI0Zw== + dependencies: + "@aws-sdk/is-array-buffer" "3.201.0" + tslib "^2.3.1" + +"@aws-sdk/util-config-provider@3.208.0": + version "3.208.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-config-provider/-/util-config-provider-3.208.0.tgz#c485fd83fbac051337e5f6be60ea3f9fa61c0139" + integrity sha512-DSRqwrERUsT34ug+anlMBIFooBEGwM8GejC7q00Y/9IPrQy50KnG5PW2NiTjuLKNi7pdEOlwTSEocJE15eDZIg== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-defaults-mode-browser@3.234.0": + version "3.234.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.234.0.tgz#1151f0beabdb46c1aaca42a1ad0714b8e686acaa" + integrity sha512-IHMKXjTbOD8XMz5+2oCOsVP94BYb9YyjXdns0aAXr2NAo7k2+RCzXQ2DebJXppGda1F6opFutoKwyVSN0cmbMw== + dependencies: + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/types" "3.226.0" + bowser "^2.11.0" + tslib "^2.3.1" + +"@aws-sdk/util-defaults-mode-node@3.234.0": + version "3.234.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.234.0.tgz#0607f1dc7a4dc896dfcaf377522535ca9ffba7a9" + integrity sha512-UGjQ+OjBYYhxFVtUY+jtr0ZZgzZh6OHtYwRhFt8IHewJXFCfZTyfsbX20szBj5y1S4HRIUJ7cwBLIytTqMbI5w== + dependencies: + "@aws-sdk/config-resolver" "3.234.0" + "@aws-sdk/credential-provider-imds" "3.226.0" + "@aws-sdk/node-config-provider" "3.226.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/util-endpoints@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.226.0.tgz#3728b2e30f6f757ae862a0b7cf3991e75f252c3f" + integrity sha512-iqOkac/zLmyPBUJd7SLN0PeZMkOmlGgD5PHmmekTClOkce2eUjK9SNX1PzL73aXPoPTyhg9QGLH8uEZEQ8YUzg== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/util-hex-encoding@3.201.0": + version "3.201.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.201.0.tgz#21d7ec319240ee68c33d938e71cb79830bea315d" + integrity sha512-7t1vR1pVxKx0motd3X9rI3m/xNp78p3sHtP5yo4NP4ARpxyJ0fokBomY8ScaH2D/B+U5o9ARxldJUdMqyBlJcA== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-locate-window@^3.0.0": + version "3.208.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.208.0.tgz#0f598fc238a1256e4bcb64d01459f03a922dd4c3" + integrity sha512-iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-middleware@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-middleware/-/util-middleware-3.226.0.tgz#7069ae96e2e00f6bb82c722e073922fb2b051ca2" + integrity sha512-B96CQnwX4gRvQdaQkdUtqvDPkrptV5+va6FVeJOocU/DbSYMAScLxtR3peMS8cnlOT6nL1Eoa42OI9AfZz1VwQ== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-retry@3.229.0": + version "3.229.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-retry/-/util-retry-3.229.0.tgz#17aad47b067e81acf644d5c2c0f2325f2d8faf4f" + integrity sha512-0zKTqi0P1inD0LzIMuXRIYYQ/8c1lWMg/cfiqUcIAF1TpatlpZuN7umU0ierpBFud7S+zDgg0oemh+Nj8xliJw== + dependencies: + "@aws-sdk/service-error-classification" "3.229.0" + tslib "^2.3.1" + +"@aws-sdk/util-uri-escape@3.201.0": + version "3.201.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-uri-escape/-/util-uri-escape-3.201.0.tgz#5e708d4cde001a4558ee616f889ceacfadd2ab03" + integrity sha512-TeTWbGx4LU2c5rx0obHeDFeO9HvwYwQtMh1yniBz00pQb6Qt6YVOETVQikRZ+XRQwEyCg/dA375UplIpiy54mA== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-user-agent-browser@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.226.0.tgz#164bb2da8d6353133784e47f0a0ae463bc9ebb73" + integrity sha512-PhBIu2h6sPJPcv2I7ELfFizdl5pNiL4LfxrasMCYXQkJvVnoXztHA1x+CQbXIdtZOIlpjC+6BjDcE0uhnpvfcA== + dependencies: + "@aws-sdk/types" "3.226.0" + bowser "^2.11.0" + tslib "^2.3.1" + +"@aws-sdk/util-user-agent-node@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.226.0.tgz#7569460b9efc6bbd5295275c51357e480ff469c2" + integrity sha512-othPc5Dz/pkYkxH+nZPhc1Al0HndQT8zHD4e9h+EZ+8lkd8n+IsnLfTS/mSJWrfiC6UlNRVw55cItstmJyMe/A== + dependencies: + "@aws-sdk/node-config-provider" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/util-utf8-browser@3.188.0", "@aws-sdk/util-utf8-browser@^3.0.0": + version "3.188.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.188.0.tgz#484762bd600401350e148277731d6744a4a92225" + integrity sha512-jt627x0+jE+Ydr9NwkFstg3cUvgWh56qdaqAMDsqgRlKD21md/6G226z/Qxl7lb1VEW2LlmCx43ai/37Qwcj2Q== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-utf8-node@3.208.0": + version "3.208.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-node/-/util-utf8-node-3.208.0.tgz#eba17de0f92f87b98481c2e2d0ceaa05c7994d67" + integrity sha512-jKY87Acv0yWBdFxx6bveagy5FYjz+dtV8IPT7ay1E2WPWH1czoIdMAkc8tSInK31T6CRnHWkLZ1qYwCbgRfERQ== + dependencies: + "@aws-sdk/util-buffer-from" "3.208.0" + tslib "^2.3.1" + "@babel/cli@^7.16.0": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.19.3.tgz#55914ed388e658e0b924b3a95da1296267e278e2" - integrity sha512-643/TybmaCAe101m2tSVHi9UKpETXP9c/Ff4mD2tAwkdP6esKIfaauZFc67vGEM6r9fekbEGid+sZhbEnSe3dg== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.20.7.tgz#8fc12e85c744a1a617680eacb488fab1fcd35b7c" + integrity sha512-WylgcELHB66WwQqItxNILsMlaTd8/SO6SgTTjMp4uCI7P4QyH1r3nqgFmO3BfM4AtfniHgFMH3EpYFj/zynBkQ== dependencies: "@jridgewell/trace-mapping" "^0.3.8" commander "^4.0.1" @@ -33,38 +779,38 @@ dependencies: "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.20.0": +"@babel/compat-data@^7.20.5": version "7.20.5" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733" integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g== "@babel/core@^7.16.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113" - integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz#37072f951bd4d28315445f66e0ec9f6ae0c8c35f" + integrity sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.5" - "@babel/helper-compilation-targets" "^7.20.0" - "@babel/helper-module-transforms" "^7.20.2" - "@babel/helpers" "^7.20.5" - "@babel/parser" "^7.20.5" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.5" - "@babel/types" "^7.20.5" + "@babel/generator" "^7.20.7" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-module-transforms" "^7.20.7" + "@babel/helpers" "^7.20.7" + "@babel/parser" "^7.20.7" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.1" semver "^6.3.0" -"@babel/generator@^7.20.5", "@babel/generator@^7.4.0": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95" - integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA== +"@babel/generator@^7.20.7", "@babel/generator@^7.4.0": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a" + integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw== dependencies: - "@babel/types" "^7.20.5" + "@babel/types" "^7.20.7" "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" @@ -75,14 +821,15 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-compilation-targets@^7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a" - integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ== +"@babel/helper-compilation-targets@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" + integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== dependencies: - "@babel/compat-data" "^7.20.0" + "@babel/compat-data" "^7.20.5" "@babel/helper-validator-option" "^7.18.6" browserslist "^4.21.3" + lru-cache "^5.1.1" semver "^6.3.0" "@babel/helper-environment-visitor@^7.18.9": @@ -112,21 +859,21 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712" - integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA== +"@babel/helper-module-transforms@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz#7a6c9a1155bef55e914af574153069c9d9470c43" + integrity sha512-FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA== dependencies: "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-module-imports" "^7.18.6" "@babel/helper-simple-access" "^7.20.2" "@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-validator-identifier" "^7.19.1" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.1" - "@babel/types" "^7.20.2" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" -"@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.19.0": +"@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2": version "7.20.2" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== @@ -160,14 +907,14 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== -"@babel/helpers@^7.20.5": - version "7.20.6" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz#e64778046b70e04779dfbdf924e7ebb45992c763" - integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w== +"@babel/helpers@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz#04502ff0feecc9f20ecfaad120a18f011a8e6dce" + integrity sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA== dependencies: - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.5" - "@babel/types" "^7.20.5" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" "@babel/highlight@^7.18.6": version "7.18.6" @@ -179,9 +926,9 @@ js-tokens "^4.0.0" "@babel/node@^7.16.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.20.5.tgz#5afdc32f4e195019b6c566f418ad630a9ee42695" - integrity sha512-ElSr40UtumWE4fYYF1xfLP2C6b9nfS/rswK7YYpLo9HDGEXGXEAWZaGCxIirxGIDyoV0rbl6jV1LyFMQ6ZOQSA== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.20.7.tgz#609be7f841893e24931b7910263babfde84040a9" + integrity sha512-AQt3gVcP+fpFuoFn4FmIW/+5JovvEoA9og4Y1LrRw0pv3jkl4tujZMMy3X/3ugjLrEy3k1aNywo3JIl3g+jVXQ== dependencies: "@babel/register" "^7.18.9" commander "^4.0.1" @@ -190,10 +937,10 @@ regenerator-runtime "^0.13.11" v8flags "^3.1.1" -"@babel/parser@^7.18.10", "@babel/parser@^7.20.5", "@babel/parser@^7.4.3": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8" - integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA== +"@babel/parser@^7.20.7", "@babel/parser@^7.4.3": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b" + integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg== "@babel/plugin-syntax-jsx@^7.18.6": version "7.18.6" @@ -203,15 +950,15 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-react-jsx@^7.16.5": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz#b3cbb7c3a00b92ec8ae1027910e331ba5c500eb9" - integrity sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.7.tgz#025d85a1935fd7e19dfdcb1b1d4df34d4da484f7" + integrity sha512-Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-jsx" "^7.18.6" - "@babel/types" "^7.19.0" + "@babel/types" "^7.20.7" "@babel/register@^7.18.9": version "7.18.9" @@ -224,35 +971,35 @@ pirates "^4.0.5" source-map-support "^0.5.16" -"@babel/template@^7.18.10", "@babel/template@^7.4.0": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" - integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA== +"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.4.0": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" + integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.18.10" - "@babel/types" "^7.18.10" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" -"@babel/traverse@^7.20.1", "@babel/traverse@^7.20.5", "@babel/traverse@^7.4.3": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133" - integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ== +"@babel/traverse@^7.20.7", "@babel/traverse@^7.4.3": + version "7.20.8" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.8.tgz#e3a23eb04af24f8bbe8a8ba3eef6155b77df0b08" + integrity sha512-/RNkaYDeCy4MjyV70+QkSHhxbvj2JO/5Ft2Pa880qJOG8tWrqcT/wXUuCCv43yogfqPzHL77Xu101KQPf4clnQ== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.5" + "@babel/generator" "^7.20.7" "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-function-name" "^7.19.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.20.5" - "@babel/types" "^7.20.5" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.4.0": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84" - integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg== +"@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.4.0": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" + integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== dependencies: "@babel/helper-string-parser" "^7.19.4" "@babel/helper-validator-identifier" "^7.19.1" @@ -306,15 +1053,15 @@ integrity sha512-ylt2NyZ77bJbRij4h9u/wVy7qYw/aDqQLWnadjvDqW/WoWCxrsX6M3CIw9GVP5xcGCDxsrKj5e0r5evuFYwrKg== "@discordjs/rest@^1.3.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@discordjs/rest/-/rest-1.4.0.tgz#ceaff2a63680c5a0d8c43b85c8a2b023413d4080" - integrity sha512-k3Ip7ffFSAfp7Mu4H/3BEXFvFz+JsbXRrRtpeBMnSp1LefhtlZWJE6xdXzNlblktKNQltnRwY+z0NZrGQdxAMw== + version "1.5.0" + resolved "https://registry.yarnpkg.com/@discordjs/rest/-/rest-1.5.0.tgz#dc15474ab98cf6f31291bf61bbc72bcf4f30cea2" + integrity sha512-lXgNFqHnbmzp5u81W0+frdXN6Etf4EUi8FAPcWpSykKd8hmlWh1xy6BmE0bsJypU1pxohaA8lQCgp70NUI3uzA== dependencies: "@discordjs/collection" "^1.3.0" "@discordjs/util" "^0.1.0" "@sapphire/async-queue" "^1.5.0" "@sapphire/snowflake" "^3.2.2" - discord-api-types "^0.37.20" + discord-api-types "^0.37.23" file-type "^18.0.0" tslib "^2.4.1" undici "^5.13.0" @@ -427,17 +1174,17 @@ integrity sha512-JkLdIsP8fPAdh9ZZjrbHWR/+mZj0wvKS5ICibcLrRI1j84UmLMshx5n9QmL8b95d4onJ2xxiyugTgSAX7AalmA== "@sapphire/shapeshift@^3.7.1": - version "3.7.1" - resolved "https://registry.yarnpkg.com/@sapphire/shapeshift/-/shapeshift-3.7.1.tgz#11f6b7bedc5bc980a1de57bd98ea2566d679d39f" - integrity sha512-JmYN/0GW49Vl8Hi4PwrsDBNjcuCylH78vWYolVys74LRIzilAAMINxx4RHQOdvYoz+ceJKVp4+zBbQ5kuIFOLw== + version "3.8.1" + resolved "https://registry.yarnpkg.com/@sapphire/shapeshift/-/shapeshift-3.8.1.tgz#b98dc6a7180f9b38219267917b2e6fa33f9ec656" + integrity sha512-xG1oXXBhCjPKbxrRTlox9ddaZTvVpOhYLmKmApD/vIWOV1xEYXnpoFs68zHIZBGbqztq6FrUPNPerIrO1Hqeaw== dependencies: fast-deep-equal "^3.1.3" - lodash.uniqwith "^4.5.0" + lodash "^4.17.21" "@sapphire/snowflake@^3.2.2": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.2.2.tgz#faacdc1b5f7c43145a71eddba917de2b707ef780" - integrity sha512-ula2O0kpSZtX9rKXNeQMrHwNd7E4jPDJYUXmEGTFdMRfyfMw+FPyh04oKMjAiDuOi64bYgVkOV3MjK+loImFhQ== + version "3.3.0" + resolved "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.3.0.tgz#247413e4d7924a9f508c6a5c8d427e4105ac0fe6" + integrity sha512-Hec5N6zEkZuZFLybVKyLFLlcSgYmR6C1/+9NkIhxPwOf6tgX52ndJCSz8ADejmbrNE0VuNCNkpzhRZzenEC9vA== "@sendgrid/client@^7.7.0": version "7.7.0" @@ -490,14 +1237,14 @@ "@types/node" "*" "@types/node@*": - version "18.11.9" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4" - integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg== + version "18.11.17" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.17.tgz#5c009e1d9c38f4a2a9d45c0b0c493fe6cdb4bcb5" + integrity sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng== "@types/node@^14.14.14": - version "14.18.33" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.33.tgz#8c29a0036771569662e4635790ffa9e057db379b" - integrity sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg== + version "14.18.35" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.35.tgz#879c4659cb7b3fe515844f029c75079c941bb65c" + integrity sha512-2ATO8pfhG1kDvw4Lc4C0GXIMSQFFJBCo/R1fSgTwmUlq5oy95LXyjDQinsRVgQY6gp6ghh3H91wk9ES5/5C+Tw== "@types/node@^17.0.45": version "17.0.45" @@ -995,17 +1742,19 @@ accepts@~1.3.5, accepts@~1.3.8: mime-types "~2.1.34" negotiator "0.6.3" -acebase-core@^1.24.0: - version "1.24.0" - resolved "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.24.0.tgz#3b6d057f8cd1bb5af434bf240dec0f39f76f0ed9" - integrity sha512-tHFVHJZDVVZSqXsuRvI/CMbcbQtulPHH/Ng6RRdfB+fPCk5tC+DrHa/X0nDfx4fzyQLVLFqp/sFErzowJwhHQw== +acebase-core@^1.25.0: + version "1.25.0" + resolved "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.25.0.tgz#afc95a26b9e1521cabc5de871ea9f186805de836" + integrity sha512-d7Bh0tcYYCcdKLYu7lDYPhDOIZQObUwGiMg4mcMfsdWWdlfQyQqQMLkYVRqVH1OdHHXEx/BoqtH1oHkEBqgRZg== + optionalDependencies: + rxjs ">= 5.x <= 7.x" acebase@*: - version "1.26.2" - resolved "https://registry.yarnpkg.com/acebase/-/acebase-1.26.2.tgz#e8acc525bfcf9cef47049c551c4e5d5e31b04197" - integrity sha512-ClN81mYAkePS2v6ux4eXoFzOCJSA8H/rIIsbr3Qttnd/6/j6G8ooGqsxTqaWwYIdPYeAIaCJsyAqyB4Q59mUhA== + version "1.27.0" + resolved "https://registry.yarnpkg.com/acebase/-/acebase-1.27.0.tgz#ac47105fe85c3019bef79b563771ebfae4719275" + integrity sha512-bnd8NhMrBg3jgbLRtMVRE9yahhSVm6mPGiwQis/gtpBORvJamlNbwQvv+xd6wA+K2SClvv23TkyLhBe7WLBqzA== dependencies: - acebase-core "^1.24.0" + acebase-core "^1.25.0" unidecode "^0.1.8" acme-client@4.2.5: @@ -2079,9 +2828,9 @@ bignumber.js@9.0.0: integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== bignumber.js@^9.0.0, bignumber.js@^9.0.1: - version "9.1.0" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.0.tgz#8d340146107fe3a6cb8d40699643c302e8773b62" - integrity sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A== + version "9.1.1" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.1.tgz#c4df7dc496bd849d4c9464344c1aa74228b4dac6" + integrity sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig== binary-extensions@^1.0.0: version "1.13.1" @@ -2167,6 +2916,11 @@ boom@0.4.x: dependencies: hoek "0.9.x" +bowser@^2.11.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.11.0.tgz#5ca3c35757a7aa5771500c70a73a9f91ef420a8f" + integrity sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA== + brace-expansion@^1.0.0, brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -2411,9 +3165,9 @@ camelcase@^5.0.0: integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== caniuse-lite@^1.0.30001400: - version "1.0.30001434" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz#ec1ec1cfb0a93a34a0600d37903853030520a4e5" - integrity sha512-aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA== + version "1.0.30001441" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz#987437b266260b640a23cd18fbddb509d7f69f3e" + integrity sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg== caseless@~0.12.0: version "0.12.0" @@ -3075,9 +3829,9 @@ dateformat@~3.0.3: integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== dayjs@^1.8.29: - version "1.11.6" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.6.tgz#2e79a226314ec3ec904e3ee1dd5a4f5e5b1c7afb" - integrity sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ== + version "1.11.7" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" + integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== ddata@~0.1.25: version "0.1.28" @@ -3120,14 +3874,14 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.2.0: integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== decimal.js@^10.4.2: - version "10.4.2" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz#0341651d1d997d86065a2ce3a441fbd0d8e8b98e" - integrity sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA== + version "10.4.3" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" + integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og== + version "0.2.2" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" + integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== deep-extend@~0.4.1: version "0.4.2" @@ -3252,10 +4006,10 @@ dir_cache@^1.0.1: minify-js "0.0.2" utils-igor "^1.0.4" -discord-api-types@^0.37.12, discord-api-types@^0.37.20: - version "0.37.20" - resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.20.tgz#f23894e3e6b894abb5431ff6c4aa52471360377c" - integrity sha512-uAO+55E11rMkYR36/paE1vKN8c2bZa1mgrIaiQIBgIZRKZTDIGOZB+8I5eMRPFJcGxrg16riUu+0aTu2JQEPew== +discord-api-types@^0.37.12, discord-api-types@^0.37.20, discord-api-types@^0.37.23: + version "0.37.24" + resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.24.tgz#f3ee0ad6b2b70925b5225f9beac6e24bc4de6e46" + integrity sha512-1+Fb4huJCihdbkJLcq2p7nBmtlmAryNwjefT8wwJnL8c7bc7WA87Oaa5mbLe96QvZyfwnwRCDX40H0HhcVV50g== discord.js@14.6.0: version "14.6.0" @@ -3426,9 +4180,9 @@ error-ex@^1.2.0, error-ex@^1.3.1: is-arrayish "^0.2.1" es-abstract@^1.19.0, es-abstract@^1.20.4: - version "1.20.4" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861" - integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA== + version "1.20.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.5.tgz#e6dc99177be37cacda5988e692c3fa8b218e95d2" + integrity sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -3436,6 +4190,7 @@ es-abstract@^1.19.0, es-abstract@^1.20.4: function.prototype.name "^1.1.5" get-intrinsic "^1.1.3" get-symbol-description "^1.0.0" + gopd "^1.0.1" has "^1.0.3" has-property-descriptors "^1.0.0" has-symbols "^1.0.3" @@ -3451,8 +4206,8 @@ es-abstract@^1.19.0, es-abstract@^1.20.4: object.assign "^4.1.4" regexp.prototype.flags "^1.4.3" safe-regex-test "^1.0.0" - string.prototype.trimend "^1.0.5" - string.prototype.trimstart "^1.0.5" + string.prototype.trimend "^1.0.6" + string.prototype.trimstart "^1.0.6" unbox-primitive "^1.0.2" es-array-method-boxes-properly@^1.0.0: @@ -3740,6 +4495,13 @@ fast-text-encoding@^1.0.0: resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867" integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w== +fast-xml-parser@4.0.11: + version "4.0.11" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.0.11.tgz#42332a9aca544520631c8919e6ea871c0185a985" + integrity sha512-4aUg3aNRR/WjQAcpceODG1C3x3lFANXRo8+1biqfieHmg9pyMt7qB4lQV/Ta6sJCTbA5vfD8fnA8S54JATiFUA== + dependencies: + strnum "^1.0.5" + fast-xml-parser@^3.19.0: version "3.21.1" resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz#152a1d51d445380f7046b304672dd55d15c9e736" @@ -4146,9 +4908,9 @@ gaxios@^5.0.0, gaxios@^5.0.1: node-fetch "^2.6.7" gcp-metadata@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.0.1.tgz#8d1e785ee7fad554bc2a80c1f930c9a9518d2b00" - integrity sha512-jiRJ+Fk7e8FH68Z6TLaqwea307OktJpDjmYnU7/li6ziwvVvU2RlrCyQo5vkdeP94chm0kcSCOOszvmuaioq3g== + version "5.1.0" + resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.1.0.tgz#105768fd493ab6ff9606e0d77cdf0a4d9c1a0180" + integrity sha512-QVjouEXvNVG/nde6VZDXXFTB02xQdztaumkWCHUff58qsdCS05/8OPh68fQ2QnArfAzZTwfEc979FHSHsU8EWg== dependencies: gaxios "^5.0.0" json-bigint "^1.0.0" @@ -4168,7 +4930,7 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== @@ -4327,9 +5089,9 @@ google-protobuf@3.19.4: integrity sha512-OIPNCxsG2lkIvf+P5FNfJ/Km95CsXOBecS9ZcAU6m2Rq3svc0Apl9nB3GMDNKfQ9asNv4KjyAqGwPQFrVle3Yg== googleapis-common@^6.0.0: - version "6.0.3" - resolved "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-6.0.3.tgz#c11cdef91b272a13eb689b143f83a038fb2c403d" - integrity sha512-Xyb4FsQ6PQDu4tAE/M/ev4yzZhFe2Gc7+rKmuCX2ZGk1ajBKbafsGlVYpmzGqQOT93BRDe8DiTmQb6YSkbICrA== + version "6.0.4" + resolved "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-6.0.4.tgz#bd968bef2a478bcd3db51b27655502a11eaf8bf4" + integrity sha512-m4ErxGE8unR1z0VajT6AYk3s6a9gIMM6EkDZfkPnES8joeOlEtFEJeF8IyZkb0tjPXkktUfYrE4b3Li1DNyOwA== dependencies: extend "^3.0.2" gaxios "^5.0.1" @@ -4339,13 +5101,20 @@ googleapis-common@^6.0.0: uuid "^9.0.0" googleapis@*: - version "109.0.1" - resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-109.0.1.tgz#e4b160c9aff12acfd8ce0b4617f5192b7b8c01b3" - integrity sha512-x286OtNu0ngzxfGz2XgRs4aMhrwutRCkCE12dh2M1jIZOpOndB7ELFXEhmtxaJ7z3257flKIbiiCJZeBO+ze/Q== + version "110.0.0" + resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-110.0.0.tgz#73e59ff0c64658924c71229ef8884da60ac9aeec" + integrity sha512-k6de3PGsdFEBULMiFwPYCKOBljDTDvHD3YGe/OFqe8Ot0lYQPL8QV1qjxjrPWiE/Ftf0Ar2v4DNES66jLfSO7w== dependencies: google-auth-library "^8.0.2" googleapis-common "^6.0.0" +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.6, graceful-fs@^4.2.8: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" @@ -4888,11 +5657,11 @@ inquirer@^0.12.0: through "^2.3.6" internal-slot@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" - integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== + version "1.0.4" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3" + integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ== dependencies: - get-intrinsic "^1.1.0" + get-intrinsic "^1.1.3" has "^1.0.3" side-channel "^1.0.4" @@ -5543,9 +6312,9 @@ json5@^0.5.1: integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw== json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== + version "2.2.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab" + integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ== jsonwebtoken@^8.5.1: version "8.5.1" @@ -5862,11 +6631,6 @@ lodash.union@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" integrity sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw== -lodash.uniqwith@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniqwith/-/lodash.uniqwith-4.5.0.tgz#7a0cbf65f43b5928625a9d4d0dc54b18cadc7ef3" - integrity sha512-7lYL8bLopMoy4CTICbxygAUq6CdRJ36vFc80DucPueUee+d5NBRxz3FdT9Pes/HEx5mPoT9jwnsEJWz1N7uq7Q== - lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.19, lodash@~4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" @@ -5908,6 +6672,13 @@ lru-cache@^4.0.1: pseudomap "^1.0.2" yallist "^2.1.2" +lru-cache@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -6170,9 +6941,9 @@ minimatch@^2.0.1: brace-expansion "^1.0.0" minimatch@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" - integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== + version "5.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz#0939d7d6f0898acbd1508abe534d1929368a8fff" + integrity sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg== dependencies: brace-expansion "^2.0.1" @@ -6239,6 +7010,13 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: dependencies: yallist "^4.0.0" +minipass@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.0.tgz#7cebb0f9fa7d56f0c5b17853cbe28838a8dbbd3b" + integrity sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw== + dependencies: + yallist "^4.0.0" + minizlib@^2.0.0, minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" @@ -6280,9 +7058,9 @@ modern-syslog@*: nan "^2.13.2" moment-timezone@^0.5.38: - version "0.5.39" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.39.tgz#342625a3b98810f04c8f4ea917e448d3525e600b" - integrity sha512-hoB6suq4ISDj7BDgctiOy6zljBsdYT0++0ZzZm9rtxIvJhIbQ3nmbgSWe7dNFGurl6/7b1OUkHlmN9JWgXVz7w== + version "0.5.40" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.40.tgz#c148f5149fd91dd3e29bf481abc8830ecba16b89" + integrity sha512-tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg== dependencies: moment ">= 2.9.0" @@ -6291,7 +7069,7 @@ moment-timezone@^0.5.38: resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== -mongodb-connection-string-url@^2.5.3: +mongodb-connection-string-url@^2.5.4: version "2.6.0" resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz#57901bf352372abdde812c81be47b75c6b2ec5cf" integrity sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ== @@ -6299,16 +7077,16 @@ mongodb-connection-string-url@^2.5.3: "@types/whatwg-url" "^8.2.1" whatwg-url "^11.0.0" -mongodb@4.9.1: - version "4.9.1" - resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.9.1.tgz#0c769448228bcf9a6aa7d16daa3625b48312479e" - integrity sha512-ZhgI/qBf84fD7sI4waZBoLBNJYPQN5IOC++SBCiPiyhzpNKOxN/fi0tBHvH2dEC42HXtNEbFB0zmNz4+oVtorQ== +mongodb@4.12.1: + version "4.12.1" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.12.1.tgz#224eb39b8784af835b515aa687c6010cecaabb1a" + integrity sha512-koT87tecZmxPKtxRQD8hCKfn+ockEL2xBiUvx3isQGI6mFmagWt4f4AyCE9J4sKepnLhMacoCTQQA6SLAI2L6w== dependencies: bson "^4.7.0" - denque "^2.1.0" - mongodb-connection-string-url "^2.5.3" - socks "^2.7.0" + mongodb-connection-string-url "^2.5.4" + socks "^2.7.1" optionalDependencies: + "@aws-sdk/credential-providers" "^3.186.0" saslprep "^1.0.3" mongodb@^3.3.2: @@ -6524,9 +7302,9 @@ node-pushover@*: httpreq "*" node-releases@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" - integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== + version "2.0.8" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz#0f349cdc8fcfa39a92ac0be9bc48b7706292b9ae" + integrity sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A== node-sspi@*: version "0.2.10" @@ -7361,9 +8139,9 @@ pkg-dir@^3.0.0: find-up "^3.0.0" plivo@*: - version "4.35.0" - resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.35.0.tgz#134552f0482cb96fbcb485bcdc09f66857a293af" - integrity sha512-E8GYcGWEUdUYEt+625UGPuUDXmlQQ/2MtwUt3OEy2DTaOhVbuZH8KC6O98Qq4sPsW3dRAgbYzeeBWGPRkmJ3xg== + version "4.36.0" + resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.36.0.tgz#d6e3fa06bc5c42a04a74d71e8e989b8f2dab5309" + integrity sha512-jhd61SkiMXkWDZc+NFNqD5yheyQSl2dpdcLzpOx2u/ddUV1PX+nGwZ+gEp1wZ2B4V/l/qwVk8QHcXRN+VtT+Gg== dependencies: "@types/node" "^14.14.14" axios "^0.21.1" @@ -8050,6 +8828,13 @@ rx-lite@^3.1.2: resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" integrity sha512-1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ== +"rxjs@>= 5.x <= 7.x": + version "7.8.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" + integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== + dependencies: + tslib "^2.1.0" + safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -8310,7 +9095,7 @@ socks-proxy-agent@^6.0.0: debug "^4.3.3" socks "^2.6.2" -socks@^2.6.2, socks@^2.7.0: +socks@^2.6.2, socks@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== @@ -8443,9 +9228,9 @@ sprintf-js@~1.0.2: integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== sqlite3@*: - version "5.1.2" - resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.2.tgz#f50d5b1482b6972fb650daf6f718e6507c6cfb0f" - integrity sha512-D0Reg6pRWAFXFUnZKsszCI67tthFD8fGPewRddDCX6w4cYwz3MbvuwRICbL+YQjBAh9zbw+lJ/V9oC8nG5j6eg== + version "5.1.4" + resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.4.tgz#35f83d368963168b324ad2f0fffce09f3b8723a7" + integrity sha512-i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA== dependencies: "@mapbox/node-pre-gyp" "^1.0.0" node-addon-api "^4.2.0" @@ -8591,7 +9376,7 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string.prototype.trimend@^1.0.5: +string.prototype.trimend@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== @@ -8600,7 +9385,7 @@ string.prototype.trimend@^1.0.5: define-properties "^1.1.4" es-abstract "^1.20.4" -string.prototype.trimstart@^1.0.5: +string.prototype.trimstart@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4" integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA== @@ -8661,7 +9446,7 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== -strnum@^1.0.4: +strnum@^1.0.4, strnum@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db" integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA== @@ -8751,21 +9536,21 @@ tar-stream@^2.2.0: readable-stream "^3.1.1" tar@^6.0.2, tar@^6.1.11, tar@^6.1.2: - version "6.1.12" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.12.tgz#3b742fb05669b55671fb769ab67a7791ea1a62e6" - integrity sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw== + version "6.1.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" + integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^3.0.0" + minipass "^4.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" telegram@*: - version "2.14.7" - resolved "https://registry.yarnpkg.com/telegram/-/telegram-2.14.7.tgz#9591b5a7406cc9224a57b69dc70eb987718a62bd" - integrity sha512-4qY+M4UHwb4xATCXpnMsBwJCMqETiH97jvnd6D8NnMbJlOC4Br049381xx3oHRc5ifTBxXuD64b7jgIR52rWtQ== + version "2.15.2" + resolved "https://registry.yarnpkg.com/telegram/-/telegram-2.15.2.tgz#e716af7a23f0acd203c03e00c7d8051df642b4f2" + integrity sha512-+/vmEImjDtkOEiiPyGThIyzBVgpCfDNz2suwXtl5z/b0xK6SWqV4edX3c1BZgK4/JrIyydrCAxLQpKlG61/uzw== dependencies: "@cryptography/aes" "^0.1.1" async-mutex "^0.3.0" @@ -8985,7 +9770,12 @@ ts-mixer@^6.0.2: resolved "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.2.tgz#3e4e4bb8daffb24435f6980b15204cb5b287e016" integrity sha512-zvHx3VM83m2WYCE8XL99uaM7mFwYSkjR2OZti98fabHrwkjsCvgwChda5xctein3xGOyaQhtTeDq/1H/GNvF3A== -tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1: +tslib@^1.11.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== + +tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== @@ -9023,9 +9813,9 @@ tweetnacl@^1.0.1: integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== twilio@*: - version "3.83.3" - resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.83.3.tgz#5aec258aa433efa515c4302cb41ed35d72f2ac8f" - integrity sha512-uyYPXUmKIvpq54DGcq0elT0t2PLhDSwD7svu18SabiFSD6rmouws8gr9CZRix45IYSnIxTmOSr3i4vWR74/hQw== + version "3.84.0" + resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.84.0.tgz#57e035a7034e4c278cdd03d3e88c05f507b9d84e" + integrity sha512-XL+RR1SdfGExC51cE22unM/r7lEFzfDYUA3FecHEe5cLF+LzxmZGB9O9BXfqZu/sZ5YlGeltJfMA5j3TRLzhLw== dependencies: axios "^0.26.1" dayjs "^1.8.29" @@ -9142,9 +9932,9 @@ underscore@~1.8.3: integrity sha512-5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg== undici@^5.11.0, undici@^5.13.0: - version "5.13.0" - resolved "https://registry.yarnpkg.com/undici/-/undici-5.13.0.tgz#56772fba89d8b25e39bddc8c26a438bd73ea69bb" - integrity sha512-UDZKtwb2k7KRsK4SdXWG7ErXiL7yTGgLWvk2AXO1JMjgjh404nFo6tWSCM2xMpJwMPx3J8i/vfqEh1zOqvj82Q== + version "5.14.0" + resolved "https://registry.yarnpkg.com/undici/-/undici-5.14.0.tgz#1169d0cdee06a4ffdd30810f6228d57998884d00" + integrity sha512-yJlHYw6yXPPsuOH0x2Ib1Km61vu4hLiRRQoafs+WUgX1vO64vgnxiCEN9dpIrhZyHFsai3F0AEj4P9zy19enEQ== dependencies: busboy "^1.6.0" @@ -9312,6 +10102,11 @@ uuid@^3.0.1, uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== +uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + uuid@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" @@ -9754,6 +10549,11 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A== +yallist@^3.0.2: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" diff --git a/pkgs/tools/admin/meshcentral/yarn.nix b/pkgs/tools/admin/meshcentral/yarn.nix index fa8f40dfbd63..a259fc9e393a 100644 --- a/pkgs/tools/admin/meshcentral/yarn.nix +++ b/pkgs/tools/admin/meshcentral/yarn.nix @@ -10,11 +10,539 @@ }; } { - name = "_babel_cli___cli_7.19.3.tgz"; + name = "_aws_crypto_ie11_detection___ie11_detection_2.0.2.tgz"; path = fetchurl { - name = "_babel_cli___cli_7.19.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/cli/-/cli-7.19.3.tgz"; - sha512 = "643/TybmaCAe101m2tSVHi9UKpETXP9c/Ff4mD2tAwkdP6esKIfaauZFc67vGEM6r9fekbEGid+sZhbEnSe3dg=="; + name = "_aws_crypto_ie11_detection___ie11_detection_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/ie11-detection/-/ie11-detection-2.0.2.tgz"; + sha512 = "5XDMQY98gMAf/WRTic5G++jfmS/VLM0rwpiOpaainKi4L0nqWMSB1SzsrEG5rjFZGYN6ZAefO+/Yta2dFM0kMw=="; + }; + } + { + name = "_aws_crypto_sha256_browser___sha256_browser_2.0.0.tgz"; + path = fetchurl { + name = "_aws_crypto_sha256_browser___sha256_browser_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz"; + sha512 = "rYXOQ8BFOaqMEHJrLHul/25ckWH6GTJtdLSajhlqGMx0PmSueAuvboCuZCTqEKlxR8CQOwRarxYMZZSYlhRA1A=="; + }; + } + { + name = "_aws_crypto_sha256_js___sha256_js_2.0.0.tgz"; + path = fetchurl { + name = "_aws_crypto_sha256_js___sha256_js_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz"; + sha512 = "VZY+mCY4Nmrs5WGfitmNqXzaE873fcIZDu54cbaDaaamsaTOP1DBImV9F4pICc3EHjQXujyE8jig+PFCaew9ig=="; + }; + } + { + name = "_aws_crypto_sha256_js___sha256_js_2.0.2.tgz"; + path = fetchurl { + name = "_aws_crypto_sha256_js___sha256_js_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.2.tgz"; + sha512 = "iXLdKH19qPmIC73fVCrHWCSYjN/sxaAvZ3jNNyw6FclmHyjLKg0f69WlC9KTnyElxCR5MO9SKaG00VwlJwyAkQ=="; + }; + } + { + name = "_aws_crypto_supports_web_crypto___supports_web_crypto_2.0.2.tgz"; + path = fetchurl { + name = "_aws_crypto_supports_web_crypto___supports_web_crypto_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.2.tgz"; + sha512 = "6mbSsLHwZ99CTOOswvCRP3C+VCWnzBf+1SnbWxzzJ9lR0mA0JnY2JEAhp8rqmTE0GPFy88rrM27ffgp62oErMQ=="; + }; + } + { + name = "_aws_crypto_util___util_2.0.2.tgz"; + path = fetchurl { + name = "_aws_crypto_util___util_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/util/-/util-2.0.2.tgz"; + sha512 = "Lgu5v/0e/BcrZ5m/IWqzPUf3UYFTy/PpeED+uc9SWUR1iZQL8XXbGQg10UfllwwBryO3hFF5dizK+78aoXC1eA=="; + }; + } + { + name = "_aws_sdk_abort_controller___abort_controller_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_abort_controller___abort_controller_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/abort-controller/-/abort-controller-3.226.0.tgz"; + sha512 = "cJVzr1xxPBd08voknXvR0RLgtZKGKt6WyDpH/BaPCu3rfSqWCDZKzwqe940eqosjmKrxC6pUZNKASIqHOQ8xxQ=="; + }; + } + { + name = "_aws_sdk_client_cognito_identity___client_cognito_identity_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_client_cognito_identity___client_cognito_identity_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.236.0.tgz"; + sha512 = "lWGuTVA+q3h1KS3nxTWeRGOfsuQ+GNwq5IxFJ8ko441mpwo5A2t6u25Z+G6t5Eh+q4EcoxMX64HYA+cu91lr7g=="; + }; + } + { + name = "_aws_sdk_client_sso_oidc___client_sso_oidc_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_client_sso_oidc___client_sso_oidc_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.236.0.tgz"; + sha512 = "9TuigSXGafVto+GjKsVkhNLlnSgNWzRL5/ClZ5lY3dWrcDEJGZjFwwRB3ICerFQJBdDfsYwjNjJPhYEHzdyBfQ=="; + }; + } + { + name = "_aws_sdk_client_sso___client_sso_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_client_sso___client_sso_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.236.0.tgz"; + sha512 = "2E/XHiVSRI+L2SlVscmV/+z4A2iWF6BTUjVBFBGMmsailvGDV6XKPFocTBsHI64G25/SYkhMdELvjn5jHLKBGQ=="; + }; + } + { + name = "_aws_sdk_client_sts___client_sts_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_client_sts___client_sts_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.236.0.tgz"; + sha512 = "ruEALU0oPwsA8xZ/HBCoUO9rsyhPyalj20GMGpzVaNcf1dr1jMTThDQvQvvjAHjY3W56mI7ApxjK+D+gok55aw=="; + }; + } + { + name = "_aws_sdk_config_resolver___config_resolver_3.234.0.tgz"; + path = fetchurl { + name = "_aws_sdk_config_resolver___config_resolver_3.234.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/config-resolver/-/config-resolver-3.234.0.tgz"; + sha512 = "uZxy4wzllfvgCQxVc+Iqhde0NGAnfmV2hWR6ejadJaAFTuYNvQiRg9IqJy3pkyDPqXySiJ8Bom5PoJfgn55J/A=="; + }; + } + { + name = "_aws_sdk_credential_provider_cognito_identity___credential_provider_cognito_identity_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_cognito_identity___credential_provider_cognito_identity_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.236.0.tgz"; + sha512 = "PDsUZ7gmSCwraDDYnmoSkmrA1tpmvDBDjNPUVe6E+/8tDw3SWiL2efGR6r8ajFh9m+6jF6B8Wy+YB3u3yjAjWQ=="; + }; + } + { + name = "_aws_sdk_credential_provider_env___credential_provider_env_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_env___credential_provider_env_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.226.0.tgz"; + sha512 = "sd8uK1ojbXxaZXlthzw/VXZwCPUtU3PjObOfr3Evj7MPIM2IH8h29foOlggx939MdLQGboJf9gKvLlvKDWtJRA=="; + }; + } + { + name = "_aws_sdk_credential_provider_imds___credential_provider_imds_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_imds___credential_provider_imds_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.226.0.tgz"; + sha512 = "//z/COQm2AjYFI1Lb0wKHTQSrvLFTyuKLFQGPJsKS7DPoxGOCKB7hmYerlbl01IDoCxTdyL//TyyPxbZEOQD5Q=="; + }; + } + { + name = "_aws_sdk_credential_provider_ini___credential_provider_ini_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_ini___credential_provider_ini_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.236.0.tgz"; + sha512 = "W5vMEauWgFCzvf4Hks6ToU5dhbN87gyijmwp/l9AkKKvuJ25LkveAhk8xz3bydJThHdgWNEuBMyfmlVWmdybIg=="; + }; + } + { + name = "_aws_sdk_credential_provider_node___credential_provider_node_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_node___credential_provider_node_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.236.0.tgz"; + sha512 = "ktRPwmqw2P4dDzs/nJYTnuesSYqpDUEtqm2KSCKNT/fobzgfsrESLk3a7TY4l6N3muxQtKwguIa9Lulhe82+wg=="; + }; + } + { + name = "_aws_sdk_credential_provider_process___credential_provider_process_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_process___credential_provider_process_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.226.0.tgz"; + sha512 = "iUDMdnrTvbvaCFhWwqyXrhvQ9+ojPqPqXhwZtY1X/Qaz+73S9gXBPJHZaZb2Ke0yKE1Ql3bJbKvmmxC/qLQMng=="; + }; + } + { + name = "_aws_sdk_credential_provider_sso___credential_provider_sso_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_sso___credential_provider_sso_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.236.0.tgz"; + sha512 = "HLeVsFHd8QLQwhjwhdlBhXOFIa33mzqmxOqe2Qr4FVD5IR1/G4zLpSWSwtYjpvWRZs2oWSg6XI7vSyeQttPmHg=="; + }; + } + { + name = "_aws_sdk_credential_provider_web_identity___credential_provider_web_identity_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_web_identity___credential_provider_web_identity_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.226.0.tgz"; + sha512 = "CCpv847rLB0SFOHz2igvUMFAzeT2fD3YnY4C8jltuJoEkn0ITn1Hlgt13nTJ5BUuvyti2mvyXZHmNzhMIMrIlw=="; + }; + } + { + name = "_aws_sdk_credential_providers___credential_providers_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_providers___credential_providers_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.236.0.tgz"; + sha512 = "z7RU5E9xlk6KX16jJxByn8xa8mv8pPZoqAPkavCsFJS6pOYTtQJYYdjrUK/2EmOmbPpc62P6mqVP7qTVQKgafw=="; + }; + } + { + name = "_aws_sdk_fetch_http_handler___fetch_http_handler_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_fetch_http_handler___fetch_http_handler_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.226.0.tgz"; + sha512 = "JewZPMNEBXfi1xVnRa7pVtK/zgZD8/lQ/YnD8pq79WuMa2cwyhDtr8oqCoqsPW+WJT5ScXoMtuHxN78l8eKWgg=="; + }; + } + { + name = "_aws_sdk_hash_node___hash_node_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_hash_node___hash_node_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/hash-node/-/hash-node-3.226.0.tgz"; + sha512 = "MdlJhJ9/Espwd0+gUXdZRsHuostB2WxEVAszWxobP0FTT9PnicqnfK7ExmW+DUAc0ywxtEbR3e0UND65rlSTVw=="; + }; + } + { + name = "_aws_sdk_invalid_dependency___invalid_dependency_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_invalid_dependency___invalid_dependency_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/invalid-dependency/-/invalid-dependency-3.226.0.tgz"; + sha512 = "QXOYFmap8g9QzRjumcRCIo2GEZkdCwd7ePQW0OABWPhKHzlJ74vvBxywjU3s39EEBEluWXtZ7Iufg6GxZM4ifw=="; + }; + } + { + name = "_aws_sdk_is_array_buffer___is_array_buffer_3.201.0.tgz"; + path = fetchurl { + name = "_aws_sdk_is_array_buffer___is_array_buffer_3.201.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/is-array-buffer/-/is-array-buffer-3.201.0.tgz"; + sha512 = "UPez5qLh3dNgt0DYnPD/q0mVJY84rA17QE26hVNOW3fAji8W2wrwrxdacWOxyXvlxWsVRcKmr+lay1MDqpAMfg=="; + }; + } + { + name = "_aws_sdk_middleware_content_length___middleware_content_length_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_content_length___middleware_content_length_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-content-length/-/middleware-content-length-3.226.0.tgz"; + sha512 = "ksUzlHJN2JMuyavjA46a4sctvnrnITqt2tbGGWWrAuXY1mel2j+VbgnmJUiwHKUO6bTFBBeft5Vd1TSOb4JmiA=="; + }; + } + { + name = "_aws_sdk_middleware_endpoint___middleware_endpoint_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_endpoint___middleware_endpoint_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.226.0.tgz"; + sha512 = "EvLFafjtUxTT0AC9p3aBQu1/fjhWdIeK58jIXaNFONfZ3F8QbEYUPuF/SqZvJM6cWfOO9qwYKkRDbCSTYhprIg=="; + }; + } + { + name = "_aws_sdk_middleware_host_header___middleware_host_header_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_host_header___middleware_host_header_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.226.0.tgz"; + sha512 = "haVkWVh6BUPwKgWwkL6sDvTkcZWvJjv8AgC8jiQuSl8GLZdzHTB8Qhi3IsfFta9HAuoLjxheWBE5Z/L0UrfhLA=="; + }; + } + { + name = "_aws_sdk_middleware_logger___middleware_logger_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_logger___middleware_logger_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.226.0.tgz"; + sha512 = "m9gtLrrYnpN6yckcQ09rV7ExWOLMuq8mMPF/K3DbL/YL0TuILu9i2T1W+JuxSX+K9FMG2HrLAKivE/kMLr55xA=="; + }; + } + { + name = "_aws_sdk_middleware_recursion_detection___middleware_recursion_detection_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_recursion_detection___middleware_recursion_detection_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.226.0.tgz"; + sha512 = "mwRbdKEUeuNH5TEkyZ5FWxp6bL2UC1WbY+LDv6YjHxmSMKpAoOueEdtU34PqDOLrpXXxIGHDFmjeGeMfktyEcA=="; + }; + } + { + name = "_aws_sdk_middleware_retry___middleware_retry_3.235.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_retry___middleware_retry_3.235.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-retry/-/middleware-retry-3.235.0.tgz"; + sha512 = "50WHbJGpD3SNp9763MAlHqIhXil++JdQbKejNpHg7HsJne/ao3ub+fDOfx//mMBjpzBV25BGd5UlfL6blrClSg=="; + }; + } + { + name = "_aws_sdk_middleware_sdk_sts___middleware_sdk_sts_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_sdk_sts___middleware_sdk_sts_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.226.0.tgz"; + sha512 = "NN9T/qoSD1kZvAT+VLny3NnlqgylYQcsgV3rvi/8lYzw/G/2s8VS6sm/VTWGGZhx08wZRv20MWzYu3bftcyqUg=="; + }; + } + { + name = "_aws_sdk_middleware_serde___middleware_serde_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_serde___middleware_serde_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-serde/-/middleware-serde-3.226.0.tgz"; + sha512 = "nPuOOAkSfx9TxzdKFx0X2bDlinOxGrqD7iof926K/AEflxGD1DBdcaDdjlYlPDW2CVE8LV/rAgbYuLxh/E/1VA=="; + }; + } + { + name = "_aws_sdk_middleware_signing___middleware_signing_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_signing___middleware_signing_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.226.0.tgz"; + sha512 = "E6HmtPcl+IjYDDzi1xI2HpCbBq2avNWcjvCriMZWuTAtRVpnA6XDDGW5GY85IfS3A8G8vuWqEVPr8JcYUcjfew=="; + }; + } + { + name = "_aws_sdk_middleware_stack___middleware_stack_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_stack___middleware_stack_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-stack/-/middleware-stack-3.226.0.tgz"; + sha512 = "85wF29LvPvpoed60fZGDYLwv1Zpd/cM0C22WSSFPw1SSJeqO4gtFYyCg2squfT3KI6kF43IIkOCJ+L7GtryPug=="; + }; + } + { + name = "_aws_sdk_middleware_user_agent___middleware_user_agent_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_user_agent___middleware_user_agent_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.226.0.tgz"; + sha512 = "N1WnfzCW1Y5yWhVAphf8OPGTe8Df3vmV7/LdsoQfmpkCZgLZeK2o0xITkUQhRj1mbw7yp8tVFLFV3R2lMurdAQ=="; + }; + } + { + name = "_aws_sdk_node_config_provider___node_config_provider_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_node_config_provider___node_config_provider_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/node-config-provider/-/node-config-provider-3.226.0.tgz"; + sha512 = "B8lQDqiRk7X5izFEUMXmi8CZLOKCTWQJU9HQf3ako+sF0gexo4nHN3jhoRWyLtcgC5S3on/2jxpAcqtm7kuY3w=="; + }; + } + { + name = "_aws_sdk_node_http_handler___node_http_handler_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_node_http_handler___node_http_handler_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/node-http-handler/-/node-http-handler-3.226.0.tgz"; + sha512 = "xQCddnZNMiPmjr3W7HYM+f5ir4VfxgJh37eqZwX6EZmyItFpNNeVzKUgA920ka1VPz/ZUYB+2OFGiX3LCLkkaA=="; + }; + } + { + name = "_aws_sdk_property_provider___property_provider_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_property_provider___property_provider_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/property-provider/-/property-provider-3.226.0.tgz"; + sha512 = "TsljjG+Sg0LmdgfiAlWohluWKnxB/k8xenjeozZfzOr5bHmNHtdbWv6BtNvD/R83hw7SFXxbJHlD5H4u9p2NFg=="; + }; + } + { + name = "_aws_sdk_protocol_http___protocol_http_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_protocol_http___protocol_http_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/protocol-http/-/protocol-http-3.226.0.tgz"; + sha512 = "zWkVqiTA9RXL6y0hhfZc9bcU4DX2NI6Hw9IhQmSPeM59mdbPjJlY4bLlMr5YxywqO3yQ/ylNoAfrEzrDjlOSRg=="; + }; + } + { + name = "_aws_sdk_querystring_builder___querystring_builder_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_querystring_builder___querystring_builder_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/querystring-builder/-/querystring-builder-3.226.0.tgz"; + sha512 = "LVurypuNeotO4lmirKXRC4NYrZRAyMJXuwO0f2a5ZAUJCjauwYrifKue6yCfU7bls7gut7nfcR6B99WBYpHs3g=="; + }; + } + { + name = "_aws_sdk_querystring_parser___querystring_parser_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_querystring_parser___querystring_parser_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/querystring-parser/-/querystring-parser-3.226.0.tgz"; + sha512 = "FzB+VrQ47KAFxiPt2YXrKZ8AOLZQqGTLCKHzx4bjxGmwgsjV8yIbtJiJhZLMcUQV4LtGeIY9ixIqQhGvnZHE4A=="; + }; + } + { + name = "_aws_sdk_service_error_classification___service_error_classification_3.229.0.tgz"; + path = fetchurl { + name = "_aws_sdk_service_error_classification___service_error_classification_3.229.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/service-error-classification/-/service-error-classification-3.229.0.tgz"; + sha512 = "dnzWWQ0/NoWMUZ5C0DW3dPm0wC1O76Y/SpKbuJzWPkx1EYy6r8p32Ly4D9vUzrKDbRGf48YHIF2kOkBmu21CLg=="; + }; + } + { + name = "_aws_sdk_shared_ini_file_loader___shared_ini_file_loader_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_shared_ini_file_loader___shared_ini_file_loader_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.226.0.tgz"; + sha512 = "661VQefsARxVyyV2FX9V61V+nNgImk7aN2hYlFKla6BCwZfMng+dEtD0xVGyg1PfRw0qvEv5LQyxMVgHcUSevA=="; + }; + } + { + name = "_aws_sdk_signature_v4___signature_v4_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_signature_v4___signature_v4_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/signature-v4/-/signature-v4-3.226.0.tgz"; + sha512 = "/R5q5agdPd7HJB68XMzpxrNPk158EHUvkFkuRu5Qf3kkkHebEzWEBlWoVpUe6ss4rP9Tqcue6xPuaftEmhjpYw=="; + }; + } + { + name = "_aws_sdk_smithy_client___smithy_client_3.234.0.tgz"; + path = fetchurl { + name = "_aws_sdk_smithy_client___smithy_client_3.234.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/smithy-client/-/smithy-client-3.234.0.tgz"; + sha512 = "8AtR/k4vsFvjXeQbIzq/Wy7Nbk48Ou0wUEeVYPHWHPSU8QamFWORkOwmKtKMfHAyZvmqiAPeQqHFkq+UJhWyyQ=="; + }; + } + { + name = "_aws_sdk_token_providers___token_providers_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_token_providers___token_providers_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.236.0.tgz"; + sha512 = "gmHuWuQgl6+2UfdbOvtsns/byZQnPGjyQ88/SlKgnX2EcDd31ENb8wRa9gfIEwvx6rTB2ve1NAhuliydB9AomQ=="; + }; + } + { + name = "_aws_sdk_types___types_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_types___types_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.226.0.tgz"; + sha512 = "MmmNHrWeO4man7wpOwrAhXlevqtOV9ZLcH4RhnG5LmRce0RFOApx24HoKENfFCcOyCm5LQBlsXCqi0dZWDWU0A=="; + }; + } + { + name = "_aws_sdk_url_parser___url_parser_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_url_parser___url_parser_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/url-parser/-/url-parser-3.226.0.tgz"; + sha512 = "p5RLE0QWyP0OcTOLmFcLdVgUcUEzmEfmdrnOxyNzomcYb0p3vUagA5zfa1HVK2azsQJFBv28GfvMnba9bGhObg=="; + }; + } + { + name = "_aws_sdk_util_base64___util_base64_3.208.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_base64___util_base64_3.208.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-base64/-/util-base64-3.208.0.tgz"; + sha512 = "PQniZph5A6N7uuEOQi+1hnMz/FSOK/8kMFyFO+4DgA1dZ5pcKcn5wiFwHkcTb/BsgVqQa3Jx0VHNnvhlS8JyTg=="; + }; + } + { + name = "_aws_sdk_util_body_length_browser___util_body_length_browser_3.188.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_body_length_browser___util_body_length_browser_3.188.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.188.0.tgz"; + sha512 = "8VpnwFWXhnZ/iRSl9mTf+VKOX9wDE8QtN4bj9pBfxwf90H1X7E8T6NkiZD3k+HubYf2J94e7DbeHs7fuCPW5Qg=="; + }; + } + { + name = "_aws_sdk_util_body_length_node___util_body_length_node_3.208.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_body_length_node___util_body_length_node_3.208.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-body-length-node/-/util-body-length-node-3.208.0.tgz"; + sha512 = "3zj50e5g7t/MQf53SsuuSf0hEELzMtD8RX8C76f12OSRo2Bca4FLLYHe0TZbxcfQHom8/hOaeZEyTyMogMglqg=="; + }; + } + { + name = "_aws_sdk_util_buffer_from___util_buffer_from_3.208.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_buffer_from___util_buffer_from_3.208.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-buffer-from/-/util-buffer-from-3.208.0.tgz"; + sha512 = "7L0XUixNEFcLUGPeBF35enCvB9Xl+K6SQsmbrPk1P3mlV9mguWSDQqbOBwY1Ir0OVbD6H/ZOQU7hI/9RtRI0Zw=="; + }; + } + { + name = "_aws_sdk_util_config_provider___util_config_provider_3.208.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_config_provider___util_config_provider_3.208.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-config-provider/-/util-config-provider-3.208.0.tgz"; + sha512 = "DSRqwrERUsT34ug+anlMBIFooBEGwM8GejC7q00Y/9IPrQy50KnG5PW2NiTjuLKNi7pdEOlwTSEocJE15eDZIg=="; + }; + } + { + name = "_aws_sdk_util_defaults_mode_browser___util_defaults_mode_browser_3.234.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_defaults_mode_browser___util_defaults_mode_browser_3.234.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.234.0.tgz"; + sha512 = "IHMKXjTbOD8XMz5+2oCOsVP94BYb9YyjXdns0aAXr2NAo7k2+RCzXQ2DebJXppGda1F6opFutoKwyVSN0cmbMw=="; + }; + } + { + name = "_aws_sdk_util_defaults_mode_node___util_defaults_mode_node_3.234.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_defaults_mode_node___util_defaults_mode_node_3.234.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.234.0.tgz"; + sha512 = "UGjQ+OjBYYhxFVtUY+jtr0ZZgzZh6OHtYwRhFt8IHewJXFCfZTyfsbX20szBj5y1S4HRIUJ7cwBLIytTqMbI5w=="; + }; + } + { + name = "_aws_sdk_util_endpoints___util_endpoints_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_endpoints___util_endpoints_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.226.0.tgz"; + sha512 = "iqOkac/zLmyPBUJd7SLN0PeZMkOmlGgD5PHmmekTClOkce2eUjK9SNX1PzL73aXPoPTyhg9QGLH8uEZEQ8YUzg=="; + }; + } + { + name = "_aws_sdk_util_hex_encoding___util_hex_encoding_3.201.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_hex_encoding___util_hex_encoding_3.201.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.201.0.tgz"; + sha512 = "7t1vR1pVxKx0motd3X9rI3m/xNp78p3sHtP5yo4NP4ARpxyJ0fokBomY8ScaH2D/B+U5o9ARxldJUdMqyBlJcA=="; + }; + } + { + name = "_aws_sdk_util_locate_window___util_locate_window_3.208.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_locate_window___util_locate_window_3.208.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.208.0.tgz"; + sha512 = "iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg=="; + }; + } + { + name = "_aws_sdk_util_middleware___util_middleware_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_middleware___util_middleware_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-middleware/-/util-middleware-3.226.0.tgz"; + sha512 = "B96CQnwX4gRvQdaQkdUtqvDPkrptV5+va6FVeJOocU/DbSYMAScLxtR3peMS8cnlOT6nL1Eoa42OI9AfZz1VwQ=="; + }; + } + { + name = "_aws_sdk_util_retry___util_retry_3.229.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_retry___util_retry_3.229.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-retry/-/util-retry-3.229.0.tgz"; + sha512 = "0zKTqi0P1inD0LzIMuXRIYYQ/8c1lWMg/cfiqUcIAF1TpatlpZuN7umU0ierpBFud7S+zDgg0oemh+Nj8xliJw=="; + }; + } + { + name = "_aws_sdk_util_uri_escape___util_uri_escape_3.201.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_uri_escape___util_uri_escape_3.201.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-uri-escape/-/util-uri-escape-3.201.0.tgz"; + sha512 = "TeTWbGx4LU2c5rx0obHeDFeO9HvwYwQtMh1yniBz00pQb6Qt6YVOETVQikRZ+XRQwEyCg/dA375UplIpiy54mA=="; + }; + } + { + name = "_aws_sdk_util_user_agent_browser___util_user_agent_browser_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_user_agent_browser___util_user_agent_browser_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.226.0.tgz"; + sha512 = "PhBIu2h6sPJPcv2I7ELfFizdl5pNiL4LfxrasMCYXQkJvVnoXztHA1x+CQbXIdtZOIlpjC+6BjDcE0uhnpvfcA=="; + }; + } + { + name = "_aws_sdk_util_user_agent_node___util_user_agent_node_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_user_agent_node___util_user_agent_node_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.226.0.tgz"; + sha512 = "othPc5Dz/pkYkxH+nZPhc1Al0HndQT8zHD4e9h+EZ+8lkd8n+IsnLfTS/mSJWrfiC6UlNRVw55cItstmJyMe/A=="; + }; + } + { + name = "_aws_sdk_util_utf8_browser___util_utf8_browser_3.188.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_utf8_browser___util_utf8_browser_3.188.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.188.0.tgz"; + sha512 = "jt627x0+jE+Ydr9NwkFstg3cUvgWh56qdaqAMDsqgRlKD21md/6G226z/Qxl7lb1VEW2LlmCx43ai/37Qwcj2Q=="; + }; + } + { + name = "_aws_sdk_util_utf8_node___util_utf8_node_3.208.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_utf8_node___util_utf8_node_3.208.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-utf8-node/-/util-utf8-node-3.208.0.tgz"; + sha512 = "jKY87Acv0yWBdFxx6bveagy5FYjz+dtV8IPT7ay1E2WPWH1czoIdMAkc8tSInK31T6CRnHWkLZ1qYwCbgRfERQ=="; + }; + } + { + name = "_babel_cli___cli_7.20.7.tgz"; + path = fetchurl { + name = "_babel_cli___cli_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/cli/-/cli-7.20.7.tgz"; + sha512 = "WylgcELHB66WwQqItxNILsMlaTd8/SO6SgTTjMp4uCI7P4QyH1r3nqgFmO3BfM4AtfniHgFMH3EpYFj/zynBkQ=="; }; } { @@ -34,19 +562,19 @@ }; } { - name = "_babel_core___core_7.20.5.tgz"; + name = "_babel_core___core_7.20.7.tgz"; path = fetchurl { - name = "_babel_core___core_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz"; - sha512 = "UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ=="; + name = "_babel_core___core_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz"; + sha512 = "t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw=="; }; } { - name = "_babel_generator___generator_7.20.5.tgz"; + name = "_babel_generator___generator_7.20.7.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz"; - sha512 = "jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA=="; + name = "_babel_generator___generator_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz"; + sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; }; } { @@ -58,11 +586,11 @@ }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.20.0.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.20.7.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.20.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz"; - sha512 = "0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ=="; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz"; + sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; }; } { @@ -98,11 +626,11 @@ }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.20.2.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.20.7.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.20.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz"; - sha512 = "zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA=="; + name = "_babel_helper_module_transforms___helper_module_transforms_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz"; + sha512 = "FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA=="; }; } { @@ -154,11 +682,11 @@ }; } { - name = "_babel_helpers___helpers_7.20.6.tgz"; + name = "_babel_helpers___helpers_7.20.7.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.20.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz"; - sha512 = "Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w=="; + name = "_babel_helpers___helpers_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz"; + sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; }; } { @@ -170,19 +698,19 @@ }; } { - name = "_babel_node___node_7.20.5.tgz"; + name = "_babel_node___node_7.20.7.tgz"; path = fetchurl { - name = "_babel_node___node_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/node/-/node-7.20.5.tgz"; - sha512 = "ElSr40UtumWE4fYYF1xfLP2C6b9nfS/rswK7YYpLo9HDGEXGXEAWZaGCxIirxGIDyoV0rbl6jV1LyFMQ6ZOQSA=="; + name = "_babel_node___node_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/node/-/node-7.20.7.tgz"; + sha512 = "AQt3gVcP+fpFuoFn4FmIW/+5JovvEoA9og4Y1LrRw0pv3jkl4tujZMMy3X/3ugjLrEy3k1aNywo3JIl3g+jVXQ=="; }; } { - name = "_babel_parser___parser_7.20.5.tgz"; + name = "_babel_parser___parser_7.20.7.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz"; - sha512 = "r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA=="; + name = "_babel_parser___parser_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz"; + sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; }; } { @@ -194,11 +722,11 @@ }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.19.0.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.20.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.19.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz"; - sha512 = "UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg=="; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.7.tgz"; + sha512 = "Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ=="; }; } { @@ -210,27 +738,27 @@ }; } { - name = "_babel_template___template_7.18.10.tgz"; + name = "_babel_template___template_7.20.7.tgz"; path = fetchurl { - name = "_babel_template___template_7.18.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz"; - sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; + name = "_babel_template___template_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz"; + sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; } { - name = "_babel_traverse___traverse_7.20.5.tgz"; + name = "_babel_traverse___traverse_7.20.8.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz"; - sha512 = "WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ=="; + name = "_babel_traverse___traverse_7.20.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.8.tgz"; + sha512 = "/RNkaYDeCy4MjyV70+QkSHhxbvj2JO/5Ft2Pa880qJOG8tWrqcT/wXUuCCv43yogfqPzHL77Xu101KQPf4clnQ=="; }; } { - name = "_babel_types___types_7.20.5.tgz"; + name = "_babel_types___types_7.20.7.tgz"; path = fetchurl { - name = "_babel_types___types_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz"; - sha512 = "c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg=="; + name = "_babel_types___types_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz"; + sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; }; } { @@ -282,11 +810,11 @@ }; } { - name = "_discordjs_rest___rest_1.4.0.tgz"; + name = "_discordjs_rest___rest_1.5.0.tgz"; path = fetchurl { - name = "_discordjs_rest___rest_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/@discordjs/rest/-/rest-1.4.0.tgz"; - sha512 = "k3Ip7ffFSAfp7Mu4H/3BEXFvFz+JsbXRrRtpeBMnSp1LefhtlZWJE6xdXzNlblktKNQltnRwY+z0NZrGQdxAMw=="; + name = "_discordjs_rest___rest_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/@discordjs/rest/-/rest-1.5.0.tgz"; + sha512 = "lXgNFqHnbmzp5u81W0+frdXN6Etf4EUi8FAPcWpSykKd8hmlWh1xy6BmE0bsJypU1pxohaA8lQCgp70NUI3uzA=="; }; } { @@ -410,19 +938,19 @@ }; } { - name = "_sapphire_shapeshift___shapeshift_3.7.1.tgz"; + name = "_sapphire_shapeshift___shapeshift_3.8.1.tgz"; path = fetchurl { - name = "_sapphire_shapeshift___shapeshift_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/@sapphire/shapeshift/-/shapeshift-3.7.1.tgz"; - sha512 = "JmYN/0GW49Vl8Hi4PwrsDBNjcuCylH78vWYolVys74LRIzilAAMINxx4RHQOdvYoz+ceJKVp4+zBbQ5kuIFOLw=="; + name = "_sapphire_shapeshift___shapeshift_3.8.1.tgz"; + url = "https://registry.yarnpkg.com/@sapphire/shapeshift/-/shapeshift-3.8.1.tgz"; + sha512 = "xG1oXXBhCjPKbxrRTlox9ddaZTvVpOhYLmKmApD/vIWOV1xEYXnpoFs68zHIZBGbqztq6FrUPNPerIrO1Hqeaw=="; }; } { - name = "_sapphire_snowflake___snowflake_3.2.2.tgz"; + name = "_sapphire_snowflake___snowflake_3.3.0.tgz"; path = fetchurl { - name = "_sapphire_snowflake___snowflake_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.2.2.tgz"; - sha512 = "ula2O0kpSZtX9rKXNeQMrHwNd7E4jPDJYUXmEGTFdMRfyfMw+FPyh04oKMjAiDuOi64bYgVkOV3MjK+loImFhQ=="; + name = "_sapphire_snowflake___snowflake_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.3.0.tgz"; + sha512 = "Hec5N6zEkZuZFLybVKyLFLlcSgYmR6C1/+9NkIhxPwOf6tgX52ndJCSz8ADejmbrNE0VuNCNkpzhRZzenEC9vA=="; }; } { @@ -490,19 +1018,19 @@ }; } { - name = "_types_node___node_18.11.9.tgz"; + name = "_types_node___node_18.11.17.tgz"; path = fetchurl { - name = "_types_node___node_18.11.9.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz"; - sha512 = "CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg=="; + name = "_types_node___node_18.11.17.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.17.tgz"; + sha512 = "HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="; }; } { - name = "_types_node___node_14.18.33.tgz"; + name = "_types_node___node_14.18.35.tgz"; path = fetchurl { - name = "_types_node___node_14.18.33.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.33.tgz"; - sha512 = "qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg=="; + name = "_types_node___node_14.18.35.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.35.tgz"; + sha512 = "2ATO8pfhG1kDvw4Lc4C0GXIMSQFFJBCo/R1fSgTwmUlq5oy95LXyjDQinsRVgQY6gp6ghh3H91wk9ES5/5C+Tw=="; }; } { @@ -1010,19 +1538,19 @@ }; } { - name = "acebase_core___acebase_core_1.24.0.tgz"; + name = "acebase_core___acebase_core_1.25.0.tgz"; path = fetchurl { - name = "acebase_core___acebase_core_1.24.0.tgz"; - url = "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.24.0.tgz"; - sha512 = "tHFVHJZDVVZSqXsuRvI/CMbcbQtulPHH/Ng6RRdfB+fPCk5tC+DrHa/X0nDfx4fzyQLVLFqp/sFErzowJwhHQw=="; + name = "acebase_core___acebase_core_1.25.0.tgz"; + url = "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.25.0.tgz"; + sha512 = "d7Bh0tcYYCcdKLYu7lDYPhDOIZQObUwGiMg4mcMfsdWWdlfQyQqQMLkYVRqVH1OdHHXEx/BoqtH1oHkEBqgRZg=="; }; } { - name = "acebase___acebase_1.26.2.tgz"; + name = "acebase___acebase_1.27.0.tgz"; path = fetchurl { - name = "acebase___acebase_1.26.2.tgz"; - url = "https://registry.yarnpkg.com/acebase/-/acebase-1.26.2.tgz"; - sha512 = "ClN81mYAkePS2v6ux4eXoFzOCJSA8H/rIIsbr3Qttnd/6/j6G8ooGqsxTqaWwYIdPYeAIaCJsyAqyB4Q59mUhA=="; + name = "acebase___acebase_1.27.0.tgz"; + url = "https://registry.yarnpkg.com/acebase/-/acebase-1.27.0.tgz"; + sha512 = "bnd8NhMrBg3jgbLRtMVRE9yahhSVm6mPGiwQis/gtpBORvJamlNbwQvv+xd6wA+K2SClvv23TkyLhBe7WLBqzA=="; }; } { @@ -2090,11 +2618,11 @@ }; } { - name = "bignumber.js___bignumber.js_9.1.0.tgz"; + name = "bignumber.js___bignumber.js_9.1.1.tgz"; path = fetchurl { - name = "bignumber.js___bignumber.js_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.0.tgz"; - sha512 = "4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A=="; + name = "bignumber.js___bignumber.js_9.1.1.tgz"; + url = "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.1.tgz"; + sha512 = "pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="; }; } { @@ -2193,6 +2721,14 @@ sha512 = "OvfN8y1oAxxphzkl2SnCS+ztV/uVKTATtgLjWYg/7KwcNyf3rzpHxNQJZCKtsZd4+MteKczhWbSjtEX4bGgU9g=="; }; } + { + name = "bowser___bowser_2.11.0.tgz"; + path = fetchurl { + name = "bowser___bowser_2.11.0.tgz"; + url = "https://registry.yarnpkg.com/bowser/-/bowser-2.11.0.tgz"; + sha512 = "AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA=="; + }; + } { name = "brace_expansion___brace_expansion_1.1.11.tgz"; path = fetchurl { @@ -2442,11 +2978,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001434.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001434.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz"; - sha512 = "aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA=="; + name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz"; + sha512 = "OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg=="; }; } { @@ -3146,11 +3682,11 @@ }; } { - name = "dayjs___dayjs_1.11.6.tgz"; + name = "dayjs___dayjs_1.11.7.tgz"; path = fetchurl { - name = "dayjs___dayjs_1.11.6.tgz"; - url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.6.tgz"; - sha512 = "zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="; + name = "dayjs___dayjs_1.11.7.tgz"; + url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz"; + sha512 = "+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="; }; } { @@ -3194,19 +3730,19 @@ }; } { - name = "decimal.js___decimal.js_10.4.2.tgz"; + name = "decimal.js___decimal.js_10.4.3.tgz"; path = fetchurl { - name = "decimal.js___decimal.js_10.4.2.tgz"; - url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz"; - sha512 = "ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA=="; + name = "decimal.js___decimal.js_10.4.3.tgz"; + url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz"; + sha512 = "VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="; }; } { - name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + name = "decode_uri_component___decode_uri_component_0.2.2.tgz"; path = fetchurl { - name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha512 = "hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="; + name = "decode_uri_component___decode_uri_component_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz"; + sha512 = "FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="; }; } { @@ -3378,11 +3914,11 @@ }; } { - name = "discord_api_types___discord_api_types_0.37.20.tgz"; + name = "discord_api_types___discord_api_types_0.37.24.tgz"; path = fetchurl { - name = "discord_api_types___discord_api_types_0.37.20.tgz"; - url = "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.20.tgz"; - sha512 = "uAO+55E11rMkYR36/paE1vKN8c2bZa1mgrIaiQIBgIZRKZTDIGOZB+8I5eMRPFJcGxrg16riUu+0aTu2JQEPew=="; + name = "discord_api_types___discord_api_types_0.37.24.tgz"; + url = "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.24.tgz"; + sha512 = "1+Fb4huJCihdbkJLcq2p7nBmtlmAryNwjefT8wwJnL8c7bc7WA87Oaa5mbLe96QvZyfwnwRCDX40H0HhcVV50g=="; }; } { @@ -3570,11 +4106,11 @@ }; } { - name = "es_abstract___es_abstract_1.20.4.tgz"; + name = "es_abstract___es_abstract_1.20.5.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.20.4.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz"; - sha512 = "0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA=="; + name = "es_abstract___es_abstract_1.20.5.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.5.tgz"; + sha512 = "7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ=="; }; } { @@ -3881,6 +4417,14 @@ sha512 = "VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w=="; }; } + { + name = "fast_xml_parser___fast_xml_parser_4.0.11.tgz"; + path = fetchurl { + name = "fast_xml_parser___fast_xml_parser_4.0.11.tgz"; + url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.0.11.tgz"; + sha512 = "4aUg3aNRR/WjQAcpceODG1C3x3lFANXRo8+1biqfieHmg9pyMt7qB4lQV/Ta6sJCTbA5vfD8fnA8S54JATiFUA=="; + }; + } { name = "fast_xml_parser___fast_xml_parser_3.21.1.tgz"; path = fetchurl { @@ -4314,11 +4858,11 @@ }; } { - name = "gcp_metadata___gcp_metadata_5.0.1.tgz"; + name = "gcp_metadata___gcp_metadata_5.1.0.tgz"; path = fetchurl { - name = "gcp_metadata___gcp_metadata_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.0.1.tgz"; - sha512 = "jiRJ+Fk7e8FH68Z6TLaqwea307OktJpDjmYnU7/li6ziwvVvU2RlrCyQo5vkdeP94chm0kcSCOOszvmuaioq3g=="; + name = "gcp_metadata___gcp_metadata_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.1.0.tgz"; + sha512 = "QVjouEXvNVG/nde6VZDXXFTB02xQdztaumkWCHUff58qsdCS05/8OPh68fQ2QnArfAzZTwfEc979FHSHsU8EWg=="; }; } { @@ -4498,19 +5042,27 @@ }; } { - name = "googleapis_common___googleapis_common_6.0.3.tgz"; + name = "googleapis_common___googleapis_common_6.0.4.tgz"; path = fetchurl { - name = "googleapis_common___googleapis_common_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-6.0.3.tgz"; - sha512 = "Xyb4FsQ6PQDu4tAE/M/ev4yzZhFe2Gc7+rKmuCX2ZGk1ajBKbafsGlVYpmzGqQOT93BRDe8DiTmQb6YSkbICrA=="; + name = "googleapis_common___googleapis_common_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-6.0.4.tgz"; + sha512 = "m4ErxGE8unR1z0VajT6AYk3s6a9gIMM6EkDZfkPnES8joeOlEtFEJeF8IyZkb0tjPXkktUfYrE4b3Li1DNyOwA=="; }; } { - name = "googleapis___googleapis_109.0.1.tgz"; + name = "googleapis___googleapis_110.0.0.tgz"; path = fetchurl { - name = "googleapis___googleapis_109.0.1.tgz"; - url = "https://registry.yarnpkg.com/googleapis/-/googleapis-109.0.1.tgz"; - sha512 = "x286OtNu0ngzxfGz2XgRs4aMhrwutRCkCE12dh2M1jIZOpOndB7ELFXEhmtxaJ7z3257flKIbiiCJZeBO+ze/Q=="; + name = "googleapis___googleapis_110.0.0.tgz"; + url = "https://registry.yarnpkg.com/googleapis/-/googleapis-110.0.0.tgz"; + sha512 = "k6de3PGsdFEBULMiFwPYCKOBljDTDvHD3YGe/OFqe8Ot0lYQPL8QV1qjxjrPWiE/Ftf0Ar2v4DNES66jLfSO7w=="; + }; + } + { + name = "gopd___gopd_1.0.1.tgz"; + path = fetchurl { + name = "gopd___gopd_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz"; + sha512 = "d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="; }; } { @@ -5090,11 +5642,11 @@ }; } { - name = "internal_slot___internal_slot_1.0.3.tgz"; + name = "internal_slot___internal_slot_1.0.4.tgz"; path = fetchurl { - name = "internal_slot___internal_slot_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + name = "internal_slot___internal_slot_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz"; + sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; }; } { @@ -5842,11 +6394,11 @@ }; } { - name = "json5___json5_2.2.1.tgz"; + name = "json5___json5_2.2.2.tgz"; path = fetchurl { - name = "json5___json5_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + name = "json5___json5_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz"; + sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; }; } { @@ -6209,14 +6761,6 @@ sha512 = "c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw=="; }; } - { - name = "lodash.uniqwith___lodash.uniqwith_4.5.0.tgz"; - path = fetchurl { - name = "lodash.uniqwith___lodash.uniqwith_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.uniqwith/-/lodash.uniqwith-4.5.0.tgz"; - sha512 = "7lYL8bLopMoy4CTICbxygAUq6CdRJ36vFc80DucPueUee+d5NBRxz3FdT9Pes/HEx5mPoT9jwnsEJWz1N7uq7Q=="; - }; - } { name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { @@ -6265,6 +6809,14 @@ sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; } + { + name = "lru_cache___lru_cache_5.1.1.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + } { name = "lru_cache___lru_cache_6.0.0.tgz"; path = fetchurl { @@ -6530,11 +7082,11 @@ }; } { - name = "minimatch___minimatch_5.1.0.tgz"; + name = "minimatch___minimatch_5.1.2.tgz"; path = fetchurl { - name = "minimatch___minimatch_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz"; - sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; + name = "minimatch___minimatch_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz"; + sha512 = "bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg=="; }; } { @@ -6609,6 +7161,14 @@ sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; } + { + name = "minipass___minipass_4.0.0.tgz"; + path = fetchurl { + name = "minipass___minipass_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-4.0.0.tgz"; + sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; + }; + } { name = "minizlib___minizlib_2.1.2.tgz"; path = fetchurl { @@ -6658,11 +7218,11 @@ }; } { - name = "moment_timezone___moment_timezone_0.5.39.tgz"; + name = "moment_timezone___moment_timezone_0.5.40.tgz"; path = fetchurl { - name = "moment_timezone___moment_timezone_0.5.39.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.39.tgz"; - sha512 = "hoB6suq4ISDj7BDgctiOy6zljBsdYT0++0ZzZm9rtxIvJhIbQ3nmbgSWe7dNFGurl6/7b1OUkHlmN9JWgXVz7w=="; + name = "moment_timezone___moment_timezone_0.5.40.tgz"; + url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.40.tgz"; + sha512 = "tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg=="; }; } { @@ -6682,11 +7242,11 @@ }; } { - name = "mongodb___mongodb_4.9.1.tgz"; + name = "mongodb___mongodb_4.12.1.tgz"; path = fetchurl { - name = "mongodb___mongodb_4.9.1.tgz"; - url = "https://registry.yarnpkg.com/mongodb/-/mongodb-4.9.1.tgz"; - sha512 = "ZhgI/qBf84fD7sI4waZBoLBNJYPQN5IOC++SBCiPiyhzpNKOxN/fi0tBHvH2dEC42HXtNEbFB0zmNz4+oVtorQ=="; + name = "mongodb___mongodb_4.12.1.tgz"; + url = "https://registry.yarnpkg.com/mongodb/-/mongodb-4.12.1.tgz"; + sha512 = "koT87tecZmxPKtxRQD8hCKfn+ockEL2xBiUvx3isQGI6mFmagWt4f4AyCE9J4sKepnLhMacoCTQQA6SLAI2L6w=="; }; } { @@ -6922,11 +7482,11 @@ }; } { - name = "node_releases___node_releases_2.0.6.tgz"; + name = "node_releases___node_releases_2.0.8.tgz"; path = fetchurl { - name = "node_releases___node_releases_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz"; - sha512 = "PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="; + name = "node_releases___node_releases_2.0.8.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz"; + sha512 = "dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="; }; } { @@ -7866,11 +8426,11 @@ }; } { - name = "plivo___plivo_4.35.0.tgz"; + name = "plivo___plivo_4.36.0.tgz"; path = fetchurl { - name = "plivo___plivo_4.35.0.tgz"; - url = "https://registry.yarnpkg.com/plivo/-/plivo-4.35.0.tgz"; - sha512 = "E8GYcGWEUdUYEt+625UGPuUDXmlQQ/2MtwUt3OEy2DTaOhVbuZH8KC6O98Qq4sPsW3dRAgbYzeeBWGPRkmJ3xg=="; + name = "plivo___plivo_4.36.0.tgz"; + url = "https://registry.yarnpkg.com/plivo/-/plivo-4.36.0.tgz"; + sha512 = "jhd61SkiMXkWDZc+NFNqD5yheyQSl2dpdcLzpOx2u/ddUV1PX+nGwZ+gEp1wZ2B4V/l/qwVk8QHcXRN+VtT+Gg=="; }; } { @@ -8641,6 +9201,14 @@ sha512 = "1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ=="; }; } + { + name = "rxjs___rxjs_7.8.0.tgz"; + path = fetchurl { + name = "rxjs___rxjs_7.8.0.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz"; + sha512 = "F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg=="; + }; + } { name = "safe_buffer___safe_buffer_5.1.2.tgz"; path = fetchurl { @@ -9090,11 +9658,11 @@ }; } { - name = "sqlite3___sqlite3_5.1.2.tgz"; + name = "sqlite3___sqlite3_5.1.4.tgz"; path = fetchurl { - name = "sqlite3___sqlite3_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.2.tgz"; - sha512 = "D0Reg6pRWAFXFUnZKsszCI67tthFD8fGPewRddDCX6w4cYwz3MbvuwRICbL+YQjBAh9zbw+lJ/V9oC8nG5j6eg=="; + name = "sqlite3___sqlite3_5.1.4.tgz"; + url = "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.4.tgz"; + sha512 = "i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA=="; }; } { @@ -9442,19 +10010,19 @@ }; } { - name = "tar___tar_6.1.12.tgz"; + name = "tar___tar_6.1.13.tgz"; path = fetchurl { - name = "tar___tar_6.1.12.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.12.tgz"; - sha512 = "jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw=="; + name = "tar___tar_6.1.13.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz"; + sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; }; } { - name = "telegram___telegram_2.14.7.tgz"; + name = "telegram___telegram_2.15.2.tgz"; path = fetchurl { - name = "telegram___telegram_2.14.7.tgz"; - url = "https://registry.yarnpkg.com/telegram/-/telegram-2.14.7.tgz"; - sha512 = "4qY+M4UHwb4xATCXpnMsBwJCMqETiH97jvnd6D8NnMbJlOC4Br049381xx3oHRc5ifTBxXuD64b7jgIR52rWtQ=="; + name = "telegram___telegram_2.15.2.tgz"; + url = "https://registry.yarnpkg.com/telegram/-/telegram-2.15.2.tgz"; + sha512 = "+/vmEImjDtkOEiiPyGThIyzBVgpCfDNz2suwXtl5z/b0xK6SWqV4edX3c1BZgK4/JrIyydrCAxLQpKlG61/uzw=="; }; } { @@ -9697,6 +10265,14 @@ sha512 = "zvHx3VM83m2WYCE8XL99uaM7mFwYSkjR2OZti98fabHrwkjsCvgwChda5xctein3xGOyaQhtTeDq/1H/GNvF3A=="; }; } + { + name = "tslib___tslib_1.14.1.tgz"; + path = fetchurl { + name = "tslib___tslib_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; + }; + } { name = "tslib___tslib_2.4.1.tgz"; path = fetchurl { @@ -9754,11 +10330,11 @@ }; } { - name = "twilio___twilio_3.83.3.tgz"; + name = "twilio___twilio_3.84.0.tgz"; path = fetchurl { - name = "twilio___twilio_3.83.3.tgz"; - url = "https://registry.yarnpkg.com/twilio/-/twilio-3.83.3.tgz"; - sha512 = "uyYPXUmKIvpq54DGcq0elT0t2PLhDSwD7svu18SabiFSD6rmouws8gr9CZRix45IYSnIxTmOSr3i4vWR74/hQw=="; + name = "twilio___twilio_3.84.0.tgz"; + url = "https://registry.yarnpkg.com/twilio/-/twilio-3.84.0.tgz"; + sha512 = "XL+RR1SdfGExC51cE22unM/r7lEFzfDYUA3FecHEe5cLF+LzxmZGB9O9BXfqZu/sZ5YlGeltJfMA5j3TRLzhLw=="; }; } { @@ -9890,11 +10466,11 @@ }; } { - name = "undici___undici_5.13.0.tgz"; + name = "undici___undici_5.14.0.tgz"; path = fetchurl { - name = "undici___undici_5.13.0.tgz"; - url = "https://registry.yarnpkg.com/undici/-/undici-5.13.0.tgz"; - sha512 = "UDZKtwb2k7KRsK4SdXWG7ErXiL7yTGgLWvk2AXO1JMjgjh404nFo6tWSCM2xMpJwMPx3J8i/vfqEh1zOqvj82Q=="; + name = "undici___undici_5.14.0.tgz"; + url = "https://registry.yarnpkg.com/undici/-/undici-5.14.0.tgz"; + sha512 = "yJlHYw6yXPPsuOH0x2Ib1Km61vu4hLiRRQoafs+WUgX1vO64vgnxiCEN9dpIrhZyHFsai3F0AEj4P9zy19enEQ=="; }; } { @@ -10105,6 +10681,14 @@ sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; } + { + name = "uuid___uuid_8.3.2.tgz"; + path = fetchurl { + name = "uuid___uuid_8.3.2.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz"; + sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; + }; + } { name = "uuid___uuid_9.0.0.tgz"; path = fetchurl { @@ -10617,6 +11201,14 @@ sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; }; } + { + name = "yallist___yallist_3.1.1.tgz"; + path = fetchurl { + name = "yallist___yallist_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + }; + } { name = "yallist___yallist_4.0.0.tgz"; path = fetchurl { From 5659f17812fa53f8ef16f68b1b351cfe2c0b6a3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Dec 2022 06:12:07 +0000 Subject: [PATCH 074/326] sigil: 1.9.10 -> 1.9.20 --- pkgs/applications/editors/sigil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 409f99e37afa..138c886e7639 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.9.10"; + version = "1.9.20"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "sha256-FWUrhTTV1TCoBhitopQc469I7SRy4UDKdRLifVKhCCg="; + sha256 = "sha256-rpJ+HBYmGuhxnZbJn59mc+IokBc5834X2uyriIGnsqA="; }; pythonPath = with python3Packages; [ lxml ]; From 6d459593981584dd15de4f061b56d35d2d62f577 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Dec 2022 20:13:29 +0000 Subject: [PATCH 075/326] distrobox: 1.4.1 -> 1.4.2.1 --- pkgs/applications/virtualization/distrobox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index aca97a811fb3..fda676ca0043 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "distrobox"; - version = "1.4.1"; + version = "1.4.2.1"; src = fetchFromGitHub { owner = "89luca89"; repo = pname; rev = version; - sha256 = "sha256-WIpl3eSdResAmWFc8OG8Jm0uLTGaovkItGAZTOEzhuE="; + sha256 = "sha256-s3lq1Xr2y29cmyT1nY5/amiDA9dNfyGaMtjTvUINSD8="; }; dontConfigure = true; From 00977f8dcf4f3ca1eeb6dd918ae99a7004d5b96b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Dec 2022 20:50:04 +0000 Subject: [PATCH 076/326] neil: 0.1.45 -> 0.1.47 --- pkgs/development/tools/neil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/development/tools/neil/default.nix index 289e90aec31d..e4af4f24e19a 100644 --- a/pkgs/development/tools/neil/default.nix +++ b/pkgs/development/tools/neil/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "neil"; - version = "0.1.45"; + version = "0.1.47"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; rev = "v${version}"; - sha256 = "sha256-QEeJWR4aBx1DsXjlTanhDSQn91I9JzEitU+Az+wTVFY="; + sha256 = "sha256-fsFIBT1voh6QcGRoGYx10JoKqZuV3xcA+eOo03DYz1s="; }; nativeBuildInputs = [ makeWrapper ]; From 40c877143d4d5a91bd95440253ecc86421cf3092 Mon Sep 17 00:00:00 2001 From: Lorenz Brun Date: Thu, 10 Nov 2022 18:40:41 +0100 Subject: [PATCH 077/326] maintainers: add lorenz --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9fb4956ac2d2..9fd634a5e618 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8164,6 +8164,12 @@ fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A"; }]; }; + lorenz = { + name = "Lorenz Brun"; + email = "lorenz@brun.one"; + github = "lorenz"; + githubId = 5228892; + }; lorenzleutgeb = { email = "lorenz@leutgeb.xyz"; github = "lorenzleutgeb"; From d5d3e334ad39522f4edeedd87f064043a4234dea Mon Sep 17 00:00:00 2001 From: Lorenz Brun Date: Thu, 20 Oct 2022 23:36:14 +0200 Subject: [PATCH 078/326] dolbybcsoftwaredecode: init at april-2018 --- .../audio/dolbybcsoftwaredecode/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/audio/dolbybcsoftwaredecode/default.nix diff --git a/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix b/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix new file mode 100644 index 000000000000..5d5c057d724b --- /dev/null +++ b/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchurl, stdenv, unzip, fpc }: + +stdenv.mkDerivation rec { + pname = "dolbybcsoftwaredecode"; + version = "april-2018"; + + src = fetchurl { + url = "mirror://sourceforge/dolbybcsoftwaredecode/April-2018/SourceCode.zip"; + sha256 = "sha256-uLcsRIpwmJlstlGV8I4+/30+D9GDpUt7DOIP/GkXWp4="; + }; + + nativeBuildInputs = [ unzip fpc ]; + buildPhase = '' + fpc DolbyBi64.PP + ''; + installPhase = '' + mkdir -p $out/bin + cp DolbyBi64 $out/bin/ + ''; + + meta = with lib; { + description = "A Dolby B & C software decoder"; + homepage = "https://sourceforge.net/projects/dolbybcsoftwaredecode/"; + maintainers = with maintainers; [ lorenz ]; + + # Project is has source code available, but has no explicit license. + # I asked upstream to assign a license, so maybe this can be free + # in the future, but for now let's play it safe and make it unfree. + license = lib.licenses.unfree; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4061f7ded7ac..1d9d7faed2ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1337,6 +1337,8 @@ with pkgs; davinci-resolve = callPackage ../applications/video/davinci-resolve { }; + dolbybcsoftwaredecode = callPackage ../applications/audio/dolbybcsoftwaredecode { }; + dwarfs = callPackage ../tools/filesystems/dwarfs { }; gamemode = callPackage ../tools/games/gamemode { From 5fd24928adff31d44681d643cb9b5c4f8fc9ea29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Dec 2022 08:08:01 +0000 Subject: [PATCH 079/326] ovito: 3.7.7 -> 3.7.11 --- pkgs/applications/graphics/ovito/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix index 9c919273b545..596ae0d07a11 100644 --- a/pkgs/applications/graphics/ovito/default.nix +++ b/pkgs/applications/graphics/ovito/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "ovito"; - version = "3.7.7"; + version = "3.7.11"; src = fetchFromGitLab { owner = "stuko"; repo = "ovito"; rev = "v${version}"; - sha256 = "sha256-wKXnb7ZzWOPPrHj3jOeFazRy0PVqcV/OFeaBs6qgF1I="; + sha256 = "sha256-Z3uwjOYJ7di/LLllbzdKjzUE7m119i03bA8dJPqhxWA="; }; nativeBuildInputs = [ From a9ef8bb2925352031df95f76f2e7ec8eff08df3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Dec 2022 00:03:25 +0000 Subject: [PATCH 080/326] leafpad: 0.8.18.1 -> 0.8.19 --- pkgs/applications/editors/leafpad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index 0376e3af6bfb..d0b38bcd35a8 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, intltool, pkg-config, gtk2 }: stdenv.mkDerivation rec { - version = "0.8.18.1"; + version = "0.8.19"; pname = "leafpad"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/leafpad/${pname}-${version}.tar.gz"; - sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; + sha256 = "sha256-B9P3EvTb0KMyUf0d7hTiGv3J+SCQ/HaMEasKxVatvpc="; }; nativeBuildInputs = [ pkg-config intltool ]; From 9344a238f7e0dbbfa5d6e5eb911d273c9343bcce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Dec 2022 05:45:51 +0000 Subject: [PATCH 081/326] swagger-codegen3: 3.0.35 -> 3.0.36 --- pkgs/tools/networking/swagger-codegen3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/tools/networking/swagger-codegen3/default.nix index 01c82c1fff54..b630c62c3a9b 100644 --- a/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/pkgs/tools/networking/swagger-codegen3/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "3.0.35"; + version = "3.0.36"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; - sha256 = "sha256-GTqB2wyDguzxrVgnkGiQGgkDVt+caaoyRvUdpeItPcA="; + sha256 = "sha256-nJsjGTtTM9ZjsqZCKKZFrLPZ4jIp1F0Spi6RzeuCzak="; }; dontUnpack = true; From 545fddfa45fe137f82938bef37984fb94008f5d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Dec 2022 13:55:46 +0000 Subject: [PATCH 082/326] batsignal: 1.6.2 -> 1.6.4 --- pkgs/applications/misc/batsignal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index 37898709493e..1618bf746ce0 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.6.2"; + version = "1.6.4"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-3T0vpyAw21u2+csqaz3Yf10G8IQRDyjReedIo+I4fvw="; + sha256 = "sha256-Z5j5tSIF3AZiZjkFFtyyi3hMqWMXtf6ont2CQ/FSEjk="; }; buildInputs = [ libnotify glib ]; From fa65a5e2a6b2cb42e3d3707a630fb9d1c75a6b50 Mon Sep 17 00:00:00 2001 From: JB Gosselin <1536838+dennajort@users.noreply.github.com> Date: Thu, 29 Dec 2022 14:12:05 -0500 Subject: [PATCH 083/326] lima: 0.14.2 --- pkgs/applications/virtualization/lima/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 92b8de106639..29dd9b27232e 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "lima"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C1qJ3SAxtFSxbGrDlLvYDzUwdiJDcegzx5uXCSYNVJQ="; + sha256 = "sha256-g4FvkjBviI1m8zlc+GK/09dIqVkTQ2MqqK1Wkyu4qBc="; }; - vendorSha256 = "sha256-MaAdX7TKfBzvzz8r+cfKCSul/QZ0/AgHnBwhu0ZR0gY="; + vendorSha256 = "sha256-l53MTxLY/uid+0U/eY96l0aBWKImST1gN2BARilh2K0="; nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; From 652204808d4476dbdd0acc6e1210d09feb3b1cf1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Dec 2022 01:16:41 +0000 Subject: [PATCH 084/326] hamlib_4: 4.4 -> 4.5.2 --- pkgs/development/libraries/hamlib/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hamlib/4.nix b/pkgs/development/libraries/hamlib/4.nix index 474db9891aa7..b199bb27397b 100644 --- a/pkgs/development/libraries/hamlib/4.nix +++ b/pkgs/development/libraries/hamlib/4.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "hamlib"; - version = "4.4"; + version = "4.5.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-i/AQewcfUvCFh/OOLe6KeEjeE0NDWzJvj2bZXh+KJIc="; + sha256 = "sha256-Wg+eky/+LTlx4HtUSqYr7D5JTnP/HOPKM/oNiOGZsGE="; }; nativeBuildInputs = [ From 37197dee16f6310502f95a3a47f122af275d70df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Dec 2022 20:10:38 +0000 Subject: [PATCH 085/326] bear: 3.0.20 -> 3.0.21 --- pkgs/development/tools/build-managers/bear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index e7255d6e756b..b371a1f11159 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.0.20"; + version = "3.0.21"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "sha256-8hA0Y/AGczFwggxkTG7PQKOVnr2Oizx4OH38nS5jCU0="; + sha256 = "sha256-wT3s8CjgFPKrJiMWHWsvmUQwpuuS4figJZUXJn3RclU="; }; nativeBuildInputs = [ cmake pkg-config ]; From bf2aea451eec5d963ad6b2e7545603ff443a1563 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Dec 2022 04:23:17 +0000 Subject: [PATCH 086/326] pgweb: 0.11.12 -> 0.13.1 --- pkgs/development/tools/database/pgweb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/pgweb/default.nix b/pkgs/development/tools/database/pgweb/default.nix index 665ce591cdd6..7cdf913736a6 100644 --- a/pkgs/development/tools/database/pgweb/default.nix +++ b/pkgs/development/tools/database/pgweb/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgweb"; - version = "0.11.12"; + version = "0.13.1"; src = fetchFromGitHub { owner = "sosedoff"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5BFTvfTXsz5ZerSoAudavT/C+SA/xkmVBtAOhAixcAE="; + sha256 = "sha256-+sU+kNTOv78g4mvynXoIyNtmeIDxzfAs4Kr/Lx9zfiU="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -f pkg/client/{client,dump}_test.go ''; - vendorSha256 = "sha256-pXV1BodOEZs5sv7UE/C58SAyIUZW5Cp2gJD7g8EuWog="; + vendorSha256 = "sha256-W+Vybea4oppD4BHRqcyouQL79cF+y+sONY9MRggti20="; ldflags = [ "-s" "-w" ]; From 661415920c027c1f8380744498709520206f81a1 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 31 Dec 2022 14:42:37 -0800 Subject: [PATCH 087/326] inklecate: 1.0.0 -> 1.1.1 --- .../compilers/inklecate/default.nix | 8 ++-- pkgs/development/compilers/inklecate/deps.nix | 41 ------------------- 2 files changed, 4 insertions(+), 45 deletions(-) diff --git a/pkgs/development/compilers/inklecate/default.nix b/pkgs/development/compilers/inklecate/default.nix index 58ec15b68253..ac32e2954937 100644 --- a/pkgs/development/compilers/inklecate/default.nix +++ b/pkgs/development/compilers/inklecate/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "inklecate"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "inkle"; repo = "ink"; rev = "v${version}"; - sha256 = "00lagmwsbxap5mgnw4gndpavmv3xsgincdaq1zvw7fkc3vn3pxqc"; + hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA=="; }; nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; @@ -24,8 +24,8 @@ buildDotnetModule rec { nugetDeps = ./deps.nix; executables = [ "inklecate" ]; - dotnet-runtime = dotnetCorePackages.runtime_3_1; - dotnet-sdk = dotnetCorePackages.sdk_3_1; + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; meta = with lib; { description = "Compiler for ink, inkle's scripting language"; diff --git a/pkgs/development/compilers/inklecate/deps.nix b/pkgs/development/compilers/inklecate/deps.nix index e873809a45ea..f3a17967e25c 100644 --- a/pkgs/development/compilers/inklecate/deps.nix +++ b/pkgs/development/compilers/inklecate/deps.nix @@ -2,45 +2,4 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) ] From 1d56f75f94434eb5751275beb7efbf4b3ac39d8c Mon Sep 17 00:00:00 2001 From: Frederick Schwalbe Date: Tue, 27 Dec 2022 22:44:18 +0100 Subject: [PATCH 088/326] chatterino2: 2.3.5 -> 2.4.0 Switch to stdenv.mkDerivation due to https://github.com/NixOS/nixpkgs/issues/180841. --- .../instant-messengers/chatterino2/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index e637881d968c..f1fc99177084 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -1,17 +1,17 @@ -{ mkDerivation, stdenv, lib, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }: +{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qtimageformats, qttools, boost, openssl, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "chatterino2"; - version = "2.3.5"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ozfLLoNUN+1SPXbMNbF1V5sdZgPZEA/J3xXzJP9D3uI="; + sha256 = "sha256-6t7Or2heyV0B5zdWZpN80iADe52faNVlIEZYtcixpZo="; fetchSubmodules = true; }; - nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; - buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl ]; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" mv bin/chatterino.app "$out/Applications/" From 34c3093c20793e261f6ebef1c4b8a358013670d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Jan 2023 02:40:55 +0000 Subject: [PATCH 089/326] python310Packages.recoll: 1.33.2 -> 1.33.4 --- pkgs/applications/search/recoll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index ee258373dc33..9fefc3070357 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -35,11 +35,11 @@ mkDerivation rec { pname = "recoll"; - version = "1.33.2"; + version = "1.33.4"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-ql4VHiblIn8uihUbF1htPnpvjw0qMxdzW8HLGlUrZW0="; + sha256 = "sha256-ffD49sGYWYEWAFPRtpyDU/CYFvkrEDL21Ddq3QsXCvc="; }; configureFlags = [ "--enable-recollq" "--disable-webkit" "--without-systemd" ] From 1f4feb7c6f2bb7d257e860b2d8413a746fbe50c8 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sun, 1 Jan 2023 11:12:23 -0600 Subject: [PATCH 090/326] avr-gcc: fix build on Darwin Adds a patch which fixes a compilation error generated by Clang 11 compiling GCC 11.3. --- .../gcc/11/avr-gcc-11.3-darwin.patch | 20 +++++++++++++++++++ pkgs/development/compilers/gcc/11/default.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch diff --git a/pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch b/pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch new file mode 100644 index 000000000000..787862fbcffa --- /dev/null +++ b/pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch @@ -0,0 +1,20 @@ +--- a/gcc/config/avr/avr.c 2022-10-08 19:18:33.000000000 +0200 ++++ b/gcc/config/avr/avr.patched.c 2022-10-08 19:19:34.000000000 +0200 +@@ -10196,7 +10196,7 @@ + to track need of __do_copy_data. */ + + static void +-avr_output_data_section_asm_op (const void *data) ++avr_output_data_section_asm_op (const char *data) + { + avr_need_copy_data_p = true; + +@@ -10209,7 +10209,7 @@ + to track need of __do_clear_bss. */ + + static void +-avr_output_bss_section_asm_op (const void *data) ++avr_output_bss_section_asm_op (const char *data) + { + avr_need_clear_bss_p = true; + diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index de764b9ccc7c..20b9c32bdf88 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -72,6 +72,8 @@ let majorVersion = "11"; sha256 = "sha256-LFAXUEoYD7YeCG8V9mWanygyQOI7U5OhCRIKOVCCDAg="; }) ] + # https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808 + ++ optional (stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch # Obtain latest patch with ../update-mcfgthread-patches.sh ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch; From b8abee82d678064c0fe50b94f08ab143c4a19e07 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 16 Dec 2022 14:56:24 +0000 Subject: [PATCH 091/326] evmdis: 2018-03-23 -> unstable-2022-05-09 --- .../tools/analysis/evmdis/default.nix | 22 +++++++++++++------ pkgs/development/tools/analysis/evmdis/go.mod | 3 +++ 2 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/tools/analysis/evmdis/go.mod diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix index 4061090b1828..d340cb7562bf 100644 --- a/pkgs/development/tools/analysis/evmdis/default.nix +++ b/pkgs/development/tools/analysis/evmdis/default.nix @@ -1,17 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage { - pname = "evmdis-unstable"; - version = "2018-03-23"; - goPackagePath = "github.com/Arachnid/evmdis"; +buildGoModule { + pname = "evmdis"; + version = "unstable-2022-05-09"; src = fetchFromGitHub { owner = "Arachnid"; repo = "evmdis"; - rev = "0d1406905c5fda6224651fa53260a21c907eb986"; - sha256 = "09y4j7ipgv8yd99g3xk3f079w8fqfj7kl1y7ry81ainysn0qlqrg"; + rev = "7fad4fbee443262839ce9f88111b417801163086"; + hash = "sha256-jfbjXoGT8RtwLlqX13kcKdiFlhrVwA7Ems6abGJVRbA="; }; + vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + preBuild = '' + # Add go modules support + cp ${./go.mod} go.mod + ''; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { homepage = "https://github.com/Arachnid/evmdis"; description = "Ethereum EVM disassembler"; diff --git a/pkgs/development/tools/analysis/evmdis/go.mod b/pkgs/development/tools/analysis/evmdis/go.mod new file mode 100644 index 000000000000..d71cfe70845d --- /dev/null +++ b/pkgs/development/tools/analysis/evmdis/go.mod @@ -0,0 +1,3 @@ +module github.com/Arachnid/evmdis + +go 1.18 From 89bdfaa08cd1ebd6892841d08fe86b87b85029d6 Mon Sep 17 00:00:00 2001 From: Ian McFarlane Date: Tue, 3 Jan 2023 11:16:13 -0600 Subject: [PATCH 092/326] rose-pine-gtk: unstable-2021-02-22 -> unstable-2022-09-01 --- pkgs/data/icons/rose-pine/default.nix | 48 ++++++++++++++++++++++ pkgs/data/themes/rose-pine-gtk/default.nix | 34 +++++++++++---- pkgs/top-level/all-packages.nix | 5 +++ 3 files changed, 80 insertions(+), 7 deletions(-) create mode 100644 pkgs/data/icons/rose-pine/default.nix diff --git a/pkgs/data/icons/rose-pine/default.nix b/pkgs/data/icons/rose-pine/default.nix new file mode 100644 index 000000000000..0aee480fb76a --- /dev/null +++ b/pkgs/data/icons/rose-pine/default.nix @@ -0,0 +1,48 @@ +{ + stdenv, + lib, + fetchFromGitHub, + variant ? "default", +}: let + source-locations = { + default = "icons/rose-pine-icons"; + moon = "icons/rose-pine-moon-icons"; + dawn = "icons/rose-pine-dawn-icons"; + }; + + source-location = + if builtins.hasAttr variant source-locations + then source-locations.${variant} + else abort "unknown rose-pine variant ${variant}"; +in + stdenv.mkDerivation rec { + pname = "rose-pine-${variant}-icon-theme"; + version = "unstable-2022-09-01"; + + src = fetchFromGitHub { + owner = "rose-pine"; + repo = "gtk"; + rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304"; + sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; + }; + + # avoid the makefile which is only for the theme maintainers + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + mv ${source-location} $out/share/icons/rose-pine + + runHook postInstall + ''; + + meta = with lib; { + description = "Rosé Pine icon theme for GTK"; + homepage = "https://github.com/rose-pine/gtk"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = [maintainers.romildo]; + }; + } diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix index d139876e1429..7cbe2d36e192 100644 --- a/pkgs/data/themes/rose-pine-gtk/default.nix +++ b/pkgs/data/themes/rose-pine-gtk/default.nix @@ -4,17 +4,28 @@ , gnome-themes-extra , gtk-engine-murrine , gtk_engines -}: +, variant ? "default" +}: let + source-locations = { + default = "gtk3/rose-pine-gtk"; + moon = "gtk3/rose-pine-moon-gtk"; + dawn = "gtk3/rose-pine-dawn-gtk"; + }; + source-location = + if builtins.hasAttr variant source-locations + then source-locations.${variant} + else abort "unknown rose-pine variant ${variant}"; +in stdenv.mkDerivation rec { - pname = "rose-pine-gtk-theme"; - version = "unstable-2021-02-22"; + pname = "rose-pine-${variant}-gtk-theme"; + version = "unstable-2022-09-01"; src = fetchFromGitHub { owner = "rose-pine"; repo = "gtk"; - rev = "9cd2dd449f911973ec549231a57a070d256da9fd"; - sha256 = "0lqx8dmv754ix3xbg7h440x964n0bg4lb06vbzvsydnbx79h7lvy"; + rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304"; + sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; }; buildInputs = [ @@ -26,11 +37,20 @@ stdenv.mkDerivation rec { gtk-engine-murrine # murrine engine for Gtk2 ]; + # avoid the makefile which is only for theme maintainers + dontBuild = true; + installPhase = '' runHook preInstall + mkdir -p $out/share/themes - cp -a Rose-Pine $out/share/themes - rm $out/share/themes/*/LICENSE + mv ${source-location} $out/share/themes/rose-pine + ${ + if variant == "moon" + then "mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine" + else "" + } + runHook postInstall ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 104f8eef991a..9e3392ff47f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27195,6 +27195,11 @@ with pkgs; roapi-http = callPackage ../servers/roapi/http.nix { }; rose-pine-gtk-theme = callPackage ../data/themes/rose-pine-gtk { }; + rose-pine-dawn-gtk-theme = callPackage ../data/themes/rose-pine-gtk { variant = "dawn"; }; + rose-pine-moon-gtk-theme = callPackage ../data/themes/rose-pine-gtk { variant = "moon"; }; + rose-pine-icon-theme = callPackage ../data/icons/rose-pine { }; + rose-pine-dawn-icon-theme = callPackage ../data/icons/rose-pine { variant = "dawn"; }; + rose-pine-moon-icon-theme = callPackage ../data/icons/rose-pine { variant = "moon"; }; route159 = callPackage ../data/fonts/route159 { }; From f18cbacce4909f4726ecf52deae3efe0fc797edb Mon Sep 17 00:00:00 2001 From: Ian McFarlane Date: Tue, 3 Jan 2023 11:34:49 -0600 Subject: [PATCH 093/326] maintainers: add the-argus --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f384f6835820..2c49d29a23b0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13907,6 +13907,13 @@ fingerprint = "D2A2 F0A1 E7A8 5E6F B711 DEE5 63A4 4817 A52E AB7B"; }]; }; + the-argus = { + email = "i.mcfarlane2002@gmail.com"; + github = "the-argus"; + name = "Ian McFarlane"; + githubId = 70479099; + matrix = "@eyes1238:matrix.org"; + }; TheBrainScrambler = { email = "esthromeris@riseup.net"; github = "TheBrainScrambler"; From 0d1d1250338f28da06b21aada80f6f734d2e99c2 Mon Sep 17 00:00:00 2001 From: Ian McFarlane Date: Tue, 3 Jan 2023 11:38:31 -0600 Subject: [PATCH 094/326] rose-pine-gtk: add the-argus as a maintainer --- pkgs/data/icons/rose-pine/default.nix | 2 +- pkgs/data/themes/rose-pine-gtk/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/rose-pine/default.nix b/pkgs/data/icons/rose-pine/default.nix index 0aee480fb76a..73571a538dc3 100644 --- a/pkgs/data/icons/rose-pine/default.nix +++ b/pkgs/data/icons/rose-pine/default.nix @@ -43,6 +43,6 @@ in homepage = "https://github.com/rose-pine/gtk"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = [maintainers.romildo]; + maintainers = with maintainers; [romildo the-argus]; }; } diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix index 7cbe2d36e192..f40916ff063e 100644 --- a/pkgs/data/themes/rose-pine-gtk/default.nix +++ b/pkgs/data/themes/rose-pine-gtk/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rose-pine/gtk"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; + maintainers = with maintainers; [ romildo the-argus ]; }; } From 99a82dd360635933294b9b1b09106983b3d284f9 Mon Sep 17 00:00:00 2001 From: Ian McFarlane Date: Tue, 3 Jan 2023 11:39:02 -0600 Subject: [PATCH 095/326] rose-pine-gtk: format --- pkgs/data/themes/rose-pine-gtk/default.nix | 89 +++++++++++----------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix index f40916ff063e..25ba5f121a89 100644 --- a/pkgs/data/themes/rose-pine-gtk/default.nix +++ b/pkgs/data/themes/rose-pine-gtk/default.nix @@ -1,10 +1,11 @@ -{ stdenv -, fetchFromGitHub -, lib -, gnome-themes-extra -, gtk-engine-murrine -, gtk_engines -, variant ? "default" +{ + stdenv, + fetchFromGitHub, + lib, + gnome-themes-extra, + gtk-engine-murrine, + gtk_engines, + variant ? "default", }: let source-locations = { default = "gtk3/rose-pine-gtk"; @@ -17,48 +18,48 @@ then source-locations.${variant} else abort "unknown rose-pine variant ${variant}"; in -stdenv.mkDerivation rec { - pname = "rose-pine-${variant}-gtk-theme"; - version = "unstable-2022-09-01"; + stdenv.mkDerivation rec { + pname = "rose-pine-${variant}-gtk-theme"; + version = "unstable-2022-09-01"; - src = fetchFromGitHub { - owner = "rose-pine"; - repo = "gtk"; - rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304"; - sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; - }; + src = fetchFromGitHub { + owner = "rose-pine"; + repo = "gtk"; + rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304"; + sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; + }; - buildInputs = [ - gnome-themes-extra # adwaita engine for Gtk2 - gtk_engines # pixmap engine for Gtk2 - ]; + buildInputs = [ + gnome-themes-extra # adwaita engine for Gtk2 + gtk_engines # pixmap engine for Gtk2 + ]; - propagatedUserEnvPkgs = [ - gtk-engine-murrine # murrine engine for Gtk2 - ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine # murrine engine for Gtk2 + ]; - # avoid the makefile which is only for theme maintainers - dontBuild = true; + # avoid the makefile which is only for theme maintainers + dontBuild = true; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p $out/share/themes - mv ${source-location} $out/share/themes/rose-pine - ${ - if variant == "moon" - then "mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine" - else "" - } + mkdir -p $out/share/themes + mv ${source-location} $out/share/themes/rose-pine + ${ + if variant == "moon" + then "mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine" + else "" + } - runHook postInstall - ''; + runHook postInstall + ''; - meta = with lib; { - description = "Rosé Pine theme for GTK"; - homepage = "https://github.com/rose-pine/gtk"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo the-argus ]; - }; -} + meta = with lib; { + description = "Rosé Pine theme for GTK"; + homepage = "https://github.com/rose-pine/gtk"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [romildo the-argus]; + }; + } From 26fff39e4f5bd4c4ccde1397aa92532fe4d3f95b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jan 2023 09:12:48 +0100 Subject: [PATCH 096/326] python310Packages.recoll: add changelog to meta - specify license --- pkgs/applications/search/recoll/default.nix | 36 ++++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 9fefc3070357..c037e41d74c6 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -42,9 +42,18 @@ mkDerivation rec { sha256 = "sha256-ffD49sGYWYEWAFPRtpyDU/CYFvkrEDL21Ddq3QsXCvc="; }; - configureFlags = [ "--enable-recollq" "--disable-webkit" "--without-systemd" ] - ++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ] - ++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]); + configureFlags = [ + "--enable-recollq" + "--disable-webkit" + "--without-systemd" + ] ++ lib.optionals (!withGui) [ + "--disable-qtgui" + "--disable-x11mon" + ] ++ (if stdenv.isLinux then [ + "--with-inotify" + ] else [ + "--without-inotify" + ]); NIX_CFLAGS_COMPILE = [ "-DNIXPKGS" ]; @@ -54,13 +63,23 @@ mkDerivation rec { ]; nativeBuildInputs = [ - file pkg-config python3Packages.setuptools which + file + pkg-config + python3Packages.setuptools + which ]; buildInputs = [ - bison chmlib python3Packages.python xapian zlib - ] ++ lib.optional withGui qtbase - ++ lib.optional stdenv.isDarwin libiconv; + bison + chmlib + python3Packages.python + xapian + zlib + ] ++ lib.optional withGui [ + qtbase + ] ++ lib.optional stdenv.isDarwin [ + libiconv + ]; # the filters search through ${PATH} using a sh proc 'checkcmds' for the # filtering utils. Short circuit this by replacing the filtering command with @@ -108,7 +127,8 @@ mkDerivation rec { members, email attachments. ''; homepage = "https://www.lesbonscomptes.com/recoll/"; - license = licenses.gpl2; + changelog = "https://www.lesbonscomptes.com/recoll/pages/release-${version}.html"; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ jcumming ]; }; From b2a8b1a48cbbd07d1f9ee374765cc76ce89b2fd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jan 2023 08:48:48 +0000 Subject: [PATCH 097/326] legendary-gl: 0.20.31 -> 0.20.32 --- pkgs/games/legendary-gl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix index f867efc382d2..a863b1d1cee7 100644 --- a/pkgs/games/legendary-gl/default.nix +++ b/pkgs/games/legendary-gl/default.nix @@ -8,13 +8,13 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.20.31"; + version = "0.20.32"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; rev = "refs/tags/${version}"; - sha256 = "sha256-XxCYL41xhtJ2z1Ps2ANTbzi4/PZu7lo78cRbr6R4iTM="; + sha256 = "sha256-MsvhVS3lqhgBJ+S/cjXFP70I3rM5WBYT7TyVlRWhNWw="; }; propagatedBuildInputs = [ requests ]; From a18a6a19fa086d92eb6f08192bd8447f674d3088 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jan 2023 11:55:39 +0000 Subject: [PATCH 098/326] vttest: 20221111 -> 20221229 --- pkgs/tools/misc/vttest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index 0f3096cc4b06..a2bd46321b74 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20221111"; + version = "20221229"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "sha256-asC/ZqWAc3gP3rdGMRT1HYCxzJ6O8djHNjBT/Nwxgac="; + sha256 = "sha256-a2oQmsrwVpz3Zg0g3NFTuD4yjpuT2uTnO5hbvMaxi/g="; }; meta = with lib; { From 6f3fc8199aba09a1260afa75987be9599369bcb7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jan 2023 12:05:27 +0000 Subject: [PATCH 099/326] squirrel-sql: 4.4.0 -> 4.5.1 --- pkgs/development/tools/database/squirrel-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index dd503834dd95..1a931b2b10c3 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { pname = "squirrel-sql"; - version = "4.4.0"; + version = "4.5.1"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "sha256-uMOVhLqjZB21SAvNXT6VhdmFyCFhBYHID9lXeDABvnk="; + sha256 = "sha256-LKX8yNSLs60546ZcvLlQF3e++VxHmPsczui4cfrpia0="; }; nativeBuildInputs = [ makeWrapper unzip ]; From f53e25064015506788f4d8d54e619e5d536be464 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jan 2023 12:13:28 +0000 Subject: [PATCH 100/326] last-resort: 14.000 -> 15.000 --- pkgs/data/fonts/last-resort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/last-resort/default.nix b/pkgs/data/fonts/last-resort/default.nix index 8cad990ac973..7b298c73169f 100644 --- a/pkgs/data/fonts/last-resort/default.nix +++ b/pkgs/data/fonts/last-resort/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl }: let - version = "14.000"; + version = "15.000"; in fetchurl { name = "last-resort-${version}"; @@ -13,7 +13,7 @@ in fetchurl { ''; recursiveHash = true; - sha256 = "sha256-rb69V4oExSFx4GpedpyVvGuS6o+MxmxTCSZhoe9kUhI="; + sha256 = "sha256-mkRIA6Hajl5e9j/qb3WSKaIaHmekjl5wGUSszWMfmjw="; meta = with lib; { description = "Fallback font of last resort"; From 1f1eba997ef3b5cf752595fc8836107a934fb7ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jan 2023 17:00:56 +0000 Subject: [PATCH 101/326] openwsman: 2.7.1 -> 2.7.2 --- pkgs/development/libraries/openwsman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 446952b30051..4df98d28fd09 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "openwsman"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "Openwsman"; repo = "openwsman"; rev = "v${version}"; - sha256 = "sha256-/fSVzpGPObMkJIu7j6eR6A7Gtf2jttoPhcSayBvn3IU="; + sha256 = "sha256-CH2pqWs64Dznim3IljmsthKEQfACVlaAKQ/07MgryHo="; }; nativeBuildInputs = [ cmake pkg-config ]; From 7e645125e96d880a8b2f34f8ac4e7acbb5522702 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Fri, 6 Jan 2023 11:31:13 -0600 Subject: [PATCH 102/326] rare: relax legendary-gl Not able to run pythonRelaxDepsHook because of https://github.com/NixOS/nixpkgs/issues/198342: The wheel name start with Rare (capital letter). --- pkgs/games/rare/default.nix | 20 +++++++++++++++++--- pkgs/games/rare/legendary-gl-version.patch | 13 +++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 pkgs/games/rare/legendary-gl-version.patch diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix index 766673d3ea02..68ad3c872605 100644 --- a/pkgs/games/rare/default.nix +++ b/pkgs/games/rare/default.nix @@ -1,5 +1,15 @@ -{ lib, fetchFromGitHub, buildPythonApplication, qt5 -, legendary-gl, pypresence, pyqt5, python, qtawesome, requests, typing-extensions }: +{ lib +, fetchFromGitHub +, buildPythonApplication +, qt5 +, legendary-gl +, pypresence +, pyqt5 +, python +, qtawesome +, requests +, typing-extensions +}: buildPythonApplication rec { pname = "rare"; @@ -25,7 +35,11 @@ buildPythonApplication rec { typing-extensions ]; - patches = [ ./fix-instance.patch ]; + patches = [ + ./fix-instance.patch + # Not able to run pythonRelaxDepsHook because of https://github.com/NixOS/nixpkgs/issues/198342 + ./legendary-gl-version.patch + ]; dontWrapQtApps = true; diff --git a/pkgs/games/rare/legendary-gl-version.patch b/pkgs/games/rare/legendary-gl-version.patch new file mode 100644 index 000000000000..bd7fa1af74f8 --- /dev/null +++ b/pkgs/games/rare/legendary-gl-version.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 2416360..08de818 100644 +--- a/setup.py ++++ b/setup.py +@@ -7,7 +7,7 @@ with open("README.md", "r") as fh: + + requirements = [ + "requests<3.0", +- "legendary-gl==0.20.31", ++ "legendary-gl~=0.20.31", + "setuptools", + "wheel", + "PyQt5", From 722054637aa2834b06fae3fc4d2f48a7019505f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 01:56:29 +0000 Subject: [PATCH 103/326] python39Packages.pyopengl-accelerate: 3.1.5 -> 3.1.6 --- .../python-modules/pyopengl-accelerate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/pkgs/development/python-modules/pyopengl-accelerate/default.nix index 195ec563d50f..27e329c92855 100644 --- a/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyopengl-accelerate"; - version = "3.1.5"; + version = "3.1.6"; disabled = pythonAtLeast "3.10"; # fails to compile src = fetchPypi { pname = "PyOpenGL-accelerate"; inherit version; - sha256 = "01iggy5jwxv7lxnj51zbmlbhag9wcb7dvrbwgi97i90n0a5m3r8j"; + sha256 = "sha256-rYowAlbsolIoJh3hb3QeUaMPNPHhsc9oNZ9cYtvNzcM="; }; meta = { From f0ebe533a322bb91cd5a105cee98708e42670b50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 04:28:02 +0000 Subject: [PATCH 104/326] mailman-hyperkitty: 1.2.0 -> 1.2.1 --- pkgs/servers/mail/mailman/mailman-hyperkitty.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix index 39f9b5ec37a8..c60dd547dca5 100644 --- a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix +++ b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix @@ -6,14 +6,14 @@ with python3.pkgs; buildPythonPackage rec { pname = "mailman-hyperkitty"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EQBx1KX3z/Wv3QAHOi+s/ihLOjpiupIQBYyE6IPbJto="; + sha256 = "sha256-+Nad+8bMtYKJbUCpppRXqhB1zdbvvFXTTHlwJLQLzDg="; }; propagatedBuildInputs = [ From 0521f3013fe9afb139bbd5c2ef704446bdc57493 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 11:08:01 +0000 Subject: [PATCH 105/326] tcpreplay: 4.4.2 -> 4.4.3 --- pkgs/tools/networking/tcpreplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index 25525fc2b602..ddc0eae97e6a 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpreplay"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; - sha256 = "sha256-Wycs2Dtn1iiKI06hX4ns2TtPrdpl7dxE57X8svOVthU="; + sha256 = "sha256-IWMxaS4QwS1/JXlF53eSjXm9CREX8+T/tbMS6yygv3w="; }; buildInputs = [ libpcap ] From b12c140dd98bf47bf3a91007021770f73f5f397b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 12:58:37 +0000 Subject: [PATCH 106/326] python310Packages.yattag: 1.14.0 -> 1.15.0 --- pkgs/development/python-modules/yattag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index 211a4b60c813..6bac02af7f80 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "5731a31cb7452c0c6930dd1a284e0170b39eee959851a2aceb8d6af4134a5fa8"; + sha256 = "sha256-ap/z/TMKYCh4BOpzcKhBZrYk6/S3rZ7XiLfFd3m2UmM="; }; meta = with lib; { From 72b82f86d4bf448c130da5980fd872a02319bd83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jan 2023 13:44:12 +0000 Subject: [PATCH 107/326] backintime: 1.3.2 -> 1.3.3 --- pkgs/applications/networking/sync/backintime/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 0b02b87a1b2f..71eece9e3bac 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -7,13 +7,13 @@ let apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; in stdenv.mkDerivation rec { pname = "backintime-common"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "sha256-7iTQZ7SiESsKK8F8BpLrRNkj8JhHo64kliaOvMvYGvw="; + sha256 = "sha256-cKmzq155/dCl5wZA2SE3XjfCocHxTh4Wa2IdfzSfQHg="; }; nativeBuildInputs = [ makeWrapper gettext ]; From 029c0a92881a9c8ca38c58c370f4934e7104aa6a Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Thu, 11 Aug 2022 01:12:32 +0000 Subject: [PATCH 108/326] squeezelite: add gpio support --- pkgs/applications/audio/squeezelite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 19b72d1c3788..fa63fee80065 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { EXECUTABLE = binName; - OPTS = [ "-DLINKALL" ] + OPTS = [ "-DLINKALL" "-DGPIO" ] ++ optional dsdSupport "-DDSD" ++ optional (!faad2Support) "-DNO_FAAD" ++ optional ffmpegSupport "-DFFMPEG" From 7dc9a9300e94b040f29e5a0f9e741af74bfe5eab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 01:38:51 +0000 Subject: [PATCH 109/326] p4c: 1.2.3.2 -> 1.2.3.5 --- pkgs/development/compilers/p4c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/p4c/default.nix b/pkgs/development/compilers/p4c/default.nix index cf02a656b770..4faf70bd975d 100644 --- a/pkgs/development/compilers/p4c/default.nix +++ b/pkgs/development/compilers/p4c/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "p4c"; - version = "1.2.3.2"; + version = "1.2.3.5"; src = fetchFromGitHub { owner = "p4lang"; repo = "p4c"; rev = "v${version}"; - sha256 = "sha256-EeTYH7CsmPPBL05zJ+g4aM677n0NqDD+H40lBuKpY6M="; + sha256 = "sha256-5wDwHj+1X6HhhiLfEbOzijpZH6GwpTPEKgNh3iIGTWY="; fetchSubmodules = true; }; From 5d0b499bb57e4b60ca62ecd08c3966868c084542 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 05:27:18 +0000 Subject: [PATCH 110/326] squashfs-tools-ng: 1.1.4 -> 1.2.0 --- pkgs/tools/filesystems/squashfs-tools-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 7f9bd4e61de7..ecb9d18fd6c0 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.1.4"; + version = "1.2.0"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "06pnr3ilywqxch942l8xdg7k053xrqjkkziivx9h89bvy5j7hgvg"; + sha256 = "sha256-1zYHYJXVhJdWQKeM0VVM4VzL3r3XPXebfR7IAEgyt+c="; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; From 495c294fae28ba842448239eaf4931c20eec17d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 06:26:21 +0000 Subject: [PATCH 111/326] cli11: 2.3.0 -> 2.3.2 --- pkgs/development/tools/misc/cli11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index f55857a4ef01..83de5d9cb01f 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "cli11"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "CLIUtils"; repo = "CLI11"; rev = "v${version}"; - sha256 = "sha256-J/hOgCDQPI0n2BGJK0+HIwlfNDVaZcxCC45uFAR7JUc="; + sha256 = "sha256-x3/kBlf5LdzkTO4NYOKanZBfcU4oK+fJw9L7cf88LsY="; }; nativeBuildInputs = [ cmake ]; From cf74134f1db0381aa680373974bb1991215c37b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 09:25:51 +0000 Subject: [PATCH 112/326] pure-prompt: 1.20.4 -> 1.21.0 --- pkgs/shells/zsh/pure-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index 28266b6e6166..ce75c2f346b5 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.20.4"; + version = "1.21.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-e1D+9EejlVZxOyErg6eRgawth5gAhv6KpgjhK06ErZc="; + sha256 = "sha256-YfasTKCABvMtncrfoWR1Su9QxzCqPED18/BTXaJHttg="; }; strictDeps = true; From 1007dac35f8ec8996cbc8fce36fd218240b79cf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jan 2023 17:20:34 +0000 Subject: [PATCH 113/326] jftui: 0.6.1 -> 0.6.2 --- pkgs/applications/video/jftui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix index 78d70d594a19..938d2311779c 100644 --- a/pkgs/applications/video/jftui/default.nix +++ b/pkgs/applications/video/jftui/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "jftui"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Aanok"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TkSnNZBnmDSMsxTFQx1OcFDLQBUqxIrFXQeeslXKqA0="; + sha256 = "sha256-4j0ypzszNWjHbb4RkMIoqvgz624zoKCKiIpidQUPIF4="; }; nativeBuildInputs = [ From 6e13168f479f7e840a2434dc2e2520c031fa285f Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sun, 1 Jan 2023 12:09:45 -0600 Subject: [PATCH 114/326] simavr: fix build on Darwin Remove unnecessary compiler flag not recognized by Clang. Borrow setup hook from Wine which filters out Darwin-specific flags not recognized by avr-gcc, which is used to build the test firmware. --- pkgs/development/tools/simavr/default.nix | 18 ++++++---- .../tools/simavr/setup-hook-darwin.sh | 34 +++++++++++++++++++ 2 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/tools/simavr/setup-hook-darwin.sh diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 8aa9ccd5388a..11b146e55c5e 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,9 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, libelf, which, pkg-config, freeglut +{ lib, stdenv, makeSetupHook, fetchFromGitHub, libelf, which, pkg-config, freeglut , avrgcc, avrlibc , libGLU, libGL , GLUT }: -stdenv.mkDerivation rec { +let + setupHookDarwin = makeSetupHook { + name = "darwin-avr-gcc-hook"; + substitutions = { + darwinSuffixSalt = stdenv.cc.suffixSalt; + avrSuffixSalt = avrgcc.suffixSalt; + }; + } ./setup-hook-darwin.sh; +in stdenv.mkDerivation rec { pname = "simavr"; version = "1.7"; @@ -22,9 +30,8 @@ stdenv.mkDerivation rec { "AVR=avr-" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; - - nativeBuildInputs = [ which pkg-config avrgcc ]; + nativeBuildInputs = [ which pkg-config avrgcc ] + ++ lib.optional stdenv.isDarwin setupHookDarwin; buildInputs = [ libelf freeglut libGLU libGL ] ++ lib.optional stdenv.isDarwin GLUT; @@ -35,7 +42,6 @@ stdenv.mkDerivation rec { checkTarget = "-C tests run_tests"; meta = with lib; { - broken = stdenv.isDarwin; description = "A lean and mean Atmel AVR simulator"; homepage = "https://github.com/buserror/simavr"; license = licenses.gpl3; diff --git a/pkgs/development/tools/simavr/setup-hook-darwin.sh b/pkgs/development/tools/simavr/setup-hook-darwin.sh new file mode 100644 index 000000000000..3861e45973ac --- /dev/null +++ b/pkgs/development/tools/simavr/setup-hook-darwin.sh @@ -0,0 +1,34 @@ + +fixupCFlagsForDarwin() { + # Because it’s getting called from a Darwin stdenv, avr-gcc will pick up on + # Darwin-specific flags, and it will barf and die on -iframework in + # particular. Strip them out, so simavr can compile its test firmware. + cflagsFilter='s|-F[^ ]*||g;s|-iframework [^ ]*||g;s|-isystem [^ ]*||g;s| *| |g' + + # The `CoreFoundation` reference is added by `linkSystemCoreFoundationFramework` in the + # Apple SDK’s setup hook. Remove that because avr-gcc will fail due to file not found. + ldFlagsFilter='s|/nix/store/[^-]*-apple-framework-CoreFoundation[^ ]*||g' + + # `cc-wrapper.sh`` supports getting flags from a system-specific salt. While it is currently a + # tuple, that’s not considered a stable interface, so the derivation will provide them. + export NIX_CFLAGS_COMPILE_@darwinSuffixSalt@=${NIX_CFLAGS_COMPILE-} + export NIX_LDFLAGS_@darwinSuffixSalt@=${NIX_LDFLAGS-} + + echo removing @darwinSuffixSalt@-specific flags from NIX_CFLAGS_COMPILE for @avrSuffixSalt@ + export NIX_CFLAGS_COMPILE_@avrSuffixSalt@+="$(sed "$cflagsFilter" <<< "$NIX_CFLAGS_COMPILE")" + echo removing @darwinSuffixSalt@-specific flags from NIX_LDFLAGS for @avrSuffixSalt@ + export NIX_LDFLAGS_@avrSuffixSalt@+="$(sed "$ldFlagsFilter;$cflagsFilter" <<< "$NIX_LDFLAGS")" + + # Make sure the global flags aren’t accidentally influencing the platform-specific flags. + export NIX_CFLAGS_COMPILE="" + export NIX_LDFLAGS="" +} + +# This is pretty hacky, but this hook _must_ run after `linkSystemCoreFoundationFramework`. +function runFixupCFlagsForDarwinLast() { + preConfigureHooks+=(fixupCFlagsForDarwin) +} + +if [ -z "${dontFixupCFlagsForDarwin-}" ]; then + postUnpackHooks+=(runFixupCFlagsForDarwinLast) +fi From 212c3f86d003a5f6dbae0964c9d95d6b4c1a588f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jan 2023 23:27:27 +0000 Subject: [PATCH 115/326] wsmancli: 2.6.0 -> 2.6.2 --- pkgs/tools/system/wsmancli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix index ac6a561bb0a6..c9c07c81bcae 100644 --- a/pkgs/tools/system/wsmancli/default.nix +++ b/pkgs/tools/system/wsmancli/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "wsmancli"; - version = "2.6.0"; + version = "2.6.2"; src = fetchFromGitHub { owner = "Openwsman"; repo = "wsmancli"; rev = "v${version}"; - sha256 = "0a67fz9lj7xkyfqim6ai9kj7v6hzx94r1bg0g0l5dymgng648b9j"; + sha256 = "sha256-A2PVhQuKVTZ/nDKyy+vZVBNLB/3xujBYBzUEWcTIYYg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From dae8d901a554b8edd63d457ff255119f451a4a2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 04:36:35 +0000 Subject: [PATCH 116/326] fluidd: 1.21.1 -> 1.23.0 --- pkgs/applications/misc/fluidd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index b92110f99d98..27e3ea0aced3 100644 --- a/pkgs/applications/misc/fluidd/default.nix +++ b/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.21.1"; + version = "1.23.0"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-TahXPbZy7eoSJ/U2wL6GaMM8F6zypf7EU91JVWlevQg="; + sha256 = "sha256-SAyR7SeMFh2twLr8QqKzALlMFLv/oAfySN5+cSNALis="; }; nativeBuildInputs = [ unzip ]; From 8bb6cdb1564ce061ee20a4eb9e7cc426f18f8df3 Mon Sep 17 00:00:00 2001 From: Bogdan Burlacu Date: Tue, 10 Jan 2023 12:58:19 +0100 Subject: [PATCH 117/326] ceres-solver: 2.0.0 -> 2.1.0 --- pkgs/development/libraries/ceres-solver/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index f5c000f2271e..a5119f4a7f65 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -18,23 +18,15 @@ assert runTests -> gflags != null; stdenv.mkDerivation rec { pname = "ceres-solver"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz"; - sha256 = "00vng9vnmdb1qga01m0why90m0041w7bn6kxa2h4m26aflfqla8h"; + sha256 = "sha256-99dO7N4K7XW/xR7EjJHQH+Fqa/FrzhmHpwcyhnAeL8Y="; }; outputs = [ "out" "dev" ]; - patches = [ - # Enable GNUInstallDirs, see: https://github.com/ceres-solver/ceres-solver/pull/706 - (fetchpatch { - url = "https://github.com/ceres-solver/ceres-solver/commit/4998c549396d36a491f1c0638fe57824a40bcb0d.patch"; - sha256 = "sha256-mF6Zh2fDVzg2kD4nI2dd9rp4NpvPErmwfdYo5JaBmCA="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = lib.optional runTests gflags; propagatedBuildInputs = [ eigen glog ] From 86c356958133f544901078338d884413e97010b0 Mon Sep 17 00:00:00 2001 From: Aamaruvi Yogamani <38222826+Technical27@users.noreply.github.com> Date: Tue, 10 Jan 2023 08:24:53 -0500 Subject: [PATCH 118/326] rtl88xxau-aircrack: 37e27f -> ee2997 Now builds on Linux 6.1. --- pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index de5c79a56013..80c14a0b3834 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, kernel }: let - rev = "37e27f9165300c89607144b646545fac576ec510"; + rev = "ee299797bcd54d5b8c58d2da8576c54cea1a03a2"; in stdenv.mkDerivation rec { pname = "rtl88xxau-aircrack"; @@ -11,15 +11,13 @@ stdenv.mkDerivation rec { owner = "aircrack-ng"; repo = "rtl8812au"; inherit rev; - sha256 = "sha256-TpmpueKAaCe7Nlmv8pMvgMXGVmXVa/1mBwtEoy4JyCY="; + sha256 = "sha256-JUyUOqLMD9nSo6i87K/6Ljp+pWSqSBz/IZiFWu03rQw="; }; buildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; - NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; - prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ @@ -40,6 +38,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.jethro ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; - broken = kernel.kernelAtLeast "5.18"; }; } From a71ea2fbd9b30a115d83751337ff994a144f909c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 17:23:40 +0000 Subject: [PATCH 119/326] kuttl: 0.14.0 -> 0.15.0 --- pkgs/applications/networking/cluster/kuttl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index d23669bb1f09..cae6540e39fe 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.14.0"; + version = "0.15.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-xQS7qCUTM3X4SpUZfxKHb08poJ2W52R7+TNe4BFL5sY="; + sha256 = "sha256-u+j1ulM6B238qXvLMJZwLqglr9CGk81MsnBYiNiZVJQ="; }; - vendorSha256 = "sha256-u8Ezk78CrAhSeeMVXj09/Hiegtx+ZNKlr/Fg0O7+iOY="; + vendorHash = "sha256-taJAQPa0EA0Ph9OpCs7jzLqBV61kVstZrWyNEYc/GBk="; subPackages = [ "cmd/kubectl-kuttl" ]; From a402e361364cf5e23ec910775758d37c19d5b246 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 17:30:07 +0000 Subject: [PATCH 120/326] tartube-yt-dlp: 2.4.093 -> 2.4.221 --- pkgs/applications/video/tartube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index e6cf8fef4d4e..859cd8e8cc36 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "tartube"; - version = "2.4.093"; + version = "2.4.221"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "refs/tags/v${version}"; - sha256 = "sha256-l8jB+3vY9jOlCaLDHAvDm1Ko7viHbnRBIMEXLb/k2z0="; + sha256 = "sha256-A5p4olnXak22410DOKIPpZ6MQGR5aS2ARWO+083bSuQ="; }; nativeBuildInputs = [ From 99639b329f0ef67dc531f8858c34006da2cae8ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 19:49:22 +0000 Subject: [PATCH 121/326] circumflex: 2.6 -> 2.8 --- pkgs/applications/networking/circumflex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/circumflex/default.nix b/pkgs/applications/networking/circumflex/default.nix index 71fe5b97b8bf..0afe9466b4cb 100644 --- a/pkgs/applications/networking/circumflex/default.nix +++ b/pkgs/applications/networking/circumflex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circumflex"; - version = "2.6"; + version = "2.8"; src = fetchFromGitHub { owner = "bensadeh"; repo = "circumflex"; rev = version; - hash = "sha256-pcY2PXiOazKAi8mAAbmftXDae01fcUw/u9JPOHQVclI="; + hash = "sha256-knN+T/dmIwHLqT3MJBjQhGlSeAu0lE2ZOv6tLqkcwS0="; }; - vendorHash = "sha256-rF1Hu4Pf9AF2MTx4GAPmzSn0M38uTxPS1bsAkO23SdI="; + vendorHash = "sha256-Xwek2xlvdGO6C/T0a96RGuMcX7jCbvntEYBf10tvmAo="; nativeBuildInputs = [ makeWrapper ]; From fd68cf5448198e22157a921024123a5e8552a83a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 20:25:01 +0000 Subject: [PATCH 122/326] python310Packages.python-vipaccess: 0.14 -> 0.14.1 --- pkgs/development/python-modules/python-vipaccess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix index c3d51ae59119..d9276e8591e9 100644 --- a/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "python-vipaccess"; - version = "0.14"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "d5013d306e5891ecfe523c9ef52d074fe8b6ca29ee259c0deeb8a83ae9884ce0"; + sha256 = "sha256-vBFCRXwZ91C48GuOet2Obbo7gM02M2c9+7rhp0l6w54="; }; propagatedBuildInputs = [ From 07584906a4342d6d64d758e9bc56b11eb0259a1d Mon Sep 17 00:00:00 2001 From: "Ian M. Jones" Date: Tue, 10 Jan 2023 21:19:20 +0000 Subject: [PATCH 123/326] wails: 2.2.0 -> 2.3.1 --- pkgs/development/tools/wails/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 714354b0597a..0b6dc6ab05f1 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "wails"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g5tZUVOZ2ywD2vS9B3y3GHaoABr2rSIZGUOsdUJOL8Q="; + sha256 = "sha256-WKA21bU7H9V/X3oPGTgf8ysXX91/tjfEqEzkBMgtMRM="; } + "/v2"; - vendorSha256 = "sha256-jRW8SROt0CON17xZ+I3WiQow7yC1ly7pPHgbpEr1kW8="; + vendorSha256 = "sha256-MPdAl8fwIoO+0IDTWVDktQND/BM/v7sms13l9PNjKDY="; proxyVendor = true; From 346b939a095793430d847f9dfc5d136bba982936 Mon Sep 17 00:00:00 2001 From: LoveIsGrief Date: Mon, 9 Jan 2023 21:35:27 +0100 Subject: [PATCH 124/326] lib/licenses add Fair license --- lib/licenses.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 52956e52afa6..e88054134a3d 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -558,6 +558,12 @@ in mkLicense lset) ({ redistributable = false; }; + fair = { + fullName = "Fair License"; + spdxId = "Fair"; + free = true; + }; + issl = { fullName = "Intel Simplified Software License"; url = "https://software.intel.com/en-us/license/intel-simplified-software-license"; From 7df27f13ee4177ebd2ee59a7ca89306addbfa63e Mon Sep 17 00:00:00 2001 From: LoveIsGrief Date: Tue, 10 Jan 2023 23:12:54 +0100 Subject: [PATCH 125/326] maintainers: Add loveisgrief --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 169663a2f573..13bd7ada0d9f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8346,6 +8346,13 @@ githubId = 4969294; name = "Louis Tim Larsen"; }; + loveisgrief = { + name = "LoveIsGrief"; + email = "loveisgrief@tuta.io"; + keys = [{ + fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB"; + }]; + }; lovek323 = { email = "jason@oconal.id.au"; github = "lovek323"; From e802b00547cb0038478157e910a0b99fc703698a Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Tue, 10 Jan 2023 21:15:17 -0800 Subject: [PATCH 126/326] dotnet-sdk_7.0: 7.0.101 -> 7.0.102 --- .../compilers/dotnet/versions/7.0.nix | 266 +++++++++--------- 1 file changed, 133 insertions(+), 133 deletions(-) diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index 04772db63fca..b33feb56c992 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -4,178 +4,178 @@ { aspnetcore_7_0 = buildAspNetCore { inherit icu; - version = "7.0.1"; + version = "7.0.2"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6f0e5e7f-cf41-4ece-a728-eab7894157cc/b043910ee98786617d99cef8e8914c23/aspnetcore-runtime-7.0.1-linux-x64.tar.gz"; - sha512 = "8265cc0f35591ba58b4c6e12378048b72d1a767c56fe29fe9b495c4ec537ed43ee30890412ae2d52b15a732bc164894d10fa8a59407073d41ac62a3fe6254f81"; + url = "https://download.visualstudio.microsoft.com/download/pr/1d8c4b4c-aec9-451b-9bd3-bf7cdbd28477/def6c1a7a9cfd4590698d4f338da2803/aspnetcore-runtime-7.0.2-linux-x64.tar.gz"; + sha512 = "d3b6c845030069581b3bfd739e3918ce77ae76c8e2e57b8e6c33c9134c46bc8c09fa9b74abdbc917c614c7d09ecbac149b0db1be2e045d26d82c61d976279b49"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e3d97ec5-f36c-45e5-bd0f-c58b0c468ec2/0b97b0983d826f854d9328165393bf1e/aspnetcore-runtime-7.0.1-linux-arm64.tar.gz"; - sha512 = "e80bb0756ba23ebeff96b5e97758a4c74f2bea29b718860e795d62402604c42ec9b544e89e94662a037bc0a68a967b93a2e6321dfd3c4416cde47cf188f67186"; + url = "https://download.visualstudio.microsoft.com/download/pr/f88ac12a-fcc7-4f69-baf9-17cfbd9b316e/8745af53d52c38afc5c9fc171cf3c7b2/aspnetcore-runtime-7.0.2-linux-arm64.tar.gz"; + sha512 = "43ad795456b6d7a1f566113aaca4d7817dc4ff9cc893cab48e01d2d9685a1febdf397dfbc774fa7adc30bac7884dbd60980fe6b95efbc9497cf3228688c123c3"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3d8f8533-29b6-44b4-9b12-12dd99e8380a/70eda23293055dfa566386c4b6e71ebc/aspnetcore-runtime-7.0.1-osx-x64.tar.gz"; - sha512 = "ce0f100cb4494c6133e2710ed92da8c7c7e7fd5626dd22052d9864c22ef4eec88b1418ce7357cbeea4349f12672efa3fe9bae5f3d41614b8fd70930b872844b5"; + url = "https://download.visualstudio.microsoft.com/download/pr/035d61f7-0418-4834-8364-eec4d3c3d112/b1fd356e10f14ee2c930e023654186f3/aspnetcore-runtime-7.0.2-osx-x64.tar.gz"; + sha512 = "a6e867fa4a9774231c736dd61e54efd8f62dc29fdcae6be298023ee86fbc8d75867d58d5968ffe566a497dfc1b10ef0104194af495d5cad48871e989b1bc2778"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0c8fce04-9135-4e2d-af4f-ef8b23a1e467/67493d21915b734225ded1ac7c311005/aspnetcore-runtime-7.0.1-osx-arm64.tar.gz"; - sha512 = "d804532c874279653fc329f23d246dd76aa375acf508de141e5c1d9d89e353f7085e53f1898cefd1d21d4bf98a719d658207b9d08c35bbc2f23d2759fe7cccf4"; + url = "https://download.visualstudio.microsoft.com/download/pr/42ad7951-d95e-4d52-8427-9ff58cdb0c16/f6256fba5b7484979737f34f7fa1e0ac/aspnetcore-runtime-7.0.2-osx-arm64.tar.gz"; + sha512 = "4538a57c6bea5d3137ec44286b17a4ab0df4b5c946db3e9bb50bd97cc0bff6f7ba6f1eb951d77e9f77d3727af7bf04105076f74f2c8b64005b1175f1c8f5cd94"; }; }; }; runtime_7_0 = buildNetRuntime { inherit icu; - version = "7.0.1"; + version = "7.0.2"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0b330412-234f-48c5-957c-c3c8c854a400/8d9a07cc153fd16a828d78c136b47e6f/dotnet-runtime-7.0.1-linux-x64.tar.gz"; - sha512 = "db79b221f6bfa4d56fe0e2b7c237612bd74a81deb18f038ab7226b9e06eaea6e90909f1493f0ab4cf7778b6544b8aaa1295ece1c4a9f1fe39ca44bbfaced46c7"; + url = "https://download.visualstudio.microsoft.com/download/pr/83524cc2-60fb-4e49-8769-e9ecb1af8e46/a28b17808ffe21483b2f719091a0544f/dotnet-runtime-7.0.2-linux-x64.tar.gz"; + sha512 = "56f7f471052b955968b9a4caa27299ac003e0347ae80e8ef23de87d28a2707bdf7ceb70467cc3e9f0c80928a779841dd7e1392ed6b06e66a7a9cda696d5c0a1e"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/038c1cc9-fcd5-4a0e-9547-acab08b0a4ee/c56e6ec6012bc6e9f52897166d543872/dotnet-runtime-7.0.1-linux-arm64.tar.gz"; - sha512 = "53e9b03326c2fdb8d2366a97f3cfbeca4f0f497b82cf665d5d4543f5d0fa8a177c53e8f48597f79072e962e3c7ef6baaca96143c2f775be52071e8ebbae88f34"; + url = "https://download.visualstudio.microsoft.com/download/pr/38d90a87-4b35-46e8-a4c7-5c4ae15eeb96/77b1c221366f3c748c226edf25a65577/dotnet-runtime-7.0.2-linux-arm64.tar.gz"; + sha512 = "dece1d39074dde28aa61f51f3d932ee5328c9ec2c5e6c9830e304bc768e3253b5fab3eb2e27752d39547d68c29666440fe5c96f0fb0b8e503b93f55429df544f"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/45a4345a-ed55-49a9-ab5b-4e85e94f489f/54011a3f9000b22ecb3a823f8f1a6f7a/dotnet-runtime-7.0.1-osx-x64.tar.gz"; - sha512 = "bec337234d04da6530437bd13ec59e0112c4cf951402e0a5ff79c60c93498701e5b5abc6dffc5afa5ccfb214eb879d278ee5beaac8f4f7043ae183157a7ab476"; + url = "https://download.visualstudio.microsoft.com/download/pr/4106c55b-9371-47c6-be04-cffe46c334d8/ad559a1e388d9384ae07381ffccdf26c/dotnet-runtime-7.0.2-osx-x64.tar.gz"; + sha512 = "6fde32130590d18d6bfd73fd3c2cd01f3ed6c2b3316285f64fb0bcc8889707e0a6e1415f796f5553486a89ef817628add27c64b69ea41c6cf4cd9fe811caa10f"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/14304a5c-0fb7-42c4-b838-e5e9c9dc9d16/7da30cc174d04e0e5d3de1a3bb134eb7/dotnet-runtime-7.0.1-osx-arm64.tar.gz"; - sha512 = "2a4e583ed1a2c32de6feb25019eb9fe4fbe26d0cc1ab45a2c7f93db61ffdeef86e37a8af5b36fff0729d649743206986374173dbc0db84d5c0f13b308e40c96b"; + url = "https://download.visualstudio.microsoft.com/download/pr/42056f30-aea1-456c-94c0-77eafd2cdbec/ddf45ed3e6c84305aa584a35344f5338/dotnet-runtime-7.0.2-osx-arm64.tar.gz"; + sha512 = "c8ee455a364a53d0945bf76096bcc568a45b843bc5b313392ab9a07f1e25b16110a411a2d4bb3b6632891cd4ea5147597c93065097bdcbd5038107382c84c9bb"; }; }; }; sdk_7_0 = buildNetSdk { inherit icu; - version = "7.0.101"; + version = "7.0.102"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/7fe73a07-575d-4cb4-b2d3-c23d89e5085f/d8b2b7e1c0ed99c1144638d907c6d152/dotnet-sdk-7.0.101-linux-x64.tar.gz"; - sha512 = "cf289ad0e661c38dcda7f415b3078a224e8347528448429d62c0f354ee951f4e7bef9cceaf3db02fb52b5dd7be987b7a4327ca33fb9239b667dc1c41c678095c"; + url = "https://download.visualstudio.microsoft.com/download/pr/c646b288-5d5b-4c9c-a95b-e1fad1c0d95d/e13d71d48b629fe3a85f5676deb09e2d/dotnet-sdk-7.0.102-linux-x64.tar.gz"; + sha512 = "7667aae20a9e50d31d1fc004cdc5cb033d2682d3aa793dde28fa2869de5ac9114e8215a87447eb734e87073cfe9496c1c9b940133567f12b3a7dea31a813967f"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/caa0e6fb-770c-4b21-ba55-30154a7a9e11/3231af451861147352aaf43cf23b16ea/dotnet-sdk-7.0.101-linux-arm64.tar.gz"; - sha512 = "b0874f4167e9792802b46a7ddcf3a7f7bf7329eb3699d4308b1cdd45ef32678962bbd0ccfd186e48e11cac3b198c4415ceac2f5e546d5fcdf0cecb05810863f7"; + url = "https://download.visualstudio.microsoft.com/download/pr/72ec0dc2-f425-48c3-97f1-dc83740ba400/78e8fa01fa9987834fa01c19a23dd2e7/dotnet-sdk-7.0.102-linux-arm64.tar.gz"; + sha512 = "a98abed737214bd61266d1a5d5096ae34537c6bef04696670d88684e9783bab6f6d45823f775648d723c4e031b1bd341f771baa6b265d2b6e5f5158213721627"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/58c27f9f-f988-4a42-be1a-0747657952f0/32c855c8c0ff149e4b3662ff3bc3e632/dotnet-sdk-7.0.101-osx-x64.tar.gz"; - sha512 = "f08a2137c37386ed9408106d10a3bac5f1a12dd3535e20e4384a96193b82fc27c15ba0ccc47e9bd7a12e533a3e9f0e220a08a220887cd12c678fed476ee12bb5"; + url = "https://download.visualstudio.microsoft.com/download/pr/91c41b31-cf90-4771-934b-6928bbb48aaf/76e95bac2a4cb3fd50c920fd1601527c/dotnet-sdk-7.0.102-osx-x64.tar.gz"; + sha512 = "b7a66a6dc9e6648a97a2697103f2a53f37cab42d7dbd62b1f6ce5b347ca6cc7e45e5474ddb546e10f1e49ac27b20c0f58936093decf779941afd2ff761ecf872"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/d9df94f7-3ea2-41b6-abde-dcb9caa87056/9df759093dcdbc1a1b98feede2da8aaa/dotnet-sdk-7.0.101-osx-arm64.tar.gz"; - sha512 = "586b5a8f32601ffb8466e0135561a02105766388997bab92a428b4567ffca961dba540d4f6fe237f3a4ea068dd4bf3c9050c8557c0cb7e25f4c020fe0a62377a"; + url = "https://download.visualstudio.microsoft.com/download/pr/d0c47b58-a384-46b3-8fce-bd9188541858/dbfe7b537396b747255e65c0fbc9641e/dotnet-sdk-7.0.102-osx-arm64.tar.gz"; + sha512 = "bc95a0215e88540bd52098453f348edb01ffec11ccfc44c7c017bfae5243ce2f0a50f4bb06cc6c3a622c9fc27b89f026be172c2d1bfb8ba62ed007071d5224b5"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.1"; sha256 = "11r444zxpaaijcxqdnc8vlm9g3mppkx8k35y7bjdinbj998jyhlv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.1"; sha256 = "1dl7yzg9a9pq9jrbbipp055laq4glk7wdwhl60iyvj7gr2icpljq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.1"; sha256 = "0psndv4171db3vqqqqvb3mca94qx411hy6cllrz0d931jydcdlna"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.1"; sha256 = "0yhjzj801xbgawi3qs87i2yv64aqf82xa36vmn37bs1dp8ikjh8h"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.1"; sha256 = "1qlkw8jlsrgx47mbvkgdqhi8qhx2j4xjbpiiaxrm2k6cdrjqqrla"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.1"; sha256 = "05prp8fnbb59ydqfgxszb1n1xa39pynzyfwwnlpjfqn0hvryh4b6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.1"; sha256 = "1z0zc164vdcb1lf4jmrsqi261l6nw8bk82y112k4mwf6fcrfqjki"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.1"; sha256 = "1wakpdw6a0arnig5rykl6k33jwp1bm7k4cawdnqhzgvq9yrhnbb8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.1"; sha256 = "0cp1qqmdgya3nc8pxbvg9nzmxcqrv26v8jpl7fpr9wvswsdm3ywr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.1"; sha256 = "1w1m89b2fmgza8fggskm2mpz3pq6f9cskqvr5wf3538s0dm3zai7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.1"; sha256 = "0rg6rh71ja5slaxx8gzmj74q0x4sij5b0437y236abyph5x8f3df"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.1"; sha256 = "1ic0wbsbs917ab37f9a3w37png5fc3p5cqiw3z6zd7dkjlxxnvqd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.1"; sha256 = "0vpqvwbv2rzbim24aqz840si89h9xbbq5h6z8m79gn47ijw4awvz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.1"; sha256 = "1hc6mmvrzvm5pl9smvk8x9x5balsyqcd928js8291qq9pw7dpc85"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.1"; sha256 = "0j5d7gr7m0dcmzsnxbw6q65c58bryj8kc1qfmr0xd99yj55lnmq4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.1"; sha256 = "11s3r9f2zgdmjim8pylp7fwm4l3pd73l0lcfdfy9h90vz3wj9dzh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.1"; sha256 = "10ni736mgmkgm1j19y6r4rrmph1f079mbydfclmf546705ssvkvp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.1"; sha256 = "184pyrr7w4i616lf41w2y4f4m2cm2m2b087v1ry1walwhazrrryw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.1"; sha256 = "0hp3b1pfj5x2xfri8nyw5kp3ggqxgjcw7njiijxpm2yg1zj269a5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.1"; sha256 = "1qy27qq6zavpa9c71hizyhp6byv4vc477r4j9iwm4shvvpyp7aad"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.1"; sha256 = "1r83c0xixij72ll58v68yads7pjfmywx0ygffd8zjmz9djxgiip0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.1"; sha256 = "1kic306b2v7n706zw4nz788an3zl316i617fdh66zkqr43kl2w5v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.1"; sha256 = "1rmdq8mipx2agyn5m1y43s650vfjxqvr96ldcgvpggs8npab7466"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.1"; sha256 = "0rlqlh326ascnqw5qfx2zyf8mvgjyf3rqyg3j7xgw0w3bwlba1ip"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.1"; sha256 = "01370xwprc3m2xgz2fs217qnm35lg5m2hh81kah0hz793dhmqcfb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.1"; sha256 = "17y7mnnzb88bpldmakwz2jqyg49c2dwk7qn4s7w67ckmggaswh4f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.1"; sha256 = "0dx0j3fikadb0ydn4ncjqsvbz14ladgmpvm9zz3n4v2y5ry0pa4a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.1"; sha256 = "0qclazx1zyr324cp2ssdrh3640sna47fyl9rnxq63jkw3n5cl7hz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.1"; sha256 = "1jj9zrblah88m1f1vm53x4gdw5671gr4zdnra0vfawwzy8rbx69k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.1"; sha256 = "0myvn4yzhljm1kr5m1b3i0hxkzfrg4nbhv49413171vwic4p8n5q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.1"; sha256 = "0zj328ka130sya394y65bnipl3mpf8nl0mapap74jnqrhbki69a8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.1"; sha256 = "04n49c643d6rksxs09h383his9m5ljaz42a00fhzw1mb4pzm88a5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.1"; sha256 = "1il3f59nbwp9gvwwpwbv7kw7dv35kh2shj030vpykq9h6ch2k2rn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "1651k4klgaa2q0rpknq5vzn0wg8sq5snx1c493sz013gbzqpq5jw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "14n1zg5bhx4yc22c3razj24rbj7h0yxlwrwzgdi51ix8gzb7nzp3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0pj24ma1533z90s96x9v0bya6macvp95ggpy0h8ixymav44fkk9k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "0ykb419lln5zdnsn9jc6kgy65wm58g7pyy11v6iycrpmbcpkb1m2"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "0754m46v1amvrvaq0yfn7lh08iwnknizis2n9qqkf0xpj32sqah5"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "0ir054hafvyf4s8fycz4bifdar9g0ss11r5dgq5m178xsjgfnhib"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "1dpbxsacbxlp6rbshdwvbrw31wz17bpmipf0svgps7py448xnqy2"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "00rabsskqgf8dcypyi48095zqqgayzhnx5zfxfa22i63cky54x0s"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "00xj1w3acbxjdasywngp2gnsxn16plf31v0vvjfwah38xzrw2qyx"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "0miri63x3fjnbliiq8724mc8bzj2kng1mss1x0rgq1rjgdb0bimx"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "1gi49a224p9slzw96607h2i95qnkjdj81kp9f2541cr47zvlslll"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "085jdd3fjj0mda4y7v6wyp21zvzg1kc21acljk8lk264cq6ckbi5"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "1fpm8faqhh4s1y4qnm4byrpvq1zlhm1brpi7vg1w7zl4y1g3wr7l"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "1xf6bn2kacdz4qjdhnwbkp6lg7l8g6xjii8vgrnpq36jm62gc4kp"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0wbpwi7v0hxbn28xkqccr1wsl82qp2j41jd819cm7amaikvqy30s"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "0sswz7ly4g22gchqh9pg9vvrkvcnb1l49sbbkjs870cyvalid9rn"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "1naqnqgw2r97q7nv5wfgdlv40g0x77fl8j777mf3plvq8y72r3rh"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "0w67rjis62ggjfail7ikx4j7wh4kqxp5fsfa9ig2j02fd63pgla3"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0275280n8vipl3szwnk0rg0ziwvpn1pdppdpac41yq8wm8vcz6js"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "080k0ayvvcg5n31p360sygmvwjbs5597dvrnl0v61nml1xh3bhb4"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "0dgyl7jkddd7pz3hsvq46ia5bq3pm8ldszrb4ylcz0c1x04fk71j"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "0v90h8zcxd917qfqfl565ch0bxhlpr6fv6d11qbyxgankpxv39cg"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "068n96asl9r3546yynv47sw8rzqj51a9f5s6phnf44213kj43kbm"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "0ldnczqjs785vivdfy1va8lfmq4zakdi9s1lbz5cc9mlj4fxnzpp"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "0g3b4pjk4895ldix2ka1c9frgkkj0dy37i88z16sgdf9liszay69"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "0qr0c891sqyd4v32xpfhafycq8ix56my508jsnq58xfpi79flhlw"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0m0ffmmjgf9sqj2yy4m9zijsy4y9kig5j28mrmgkhypbv310lhwj"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "1shp6ikrd2cck7jv0lxbpy5dq02hy8pihcqwn931zkrwcz54ci1q"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "08s3xxiqdfz980l85gvizwr1i4r5izmzll4543sr2qd8f2yldpdx"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "1i2xkjdp2szjbg4spczv8jv4kp2c9c172g2xqp1idsvbh3qmmi4v"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0xgjm43mbdj939l3kksmcs2haz7p0lyw9iw7nvvd82m9gi3lf85r"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "1g538a6qay31bk7w918rb2m5davxhvv69rhk1s7yizmsnh4ib5j1"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "0gjlk1ra5ihp7ymv4dhar9j3skcb7m55zjd1x734z5qxchvwzf2h"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "04lfhpy7k77vplwa2mpmynrwrw6m3k8qk7cb35xb7bdi6x736r6q"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0p3j3xip46dnr04zrdb9s0nf6hx32k1p00xiawra79k9jwm49m9g"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "0jhy162fx1iy75iph5l03yvj04j3jhjlbfslvra4c4xkmy1dc6x9"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "0aljg6nmz03d1wzyqdb2xhfbbrm93c91kqxj6y1f9zl7sx1ih9h7"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "1bq4bcc5p1b37b5ygbi4zzy3w4n10w7n36ghd08f24mqilsa1cq9"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0d14ppfhxd235qapgnfzxg28i9l1sz2rpx6rskc92znf86vr8r7h"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "0ghc0shad29864mx76g81q04r5wvk2kghlm3x9d59wj0z0afdc9h"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "19gqgvy18m8rwmgyc4pmdgzdrg8kxjqdhrn8d5gv0jx37yfk6mv8"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "1s2zq4lhs9wallnzwq60kd0f6pyp0rlasqhrdrias2yw4jcvyxb1"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "15kcczvqq7k3rw7l2hddhy8w0s4xyzars9fi01w7saj9fqzak043"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "17li6mdg3nbx67riypfz7s71nkp2gph5myalav3n3v1pnl2ddhiq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.1"; sha256 = "0xj7chxs3vcbas6sw1hydpvdri7snwvqc2vi06ll1jsy5nsp1z3r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.1"; sha256 = "04r740hqz53an4mww7w138qv14v1c0665829lf23zipqrrhj0am3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.1"; sha256 = "0hlw4d555j1gmc1gmpnqqwmmxm1p3dw5nr6z9wakmr8wbhlij9hp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.1"; sha256 = "0bavrg11l8pkvbxp5z3scvdi2knnpi2jhx2z2z00162kyvwsnbm6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.1"; sha256 = "1zbzc6xnbky56qc0sjdc6k4cmn764xnq2cnpxx85anxq7l4brf00"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.1"; sha256 = "189zljg2czvs4jaqfascm143j7mmpfvp19kr1m9z7nl55fa04mm3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.1"; sha256 = "0xpb9asinhck23y9lnpkk3iqj4j12v1fsp4m4j5dfc26ncnq86mb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.1"; sha256 = "0cqmpf8h8vwxzhfw5fg27xbs630dallss1pz1993bn41nq6f7ydj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.1"; sha256 = "10jqwp8fqy6mr4hx4vsn0zvb7rbgh800zh1csa6fq2hyk783vmii"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.1"; sha256 = "1h0l6b79878ixr96yr9gpinjn65l86kr15jrl58dl8dzq5dgkiqi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.1"; sha256 = "01x9aj4010n9j0lspsczzqirbp1yydqffcswxwgrfrqg1yjhp687"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.1"; sha256 = "1w3hrd6c6662972sx8swhw66b1j2rgmdxva221n8c3bl64y9yrcp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.1"; sha256 = "0vqi937b3qzcj68cz6r9pd9ad13qkbhwdfapj1s55glwkb0a2rwn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.1"; sha256 = "02h3186ysfgqr9mrg8yznic27s82k43va4dx1bfy6rjkq8s2qa5n"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "08cw0dgskfvb27y29d4vgmz4z3yp8fkla12h31py5d499443yaa6"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "062kb0cw912l8z1aymsw9sv5v9lcn1j5ynqi8p6jbm4qz4m5kmfg"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0j8i1gymlyr2zg28zml0pgg0ziv35wsvhiixjqy40bg1w77p14wy"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "08cx11n5m9iv6nashba76m0xz28sh0mc74vbak2xnskhmkapv42f"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "0c4y89pjw5gdla0lnl95xxj3gz5jhxnh96h31f6c1b754f7fcjiq"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "015l0vin9fwfxyqaws8b7ikbdj949gdrpgb01sxb6zk830y27n60"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "1v04f0g159x7di9na4ydkljwijz7ly4v1ws3n5h6m0yf5r5plv5x"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "0v61px8250kzbd2dsl823m32g68j96ga3br1001x237w09qmpwjc"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.1"; sha256 = "0f572aariwr3mncgyhf015l3a3rj98j0xwlama9mvhaqjvj9pahg"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.1"; sha256 = "0bb22j0mld6f85056rnfb2wy3js4hq1f6lcxgfckb3lcpdv3hbny"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.1"; sha256 = "1gjbvjx6kf84gmwakazkz8r7sg61ls7n6lqkh4ny8py45nacr85v"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.1"; sha256 = "0sg4cjj235jwpj8kk85178qnx869xrw69abda9gfczkyzzfyww2i"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.1"; sha256 = "1caj3ipvszwz2xbfh8hmcp03b0swq2haiplvch5z1a986gp336g0"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.1"; sha256 = "08z02n5632qd7jhk3w5pwyp2lgaj0w7ch966vddqn7b11mzhrspy"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.1"; sha256 = "0s8ky64iwn1pcj3pb0myw0m9d07grxcy4f47aj7baplgq6l14z89"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.2"; sha256 = "1yzxfrn3sikcl5xv7l69yly00xs483q5vr5wgp08vrlzgcgyb2rr"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.2"; sha256 = "07m4dxmgl7fcid7crkb51qsrizw66ax0l1zzq1gan7pbyny9gip7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.2"; sha256 = "0vgi12pg0xl0abmzmw0mb29030djg5bk9lqxs1sm6m4sk7137l93"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.2"; sha256 = "1wapqdaw5k9aqzfdhs4y0avrinfcya2y301qbdr92i3p11i7hccf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.2"; sha256 = "1bfs9vgl46zzb59lja3a2phqshspxc9dw4ldc1vqm255isjwyq3c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.2"; sha256 = "17bpwdpw6b5v1fqiih1c8jb8cklw7wvlfnsw6zy0ac6z67dylyin"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.2"; sha256 = "14mmkyg8pi1i7k2i0zqfqvkn5al2k39n6sv2rc6961y7436a7vmd"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.2"; sha256 = "0j4jzc99az94drwgfzf672hjm8ia1hq7dzhq7i0c8ny4xzdqidwq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.2"; sha256 = "1ngxdxn3x54pf97vzrn8f89nr16yrzdbl92mp07jmr1z3k5sdb0k"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.2"; sha256 = "1lgxj2x6gcyn1c67h8231w1xx4a9alldp0nfkw97298453gnzqg0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.2"; sha256 = "0162avkqlg4am99jh7a98bv8r4mr3c5r5yrxng8wgyf6n6k7ymy9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.2"; sha256 = "0lns56ppla5xgvval5m84j41yaynbzqfvivfqxw88haxay33nlb9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.2"; sha256 = "0al7s0nscy1941wpvmc2lnrrknpiai6s4p2w2hy75kay4ipcbg97"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.2"; sha256 = "1y8wm5jl5ly30ccfff5kjhnmlyacpk0ykipphvgb6whd8fnck8ph"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.2"; sha256 = "0sjhr5rkk1jv3i9ddgf9k5lk9pclkn0gs961xn2bvjcslm99ns2p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.2"; sha256 = "0jdh1hrwvdq5llma5p1ammhrwgw8y7iw2qqy5rpkmn4jp08lg2k0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.2"; sha256 = "1f5qlp1m9mjs6c72a2kdc1f2hq0spwqxhcdyf8wpb6bg4bb80p20"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.2"; sha256 = "0sfgwgvikpvf1zbzdqmbvi830ri28xgag39x658qk46yp1a13405"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.2"; sha256 = "17nmc7jymlsxmrdh7jvwmcn9cpfzs04yzcwgigq5bvqiqj809px4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.2"; sha256 = "1z0g31wr1rwf09v1pyrd2vjdxri0h2f1w9m69pwkx0n255584b4w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.2"; sha256 = "1b82hk8s3z380vkyzi8w4n3hznjp3x8dh7hrdwyqyb5v7l8lipw5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.2"; sha256 = "10raq3bpnsy9jsni5bb96zkmx4i1l72h2gzv8jvw9basygqqvk8x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.2"; sha256 = "0liiy8m17bcn5gydpzbnxl79g2mfpsq2d2c67l0hwqqn5w1zv2a4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.2"; sha256 = "0lpwyxhxi1ir52lg31kynzldk5pk6qxawy22izdwlw7fhmwkm0sf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.2"; sha256 = "0cbwhjiwj0lhn6chqz3msymlsqhlpmvdwbhd9r499mfjj0isrpq4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.2"; sha256 = "1iijrsbib1ipihm01dinpd8kklckravn5i40b8whynbpcqi8avhx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.2"; sha256 = "0z1lrxnzbjq18fzy1h77rbyfv2amwzwvfzibdaqv0r9xgrzspvdj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.2"; sha256 = "09agcf1z06z816y40lv0n7mq7njjc48i5dr1xsdiwk587kljp71v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.2"; sha256 = "0h6sbb8iand170cdrr5y6a4kmlhd7s21h1jz8c1idjp7p3i2i8x1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.2"; sha256 = "10ddf1b2m8p16hfz16073w1dzlacx9v1mk62vgnbyyv20g4a4gs1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.2"; sha256 = "0z1yjx7s19m52cliy4f7mwi0y4knba2qadg1qma0d90l7i0wc3v3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.2"; sha256 = "1lf4vkn635xilfzz183yn9byyjfxhdgvchngm34j6jj4pi70d0k2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.2"; sha256 = "1j5wmnxanzkngxz9klaf6bd2chc3fk8z6j6sksmrkd46ykrpbxc4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0ay93vi625b7f4rmg6ff9qjhjy0zjvv906ygmg9irghn97qqy283"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1jnxlw78wqdgcq645aai02vxmgghb0dxhkp33c9qpm5c264vlznl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "07bl45jhg07bfx0f5n755h9wcg3b1igjahy3c45j5d9m5c8avh64"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1b40nzkjgv30v15n9dmgph976i883vpi85djmibvrlk7mah66j5k"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0ig879a4yl5n1xh0i0s7cikf2zkrx1wzb0amqv5ml4pk0ryik4sd"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "04mpy53rw19677ba57l77vk26xmfp5vdgqniqwpqga236sahl3v7"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "081csjhs37m6qspm7mrc3sj7jsn685y1xjkc4wxbypdvqsn43smi"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "139r2lsi1yx5g7d3g62kch1vfyxgfwbyr4gps1q0w4fi0s26qaai"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0rkpicqfbvd1c6l32kzvimw5i4fff8pachazvfqdqp2w98qik4g2"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1x73cdb6as4vh4hldql1p5cys94x8lxgmyygb1bj82l1brgqlqzr"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "1cl8ppl19gb442a00g2bf6szbn70wlr465a98q6xg5h5b92a4z1y"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1lch9mwj3jw8zfaz93pg6j3mviw28bm3ll9z3bdv0spkp1d2gy0p"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "1f3jxldxcy3zjc8ya6lcz68ki8ih5q60vkcv8p9v9qbjbcf3x2qg"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "0kqhpf54jv80in1ypygl3mmdbf1miypn7bdp4d26wrq7anfhr1id"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "1r0hq5w5kn1vr3br7ayg60rf17cxa8jmllmj9cc8rqndpjj04qv1"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "0y5jxxr967xx54wvrrxix9c4i49lx9jlj2dr1y76hywl5rib9xff"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0xxkdjdssvxwnmfkdrn4qpb1y9yfwdrzzm6xwdhj8gcfjbyxv8l8"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "0cl0xinjkk6qjcff015rjarni4z71q1d56d9y7jnp7z9sxbqcpmx"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "15sr4ispkd1zbbp4xz08vpb24p5pbc2avgn7mk502g9y2a87xszq"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1iga8qsq38q182p9awjvgf7301f0y0sbzkx2mvgrp3ppy7rz1jvi"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "01kixadmk3zji3cmqimdg9zzaz2jyfkz8dfd5ll78mdl3qcl341z"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1rvnsiiygy1z01qgl64id93j2nhgi20bc4iwqaaqhzwdgh2600mw"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0ywkdjisj0dsi9f2wyx8faly6zjwhgnzgxvbblfg01saxkqanfrg"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "0wg2vsp7hs2rqh48q2qkb83a4ga5z6awadyn1zkvmxdzrxyk9kry"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "14vq3sndmmfk3x5pfl3q9pcrv2865xpsbmc5i017qah3x1x74i7l"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1i3awdr5dp3jcqkhjkipqy13qdbpgi98cncb9m3jfnnsc36mb732"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "160qg0ar7ja7s3vbh5za28an5xabqdgh7gnnv48baswxm4bls8ds"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1iv0fy0hg62l0r9696f18m9k1fi9qm9pvabq3ahn1nksqmdqjbp8"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0nrnyb6bpqb48rd2pymm0b20rwxpy2yja8ch0l1gzsw0d28ma5c6"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1ys6rfj02vf9jspl7kmyif593kn6mmkyhdncvwpp2fbiip8vxgc4"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0sn7h66y8jxcd17fpfzcysyyic2bgf3jw2ljlgr8v3ags726kn0w"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1hzfjrrav3pxvx0jryyj6kli7q22w2q5zaix6ij4nml7g3d0ygzr"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "1qwnlz65s9jpl0gr5avfc1krvy9m6d9iprjb4hr8v38gj17q4xxy"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1n4fjjrb2yc7d11p8l7z9x09xx2421diiv2i78wygmkz0czdlw48"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0yl9yn4i1lhf76yl92izxzi6x9s6srdbwdh4kcwnwxcszf201gkk"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "09387pgs6qvfs71ll648lyyj7i6wrc98sgh77rr2nhmaw2b3gaq5"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "1jngriv8cfn05njhc97h16048z35686526a3p0iim1xi1zqga5vj"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1hlqn3qdjcjnfwp40hlnjb747pic0lhwc6xvcnly1a9zgk387sg8"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "1jbaqhrqpm696d40swrjj9l19q47rmixzfzbxwm4xgjf2pnrjarc"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "0ar8bydq0arfa0ky6xwfqnjvdn86rfkw7v7v9ga2x51h3n60i149"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0dj6f5fph9m4ym1jcg21v101qj4spzb0qwq0wn79sgd54jia1mfl"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "0iwdwxqy08j7arbfjjj5bx3x4w0fdwhzmwbzidkhgzvqq634n7d0"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0j29f9bfa6hxqs32xy58kwbmqqnbz4b29w2l82ip9w9s8yvjvci3"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1gql9hl2li508sndlvf7hgi0bf74qghbyzyilw6xad88gnvr04vf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.2"; sha256 = "0j9x85vd9lar3mkdxknas1fsvnbxr2713p88qdf6p5zvv2fc2jlw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.2"; sha256 = "1bc3kf8yp6hpmp6layigxz2yzfgdclwgjx621lgg4qiq4xs3sddn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.2"; sha256 = "17kz2565nr7c4737pi3p4kfr1qxrq6gzr3mg3mbm2ky75a2mh016"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.2"; sha256 = "16pvajh1x6pvqrlq1lbzdhin4r5a4ws77zgvf3bp11a85kv7dj1w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.2"; sha256 = "0pmzq9z9d0fflk3zjakc1jjxw66n3wnswm224i0hah02vza2xyia"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.2"; sha256 = "1962bjgwn15p3fh8c1797mhz01bz024mn81dy3dmym755m1mx7c5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.2"; sha256 = "0lxr8agz52wkdm2jd3lz1fkiwqbfkr8rvaxmp65sfzbzs8zmj3dl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.2"; sha256 = "0rcq6fxq8z5xc5nmm2l7zal6c9fqj3vva29b0hwnp8ijk6s2srya"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.2"; sha256 = "1fl418xx0nf5vr6pi3wx257aixiblw70lpsafvjc9f10saihshdj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.2"; sha256 = "1n2b3lpnzc83wyf9pb5cp54hsk0shhww6kh9jd9gw9g89j8la9x7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.2"; sha256 = "0raacw2a86d00q0ky8802c4nhgvik4dls7073dd1mjpmkdc9k8ki"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.2"; sha256 = "14x7cl7dxdy689rkg296rncmzqdv1wsz6axnlf76ywfix5aakh89"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.2"; sha256 = "106n3vwyr2cbgx5a27xy13zp6j943jmmzb0dyj2w3kjmwzdgbjqd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.2"; sha256 = "00y48dbl81d08bcgmy0xfnnr9rp9qnq3w6cad3n151nszz7m3i3f"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "1kl99n29m17ab5vg7k14d9ivsaqpwalbqdxchcfsqxnghby84cia"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "02fbrm2d1000s2ql17c0lcdqv0bacnvgx0kq401yqyirlh5ls0n0"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0bld37hmv1jnxg3w3lkigpk3iy0s1yxryfdd9l4q8my0bpxbdi11"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "055vc0vkbvllqq945py1av0qqcp7a7wvgd6qhazv9d5kyx6hg7dq"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0wppab4l04l23vizk235wvz5niqhv06v929zdr9gi3zg12ajcw8w"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "0y0rr56sm2ij1mrkq9s5j55w49lh4blxg3s5wwxpb5sxrlwl9ygy"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0w3hx2bla0pj5g0kjjlhwr65r93fppyb2cl1prr43aq560a766gq"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1kd4mjd2wygsmlrgy2syvlrf17nd6y5w2bqq42pj4d1xa8i3p7rq"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "1a3hywbyc4hd37pr5cyggxhgr1g69yrphwsyi0h0ylypz7njd721"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "1dalxbgxzc45qj2l7xmhnkzm3jfv4lmbvcd8rvhsm6xh2xq1qhnk"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "019zv2jsw9l440s7c6ybb2jaabkv4l1499vzbks3k55gb7985amz"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "0qmkv3dfrqw8j13cwy3ky3bd5jbs781p4x4m0y2sw6rmfccv7xn0"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "0lmncf55nigri5ivfrlzilx0x6m39pg62nld42zwv3bsncmnfjm3"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "1s14lx6qpfah60rpzxjpinlab98j5kvl8nrmi7g3hjzigf3iflm1"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "1pa8j2n09y062grblkq3ihy22gl71b91pff6ad0d8v7q5821ax2z"; }) ]; }; } From cde181e81bfad54ef03721e1e57361c177c816ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Jan 2023 13:11:50 +0000 Subject: [PATCH 127/326] redis-plus-plus: 1.3.5 -> 1.3.7 --- pkgs/development/libraries/redis-plus-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/redis-plus-plus/default.nix b/pkgs/development/libraries/redis-plus-plus/default.nix index 61e593d28c93..b064297afdd1 100644 --- a/pkgs/development/libraries/redis-plus-plus/default.nix +++ b/pkgs/development/libraries/redis-plus-plus/default.nix @@ -8,13 +8,13 @@ assert enableShared || enableStatic; stdenv.mkDerivation rec { pname = "redis-plus-plus"; - version = "1.3.5"; + version = "1.3.7"; src = fetchFromGitHub { owner = "sewenew"; repo = "redis-plus-plus"; rev = version; - sha256 = "sha256-5tjadh3Ku7lrJn4tbi8TjTH6N0+QB2ER9xuO51cK/LU="; + sha256 = "sha256-QCNN85syxw2EGPdyTV3bL0txcHl7t2YhsKwK9lgnexY="; }; nativeBuildInputs = [ cmake ]; From 9f54342b153d45f7f525acaa187f669e44e8d505 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Jan 2023 16:11:09 +0000 Subject: [PATCH 128/326] libgbinder: 1.1.26 -> 1.1.31 --- pkgs/development/libraries/libgbinder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index 164c9f9e27dd..fef8ad6da4ef 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.26"; + version = "1.1.31"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-bXptf1ALanzDyhajQtKMs/0M9TWlrjhWQdC1NZiUgd8="; + sha256 = "sha256-TrIBI72ammruYbDb46ZfjJ9p8hoqqlApC7ZvnUHK3S8="; }; outputs = [ "out" "dev" ]; From 629ec4589379193bc89a2ab5c874a2fb49cac87e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Jan 2023 19:57:35 +0000 Subject: [PATCH 129/326] siril: 1.0.5 -> 1.0.6 --- pkgs/applications/science/astronomy/siril/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index 7e59c2865e56..db0411f1337a 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "siril"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitLab { owner = "free-astro"; repo = pname; rev = version; - sha256 = "sha256-1NPMTHPbYKPmaG+xRyKFU4/4Iio2ptn+HOvnsg4hoFE="; + sha256 = "sha256-KFCA3fUMVFHmh1BdKed5/dkq0EeYcmoWec97WX9ZHUc="; }; nativeBuildInputs = [ From 0e9cb9fcfda189bde0cd6bbd47773b5e7b041e3d Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 4 Jan 2023 18:05:13 +0300 Subject: [PATCH 130/326] nixos/dhcpcd: don't solicit or accept ipv6 router advertisements if use static addresses --- .../doc/manual/from_md/release-notes/rl-2305.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ nixos/modules/services/networking/dhcpcd.nix | 9 +++++++++ 3 files changed, 18 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 518a89688b95..6db398db4c80 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -377,6 +377,13 @@ security. + + + services.dhcpcd service now don’t solicit + or accept IPv6 Router Advertisements on interfaces that use + static IPv6 addresses. + + The module services.headscale was diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 312ff3463039..d6a2c7b67e83 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -104,6 +104,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.chronyd` is now started with additional systemd sandbox/hardening options for better security. +- `services.dhcpcd` service now don't solicit or accept IPv6 Router Advertisements on interfaces that use static IPv6 addresses. + - The module `services.headscale` was refactored to be compliant with [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md). To be precise, this means that the following things have changed: - Most settings has been migrated under [services.headscale.settings](#opt-services.headscale.settings) which is an attribute-set that diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index ac5d45a65e3b..9a0b29fbe5a7 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -33,6 +33,13 @@ let (if !config.networking.useDHCP && enableDHCP then map (i: i.name) (filter (i: i.useDHCP == true) interfaces) else null); + staticIPv6Addresses = map (i: i.name) (filter (i: i.ipv6.addresses != [ ]) interfaces); + + noIPv6rs = concatStringsSep "\n" (map (name: '' + interface ${name} + noipv6rs + '') staticIPv6Addresses); + # Config file adapted from the one that ships with dhcpcd. dhcpcdConf = pkgs.writeText "dhcpcd.conf" '' @@ -75,6 +82,8 @@ let ''} ${cfg.extraConfig} + + ${optionalString config.networking.enableIPv6 noIPv6rs} ''; exitHook = pkgs.writeText "dhcpcd.exit-hook" From 9a13c5514c920a9b86714047f28f44e2d0f63f19 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 12 Jan 2023 23:03:06 +0100 Subject: [PATCH 131/326] nixos/activemq: deprecate phases --- .../services/amqp/activemq/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index bd37fe3b5574..b1f9b7a3bb1f 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -7,20 +7,19 @@ let cfg = config.services.activemq; - activemqBroker = stdenv.mkDerivation { - name = "activemq-broker"; - phases = [ "installPhase" ]; - buildInputs = [ jdk ]; - installPhase = '' - mkdir -p $out/lib - source ${activemq}/lib/classpath.env - export CLASSPATH - ln -s "${./ActiveMQBroker.java}" ActiveMQBroker.java - javac -d $out/lib ActiveMQBroker.java - ''; - }; + activemqBroker = runCommand "activemq-broker" + { + nativeBuildInputs = [ jdk ]; + } '' + mkdir -p $out/lib + source ${activemq}/lib/classpath.env + export CLASSPATH + ln -s "${./ActiveMQBroker.java}" ActiveMQBroker.java + javac -d $out/lib ActiveMQBroker.java + ''; -in { +in +{ options = { services.activemq = { From 7ead78268f1ec9559d6674416296efed78040611 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Thu, 12 Jan 2023 17:13:00 -0500 Subject: [PATCH 132/326] brave: 1.46.144 -> 1.47.171 https://community.brave.com/t/release-channel-1-47-171/462818 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index dc171a99bcdb..45e064a31b70 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.46.144"; + version = "1.47.171"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-RivuyMPrqBXeTENrH4wApqHglPAZHVXMd863Wlh+EHY="; + sha256 = "sha256-0hKosta1fxth9ScDRmrrt8BH4CTIRm0ghetY4Jkuco8="; }; dontConfigure = true; From d208683cdf5f0b4ee2472c0d5cd5596f4e7e20f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 23:58:06 +0000 Subject: [PATCH 133/326] hyper: 3.3.0 -> 3.4.1 --- pkgs/applications/terminal-emulators/hyper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 06c819d4bb1b..6873558830be 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "hyper"; - version = "3.3.0"; + version = "3.4.1"; src = fetchurl { url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb"; - sha256 = "sha256-VJAFa4I5nHuS/aXhiiXztUh2MjCq5zdwCtK0oSsOrGQ="; + sha256 = "sha256-jEzZ6MWFaNXBS8CAzfn/ufMPpWcua9HhBFzetWMlH1Y="; }; nativeBuildInputs = [ dpkg ]; From 18fd604cf09d7aa86f1730b7b074e586ccc43f4e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 13 Jan 2023 02:38:52 +0100 Subject: [PATCH 134/326] sooperlooper: 1.7.4 -> 1.7.8 --- .../audio/sooperlooper/default.nix | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index 63cb7398201b..35fb524ab301 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , which @@ -9,7 +10,7 @@ , libxml2 , libjack2 , libsndfile -, wxGTK30 +, wxGTK32 , libsigcxx , libsamplerate , rubberband @@ -21,15 +22,23 @@ stdenv.mkDerivation rec { pname = "sooperlooper"; - version = "1.7.4"; + version = "1.7.8"; src = fetchFromGitHub { owner = "essej"; repo = "sooperlooper"; - rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1jng9bkb7iikad0dy1fkiq9wjjdhh1xi1p0cp2lvnz1dsc4yk6iw"; + rev = "v${version}"; + sha256 = "sha256-Lrsz/UDCgoac63FJ3CaPVaYwvBtzkGQQRLhUi6lUusE="; }; + patches = [ + (fetchpatch { + name = "10-build_with_wx_32.patch"; + url = "https://sources.debian.org/data/main/s/sooperlooper/1.7.8~dfsg0-2/debian/patches/10-build_with_wx_32.patch"; + sha256 = "sha256-NF/w+zgRBNkSTqUJhfH9kQogXSYEF70pCN+loR0hjpg="; + }) + ]; + autoreconfPhase = '' patchShebangs ./autogen.sh ./autogen.sh @@ -47,7 +56,7 @@ stdenv.mkDerivation rec { libxml2 libjack2 libsndfile - wxGTK30 + wxGTK32 libsigcxx libsamplerate rubberband @@ -68,7 +77,7 @@ stdenv.mkDerivation rec { However, this kind of live performance looping tool is most effectively used via hardware (midi footpedals, etc) and the engine can be run standalone on a computer without a monitor. ''; - homepage = "http://essej.net/sooperlooper/"; # https is broken + homepage = "https://sonosaurus.com/sooperlooper/"; license = licenses.gpl2; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; From ab43cc69fa5621c7f728ee0a58ce88d226ac61f4 Mon Sep 17 00:00:00 2001 From: Ian McFarlane Date: Thu, 12 Jan 2023 22:56:42 -0600 Subject: [PATCH 135/326] rose-pine-gtk: squash variants into one package --- pkgs/data/icons/rose-pine/default.nix | 20 +++++------------ pkgs/data/themes/rose-pine-gtk/default.nix | 26 +++++----------------- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 11 insertions(+), 39 deletions(-) diff --git a/pkgs/data/icons/rose-pine/default.nix b/pkgs/data/icons/rose-pine/default.nix index 73571a538dc3..a19b786f4ee8 100644 --- a/pkgs/data/icons/rose-pine/default.nix +++ b/pkgs/data/icons/rose-pine/default.nix @@ -2,21 +2,9 @@ stdenv, lib, fetchFromGitHub, - variant ? "default", -}: let - source-locations = { - default = "icons/rose-pine-icons"; - moon = "icons/rose-pine-moon-icons"; - dawn = "icons/rose-pine-dawn-icons"; - }; - - source-location = - if builtins.hasAttr variant source-locations - then source-locations.${variant} - else abort "unknown rose-pine variant ${variant}"; -in +}: stdenv.mkDerivation rec { - pname = "rose-pine-${variant}-icon-theme"; + pname = "rose-pine-icon-theme"; version = "unstable-2022-09-01"; src = fetchFromGitHub { @@ -33,7 +21,9 @@ in runHook preInstall mkdir -p $out/share/icons - mv ${source-location} $out/share/icons/rose-pine + mv icons/rose-pine-icons $out/share/icons/rose-pine + mv icons/rose-pine-dawn-icons $out/share/icons/rose-pine-dawn + mv icons/rose-pine-moon-icons $out/share/icons/rose-pine-moon runHook postInstall ''; diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix index 25ba5f121a89..309b115d6bef 100644 --- a/pkgs/data/themes/rose-pine-gtk/default.nix +++ b/pkgs/data/themes/rose-pine-gtk/default.nix @@ -4,20 +4,8 @@ lib, gnome-themes-extra, gtk-engine-murrine, - gtk_engines, - variant ? "default", -}: let - source-locations = { - default = "gtk3/rose-pine-gtk"; - moon = "gtk3/rose-pine-moon-gtk"; - dawn = "gtk3/rose-pine-dawn-gtk"; - }; - - source-location = - if builtins.hasAttr variant source-locations - then source-locations.${variant} - else abort "unknown rose-pine variant ${variant}"; -in + gtk_engines +}: stdenv.mkDerivation rec { pname = "rose-pine-${variant}-gtk-theme"; version = "unstable-2022-09-01"; @@ -45,12 +33,10 @@ in runHook preInstall mkdir -p $out/share/themes - mv ${source-location} $out/share/themes/rose-pine - ${ - if variant == "moon" - then "mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine" - else "" - } + mv gtk3/rose-pine-gtk $out/share/themes/rose-pine + mv gtk3/rose-pine-moon-gtk $out/share/themes/rose-pine-moon + mv gtk3/rose-pine-dawn-gtk $out/share/themes/rose-pine-dawn + mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine-moon runHook postInstall ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e3392ff47f1..a0dba17464ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27195,11 +27195,7 @@ with pkgs; roapi-http = callPackage ../servers/roapi/http.nix { }; rose-pine-gtk-theme = callPackage ../data/themes/rose-pine-gtk { }; - rose-pine-dawn-gtk-theme = callPackage ../data/themes/rose-pine-gtk { variant = "dawn"; }; - rose-pine-moon-gtk-theme = callPackage ../data/themes/rose-pine-gtk { variant = "moon"; }; rose-pine-icon-theme = callPackage ../data/icons/rose-pine { }; - rose-pine-dawn-icon-theme = callPackage ../data/icons/rose-pine { variant = "dawn"; }; - rose-pine-moon-icon-theme = callPackage ../data/icons/rose-pine { variant = "moon"; }; route159 = callPackage ../data/fonts/route159 { }; From e02cd8e9286fbbf27afefbc6032b4f035cca242d Mon Sep 17 00:00:00 2001 From: Ian McFarlane Date: Thu, 12 Jan 2023 22:58:33 -0600 Subject: [PATCH 136/326] rose-pine-gtk: format --- pkgs/data/icons/rose-pine/default.nix | 54 ++++++++-------- pkgs/data/themes/rose-pine-gtk/default.nix | 72 +++++++++++----------- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/pkgs/data/icons/rose-pine/default.nix b/pkgs/data/icons/rose-pine/default.nix index a19b786f4ee8..6ce6f1d59a33 100644 --- a/pkgs/data/icons/rose-pine/default.nix +++ b/pkgs/data/icons/rose-pine/default.nix @@ -3,36 +3,36 @@ lib, fetchFromGitHub, }: - stdenv.mkDerivation rec { - pname = "rose-pine-icon-theme"; - version = "unstable-2022-09-01"; +stdenv.mkDerivation rec { + pname = "rose-pine-icon-theme"; + version = "unstable-2022-09-01"; - src = fetchFromGitHub { - owner = "rose-pine"; - repo = "gtk"; - rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304"; - sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; - }; + src = fetchFromGitHub { + owner = "rose-pine"; + repo = "gtk"; + rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304"; + sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; + }; - # avoid the makefile which is only for the theme maintainers - dontBuild = true; + # avoid the makefile which is only for the theme maintainers + dontBuild = true; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p $out/share/icons - mv icons/rose-pine-icons $out/share/icons/rose-pine - mv icons/rose-pine-dawn-icons $out/share/icons/rose-pine-dawn - mv icons/rose-pine-moon-icons $out/share/icons/rose-pine-moon + mkdir -p $out/share/icons + mv icons/rose-pine-icons $out/share/icons/rose-pine + mv icons/rose-pine-dawn-icons $out/share/icons/rose-pine-dawn + mv icons/rose-pine-moon-icons $out/share/icons/rose-pine-moon - runHook postInstall - ''; + runHook postInstall + ''; - meta = with lib; { - description = "Rosé Pine icon theme for GTK"; - homepage = "https://github.com/rose-pine/gtk"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [romildo the-argus]; - }; - } + meta = with lib; { + description = "Rosé Pine icon theme for GTK"; + homepage = "https://github.com/rose-pine/gtk"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [romildo the-argus]; + }; +} diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix index 309b115d6bef..8398373756f8 100644 --- a/pkgs/data/themes/rose-pine-gtk/default.nix +++ b/pkgs/data/themes/rose-pine-gtk/default.nix @@ -4,48 +4,48 @@ lib, gnome-themes-extra, gtk-engine-murrine, - gtk_engines + gtk_engines, }: - stdenv.mkDerivation rec { - pname = "rose-pine-${variant}-gtk-theme"; - version = "unstable-2022-09-01"; +stdenv.mkDerivation rec { + pname = "rose-pine-${variant}-gtk-theme"; + version = "unstable-2022-09-01"; - src = fetchFromGitHub { - owner = "rose-pine"; - repo = "gtk"; - rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304"; - sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; - }; + src = fetchFromGitHub { + owner = "rose-pine"; + repo = "gtk"; + rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304"; + sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; + }; - buildInputs = [ - gnome-themes-extra # adwaita engine for Gtk2 - gtk_engines # pixmap engine for Gtk2 - ]; + buildInputs = [ + gnome-themes-extra # adwaita engine for Gtk2 + gtk_engines # pixmap engine for Gtk2 + ]; - propagatedUserEnvPkgs = [ - gtk-engine-murrine # murrine engine for Gtk2 - ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine # murrine engine for Gtk2 + ]; - # avoid the makefile which is only for theme maintainers - dontBuild = true; + # avoid the makefile which is only for theme maintainers + dontBuild = true; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p $out/share/themes - mv gtk3/rose-pine-gtk $out/share/themes/rose-pine - mv gtk3/rose-pine-moon-gtk $out/share/themes/rose-pine-moon - mv gtk3/rose-pine-dawn-gtk $out/share/themes/rose-pine-dawn - mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine-moon + mkdir -p $out/share/themes + mv gtk3/rose-pine-gtk $out/share/themes/rose-pine + mv gtk3/rose-pine-moon-gtk $out/share/themes/rose-pine-moon + mv gtk3/rose-pine-dawn-gtk $out/share/themes/rose-pine-dawn + mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine-moon - runHook postInstall - ''; + runHook postInstall + ''; - meta = with lib; { - description = "Rosé Pine theme for GTK"; - homepage = "https://github.com/rose-pine/gtk"; - license = licenses.gpl3Only; - platforms = platforms.linux; - maintainers = with maintainers; [romildo the-argus]; - }; - } + meta = with lib; { + description = "Rosé Pine theme for GTK"; + homepage = "https://github.com/rose-pine/gtk"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [romildo the-argus]; + }; +} From cc4de1aa3ad39c480e111113aec48da2e7c24e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Fri, 13 Jan 2023 10:16:46 +0100 Subject: [PATCH 137/326] nixos-rebuild: Allow local builds when --target-host is used again This is a followup of #148921, to allow local builds when `--target-host` is used again. It also documents the change in behavior, regarding the specialty of the `localhost` value. By removing the special handling of an empty `buildHost` and non empty `targetHost`, this change also slightly alters the behavior of `nixos-rebuild`. Originally by specifying `--target-host target --build-host ""`, the now removed special case would transform those arguments to `--target-host target --build-host target`. Now the empty `--build-host` would result in a local build. --- .../doc/manual/from_md/release-notes/rl-2305.section.xml | 9 +++++++++ nixos/doc/manual/man-nixos-rebuild.xml | 6 +++--- nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 4 ---- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 242841a56b65..7a8c7b10596a 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -256,6 +256,15 @@ been changed to null. + + + The --target-host and + --build-host options of + nixos-rebuild no longer treat the + localhost value specially – to build + on/deploy to local machine, omit the relevant flag. + + The nix.readOnlyStore option has been diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index cab871661a75..1b55d07c9502 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -532,15 +532,15 @@ Specifies the NixOS target host. By setting this to something other than - localhost, the system activation will happen + an empty string, the system activation will happen on the remote host instead of the local machine. The remote host needs to be accessible over ssh, and for the commands , and you need root access. - If is not explicitly specified, building - will take place locally. + If is not explicitly specified or empty, + building will take place locally. diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index b5c74836ef40..f6c71cc3da0a 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -67,6 +67,8 @@ In addition to numerous new and upgraded packages, this release has the followin - In `mastodon` it is now necessary to specify location of file with `PostgreSQL` database password. In `services.mastodon.database.passwordFile` parameter default value `/var/lib/mastodon/secrets/db-password` has been changed to `null`. +- The `--target-host` and `--build-host` options of `nixos-rebuild` no longer treat the `localhost` value specially – to build on/deploy to local machine, omit the relevant flag. + - The `nix.readOnlyStore` option has been renamed to `boot.readOnlyNixStore` to clarify that it configures the NixOS boot process, not the Nix daemon. ## Other Notable Changes {#sec-release-23.05-notable-changes} diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 217e04d35720..ed7c9231905a 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -148,10 +148,6 @@ if [[ -n "$SUDO_USER" || -n $remoteSudo ]]; then maybeSudo=(sudo --preserve-env="$preservedSudoVars" --) fi -if [[ -z "$buildHost" && -n "$targetHost" ]]; then - buildHost="$targetHost" -fi - # log the given argument to stderr if verbose mode is on logVerbose() { if [ -n "$verboseScript" ]; then From 268feffcaac9f5fa37d4be7d64d43d32e2088170 Mon Sep 17 00:00:00 2001 From: LoveIsGrief Date: Tue, 10 Jan 2023 23:13:19 +0100 Subject: [PATCH 138/326] simple-dlna-browser: Add new package A useful CLI script I found that's way light than VLC and other GUI apps since SSDP is pretty much a text-based protocol built on top of HTTP. --- .../simple-dlna-browser/default.nix | 68 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/tools/networking/simple-dlna-browser/default.nix diff --git a/pkgs/tools/networking/simple-dlna-browser/default.nix b/pkgs/tools/networking/simple-dlna-browser/default.nix new file mode 100644 index 000000000000..c59a1e28910a --- /dev/null +++ b/pkgs/tools/networking/simple-dlna-browser/default.nix @@ -0,0 +1,68 @@ +{ + # Derivation stuff + fetchFromGitHub, + lib, + makeWrapper, + stdenv, + # Dependencies + # Add these to the wrapper + curl, + gawk, + gnugrep, + gnused, + socat, + wget, +}: +stdenv.mkDerivation { + pname = "simple-dlna-browser"; + version = "unstable-2023-01-09"; + + src = fetchFromGitHub { + owner = "javier-lopez"; + repo = "learn"; + sparseCheckout = [ + "sh/tools/simple-dlna-browser" + ]; + rev = "666e2c402723251ba19ce9d7c11b83b06c15a2c5"; + sha256 = "sha256-jwPAEgti5DrjNnNVW/61GGTP+QedGAjz9kPwYhMAdTk="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + outputWrapper="$out/bin/simple-dlna-browser" + outputWrapped="$out/bin/wrapped-simple-dlna-browser" + + mkdir -p $out/bin + cp sh/tools/simple-dlna-browser $outputWrapped + makeWrapper $outputWrapped $outputWrapper \ + --prefix PATH : ${lib.makeBinPath [ + curl + gawk + gnugrep + gnused + socat + wget + ]} + + # Set the program name to a fixed value + # Normally it is guessed by the filename, but we don't want it to be the name of the wrapper + sed -i -e 's/PROGNAME=".*"/PROGNAME="simple-dlna-browser"/' $outputWrapped + ''; + + meta = { + description = "Query dlna media servers"; + longDescription = '' + A bash script that allows simple interactions with [DLNA] media servers. + It is a light-weight, CLI alternative to [VLC], [Kodi], and other players. + + [DLNA]: https://en.wikipedia.org/wiki/Digital_Living_Network_Alliance + [Kodi]: https://kodi.tv/ + [VLC]: https://www.videolan.org/vlc/ + ''; + homepage = "https://github.com/javier-lopez/learn/blob/master/sh/tools/simple-dlna-browser"; + license = lib.licenses.fair; + maintainers = with lib.maintainers; [ loveisgrief ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2470aae99a26..bd241fc55ec3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1455,6 +1455,8 @@ with pkgs; sgrep = callPackage ../tools/text/sgrep { }; + simple-dlna-browser = callPackage ../tools/networking/simple-dlna-browser { }; + sorted-grep = callPackage ../tools/text/sorted-grep { }; smbscan = callPackage ../tools/security/smbscan { }; From 85dc9e8544749aefe35eb58cdbd561fbd164d2d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Jan 2023 21:16:58 +0000 Subject: [PATCH 139/326] qcad: 3.27.6.11 -> 3.27.8.7 --- pkgs/applications/misc/qcad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 0fc2697848d0..dcf941cf03aa 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.27.6.11"; + version = "3.27.8.7"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-FfbHedJgzZdUpamLL2Wz2P8glaC/IVYCGZQk9EEc83k="; + sha256 = "sha256-GWDDZzFDOR96ZpmNDUuE+S9zTMVSYFNJKp8z/Cx3hec="; }; patches = [ From a1b357d321bdea614331242301e8d69c6099cc28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 00:29:49 +0000 Subject: [PATCH 140/326] libamqpcpp: 4.3.18 -> 4.3.19 --- pkgs/development/libraries/libamqpcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index c055a6bce193..c9d396bf2e37 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.18"; + version = "4.3.19"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-cjxzBw2tjZROx5xzdhzZjGNJQe3tC9fHOhF/+uSM+CY="; + sha256 = "sha256-YyWpXh/8gNYTiGAJWr8lRPhstBD0eEVRBg8IlYk8o3w="; }; buildInputs = [ openssl ]; From 92dca3d39f1ab3db606f1869baf658bc8b292013 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 00:34:44 +0000 Subject: [PATCH 141/326] micronaut: 3.7.4 -> 3.8.1 --- pkgs/development/tools/micronaut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 0e809bb32f76..c814517520f6 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "3.7.4"; + version = "3.8.1"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-VUavNwj5MCMZFV9WASF3olOdZb4JNBYbcQdgUfvPS8k="; + sha256 = "sha256-DBWPKy17pYU5VWEOxnaP2AKoiskNCBbt9QqO6xxf7eI="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 40208098d2cf7ef3706a7f68ffdef7046eb2d001 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 01:03:41 +0000 Subject: [PATCH 142/326] klayout: 0.27.11 -> 0.28.3 --- pkgs/applications/misc/klayout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 3ab41da35452..0386b25ee422 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.27.11"; + version = "0.28.3"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-w3ag+TPUrjPbPIy6N4HPsfraOyoHqBbvjwB1M6+qh60="; + hash = "sha256-keC+QLV/iEEGFDdy/Vt2pCr55qbqQzcx3HokdDi+xSU="; }; postPatch = '' From de45d7fd527fe44d79412a71b522b08c467bfe7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 01:38:36 +0000 Subject: [PATCH 143/326] libzen: 0.4.39 -> 0.4.40 --- pkgs/development/libraries/libzen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 1c7aa8c54b72..a0c99457d47b 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.39"; + version = "0.4.40"; pname = "libzen"; src = fetchurl { url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "1rwaxmid9iv65n0y6xlcyxxydsvihjni9ldxpg6pbqz43amp49xx"; + sha256 = "sha256-VUPixFIUudnwuk9D3uYdApbh/58UJ+1sh53dG2K59p4="; }; nativeBuildInputs = [ autoreconfHook ]; From 2d639cc4219699e3966cbdbe85dd452de360b3f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 01:53:57 +0000 Subject: [PATCH 144/326] ode: 0.16.2 -> 0.16.3 --- pkgs/development/libraries/ode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index 211821e084cc..f82a67b76e1c 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ode"; - version = "0.16.2"; + version = "0.16.3"; src = fetchurl { url = "https://bitbucket.org/odedevs/${pname}/downloads/${pname}-${version}.tar.gz"; - sha256 = "08hgh4gqdk77jcw8b7gq2mwsfg4a5v5y0j7g42bxiqhmn3ffnsmj"; + sha256 = "sha256-x0Hb9Jv8Rozilkgk5bw/kG6pVrGuNZTFDTUcOD8DxBM="; }; meta = with lib; { From 26ce043bbf354d7fc8c6f0b910225a5683be2b78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 03:55:10 +0000 Subject: [PATCH 145/326] nordzy-icon-theme: 1.7.6 -> 1.8.1 --- pkgs/data/icons/nordzy-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/data/icons/nordzy-icon-theme/default.nix index 74e3ac872583..bc9d20342ef0 100644 --- a/pkgs/data/icons/nordzy-icon-theme/default.nix +++ b/pkgs/data/icons/nordzy-icon-theme/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "nordzy-icon-theme"; - version = "1.7.6"; + version = "1.8.1"; src = fetchFromGitHub { owner = "alvatip"; repo = "Nordzy-icon"; rev = version; - sha256 = "sha256-VKcbQ6DeQ0zGOPJgfmZMNsHjsMwoCk7jUT2Oc8xuwGc="; + sha256 = "sha256-JfVcznGoL/HmNbjZk6RUUp/RZIXYIAoOMA3HBpqlUcE="; }; # In the post patch phase we should first make sure to patch shebangs. From ddb7ece95a1b6fa9e0879a1c74010849c9a1517b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 04:22:10 +0000 Subject: [PATCH 146/326] grafana-image-renderer: 3.6.1 -> 3.6.3 --- pkgs/servers/monitoring/grafana-image-renderer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 56a6f1e1a046..952a9f94ceba 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -12,13 +12,13 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.6.1"; + version = "3.6.3"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - sha256 = "sha256-x+kGouF/7ltKdYfNO2EI8F4FKWYClcyigcUVfZlud00="; + sha256 = "sha256-5oER0KMhBBu8AiawxHNoYIV+farcLBjB8HpO+1UluSY="; }; buildPhase = '' From 5a9ca13318501b66a88778509bb280e4a671ebf5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 05:18:35 +0000 Subject: [PATCH 147/326] nco: 5.0.6 -> 5.1.4 --- pkgs/development/libraries/nco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index ef396f299937..571fc039142f 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nco"; - version = "5.0.6"; + version = "5.1.4"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = version; - sha256 = "sha256-LmxHgSBBqXK5M4KOthd8R+H5EY3O5lueb2gnw5mK8Xw="; + sha256 = "sha256-M2GP92SIs4B92Re8McGKIIjQJ+qXAr/TwDtFKcH/zsk="; }; nativeBuildInputs = [ flex which antlr2 ]; From fc65d6e66e13c9a3251b4f511138f92de8b381ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 06:06:52 +0000 Subject: [PATCH 148/326] star: 2.7.10a -> 2.7.10b --- pkgs/applications/science/biology/star/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index 3555929a33ea..e1a21cba0da2 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "star"; - version = "2.7.10a"; + version = "2.7.10b"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "sha256-qwddCGMOKWgx76qGwRQXwvv9fCSeVsZbWHmlBwEqGKE="; + sha256 = "sha256-58Y4lzqXwBhRlXcionUg2IhAg5znNUuyr/FsuNZd+5Q="; }; sourceRoot = "source/source"; From 8aac051f844abbe34c0b53f44a733f79bf4893f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 07:26:57 +0000 Subject: [PATCH 149/326] libargs: 6.4.4 -> 6.4.6 --- pkgs/development/libraries/libargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libargs/default.nix b/pkgs/development/libraries/libargs/default.nix index 419cbfdb9f5e..79572e430013 100644 --- a/pkgs/development/libraries/libargs/default.nix +++ b/pkgs/development/libraries/libargs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "args"; - version = "6.4.4"; + version = "6.4.6"; src = fetchFromGitHub { owner = "Taywee"; repo = pname; rev = version; - sha256 = "sha256-niuBM8tPCedFNCrkgvLE7PZu411sKgcvovr++6dIaus="; + sha256 = "sha256-2gH3h3QAl0+XVULt/fR2UUGKNIxTUmnRRdxPOFdpVy4="; }; nativeBuildInputs = [ cmake ]; From bd4aede85c5f7d4a1e73279c43fea73e00060092 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 07:58:31 +0000 Subject: [PATCH 150/326] frp: 0.45.0 -> 0.46.1 --- pkgs/tools/networking/frp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index fc5e675ec9aa..4d6c54564bb2 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.45.0"; + version = "0.46.1"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ybcc1k0XSX+ZiG7Z1Bwai1RCypZfrHqhi3uJNhJYILo="; + sha256 = "sha256-/itziNmIDIuj3sKpB+SEiiwvJqdH5nmTkpFdMSY5L0g="; }; - vendorSha256 = "sha256-ZwBSptOsFcxz+xBpjrsvnLvky8kSN4uFx1fXcdDwAmk="; + vendorHash = "sha256-dU9rhYgYgP1qTPR3ykUgyg+B1bBVJwizWooyCpdpnm0="; doCheck = false; From 56ab60896aa96001c0ca21ce27e02e08d485cf58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 08:22:21 +0000 Subject: [PATCH 151/326] openhantek6022: 3.3.1 -> 3.3.2.1 --- .../science/electronics/openhantek6022/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix index da75983e40f6..d64f5547e71b 100644 --- a/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "openhantek6022"; - version = "3.3.1"; + version = "3.3.2.1"; src = fetchFromGitHub { owner = "OpenHantek"; repo = "OpenHantek6022"; rev = version; - sha256 = "sha256-8QXFTQQZ5Q1SRQI4jWzRek+3BTuWfGHJIbgvwbZulg8="; + sha256 = "sha256-ysluU3UmWtrTAstnCbSy4TdzbjcnSUeE+d8mpC7Ocvk="; }; nativeBuildInputs = [ cmake makeWrapper ]; From 82e33443c9cf7290f1eed74c16814ad9f92379c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 08:22:47 +0000 Subject: [PATCH 152/326] opcr-policy: 0.1.43 -> 0.1.47 --- pkgs/development/tools/opcr-policy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix index d3b46e1d95ff..f3e8c942bf24 100644 --- a/pkgs/development/tools/opcr-policy/default.nix +++ b/pkgs/development/tools/opcr-policy/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.1.43"; + version = "0.1.47"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-6j3PEdSI8pLyTaYVUGmnPXV8P3arr3BukAI8R9eikCI="; + sha256 = "sha256-HjoVD3GLNg1jdCPMwEUJR/0BLJexbVxacVfmIm/P4SI="; }; - vendorSha256 = "sha256-wPtChLsIWX1YckA9p6YMxGMvqGqO0ohXYsOdkuCHbd4="; + vendorHash = "sha256-/wTLnJ3l22owDL5dFR9H/QN3UItxP7QQgU/NcmzBL6U="; ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; From 99bee15d83e2ecdd38c48894f1582b5af0751757 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 08:57:35 +0000 Subject: [PATCH 153/326] partclone: 0.3.21 -> 0.3.22 --- pkgs/tools/backup/partclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index ccf74e46aeb5..b5a694482cb8 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "partclone"; - version = "0.3.21"; + version = "0.3.22"; src = fetchFromGitHub { owner = "Thomas-Tsai"; repo = "partclone"; rev = version; - sha256 = "sha256-QAvZzu63TSj/kRYd60q2lpxU92xTV8T8jXdtZvrxX+I="; + sha256 = "sha256-NSIWuzgv3dQ2Kpl1HOoghrOaKztDjZs8NjF9k41kZQY="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From f2c75f068dadba11c6f0dc74347ad79448843942 Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Fri, 30 Dec 2022 16:45:09 +0000 Subject: [PATCH 154/326] avalanchego: init at 1.9.7 Fixes #208032 --- .../networking/avalanchego/default.nix | 45 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/networking/avalanchego/default.nix diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix new file mode 100644 index 000000000000..b1b3a5781972 --- /dev/null +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -0,0 +1,45 @@ +{ IOKit +, buildGoModule +, fetchFromGitHub +, fetchpatch +, lib +, stdenv +}: + +buildGoModule rec { + pname = "avalanchego"; + version = "1.9.7"; + + src = fetchFromGitHub { + owner = "ava-labs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7WiIw2k0ZNm6jFHIiJlKuWFdEhb11qGVot1B50Za/GY="; + }; + + vendorHash = "sha256-2ezrasgGkMqr+dUF+TfsM5cevLGAFMyq9FlMxzKola8="; + # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 + proxyVendor = true; + + buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + + subPackages = [ "main" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/ava-labs/avalanchego/version.GitCommit=${version}" + ]; + + postInstall = '' + mv $out/bin/{main,${pname}} + ''; + + meta = with lib; { + description = "Go implementation of an Avalanche node"; + homepage = "https://github.com/ava-labs/avalanchego"; + changelog = "https://github.com/ava-labs/avalanchego/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e921bd726d9a..2009afdbf779 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27849,6 +27849,10 @@ with pkgs; av-98 = callPackage ../applications/networking/browsers/av-98 { }; + avalanchego = callPackage ../applications/networking/avalanchego { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; + avizo = callPackage ../applications/misc/avizo { }; avocode = callPackage ../applications/graphics/avocode {}; From 578e88414a680c96ce4b808427c9e89d1692d8ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 13:39:06 +0000 Subject: [PATCH 155/326] libdigidocpp: 3.14.11 -> 3.14.12 --- pkgs/development/libraries/libdigidocpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 21da1a917bf1..6b15d1fab20c 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.11"; + version = "3.14.12"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - hash = "sha256-5QYKHwRB5nck5yqukX/UA+M3jFlBvkQ/ekB7JFIY5tI="; + hash = "sha256-82AH18KcrkD7mHDy+2c9v7E3Kj7Cb7jCoLfmo09D8PU="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; From 72e09e90547d4597750025b4a975ba9e308e8ab2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 14:25:01 +0000 Subject: [PATCH 156/326] libucl: 0.8.1 -> 0.8.2 --- pkgs/development/libraries/libucl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libucl/default.nix b/pkgs/development/libraries/libucl/default.nix index e65d0d475ff9..9ba96644102e 100644 --- a/pkgs/development/libraries/libucl/default.nix +++ b/pkgs/development/libraries/libucl/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "libucl"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "vstakhov"; repo = pname; rev = version; - sha256 = "1h52ldxankyhbbm1qbqz1f2q0j03c1b4mig7343bs3mc6fpm18gf"; + sha256 = "sha256-rpTc0gq8HquDow4NEkRSjyESEMrv8dAhX98yKKu/Fsk="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From a69f2fc78ca1ed6a760363a00bf36216ba9e656e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 16:10:52 +0000 Subject: [PATCH 157/326] guile-ssh: 0.16.0 -> 0.16.2 --- pkgs/development/guile-modules/guile-ssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/guile-modules/guile-ssh/default.nix b/pkgs/development/guile-modules/guile-ssh/default.nix index 1fb97c7a2ae7..be082c373a2d 100644 --- a/pkgs/development/guile-modules/guile-ssh/default.nix +++ b/pkgs/development/guile-modules/guile-ssh/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "guile-ssh"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "artyom-poptsov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3h4U/h6cVgHTJOyliw1gTYtgzQcatRLX6NrP87JXRc0="; + sha256 = "sha256-BDnLm5Q+69v8JbrfAn0+XMuWzRvCeUB/prfrKnvw5eY="; }; configureFlags = [ "--with-guilesitedir=\${out}/share/guile/site" ]; From face67b312e0251ae610d5984b2362cd1633a069 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 16:21:38 +0000 Subject: [PATCH 158/326] xfe: 1.44 -> 1.45 --- pkgs/applications/file-managers/xfe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index 92b3fae31596..5ac0f5e3abab 100644 --- a/pkgs/applications/file-managers/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "xfe"; - version = "1.44"; + version = "1.45"; src = fetchurl { url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz"; - sha256 = "594c14d185bdfc7e3132aefda7cf4e233625258ca9a1939359944a2c07c030b6"; + sha256 = "sha256-RmvVUzqCsRRwXgC4Yabt46uFHnL0XFWncQfXDG+owDc="; }; nativeBuildInputs = [ pkg-config intltool ]; From e3fe978bdfd5bd8b94193bdd30d99a3a851d2faa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Jan 2023 20:50:44 +0000 Subject: [PATCH 159/326] gerbera: 1.11.0 -> 1.12.1 --- pkgs/servers/gerbera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index 5f6c8797b0e7..b62237866b3f 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -65,13 +65,13 @@ let in stdenv.mkDerivation rec { pname = "gerbera"; - version = "1.11.0"; + version = "1.12.1"; src = fetchFromGitHub { repo = "gerbera"; owner = "gerbera"; rev = "v${version}"; - sha256 = "sha256-pikzgbm962C7yFM67Z/LayLf4mpLV4HfqZJlBfebL8U="; + sha256 = "sha256-j5J0u0zIjHY2kP5P8IzN2h+QQSCwsel/iTspad6V48s="; }; postPatch = lib.optionalString enableMysql '' From 3e0afdc5968114f1fc9f8c34b5d3364703e3c2c7 Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Mon, 28 Nov 2022 00:49:15 -0500 Subject: [PATCH 160/326] bencoder: init at 0.2.0 --- .../python-modules/bencoder/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/bencoder/default.nix diff --git a/pkgs/development/python-modules/bencoder/default.nix b/pkgs/development/python-modules/bencoder/default.nix new file mode 100644 index 000000000000..2fa730630c0b --- /dev/null +++ b/pkgs/development/python-modules/bencoder/default.nix @@ -0,0 +1,27 @@ +{ lib +, fetchPypi +, buildPythonPackage +, setuptools +}: +buildPythonPackage rec { + pname = "bencoder"; + version = "0.2.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-rENvM/3X51stkFdJHSq+77VjHvsTyBNAPbCtsRq1L8I="; + }; + + pythonImportsCheck = [ "bencoder" ]; + + # There are no tests. + doCheck = false; + + meta = with lib; { + description = "A simple bencode decoder/encoder library in pure Python"; + homepage = "https://github.com/utdemir/bencoder"; + license = licenses.gpl2; + maintainers = with maintainers; [ somasis ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9fc93c10c252..c2d0b3aeec6e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1199,6 +1199,8 @@ self: super: with self; { bellows = callPackage ../development/python-modules/bellows { }; + bencoder = callPackage ../development/python-modules/bencoder { }; + beniget = callPackage ../development/python-modules/beniget { }; bespon = callPackage ../development/python-modules/bespon { }; From 78eb8d67272ee8d303fccd85e2d915c09b314542 Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Sat, 14 Jan 2023 19:46:11 -0500 Subject: [PATCH 161/326] gazelle-origin: init at 3.0.0 --- pkgs/tools/misc/gazelle-origin/default.nix | 38 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/misc/gazelle-origin/default.nix diff --git a/pkgs/tools/misc/gazelle-origin/default.nix b/pkgs/tools/misc/gazelle-origin/default.nix new file mode 100644 index 000000000000..800904e909c5 --- /dev/null +++ b/pkgs/tools/misc/gazelle-origin/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, bencoder +, pyyaml +, requests +, setuptools +}: +buildPythonApplication rec { + pname = "gazelle-origin"; + version = "3.0.0"; + format = "setuptools"; + + src = fetchFromGitHub { + repo = pname; + # Use the spinfast319 fork, since it seems that upstream + # at is inactive + owner = "spinfast319"; + rev = version; + hash = "sha256-+yMKnfG2f+A1/MxSBFLaHfpCgI2m968iXqt+2QanM/c="; + }; + + propagatedBuildInputs = [ + bencoder + pyyaml + requests + ]; + + pythonImportsCheck = [ "gazelleorigin" ]; + + meta = with lib; { + description = "Tool for generating origin files using the API of Gazelle-based torrent trackers"; + homepage = "https://github.com/spinfast319/gazelle-origin"; + # TODO license is unspecified in the upstream, as well as the fork + license = licenses.unfree; + maintainers = with maintainers; [ somasis ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4651d305032..adb77dd03a8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28492,6 +28492,8 @@ with pkgs; gauche = callPackage ../development/interpreters/gauche { }; + gazelle-origin = python3Packages.callPackage ../tools/misc/gazelle-origin { }; + gcal = callPackage ../applications/misc/gcal { }; gcstar = callPackage ../applications/misc/gcstar { }; From 15796c4ed9d9479a612d927116fa5e251c47dda0 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sat, 14 Jan 2023 18:46:59 -0800 Subject: [PATCH 162/326] lastpass-cli: 1.3.3 -> 1.3.4 --- pkgs/tools/security/lastpass-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 14a6ef750e3a..9cc02e33d9bd 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lastpass-cli"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "lastpass"; repo = pname; rev = "v${version}"; - sha256 = "168jg8kjbylfgalhicn0llbykd7kdc9id2989gg0nxlgmnvzl58a"; + sha256 = "sha256-bPAENorvj48cyRpnMLmyENXlipSGhTLW+XVoyrPogTE="; }; patches = [ From fef1559b0568b31378c8ad7809f901a57bbb8fae Mon Sep 17 00:00:00 2001 From: George Shammas Date: Sun, 18 Dec 2022 14:19:44 -0500 Subject: [PATCH 163/326] nixos/mastodon: Add the ability to pass environment files --- nixos/modules/services/web-apps/mastodon.nix | 24 +++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index cc30896c80bd..1b6e1ac583af 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -94,11 +94,14 @@ let ] else [] ) env)))); - mastodonTootctl = pkgs.writeShellScriptBin "mastodon-tootctl" '' + mastodonTootctl = let + sourceExtraEnv = lib.concatMapStrings (p: "source ${p}\n") cfg.extraEnvFiles; + in pkgs.writeShellScriptBin "mastodon-tootctl" '' set -a export RAILS_ROOT="${cfg.package}" source "${envFile}" source /var/lib/mastodon/.secrets_env + ${sourceExtraEnv} sudo=exec if [[ "$USER" != ${cfg.user} ]]; then @@ -427,6 +430,15 @@ in { ''; }; + extraEnvFiles = lib.mkOption { + type = with lib.types; listOf path; + default = []; + description = lib.mdDoc '' + Extra environment files to pass to all mastodon services. Useful for passing down environemntal secrets. + ''; + example = [ "/etc/mastodon/s3config.env" ]; + }; + automaticMigrations = lib.mkOption { type = lib.types.bool; default = true; @@ -579,7 +591,7 @@ in { }; serviceConfig = { Type = "oneshot"; - EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ]; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles; WorkingDirectory = cfg.package; # System Call Filtering SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ])) "@chown" "pipe" "pipe2" ]; @@ -607,7 +619,7 @@ in { ExecStart = "${cfg.package}/run-streaming.sh"; Restart = "always"; RestartSec = 20; - EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ]; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles; WorkingDirectory = cfg.package; # Runtime directory and mode RuntimeDirectory = "mastodon-streaming"; @@ -634,7 +646,7 @@ in { ExecStart = "${cfg.package}/bin/puma -C config/puma.rb"; Restart = "always"; RestartSec = 20; - EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ]; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles; WorkingDirectory = cfg.package; # Runtime directory and mode RuntimeDirectory = "mastodon-web"; @@ -662,7 +674,7 @@ in { ExecStart = "${cfg.package}/bin/sidekiq -c ${toString cfg.sidekiqThreads} -r ${cfg.package}"; Restart = "always"; RestartSec = 20; - EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ]; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles; WorkingDirectory = cfg.package; # System Call Filtering SystemCallFilter = [ ("~" + lib.concatStringsSep " " systemCallsList) "@chown" "pipe" "pipe2" ]; @@ -675,7 +687,7 @@ in { environment = env; serviceConfig = { Type = "oneshot"; - EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ]; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles; } // cfgService; script = let olderThanDays = toString cfg.mediaAutoRemove.olderThanDays; From f44a536cf0ce7497106246492226f9ded4b02c4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 06:15:52 +0000 Subject: [PATCH 164/326] i2pd: 2.44.0 -> 2.45.1 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 353aea94a894..041fe636bd96 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.44.0"; + version = "2.45.1"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-9LnT0613z2I9bA0FhcTgINBnXG17ulz6flA13B1Vijs="; + sha256 = "sha256-gyHnLoELjL/IQbtgH2W25xw30l+9akH7jgQfjp4y5sg="; }; buildInputs = [ boost zlib openssl ] From 6984331709ceaf9f3fbe1c40fb59849feff8f586 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 06:54:19 +0000 Subject: [PATCH 165/326] dragonfly-reverb: 3.2.7 -> 3.2.8 --- pkgs/applications/audio/dragonfly-reverb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index 731578d04e46..151f03797cc8 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dragonfly-reverb"; - version = "3.2.7"; + version = "3.2.8"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "sha256-DJ6J5PuRFDin6PtkNYjIRI1gEVQkKmnZLhnj7L4JtPM="; + sha256 = "sha256-Jz0t9IO3H+guL4NiETCBHSb4rxFTxZRHw2v20yS/wlk="; fetchSubmodules = true; }; From e556438e1cf5ec260258c955ed4472afb388d08d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 07:01:57 +0000 Subject: [PATCH 166/326] driftctl: 0.38.1 -> 0.38.2 --- pkgs/applications/networking/cluster/driftctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix index 0c9d90cd8aac..c90c93f20624 100644 --- a/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "driftctl"; - version = "0.38.1"; + version = "0.38.2"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-etH/92Nhl5ZkmBeDtgFN0pLUOzgWhd3lClW4+zXYPr4="; + sha256 = "sha256-PPzoZypTP3yrgU50Uv7yBNCc2nAa84quCTWjxyq9h/c="; }; - vendorSha256 = "sha256-tvl0VlMUD7rVlB/OjyptYyllx6brX+ycGTp4In9yEvE="; + vendorHash = "sha256-XVEXWBVqYoAlK4DP0GdWqJDcLy9WxCaUdNbVESJ9zoM="; nativeBuildInputs = [ installShellFiles ]; From a7f6a9293a2d0ad475ae14b5c598c87dd9bb47a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 09:07:04 +0000 Subject: [PATCH 167/326] minissdpd: 1.5.20180223 -> 1.6.0 --- pkgs/tools/networking/minissdpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index 869abe92e5c2..9b24f4fc6bf4 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "minissdpd"; - version = "1.5.20180223"; + version = "1.6.0"; src = fetchurl { - sha256 = "1c47h1zil04jnbxiaaci2rm8jij47zp5156v48hb6m87nh4l5adv"; + sha256 = "sha256-9MLepqRy4KXMncotxMH8NrpVOOrPjXk4JSkyUXJVRr0="; url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz"; name = "${pname}-${version}.tar.gz"; }; From ed8834484642abebfcbfdb5e28458644c206679a Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 15 Jan 2023 14:16:37 +0100 Subject: [PATCH 168/326] libtar: apply patches for CVE-2021-33640, CVE-2021-33643, CVE-2021-33644, CVE-2021-33645 and CVE-2021-33646 https://nvd.nist.gov/vuln/detail/CVE-2021-33640 https://nvd.nist.gov/vuln/detail/CVE-2021-33643 https://nvd.nist.gov/vuln/detail/CVE-2021-33644 https://nvd.nist.gov/vuln/detail/CVE-2021-33645 https://nvd.nist.gov/vuln/detail/CVE-2021-33646 One of the existing patch that was pulled from Debian has been replaced by the Fedora version to be able to apply the CVE-2021-33645/CVE-2021-33646/CVE-2021-33640 patch without changes. --- pkgs/development/libraries/libtar/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index 3e5b4cd23e9d..c6c89ecb4f08 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -18,10 +18,24 @@ stdenv.mkDerivation rec { inherit sha256; }; in [ - (fp "no_static_buffers" "0yv90bhvqjj0v650gzn8fbzhdhzx5z0r1lh5h9nv39wnww435bd0") + (fetchpatch { + name = "no_static_buffers.patch"; + url = "https://src.fedoraproject.org/rpms/libtar/raw/e25b692fc7ceaa387dafb865b472510754f51bd2/f/libtar-1.2.20-no-static-buffer.patch"; + sha256 = "sha256-QcWOgdkNlALb+YDVneT1zCNAMf4d8IUm2kUUUy2VvJs="; + }) (fp "no_maxpathlen" "11riv231wpbdb1cm4nbdwdsik97wny5sxcwdgknqbp61ibk572b7") (fp "CVE-2013-4420" "0d010190bqgr2ggy02qwxvjaymy9a22jmyfwdfh4086v876cbxpq") (fp "th_get_size-unsigned-int" "1ravbs5yrfac98mnkrzciw9hd2fxq4dc07xl3wx8y2pv1bzkwm41") + (fetchpatch { + name = "CVE-2021-33643_CVE-2021-33644.patch"; + url = "https://src.fedoraproject.org/rpms/libtar/raw/e25b692fc7ceaa387dafb865b472510754f51bd2/f/libtar-1.2.20-CVE-2021-33643-CVE-2021-33644.patch"; + sha256 = "sha256-HdjotTvKJNntkdcV+kR08Ht/MyNeB6qUT0qo67BBOVA="; + }) + (fetchpatch { + name = "CVE-2021-33645_CVE-2021-33646_CVE-2021-33640.patch"; + url = "https://src.fedoraproject.org/rpms/libtar/raw/e25b692fc7ceaa387dafb865b472510754f51bd2/f/libtar-1.2.20-CVE-2021-33645-CVE-2021-33646.patch"; + sha256 = "sha256-p9DEFAL5Y+Ldy5c9Wj9h/BSg4TDxIxCjCQJD+wGQ7oI="; + }) ]; nativeBuildInputs = [ autoreconfHook ]; From c68f4747c48cfb8239b44732d7afaaf4b197296b Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Wed, 21 Dec 2022 16:01:37 -0800 Subject: [PATCH 169/326] pulumi-bin: 3.49.0 -> 3.51.1 Signed-off-by: Lionello Lunesu --- pkgs/tools/admin/pulumi-bin/data.nix | 210 +++++++++++++------------- pkgs/tools/admin/pulumi-bin/update.sh | 6 +- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index b492c8901aac..bba35702afb4 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,20 +1,20 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.49.0"; + version = "3.51.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.49.0-linux-x64.tar.gz"; - sha256 = "1wz24hhxjhyl0gsv166k0661gckc4xzpgxns99vsd2hgrj0ccsnr"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.51.1-linux-x64.tar.gz"; + sha256 = "1cm45ka0js5q06sj4h2848232pydy3fjibg97aq4cj7av0l9vrxq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-amd64.tar.gz"; sha256 = "0g3s60yscxrwzbq40zii0mnh2z9yggz0wc2kg9yrfzybrmsmx8z3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-linux-amd64.tar.gz"; - sha256 = "0yprg3mgb7zik6s2hhh1jj7kyic9ihipr698vspgdjxa3ya4nvij"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.0.0-linux-amd64.tar.gz"; + sha256 = "1vdl1jipyq004ldqwa12bjvijy3dchp1c5i89fdgrrgb0bv9yshp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-linux-amd64.tar.gz"; @@ -25,36 +25,36 @@ sha256 = "15qs31vpip7dbzmhaa2rh6439qdd9b88dblkilwr3rypwiwdsdvy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-linux-amd64.tar.gz"; - sha256 = "1rp0kdsrljlyzp58zrzvs8ifygrlz3qz6wqi1cxmf482gn1ck3xg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-linux-amd64.tar.gz"; + sha256 = "01zjsw7f9r2andc6am09qhs2gy9189i3bvkdyxmv6bkh7907z8pg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.23.0-linux-amd64.tar.gz"; - sha256 = "05w5ryi3wsqnnsswpjd2x0dsfaqcd7wx32q67p8p8gh49r3xayhb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.27.0-linux-amd64.tar.gz"; + sha256 = "1zf30vvq83r6yyfnh2n3vpp2mbc12c4r7kcff0xl1xlhswggkshc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.27.0-linux-amd64.tar.gz"; - sha256 = "1n7i5y7baxb7wlr16z664ykd9v3rjm0c0ds5fa8zjqg198hi5lkm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.30.0-linux-amd64.tar.gz"; + sha256 = "00gz6y7af600h6q317wnvkajfw1b2l841s6hlyx6fcdsk005jlq6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.32.0-linux-amd64.tar.gz"; - sha256 = "1fah3b9xp14qmwywnd08j1hmpcqjnyhzv9qwvsn5pxgdl9k6kk5c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.33.0-linux-amd64.tar.gz"; + sha256 = "1zk1i090bp23xihv4v3y9nz0k54jijf6450ld115kky1cgnbvy4a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-amd64.tar.gz"; sha256 = "12sxvvjzf9761cag1kah7sdvjg98mi05jrfy0g06xf7lghlyxpcr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.13.0-linux-amd64.tar.gz"; - sha256 = "10ssqnd4njspvj9s8450hiiya9p6pkxpvhlzk6fws1mc3x6w8hdv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-linux-amd64.tar.gz"; + sha256 = "0rx4324vibzklg5gldphfdkc42fafshqkw9ifxr5qf0yxlfffj62"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-linux-amd64.tar.gz"; sha256 = "1nk8aprac0bcw5lx75plwg07hlx1jmbbscima0j5g36gkw6lhln2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.12.0-linux-amd64.tar.gz"; - sha256 = "0nzk6qw2wmab39441sx1fs0ywhy41c118i9sbvqr1rn7rgd1p956"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.13.0-linux-amd64.tar.gz"; + sha256 = "03vgim1pvmvxr7218i4diyfzwgywxc6sqk561ql1msnz1cz1pv51"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-linux-amd64.tar.gz"; @@ -73,12 +73,12 @@ sha256 = "1w8sclkkzaj88kzx3g4lxg490v5hawv68j6y7a10a11v69qjv6lb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.45.0-linux-amd64.tar.gz"; - sha256 = "1p9jkanm30wvqhy19dl4qm89xyldks2a8dvxpbpm1nqn1ilppicy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.46.0-linux-amd64.tar.gz"; + sha256 = "14x5wjfkjc86j2v63k0n7cl28s7bbsia6rx3xsh65alphr1lazhr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.1.0-linux-amd64.tar.gz"; - sha256 = "02qlpxndk8p5slpvn2cq7mkj8k8w5zwn5n66cbnb6rh5c43jcwx5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.2.0-linux-amd64.tar.gz"; + sha256 = "00h2gs0xcq74jgi18bv2ypqiy7ifxjfkfbdgncycknvg95lifmqa"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-linux-amd64.tar.gz"; @@ -89,12 +89,12 @@ sha256 = "1mm6b8pik79axixyca6vi1vcmwcwpksli3pf26a7q3cxn7qlillb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-linux-amd64.tar.gz"; - sha256 = "09i6lh9wfsfpa5jkj2nb80f3gvmpg3m3flfgfcc794khlrikqmib"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-linux-amd64.tar.gz"; + sha256 = "113yrv1yr0lzwslayhzhsyrrfk3vrddicbbbd0fs56pgks2r66ik"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.0-linux-amd64.tar.gz"; - sha256 = "04akrli4cg21w3rhsj7vsgjhn5saal0ikk5jbdw58d4bc28vicji"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-linux-amd64.tar.gz"; + sha256 = "1xx1i59c08p2vkclq5z5brlzp6hyk7qyi09xvx49159gqidzxlv7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-amd64.tar.gz"; @@ -121,8 +121,8 @@ sha256 = "0vxspn9rjb928ax4755086kil6j3616ga5zn3d6xrwm9cvmal0kb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-linux-amd64.tar.gz"; - sha256 = "1i43wmldn3q0jshfa07rldbn7rhyg5r536dzwnfmp47dvk6jhzyl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-linux-amd64.tar.gz"; + sha256 = "1nxa130a46icjqd7vr466klg445xl3611185vn7s4h7vcm2h30s9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-amd64.tar.gz"; @@ -163,16 +163,16 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.49.0-darwin-x64.tar.gz"; - sha256 = "1sp4q9n2kfiw3sj30k6kcya6jvj52bjim6dy0bz7z23ibrn50psm"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.51.1-darwin-x64.tar.gz"; + sha256 = "1kabmpwzqaiss5va97vdq1lnshz9pywpiipni8jcg289az8bld6y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-amd64.tar.gz"; sha256 = "0f62xfma1d299625ydj3f95anz47l41dyasq9vpvsi1cqii6h4a1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-darwin-amd64.tar.gz"; - sha256 = "08d4d4rnqdx2c18ji6lm5bflskxfh7r918hickpyg3bvswgmg7kg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.0.0-darwin-amd64.tar.gz"; + sha256 = "0jhirs5ric5jgnncf152l2f1q80kdqw9asr1xj3h7iybjlxa5gk8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-darwin-amd64.tar.gz"; @@ -183,36 +183,36 @@ sha256 = "1iw5xzgyfjr6j9dmhvmbnfhw8q4x94af5jb3jzzhbfjnsrbricwb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-darwin-amd64.tar.gz"; - sha256 = "1ss0si046ikx60l94121vfd80h2axcbddiak3pnwq3cikabyw8r7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-darwin-amd64.tar.gz"; + sha256 = "0ypm2xknhz09cmzj57d5r8axn4jscb8r8z9sqx88y3fsh14s3j6d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.23.0-darwin-amd64.tar.gz"; - sha256 = "16vkcr4iilv4lz0sz9hsj9s6yp7lvkaivx8890xs3ckkhqpi778f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.27.0-darwin-amd64.tar.gz"; + sha256 = "0zgp9cmz1haih3p8z3nd62nsh09vd4n4dfcvzb7rw7kbzz6z31h8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.27.0-darwin-amd64.tar.gz"; - sha256 = "002f5gbjrmhkrvj73r7fv3ccfflfry143mp9rcf9rwhmsfgz5r2f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.30.0-darwin-amd64.tar.gz"; + sha256 = "0dp69dqmn7qyc6ib9gajlrjh6dq302i9pf9nw1wmsbpf46ycksyg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.32.0-darwin-amd64.tar.gz"; - sha256 = "0rymhyr4a16s0xsw07g45mslfsq2l1rav27vlp8b4k1kshja2g13"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.33.0-darwin-amd64.tar.gz"; + sha256 = "0nk8mhj5lbkdkczfj0d0pxxxamigjvj7777lrs9f7i9v4b0ywiri"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-amd64.tar.gz"; sha256 = "026i7hxa80b7mipw792anv1wplmz2w23irfy26bsh77an36hk46y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.13.0-darwin-amd64.tar.gz"; - sha256 = "1nhgf3qwvhxl2akl3y7spwirb34cbch7fvz5rjbb0f8680r59sd3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-darwin-amd64.tar.gz"; + sha256 = "0kn3hzaycks3w2b1sbc0yzw4xis3gh6pgzmarc8zmdnlnlhzw7my"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-darwin-amd64.tar.gz"; sha256 = "0jh6v9skyxf4ljiqc5070c1r8gkgaic6wy7w7264c1xfrnwsy31g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.12.0-darwin-amd64.tar.gz"; - sha256 = "107dk7vn5i61pwf57538ih5liqb3w22q34rs2rrvw41gifyk83wg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.13.0-darwin-amd64.tar.gz"; + sha256 = "0lqhnyvbgllrjmpwfgwsvjf1942vr2g4lrcdag29xfg9s5xqk224"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-darwin-amd64.tar.gz"; @@ -231,12 +231,12 @@ sha256 = "015wqmygcagx3abwwisf5iyi6xaakw2wxs2nc4clis9q0g6dnw3y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.45.0-darwin-amd64.tar.gz"; - sha256 = "0jdjfzc5abl01z8n07vcb3vk82x87rhpmkrk9ra7i57p8f5rhyfr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.46.0-darwin-amd64.tar.gz"; + sha256 = "1jykny20wxgvcry2dh6cfbbzf3bhpf855xv9s0z5dpv74kxm51q6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.1.0-darwin-amd64.tar.gz"; - sha256 = "03a3lbmr737aql53wjavbh474g4cwxil6dvs47d71akp9mbn38f6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.2.0-darwin-amd64.tar.gz"; + sha256 = "0np6bcjiz6z0qbim22qsq0xr409779c5vb5i8yqkp2znvh79744h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-darwin-amd64.tar.gz"; @@ -247,12 +247,12 @@ sha256 = "1cbvk8xxsgg0hzw1kc6f0mn77ws3aw1zrvmx67mgjjab2ljz6aks"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-darwin-amd64.tar.gz"; - sha256 = "1jp9cfw8jj1wms73b5d1xhkmnylly061fxilxzvnpd49glam7da6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-darwin-amd64.tar.gz"; + sha256 = "069hl04cwjvd9hy6sm2wv225r1fmmf7z04p8qiy6kmck588c19lx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.0-darwin-amd64.tar.gz"; - sha256 = "08a135hg0xkfcx9dvfgxxyl2gp87aybq3np53ni85rwbja297zqn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-darwin-amd64.tar.gz"; + sha256 = "1sgfc3f5h82zlqbgl29p9jffr125yypfh6hjfnpqjpy25mlxcpz8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-amd64.tar.gz"; @@ -279,8 +279,8 @@ sha256 = "0086l2ch5wdhdilwipln9clq09lnj2njgpp2wn8mxvd69xjccsz0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-darwin-amd64.tar.gz"; - sha256 = "1a7mq8qw17g4f6zfgdnym77q7j8dc1iigxcwmnz46d07mjq34d0h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-darwin-amd64.tar.gz"; + sha256 = "0is852yq285vs2n79qdq20jn9y0f981a622gfq8c0l7hkjqc97dz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-amd64.tar.gz"; @@ -321,16 +321,16 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.49.0-linux-arm64.tar.gz"; - sha256 = "1jrn74dp61kv4dppf0aav4fwjc9nzyhn8xss1z5l6xklls4sm7gv"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.51.1-linux-arm64.tar.gz"; + sha256 = "1blk2aghrpqwxh8hy2k476n4arg7xrp043kivc18yxrrzs6347hq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-arm64.tar.gz"; sha256 = "10gmwqfhvz1yp0ld69w01fmjnfw907pa0pmzjndm3p9fwqjrr2nd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-linux-arm64.tar.gz"; - sha256 = "014rlaw7acyz2rsmnv2mq9as6z9c9aa4s03qbfkk95sqyf6xvlqc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.0.0-linux-arm64.tar.gz"; + sha256 = "1bfl5yps753zz6z3w02ykyhb8fpwrlkga7jlwk9g0grh7zmimc1q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-linux-arm64.tar.gz"; @@ -341,36 +341,36 @@ sha256 = "1yqqnc03hv79l1px8qxppwf8n3shdcd8jd46q1xm9f9fm7bkxd9i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-linux-arm64.tar.gz"; - sha256 = "1r8rq9m2rayylspz38x8wqj7d9nlks3ynr5ifdiqf10a5xchcw96"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-linux-arm64.tar.gz"; + sha256 = "0m773l7289rqpkyzmfbdsg4v6m531p8mp4mjhr6px5amii7875qz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.23.0-linux-arm64.tar.gz"; - sha256 = "105dz76dx9zscmhsb02iykj98lrbjavlkl65a6885crjvr48dwg5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.27.0-linux-arm64.tar.gz"; + sha256 = "0sbw6qk2a5gncwdsg3647l0kjcykh5j4l7wk6hdviycgy5r0gjhz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.27.0-linux-arm64.tar.gz"; - sha256 = "0jjvmsaa3g6mf905d6sv3rgl78vylvpmbb9pzx1ymyainx8pd1df"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.30.0-linux-arm64.tar.gz"; + sha256 = "1dxg730fn59h0vj3pblc068d55p04f6hhsmkwrgh06br8mp2xv45"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.32.0-linux-arm64.tar.gz"; - sha256 = "1fyhmcmnzbghhj8q0p4zsfqh69g9arfwgipakq5qrcmcpw9kij6f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.33.0-linux-arm64.tar.gz"; + sha256 = "1b3c1z5kgk9jdz57l5wn317ia2fz9mxyai4anzfik13b0dpkngl4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-arm64.tar.gz"; sha256 = "1bxrh89hkw9b0g20d4apwhswl1dxb4v4nn5rkkkjd91ykin5idp2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.13.0-linux-arm64.tar.gz"; - sha256 = "0fzgwyqn55n4x6v36dzjvkw4xj4z27vpzm70bfnc5b0arq67hddl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-linux-arm64.tar.gz"; + sha256 = "1rvpvdf7mcxqc0srp2dkca1nmwnbjvzmpfg6lbg0yxpk6ajxmjll"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-linux-arm64.tar.gz"; sha256 = "1hd08gd2v3wl81amvcf821vzmmh7agw8cspnl6fqc7g69agn1l12"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.12.0-linux-arm64.tar.gz"; - sha256 = "09igkbcxpvblbcwcg1p35z6n5nnrlwmk1q9b0xmikrh5sagayrxy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.13.0-linux-arm64.tar.gz"; + sha256 = "0liagz2nd3qx686rnqysfb28bd42qp3d7qmgnq364676q9qqqkak"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-linux-arm64.tar.gz"; @@ -389,12 +389,12 @@ sha256 = "1j4qp9pf9iy7hzq5pvj2ysk149s5012bi03il2qz3qcz2ga983p7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.45.0-linux-arm64.tar.gz"; - sha256 = "1vrr17vc0n0f60w898c9s77car0yq39srhh0xb23lpi2v37ina8m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.46.0-linux-arm64.tar.gz"; + sha256 = "0ppb9qwjwz3s4ysidpyakvadrbpzqgpljbcvpgfd4xgqkgmrm88j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.1.0-linux-arm64.tar.gz"; - sha256 = "1zpqpja1264w5gvr20g15vccdv44rc8mcair0w78gx32anxnxwfy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.2.0-linux-arm64.tar.gz"; + sha256 = "0qj7akqm6gdis29nmiq2cbmiyqp97fbwv6wh63y2c6nwyi2qmxv4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-linux-arm64.tar.gz"; @@ -405,12 +405,12 @@ sha256 = "16q5kspbl882sa115lfcb8h8sx1i6lhm14xyzsfkmhznqny3lbv8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-linux-arm64.tar.gz"; - sha256 = "0gis39k5kgdxl0i4afy78hkcmwpzm1shh4x713p7dg6h8w0afdmi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-linux-arm64.tar.gz"; + sha256 = "0b8zaqcmlbdl5p38xjk0j7pgd6cy5mf1wc25g6rxflbikx9k43v9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.0-linux-arm64.tar.gz"; - sha256 = "1w43js5nxzwah046y54a1h72cqz6n701sns8zppssgzidr2cqvjv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-linux-arm64.tar.gz"; + sha256 = "1cv9y65n4fh3308r2y61n7k6h5531kk9a14qfbix1dmiv9zkg2jc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-arm64.tar.gz"; @@ -437,8 +437,8 @@ sha256 = "1djc9ar4x6rmi49grl4nxhycc2fbfvk9h1g2xnzl67adxh2cbgj9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-linux-arm64.tar.gz"; - sha256 = "0rwvp6v00iybqlnf52n3a1afvpvr3vvvsxql9jsv4n2wxn4w1bhb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-linux-arm64.tar.gz"; + sha256 = "0r7zm66p47f0b0f3x219s36mvinwij8jyjqi5jafbvzbrmwfrnmk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-arm64.tar.gz"; @@ -479,16 +479,16 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.49.0-darwin-arm64.tar.gz"; - sha256 = "0ykpgk3ngczzyv8vnwya937p51q463xm0pr69vdannc8jpn7w7ds"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.51.1-darwin-arm64.tar.gz"; + sha256 = "1mfvrdnyygakcyhc03jbgip4vgdj709w9zphz75r2dahz5mn4mjp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-arm64.tar.gz"; sha256 = "1v6dwsjbqmg9qnlhf5jl98r5c171xnsp3fnyfkg2h8874scg2gpp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-darwin-arm64.tar.gz"; - sha256 = "19l5b3grxf0ckxpmjn7x8158bkzv8329adj7m4gi09d9sx6wwsxw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.0.0-darwin-arm64.tar.gz"; + sha256 = "069gdbxd82wps9fl7684g7fcd8yk93v2mfjkslyv5x3fkf4xn377"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-darwin-arm64.tar.gz"; @@ -499,36 +499,36 @@ sha256 = "0g882459cqbxcl9ml7mdc4s4xx6kg7srk56n0x7ypj3k0j7hjbd0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-darwin-arm64.tar.gz"; - sha256 = "0dvcbni3s6gpcizgdilsjnks7z3srvdmzqlcdd61dzv0j5jkfshp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-darwin-arm64.tar.gz"; + sha256 = "02v0p3ksv0rlz1fk216fr1q3smnxw3fvzpbd9bichsmp8hids4gq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.23.0-darwin-arm64.tar.gz"; - sha256 = "096hmgpfx5hq8m4b7m3zxym2szvrdyhy041wqg6v5rzhhm23ra6n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.27.0-darwin-arm64.tar.gz"; + sha256 = "15bxhlc36lzdrgrr7f3xzc3x4pf2pyf6gdghckgk5s045b14kw6i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.27.0-darwin-arm64.tar.gz"; - sha256 = "015s2sskdgifx22p66zzga3qzsqvh87anfb9429akm4h8wflz3rn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.30.0-darwin-arm64.tar.gz"; + sha256 = "1808vgyc5inrngfwj0l8szngcg6vw9k5fhhqlhiwqf1skwikln4j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.32.0-darwin-arm64.tar.gz"; - sha256 = "1zagcsbn1blja0g8yk5bp7l20dhrpg8f84q2xck1py7yi0dgb8si"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.33.0-darwin-arm64.tar.gz"; + sha256 = "0v4vjzg79316mqv40b5010adihg57gcjrvkbafmdw7g0qanbks2v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-arm64.tar.gz"; sha256 = "030fyfj5yd4p0f7ffwdsqvkjwxihz96vgy2qqibhyyv3p6ymdpym"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.13.0-darwin-arm64.tar.gz"; - sha256 = "0qy88ngn3z716r2rjramgj11fggh86zcpcx0cfldmwjn2hkyhqab"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-darwin-arm64.tar.gz"; + sha256 = "1z12mpwsls2h8662wnvg4npnqmh643cwa57z24n6y1i0wlzimq58"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-darwin-arm64.tar.gz"; sha256 = "1ss8dak6lk03s391914wxs1y20h4k0khqab7k15lajvl6jm13809"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.12.0-darwin-arm64.tar.gz"; - sha256 = "12c617m97ba2l9v2vz0li4w0gh3gcjspkhxh4zg2wpiiiyxghr3j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.13.0-darwin-arm64.tar.gz"; + sha256 = "10ygprngyfxvh96b14605hphanx2ja62l6lpqllwj88jdx1ds1nz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-darwin-arm64.tar.gz"; @@ -547,12 +547,12 @@ sha256 = "0vdrj3w6w9qw823fwr1i8j3gqirknvx5yiinp8sglsx9xb6p9q5i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.45.0-darwin-arm64.tar.gz"; - sha256 = "17r1fprf7gbymmwyw2vqalj6x34iqhqx0jvrcm5g93qwgcimhi5g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.46.0-darwin-arm64.tar.gz"; + sha256 = "1c06qf38mwli099rv1jhi0wgfq35g2byd3dcq7s8m0plfvvjciip"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.1.0-darwin-arm64.tar.gz"; - sha256 = "06y4ciy227kfck89av48dbnhd4mfac9gycgiqxn7nfsq8klabf2d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.2.0-darwin-arm64.tar.gz"; + sha256 = "1i2rfi2qwpm2bk1qrdvjymk1dpw9469vqw0ja441i863cvd7ipx3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-darwin-arm64.tar.gz"; @@ -563,12 +563,12 @@ sha256 = "1m1w4qds6jbmpw4xwy87bgf8d4nzv8kj29mdnfqbf3hssvzk2zc6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-darwin-arm64.tar.gz"; - sha256 = "1679zpv2r3i2acjmx2a6i7dc47p73gf3jw1k1aclasd5cyjf46jf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-darwin-arm64.tar.gz"; + sha256 = "09ri5bp9hvq9db1hpgjxjzd9i2fkmr7fry2fdjx6gv1j2djcvryq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.0-darwin-arm64.tar.gz"; - sha256 = "1m2p7xhfw8lxmdc9s16bq501ssyw7gyxmci1ci4grnk11id5a2x2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-darwin-arm64.tar.gz"; + sha256 = "1a38gi1y1vwvgxhid070hsl7la8wnwxzs8473hm1w12lq9kymh0p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-arm64.tar.gz"; @@ -595,8 +595,8 @@ sha256 = "1j6c83xvcanyzp1q8zwa952dplvvi0f4psfdscpplbsgzmq5v54n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-darwin-arm64.tar.gz"; - sha256 = "07kj6rz7dh08n74zfjprjnzjcrizcmy8rfbnvfi9qkavh0mgcxvv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-darwin-arm64.tar.gz"; + sha256 = "1vzyn88xw94b2kgd0gmvsjz1k7bjvmf9gyynnn2xsmzzs6jmhl1d"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi-bin/update.sh b/pkgs/tools/admin/pulumi-bin/update.sh index 4fdf3d97d35f..fb583e5ad18e 100755 --- a/pkgs/tools/admin/pulumi-bin/update.sh +++ b/pkgs/tools/admin/pulumi-bin/update.sh @@ -3,8 +3,8 @@ # shellcheck shell=bash # Bash 3 compatible for Darwin -if [ -z "${GITHUB_TOKEN}" ]; then - echo >&2 "usage: GITHUB_TOKEN=… ./update.sh" +if [ -z "${GITHUB_TOKEN}" ] || [ $# -ne 1 ]; then + echo >&2 "usage: GITHUB_TOKEN=… ./update.sh pulumi-version" exit 1 fi @@ -12,7 +12,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.49.0" +VERSION=$1 # An array of plugin names. The respective repository inside Pulumi's # Github organization is called pulumi-$name by convention. From e2f0a97456e925952406ce770b3ad9afbd7744e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jan 2023 18:55:12 +0000 Subject: [PATCH 170/326] pmd: 6.49.0 -> 6.53.0 --- pkgs/development/tools/analysis/pmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 4695854dbfad..fdc20a3eefb8 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.49.0"; + version = "6.53.0"; src = fetchurl { url = "https://github.com/pmd/pmd/releases/download/pmd_releases/${version}/pmd-bin-${version}.zip"; - hash = "sha256-dEKfQIdWkx6XAKnEBHaVI0l729Xj2RnjoHl59t0Kal0="; + hash = "sha256-pHEGBIvC4XAuzWZpws7ldRGabfKhAqZnaahqVdNpUJE="; }; nativeBuildInputs = [ unzip makeWrapper ]; From 2ac3bf735a25a585982fbd76b384b6ec41fb3dcd Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 15 Jan 2023 22:36:26 +0300 Subject: [PATCH 171/326] =?UTF-8?q?tdlib:=201.8.8=20=E2=86=92=201.8.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/tdlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index ca0f98acc2e5..575d8f4c4e0c 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.8.8"; + version = "1.8.10"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "bbe37ee594d97f3c7820dd23ebcd9c9b8dac51a0"; - sha256 = "jLJglvq+7f+zCoanDRTFpUsH/M1Qf7PWJ1JjvmZsa24="; + rev = "93c42f6d7c1209937431469f80427d48907f1b8d"; + hash = "sha256-vdaVnC26txUBp8rlqx1CdLHlNlack3XXYdfFal1VLh4="; }; buildInputs = [ gperf openssl readline zlib ]; From 3ccbb8cffac0a64a9d557d77432f092f32a46423 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jan 2023 01:50:21 +0000 Subject: [PATCH 172/326] super-productivity: 7.12.0 -> 7.12.1 --- pkgs/applications/office/super-productivity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index 18091b82afaf..fc1087ab2d93 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-Ms7wt79iZz0xnrp+yrFs/FzVqINe6BSOEmYG9Oiz5JU="; + sha256 = "sha256-zMw6C7kyO8yDLF2vrRlBqcgzcfM4TR7/fJPHPaixw6Y="; name = "${pname}-${version}.AppImage"; }; From f133968d2c080e96dab2d5c1ae206cc95837eb76 Mon Sep 17 00:00:00 2001 From: nviets Date: Sun, 15 Jan 2023 21:46:46 -0600 Subject: [PATCH 173/326] updated MKL to 2023.0.0 --- .../libraries/science/math/mkl/default.nix | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 559d8094b287..9becf229c9ef 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -21,46 +21,47 @@ let # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: # https://github.com/matthewbauer/undmg/issues/4 - mklVersion = if stdenvNoCC.isDarwin then "2019.3" else "2021.1.1"; - rel = if stdenvNoCC.isDarwin then "199" else "52"; + mklVersion = if stdenvNoCC.isDarwin then "2019.3" else "2023.0.0"; + rel = if stdenvNoCC.isDarwin then "199" else "25398"; # Intel openmp uses its own versioning. - openmpVersion = if stdenvNoCC.isDarwin then "19.0.3" else "19.1.3"; - openmpRel = "189"; + openmpVersion = if stdenvNoCC.isDarwin then "19.0.3" else "2023.0.0"; + openmpRel = "25370"; # Thread Building Blocks release. - tbbRel = "119"; + tbbVersion = if stdenvNoCC.isDarwin then "2019.3" else "2021.8.0"; + tbbRel = "25334"; shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary; oneapi-mkl = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; - hash = "sha256-G2Y7iX3UN2YUJhxcMM2KmhONf0ls9owpGlOo8hHOfqA="; + hash = "sha256-fiL5TDmQHB+OQb1ERcoDQFpUutpsPe+AqIbMoa85nEk="; }; oneapi-mkl-common = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; - hash = "sha256-HrMt2OcPIRxM8EL8SPjYTyuHJnC7RhPFUrvLhRH+7vc="; + hash = "sha256-AFayUxybi48SgR2mX6mxkNECconIXm1/TWelvE4aqX0="; }; oneapi-mkl-common-devel = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-devel-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; - hash = "sha256-XDE2WFJzEcpujFmO2AvqQdipZMvKB6/G+ksBe2sE438="; + hash = "sha256-riyIO2xWuvTSzfXgB+K6NSKqWLRmxKSnGZaH5nYTYPk="; }; oneapi-mkl-devel = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-devel-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; - hash = "sha256-GhUJZ0Vr/ZXp10maie29/5ryU7zzX3F++wRCuuFcE0s="; + hash = "sha256-2IK0t47FaPNp7Oq9LJ5ZdLmlFFjQluWrh+nhvi8MCd8="; }; oneapi-openmp = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-openmp-${mklVersion}-${mklVersion}-${openmpRel}.x86_64.rpm"; - hash = "sha256-yP2c4aQAFNRffjLoIZgWXLcNXbiez8smsgu2wXitefU="; + hash = "sha256-grzVFWqt3Vpwb5K3Bur+sJz8pdKxZ4ISJXF5YAPrwmk="; }; oneapi-tbb = fetchurl { - url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${mklVersion}-${mklVersion}-${tbbRel}.x86_64.rpm"; - hash = "sha256-K1BvhGoGVU2Zwy5vg2ZvJWBrSdh5uQwo0znt5039X0A="; + url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${tbbVersion}-${tbbVersion}-${tbbRel}.x86_64.rpm"; + hash = "sha256-8hIoRfV36XVElKCqP9UmCkjLCs3l0ZKCHxg+yxNIHc0="; }; in stdenvNoCC.mkDerivation ({ @@ -128,23 +129,23 @@ in stdenvNoCC.mkDerivation ({ done # License - install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/2021.1.1/licensing/en/license.txt + install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/${mklVersion}/licensing/license.txt # Dynamic libraries mkdir -p $out/lib cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib - cp -a opt/intel/oneapi/compiler/2021.1.1/linux/compiler/lib/intel64_lin/*.so* $out/lib - cp -a opt/intel/oneapi/tbb/2021.1.1/lib/intel64/gcc4.8/*.so* $out/lib + cp -a opt/intel/oneapi/compiler/${mklVersion}/linux/compiler/lib/intel64_lin/*.so* $out/lib + cp -a opt/intel/oneapi/tbb/${tbbVersion}/lib/intel64/gcc4.8/*.so* $out/lib # Headers cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/ '' + (if enableStatic then '' install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.a - install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*.pc + install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/tools/pkgconfig/*.pc '' else '' cp opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib - install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*dynamic*.pc + install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*dynamic*.pc '') + '' # Setup symlinks for blas / lapack ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt} From a2244cd5dde9f0d07e086328c5aacd1e11d24c34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jan 2023 05:31:38 +0000 Subject: [PATCH 174/326] vassal: 3.6.7 -> 3.6.10 --- pkgs/games/vassal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index fd3df36bdb51..d199918218b3 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.7"; + version = "3.6.10"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-WTYMbVtAciscnBzR4uHmVVXpuge53e32uLmUF8/w6I0="; + sha256 = "sha256-YQUKYsuDaCHChiRBQOKr813ptyc4UxZQ5aQFeC6tutU="; }; nativeBuildInputs = [ makeWrapper ]; From 7641901f0acda84cfd1f9c8da03ad8b10edb0640 Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Mon, 16 Jan 2023 11:28:46 +0530 Subject: [PATCH 175/326] xplr: 0.20.1 -> 0.20.2 --- pkgs/applications/misc/xplr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 678b8968aae1..0b1aa7eb9157 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b3TdhziXPytHitilMBkr6OGaI+CBI3w4qcTIkQtOAjs="; + sha256 = "sha256-iPcxDNtwWnvFljZw052aw/ekCahyFBNt/zbUAdaWJA8="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-pdXLuogkz5q4+B/y/alA900OHVGBT8W6BR7I2aH8IaA="; + cargoSha256 = "sha256-Sn7ZcNdmMDQJHn99iTJX9c3uVhaGpRvEgdoJFmIUgeU="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; From d269d79261f605d1f1dbec27dc5929cbc2dd6a14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jan 2023 09:13:32 +0000 Subject: [PATCH 176/326] last: 1411 -> 1422 --- pkgs/applications/science/biology/last/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 0b5b8bb5059d..fe2b773fb0e3 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1411"; + version = "1422"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = version; - sha256 = "sha256-CO3tlFx9NxGplErENG6iFikgE246swPITsVR+nHzsYw="; + sha256 = "sha256-3OhttOd6qgO6d+sbVkZj8i/K6bJTvlMyfa3E4mIpt24="; }; nativeBuildInputs = [ unzip ]; From dde298c12623af9e1b84a0459fb0c2de73cda7dd Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 16 Jan 2023 19:49:16 +0800 Subject: [PATCH 177/326] python37: remove leftover files --- .../python/cpython/docs/3.7-html.nix | 20 ------------------- .../python/cpython/docs/3.7-pdf-a4.nix | 20 ------------------- .../python/cpython/docs/3.7-pdf-letter.nix | 20 ------------------- .../python/cpython/docs/3.7-text.nix | 20 ------------------- 4 files changed, 80 deletions(-) delete mode 100644 pkgs/development/interpreters/python/cpython/docs/3.7-html.nix delete mode 100644 pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix delete mode 100644 pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix delete mode 100644 pkgs/development/interpreters/python/cpython/docs/3.7-text.nix diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix deleted file mode 100644 index 2e399aa52fcd..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - pname = "python37-docs-html"; - version = "3.7.2"; - - src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-html.tar.bz2"; - sha256 = "19wbrawpdam09fmyipfy92sxwn1rl93v8jkfqsfx028qhvzf0422"; - }; - installPhase = '' - mkdir -p $out/share/doc/python37 - cp -R ./ $out/share/doc/python37/html - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix deleted file mode 100644 index 9879a26be525..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - pname = "python37-docs-pdf-a4"; - version = "3.7.2"; - - src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-a4.tar.bz2"; - sha256 = "0vdx762m30hjaabn6w88awcj2qpbz0b6z59zn9wmamd35k59lfba"; - }; - installPhase = '' - mkdir -p $out/share/doc/python37 - cp -R ./ $out/share/doc/python37/pdf-a4 - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix deleted file mode 100644 index 7c58c45776e7..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - pname = "python37-docs-pdf-letter"; - version = "3.7.2"; - - src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-letter.tar.bz2"; - sha256 = "17g57vlyvqx0k916q84q2pcx7y8myw0fda9fvg9kh0ph930c837x"; - }; - installPhase = '' - mkdir -p $out/share/doc/python37 - cp -R ./ $out/share/doc/python37/pdf-letter - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix deleted file mode 100644 index 641e4913f65a..000000000000 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - pname = "python37-docs-text"; - version = "3.7.2"; - - src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-text.tar.bz2"; - sha256 = "0h50rlr8jclwfxa106b42q2vn2ynp219c4zsy5qz65n5m3b7y1g2"; - }; - installPhase = '' - mkdir -p $out/share/doc/python37 - cp -R ./ $out/share/doc/python37/text - ''; - meta = { - maintainers = [ ]; - }; -} From 1d2d6b46833a56119e202f1b2691b677629727df Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 16 Jan 2023 19:53:02 +0800 Subject: [PATCH 178/326] macvim: use python3 instead of python37 --- pkgs/applications/editors/vim/macvim.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index f5b79ecdb01e..8440d1fd6d9c 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -11,7 +11,7 @@ , perl , luajit , darwin -, python37 +, python3 }: let @@ -41,7 +41,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config buildSymlinks ]; buildInputs = [ - gettext ncurses cscope luajit ruby tcl perl python37 + gettext ncurses cscope luajit ruby tcl perl python3 ]; patches = [ ./macvim.patch ]; @@ -61,7 +61,7 @@ stdenv.mkDerivation { "--without-local-dir" "--with-luajit" "--with-lua-prefix=${luajit}" - "--with-python3-command=${python37}/bin/python3" + "--with-python3-command=${python3}/bin/python3" "--with-ruby-command=${ruby}/bin/ruby" "--with-tclsh=${tcl}/bin/tclsh" "--with-tlib=ncurses" @@ -159,7 +159,7 @@ stdenv.mkDerivation { libperl=$(dirname $(find ${perl} -name "libperl.dylib")) install_name_tool -add_rpath ${luajit}/lib $exe install_name_tool -add_rpath ${tcl}/lib $exe - install_name_tool -add_rpath ${python37}/lib $exe + install_name_tool -add_rpath ${python3}/lib $exe install_name_tool -add_rpath $libperl $exe install_name_tool -add_rpath ${ruby}/lib $exe From f9743eebe285fc2ce6df4f2b27209bd0e9aefdeb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jan 2023 14:53:50 +0000 Subject: [PATCH 179/326] pyradio: 0.8.9.32 -> 0.8.9.36 --- pkgs/applications/audio/pyradio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index 8038ef5bf937..2be471650a6e 100644 --- a/pkgs/applications/audio/pyradio/default.nix +++ b/pkgs/applications/audio/pyradio/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.32"; + version = "0.8.9.36"; src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1lczH8xTZV1XVVByLAGXJbjXd20JUJALIJJ3s9+orxM="; + hash = "sha256-xEFjyVly1VyDz9ALtVwxxrEs856joP+pe/mappyKrPU="; }; nativeBuildInputs = [ From 8575ba2ab270f0c13f06fc91b4088cc33537dd0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jan 2023 18:36:45 +0000 Subject: [PATCH 180/326] gensio: 2.5.5 -> 2.6.2 --- pkgs/development/libraries/gensio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 16000833d42c..a11b5674b58a 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.5.5"; + version = "2.6.2"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K2A61OflKdVVzdV8qH5x/ggZKa4i8yvs5bdPoOwmm7A="; + sha256 = "sha256-lpP/pmM06zIw+9EZe+zywExLOcrN3K7IMK32XSrCmYs="; }; passthru = { From 64165b053d977c705aeac3358c7b9bdc761c719b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 16 Jan 2023 19:47:10 +0000 Subject: [PATCH 181/326] python310Packages.atlassian-python-api: 3.32.0 -> 3.32.2 --- .../python-modules/atlassian-python-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index fae7f6567037..0b183bcca7fe 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.32.0"; + version = "3.32.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Jh3JdrA/ahge/tJipeMGag2CUk4uuGzMXC9I7UWha9E="; + sha256 = "sha256-fI+c2JiChDZhZPdoy3PaRtUwgWMRJnZieHcF4OR6nZE="; }; propagatedBuildInputs = [ From 1b89ef3acc73d8698171aac0e253d2d6eeac94b0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 16 Jan 2023 20:51:47 +0100 Subject: [PATCH 182/326] performous: 1.1 -> 1.2.0 --- pkgs/games/performous/default.nix | 37 ++++++-- pkgs/games/performous/performous-cmake.patch | 93 +++----------------- pkgs/games/performous/performous-fftw.patch | 15 ++++ pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 60 insertions(+), 89 deletions(-) create mode 100644 pkgs/games/performous/performous-fftw.patch diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index 10ce4dd06fcd..7a58cc8e6008 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -2,12 +2,16 @@ , stdenv , fetchFromGitHub , SDL2 +, aubio , boost , cmake , ffmpeg , gettext +, git , glew , glibmm +, glm +, icu , libepoxy , librsvg , libxmlxx @@ -18,16 +22,31 @@ stdenv.mkDerivation rec { pname = "performous"; - version = "1.1"; + version = "1.2.0"; src = fetchFromGitHub { - owner = "performous"; - repo = "performous"; - rev = version; - hash = "sha256-neTHfug2RkcH/ZvAMCJv++IhygGU0L5Ls/jQYjLEQCI="; + owner = pname; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-ueTSirov/lj4/IzaMqHitbOqx8qqUpsTghcb9DUnNEg="; }; - patches = [ ./performous-cmake.patch ]; + cedSrc = fetchFromGitHub { + owner = pname; + repo = "compact_enc_det"; + rev = "9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e"; + hash = "sha256-ztfeblR4YnB5+lb+rwOQJjogl+C9vtPH9IVnYO7oxec="; + }; + + patches = [ + ./performous-cmake.patch + ./performous-fftw.patch + ]; + + postPatch = '' + mkdir ced-src + cp -R ${cedSrc}/* ced-src + ''; nativeBuildInputs = [ cmake @@ -37,10 +56,13 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 + aubio boost ffmpeg glew glibmm + glm + icu libepoxy librsvg libxmlxx @@ -49,9 +71,10 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://performous.org/"; description = "Karaoke, band and dancing game"; + homepage = "https://performous.org/"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ wegank ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/performous/performous-cmake.patch b/pkgs/games/performous/performous-cmake.patch index 59d2cc9a927c..5c1a4c91012b 100644 --- a/pkgs/games/performous/performous-cmake.patch +++ b/pkgs/games/performous/performous-cmake.patch @@ -1,86 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 48af2a89..43786c31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 3.6) - project(Performous CXX C) +@@ -75,15 +75,7 @@ else() + message(STATUS "Localization disabled: Gettext tools (msgfmt) missing") + endif() - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") ---- a/cmake/Modules/FindPango.cmake -+++ b/cmake/Modules/FindPango.cmake -@@ -2,31 +2,10 @@ - # Once done, this will define - # - # Pango_FOUND - system has Pango --# Pango_INCLUDE_DIRS - the Pango include directories - # Pango_LIBRARIES - link these to use Pango - - include(LibFindMacros) - --# Dependencies --libfind_package(Pango Freetype) --libfind_package(Pango Glib) --libfind_package(Pango GObject) -- --# Use pkg-config to get hints about paths --libfind_pkg_check_modules(Pango_PKGCONF pango) -- --# Include dir --find_path(Pango_INCLUDE_DIR -- NAMES pango/pango.h -- HINTS ${Pango_PKGCONF_INCLUDE_DIRS} -- PATH_SUFFIXES pango-1.0 +-include(FetchContent) +-FetchContent_Declare(ced-sources +- GIT_REPOSITORY https://github.com/performous/compact_enc_det.git +- #https://github.com/google/compact_enc_det.git +- GIT_TAG master +- SOURCE_DIR ced-src -) - --# Finally the library itself --find_library(Pango_LIBRARY -- NAMES pango-1.0 -- HINTS ${Pango_PKGCONF_LIBRARY_DIRS} --) -- -+libfind_pkg_check_modules(Pango_PKGCONF IMPORTED_TARGET pango) -+set(Pango_LIBRARY PkgConfig::Pango_PKGCONF) - libfind_process(Pango) -- ---- a/cmake/Modules/FindPangoCairo.cmake -+++ b/cmake/Modules/FindPangoCairo.cmake -@@ -1,35 +1,11 @@ - # - Try to find PangoCairo - # Once done, this will define - # --# PangoCairo_FOUND - system has Pango --# PangoCairo_INCLUDE_DIRS - the Pango include directories --# PangoCairo_LIBRARIES - link these to use Pango -+# PangoCairo_FOUND - system has PangoCairo -+# PangoCairo_LIBRARIES - link these to use PangoCairo +-FetchContent_MakeAvailable(ced-sources) ++add_subdirectory(ced-src) - include(LibFindMacros) + option(USE_SELF_BUILT_AUBIO "Use custom aubio local build instead of using system lib (if available)" FALSE) --# Dependencies --libfind_package(PangoCairo Pango) --libfind_package(PangoCairo Cairo) -- --# Use pkg-config to get hints about paths --libfind_pkg_check_modules(PangoCairo_PKGCONF pangocairo) -- --# Include dir --find_path(PangoCairo_INCLUDE_DIR -- NAMES pango/pangocairo.h -- HINTS ${PangoCairo_PKGCONF_INCLUDE_DIRS} -- PATH_SUFFIXES pango-1.0 --) -- --# Finally the library itself --find_library(PangoCairo_LIBRARY -- NAMES pangocairo-1.0 -- HINTS ${PangoCairo_PKGCONF_LIBRARY_DIRS} --) -- --# Set the include dir variables and the libraries and let libfind_process do the rest. --# NOTE: Singular variables for this library, plural for libraries this this lib depends on. --set(PangoCairo_PROCESS_INCLUDES PangoCairo_INCLUDE_DIR Pango_INCLUDE_DIR Cairo_INCLUDE_DIR) --set(PangoCairo_PROCESS_LIBS PangoCairo_LIBRARY Pango_LIBRARY Cairo_LIBRARY) -+libfind_pkg_check_modules(PangoCairo_PKGCONF IMPORTED_TARGET pangocairo) -+set(PangoCairo_LIBRARY PkgConfig::PangoCairo_PKGCONF) - libfind_process(PangoCairo) -- diff --git a/pkgs/games/performous/performous-fftw.patch b/pkgs/games/performous/performous-fftw.patch new file mode 100644 index 000000000000..f24808ae80d0 --- /dev/null +++ b/pkgs/games/performous/performous-fftw.patch @@ -0,0 +1,15 @@ +diff --git a/game/audio.cc b/game/audio.cc +index da810488..d7f3d072 100644 +--- a/game/audio.cc ++++ b/game/audio.cc +@@ -121,8 +121,8 @@ Music::Music(Audio::Files const& files, unsigned int sr, bool preview): srate(sr + suppressCenterChannel = config["audio/suppress_center_channel"].b(); + } + +-unsigned Audio::aubio_win_size = 1536; +-unsigned Audio::aubio_hop_size = 768; ++unsigned Audio::aubio_win_size = 2048; ++unsigned Audio::aubio_hop_size = 1024; + + std::unique_ptr Audio::aubioTempo = + std::unique_ptr( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9d714468bff..e9487bd0174d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35056,9 +35056,7 @@ with pkgs; pentobi = libsForQt5.callPackage ../games/pentobi { }; - performous = callPackage ../games/performous { - boost = boost166; - }; + performous = callPackage ../games/performous { }; pinball = callPackage ../games/pinball { }; From eb290d87d3bc06f763b4455341606509b7b845eb Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 9 Dec 2022 15:41:41 -0800 Subject: [PATCH 183/326] gradle_4: remove --- pkgs/development/tools/build-managers/gradle/default.nix | 7 ------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 7e34249f2075..a023a8ef2861 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -148,11 +148,4 @@ rec { sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z"; defaultJava = jdk11; }; - - gradle_4 = gen { - version = "4.10.3"; - nativeVersion = "0.14"; - sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6"; - defaultJava = jdk8; - }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 26425485f648..086b24eb1eb4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -584,6 +584,7 @@ mapAliases ({ graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15 graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15 gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03 + gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 grafana-mimir = throw "'grafana-mimir' has been renamed to/replaced by 'mimir'"; # Added 2022-06-07 gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5f68fb7faf1..9119d8e9d24c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17625,7 +17625,6 @@ with pkgs; inherit jdk8 jdk11 jdk17; }; gradleGen = gradle-packages.gen; - gradle_4 = callPackage gradle-packages.gradle_4 { }; gradle_5 = callPackage gradle-packages.gradle_5 { }; gradle_6 = callPackage gradle-packages.gradle_6 { }; gradle_7 = callPackage gradle-packages.gradle_7 { }; From ce3a7f8d88d30f8047696326e5a3c58c9d187e8f Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 17 Jan 2023 11:56:31 -0800 Subject: [PATCH 184/326] gradle_5: remove --- pkgs/development/tools/build-managers/gradle/default.nix | 9 --------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index a023a8ef2861..d8a797dc9189 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -139,13 +139,4 @@ rec { sha256 = "0p83zgszmrwa26a4q8nvzva2af5lfzy6xvcs57y9588smsw51wyw"; defaultJava = jdk11; }; - - # NOTE: No GitHub Release for the following versions. `update.sh` will not work. - - gradle_5 = gen { - version = "5.6.4"; - nativeVersion = "0.18"; - sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z"; - defaultJava = jdk11; - }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 086b24eb1eb4..8aaa0fcc32cc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -585,6 +585,7 @@ mapAliases ({ graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15 gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03 gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 + gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 grafana-mimir = throw "'grafana-mimir' has been renamed to/replaced by 'mimir'"; # Added 2022-06-07 gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9119d8e9d24c..1598373545bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17625,7 +17625,6 @@ with pkgs; inherit jdk8 jdk11 jdk17; }; gradleGen = gradle-packages.gen; - gradle_5 = callPackage gradle-packages.gradle_5 { }; gradle_6 = callPackage gradle-packages.gradle_6 { }; gradle_7 = callPackage gradle-packages.gradle_7 { }; gradle = gradle_7; From cd5e3e324afe790aa75fdc53ca2515bbc3a7a7dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 03:52:55 +0000 Subject: [PATCH 185/326] vault-medusa: 0.3.6 -> 0.4.1 --- pkgs/tools/security/vault-medusa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault-medusa/default.nix b/pkgs/tools/security/vault-medusa/default.nix index 84367b04abe1..9cd6bd1fd46e 100644 --- a/pkgs/tools/security/vault-medusa/default.nix +++ b/pkgs/tools/security/vault-medusa/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vault-medusa"; - version = "0.3.6"; + version = "0.4.1"; src = fetchFromGitHub { owner = "jonasvinther"; repo = "medusa"; rev = "v${version}"; - sha256 = "sha256-KAKHuUv6nFVi3ucXkXGs9yfy2WFBnIDaDiNLKXsEOlI="; + sha256 = "sha256-VL22p723LDHpn+WhKoPm3u1uSTMofJpy3tZNlgcWQSk="; }; - vendorSha256 = "sha256-DCq+Dke33trkntrXz49I1mDxsJodVbtZEbg1UF6Tmwk="; + vendorHash = "sha256-pptAtzw9vRguQJK73kjfM/wnTJDekXBWV3Yeb8p8LOY="; meta = with lib; { description = "A cli tool for importing and exporting Hashicorp Vault secrets"; From d67f331026f455544706a3621d586f661ec58527 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 05:10:37 +0000 Subject: [PATCH 186/326] python310Packages.mt-940: 4.27.0 -> 4.28.0 --- pkgs/development/python-modules/mt-940/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index b2e5f53119f7..417c5ff7d83a 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "4.27.0"; + version = "4.28.0"; pname = "mt-940"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LL4CRioio63gpXrsurVucrkFgQrEh0gZPZ79Y2tk/90="; + sha256 = "sha256-ydTOaijDmA2ogIONzRMMoz+5jr99qxWM1zzGGzg7f2Q="; }; propagatedBuildInputs = lib.optional (!isPy3k) enum34; From 789b55c683a7ac3afe7f8d177bf04210dfd9261e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jan 2023 05:38:24 +0000 Subject: [PATCH 187/326] python310Packages.trimesh: 3.18.0 -> 3.18.1 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 46d1b97894d6..672a0916b22f 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.18.0"; + version = "3.18.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RYjJdbi60vHDwlShKmEoK6g3mmtb3euuM9qvdqpn5oE="; + sha256 = "sha256-8Jw5YmHsATchcchiPqxqxA+PYgl7elqZLqG8vTu/b0k="; }; propagatedBuildInputs = [ numpy ]; From 6caaaeff07183b8479cd796a2be2e1cf70716b0a Mon Sep 17 00:00:00 2001 From: Atemu Date: Wed, 18 Jan 2023 19:03:34 +0100 Subject: [PATCH 188/326] BeatSaberModManager: bump deps Fixes the build --- pkgs/games/BeatSaberModManager/deps.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/games/BeatSaberModManager/deps.nix b/pkgs/games/BeatSaberModManager/deps.nix index 57f7add09f5f..1542b120c9af 100644 --- a/pkgs/games/BeatSaberModManager/deps.nix +++ b/pkgs/games/BeatSaberModManager/deps.nix @@ -26,9 +26,9 @@ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.11"; sha256 = "15n8x52njzxs2cwzzswi0kawm673jkvf2yga87jaf7hr729bfmcr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.11"; sha256 = "1pw25rnw5nm51wjdjbrhzhz9v0c8gjjqn2na2bam3c5xawvnqkqf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.11"; sha256 = "0vd5da34frm7avrc9d16d39s2k5sgzd260j5pkjsianhpjby5rbn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.12"; sha256 = "0x8x922jhdn4zzbqqhlnzg5cmg69myn9zibk363py3yamkywcami"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.12"; sha256 = "1zi1x4w51fawi8083s48mxrlpqzkc48qsvrq2h7xx58x48ml465s"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.12"; sha256 = "1wwciddbnykamlwl9i88l9081q27l0i17jmvymsxddbi0v9rr3sb"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) @@ -36,11 +36,11 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.11"; sha256 = "0k8nl3hnr8h0ljw185dyhavrz2f7x6wavyadyf7f1v289jzasj72"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.11"; sha256 = "0bnq4dj7s5mspi7f8ihpp2y4bncb229ihrcmxvifsbb15mlhh8g4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.11"; sha256 = "1j64ppdvh5s3pqr6sm3sq9bmk3fzj7l4j3bx023zn3dyllibpv68"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.11"; sha256 = "03kvh4l5j8i8263wz7fmznzf5rs1grgazrhi3ayhynvhdal04mdk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.11"; sha256 = "1f60dyl8pnj067i7bvmsbazcvrjkgrz9943vjj0ym49cfyq98cnw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.12"; sha256 = "0axj326a79h8762ahrxgpnzczivfvdjn2xa2np2djc7ybn6j3491"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.12"; sha256 = "0dfivz2wq18gsdn8b9d0v6q0lf2mvayl85nad7cvysfc93aw05jg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.12"; sha256 = "00s1flhzvxsdhgn469vc1q63qkcv05g5zqx10p1gsnzxjpdx01in"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.12"; sha256 = "1j615cjwkyjkvvc03pvwmfgqbh1z9aq08bvw0bnjkhs1qs6dz7x0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.12"; sha256 = "1w7kfgld8wcbqqyb1cpbnd6b08f83jfny2q70vb1qdqfn5bgcb1h"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) From f02cba5d2f454d315c30a4375732ce722101cbcd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 09:35:03 +0000 Subject: [PATCH 189/326] civo: 1.0.41 -> 1.0.45 --- pkgs/applications/networking/cluster/civo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index bd3672b997b1..2fbbc9ad1d24 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.41"; + version = "1.0.45"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-dvbxxW+UyTA+EzBV6g9JRao8D6ZE5hhXLX4q/mmPIQg="; + sha256 = "sha256-wYZC4eEvxvHgtb0l+kpP2msQgt8InJu59lgS5cwGxRI="; }; - vendorSha256 = "sha256-gBVSpjoAfbxlJnlrFrsBupJgVQ59sh1ipOry0Mgppig="; + vendorHash = "sha256-42ZTPl4kI+dgr78s9WvLFchQU9uvkMkkio53REjvpbw="; nativeBuildInputs = [ installShellFiles ]; From 1c272b106b66baea9dd8ef7cc2c541dd38373657 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 7 Jan 2023 15:32:35 +0100 Subject: [PATCH 190/326] xrdp: 0.9.9 -> 0.9.21, xorgxrdp: 0.2.9 -> 0.9.19 --- .../networking/remote/xrdp/default.nix | 42 +- .../remote/xrdp/dynamic_config.patch | 376 ++++++++++++++++++ 2 files changed, 391 insertions(+), 27 deletions(-) create mode 100644 pkgs/applications/networking/remote/xrdp/dynamic_config.patch diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index 3744451f3e28..b7c51d70dfec 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -3,13 +3,13 @@ let xorgxrdp = stdenv.mkDerivation rec { pname = "xorgxrdp"; - version = "0.2.9"; + version = "0.9.19"; src = fetchFromGitHub { owner = "neutrinolabs"; repo = "xorgxrdp"; rev = "v${version}"; - sha256 = "1bhp5x47hajhinvglmc4vxxnpjvfjm6369njb3ghqfr7c5xypvzr"; + hash = "sha256-WI1KyJDQkmNHwweZMbNd2KUfawaieoGMDMQfeD12cZs="; }; nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; @@ -34,21 +34,23 @@ let }; xrdp = stdenv.mkDerivation rec { - version = "0.9.9"; + version = "0.9.21.1"; pname = "xrdp"; src = fetchFromGitHub { - owner = "volth"; + owner = "neutrinolabs"; repo = "xrdp"; - rev = "refs/tags/runtime-cfg-path-${version}"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be patched already + rev = "v${version}"; fetchSubmodules = true; - sha256 = "0ynj6pml4f38y8571ryhifza57wfqg4frdrjcwzw3fmryiznfm1z"; + hash = "sha256-/o052ij+Tpcw5/k1UyP6OGOzrtBwh3jRkftStIEhUF0="; }; - nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; + nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm perl ]; buildInputs = [ openssl systemd pam fuse libjpeg libopus xorg.libX11 xorg.libXfixes xorg.libXrandr ]; + patches = [ ./dynamic_config.patch ]; + postPatch = '' substituteInPlace sesman/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q" ''; @@ -58,23 +60,23 @@ let ./bootstrap ''; dontDisableStatic = true; - configureFlags = [ "--with-systemdsystemunitdir=/var/empty" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" ]; + configureFlags = [ "--with-systemdsystemunitdir=/var/empty" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" "--enable-pam-config=unix" ]; installFlags = [ "DESTDIR=$(out)" "prefix=" ]; postInstall = '' - # remove generated keys (as non-determenistic) and upstart script - rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem,xrdp.sh} + # remove generated keys (as non-deterministic) + rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem} cp $src/keygen/openssl.conf $out/share/xrdp/openssl.conf substituteInPlace $out/etc/xrdp/sesman.ini --replace /etc/xrdp/pulse $out/etc/xrdp/pulse # remove all session types except Xorg (they are not supported by this setup) - ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini + perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini # remove all session types and then add Xorg - ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini + perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini cat >> $out/etc/xrdp/sesman.ini < + + #if defined(XRDP_NEUTRINORDP) + #include +@@ -46,10 +47,21 @@ xrdp_rdp_read_config(const char *xrdp_ini, struct xrdp_client_info *client_info) + struct list *values = (struct list *)NULL; + char *item = NULL; + char *value = NULL; ++ char cfg_dir[256]; + int pos; + char *tmp = NULL; + int tmp_length = 0; + ++ g_strncpy(cfg_dir, xrdp_ini, 255); ++ *(strrchr(cfg_dir, '/')) = 0; ++ ++ /* default location is next to xrdp.ini */ ++ g_snprintf(client_info->certificate, 1023, "%s/cert.pem", cfg_dir); ++ g_snprintf(client_info->key_file, 1023, "%s/key.pem", cfg_dir); ++ g_snprintf(client_info->xrdp_keyboard_ini_file, 255, "%s/xrdp_keyboard.ini", cfg_dir); ++ g_snprintf(client_info->rsakeys_ini_file, 255, "%s/rsakeys.ini", cfg_dir); ++ g_snprintf(client_info->keymaps_path, 255, "%s", cfg_dir); ++ + client_info->xrdp_keyboard_overrides.type = -1; + client_info->xrdp_keyboard_overrides.subtype = -1; + client_info->xrdp_keyboard_overrides.layout = -1; +@@ -253,14 +265,14 @@ xrdp_rdp_read_config(const char *xrdp_ini, struct xrdp_client_info *client_info) + if (g_strlen(value) == 0) + { + /* default key_file path */ +- g_snprintf(client_info->key_file, 1023, "%s/key.pem", XRDP_CFG_PATH); ++ g_snprintf(client_info->key_file, 1023, "%s/key.pem", cfg_dir); + LOG(LOG_LEVEL_INFO, "Using default X.509 key file: %s", + client_info->key_file); + } + else if (value[0] != '/') + { + /* default key_file path */ +- g_snprintf(client_info->key_file, 1023, "%s/key.pem", XRDP_CFG_PATH); ++ g_snprintf(client_info->key_file, 1023, "%s/key.pem", cfg_dir); + LOG(LOG_LEVEL_WARNING, + "X.509 key file should use absolute path, using " + "default instead: %s", client_info->key_file); +@@ -277,6 +289,51 @@ xrdp_rdp_read_config(const char *xrdp_ini, struct xrdp_client_info *client_info) + client_info->key_file, g_get_strerror()); + } + } ++ else if (g_strcasecmp(item, "rsakeys_ini") == 0) ++ { ++ if (value[0] != '/') ++ { ++ g_snprintf(client_info->rsakeys_ini_file, 255, "%s/rsakeys.ini", cfg_dir); ++ log_message(LOG_LEVEL_WARNING, ++ "rsakeys.ini file should use absolute path, using " ++ "default instead: %s", client_info->rsakeys_ini_file); ++ } ++ else ++ { ++ /* use user defined rsakeys.ini */ ++ g_strncpy(client_info->rsakeys_ini_file, value, 255); ++ } ++ } ++ else if (g_strcasecmp(item, "xrdp_keyboard_ini") == 0) ++ { ++ if (value[0] != '/') ++ { ++ g_snprintf(client_info->xrdp_keyboard_ini_file, 255, "%s/xrdp_keyboard.ini", cfg_dir); ++ log_message(LOG_LEVEL_WARNING, ++ "xrdp_keyboard.ini file should use absolute path, using " ++ "default instead: %s", client_info->xrdp_keyboard_ini_file); ++ } ++ else ++ { ++ /* use user defined xrdp_keyboard.ini */ ++ g_strncpy(client_info->xrdp_keyboard_ini_file, value, 255); ++ } ++ } ++ else if (g_strcasecmp(item, "keymaps_path") == 0) ++ { ++ if (value[0] != '/') ++ { ++ g_snprintf(client_info->keymaps_path, 255, "%s", cfg_dir); ++ log_message(LOG_LEVEL_WARNING, ++ "keymaps_path should use absolute path, using " ++ "default instead: %s", client_info->keymaps_path); ++ } ++ else ++ { ++ /* use user defined xrdp_keyboard.ini */ ++ g_strncpy(client_info->keymaps_path, value, 255); ++ } ++ } + else if (g_strcasecmp(item, "domain_user_separator") == 0 + && g_strlen(value) > 0) + { +diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c +index 8fa34aea..da94cf95 100644 +--- a/libxrdp/xrdp_sec.c ++++ b/libxrdp/xrdp_sec.c +@@ -371,7 +371,6 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info) + char *item = (char *)NULL; + char *value = (char *)NULL; + char *q = (char *)NULL; +- char keyboard_cfg_file[256] = { 0 }; + char rdp_layout[256] = { 0 }; + + const struct xrdp_keyboard_overrides *ko = +@@ -419,10 +418,9 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info) + client_info->keyboard_subtype = 1; + } + +- g_snprintf(keyboard_cfg_file, 255, "%s/xrdp_keyboard.ini", XRDP_CFG_PATH); +- LOG(LOG_LEVEL_DEBUG, "keyboard_cfg_file %s", keyboard_cfg_file); ++ LOG(LOG_LEVEL_DEBUG, "keyboard_cfg_file %s", client_info->xrdp_keyboard_ini_file); + +- fd = g_file_open(keyboard_cfg_file); ++ fd = g_file_open(client_info->xrdp_keyboard_ini_file); + + if (fd >= 0) + { +@@ -594,7 +592,7 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info) + else + { + LOG(LOG_LEVEL_ERROR, "xrdp_load_keyboard_layout: error opening %s", +- keyboard_cfg_file); ++ client_info->xrdp_keyboard_ini_file); + } + } + +@@ -2759,7 +2757,6 @@ xrdp_sec_incoming(struct xrdp_sec *self) + int index = 0; + char *item = NULL; + char *value = NULL; +- char key_file[256]; + + iso = self->mcs_layer->iso_layer; + +@@ -2805,19 +2802,17 @@ xrdp_sec_incoming(struct xrdp_sec *self) + LOG(LOG_LEVEL_DEBUG, "Using RDP security, and " + "reading the server configuration"); + +- g_memset(key_file, 0, sizeof(char) * 256); + g_random(self->server_random, 32); + items = list_create(); + items->auto_free = 1; + values = list_create(); + values->auto_free = 1; +- g_snprintf(key_file, 255, "%s/rsakeys.ini", XRDP_CFG_PATH); + +- if (file_by_name_read_section(key_file, "keys", items, values) != 0) ++ if (file_by_name_read_section(self->rdp_layer->client_info.rsakeys_ini_file, "keys", items, values) != 0) + { + /* this is a show stopper */ + LOG(LOG_LEVEL_ERROR, "XRDP cannot read file: %s " +- "(check permissions)", key_file); ++ "(check permissions)", self->rdp_layer->client_info.rsakeys_ini_file); + list_delete(items); + list_delete(values); + return 1; +diff --git a/sesman/config.c b/sesman/config.c +index 61e9e403..0466f61a 100644 +--- a/sesman/config.c ++++ b/sesman/config.c +@@ -34,6 +34,7 @@ + #include "sesman.h" + #include "log.h" + #include "string_calls.h" ++#include + #include "chansrv/chansrv_common.h" + + /***************************************************************************//** +@@ -47,11 +48,10 @@ + * + */ + static int +-config_read_globals(int file, struct config_sesman *cf, struct list *param_n, ++config_read_globals(const char *base_dir, int file, struct config_sesman *cf, struct list *param_n, + struct list *param_v) + { + int i; +- int length; + char *buf; + + list_clear(param_v); +@@ -127,13 +127,12 @@ config_read_globals(int file, struct config_sesman *cf, struct list *param_n, + g_free(cf->default_wm); + cf->default_wm = g_strdup("startwm.sh"); + } +- /* if default_wm doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */ ++ /* if default_wm doesn't begin with '/', it's a relative path to base_dir */ + if (cf->default_wm[0] != '/') + { + /* sizeof operator returns string length including null terminator */ +- length = sizeof(XRDP_CFG_PATH) + g_strlen(cf->default_wm) + 1; /* '/' */ +- buf = (char *)g_malloc(length, 0); +- g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, cf->default_wm); ++ buf = (char *)g_malloc(g_strlen(base_dir) + 1 + g_strlen(cf->default_wm) + 1, 0); ++ g_sprintf(buf, "%s/%s", base_dir, cf->default_wm); + g_free(cf->default_wm); + cf->default_wm = g_strdup(buf); + g_free(buf); +@@ -151,10 +150,8 @@ config_read_globals(int file, struct config_sesman *cf, struct list *param_n, + /* if reconnect_sh doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */ + if (cf->reconnect_sh[0] != '/') + { +- /* sizeof operator returns string length including null terminator */ +- length = sizeof(XRDP_CFG_PATH) + g_strlen(cf->reconnect_sh) + 1; /* '/' */ +- buf = (char *)g_malloc(length, 0); +- g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, cf->reconnect_sh); ++ buf = (char *)g_malloc(g_strlen(base_dir) + 1 + g_strlen(cf->reconnect_sh) + 1, 0); ++ g_sprintf(buf, "%s/%s", base_dir, cf->reconnect_sh); + g_free(cf->reconnect_sh); + cf->reconnect_sh = g_strdup(buf); + g_free(buf); +@@ -511,6 +508,7 @@ struct config_sesman * + config_read(const char *sesman_ini) + { + struct config_sesman *cfg; ++ char cfg_dir[256]; + int all_ok = 0; + + if ((cfg = g_new0(struct config_sesman, 1)) != NULL) +@@ -532,8 +530,10 @@ config_read(const char *sesman_ini) + param_v->auto_free = 1; + + /* read global config */ +- config_read_globals(fd, cfg, param_n, param_v); +- ++ g_strcpy(cfg_dir, sesman_ini); ++ *(strrchr(cfg_dir, '/')) = 0; // cfg_file validated to contain '/' ++ ++ config_read_globals(cfg_dir, fd, cfg, param_n, param_v); + /* read Xvnc/X11rdp/Xorg parameter list */ + config_read_vnc_params(fd, cfg, param_n, param_v); + config_read_rdp_params(fd, cfg, param_n, param_v); +diff --git a/xrdp/lang.c b/xrdp/lang.c +index e4c18077..06f92997 100644 +--- a/xrdp/lang.c ++++ b/xrdp/lang.c +@@ -229,7 +229,7 @@ km_read_section(int fd, const char *section_name, struct xrdp_key_info *keymap) + + /*****************************************************************************/ + int +-get_keymaps(int keylayout, struct xrdp_keymap *keymap) ++get_keymaps(const char* keymaps_path, int keylayout, struct xrdp_keymap *keymap) + { + int fd; + int basic_key_layout = keylayout & 0x0000ffff; +@@ -239,21 +239,21 @@ get_keymaps(int keylayout, struct xrdp_keymap *keymap) + filename = (char *)g_malloc(256, 0); + + /* check if there is a keymap file e.g. km-e00100411.ini */ +- g_snprintf(filename, 255, "%s/km-%08x.ini", XRDP_CFG_PATH, keylayout); ++ g_snprintf(filename, 255, "%s/km-%08x.ini", keymaps_path, keylayout); + + /* if the file does not exist, use only lower 16 bits instead */ + if (!g_file_exist(filename)) + { + LOG(LOG_LEVEL_WARNING, "Cannot find keymap file %s", filename); + /* e.g. km-00000411.ini */ +- g_snprintf(filename, 255, "%s/km-%08x.ini", XRDP_CFG_PATH, basic_key_layout); ++ g_snprintf(filename, 255, "%s/km-%08x.ini", keymaps_path, basic_key_layout); + } + + /* finally, use 'en-us' */ + if (!g_file_exist(filename)) + { + LOG(LOG_LEVEL_WARNING, "Cannot find keymap file %s", filename); +- g_snprintf(filename, 255, "%s/km-00000409.ini", XRDP_CFG_PATH); ++ g_snprintf(filename, 255, "%s/km-00000409.ini", keymaps_path); + } + + if (g_file_exist(filename)) +diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c +index e91672fb..37cef0c0 100644 +--- a/xrdp/xrdp.c ++++ b/xrdp/xrdp.c +@@ -384,7 +384,6 @@ xrdp_sanity_check(void) + { + int intval = 1; + int host_be; +- const char *key_file = XRDP_CFG_PATH "/rsakeys.ini"; + + /* check compiled endian with actual endian */ + host_be = !((int)(*(unsigned char *)(&intval))); +@@ -429,12 +428,6 @@ xrdp_sanity_check(void) + return 1; + } + +- if (!g_file_exist(key_file)) +- { +- g_writeln("File %s is missing, create it using xrdp-keygen", key_file); +- return 1; +- } +- + return 0; + } + +diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h +index 36d8f87a..687b9dd5 100644 +--- a/xrdp/xrdp.h ++++ b/xrdp/xrdp.h +@@ -380,7 +380,7 @@ get_char_from_scan_code(int device_flags, int scan_code, int *keys, + int caps_lock, int num_lock, int scroll_lock, + struct xrdp_keymap *keymap); + int +-get_keymaps(int keylayout, struct xrdp_keymap *keymap); ++get_keymaps(const char* keymaps_path, int keylayout, struct xrdp_keymap *keymap); + + /* xrdp_login_wnd.c */ + int +diff --git a/xrdp/xrdp.ini.in b/xrdp/xrdp.ini.in +index 3b6340f8..c05e2930 100644 +--- a/xrdp/xrdp.ini.in ++++ b/xrdp/xrdp.ini.in +@@ -52,6 +52,12 @@ crypt_level=high + ; openssl req -x509 -newkey rsa:2048 -nodes -keyout key.pem -out cert.pem -days 365 + certificate= + key_file= ++;directory with km-*.ini files; default is the directory of xrdp.ini ++#keymaps_path= ++;location of xrdp_keyboard_ini; default next to xrdp.ini ++#xrdp_keyboard_ini= ++;location of rsakeys.ini; default next to xrdp.ini ++#rsakeys_ini= + + ; set SSL protocols + ; can be comma separated list of 'SSLv3', 'TLSv1', 'TLSv1.1', 'TLSv1.2', 'TLSv1.3' +diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c +index 94691582..602b3ca6 100644 +--- a/xrdp/xrdp_wm.c ++++ b/xrdp/xrdp_wm.c +@@ -64,7 +64,7 @@ xrdp_wm_create(struct xrdp_process *owner, + self->mm = xrdp_mm_create(self); + self->default_font = xrdp_font_create(self); + /* this will use built in keymap or load from file */ +- get_keymaps(self->session->client_info->keylayout, &(self->keymap)); ++ get_keymaps(client_info->keymaps_path, self->session->client_info->keylayout, &(self->keymap)); + xrdp_wm_set_login_state(self, WMLS_RESET); + self->target_surface = self->screen; + self->current_surface_index = 0xffff; /* screen */ +diff --git a/xup/xup.c b/xup/xup.c +index e67d9477..8bc718a0 100644 +--- a/xup/xup.c ++++ b/xup/xup.c +@@ -318,7 +318,7 @@ lib_mod_event(struct mod *mod, int msg, tbus param1, tbus param2, + msg param1 param2 param3 param4 + 15 0 65507 29 0 + 16 0 65507 29 49152 */ +- init_stream(s, 8192); ++ init_stream(s, (int)sizeof(mod->client_info) < 8192 ? 8192 : (int)sizeof(mod->client_info)); + s_push_layer(s, iso_hdr, 4); + out_uint16_le(s, 103); + out_uint32_le(s, 16); /* key up */ From 3469fcfe483f52f36ce143139db5f93ff2a0e407 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 15:21:38 +0000 Subject: [PATCH 191/326] step-ca: 0.23.0 -> 0.23.1 --- pkgs/tools/security/step-ca/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 7fc646b1e61a..d5d84909f772 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "sha256-upi0EL6iviLV7hrLkh5PUAhx3/98kMISqHdy7NFODwI="; + sha256 = "sha256-zIF7R0zIoqQx0epTJAVdesT6IOoNek7Blt7W3Ulng4A="; }; - vendorSha256 = "sha256-2uxDQVNTNBTj40vYMlCuwMPCQDGQfkdUc67qmP5+j7g="; + vendorHash = "sha256-JX5jUIMwd+eCYRytaf+EXV/xHh6CCS2Ia0K+UQZxG7E="; ldflags = [ "-buildid=" ]; From e4d981e97fa0e4eb0f26cc2ac4d340c771f28f88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 18:35:34 +0000 Subject: [PATCH 192/326] cf-terraforming: 0.8.8 -> 0.9.0 --- pkgs/tools/misc/cf-terraforming/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/cf-terraforming/default.nix b/pkgs/tools/misc/cf-terraforming/default.nix index 679b575a3d59..20c4221a0816 100644 --- a/pkgs/tools/misc/cf-terraforming/default.nix +++ b/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.8.8"; + version = "0.9.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-wqpVqf4E5Zz8oKjl7XNjAH05wA++MOL9EnHL/YwsSYw="; + sha256 = "sha256-wELV3Jp11Iv3G//VOAosL5QDnbNTyEAvq9hmLWDdPBU="; }; - vendorSha256 = "sha256-tmq55wCQ10WkP+Cp3Ak6mttwL1wxqIAvpn6tsluhI34="; + vendorHash = "sha256-XFJGw76Fz9tzknWuzc1aw1uJ34UQfFLe1WUVtPGbn64="; ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ]; # The test suite insists on downloading a binary release of Terraform from From 0d9917d16b1ea60f8944eb22ce4b6a468c5461b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Jan 2023 21:30:47 +0000 Subject: [PATCH 193/326] wakatime: 1.60.1 -> 1.61.0 --- pkgs/tools/misc/wakatime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index a2757d1bced7..db52bae523f6 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakatime"; - version = "1.60.1"; + version = "1.61.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - sha256 = "sha256-HOSNNeLtqyLahjG8AzhpfOb9Nmtd0XpI+AA03mlUBCQ="; + sha256 = "sha256-pd6kK1591dLEau9oKdd+A2y8rRerFQ+z2yY+/BsNUAI="; }; - vendorSha256 = "sha256-ANRcgeZYtcWGbK8c9KE8joo97d8LKvKA8/A+/rrjOoM="; + vendorHash = "sha256-R+VqIw8fztBH2WTf5vjqtMfASNnOTjA3DEndXYyyMi4="; meta = with lib; { inherit (src.meta) homepage; From e7c3542806350832c10d5c51d158ac36b9b4f905 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 00:00:51 +0000 Subject: [PATCH 194/326] xray: 1.7.0 -> 1.7.2 --- pkgs/tools/networking/xray/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index 29b898e8da11..e59715e61f38 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -20,16 +20,16 @@ let in buildGoModule rec { pname = "xray"; - version = "1.7.0"; + version = "1.7.2"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - sha256 = "sha256-aNIb90obew+tvd/rYVddK1MmUqLXSqi9xAu65BQFvk0="; + sha256 = "sha256-jwCvo6+YXC471VqGWzcrnrLWOSJW2tBKa5SoynQg0Lo="; }; - vendorSha256 = "sha256-zZdUPjlul9f1jKy0Zf79KOToHIsvfgwDp6XpFPYyTzk="; + vendorSha256 = "sha256-P2g0MqlBScm6yTnpvL5T6l9ntsb4tK9k3Civ7rTevrE="; nativeBuildInputs = [ makeWrapper ]; From d12040e85829bf0c4afbb694449283cf6941650b Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Thu, 19 Jan 2023 22:45:41 -0600 Subject: [PATCH 195/326] nixos/tests/systemd-boot: fix update test At some point many months ago, the systemd-boot update script stopped outputting parentheses around the version being upgraded from, causing the test to fail. Remove the parentheses from the expected message to fix the test. --- nixos/tests/systemd-boot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index 039e6bdd9d5a..759ddd2eb2ca 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -107,7 +107,7 @@ in ) output = machine.succeed("/run/current-system/bin/switch-to-configuration boot") - assert "updating systemd-boot from (000.0-1-notnixos) to " in output + assert "updating systemd-boot from 000.0-1-notnixos to " in output ''; }; From 373efbda6425dae7875efc98339cc18af3c254f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 05:13:53 +0000 Subject: [PATCH 196/326] limitcpu: 2.7 -> 2.8 --- pkgs/tools/misc/limitcpu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/limitcpu/default.nix b/pkgs/tools/misc/limitcpu/default.nix index 2d7fb55dcd9c..84de4d23a3ac 100644 --- a/pkgs/tools/misc/limitcpu/default.nix +++ b/pkgs/tools/misc/limitcpu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "limitcpu"; - version = "2.7"; + version = "2.8"; src = fetchurl { url = "mirror://sourceforge/limitcpu/cpulimit-${version}.tar.gz"; - sha256 = "sha256-HeBApPikDf6MegJf6YB1ZzRo+8P8zMvCMbx0AvYuxKA="; + sha256 = "sha256-fjGbCR9QEVTmAFxd+WoEAGbuhtsiAdWDXQq9mOO2t/8="; }; buildFlags = with stdenv; [ ( From 83eb035ef93bad74d4c98de5b4bbe08ebae4fee7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 05:21:04 +0000 Subject: [PATCH 197/326] pg_activity: 3.0.1 -> 3.0.3 --- pkgs/development/tools/database/pg_activity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/pg_activity/default.nix b/pkgs/development/tools/database/pg_activity/default.nix index 399c8801f772..c3ec5f9d5802 100644 --- a/pkgs/development/tools/database/pg_activity/default.nix +++ b/pkgs/development/tools/database/pg_activity/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "pg_activity"; - version = "3.0.1"; + version = "3.0.3"; disabled = python3Packages.pythonOlder "3.6"; src = fetchFromGitHub { owner = "dalibo"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-YsHY2Hvr1aDKA+YOftc7iUi1qXDv6HW+jQtTQgQ5+M4="; + sha256 = "sha256-djpBdhCgtlm6+DiZVKSKh0nu30YVm/qZHlBHPtdObfU="; }; propagatedBuildInputs = with python3Packages; [ From 8736edfd9547b2f5807c4fa7d780fcc2fef87088 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Thu, 19 Jan 2023 23:21:15 -0600 Subject: [PATCH 198/326] nixos/qemu-vm: fix useBootLoader builds on aarch64-linux The aarch64-linux kernel and initrd recently eclipsed 60M, causing the boot disk image build to run out of space and fail. Double the size of the image to 120M to fix the issue. The disk image is stored in expandable qcow2 format, so only the space actually used by files in the image is consumed. Therefore, other architectures are not unfairly penalized, and the output size does not suddenly double. This also fixes NixOS tests which use this option, like systemd-boot's. --- nixos/modules/virtualisation/qemu-vm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 4520408ca337..06210529eb8c 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -211,7 +211,7 @@ let '' mkdir $out diskImage=$out/disk.img - ${qemu}/bin/qemu-img create -f qcow2 $diskImage "60M" + ${qemu}/bin/qemu-img create -f qcow2 $diskImage "120M" ${if cfg.useEFIBoot then '' efiVars=$out/efi-vars.fd cp ${cfg.efi.variables} $efiVars @@ -225,7 +225,7 @@ let + " -drive if=pflash,format=raw,unit=1,file=$efiVars"); } '' - # Create a /boot EFI partition with 60M and arbitrary but fixed GUIDs for reproducibility + # Create a /boot EFI partition with 120M and arbitrary but fixed GUIDs for reproducibility ${pkgs.gptfdisk}/bin/sgdisk \ --set-alignment=1 --new=1:34:2047 --change-name=1:BIOSBootPartition --typecode=1:ef02 \ --set-alignment=512 --largest-new=2 --change-name=2:EFISystem --typecode=2:ef00 \ From 29585f1ea0a03863b033547b50c38b53e5cbb3ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 05:33:22 +0000 Subject: [PATCH 199/326] moodle: 4.0.5 -> 4.1.1 --- pkgs/servers/web-apps/moodle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 02bb13f5f7e3..726552f3093b 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, writeText, plugins ? [ ], nixosTests }: let - version = "4.0.5"; + version = "4.1.1"; versionParts = lib.take 2 (lib.splitVersion version); # 4.2 -> 402, 3.11 -> 311 @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "sha256-m4LyAg/C/ZV3nBD4gNFNjwI6glg7ZAH2nSGg0mU2DsI="; + sha256 = "sha256-w6N/jFYieL+yJXlDr1/9AATChSqiatx+aJl0XSOSL0s="; }; phpConfig = writeText "config.php" '' From ddc5d34f6126c7029d6aa876eac29e2aed0ee0e4 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Thu, 19 Jan 2023 23:42:22 -0600 Subject: [PATCH 200/326] nixos/tests/systemd-boot: only patch systemd-boot during update test The update test patches the systemd-boot binary to report a known version then tests that this is the version updated from. The previous patch would also search the kernel and initrd binaries, which would cause sed to write out a temporary file that might cause the disk to run out of space and the test to fail. Only attempt to patch binaries which contain systemd-boot (usually `BOOT.EFI` and `systemd-boot.efi` to avoid this problem. As a bonus, this reduces test time by 20-30%. --- nixos/tests/systemd-boot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index 759ddd2eb2ca..94e269ff37bb 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -101,7 +101,7 @@ in # Replace version inside sd-boot with something older. See magic[] string in systemd src/boot/efi/boot.c machine.succeed( """ - find /boot -iname '*.efi' -print0 | \ + find /boot -iname '*boot*.efi' -print0 | \ xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot 000.0-1-notnixos ####/' '{}' """ ) From 8f2babd0326e57dc01a22bdccec376dcc7ca3ed3 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Mon, 16 Jan 2023 15:31:52 -0600 Subject: [PATCH 201/326] nixos/systemd-boot: pass EFI variable flags during update too On some systems, EFI variables are not supported or otherwise wonky. bootctl attempting to access them causes failures during bootloader installations and updates. For such systems, NixOS provides the options `boot.loader.efi.canTouchEfiVariables` and `boot.loader.systemd-boot.graceful` which pass flags to bootctl that change whether and how EFI variables are accessed. Previously, these flags were only passed to bootctl during an install operation. However, they also apply during an update operation, which can cause the same sorts of errors. This change passes the flags during update operations as well to prevent those errors. Fixes https://github.com/NixOS/nixpkgs/issues/151336 --- .../systemd-boot/systemd-boot-builder.py | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index ea3577f138c2..db6467637974 100755 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -228,20 +228,21 @@ def main() -> None: warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning) os.environ["NIXOS_INSTALL_BOOTLOADER"] = "1" + # flags to pass to bootctl install/update + bootctl_flags = [] + + if "@canTouchEfiVariables@" != "1": + bootctl_flags.append("--no-variables") + + if "@graceful@" == "1": + bootctl_flags.append("--graceful") + if os.getenv("NIXOS_INSTALL_BOOTLOADER") == "1": # bootctl uses fopen() with modes "wxe" and fails if the file exists. if os.path.exists("@efiSysMountPoint@/loader/loader.conf"): os.unlink("@efiSysMountPoint@/loader/loader.conf") - flags = [] - - if "@canTouchEfiVariables@" != "1": - flags.append("--no-variables") - - if "@graceful@" == "1": - flags.append("--graceful") - - subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + flags + ["install"]) + subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["install"]) else: # Update bootloader to latest if needed available_out = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[2] @@ -270,7 +271,7 @@ def main() -> None: print("skipping systemd-boot update to %s because of known regression" % available_version) else: print("updating systemd-boot from %s to %s" % (installed_version, available_version)) - subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@", "update"]) + subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["update"]) mkdir_p("@efiSysMountPoint@/efi/nixos") mkdir_p("@efiSysMountPoint@/loader/entries") From b17e22ec52f0f0e498bbf16763d94d17fb095789 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 20 Jan 2023 08:07:06 +0100 Subject: [PATCH 202/326] =?UTF-8?q?ocamlPackages.secp256k1:=200.4.1=20?= =?UTF-8?q?=E2=86=92=200.4.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/secp256k1/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/pkgs/development/ocaml-modules/secp256k1/default.nix index 7ad18fba81c6..00233beefd94 100644 --- a/pkgs/development/ocaml-modules/secp256k1/default.nix +++ b/pkgs/development/ocaml-modules/secp256k1/default.nix @@ -2,15 +2,13 @@ buildDunePackage rec { pname = "secp256k1"; - version = "0.4.1"; - - useDune2 = true; + version = "0.4.4"; src = fetchFromGitHub { owner = "dakk"; repo = "secp256k1-ml"; rev = version; - sha256 = "0jkd7mc5kynhg0b76dfk70pww97qsq2jbd991634i16xf8qja9fj"; + hash = "sha256-22+dZb3MC1W5Qvsz3+IHV1/XiGCRmJHTH+6IW2QX2hU="; }; buildInputs = [ base stdio dune-configurator secp256k1 ]; From 6dd6c2b7b30a112592f194e6ed0e6a3669215132 Mon Sep 17 00:00:00 2001 From: Dixon Sean Low Yan Feng Date: Fri, 20 Jan 2023 13:24:01 +0800 Subject: [PATCH 203/326] material-design-icons: convert to `stdenvNoCC.mkDerivation` --- .../fonts/material-design-icons/default.nix | 40 +++++++++++-------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index 82f422146ac7..43a5a890fd02 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -1,24 +1,30 @@ -{ lib, fetchFromGitHub }: +{ lib, fetchFromGitHub, stdenvNoCC }: -let +stdenvNoCC.mkDerivation rec { + pname = "material-design-icons"; version = "7.0.96"; -in fetchFromGitHub { - name = "material-design-icons-${version}"; - owner = "Templarian"; - repo = "MaterialDesign-Webfont"; - rev = "v${version}"; - postFetch = '' - mkdir -p $out/share/fonts/{eot,truetype,woff,woff2} - mv $out/fonts/*.eot $out/share/fonts/eot/ - mv $out/fonts/*.ttf $out/share/fonts/truetype/ - mv $out/fonts/*.woff $out/share/fonts/woff/ - mv $out/fonts/*.woff2 $out/share/fonts/woff2/ - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + dontBuild = true; + + src = fetchFromGitHub { + owner = "Templarian"; + repo = "MaterialDesign-Webfont"; + rev = "v${version}"; + sha256 = "sha256-d4weq1V8Pk0xJxzTVaiyMhkMHvrH3SBkUzRQT3w7n0U="; + sparseCheckout = [ "fonts" ]; + }; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/fonts/"{eot,truetype,woff,woff2} + cp fonts/*.eot "$out/share/fonts/eot/" + cp fonts/*.ttf "$out/share/fonts/truetype/" + cp fonts/*.woff "$out/share/fonts/woff/" + cp fonts/*.woff2 "$out/share/fonts/woff2/" + + runHook postInstall ''; - sha256 = "sha256-l60LRXLwLh+7Ls3kMTJ5eDTVpVMcqtshMv/ehIk8fCk="; meta = with lib; { description = "7000+ Material Design Icons from the Community"; From a5bcee65171cf1f9b77ab9857cb6c14cdf98cc9a Mon Sep 17 00:00:00 2001 From: Dixon Sean Low Yan Feng Date: Fri, 20 Jan 2023 13:35:16 +0800 Subject: [PATCH 204/326] material-design-icons: 7.0.96 -> 7.1.96 --- pkgs/data/fonts/material-design-icons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index 43a5a890fd02..c5b8ba00e95d 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -2,7 +2,7 @@ stdenvNoCC.mkDerivation rec { pname = "material-design-icons"; - version = "7.0.96"; + version = "7.1.96"; dontBuild = true; @@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec { owner = "Templarian"; repo = "MaterialDesign-Webfont"; rev = "v${version}"; - sha256 = "sha256-d4weq1V8Pk0xJxzTVaiyMhkMHvrH3SBkUzRQT3w7n0U="; + sha256 = "sha256-qS7zJQkd0Q5wYLgYXa63fD3Qi2T5JWD6vXW2FoFzZxo="; sparseCheckout = [ "fonts" ]; }; From aedca364f913021a0b84ab678754adcd6ee495c8 Mon Sep 17 00:00:00 2001 From: Dixon Sean Low Yan Feng Date: Fri, 20 Jan 2023 13:36:18 +0800 Subject: [PATCH 205/326] material-design-icons: add PlayerNameHere as maintainer --- pkgs/data/fonts/material-design-icons/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index c5b8ba00e95d..fdd85f66e408 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -36,6 +36,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://materialdesignicons.com"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ vlaci ]; + maintainers = with maintainers; [ vlaci PlayerNameHere ]; }; } From 82d7d64d3aad85c6452724f8c92a74078dab48b8 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 20 Jan 2023 09:17:34 -0300 Subject: [PATCH 206/326] rubyPackages.libv8: mark broken --- pkgs/development/ruby-modules/gem-config/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index ccc4430ca83c..1a95520b9273 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -370,7 +370,7 @@ in # otherwise the gem will fail to link to the libv8 binary. # see: https://github.com/cowboyd/libv8/pull/161 libv8 = attrs: { - buildInputs = [ which v8 python3 ]; + buildInputs = [ which v8 python2 ]; buildFlags = [ "--with-system-v8=true" ]; dontBuild = false; # The gem includes broken symlinks which are ignored during unpacking, but @@ -384,6 +384,9 @@ in --replace "location = Libv8::Location::Vendor.new" \ "location = Libv8::Location::System.new" ''; + meta.broken = true; # At 2023-01-20, errors as: + # "Failed to build gem native extension." + # Requires Python 2. Project is abandoned. }; execjs = attrs: { From 2dfc86b8380edf8f8d00c8e25508b565708d6a89 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 17 Jan 2023 13:01:47 +0100 Subject: [PATCH 207/326] nixos/modprobe: fix typo in boot.modprobeConfig.enable documentation This typo was introduced in f4d8e64bed05489cdb2af880644f1da4d0fe4eef. Also remove the dot at the end of the sentence since otherwise there would be two dots in the documentation. --- nixos/modules/system/boot/modprobe.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index 54bb7ea9ddd7..d751c4462d3f 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -7,7 +7,7 @@ with lib; ###### interface options = { - boot.modprobeConfig.enable = mkEnableOption (lib.mdDoc "modprobe config. This is useful for systemds like containers which do not require a kernel.") // { + boot.modprobeConfig.enable = mkEnableOption (lib.mdDoc "modprobe config. This is useful for systems like containers which do not require a kernel") // { default = true; }; From bfac961c8cc623557a421512a99def1e3784c61e Mon Sep 17 00:00:00 2001 From: Marian Hammer Date: Thu, 19 Jan 2023 13:02:02 +0100 Subject: [PATCH 208/326] prometheus: 2.40.3 -> 2.41.0 prometheus 2.40.x is out of support since 12/2022 therefore the update to 2.41.0 between those two releases security critical patches have been added both to prometheus codebase and upstream dependecies, see: * 2.40.6 / 2022-12-09 https://github.com/prometheus/prometheus/pull/11690 [SECURITY] Security upgrade from go and upstream dependencies that include security fixes to the net/http and os packages. #11691 * 2.40.4 / 2022-11-29 https://github.com/advisories/GHSA-7rg2-cxvp-9p7p https://github.com/advisories/GHSA-4v48-4q5m-8vx4 [SECURITY] Fix basic authentication bypass vulnerability (CVE-2022-46146) GHSA-4v48-4q5m-8vx4 --- pkgs/servers/monitoring/prometheus/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 2d2439b4c234..ade935f16d04 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.40.3"; + version = "2.41.0"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - sha256 = "sha256-dvMts9uJNLSp8Qho+yKMLPTy/1c2RgfeEn3UQLIZNc4="; + sha256 = "sha256-0EFeAuhQUu+4TCoHsWHTbWTGJLjS37POacP1K42sGqI="; }; in buildGoModule rec { @@ -45,10 +45,10 @@ buildGoModule rec { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "sha256-Jg8loH0Sji1MmDXUnMtvLTHjNGmkrzZApxvpe2+OqtU="; + sha256 = "sha256-J3KDN02m639bUGrnUrqeCLferrqIHaJ2VEBjIqfm/GY="; }; - vendorSha256 = "sha256-aRVoEgP84ITQ1D0PsFVJUKH/Uin7s80iQCwzgrfpjoM="; + vendorSha256 = "sha256-4Of1euBp5Lka6Bb2UJYUQuRa7t2/B1HaXCWSOqCASYw="; excludedPackages = [ "documentation/prometheus-mixin" ]; From 7d7fe8858844db7751df42fdb32a82af1ed5751a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 19:43:01 +0000 Subject: [PATCH 209/326] jackett: 0.20.2608 -> 0.20.2679 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index e739b1e8e9d5..07ee03059d11 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.2608"; + version = "0.20.2679"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-VR3/TmSpdSSnY9C+aTY1s3fawZgg7Ecf+k2kuuj1/roGKGApVHMaBQOc2p7j9fA6v6YEFSb8Mkoq5I1fi6y4xg=="; + hash = "sha512-uB1gOtalInBOFulmdHvA9ycPt0CvEefXZyGhYwUZ+bjyMaM1T6QcrPeSjuBQ10nIrRmqrXMSZB3cvthSwm+Rrw=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From c0fff22e52c323ab4ab32a710a78aa058d404421 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 19:50:45 +0000 Subject: [PATCH 210/326] pscale: 0.125.0 -> 0.127.0 --- pkgs/development/tools/pscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index c68410063aa2..aabd70f1a86e 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.125.0"; + version = "0.127.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-B765hV5hs5FfpzkRwQY9szu6l8ImDTUoEl77IcgRngA="; + sha256 = "sha256-GWfEazFrGlH26X0ILMMQTGlzIKm/S9TPCT4ViF+AA+k="; }; - vendorSha256 = "sha256-YOytSBJDktWIwN1vhD1imIZVTg6t+Lmfg4cFtE3lys4="; + vendorHash = "sha256-5dWZLVPRKJWNtNJ5swIMgSFP2idD34sR/hzQ/+HuykU="; ldflags = [ "-s" "-w" From e550b2c9c8166f053c71361db52130362325fb6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Jan 2023 23:59:04 +0000 Subject: [PATCH 211/326] unciv: 4.3.1 -> 4.4.3 --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 604f01fafd1e..76dac1e5e278 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.3.1"; + version = "4.4.3"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-qgjMQSkSYp/Tk9Acr21Nd5gLq9JLmEYsfSC+Ia362+c="; + sha256 = "sha256-oPZdQEfWgVo4M0WDhKfDDB4GqnzQEM8x79FSa3jC+U0="; }; dontUnpack = true; From 49d71d095482c25d5bcf8567d7420dd44b32558c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 03:03:54 +0000 Subject: [PATCH 212/326] python310Packages.limnoria: 2022.11.10 -> 2023.1.12 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 496f55b4000c..09f7b9f0f884 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2022.11.10"; + version = "2023.1.12"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IvnA9y/pkRrkEabUX05wcAg+8To0OLbt55olQfRUAQc="; + hash = "sha256-V3DkIsnVv/HekWuOnIKnMHhccDGWun7mF7AcBSEsy6o="; }; propagatedBuildInputs = [ From 1a9ef11a8cc5ee3b115ae99f20f94bb47a6040de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 03:53:20 +0000 Subject: [PATCH 213/326] kics: 1.6.7 -> 1.6.8 --- pkgs/tools/admin/kics/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 71f88a9b23b9..88621f236569 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kics"; - version = "1.6.7"; + version = "1.6.8"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-VtQauOf3FavXULFeWWw3aThHZAFMuwuI/FYr0dtZc0A="; + sha256 = "sha256-s2M763M4Hoy8gjgkHT69pCUCsWepmt0zEyXYpGzYTn0="; }; - vendorHash = "sha256-0Y4+tG54McwcRVuHXJBfs6Zg1fJBffeDs7JYInqfXe0="; + vendorHash = "sha256-JWdc0BN0GRw79uhb2uubSG1bnZlTHTVrmS0Jft1ZNh8="; subPackages = [ "cmd/console" ]; From b794299b112c738d6796eea34f4bedd1df619a8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 08:47:18 +0000 Subject: [PATCH 214/326] pinniped: 0.20.0 -> 0.22.0 --- pkgs/applications/networking/cluster/pinniped/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/applications/networking/cluster/pinniped/default.nix index 32ce4d74a3d9..10c9c6be689a 100644 --- a/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/pkgs/applications/networking/cluster/pinniped/default.nix @@ -2,18 +2,18 @@ buildGoModule rec{ pname = "pinniped"; - version = "0.20.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-JKZij9f6zlBzbYolxz03R5j95zKELVmEhX+QRTxF/cc="; + sha256 = "sha256-gi6uFJFP3hdHJqH9y7Q8tUGRJECPHxbajU5BJeBcJzo="; }; subPackages = "cmd/pinniped"; - vendorSha256 = "sha256-szv/B7LG/In0j6MT6KCnuUfaCnK7RsJOLeuOtJ/ig9w="; + vendorHash = "sha256-4N8HtBeGeu22Go63dV0WBdbheXylButu+M9vZL7qOcU="; ldflags = [ "-s" "-w" ]; From 5d3ae1d386f3be6fec30de687b802f0f12e08d08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 13:32:15 +0000 Subject: [PATCH 215/326] rpcs3: 0.0.26-14568-1852b370d -> 0.0.26-14599-d3183708e --- pkgs/applications/emulators/rpcs3/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 4d71e91a631d..93d7a58e3cf4 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14568-1852b370d"; - rpcs3Version = "0.0.26-14568-1852b370d"; - rpcs3Revision = "1852b370d7a8310de092ca4132464c84192671cb"; - rpcs3Sha256 = "0yqvn5w9b4lxb43lllqch0s1sdj5v274hhbysgblbc7nilzcgsq6"; + rpcs3GitVersion = "14599-d3183708e"; + rpcs3Version = "0.0.26-14599-d3183708e"; + rpcs3Revision = "d3183708e81ba2707d39829cc1c0cb226dd9e50e"; + rpcs3Sha256 = "0lx9v614r9afmfknw9qdwawwayg3z0fj6chbhnfghm2j2zgqqbpi"; ittapi = fetchFromGitHub { owner = "intel"; From 12cb062985575535fd4d6514cbce74b1f086bc29 Mon Sep 17 00:00:00 2001 From: toastal Date: Sat, 21 Jan 2023 14:12:28 +0700 Subject: [PATCH 216/326] =?UTF-8?q?zfs:=202.1.7=20=E2=86=92=202.1.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/openzfs/zfs/releases/tag/zfs-2.1.8 2.1.9 staging always just starts at the last version cut. --- pkgs/os-specific/linux/zfs/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index af13f856027b..481827474eea 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_6_0 ? pkgs.linuxKernel.packages.linux_6_0 +, linuxPackages_6_1 ? pkgs.linuxKernel.packages.linux_6_1 }: let @@ -222,28 +222,28 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "6.1"; - latestCompatibleLinuxPackages = linuxPackages_6_0; + kernelCompatible = kernel.kernelOlder "6.2"; + latestCompatibleLinuxPackages = linuxPackages_6_1; # this package should point to the latest release. - version = "2.1.7"; + version = "2.1.8"; - sha256 = "sha256-vLm6RE11nqOCoYXne79JU3nUQnVEUNbwrULwFfghWcI="; + sha256 = "sha256-/+23SEtywa7b1dgvQNmEGrfqXzM1mlk00TSpuiCkQOk="; }; zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "6.1"; - latestCompatibleLinuxPackages = linuxPackages_6_0; + kernelCompatible = kernel.kernelOlder "6.2"; + latestCompatibleLinuxPackages = linuxPackages_6_1; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.8-staging-2023-01-10"; - rev = "0156253d29a303bdcca3e535958e754d8f086e33"; + version = "2.1.9-staging-2023-01-19"; + rev = "04b02785b67f9b976c43643dd52ce6cdbc22e11e"; - sha256 = "sha256-2+vymBesmNLB3fuaCwQOojEzn3aYqtxIo35MvlwOoNw="; + sha256 = "sha256-/+23SEtywa7b1dgvQNmEGrfqXzM1mlk00TSpuiCkQOk="; isUnstable = true; }; From dc9e0d81350937c8b68844581db6570fb8f72c09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 16:51:29 +0000 Subject: [PATCH 217/326] mackerel-agent: 0.73.1 -> 0.74.1 --- pkgs/servers/monitoring/mackerel-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index cae036926ff5..a3e615c19789 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.73.1"; + version = "0.74.1"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zbzTKMvadp9+KbHm2utJM84MPb80+zjR8hUHHTtzSdc="; + sha256 = "sha256-c1CywtgvVORkDewFB9iz99aUT5gFi5vXWddGZGLFu7o="; }; nativeBuildInputs = [ makeWrapper ]; checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorSha256 = "sha256-GuaBdqiqKUhYySYlJlJIR1NhUx7LuCqcUSXfLTkIvQI="; + vendorHash = "sha256-281Qz57n5qAOoqLofTFv5UcLs0xVz8iyV9yxDdsuljE="; subPackages = [ "." ]; From 76fb7480de6d5cd5995b0b5da1e7e19e4db010a9 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 21 Jan 2023 18:40:16 +0100 Subject: [PATCH 218/326] buildbot: fix tests --- pkgs/development/python-modules/buildbot/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index c30e54aca998..8a59637363e3 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -118,6 +118,9 @@ let substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" ''; + # Silence the depreciation warning from SqlAlchemy + SQLALCHEMY_SILENCE_UBER_WARNING = 1; + # TimeoutErrors on slow machines -> aarch64 doCheck = !stdenv.isAarch64; @@ -127,6 +130,8 @@ let # remove testfile which is missing configuration file from sdist rm buildbot/test/integration/test_graphql.py + # tests in this file are flaky, see https://github.com/buildbot/buildbot/issues/6776 + rm buildbot/test/integration/test_try_client.py ''; passthru = { From d64b30098b10a1e19ecb90b15c050cc949ffffad Mon Sep 17 00:00:00 2001 From: Jade Date: Sat, 21 Jan 2023 12:51:23 -0500 Subject: [PATCH 219/326] libpcap: added support for rpcapd --- pkgs/development/libraries/libpcap/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index f3d3587c14fa..443e4de04d9e 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchurl, flex, bison, bluez, pkg-config, withBluez ? false }: +{ lib +, stdenv +, fetchurl +, flex +, bison +, bluez +, libxcrypt +, pkg-config +, withBluez ? false +, withRemote ? false +}: with lib; @@ -11,6 +21,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-7ShfSsyvBTRPkJdXV7Pb/ncrpB0cQBwmSLf6RbcRvdQ="; }; + buildInputs = optionals withRemote [ libxcrypt ]; + nativeBuildInputs = [ flex bison ] ++ optionals withBluez [ bluez.dev pkg-config ]; @@ -20,6 +32,8 @@ stdenv.mkDerivation rec { "--with-pcap=${if stdenv.isLinux then "linux" else "bpf"}" ] ++ optionals stdenv.isDarwin [ "--disable-universal" + ] ++ optionals withRemote [ + "--enable-remote" ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "ac_cv_linux_vers=2" ]; From 54626a9b527f31f5e926cc53b9579b071607da62 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 21 Jan 2023 18:28:29 +0000 Subject: [PATCH 220/326] mc: 4.8.28 -> 4.8.29 Changes: http://www.midnight-commander.org/wiki/NEWS-4.8.29 --- pkgs/applications/file-managers/mc/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix index 9204aad535ea..8b54d79622a4 100644 --- a/pkgs/applications/file-managers/mc/default.nix +++ b/pkgs/applications/file-managers/mc/default.nix @@ -16,7 +16,6 @@ , libssh2 , openssl , coreutils -, autoreconfHook , autoSignDarwinBinariesHook # updater only @@ -25,23 +24,14 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.28"; + version = "4.8.29"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-6ZTZvppxcumsSkrWIQeSH2qjEuZosFbf5bi867r1OAM="; + sha256 = "sha256-AdijuU9YGAzKW/FyV7UHjR/W/SeptcDpcOx2dUlUCtQ="; }; - patches = [ - # Add support for PERL_FOR_BUILD to fix cross-compilation: - # https://midnight-commander.org/ticket/4399 - (fetchurl { - url = "https://midnight-commander.org/raw-attachment/ticket/4399/0001-configure.ac-introduce-PERL_FOR_BUILD.patch"; - hash = "sha256-i4cbg/pner+yPfgmP04DEIvpNDlM9YDca1TNBdhWhwI="; - }) - ]; - - nativeBuildInputs = [ pkg-config autoreconfHook unzip ] + nativeBuildInputs = [ pkg-config unzip ] # The preFixup hook rewrites the binary, which invaliates the code # signature. Add the fixup hook to sign the output. ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ From 2660299f54698b7bd8e8cb11809d45c5377377c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 21:19:00 +0000 Subject: [PATCH 221/326] bowtie2: 2.4.5 -> 2.5.1 --- pkgs/applications/science/biology/bowtie2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 1702079e017f..954b704be0c6 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.4.5"; + version = "2.5.1"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xCsTkQXrZS+Njn0YfidhPln+OwVfTXOqbtB0dCfTP2U="; + sha256 = "sha256-HaiZmWU6akHXJVWBmCvkG2E61NDrAP7UIxx9DNCEZqE="; }; nativeBuildInputs = [ cmake ]; From 046f822dd5fa612031b79209cb1cee0efddd5850 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 Jan 2023 22:00:05 +0000 Subject: [PATCH 222/326] home-assistant: 2023.1.5 -> 2023.1.6 https://github.com/home-assistant/core/releases/tag/2023.1.6 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index cb7490c78fb2..ce9192f70c30 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.1.5"; + version = "2023.1.6"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 3d0863ed6fd0..b2bfea501dd1 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -325,7 +325,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.1.5"; + hassVersion = "2023.1.6"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -343,7 +343,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-gqWkj90Vw+Pne0Iseet1Jz0Eh3YpUiqspGltvU5Pxro="; + hash = "sha256-szD9smS1OZAECvFufmj0qfnIXFivB93D5XEwWeiIYh4="; }; # leave this in, so users don't have to constantly update their downstream patch handling From 8acd881cf658293c88b9545c112a495ae4ba3748 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 00:03:56 +0000 Subject: [PATCH 223/326] goeland: 0.12.3 -> 0.13.0 --- .../applications/networking/feedreaders/goeland/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/applications/networking/feedreaders/goeland/default.nix index 270cb7cdb622..4c82bcdd3168 100644 --- a/pkgs/applications/networking/feedreaders/goeland/default.nix +++ b/pkgs/applications/networking/feedreaders/goeland/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "goeland"; - version = "0.12.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "slurdge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R3ZkGTq0g90DkflLXr2MUBIv5Qspi3OM+sdDGqJYjyw="; + sha256 = "sha256-MD8wdXOZ8Kmun8AYv/zlRKwgAcGu2A349Xr8d7SVX4s="; }; - vendorSha256 = "sha256-iljGBe8c6dqEHRpMN5cz7wmminejoiXXDKuQDazDztA="; + vendorHash = "sha256-BErLmtzgVqDKLFAnKugDBwj3Vgm8rM6BfWcMOhu4SWY="; ldflags = [ "-s" From e9331891f2cc9dcaf574a40bded86a859b64d8fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 00:27:36 +0000 Subject: [PATCH 224/326] nuraft: 1.3.0 -> 2.1.0 --- pkgs/development/libraries/nuraft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nuraft/default.nix b/pkgs/development/libraries/nuraft/default.nix index 232fdfc512f0..d8a56a7a5bfe 100644 --- a/pkgs/development/libraries/nuraft/default.nix +++ b/pkgs/development/libraries/nuraft/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuraft"; - version = "1.3.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "eBay"; repo = "NuRaft"; rev = "v${version}"; - sha256 = "sha256-Fyy9B5CXyMcDSOdqaeJ4ejo1svM90ESXuNL0rzsTZpE="; + sha256 = "sha256-puO8E7tSLqB0oq/NlzEZqQgIZKm7ZUb4HhR0XuI9dco="; }; nativeBuildInputs = [ cmake ]; From a2f9ee028e660a038faef20e959d3dd835968736 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 21 Jan 2023 20:34:17 -0500 Subject: [PATCH 225/326] cargo-careful: init at 0.2.4 --- .../tools/rust/cargo-careful/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-careful/default.nix diff --git a/pkgs/development/tools/rust/cargo-careful/default.nix b/pkgs/development/tools/rust/cargo-careful/default.nix new file mode 100644 index 000000000000..ae3e0f163153 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-careful/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-careful"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "RalfJung"; + repo = "cargo-careful"; + rev = "v${version}"; + hash = "sha256-kKF/Fp6RCF9PUdgqeo2e4vLVhl8+5M4oa0Q18ZdXJRc="; + }; + + cargoHash = "sha256-rhTi4rHfU+ZgNAMXSX7r5k3NfMUPNjHIUDs6FzeqcWk="; + + meta = with lib; { + description = "A tool to execute Rust code carefully, with extra checking along the way"; + homepage = "https://github.com/RalfJung/cargo-careful"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 649e19e17661..58f682c6ae2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15583,6 +15583,7 @@ with pkgs; cargo-cache = callPackage ../development/tools/rust/cargo-cache { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-careful = callPackage ../development/tools/rust/cargo-careful { }; cargo-chef = callPackage ../development/tools/rust/cargo-chef { }; cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation; From 5037415bf66351403b72d619804956df945ac731 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 01:43:01 +0000 Subject: [PATCH 226/326] simgear: 2020.3.14 -> 2020.3.17 --- pkgs/development/libraries/simgear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index 649c1dbae27a..5fe290f04f2c 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.14"; + version = "2020.3.17"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-NbpHn1e9+TD+9/iSFBw16/CQMXYx3D/aSDhkSGdBT3Q="; + sha256 = "sha256-TF6c0Nz/G9MRwkYKpgEjC9gKvbrsdRtVnB1xR3SfN3w="; }; nativeBuildInputs = [ cmake ]; From 2dbb06e267e5b4e657ca71df8363cc0ab3396423 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 3 Jan 2023 02:29:02 +0100 Subject: [PATCH 227/326] fmt: fmt_7 -> fmt_9 Change the default fmt alias from fmt_7 to fmt_9 (i.e. the latest). Follow-up on PR #187482 (56603378ba3fa9877ad69e2bf8c55709e061fdfd). --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 649e19e17661..dd146107354f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19473,8 +19473,7 @@ with pkgs; inherit (callPackages ../development/libraries/fmt { }) fmt_7 fmt_8 fmt_9; - fmt = fmt_7; - fmt_latest = fmt_9; + fmt = fmt_9; fplll = callPackage ../development/libraries/fplll {}; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; From 8c11effee2cb3fdece23a5d28147156647f55963 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 3 Jan 2023 02:29:26 +0100 Subject: [PATCH 228/326] treewide: pin to fmt_7 Pin all packages using the default fmt to the older fmt_7. --- .../instant-messengers/jami/default.nix | 3 +- pkgs/games/0ad/default.nix | 4 +- pkgs/top-level/all-packages.nix | 73 +++++++++++++++---- pkgs/top-level/python-packages.nix | 8 +- 4 files changed, 68 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index ea898c0da8c9..4bfd71960584 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -10,6 +10,7 @@ , jack , udev , qt6Packages +, fmt }: let @@ -105,7 +106,7 @@ rec { }; jami-daemon = callPackage ./daemon.nix { - inherit version src udev jack jami-meta ffmpeg-jami pjsip-jami opendht-jami; + inherit version src udev jack jami-meta ffmpeg-jami pjsip-jami opendht-jami fmt; }; jami-client = qt6Packages.callPackage ./client.nix { diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index 860db7c6d5ae..7f34874e81c2 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -1,9 +1,9 @@ -{ wxGTK, stdenv, newScope }: +{ wxGTK, fmt, stdenv, newScope }: let callPackage = newScope self; self = { - zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK stdenv; }; + zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK fmt stdenv; }; zeroad-data = callPackage ./data.nix { inherit stdenv; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd146107354f..4950f76c3934 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1191,6 +1191,7 @@ with pkgs; adlplug = callPackage ../applications/audio/adlplug { inherit (darwin.apple_sdk.frameworks) Foundation Cocoa Carbon CoreServices ApplicationServices CoreAudio CoreMIDI AudioToolbox Accelerate CoreImage IOKit AudioUnit QuartzCore WebKit DiscRecording CoreAudioKit; + fmt = fmt_7; jack = libjack2; }; opnplug = adlplug.override { @@ -2112,6 +2113,7 @@ with pkgs; pcsx2 = callPackage ../applications/emulators/pcsx2 { wxGTK = wxGTK30; + fmt = fmt_7; }; pcsxr = callPackage ../applications/emulators/pcsxr { }; @@ -2209,6 +2211,7 @@ with pkgs; dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; + fmt = fmt_7; }; ### APPLICATIONS/EMULATORS/RETROARCH @@ -4043,7 +4046,9 @@ with pkgs; wdomirror = callPackage ../tools/wayland/wdomirror { }; - wdt = callPackage ../applications/networking/sync/wdt { }; + wdt = callPackage ../applications/networking/sync/wdt { + fmt = fmt_7; + }; wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; @@ -5790,6 +5795,7 @@ with pkgs; libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { lua = lua5_4; + fmt = fmt_7; }) ceph ceph-client; @@ -6926,7 +6932,10 @@ with pkgs; eris-go = callPackage ../servers/eris-go { }; - ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; }; + ericw-tools = callPackage ../applications/misc/ericw-tools { + stdenv = gcc10StdenvCompat; + fmt = fmt_7; + }; cryfs = callPackage ../tools/filesystems/cryfs { }; @@ -7069,11 +7078,15 @@ with pkgs; chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { }; - fcitx5 = libsForQt5.callPackage ../tools/inputmethods/fcitx5 { }; + fcitx5 = libsForQt5.callPackage ../tools/inputmethods/fcitx5 { + fmt = fmt_7; + }; fcitx5-with-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/with-addons.nix { }; - fcitx5-chinese-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { }; + fcitx5-chinese-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { + fmt = fmt_7; + }; fcitx5-mozc = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { abseil-cpp = abseil-cpp.override { @@ -7091,9 +7104,13 @@ with pkgs; fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { lua = lua5_3; }; - fcitx5-m17n = callPackage ../tools/inputmethods/fcitx5/fcitx5-m17n.nix { }; + fcitx5-m17n = callPackage ../tools/inputmethods/fcitx5/fcitx5-m17n.nix { + fmt = fmt_7; + }; - fcitx5-gtk = callPackage ../tools/inputmethods/fcitx5/fcitx5-gtk.nix { }; + fcitx5-gtk = callPackage ../tools/inputmethods/fcitx5/fcitx5-gtk.nix { + fmt = fmt_7; + }; fcitx5-hangul = callPackage ../tools/inputmethods/fcitx5/fcitx5-hangul.nix { }; @@ -10267,6 +10284,7 @@ with pkgs; opendht = callPackage ../development/libraries/opendht { inherit (darwin.apple_sdk.frameworks) Security; + fmt = fmt_7; }; opendkim = callPackage ../development/libraries/opendkim { }; @@ -12551,7 +12569,9 @@ with pkgs; trdl-client = callPackage ../tools/misc/trdl-client { }; - trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { }; + trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { + fmt = fmt_7; + }; trickle = callPackage ../tools/networking/trickle {}; @@ -15363,6 +15383,7 @@ with pkgs; rocsolver = callPackage ../development/libraries/rocsolver { stdenv = rocmClangStdenv; + fmt = fmt_7; }; rocm-opencl-runtime = callPackage ../development/libraries/rocm-opencl-runtime { @@ -18855,6 +18876,7 @@ with pkgs; bencode = callPackage ../development/libraries/bencode { stdenv = gcc10StdenvCompat; + fmt = fmt_7; }; bencodetools = callPackage ../development/libraries/bencodetools { }; @@ -21961,7 +21983,9 @@ with pkgs; minizip-ng = callPackage ../development/libraries/minizip-ng { }; - mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { }; + mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { + fmt = fmt_7; + }; mkvtoolnix-cli = mkvtoolnix.override { withGUI = false; @@ -24411,6 +24435,7 @@ with pkgs; inherit (callPackages ../servers/mpd { inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit; + fmt = fmt_7; }) mpd mpd-small mpdWithFeatures; libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { }; @@ -25664,7 +25689,9 @@ with pkgs; kmscube = callPackage ../os-specific/linux/kmscube { }; - kmsxx = callPackage ../development/libraries/kmsxx { }; + kmsxx = callPackage ../development/libraries/kmsxx { + fmt = fmt_7; + }; latencytop = callPackage ../os-specific/linux/latencytop { }; @@ -31305,7 +31332,9 @@ with pkgs; oroborus = callPackage ../applications/window-managers/oroborus {}; - osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; + osm2pgsql = callPackage ../tools/misc/osm2pgsql { + fmt = fmt_7; + }; ostinato = libsForQt5.callPackage ../applications/networking/ostinato { }; @@ -31633,7 +31662,9 @@ with pkgs; boost = boost175; }; - openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { }; + openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { + fmt = fmt_7; + }; openjump = callPackage ../applications/misc/openjump { }; @@ -32504,7 +32535,9 @@ with pkgs; wavebox = callPackage ../applications/networking/instant-messengers/wavebox { }; - sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; + sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { + fmt = fmt_7; + }; stag = callPackage ../applications/misc/stag { curses = ncurses; @@ -34183,6 +34216,7 @@ with pkgs; litecoin = libsForQt5.callPackage ../applications/blockchains/litecoin { inherit (darwin.apple_sdk.frameworks) AppKit; boost = pkgs.boost174; + fmt = fmt_7; }; litecoind = litecoin.override { withGui = false; }; @@ -34643,6 +34677,7 @@ with pkgs; SDL2 = SDL2.override { withStatic = true; }; + fmt = fmt_7; }; dhewm3 = callPackage ../games/dhewm3 { }; @@ -34667,7 +34702,9 @@ with pkgs; d1x-rebirth-full d2x-rebirth-full; - easyrpg-player = callPackage ../games/easyrpg-player { }; + easyrpg-player = callPackage ../games/easyrpg-player { + fmt = fmt_7; + }; eboard = callPackage ../games/eboard { }; @@ -35577,6 +35614,7 @@ with pkgs; zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad { wxGTK = wxGTK32; + fmt = fmt_7; }); zeroad = zeroadPackages.zeroad; @@ -35708,7 +35746,9 @@ with pkgs; cp2k = callPackage ../applications/science/chemistry/cp2k { }; - d-seams = callPackage ../applications/science/chemistry/d-seams {}; + d-seams = callPackage ../applications/science/chemistry/d-seams { + fmt = fmt_7; + }; ergoscf = callPackage ../applications/science/chemistry/ergoscf { }; @@ -37291,7 +37331,9 @@ with pkgs; kompose = callPackage ../applications/networking/cluster/kompose { }; - kompute = callPackage ../development/libraries/kompute { }; + kompute = callPackage ../development/libraries/kompute { + fmt = fmt_7; + }; kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; @@ -38608,6 +38650,7 @@ with pkgs; # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; jack = libjack2; + fmt = fmt_7; }; inherit (jami) jami-daemon jami-client; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7cc0f49178e9..866bab8a9ff7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9656,7 +9656,9 @@ self: super: with self; { qiskit = callPackage ../development/python-modules/qiskit { }; - qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; + qiskit-aer = callPackage ../development/python-modules/qiskit-aer { + fmt = pkgs.fmt_7; + }; qiskit-finance = callPackage ../development/python-modules/qiskit-finance { }; @@ -12007,7 +12009,9 @@ self: super: with self; { volvooncall = callPackage ../development/python-modules/volvooncall { }; - vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; + vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { + fmt = pkgs.fmt_7; + }; vpk = callPackage ../development/python-modules/vpk { }; From 6a1bfe659cde6a436c0408ac27d994b127eae01d Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 3 Jan 2023 02:30:09 +0100 Subject: [PATCH 229/326] treewide: unpin fmt_7, use latest fmt where possible --- .../instant-messengers/jami/default.nix | 3 +- pkgs/games/0ad/default.nix | 4 +- pkgs/top-level/all-packages.nix | 59 ++++--------------- pkgs/top-level/python-packages.nix | 8 +-- 4 files changed, 17 insertions(+), 57 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 4bfd71960584..ea898c0da8c9 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -10,7 +10,6 @@ , jack , udev , qt6Packages -, fmt }: let @@ -106,7 +105,7 @@ rec { }; jami-daemon = callPackage ./daemon.nix { - inherit version src udev jack jami-meta ffmpeg-jami pjsip-jami opendht-jami fmt; + inherit version src udev jack jami-meta ffmpeg-jami pjsip-jami opendht-jami; }; jami-client = qt6Packages.callPackage ./client.nix { diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index 7f34874e81c2..860db7c6d5ae 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -1,9 +1,9 @@ -{ wxGTK, fmt, stdenv, newScope }: +{ wxGTK, stdenv, newScope }: let callPackage = newScope self; self = { - zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK fmt stdenv; }; + zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK stdenv; }; zeroad-data = callPackage ./data.nix { inherit stdenv; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4950f76c3934..b8c1d05be0a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1191,7 +1191,6 @@ with pkgs; adlplug = callPackage ../applications/audio/adlplug { inherit (darwin.apple_sdk.frameworks) Foundation Cocoa Carbon CoreServices ApplicationServices CoreAudio CoreMIDI AudioToolbox Accelerate CoreImage IOKit AudioUnit QuartzCore WebKit DiscRecording CoreAudioKit; - fmt = fmt_7; jack = libjack2; }; opnplug = adlplug.override { @@ -2113,7 +2112,6 @@ with pkgs; pcsx2 = callPackage ../applications/emulators/pcsx2 { wxGTK = wxGTK30; - fmt = fmt_7; }; pcsxr = callPackage ../applications/emulators/pcsxr { }; @@ -4046,9 +4044,7 @@ with pkgs; wdomirror = callPackage ../tools/wayland/wdomirror { }; - wdt = callPackage ../applications/networking/sync/wdt { - fmt = fmt_7; - }; + wdt = callPackage ../applications/networking/sync/wdt { }; wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; @@ -6932,10 +6928,7 @@ with pkgs; eris-go = callPackage ../servers/eris-go { }; - ericw-tools = callPackage ../applications/misc/ericw-tools { - stdenv = gcc10StdenvCompat; - fmt = fmt_7; - }; + ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; }; cryfs = callPackage ../tools/filesystems/cryfs { }; @@ -7078,15 +7071,11 @@ with pkgs; chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { }; - fcitx5 = libsForQt5.callPackage ../tools/inputmethods/fcitx5 { - fmt = fmt_7; - }; + fcitx5 = libsForQt5.callPackage ../tools/inputmethods/fcitx5 { }; fcitx5-with-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/with-addons.nix { }; - fcitx5-chinese-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { - fmt = fmt_7; - }; + fcitx5-chinese-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { }; fcitx5-mozc = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { abseil-cpp = abseil-cpp.override { @@ -7104,13 +7093,9 @@ with pkgs; fcitx5-lua = callPackage ../tools/inputmethods/fcitx5/fcitx5-lua.nix { lua = lua5_3; }; - fcitx5-m17n = callPackage ../tools/inputmethods/fcitx5/fcitx5-m17n.nix { - fmt = fmt_7; - }; + fcitx5-m17n = callPackage ../tools/inputmethods/fcitx5/fcitx5-m17n.nix { }; - fcitx5-gtk = callPackage ../tools/inputmethods/fcitx5/fcitx5-gtk.nix { - fmt = fmt_7; - }; + fcitx5-gtk = callPackage ../tools/inputmethods/fcitx5/fcitx5-gtk.nix { }; fcitx5-hangul = callPackage ../tools/inputmethods/fcitx5/fcitx5-hangul.nix { }; @@ -10284,7 +10269,6 @@ with pkgs; opendht = callPackage ../development/libraries/opendht { inherit (darwin.apple_sdk.frameworks) Security; - fmt = fmt_7; }; opendkim = callPackage ../development/libraries/opendkim { }; @@ -12569,9 +12553,7 @@ with pkgs; trdl-client = callPackage ../tools/misc/trdl-client { }; - trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { - fmt = fmt_7; - }; + trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { }; trickle = callPackage ../tools/networking/trickle {}; @@ -15383,7 +15365,6 @@ with pkgs; rocsolver = callPackage ../development/libraries/rocsolver { stdenv = rocmClangStdenv; - fmt = fmt_7; }; rocm-opencl-runtime = callPackage ../development/libraries/rocm-opencl-runtime { @@ -18876,7 +18857,6 @@ with pkgs; bencode = callPackage ../development/libraries/bencode { stdenv = gcc10StdenvCompat; - fmt = fmt_7; }; bencodetools = callPackage ../development/libraries/bencodetools { }; @@ -21983,9 +21963,7 @@ with pkgs; minizip-ng = callPackage ../development/libraries/minizip-ng { }; - mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { - fmt = fmt_7; - }; + mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { }; mkvtoolnix-cli = mkvtoolnix.override { withGUI = false; @@ -24435,7 +24413,6 @@ with pkgs; inherit (callPackages ../servers/mpd { inherit (darwin.apple_sdk.frameworks) AudioToolbox AudioUnit; - fmt = fmt_7; }) mpd mpd-small mpdWithFeatures; libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { }; @@ -25689,9 +25666,7 @@ with pkgs; kmscube = callPackage ../os-specific/linux/kmscube { }; - kmsxx = callPackage ../development/libraries/kmsxx { - fmt = fmt_7; - }; + kmsxx = callPackage ../development/libraries/kmsxx { }; latencytop = callPackage ../os-specific/linux/latencytop { }; @@ -32535,9 +32510,7 @@ with pkgs; wavebox = callPackage ../applications/networking/instant-messengers/wavebox { }; - sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { - fmt = fmt_7; - }; + sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { }; stag = callPackage ../applications/misc/stag { curses = ncurses; @@ -34216,7 +34189,6 @@ with pkgs; litecoin = libsForQt5.callPackage ../applications/blockchains/litecoin { inherit (darwin.apple_sdk.frameworks) AppKit; boost = pkgs.boost174; - fmt = fmt_7; }; litecoind = litecoin.override { withGui = false; }; @@ -34677,7 +34649,6 @@ with pkgs; SDL2 = SDL2.override { withStatic = true; }; - fmt = fmt_7; }; dhewm3 = callPackage ../games/dhewm3 { }; @@ -34702,9 +34673,7 @@ with pkgs; d1x-rebirth-full d2x-rebirth-full; - easyrpg-player = callPackage ../games/easyrpg-player { - fmt = fmt_7; - }; + easyrpg-player = callPackage ../games/easyrpg-player { }; eboard = callPackage ../games/eboard { }; @@ -35614,7 +35583,6 @@ with pkgs; zeroadPackages = recurseIntoAttrs (callPackage ../games/0ad { wxGTK = wxGTK32; - fmt = fmt_7; }); zeroad = zeroadPackages.zeroad; @@ -35746,9 +35714,7 @@ with pkgs; cp2k = callPackage ../applications/science/chemistry/cp2k { }; - d-seams = callPackage ../applications/science/chemistry/d-seams { - fmt = fmt_7; - }; + d-seams = callPackage ../applications/science/chemistry/d-seams {}; ergoscf = callPackage ../applications/science/chemistry/ergoscf { }; @@ -38650,7 +38616,6 @@ with pkgs; # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; jack = libjack2; - fmt = fmt_7; }; inherit (jami) jami-daemon jami-client; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 866bab8a9ff7..7cc0f49178e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9656,9 +9656,7 @@ self: super: with self; { qiskit = callPackage ../development/python-modules/qiskit { }; - qiskit-aer = callPackage ../development/python-modules/qiskit-aer { - fmt = pkgs.fmt_7; - }; + qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; qiskit-finance = callPackage ../development/python-modules/qiskit-finance { }; @@ -12009,9 +12007,7 @@ self: super: with self; { volvooncall = callPackage ../development/python-modules/volvooncall { }; - vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { - fmt = pkgs.fmt_7; - }; + vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; vpk = callPackage ../development/python-modules/vpk { }; From bca50871099f6dcd84a1ce5027ce2057e02f1df7 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 3 Jan 2023 02:30:21 +0100 Subject: [PATCH 230/326] dolphin-emu-primehack: pin fmt_7 -> fmt_8 Bump to latest supported fmt. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8c1d05be0a2..79db555950cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2209,7 +2209,7 @@ with pkgs; dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; - fmt = fmt_7; + fmt = fmt_8; }; ### APPLICATIONS/EMULATORS/RETROARCH From 9e570e9ceab6c78b8e48356f5c2dc0e09f4226d0 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 3 Jan 2023 02:30:45 +0100 Subject: [PATCH 231/326] osm2pgsql: pin fmt_7 -> fmt_8 Bump to latest supported fmt. --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 79db555950cc..b71f7371801b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31308,7 +31308,8 @@ with pkgs; oroborus = callPackage ../applications/window-managers/oroborus {}; osm2pgsql = callPackage ../tools/misc/osm2pgsql { - fmt = fmt_7; + # fmt_9 is not supported: https://github.com/openstreetmap/osm2pgsql/issues/1859 + fmt = fmt_8; }; ostinato = libsForQt5.callPackage ../applications/networking/ostinato { }; From d2eac42a6f2ff122725b5bf9aed0a70002cdb9ab Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 3 Jan 2023 02:30:52 +0100 Subject: [PATCH 232/326] kompute: pin fmt_7 -> fmt_8 Bump to latest supported fmt. --- pkgs/development/libraries/kompute/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kompute/default.nix b/pkgs/development/libraries/kompute/default.nix index 0b79bd7e56a2..ced30a87dbfa 100644 --- a/pkgs/development/libraries/kompute/default.nix +++ b/pkgs/development/libraries/kompute/default.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { url = "https://github.com/KomputeProject/kompute/commit/9a791b161dd58ca927fe090f65fa2b0e5e85e7ca.diff"; sha256 = "OtFTN8sgPlyiMmVzUnqzCkVMKj6DWxbCXtYwkRdEprY="; }) + (fetchpatch { + name = "enum-class-fix-for-fmt-8-x.patch"; + url = "https://github.com/KomputeProject/kompute/commit/f731f2e55c7aaaa804111106c3e469f9a642d4eb.patch"; + sha256 = "sha256-scTCYqkgKQnH27xzuY4FVbiwRuwBvChmLPPU7ZUrrL0="; + }) ]; cmakeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b71f7371801b..09516b4aa160 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37299,7 +37299,7 @@ with pkgs; kompose = callPackage ../applications/networking/cluster/kompose { }; kompute = callPackage ../development/libraries/kompute { - fmt = fmt_7; + fmt = fmt_8; }; kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; From 44c6d3cc10b6a7caae885f8ee5dc9465fcc4880f Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 3 Jan 2023 02:30:59 +0100 Subject: [PATCH 233/326] openimageio: pin fmt_7 -> fmt_8 Bump to latest supported fmt. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09516b4aa160..43a4c611ea77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31639,7 +31639,7 @@ with pkgs; }; openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { - fmt = fmt_7; + fmt = fmt_8; }; openjump = callPackage ../applications/misc/openjump { }; From b9bf4d5378762acfe7367fa4fef7b61d1f479596 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 3 Jan 2023 02:31:06 +0100 Subject: [PATCH 234/326] ceph: pin fmt_7 -> fmt_8 Bump to latest supported fmt. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43a4c611ea77..61a40bfaf246 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5791,7 +5791,7 @@ with pkgs; libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { lua = lua5_4; - fmt = fmt_7; + fmt = fmt_8; }) ceph ceph-client; From fb9496a58fa963aa53c18a1b318e522ddb38b8a5 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 3 Jan 2023 02:31:11 +0100 Subject: [PATCH 235/326] fmt_7: remove unused pkg --- pkgs/development/libraries/fmt/default.nix | 5 ----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 76107e1e0702..5f810ecbe5ed 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -42,11 +42,6 @@ let }; in { - fmt_7 = generic { - version = "7.1.3"; - sha256 = "08hyv73qp2ndbs0isk8pspsphdzz5qh8czl3wgyxy3mmif9xdg29"; - }; - fmt_8 = generic { version = "8.1.1"; sha256 = "sha256-leb2800CwdZMJRWF5b1Y9ocK0jXpOX/nwo95icDf308="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61a40bfaf246..44df4ec5f6a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19473,7 +19473,7 @@ with pkgs; flyway = callPackage ../development/tools/flyway { }; - inherit (callPackages ../development/libraries/fmt { }) fmt_7 fmt_8 fmt_9; + inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9; fmt = fmt_9; From 6f7decf60b3241c7b142d6ce59c7db1115413bad Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 22 Jan 2023 04:17:00 +0100 Subject: [PATCH 236/326] freedv: 1.8.6 -> 1.8.7 --- pkgs/applications/radio/freedv/default.nix | 26 +++++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index d6b4794e97d8..06cb2776a0b3 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -3,6 +3,9 @@ , stdenv , fetchFromGitHub , cmake +, macdylibbundler +, makeWrapper +, darwin , codec2 , libpulseaudio , libsamplerate @@ -21,23 +24,28 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-zzzRePBc09fK1ILoDto3EVz7IxJKePi39E18BrQedE0="; + hash = "sha256-N9LZCf2YAhVgxnQWgCB9TqGNpUGP1ZqpLmbYIaQsn08="; }; postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/CMakeLists.txt \ - --replace "if(APPLE)" "if(0)" \ - --replace "\''${FREEDV_LINK_LIBS})" "\''${FREEDV_LINK_LIBS} \''${FREEDV_LINK_LIBS_OSX})" \ - --replace "\''${RES_FILES})" "\''${RES_FILES} \''${FREEDV_SOURCES_OSX})" + --replace "\''${CMAKE_SOURCE_DIR}/macdylibbundler/dylibbundler" "dylibbundler" + sed -i "/hdiutil/d" src/CMakeLists.txt ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals stdenv.isDarwin [ + macdylibbundler + makeWrapper + darwin.autoSignDarwinBinariesHook + ]; buildInputs = [ codec2 @@ -67,6 +75,12 @@ stdenv.mkDerivation rec { doCheck = true; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/bin/FreeDV.app $out/Applications + makeWrapper $out/Applications/FreeDV.app/Contents/MacOS/FreeDV $out/bin/freedv + ''; + meta = with lib; { homepage = "https://freedv.org/"; description = "Digital voice for HF radio"; From 96f9166f68878087b27b4c10ae1d67e491024e51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 05:16:04 +0000 Subject: [PATCH 237/326] pachyderm: 2.4.2 -> 2.4.4 --- pkgs/applications/networking/cluster/pachyderm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index a7544e50b380..ce363080f459 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.4.2"; + version = "2.4.4"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-IzZBs6g6MQKofhMIdLr7ty7HzwF+SoyzCJ6RDMHt0mo="; + hash = "sha256-53VUZHA+yURikVtcXXa/fZqwAqwjukBKS4NQEBBoHew="; }; - vendorHash = "sha256-j7zg0vIhdYbzyi4owdVEF4XyUNwGds6J01+3k5K90Yg="; + vendorHash = "sha256-k6ODl+whgeeyd8XaOjTDjxfShpOztirjq/Tg98YP8Hs="; subPackages = [ "src/server/cmd/pachctl" ]; From b92f2042a008218f614b4910dbaa9d700bd45da8 Mon Sep 17 00:00:00 2001 From: Ian McFarlane Date: Sun, 22 Jan 2023 02:46:29 -0500 Subject: [PATCH 238/326] rose-pine-gtk: remove reference to nonexistent variable variant --- pkgs/data/themes/rose-pine-gtk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix index 8398373756f8..707b05fd8e2a 100644 --- a/pkgs/data/themes/rose-pine-gtk/default.nix +++ b/pkgs/data/themes/rose-pine-gtk/default.nix @@ -7,7 +7,7 @@ gtk_engines, }: stdenv.mkDerivation rec { - pname = "rose-pine-${variant}-gtk-theme"; + pname = "rose-pine-gtk-theme"; version = "unstable-2022-09-01"; src = fetchFromGitHub { From 4efd9c440b9b2cc5e74e4e1721c01afc908b8bdc Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 22 Jan 2023 08:32:20 +0000 Subject: [PATCH 239/326] postfix: add trivial updater --- pkgs/servers/mail/postfix/default.nix | 6 +++++- pkgs/servers/mail/postfix/update.sh | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100755 pkgs/servers/mail/postfix/update.sh diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 1093e8a8d1ce..684e8ade5226 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -104,7 +104,11 @@ in stdenv.mkDerivation rec { --prefix PATH ":" ${lib.makeBinPath [ coreutils findutils gnugrep gawk gnused ]} ''; - passthru.tests = { inherit (nixosTests) postfix postfix-raise-smtpd-tls-security-level; }; + passthru = { + tests = { inherit (nixosTests) postfix postfix-raise-smtpd-tls-security-level; }; + + updateScript = ./update.sh; + }; meta = with lib; { homepage = "http://www.postfix.org/"; diff --git a/pkgs/servers/mail/postfix/update.sh b/pkgs/servers/mail/postfix/update.sh new file mode 100755 index 000000000000..eacb548bc002 --- /dev/null +++ b/pkgs/servers/mail/postfix/update.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl pcre common-updater-scripts + +set -eu -o pipefail + +# Expect the text in format of 'Source code |' +# Stable release goes first. +new_version="$(curl -s http://cdn.postfix.johnriley.me/mirrors/postfix-release/index.html | + pcregrep -o1 '"official/postfix-([0-9.]+)[.]tar[.]gz">' | head -n1)" +update-source-version postfix "$new_version" From 9bc59980ab7cc5bfed425489260e6bebc0a1dc59 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 22 Jan 2023 08:50:47 +0000 Subject: [PATCH 240/326] postfix: 3.7.3 -> 3.7.4 Changes: http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/postfix-3.7.4.RELEASE_NOTES --- pkgs/servers/mail/postfix/default.nix | 7 ++----- pkgs/servers/mail/postfix/linux-6.patch | 26 ------------------------- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 pkgs/servers/mail/postfix/linux-6.patch diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 684e8ade5226..56380ed4b6ee 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.7.3"; + version = "3.7.4"; src = fetchurl { url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz"; - hash = "sha256-0i89N+91YT1dVztW/FHvCX8sDQsOQHkjcR9xwftykRs="; + hash = "sha256-TBN6IwNEjyWZODaDfe6uh/rF1NA68Rrejpvq2AYyhkU="; }; nativeBuildInputs = [ makeWrapper m4 ]; @@ -53,9 +53,6 @@ in stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/postfix/raw/2f9d42453e67ebc43f786d98262a249037f80a77/f/postfix-3.6.2-glibc-234-build-fix.patch"; sha256 = "sha256-xRUL5gaoIt6HagGlhsGwvwrAfYvzMgydsltYMWvl9BI="; }) - - # linux-6 compatibility - ./linux-6.patch ]; postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' diff --git a/pkgs/servers/mail/postfix/linux-6.patch b/pkgs/servers/mail/postfix/linux-6.patch deleted file mode 100644 index ee9a3be740a7..000000000000 --- a/pkgs/servers/mail/postfix/linux-6.patch +++ /dev/null @@ -1,26 +0,0 @@ -Extracted fix from postfix-3.8-20221006 snapshot: - https://github.com/vdukhovni/postfix/commit/b65530350fa4a7eee40946160fd80c3e1e0b63e5 ---- a/makedefs -+++ b/makedefs -@@ -627,7 +627,8 @@ EOF - : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} - : ${PLUGIN_LD="${CC-gcc} -shared"} - ;; -- Linux.[345].*) SYSTYPE=LINUX$RELEASE_MAJOR -+ Linux.[3456].*) -+ SYSTYPE=LINUX$RELEASE_MAJOR - case "$CCARGS" in - *-DNO_DB*) ;; - *-DHAS_DB*) ;; ---- a/src/util/sys_defs.h -+++ b/src/util/sys_defs.h -@@ -751,7 +751,8 @@ extern int initgroups(const char *, int); - /* - * LINUX. - */ --#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) -+#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) \ -+ || defined(LINUX6) - #define SUPPORTED - #define UINT32_TYPE unsigned int - #define UINT16_TYPE unsigned short From 8e228cb51defa02fc70164a0eb353a171caa2914 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 09:15:25 +0000 Subject: [PATCH 241/326] qownnotes: 23.1.0 -> 23.1.1 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 158c2389a313..99f5e0e249f6 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -17,14 +17,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.1.0"; + version = "23.1.1"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-HMs8DTL2BDSDmchadpVvbShjJMPP6W587F38uiixCuQ="; + sha256 = "sha256-BMisfFMy3kNoZHCYbGqzT9hxzVpKBUN6fSOilPw9O1w="; }; nativeBuildInputs = [ From 6f3f88ec480e713321503d3a9ccb8afec71ae97a Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 22 Jan 2023 14:04:34 +0200 Subject: [PATCH 242/326] linuxPackages.zenpower: unstable-2022-04-13 -> unstable-2022-11-04 upstream has moved https://github.com/Ta180m/zenpower3 https://git.exozy.me/a/zenpower3 --- pkgs/os-specific/linux/zenpower/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix index 1ba01a1c88fb..7a4facebcee8 100644 --- a/pkgs/os-specific/linux/zenpower/default.nix +++ b/pkgs/os-specific/linux/zenpower/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, kernel, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, kernel, fetchFromGitea }: stdenv.mkDerivation rec { pname = "zenpower"; - version = "unstable-2022-04-13"; + version = "unstable-2022-11-04"; - src = fetchFromGitHub { - owner = "Ta180m"; + src = fetchFromGitea { + domain = "git.exozy.me"; + owner = "a"; repo = "zenpower3"; - rev = "c36a86c64b802e9b90b5166caee6a8e8eddaeb56"; - sha256 = "1i9ap7xgab421f3c68mcmad25xs4h8pfz0g0f9yzg7hxpmb0npxi"; + rev = "c176fdb0d5bcba6ba2aba99ea36812e40f47751f"; + sha256 = "sha256-d2WH8Zv7F0phZmEKcDiaak9On+Mo9bAFhMulT/N5FWI="; }; hardeningDisable = [ "pic" ]; From 5461c2c4b7e753af7ac2e2b202ecfb105852f244 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 22 Jan 2023 20:45:13 +0800 Subject: [PATCH 243/326] nixosTests.pantheon: remove a TODO Pantheon is moving away from Bamf. --- nixos/tests/pantheon.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index 52f85f5c07da..7594c239e9b3 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -40,7 +40,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with subtest("Check that logging in has given the user ownership of devices"): machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") - # TODO: DBus API could eliminate this? Pantheon uses Bamf. with subtest("Check if pantheon session components actually start"): machine.wait_until_succeeds("pgrep gala") machine.wait_for_window("gala") From 009cdb01c71c5ffefcf9d831f1dec7e0cb0a6627 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 21 Jan 2023 23:23:51 +0800 Subject: [PATCH 244/326] nixosTests.pantheon: ensure switchboard starts I noticed this is something that can be easily broken during libsoup3 migration. --- nixos/tests/pantheon.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index 7594c239e9b3..d24d9a92c0a6 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -48,6 +48,12 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : machine.wait_until_succeeds("pgrep plank") machine.wait_for_window("plank") + with subtest("Open system settings"): + machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.switchboard >&2 &'") + # Wait for all plugins to be loaded before we check if the window is still there. + machine.sleep(5) + machine.wait_for_window("io.elementary.switchboard") + with subtest("Open elementary terminal"): machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal >&2 &'") machine.wait_for_window("io.elementary.terminal") From 30d5a2216fc0091a62841154a96d6d91d5d2aac2 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 21 Jan 2023 23:41:23 +0800 Subject: [PATCH 245/326] nixosTests.pantheon: nodes.machine.config -> nodes.machine Silence a warning: warning: Module argument `nodes.machine.config` is deprecated. Use `nodes.machine` instead. --- nixos/tests/pantheon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index d24d9a92c0a6..0773fc0472aa 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -20,8 +20,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; - bob = nodes.machine.config.users.users.bob; + user = nodes.machine.users.users.alice; + bob = nodes.machine.users.users.bob; in '' machine.wait_for_unit("display-manager.service") From d0206d0de07e14b4d62094fe05b821b0610e2ce2 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Sun, 22 Jan 2023 14:14:14 +0100 Subject: [PATCH 246/326] pythonPackages.pynmea2: 1.18.0 -> 1.19.0 https://github.com/Knio/pynmea2/compare/1.18.0...5d3d2013bff9c5bce2e14132d21fff865b1e58fd --- pkgs/development/python-modules/pynmea2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index 10ced5532452..859b12647460 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynmea2"; - version = "1.18.0"; + version = "1.19.0"; src = fetchPypi { inherit pname version; - sha256 = "1b94lhpbgvnknb563dlwvs5vkk7w3ma54sj614ynh2dzgqrd6h73"; + hash = "sha256-Hap5uTJ5+IfRwjXlzFx54yZEVkE4zkaYmrD0ovyXDXw="; }; nativeCheckInputs = [ pytestCheckHook ]; From 2166bf1bfe6db53e9052d4f96c952e036eb7ca25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 13:54:41 +0000 Subject: [PATCH 247/326] sambamba: 0.8.2 -> 1.0.0 --- pkgs/applications/science/biology/sambamba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/sambamba/default.nix b/pkgs/applications/science/biology/sambamba/default.nix index c6e78a134e60..38333cbc9988 100644 --- a/pkgs/applications/science/biology/sambamba/default.nix +++ b/pkgs/applications/science/biology/sambamba/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "sambamba"; - version = "0.8.2"; + version = "1.0.0"; src = fetchFromGitHub { owner = "biod"; repo = "sambamba"; rev = "v${version}"; - sha256 = "sha256-FEa9QjQoGNUOAtMNMZcqpTKMKVtXoBuOomTy0mpos/0="; + sha256 = "sha256-HwAzsbT71Q35Io6H7Hzs4RTatpRpdHqV0cwPYAlsf6c="; fetchSubmodules = true; }; From 637880a98ce604be0749a39ae5f3aa2cc00be101 Mon Sep 17 00:00:00 2001 From: Et7f3 Date: Sun, 22 Jan 2023 03:59:06 +0100 Subject: [PATCH 248/326] ocamlPackages.megam: fix build with ocaml_5_0 --- pkgs/applications/science/misc/megam/default.nix | 10 +++++++++- .../science/misc/megam/ocaml-includes.patch | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index 044f9ae56d05..e71c232be8f0 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -12,6 +12,14 @@ stdenv.mkDerivation { patches = [ ./ocaml-includes.patch ./ocaml-3.12.patch ]; + postPatch = '' + # Deprecated in ocaml 3.10 https://github.com/ocaml/ocaml/commit/f6190f3d0c49c5220d443ee8d03ca5072d68aa87 + # Deprecated in ocaml 3.08 https://github.com/ocaml/ocaml/commit/0c7aecb88dc696f66f49f3bed54a037361a26b8d + substituteInPlace fastdot_c.c --replace copy_double caml_copy_double --replace Bigarray_val Caml_ba_array_val --replace caml_bigarray caml_ba_array + # They were already deprecated in 3.12 https://v2.ocaml.org/releases/3.12/htmlman/libref/Array.html + substituteInPlace abffs.ml main.ml --replace create_matrix make_matrix + substituteInPlace intHashtbl.ml --replace Array.create Array.make + ''; strictDeps = true; nativeBuildInputs = [ makeWrapper ocaml ]; @@ -20,7 +28,7 @@ stdenv.mkDerivation { makeFlags = [ "CAML_INCLUDES=${ocaml}/lib/ocaml/caml" - "WITHBIGARRAY=bigarray.cma" + ("WITHBIGARRAY=" + lib.optionalString (lib.versionOlder ocaml.version "4.08.0") "bigarray.cma") ]; # see https://bugzilla.redhat.com/show_bug.cgi?id=435559 diff --git a/pkgs/applications/science/misc/megam/ocaml-includes.patch b/pkgs/applications/science/misc/megam/ocaml-includes.patch index b3a56643448c..d4f38949b4d3 100644 --- a/pkgs/applications/science/misc/megam/ocaml-includes.patch +++ b/pkgs/applications/science/misc/megam/ocaml-includes.patch @@ -15,7 +15,7 @@ diff -ru megam_0.92/Makefile megam_0.92-b/Makefile #WITHCLIBS =-I /usr/lib/ocaml/3.09.2/caml -WITHCLIBS =-I /usr/lib/ocaml/caml -+WITHCLIBS =-I $(CAML_INCLUDES) ++WITHCLIBS =-I $(CAML_INCLUDES) -I +unix -I +str ################ End of user's variables ##################### From aa7627a19f1cc46de098ca0e0c598790908f50a0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 20 Jan 2023 01:28:20 +0000 Subject: [PATCH 249/326] gperftools: broaden platforms Builds fine for NetBSD, will build for FreeBSD once https://github.com/NixOS/nixpkgs/pull/211230 is merged, and the README mentions some amount of Windows support. --- pkgs/development/libraries/gperftools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index c4f7770ae8c3..002d07cc33b7 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/gperftools/gperftools"; description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; - platforms = with platforms; linux ++ darwin; + platforms = platforms.all; license = licenses.bsd3; maintainers = with maintainers; [ vcunat ]; }; From b31162552614968eaad5668f35a4d969780e5183 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 20 Jan 2023 19:40:04 +0000 Subject: [PATCH 250/326] httrack: depend on libiconv unconditionally libiconv is already defined per-platform. The actual libiconv library won't be built on platforms like Linux where it doesn't need to be, so there's no need to maintain a separate platform list here. Required to build for FreeBSD. --- pkgs/tools/backup/httrack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index a01565c43a0a..8ac3bf740412 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl"; }; - buildInputs = [ zlib openssl ] ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ libiconv openssl zlib ]; enableParallelBuilding = true; From 58e4c2638c2e8988892ad4ef5d7a3b0cd7052477 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Sun, 22 Jan 2023 18:21:51 +0100 Subject: [PATCH 251/326] omnisharp-roslyn: 1.39.2 -> 1.39.4 --- .../tools/omnisharp-roslyn/default.nix | 4 +- .../tools/omnisharp-roslyn/deps.nix | 135 ++++++------------ 2 files changed, 42 insertions(+), 97 deletions(-) diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 0fc9952b592c..046956057017 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -13,13 +13,13 @@ let in let finalPackage = buildDotnetModule rec { pname = "omnisharp-roslyn"; - version = "1.39.2"; + version = "1.39.4"; src = fetchFromGitHub { owner = "OmniSharp"; repo = pname; rev = "v${version}"; - sha256 = "/MxBdMjPpq3Gwhi/93+JCAI+BuiiWu0n9QThQi+s/kE="; + sha256 = "rX0FeURw6WMbcJOomqHFcZ9tpKO1td60/HbbVClV324="; }; projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj"; diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix index ca9228eddb5d..e19073c93356 100644 --- a/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -4,13 +4,13 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Cake.Scripting.Abstractions"; version = "0.9.0"; sha256 = "15nqr100crclha0lzgil25j1wn45517gb34059qypj05j8psfmjx"; }) (fetchNuGet { pname = "Cake.Scripting.Transport"; version = "0.9.0"; sha256 = "1gpbvframx4dx4mzfh44cib6dfd26q7878vf073m9gv3y43sws7b"; }) - (fetchNuGet { pname = "Dotnet.Script.DependencyModel"; version = "1.3.1"; sha256 = "0bi9rg6c77qav8mb0rbvs5pczf9f0ii8i11c9vyib53bv6fiifxp"; }) - (fetchNuGet { pname = "Dotnet.Script.DependencyModel.NuGet"; version = "1.3.1"; sha256 = "1v2xd0f2xrkgdznnjad5vhjan51k9qwi4piyg5vdz9mvywail51q"; }) + (fetchNuGet { pname = "Dotnet.Script.DependencyModel"; version = "1.4.0"; sha256 = "08269f79r3a7iwf3i661k6vzi9xk21f0z21997dpyl2qhl5igndg"; }) + (fetchNuGet { pname = "Dotnet.Script.DependencyModel.NuGet"; version = "1.4.0"; sha256 = "0mhbxvcf9p48zzc3f2x25ihh1lxzzn63mwld5lkny5m1bx1fp198"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; sha256 = "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba"; }) (fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "3.1.0"; sha256 = "075n1mfsxwz514r94l8i3ax0wp43c3xb4f9w25a96h6xxnj0k2hd"; }) (fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.3.1"; sha256 = "1hwjihnjcycnzqksa6pcljj515nprpqjqbqy3shykd86micyhhxr"; }) (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.3.1"; sha256 = "0v27f8nv0q6q3n5h4sdf3hm2j9b1dmjx5hpxv9s16gb4ayiaq8y9"; }) @@ -20,61 +20,47 @@ (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.1"; sha256 = "0yib6x7hankpr9knfxascybhydkq6zwc3ahg8f2hzph9pcf9krjz"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; sha256 = "0b2xy6m3l1y6j2xc97cg5llia169jv4nszrrrqclh505gpw6qccz"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.4.0-3.22429.3"; sha256 = "1f8jjy4v0f5banvg3d0qwv43w86ja1hz3rq452kg44ikrsnhzvcw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.4.0-3.22429.3/microsoft.codeanalysis.common.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.4.0-3.22429.3"; sha256 = "1y5llwvgzzi294dh501h064l4c2niin4k0hkq1vr5hlyzcbzgdxg"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.4.0-3.22429.3/microsoft.codeanalysis.csharp.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.4.0-3.22429.3"; sha256 = "0swcsc4g6k1dfw8gmdk6dq35yrrw2idqzfxjqvx8hns453z33x73"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.4.0-3.22429.3/microsoft.codeanalysis.csharp.features.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.4.0-3.22429.3"; sha256 = "0sbwidq35lakh0y58ci67kpqayiyc69ag850fmrnjg7zwgcjc8p8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.4.0-3.22429.3/microsoft.codeanalysis.csharp.scripting.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.4.0-3.22429.3"; sha256 = "0k4kzg4b3wirp1n6ic995g35h70iwpcwr18c9z1246i0kc0nll2q"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.4.0-3.22429.3/microsoft.codeanalysis.csharp.workspaces.4.4.0-3.22429.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0-2.22527.10"; sha256 = "0xvlmg1n5aj7ifb1kd6jg1sk6251rz8xi877v8jz4qx178vqcx8s"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.5.0-2.22527.10/microsoft.codeanalysis.common.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0-2.22527.10"; sha256 = "15vsv35zzgjysyr5hsrykc9qx8l062i4fyqg6hay7acqfx5kp539"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.5.0-2.22527.10"; sha256 = "0bq3512kkhwq5p81svy7s850apdq0qmydjxqmms6f70sspyxh38b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.features.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.5.0-2.22527.10"; sha256 = "0lr2y28amwg5p0bb9gyh1yybci9swjwm0pp85nlr8zj8a8d1633w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.scripting.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0-2.22527.10"; sha256 = "0xwclnvvlq36955vlih56a28fp79c6927rmhlqkdhqs3lsdz9l23"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.workspaces.4.5.0-2.22527.10.nupkg"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0"; sha256 = "1y5r6pm9rp70xyiaj357l3gdl4i4r8xxvqllgdyrwn9gx2aqzzqk"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.4.0-3.22429.3"; sha256 = "1vi1dfwm4qq5vv10iaza174ikj3jqywv68hbjlm5g92iyw5v2j19"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.4.0-3.22429.3/microsoft.codeanalysis.externalaccess.omnisharp.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.4.0-3.22429.3"; sha256 = "1p49rjcgwb3hsh78h3n5ifi4iaywbkx6jdi4n8xpm8nyicjy524c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.4.0-3.22429.3/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.4.0-3.22429.3"; sha256 = "19dfwpz35cvgvg9cgmfbf5c63msp1800kgk3v1ssphzfpmc35ws1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.4.0-3.22429.3/microsoft.codeanalysis.features.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.4.0-3.22429.3"; sha256 = "1g0ly8qfz3j26il3pz5xh7kg13a41kbw2rm81srlamgv9djgxa8l"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.4.0-3.22429.3/microsoft.codeanalysis.scripting.common.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.4.0-3.22429.3"; sha256 = "080r4cwckhmvs9zjwi225q3gssi7f1h4ic93yakmk89mph0wjkaq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.4.0-3.22429.3/microsoft.codeanalysis.workspaces.common.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.5.0-2.22527.10"; sha256 = "0lg4bgm4awidj41p8gdjy6j4a2dq5hwvq7rw37sv9af93ri16pfh"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.5.0-2.22527.10/microsoft.codeanalysis.externalaccess.omnisharp.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.5.0-2.22527.10"; sha256 = "1ffcwf7pwcx4s63k6dhbgyj2anrw3n49cyj1845983vm918p9ymw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.5.0-2.22527.10/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.5.0-2.22527.10"; sha256 = "1n06zkwpyc6jxsy3mlr23ad42yga40fbsyfnxdi632p4iav294w0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.5.0-2.22527.10/microsoft.codeanalysis.features.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.5.0-2.22527.10"; sha256 = "1xlm9n7kgin9cfr2xybjxgiwwbnfifyx0r4mm1gfdhgfjbykbqhf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.5.0-2.22527.10/microsoft.codeanalysis.scripting.common.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0-2.22527.10"; sha256 = "00swl909fqjp6vd41jc7f9kd7n5fzzqvpf1jicrbyr2nmh3mk0xk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.5.0-2.22527.10/microsoft.codeanalysis.workspaces.common.4.5.0-2.22527.10.nupkg"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "1.4.0"; sha256 = "0li9shnm941jza40kqfkbbys77mrr55nvi9h3maq9fipq4qwx92d"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "6.0.0"; sha256 = "0qn30d3pg4rx1x2k525jj4x5g1fxm2v5m0ksz2dmk1gmqalpask8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "6.0.0"; sha256 = "0dq1x7962zsp926rj76i4akk4hsy7r5ldys8r4xsd78rq5f67rhq"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "6.0.0"; sha256 = "1hb4qrq9xdxzh2px515pv1vkz1jigwaxw1hfg9w8s6pgl8z04l4c"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.0"; sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "6.0.0"; sha256 = "1c6l5szma1pdn61ncq1kaqibg0dz65hbma2xl626a8d1m6awn353"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "6.0.0"; sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.0.0"; sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; sha256 = "17d02106ksijzcnh03h8qaijs77xsba5l50chng6gb8nwi7wrbd5"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.1"; sha256 = "0c8yicvhmwgm3z076hy3zgkqznhmrm8qygiscawlc9k01l5ilkrs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; }) @@ -85,46 +71,44 @@ (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.3.0"; sha256 = "0n0iahawk4cjc7pkddjyaqnb10fn5qcjy59645ni0wy8q3myiskh"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.SDK.EmbedInteropTypes"; version = "15.0.12"; sha256 = "083pva0a0xxvqqrjv75if25wr3rq034wgjhbax74zhzdb665nzsw"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "1.14.114"; sha256 = "062mqkmjf4k6zm3wi9ih0lzypfsnv82lgh88r35fj66akihn86gv"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.7.56"; sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.4.27"; sha256 = "17f9bj01qxdd7mjxslgxkhky6xmg7agpimkf071k451csj5k2vkd"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.4.27"; sha256 = "1js19g9i2vz012l1ma2wx23awyxh2jqng1qs652l9jwj6gmp71v8"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.0.64"; sha256 = "1qm2dc9v1glpgy2blbcmsljwrsx55k82rjw4hiqh031h8idwryrl"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.6.81"; sha256 = "06wihcaga8537ibh0mkj28m720m6vzkqk562zkynhca85nd236yi"; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.8.57"; sha256 = "05p1vqs09xj6pa3nv08xymzz8sg5sg59598bn1rmfmbpqp3glvax"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { pname = "NuGet.Common"; version = "5.2.0"; sha256 = "14y7axpmdl9fg8jfc42gxpcq9wj8k3vzc07npmgjnzqlp5xjyyac"; }) + (fetchNuGet { pname = "NuGet.Common"; version = "6.2.0"; sha256 = "1xvjlly8x3gs26sbcil8vn3xf8wfb7lkmb36sics46b7a6fmkdhn"; }) (fetchNuGet { pname = "NuGet.Common"; version = "6.4.0-preview.1.53"; sha256 = "1p3f3p9md7d880hbp50msp54qkhwknxkz62sm79ndgldnclwrr3i"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.4.0-preview.1.53/nuget.common.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "5.2.0"; sha256 = "0b4dkym3vnj7qldnqqq6h6ry0gkql5c2ps5wy72b8s4fc3dmnvf1"; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "6.2.0"; sha256 = "07hmnm1v5qbqpa2m77gikm0pds8c7blnc98il17alswc5hhmblm8"; }) (fetchNuGet { pname = "NuGet.Configuration"; version = "6.4.0-preview.1.53"; sha256 = "0zlkzgwqspja7j1j7jb5h3wdzvg42zp11ysgl93s96yxjr92ivx5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.4.0-preview.1.53/nuget.configuration.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "5.2.0"; sha256 = "156yjfsk9pzqviiwy69lxfqf61yyj4hn4vdgfcbqvw4d567i150r"; }) + (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.2.0"; sha256 = "0b00072yx20qnr9riq3b72ia1129llhw9a2fw6yv7ak77a70c3pq"; }) (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.4.0-preview.1.53"; sha256 = "05gmy611x4vppw2xjkbnnvf97nj3lrjkg5q1ilp625hf5hrmmx68"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.4.0-preview.1.53/nuget.dependencyresolver.core.6.4.0-preview.1.53.nupkg"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.2.0"; sha256 = "1fh4rp26m77jq5dyln68wz9qm217la9vv21amis2qvcy6gknk2wp"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.2.0"; sha256 = "0swbxdzvrd6jnpnr5kss6v5f7grhgzl1z5nk6b00z2x8pbrjfr42"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.4.0-preview.1.53"; sha256 = "0sp7phay7764wfwz9p4yl17zcxi8h9xpzv5x5kpqq9dmv79mx7ld"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.4.0-preview.1.53/nuget.frameworks.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.LibraryModel"; version = "5.2.0"; sha256 = "0vxd0y7rzzxvmxji9bzp95p2rx48303r3nqrlhmhhfc4z5fxjlqk"; }) + (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.2.0"; sha256 = "02l13hkpc6p86ibni8gzk65gdv85fmm1wqn39j86s68p5wf8l892"; }) (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.4.0-preview.1.53"; sha256 = "1syji2ml2mpsalyd4b7i3vni2d65mjmdy5csky7226m8nwxsaf9m"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.4.0-preview.1.53/nuget.librarymodel.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "5.2.0"; sha256 = "14frrbdkka9jd6g52bv4lbqnpckw09yynr08f9kfgbc3j8pklqqb"; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "6.2.0"; sha256 = "05xkba6bckq1vpni9j7ng20zy0l7srk8lyx4mxy9cf1z14ca30bl"; }) (fetchNuGet { pname = "NuGet.Packaging"; version = "6.4.0-preview.1.53"; sha256 = "1rxbjc2430ry7aqyb9k9bk8qg6l3max84rg81445y0s3f23cbmpp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.4.0-preview.1.53/nuget.packaging.6.4.0-preview.1.53.nupkg"; }) (fetchNuGet { pname = "NuGet.Packaging.Core"; version = "6.4.0-preview.1.53"; sha256 = "08fkl1kp4sizncd0mgsgyas0qzq2wdxby7m3r9q3c8isk7m44lw7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging.core/6.4.0-preview.1.53/nuget.packaging.core.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.ProjectModel"; version = "5.2.0"; sha256 = "1j23jk2zql52v2nqgi0k6d7z63pjjzrvw8y1s38zpf0sn7lzdr0h"; }) + (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.2.0"; sha256 = "1fsr9dzxibllhzd80dap593snms7jp7mzsihq7mh55vbj3n6qss8"; }) (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.4.0-preview.1.53"; sha256 = "08y3gwlw26jbx5chmmgrbvpad42zf5f668cd2vh1xj9i0li9df9g"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.4.0-preview.1.53/nuget.projectmodel.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "5.2.0"; sha256 = "1vlrrlcy7p2sf23wqax8mfhplnzppd73xqlr2g83ya056w0yf2rd"; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "6.2.0"; sha256 = "1fai84b45sv2h4wm6jqghf16x8hc6ksdsq4llay9qh1mak0zfg33"; }) (fetchNuGet { pname = "NuGet.Protocol"; version = "6.4.0-preview.1.53"; sha256 = "064l1cfx2483lvy9w5khigp07bp7y42rnrz8i85jalkrc4p3jvmr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.4.0-preview.1.53/nuget.protocol.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "5.2.0"; sha256 = "08ay8bhddj9yiq6h9lk814l65fpx5gh1iprkl7pcp78g57a6k45k"; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "6.2.0"; sha256 = "0qpsf9wywwi49d0p9gvb0h6m6ja17lg8wyiyk1gg502cb73b90zn"; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "6.4.0-preview.1.53"; sha256 = "1mvc81qy3s5iwqikyw5hypfkrf9ji5br91dybavznhhls9j96999"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.4.0-preview.1.53/nuget.versioning.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.0"; sha256 = "0m9lw21iz90ayl35f24ir3vbiydf4sjqw590qqgwknykpzsi1ai2"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.0"; sha256 = "17akjdh9dnyxr01lnlsa41ca52psqnny8j3wxz904zs15pz932ln"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.0"; sha256 = "06d4wakdaj42c9qnlhdyqrjnm97azp4hrvfg70f96ldl765y9vrf"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.0"; sha256 = "0k1z3zchl1d82fj0ha63i54g5j046iaz8vb3cyxpjb6kp7zah28v"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.0"; sha256 = "0s3h9v5p043ip27g9jcvd0np9q3hn2pfv6gn539m45yb5d74a6i5"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.7"; sha256 = "02fsw54jmh037a5q518nrsd9657kdy111m31q13ll759a601bai7"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.7"; sha256 = "15wy1ql68bdbz507488ivdlc4wsd3f73cbwqwc8yci1mwpfcwryd"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.7"; sha256 = "0c2mh69cx4lzf0s146i9ci43inb9mns4rcy08qdzki56irb0y3yh"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.7"; sha256 = "004jacz3w9rqvccfa1f88vzkz68agx786bncg43bc6mzg8j7mcvr"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.7"; sha256 = "05a5vh32vq6jipzvwwjzjf40l2ar2qxp6v9sxpfjnxdvm1bxyxmf"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -166,21 +150,19 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.0.7"; sha256 = "083saqlwx1hbhy0rv7vi973aw7jv8q53fcxlrprx1wgxdwnbi5ni"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.0.7"; sha256 = "0b25qz3h1aarza2b74alsl9v6czns3y61i8p10yqgd9djk1b1byj"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.0.7"; sha256 = "0wkrzcpc9vcd27gwj6w537i1i5i3h5zsips8b9v9ngk003n50mia"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.0.7"; sha256 = "1kmyf4v4157n2194j17ijf62xnqiapxhg4aka851zx0hzlxm7ygp"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.0.7"; sha256 = "1davv3fqd05353d7dl7wm2sg58fyy59b29pk58w1vf7m33580grj"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.1.0"; sha256 = "008bnj279y7gxcai69r4bqgxpxwsdb8jvai4kxkd97arlcr1cpjv"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.0"; sha256 = "0kq5x9k5kl6lh7jp1hgjn08wl37zribrykfimhln6mkqbp1myncp"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.0"; sha256 = "1ibkkz5dsac64nf7alsdsr8r1jm8j87vv6chsi3azkf5zv0rphsy"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.1.0"; sha256 = "12a6s3knynfrzf9vxxy6hwg4hvxncc0ad59g3bigqx86p8xfb4nq"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.0"; sha256 = "1g7gi1kdil8iv67g42xbmfhr1l0pkz645gqnd8lfv3q24449shan"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) @@ -195,35 +177,25 @@ (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) (fetchNuGet { pname = "System.Data.DataSetExtensions"; version = "4.5.0"; sha256 = "0gk9diqx388qjmbhljsx64b5i0p9cwcaibd4h7f8x901pz84x6ma"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) - (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; }) (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "4.7.3"; sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "5.0.1"; sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) @@ -233,56 +205,40 @@ (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) (fetchNuGet { pname = "System.Reactive"; version = "4.4.1"; sha256 = "0gx8jh3hny2y5kijz5k9pxiqw481d013787c04zlhps21ygklw4a"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection.DispatchProxy"; version = "4.5.1"; sha256 = "0cdnl4i9mfk7kx2ylglayqwqw7kl5k1xr8siaxch45hfyc2cpds8"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.0"; sha256 = "1x0b289r9yjzdqypi2x3dc8sa66s3b6bpc7l2f8hxrzl6czdg4al"; }) (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; sha256 = "1h73gps9ffw77vys4zwgm78fgackqw6a7rjrg75mmx79vdw1shgw"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.WindowsRuntime"; version = "4.3.0"; sha256 = "0bpsy91yqm2ryp5y9li8p6yh4yrxcvg9zvm569ifw25rpy67bgp9"; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.6.0"; sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) @@ -296,7 +252,6 @@ (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj"; }) (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; sha256 = "0wswhbvm3gh06azg9k1zfvmhicpzlh7v71qzd4x5zwizq4khv7iq"; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.3.0"; sha256 = "1kg264xmqabyz8gfg8ymp6qp6aw43vawfp0znf0909d7b5jd3dq9"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) @@ -307,32 +262,22 @@ (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.6.0"; sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "6.0.0"; sha256 = "1b4vyjdir9kdkiv2fqqm4f76h0df68k8gcd7jb2b38zgr2vpnk3c"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) ] From 603239b8a022094e97ec873842ce2fe01bdc47a3 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Sun, 22 Jan 2023 18:26:45 +0100 Subject: [PATCH 252/326] godot_4: 4.0-beta10 -> 4.0-beta14 --- pkgs/development/tools/godot/4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index 22b14dd283b3..abf87bd0ba19 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.0-beta10"; + version = "4.0-beta14"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; - rev = "d0398f62f08ce0cfba80990b21c6af4181f93fe9"; - sha256 = "sha256-h4DpK7YC7/qMc6GAD2nvNVmrlGjKT5d7OK+1NcuZCMg="; + rev = "28a24639c3c6a95b5b9828f5f02bf0dc2f5ce54b"; + sha256 = "sha256-qAotCc2YUg8FMK+JFHi5B4OL/cAtvWO/pYRRz8RcNUY="; }; nativeBuildInputs = [ From 815282d1c0308de5bcc59d84b4a0ee97403271df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 22 Jan 2023 03:16:58 +0100 Subject: [PATCH 253/326] fwupd: 1.8.4 -> 1.8.9 --- ...d-option-for-installation-sysconfdir.patch | 63 +++++++++---------- .../linux/firmware/fwupd/default.nix | 43 +++++++------ .../linux/firmware/fwupd/efi-app-path.patch | 6 +- .../fwupd/install-fwupdplugin-to-out.patch | 37 +++-------- .../firmware/fwupd/installed-tests-path.patch | 29 +++------ 5 files changed, 72 insertions(+), 106 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index 2a6ae96cef11..cb33eb1c214c 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -10,7 +10,7 @@ index b0ff5b106..13ac380d0 100644 ) endif diff --git a/data/meson.build b/data/meson.build -index 3a77a7bfc..747bd1988 100644 +index 865b20e26..ff1c2657b 100644 --- a/data/meson.build +++ b/data/meson.build @@ -26,7 +26,7 @@ endif @@ -20,8 +20,8 @@ index 3a77a7bfc..747bd1988 100644 - install_dir: join_paths(sysconfdir, 'fwupd') + install_dir: join_paths(sysconfdir_install, 'fwupd') ) - plugin_quirks += join_paths(meson.current_source_dir(), 'power.quirk') - plugin_quirks += join_paths(meson.current_source_dir(), 'cfi.quirk') + plugin_quirks += files([ + 'power.quirk', diff --git a/data/pki/meson.build b/data/pki/meson.build index 3649fecea..c3462744b 100644 --- a/data/pki/meson.build @@ -57,28 +57,27 @@ index 3649fecea..c3462744b 100644 ) endif diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build -index 1d1698a7e..5469d00a6 100644 +index c20a1a05e..87b1fa930 100644 --- a/data/remotes.d/meson.build +++ b/data/remotes.d/meson.build -@@ -2,7 +2,7 @@ if build_standalone and get_option('lvfs') != 'false' - install_data([ - 'lvfs-testing.conf', - ], -- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d') -+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d') - ) - con3 = configuration_data() - if get_option('lvfs') == 'disabled' -@@ -15,7 +15,7 @@ if build_standalone and get_option('lvfs') != 'false' +@@ -15,14 +15,14 @@ if build_standalone and get_option('lvfs') != 'false' output: 'lvfs.conf', configuration: con3, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), ++ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), + ) + configure_file( + input: 'lvfs-testing.conf', + output: 'lvfs-testing.conf', + configuration: con3, + install: true, +- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) i18n.merge_file( input: 'lvfs.metainfo.xml', -@@ -49,12 +49,12 @@ configure_file( +@@ -54,12 +54,12 @@ configure_file( output: 'vendor.conf', configuration: con2, install: true, @@ -94,10 +93,10 @@ index 1d1698a7e..5469d00a6 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index e7980e965..2c66e2dc4 100644 +index d3e08af43..30011f548 100644 --- a/meson.build +++ b/meson.build -@@ -195,6 +195,12 @@ endif +@@ -193,6 +193,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -111,7 +110,7 @@ index e7980e965..2c66e2dc4 100644 gio = dependency('gio-2.0', version: '>= 2.45.8') giounix = dependency('gio-unix-2.0', version: '>= 2.45.8', required: false) diff --git a/meson_options.txt b/meson_options.txt -index 6cf92e72e..2e8568292 100644 +index 204690640..6fc7e8437 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ @@ -120,10 +119,10 @@ index 6cf92e72e..2e8568292 100644 option('consolekit', type : 'feature', description : 'ConsoleKit support', deprecated: {'true': 'enabled', 'false': 'disabled'}) option('static_analysis', type : 'boolean', value : false, description : 'enable GCC static analysis support') diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build -index 67bd3b9d9..ad04a91b6 100644 +index 88c039f85..62a7691f3 100644 --- a/plugins/dell-esrt/meson.build +++ b/plugins/dell-esrt/meson.build -@@ -38,6 +38,6 @@ configure_file( +@@ -27,6 +27,6 @@ configure_file( output: 'dell-esrt.conf', configuration: con2, install: true, @@ -132,7 +131,7 @@ index 67bd3b9d9..ad04a91b6 100644 ) endif diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build -index d626c3ad3..5a2f847d5 100644 +index 23ec5ec82..b03826fc0 100644 --- a/plugins/msr/meson.build +++ b/plugins/msr/meson.build @@ -10,7 +10,7 @@ install_data(['fwupd-msr.conf'], @@ -142,27 +141,27 @@ index d626c3ad3..5a2f847d5 100644 - install_dir: join_paths(sysconfdir, 'fwupd') + install_dir: join_paths(sysconfdir_install, 'fwupd') ) - shared_module('fu_plugin_msr', - fu_hash, + plugin_builtins += static_library('fu_plugin_msr', + sources: [ diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build -index 95606e478..e5355e520 100644 +index 1e35b6ce9..33ca1447f 100644 --- a/plugins/redfish/meson.build +++ b/plugins/redfish/meson.build -@@ -43,7 +43,7 @@ shared_module('fu_plugin_redfish', - ) +@@ -35,7 +35,7 @@ plugin_builtin_redfish = static_library('fu_plugin_redfish', + plugin_builtins += plugin_builtin_redfish install_data(['redfish.conf'], - install_dir: join_paths(sysconfdir, 'fwupd'), + install_dir: join_paths(sysconfdir_install, 'fwupd'), + install_mode: 'rw-r-----', ) - if get_option('tests') diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build -index 5f8ffbf90..9ba323e75 100644 +index 71d930e62..399fb5781 100644 --- a/plugins/thunderbolt/meson.build +++ b/plugins/thunderbolt/meson.build -@@ -32,7 +32,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', - ) +@@ -19,7 +19,7 @@ plugin_builtin_thunderbolt = static_library('fu_plugin_thunderbolt', + plugin_builtins += plugin_builtin_thunderbolt install_data(['thunderbolt.conf'], - install_dir: join_paths(sysconfdir, 'fwupd') @@ -171,7 +170,7 @@ index 5f8ffbf90..9ba323e75 100644 # we use functions from 2.52 in the tests if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52') diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build -index ef38dc03e..78ff65e1d 100644 +index b4b038313..9c5407c3f 100644 --- a/plugins/uefi-capsule/meson.build +++ b/plugins/uefi-capsule/meson.build @@ -20,7 +20,7 @@ if host_machine.system() == 'linux' @@ -183,7 +182,7 @@ index ef38dc03e..78ff65e1d 100644 ) elif host_machine.system() == 'freebsd' backend_srcs += 'fu-uefi-backend-freebsd.c' -@@ -110,7 +110,7 @@ if get_option('compat_cli') and get_option('man') +@@ -87,7 +87,7 @@ if get_option('compat_cli') and get_option('man') endif install_data(['uefi_capsule.conf'], diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 66cfbef940bf..457160879871 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -15,6 +15,7 @@ , gusb , sqlite , libarchive +, libredirect , curl , libjcat , elfutils @@ -30,6 +31,7 @@ , protobufc , python3 , wrapGAppsNoGuiHook +, ensureNewerSourcesForZipFilesHook , json-glib , bash-completion , shared-mime-info @@ -85,13 +87,13 @@ let test-firmware = let - version = "unstable-2021-11-02"; + version = "unstable-2022-04-02"; src = fetchFromGitHub { name = "fwupd-test-firmware-${version}"; owner = "fwupd"; repo = "fwupd-test-firmware"; - rev = "aaa2f9fd68a40684c256dd85b86093cba38ffd9d"; - sha256 = "Slk7CNfkmvmOh3WtIBkPs3NYT96co6i8PwqcbpeVFgA="; + rev = "39954e434d63e20e85870dd1074818f48a0c08b7"; + hash = "sha256-d4qG3fKyxkfN91AplRYqARFz+aRr+R37BpE450bPxi0="; passthru = { inherit src version; # For update script updateScript = unstableGitUpdater { @@ -114,7 +116,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.8.4"; + version = "1.8.9"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -123,7 +125,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "sha256-rfoHQ0zcKexBxA/vRg6Nlwlj/gx+hJ3sfzkyrbFh+IY="; + hash = "sha256-cZp5GsS6WYiuuT7EJ3i9ZdM8sHXQwJO1wE5eFoK+Uoo="; }; patches = [ @@ -147,6 +149,8 @@ let ]; nativeBuildInputs = [ + # required for firmware zipping + ensureNewerSourcesForZipFilesHook meson ninja gi-docgen @@ -187,7 +191,7 @@ let libmbim libcbor libqmi - xz # for liblzma. + xz # for liblzma ] ++ lib.optionals haveDell [ libsmbios ] ++ lib.optionals haveFlashrom [ @@ -210,14 +214,9 @@ let "-Dsysconfdir_install=${placeholder "out"}/etc" "-Defi_os_dir=nixos" "-Dplugin_modem_manager=enabled" - # Requires Meson 0.63 - "-Dgresource_quirks=disabled" # We do not want to place the daemon into lib (cyclic reference) "--libexecdir=${placeholder "out"}/libexec" - # Our builder only adds $lib/lib to rpath but some things link - # against libfwupdplugin which is in $out/lib. - "-Dc_link_args=-Wl,-rpath,${placeholder "out"}/lib" ] ++ lib.optionals (!haveDell) [ "-Dplugin_dell=disabled" "-Dplugin_synaptics_mst=disabled" @@ -232,8 +231,7 @@ let # TODO: wrapGAppsHook wraps efi capsule even though it is not ELF dontWrapGApps = true; - # /etc/os-release not available in sandbox - # doCheck = true; + doCheck = true; # Environment variables @@ -254,16 +252,18 @@ let postPatch = '' patchShebangs \ contrib/generate-version-script.py \ - meson_post_install.sh \ po/test-deps - # This checks a version of a dependency of gi-docgen but gi-docgen is self-contained in Nixpkgs. - echo "Clearing docs/test-deps.py" - test -f docs/test-deps.py - echo > docs/test-deps.py - substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \ --replace "gdbus" ${glib.bin}/bin/gdbus + + # tests fail with: Failed to load SMBIOS: neither SMBIOS or DT found + sed -i 's/test(.*)//' plugins/lenovo-thinklmi/meson.build + sed -i 's/test(.*)//' plugins/mtd/meson.build + # fails on amd cpu + sed -i 's/test(.*)//' libfwupdplugin/meson.build + # in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf + sed -i "s/get_option('tests')/false/" plugins/redfish/meson.build ''; preBuild = '' @@ -273,6 +273,10 @@ let preCheck = '' addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" + + echo "12345678901234567890123456789012" > machine-id + export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) \ + LD_PRELOAD=${libredirect}/lib/libredirect.so ''; preInstall = '' @@ -349,7 +353,6 @@ let defaultDisabledPlugins = [ "test" "test_ble" - "invalid" ]; # For updating. diff --git a/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch index afee6d9f61ea..a91adc1a69b9 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch @@ -1,13 +1,13 @@ diff --git a/meson.build b/meson.build -index b91dd037..01d70a61 100644 +index 7ac8c937a..5a23d0c80 100644 --- a/meson.build +++ b/meson.build -@@ -413,7 +413,7 @@ if build_standalone and efiboot.found() and efivar.found() +@@ -419,7 +419,7 @@ if build_standalone and efiboot.found() and efivar.found() conf.set('HAVE_EFI_TIME_T', '1') endif - efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') -+ efi_app_location = join_paths(dependency('fwupd-efi').get_pkgconfig_variable('prefix'), 'libexec', 'fwupd', 'efi') ++ efi_app_location = join_paths(dependency('fwupd-efi').get_variable(pkgconfig: 'prefix'), 'libexec', 'fwupd', 'efi') conf.set_quoted('EFI_APP_LOCATION', efi_app_location) if host_cpu == 'x86' diff --git a/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch b/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch index f3369b6e1333..e6269ae840bb 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch @@ -1,37 +1,14 @@ -diff --git a/libfwupdplugin/meson.build b/libfwupdplugin/meson.build -index 1afa28e1..3da81d30 100644 ---- a/libfwupdplugin/meson.build -+++ b/libfwupdplugin/meson.build -@@ -220,7 +220,8 @@ fwupdplugin = library( - ], - link_args: cc.get_supported_link_arguments([vflag]), - link_depends: fwupdplugin_mapfile, -- install: true -+ install: true, -+ install_dir: bindir / '..' / 'lib', - ) - - fwupdplugin_pkgg = import('pkgconfig') -@@ -280,7 +281,8 @@ if introspection.allowed() - girtargets, - fwupd_gir[0], - ], -- install: true -+ install: true, -+ install_dir_typelib: bindir / '..' / 'lib' / 'girepository-1.0', - ) - - # Verify the map file is correct -- note we can't actually use the generated diff --git a/meson.build b/meson.build -index b91dd037..f97b4c26 100644 +index 9ae278b66..7cddf1a0d 100644 --- a/meson.build +++ b/meson.build -@@ -504,7 +504,7 @@ if build_standalone +@@ -507,7 +507,7 @@ if build_standalone if host_machine.system() == 'windows' - plugin_dir = 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current) + libdir_pkg = 'fwupd-@0@'.format(fwupd_version) else -- plugin_dir = join_paths(libdir, 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)) -+ plugin_dir = join_paths(bindir, '..', 'lib', 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)) +- libdir_pkg = join_paths(libdir, 'fwupd-@0@'.format(fwupd_version)) ++ libdir_pkg = join_paths(prefix, 'lib', 'fwupd-@0@'.format(fwupd_version)) endif - conf.set_quoted('FWUPD_PLUGINDIR', plugin_dir) + conf.set_quoted('FWUPD_LIBDIR_PKG', libdir_pkg) endif + diff --git a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch index 49bca65d9c60..a914f56c66db 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch @@ -1,19 +1,19 @@ diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build -index b8ec916f..38209b36 100644 +index be3d5c6d9..14d45dcaf 100644 --- a/data/installed-tests/meson.build +++ b/data/installed-tests/meson.build @@ -83,5 +83,5 @@ configure_file( - output : 'fwupd-tests.conf', - configuration : con2, + output: 'fwupd-tests.conf', + configuration: con2, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index b91dd037..d7e20b18 100644 +index 30011f548..7ac8c937a 100644 --- a/meson.build +++ b/meson.build -@@ -188,8 +188,8 @@ else +@@ -186,8 +186,8 @@ else datadir = join_paths(prefix, get_option('datadir')) sysconfdir = join_paths(prefix, get_option('sysconfdir')) localstatedir = join_paths(prefix, get_option('localstatedir')) @@ -24,7 +24,7 @@ index b91dd037..d7e20b18 100644 daemon_dir = join_paths(libexecdir, 'fwupd') endif mandir = join_paths(prefix, get_option('mandir')) -@@ -492,6 +492,7 @@ gnome = import('gnome') +@@ -498,6 +498,7 @@ gnome = import('gnome') i18n = import('i18n') conf.set_quoted('FWUPD_PREFIX', prefix) @@ -33,10 +33,10 @@ index b91dd037..d7e20b18 100644 conf.set_quoted('FWUPD_LIBDIR', libdir) conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir) diff --git a/meson_options.txt b/meson_options.txt -index d00038db..be1c45b4 100644 +index 6fc7e8437..29832fd08 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -56,6 +56,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated: +@@ -57,6 +57,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated: option('systemd_unit_user', type : 'string', description : 'User account to use for fwupd-refresh.service (empty for DynamicUser)') option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on') option('elogind', type : 'feature', description : 'elogind support', deprecated: {'true': 'enabled', 'false': 'disabled'}) @@ -44,16 +44,3 @@ index d00038db..be1c45b4 100644 option('tests', type : 'boolean', value : true, description : 'enable tests') option('soup_session_compat', type : 'boolean', value : true, description : 'enable SoupSession runtime compatibility support') option('curl', type : 'feature', description : 'libcurl support', deprecated: {'true': 'enabled', 'false': 'disabled'}) -diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c -index 4d19e560..91cfaa61 100644 ---- a/plugins/redfish/fu-self-test.c -+++ b/plugins/redfish/fu-self-test.c -@@ -27,7 +27,7 @@ fu_test_is_installed_test(void) - const gchar *builddir = g_getenv("G_TEST_BUILDDIR"); - if (builddir == NULL) - return FALSE; -- return g_str_has_prefix(builddir, FWUPD_PREFIX); -+ return g_str_has_prefix(builddir, FWUPD_INSTALLED_TEST_PREFIX); - } - - static void From 0f2b75bc9d1a0ca001bdfccf2390f2bcb8cfc1b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 18:25:13 +0000 Subject: [PATCH 254/326] syft: 0.62.3 -> 0.66.2 --- pkgs/tools/admin/syft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index d882890bba78..104365de5d41 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.62.3"; + version = "0.66.2"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rDj/yerLY7EN/jeAh/xaUX04LqGqijajSZLFhjiyuSg="; + sha256 = "sha256-CIFK4XIYpRK9CJOwQUV6kRGU++iWJCdMBR7v6xh0iaY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorSha256 = "sha256-MUNXMdzLVgbFtVo1CRCnZfpZl8Ze2R98mx7Y9QreLRw="; + vendorHash = "sha256-ttvfzlSFgh0xQ0W/ftLeSrJNOzg7Iq1qdLgflGy7N8Q="; nativeBuildInputs = [ installShellFiles ]; From 38bc80cb5a16106d7789c9bb4a84e8515dd28594 Mon Sep 17 00:00:00 2001 From: novenary Date: Sun, 22 Jan 2023 20:36:25 +0200 Subject: [PATCH 255/326] maintainers: add novenary --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 61096b5981ce..7d031b591356 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10418,6 +10418,12 @@ githubId = 6052922; name = "Kirill Struokov"; }; + novenary = { + email = "streetwalkermc@gmail.com"; + github = "9ary"; + githubId = 1155030; + name = "novenary"; + }; np = { email = "np.nix@nicolaspouillard.fr"; github = "np"; From eaed23363a66bef2a164face57c6fd93b4a8560e Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Mon, 23 Jan 2023 00:10:29 +0530 Subject: [PATCH 256/326] cdxgen: init at 6.0.14 --- pkgs/tools/security/cdxgen/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/security/cdxgen/default.nix diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/tools/security/cdxgen/default.nix new file mode 100644 index 000000000000..ffdd977da416 --- /dev/null +++ b/pkgs/tools/security/cdxgen/default.nix @@ -0,0 +1,27 @@ +{ lib +, fetchFromGitHub +, buildNpmPackage +}: + +buildNpmPackage rec { + pname = "cdxgen"; + version = "6.0.14"; + + src = fetchFromGitHub { + owner = "AppThreat"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ddeX2EwA2g6wgfsNxf/5ZVsQOHlINGhxif/y6368wCw="; + }; + + npmDepsHash = "sha256-CJ939wT9dKUzMDH2yHKgT056F2AVBevJlS/NhUBjx0E="; + + dontNpmBuild = true; + + meta = with lib; { + description = "Creates CycloneDX Software Bill-of-Materials (SBOM) for your projects from source and container images"; + homepage = "https://github.com/AppThreat/cdxgen"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bd9165aca44..b39d6622841c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3861,6 +3861,8 @@ with pkgs; cde = callPackage ../tools/package-management/cde { }; + cdxgen = callPackage ../tools/security/cdxgen { }; + ceres-solver = callPackage ../development/libraries/ceres-solver { gflags = null; # only required for examples/tests }; From f050ae86cc88baa49ee466c36f36e8401cf15c5b Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 22 Jan 2023 14:11:36 -0500 Subject: [PATCH 257/326] ruff: 0.0.228 -> 0.0.230 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.228...v0.0.230 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.230 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 152d0b494de3..8854ee18bf61 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.228"; + version = "0.0.230"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Dza6SRWYjegUaoZeWJCARdYUM5SY+2zHItYi87q8YLo="; + sha256 = "sha256-40QVmxdEuWQEFCkf8ypEWsH1R6A3WjTXWPC99RnWsgI="; }; - cargoSha256 = "sha256-+u2tJHqAnTaUGVfjTHGIZqIp5VJMoR/W76rSa6IaicU="; + cargoSha256 = "sha256-ek/+qYOsFhbwWuHn6ezWzsxxeK0umrNAZZVFJl2ya1M="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From b29703a4b12ca93395f6a4c95770ad92bac06960 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 19:47:57 +0000 Subject: [PATCH 258/326] python310Packages.tinydb: 4.7.0 -> 4.7.1 --- pkgs/development/python-modules/tinydb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix index 3601c6902da0..87d3502f6e03 100644 --- a/pkgs/development/python-modules/tinydb/default.nix +++ b/pkgs/development/python-modules/tinydb/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "tinydb"; - version = "4.7.0"; + version = "4.7.1"; disabled = pythonOlder "3.5"; format = "pyproject"; src = fetchFromGitHub { owner = "msiemens"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-cAIo/qdIOIpPt9vPan5oJfKtH2Gmrm03aLuAHpfUfLY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-nKsTMakCOBVHDDp8AX/xDkvHpCMBoIb0pa24F4VX/14="; }; nativeBuildInputs = [ From de3b8f45ae7aa96830fc6915a91d1efbb941fe52 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 20:57:35 +0100 Subject: [PATCH 259/326] cpuid: 20221201 -> 20230120 --- pkgs/os-specific/linux/cpuid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index 6ea68c9d571c..7d6431b5ced6 100644 --- a/pkgs/os-specific/linux/cpuid/default.nix +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20221201"; + version = "20230120"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-CP7cOCgQZnqdCkF9KXXeOrXYFXNFLP9Xst6rBtgvj24="; + sha256 = "sha256-uJtB+IldDVj9uwpUECu0kLx8WCjbLNFb6C0U0ZRjpXk="; }; # For pod2man during the build process. From 1109b9d6860afbefc8683f5107c2b0fb619b982d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 21:06:49 +0100 Subject: [PATCH 260/326] python310Packages.python-bsblan: add changelog to meta --- pkgs/development/python-modules/python-bsblan/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 98ed367fdb16..fe8fc87bf3bf 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "liudger"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-pLqX+gbY71OsLflTyDuL4revj5dXol//eTFVy8iT9O4="; }; @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to control and monitor an BSBLan device programmatically"; homepage = "https://github.com/liudger/python-bsblan"; + changelog = "https://github.com/liudger/python-bsblan/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 707a15f5735dec32773a32e0f7d217d24dfd873e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 21:07:39 +0100 Subject: [PATCH 261/326] python310Packages.python-bsblan: 0.5.8 -> 0.5.9 Diff: https://github.com/liudger/python-bsblan/compare/refs/tags/v0.5.8...v0.5.9 Changelog: https://github.com/liudger/python-bsblan/releases/tag/v0.5.9 --- pkgs/development/python-modules/python-bsblan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index fe8fc87bf3bf..11d3bdc3adfc 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.5.8"; + version = "0.5.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "liudger"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pLqX+gbY71OsLflTyDuL4revj5dXol//eTFVy8iT9O4="; + hash = "sha256-9WXj/zFFzPr3YabdEYN+Xn/IwKplPFdHAFDB2S2JUEI="; }; nativeBuildInputs = [ From 1dff4c3d81dd234693abbb3dfed94c802dd0b268 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 21:13:11 +0100 Subject: [PATCH 262/326] python310Packages.yalexs-ble: 1.12.5 -> 1.12.7 Diff: https://github.com/bdraco/yalexs-ble/compare/refs/tags/v1.12.5...v1.12.7 Changelog: https://github.com/bdraco/yalexs-ble/blob/v1.12.7/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 1404093bcd00..9b4d1091843d 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "1.12.5"; + version = "1.12.7"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wofdqwgMbwxUgUVwBT44qbD4m0q0CtmGH7AxRNMBMbE="; + hash = "sha256-f2JrUzgSPbko/H7n6IYiw3nLU9SkIH8BgSEyMlGppok="; }; nativeBuildInputs = [ From 3bc27524abc4b5f5aaf6cfdc2bb6114f8276bd32 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 21:14:08 +0100 Subject: [PATCH 263/326] python310Packages.airthings-ble: 0.5.4 -> 0.5.5 Diff: https://github.com/vincegio/airthings-ble/compare/refs/tags/v0.5.4...v0.5.5 --- pkgs/development/python-modules/airthings-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index 2dc6dcd538a7..6351fea9bd80 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "airthings-ble"; - version = "0.5.4"; + version = "0.5.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vincegio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eN0JSbzsB/KOkPTbjmc0X5IWf2yg004fNqGhdC2siFQ="; + hash = "sha256-A1YsYOquDUDGeEI4xzQSjEk1H92Jjlhsb5IPRt0lM2c="; }; postPatch = '' From 557679ed84e59932fb89c20f431d27acead811cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 21:20:02 +0100 Subject: [PATCH 264/326] python310Packages.flux-led: 0.28.34 -> 0.28.35 Changelog: https://github.com/Danielhiversen/flux_led/releases/tag/0.28.35 --- pkgs/development/python-modules/flux-led/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 21d1a51f8c41..29a077a0bc6e 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -1,4 +1,5 @@ { lib +, async-timeout , buildPythonPackage , fetchFromGitHub , webcolors @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.34"; + version = "0.28.35"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,10 +18,11 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = "refs/tags/${version}"; - hash = "sha256-bIL9ivjCLKeTLK3n0ytgGkXQggsuDiMCY7kAtE81qfY="; + hash = "sha256-+MbcI/gcoQOpfL77AyA0rZBP5OgP87gSDt4e5pjriqY="; }; propagatedBuildInputs = [ + async-timeout webcolors ]; From 843a13514c0e49ea6a8b2a022fad54a5ac6e10d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 22 Jan 2023 21:26:22 +0100 Subject: [PATCH 265/326] python310Packages.pytrafikverket: 0.2.2 -> 0.2.3 Changelog: https://github.com/endor-force/pytrafikverket/releases/tag/0.2.3 --- pkgs/development/python-modules/pytrafikverket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytrafikverket/default.nix b/pkgs/development/python-modules/pytrafikverket/default.nix index ecbf9c68e9a1..f3785f5fb6db 100644 --- a/pkgs/development/python-modules/pytrafikverket/default.nix +++ b/pkgs/development/python-modules/pytrafikverket/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pytrafikverket"; - version = "0.2.2"; + version = "0.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NWQHrdTKb3RQ7ZjXpHyQ5qPPXuZUU7G+FvBx1VQEbss="; + hash = "sha256-bbg1FzzJ3cJIbV+u3Ih70hkgu23Joxc1xeLELiRYt8g="; }; propagatedBuildInputs = [ From b533ff3d01cfc7dd22a7ead3c73f5929dd55675f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 20:29:15 +0000 Subject: [PATCH 266/326] flyway: 9.7.0 -> 9.12.0 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 7bbbfb4535d5..2921a7b39445 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.7.0"; + version = "9.12.0"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-HXLwC5T+hPbUTf4grKjCnhIMpqsFAz5yK6kH4XicLG8="; + sha256 = "sha256-8Zx+0lWaPAgPhxcvb84FzT2z58yAwDDLHegtXpRTr5M="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From be62259393a3cff405b9d84015f1a60d9150b355 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 22 Jan 2023 19:29:48 +0000 Subject: [PATCH 267/326] libcIconv: rename from glibcIconv MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's nothing Glibc-specific about this function — it's already used for musl and wasilibc as well! I haven't bothered with an alias as I think it's highly unlikely anybody uses this function outside Nixpkgs. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1df342fa13dd..97661453c278 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21144,7 +21144,7 @@ with pkgs; # just in case you want it regardless of platform. libiconv = if lib.elem stdenv.hostPlatform.libc ["glibc" "musl" "wasilibc"] - then glibcIconv (if stdenv.hostPlatform != stdenv.buildPlatform + then libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform then libcCross else stdenv.cc.libc) else if stdenv.hostPlatform.isDarwin @@ -21153,7 +21153,7 @@ with pkgs; then null else libiconvReal; - glibcIconv = libc: let + libcIconv = libc: let inherit (libc) pname version; libcDev = lib.getDev libc; in runCommand "${pname}-iconv-${version}" { strictDeps = true; } '' From b19185fdb2a5ffbbdb5689ef5ee30d17d208e217 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 22 Jan 2023 19:31:16 +0000 Subject: [PATCH 268/326] libiconv: use libc header on NetBSD Let's be consistent about this. Updated netbsd.libc to have a pname attribute so it's compatible with libcIconv. --- pkgs/os-specific/bsd/netbsd/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index 37a0c35b1860..8903db9f36b7 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -54,7 +54,8 @@ in makeScopeWithSplicing mkDerivation = lib.makeOverridable (attrs: let stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; in stdenv'.mkDerivation ({ - name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; + pname = "${attrs.pname or (baseNameOf attrs.path)}-netbsd"; + inherit (attrs) version; src = fetchNetBSD attrs.path attrs.version attrs.sha256; extraPaths = [ ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97661453c278..a2f9b2fa7b5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21143,14 +21143,12 @@ with pkgs; # We also provide `libiconvReal`, which will always be a standalone libiconv, # just in case you want it regardless of platform. libiconv = - if lib.elem stdenv.hostPlatform.libc ["glibc" "musl" "wasilibc"] + if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" "nblibc" "wasilibc" ] then libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform then libcCross else stdenv.cc.libc) else if stdenv.hostPlatform.isDarwin then darwin.libiconv - else if stdenv.hostPlatform.isNetBSD - then null else libiconvReal; libcIconv = libc: let From fc0c3f538258b2973f46b50098a99bcc14779843 Mon Sep 17 00:00:00 2001 From: Ian McFarlane <70479099+the-argus@users.noreply.github.com> Date: Sun, 22 Jan 2023 21:12:09 +0000 Subject: [PATCH 269/326] rose-pine-gtk: use nixpkgs-fmt, NoCC, and update icon cache --- pkgs/data/icons/rose-pine/default.nix | 19 ++++++++++++++----- pkgs/data/themes/rose-pine-gtk/default.nix | 16 ++++++++-------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/pkgs/data/icons/rose-pine/default.nix b/pkgs/data/icons/rose-pine/default.nix index 6ce6f1d59a33..051294c5d3a8 100644 --- a/pkgs/data/icons/rose-pine/default.nix +++ b/pkgs/data/icons/rose-pine/default.nix @@ -1,9 +1,10 @@ -{ - stdenv, - lib, - fetchFromGitHub, +{ stdenvNoCC +, lib +, fetchFromGitHub +, gtk3 }: -stdenv.mkDerivation rec { + +stdenvNoCC.mkDerivation rec { pname = "rose-pine-icon-theme"; version = "unstable-2022-09-01"; @@ -14,6 +15,10 @@ stdenv.mkDerivation rec { sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; }; + nativeBuildInputs = [ + gtk3 + ]; + # avoid the makefile which is only for the theme maintainers dontBuild = true; @@ -25,6 +30,10 @@ stdenv.mkDerivation rec { mv icons/rose-pine-dawn-icons $out/share/icons/rose-pine-dawn mv icons/rose-pine-moon-icons $out/share/icons/rose-pine-moon + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + runHook postInstall ''; diff --git a/pkgs/data/themes/rose-pine-gtk/default.nix b/pkgs/data/themes/rose-pine-gtk/default.nix index 707b05fd8e2a..4211864139df 100644 --- a/pkgs/data/themes/rose-pine-gtk/default.nix +++ b/pkgs/data/themes/rose-pine-gtk/default.nix @@ -1,12 +1,12 @@ -{ - stdenv, - fetchFromGitHub, - lib, - gnome-themes-extra, - gtk-engine-murrine, - gtk_engines, +{ stdenvNoCC +, lib +, fetchFromGitHub +, gnome-themes-extra +, gtk-engine-murrine +, gtk_engines }: -stdenv.mkDerivation rec { + +stdenvNoCC.mkDerivation rec { pname = "rose-pine-gtk-theme"; version = "unstable-2022-09-01"; From 9fd918d07a7be106c2909b086633f8a8a0a290dc Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 22 Jan 2023 17:38:31 -0500 Subject: [PATCH 270/326] bottom: 0.7.1 -> 0.8.0 Diff: https://github.com/ClementTsang/bottom/compare/0.7.1...0.8.0 Changelog: https://github.com/ClementTsang/bottom/blob/0.8.0/CHANGELOG.md --- pkgs/tools/system/bottom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 08b15bc4c9dc..9ca8fe25d19c 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-g9MkS1ps4RTEvuZP9oJize+Uz7W6uCNNks+HjO771QU="; + sha256 = "sha256-UbzWI3f1ewFwg7BsqcvPZFeJt5E6alShxNuIKy+Tno0="; }; - cargoHash = "sha256-wVvGj58dmpLH+zMu9e/TQ7gTvwmgYIYX5MrVcnOMu/A="; + cargoHash = "sha256-ihCgaB+vP5YyqMIg8qrkCEvSQdc6Eq00D1r3PGc2WpA="; nativeBuildInputs = [ installShellFiles ]; From 1310cc0ad72bddea49ed7ed199e1390a1d27cad0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 22:52:06 +0000 Subject: [PATCH 271/326] ergo: 5.0.3 -> 5.0.6 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 3d14ec40f238..e65684353642 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.3"; + version = "5.0.6"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-IDAss4qX39qPyOsPpVg5zU6zq/QV/RTnbHTGVl9UmOA="; + sha256 = "sha256-UiPwvZcdkeFOTMVcUT1Xr5ByrJC+yzodCfi8Br61hjU="; }; nativeBuildInputs = [ makeWrapper ]; From b289bfdeebdc39894b7bafca7f0a1e61b6979620 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 23:00:43 +0000 Subject: [PATCH 272/326] libosmium: 2.18.0 -> 2.19.0 --- pkgs/development/libraries/libosmium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index 01cdc96e39cd..d86755837b4a 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libosmium"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "sha256-IPdaBT6hRNHo8kuOsiKdyiQkRxA/l+44U3qGGG89BTo="; + sha256 = "sha256-R7kOhQFfGYuHNkIZV4BTE+WKjHnCJwKeIWjCJNrvyTQ="; }; nativeBuildInputs = [ cmake ]; From 9f370f0f74d2db2cf64c10ca7fa6f45fa6f1bd38 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 13 Jan 2023 08:10:06 +0800 Subject: [PATCH 273/326] cargo-bisect-rustc: unpin openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fc6d073d097..220db4c5e94d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15533,7 +15533,6 @@ with pkgs; }; cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; cargo-bitbake = callPackage ../development/tools/rust/cargo-bitbake { }; cargo-c = callPackage ../development/tools/rust/cargo-c { From f6d98679bb2fa6f65f1783e3488f2d615500df98 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 13 Jan 2023 08:15:03 +0800 Subject: [PATCH 274/326] cliscord: unpin openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 220db4c5e94d..a61e0f754517 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16078,7 +16078,6 @@ with pkgs; cliscord = callPackage ../misc/cliscord { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; clisp = callPackage ../development/interpreters/clisp { From 93da9cccfacd6b94b0d0bcbe55a8d44c0d2aaf8c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 13 Jan 2023 18:56:02 +0800 Subject: [PATCH 275/326] journaldriver: unpin openssl_1_1 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a61e0f754517..961e4afc02fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8514,9 +8514,7 @@ with pkgs; jot = callPackage ../applications/misc/jot { }; - journaldriver = callPackage ../tools/misc/journaldriver { - openssl = openssl_1_1; - }; + journaldriver = callPackage ../tools/misc/journaldriver { }; jp = callPackage ../development/tools/jp { }; From f85005c85e0d7daee4afe82eac73a7da7b856f6d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 23 Jan 2023 09:51:13 +0800 Subject: [PATCH 276/326] git-trim: unpin openssl_1_1 --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 961e4afc02fe..8733035de7c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1846,7 +1846,6 @@ with pkgs; git-town = callPackage ../applications/version-management/git-town { }; git-trim = callPackage ../applications/version-management/git-trim { - openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; }; From 284370ecf074a5b1b9efaca9952864ad3d4c80b8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 20 Jan 2023 20:16:22 +0800 Subject: [PATCH 277/326] shotwell: remove unused libchamplain dependency https://gitlab.gnome.org/GNOME/shotwell/-/commit/e9829cefa3eb11a7adfd61eb849b11476342def2 The above commit actually removes the dependency. grep -inr 'champlain' still returns some results from src/MapWidget.vala, it is just an unused file. (Note that this app is ported to libsoup 3 in 0.31.5) --- pkgs/applications/graphics/shotwell/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 251dfdef32f4..a566d9da788c 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -30,7 +30,6 @@ , wrapGAppsHook , gobject-introspection , itstool -, libchamplain , libsecret , gsettings-desktop-schemas , python3 @@ -86,7 +85,6 @@ stdenv.mkDerivation rec { librest gcr gnome.adwaita-icon-theme - libchamplain libsecret ]; From a4e6fbc3bf980af29c99f969106e8c34c1ebb687 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 20 Jan 2023 21:42:16 +0800 Subject: [PATCH 278/326] gnome.empathy: drop Unmaintained and does not launch. libsoup2 symbols detected. Using libsoup2 and libsoup3 in the same process is not supported. Already removed in debian when bumping GNOME to 43: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1018122 --- pkgs/desktops/gnome/core/empathy/default.nix | 147 ------------------- pkgs/desktops/gnome/default.nix | 3 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 2 insertions(+), 151 deletions(-) delete mode 100644 pkgs/desktops/gnome/core/empathy/default.nix diff --git a/pkgs/desktops/gnome/core/empathy/default.nix b/pkgs/desktops/gnome/core/empathy/default.nix deleted file mode 100644 index fbfee37cd13e..000000000000 --- a/pkgs/desktops/gnome/core/empathy/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ lib, stdenv -, intltool -, fetchurl -, webkitgtk -, pkg-config -, gtk3 -, glib -, file -, librsvg -, gnome -, gdk-pixbuf -, python3 -, telepathy-glib -, telepathy-farstream -, clutter-gtk -, clutter-gst -, gst_all_1 -, cogl -, gnome-online-accounts -, gcr -, libsecret -, folks -, libpulseaudio -, telepathy-mission-control -, telepathy-logger -, libnotify -, clutter -, libsoup -, gnutls -, evolution-data-server -, yelp-xsl -, libcanberra-gtk3 -, p11-kit -, farstream -, libtool -, shared-mime-info -, wrapGAppsHook -, itstool -, libxml2 -, libxslt -, icu -, libgee -, gsettings-desktop-schemas -, isocodes -, enchant -, libchamplain -, geoclue2 -, geocode-glib -, cheese -, libgudev -}: - -stdenv.mkDerivation rec { - pname = "empathy"; - version = "3.25.90"; - - src = fetchurl { - url = "mirror://gnome/sources/empathy/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc"; - }; - - propagatedBuildInputs = [ - (folks.override { telepathySupport = true; }) - telepathy-logger - evolution-data-server - telepathy-mission-control - ]; - - nativeBuildInputs = [ - pkg-config - libtool - intltool - itstool - file - wrapGAppsHook - libxml2 - libxslt - yelp-xsl - python3 - ]; - - buildInputs = [ - gtk3 - glib - webkitgtk - icu - gnome-online-accounts - telepathy-glib - clutter-gtk - clutter-gst - cogl - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gcr - libsecret - libpulseaudio - gdk-pixbuf - libnotify - clutter - libsoup - gnutls - libgee - p11-kit - libcanberra-gtk3 - telepathy-farstream - farstream - gnome.adwaita-icon-theme - gsettings-desktop-schemas - librsvg - - # Spell-checking - enchant - isocodes - - # Display maps, location awareness, geocode support - libchamplain - geoclue2 - geocode-glib - - # Cheese webcam support, camera monitoring - cheese - libgudev - ]; - - enableParallelBuilding = true; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ) - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = "empathy"; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Empathy"; - description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; - maintainers = teams.gnome.members; - license = [ licenses.gpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index fa9b8eef0659..ae8bc2bc1302 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -23,8 +23,6 @@ lib.makeScope pkgs.newScope (self: with self; { dconf-editor = callPackage ./core/dconf-editor { }; - empathy = callPackage ./core/empathy { }; - epiphany = callPackage ./core/epiphany { }; evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests @@ -264,6 +262,7 @@ lib.makeScope pkgs.newScope (self: with self; { }) // lib.optionalAttrs config.allowAliases { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. + empathy = throw "The ‘gnome.empathy’ package was removed as it is unmaintained and no longer launches due to libsoup3 migration."; # added 2023-01-20 gnome-desktop = throw "The ‘gnome.gnome-desktop’ alias was removed. Please use ‘pkgs.gnome-desktop’ directly."; # converted to throw on 2022-10-26 gnome-todo = pkgs.endeavour; # added 2022-07-30 libgnome-games-support = throw "The ‘gnome.libgnome-games-support’ alias was removed. Please use ‘pkgs.libgnome-games-support’ directly."; # converted to throw on 2022-10-26 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5506b451ddb1..7642fb07f82f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -419,6 +419,7 @@ mapAliases ({ emacsPackagesNgGen = throw "'emacsPackagesNgGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18 + empathy = throw "empathy was removed as it is unmaintained and no longer launches due to libsoup3 migration"; # Added 2023-01-20 enblendenfuse = throw "'enblendenfuse' has been renamed to/replaced by 'enblend-enfuse'"; # Converted to throw 2022-02-22 encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06 envdir = throw "envdir has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f2c773f6a4f..0a73b72c61b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28731,8 +28731,6 @@ with pkgs; # If you turn this into "real" alias again, please add it to pkgs/top-level/packages-config.nix again too emacsPackages = emacs.pkgs; - inherit (gnome) empathy; - emptty = callPackage ../applications/display-managers/emptty {}; endeavour = callPackage ../applications/office/endeavour { }; From 5b5ace4f17fa4eb790a84f883637713aea837382 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 23 Jan 2023 04:36:02 +0100 Subject: [PATCH 279/326] bundler: 2.4.4 -> 2.4.5 --- pkgs/development/ruby-modules/bundler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 032b61958fa1..9be3f909ca59 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.4.4"; - source.sha256 = "sha256-gwAxWVkd9nptMRtaZc++8PmJZdIDVr66wUv1xi1NPJ0="; + version = "2.4.5"; + source.sha256 = "sha256-Wvj6rwlmbVnM3xqORh8Xu8XE5Jutstyu4XRln4yH1Eo="; dontPatchShebangs = true; postFixup = '' From 109d610f48744f410d78281cc9b9ed1b91c9aa4e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 03:07:15 +0000 Subject: [PATCH 280/326] =?UTF-8?q?terraform-providers.gitlab:=2015.7.1=20?= =?UTF-8?q?=E2=86=92=2015.8.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 2da6b6b31c82..1f4ce103d858 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -433,13 +433,13 @@ "vendorHash": null }, "gitlab": { - "hash": "sha256-RCN4CRFffg1rhyNACo/5ebVzbvsUXf6otDRuxlF8RoM=", + "hash": "sha256-bCF6BLuzjUZToZKerfsGcav4DD6AWwOrlELxQKygHv4=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v15.7.1", + "rev": "v15.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-7XiZP51K/S5Al+VNJw4NcqzkMeqs2iSHCOlNAI4+id4=" + "vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE=" }, "google": { "hash": "sha256-/UgxXHucsrt960zLQiPruqJLxjFriTrNKjeI1gNEWys=", From 9a1a1f1faa9edc7548dabd3727576609673b60c7 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 23 Jan 2023 03:55:02 +0000 Subject: [PATCH 281/326] yubioath-flutter: flutter itself should not be in the closure for yubioath-flutter --- pkgs/applications/misc/yubioath-flutter/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index 6b58dd1caf5d..bac11b6899b3 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -6,6 +6,7 @@ , pcre2 , gnome , makeWrapper +, removeReferencesTo }: let vendorHashes = { @@ -64,16 +65,25 @@ flutter.mkFlutterApp rec { substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \ --replace "@EXEC_PATH/authenticator" "$out/bin/yubioath-flutter" \ --replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png" + + # Remove unnecessary references to Flutter. + remove-references-to -t ${flutter.unwrapped} $out/app/data/flutter_assets/shaders/ink_sparkle.frag ''; nativeBuildInputs = [ makeWrapper + removeReferencesTo ]; buildInputs = [ pcre2 ]; + disallowedReferences = [ + flutter + flutter.unwrapped + ]; + meta = with lib; { description = "Yubico Authenticator for Desktop"; homepage = "https://github.com/Yubico/yubioath-flutter"; From 0aeadf53d3e4f7c8517db77479dc16ec059e5269 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 23 Jan 2023 05:38:09 +0100 Subject: [PATCH 282/326] p2pool: 2.4 -> 2.7 --- pkgs/applications/misc/p2pool/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index b41b5ffb885e..bce7760759df 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -11,22 +11,27 @@ , openssl , pkg-config , zeromq +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Foundation; +in stdenv.mkDerivation rec { pname = "p2pool"; - version = "2.4"; + version = "2.7"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-En2ogxAD61w7DRTsCGIp6fEP/cC2A+pTYIbjeJ1MktY="; + sha256 = "sha256-j3SVwat/LGw/iGcyNn8acR29Ob/WXDKyeCfDTsH+gxA="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libuv zeromq libsodium gss hwloc openssl curl ]; + buildInputs = [ libuv zeromq libsodium gss hwloc openssl curl ] + ++ lib.optionals stdenv.isDarwin [ Foundation ]; installPhase = '' runHook preInstall From 20a1663e048047fd94f73a64157cec650c2906c1 Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Thu, 19 Jan 2023 05:35:08 +0100 Subject: [PATCH 283/326] fava: loosen cheroot version requirement --- pkgs/applications/office/fava/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index fce5bb149641..9a81afb8c6a5 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -10,7 +10,9 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-Uw8UIJa+Dtsy+o31I1ynLyhZrFNX42NFRXu1O2ISbzU="; }; - nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; + pythonRelaxDeps = [ "cheroot" ]; + + nativeBuildInputs = with python3.pkgs; [ setuptools-scm pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ babel From 53bb93d08bc75a0a7b32be9ffed32202f7469e08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 05:33:47 +0000 Subject: [PATCH 284/326] babashka: 1.0.169 -> 1.0.170 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 0934e73a19a5..4f0259c65d85 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "1.0.169"; + version = "1.0.170"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-R4oGMN/2oVPKe0JBXXQ1mzw0F66Wn+WiP0kVs53zdoI="; + sha256 = "sha256-NM1lcDi60DuBr67kOx6CVLyO8p2DUq6c2oTZEiHBFjw="; }; executable = "bb"; From 290892ddba7468398b6a0bf77ce29b8a00b7cd53 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 23 Jan 2023 06:53:00 +0100 Subject: [PATCH 285/326] Revert "jdupes: 1.21.0 -> 1.21.1" --- pkgs/tools/misc/jdupes/default.nix | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index c4d54f38110e..72970d2dc9b4 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -1,20 +1,38 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.21.1"; + version = "1.21.0"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "sha256-VtwEDw0BBcXO2NVka0pddJSOm8hnQ8iqL2fzGI8uVFM="; + sha256 = "sha256-nDyRaV49bLVHlyqKJ7hf6OBWOLCfmHrTeHryK091c3w="; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. postFetch = "rm -r $out/testdir"; }; + patches = [ + (fetchpatch { + name = "darwin-stack-size.patch"; + url = "https://github.com/jbruchon/jdupes/commit/8f5b06109b44a9e4316f9445da3044590a6c63e2.patch"; + sha256 = "0saq92v0mm5g979chr062psvwp3i3z23mgqrcliq4m07lvwc7i3s"; + }) + (fetchpatch { + name = "linux-header-ioctl.patch"; + url = "https://github.com/jbruchon/jdupes/commit/0d4d98f51c99999d2c6dbbb89d554af551b5b69b.patch"; + sha256 = "sha256-lyuZeRp0Laa8I9nDl1HGdlKa59OvGRQJnRg2fTWv7mQ="; + }) + (fetchpatch { + name = "darwin-apfs-comp.patch"; + url = "https://github.com/jbruchon/jdupes/commit/517b7035945eacd82323392b13bc17b044bcc89d.patch"; + sha256 = "sha256-lvOab6tyEyKUtik3JBdIs5SHpVjcQEDfN7n2bfUszBw="; + }) + ]; + dontConfigure = true; makeFlags = [ From ce563f610557f4e2659c9b3a567bbf46116736bf Mon Sep 17 00:00:00 2001 From: novenary Date: Sun, 22 Jan 2023 20:36:51 +0200 Subject: [PATCH 286/326] gitprompt-rs: init at 0.3.0 --- .../gitprompt-rs/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/version-management/gitprompt-rs/default.nix diff --git a/pkgs/applications/version-management/gitprompt-rs/default.nix b/pkgs/applications/version-management/gitprompt-rs/default.nix new file mode 100644 index 000000000000..6980c8f22576 --- /dev/null +++ b/pkgs/applications/version-management/gitprompt-rs/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, rustPlatform, git }: + +rustPlatform.buildRustPackage rec { + pname = "gitprompt-rs"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "9ary"; + repo = pname; + rev = version; + sha256 = "00xxz7awk01981daabp8m3kwq127y733ynijiwqgs8xvn4nkg8h6"; + }; + + cargoSha256 = "0avs833vb6q1avjbfygm55s83iy942xgqsx6qdzksry44n35s418"; + + postPatch = '' + substituteInPlace src/main.rs \ + --replace 'Command::new("git")' 'Command::new("${git}/bin/git")' + ''; + + meta = with lib; { + description = "Simple Git prompt"; + homepage = "https://github.com/9ary/gitprompt-rs"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ novenary ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 819c43791048..1a0c6950990b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1882,6 +1882,8 @@ with pkgs; gitnuro = callPackage ../applications/version-management/gitnuro { }; + gitprompt-rs = callPackage ../applications/version-management/gitprompt-rs/default.nix { }; + gitsign = callPackage ../applications/version-management/gitsign { }; gitstats = callPackage ../applications/version-management/gitstats { }; From 0fbdf6daae8d905f8fe70db512ed1bf6f7e48981 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 08:08:28 +0000 Subject: [PATCH 287/326] httm: 0.19.2 -> 0.19.3 --- pkgs/tools/filesystems/httm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index a19333f1cc83..9181dff70d34 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-0diHZFD4+glTdGWWJk/5amr0mDsvKV5OibKGQNtitIk="; + sha256 = "sha256-TDA1T36iY3xRFX0mBYazKeyzoDD7RPWRxQfUF7Rv5vA="; }; - cargoSha256 = "sha256-Rg1wmDLmkDC25meZIe94WZ3Wp8a93VAqRJXjmaE6k18="; + cargoHash = "sha256-rBZ9cYk5Gzs8hy8fRgO8I0zaBncl8CwQoX5I0qzHBYE="; nativeBuildInputs = [ installShellFiles ]; From d776f4ed22e9e1aa2ff73f826a33cf42ceadf52e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 08:17:11 +0000 Subject: [PATCH 288/326] relic: 7.5.3 -> 7.5.4 --- pkgs/development/tools/relic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/relic/default.nix b/pkgs/development/tools/relic/default.nix index 6fb5507b87d6..6652e5547f12 100644 --- a/pkgs/development/tools/relic/default.nix +++ b/pkgs/development/tools/relic/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "relic"; - version = "7.5.3"; + version = "7.5.4"; src = fetchFromGitHub { owner = "sassoftware"; repo = pname; rev = "v${version}"; - sha256 = "sha256-urueDWvHhDsIiLIAatAforBM//UEJz8wUHEVyhwV7JY="; + sha256 = "sha256-rm52XrN0554copqIllfaNC9EIZ+6rxVeZWTWR2y9X14="; }; - vendorSha256 = "sha256-wlylASK2RES0nbf6UZHJBrYQaz9jrq5j7/KF1wYOqE0="; + vendorHash = "sha256-389ki4hsx7l2gHSiOHledo/ZP+I3NAkk1K8anq2kfEE="; meta = with lib; { homepage = "https://github.com/sassoftware/relic"; From 6f51b1834ab5c3227473efd6f7044e75121aca6a Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Mon, 23 Jan 2023 08:33:31 +0000 Subject: [PATCH 289/326] operator-sdk: build all binaries Currently the repo provides 3 binaries. The 2 that were missing are used in upstream docker images. But to use dockerTools instead, these need to be packaged with nix! @moduon MT-1075 --- pkgs/development/tools/operator-sdk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index b1d8e5065f28..3b38cc97e6b8 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -29,6 +29,8 @@ buildGoModule rec { doCheck = false; subPackages = [ + "cmd/ansible-operator" + "cmd/helm-operator" "cmd/operator-sdk" ]; From 24bb925ebcfe5b2feeea3ebb14f7da603a3588b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jan 2023 04:34:38 +0000 Subject: [PATCH 290/326] komga: 0.158.0 -> 0.160.0 --- pkgs/servers/komga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/komga/default.nix b/pkgs/servers/komga/default.nix index bc4c3ac4869b..47aca84a80b2 100644 --- a/pkgs/servers/komga/default.nix +++ b/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "0.158.0"; + version = "0.160.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-WySZFoi1ifSuvlKrbgvd0WXzib6cSiOcGZ2cSSIQZTc="; + sha256 = "sha256-maNOiC+hFv/mniU1spZVZrUJETT5sgdi1OmbYR2smFk="; }; nativeBuildInputs = [ From 3bbf545034ea2a5e18c90931bed0e732d121475f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 20:14:54 +0000 Subject: [PATCH 291/326] copilot-cli: 1.24.0 -> 1.25.0 --- pkgs/tools/admin/copilot-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix index 96afae58b173..dee610f3b6fd 100644 --- a/pkgs/tools/admin/copilot-cli/default.nix +++ b/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OTt9sJuLv+fY2OTK4FGl15/YmxnPRqGXNnKYl9TtHxE="; + sha256 = "sha256-Lhg3ZOCv5FlMh2FI92s8OR1XugkX0occv0ku7MKhL+8="; }; - vendorSha256 = "sha256-dH39ZpATq5Oafr7Guc+zYUhjlAgiwpc5HKHWlMm4buU="; + vendorHash = "sha256-rxnVNAgLOVBshm6tKOfqspOy+rQP7M22+Q3HnWBVjr8="; nativeBuildInputs = [ installShellFiles ]; From 5fa6306fd5690439a3b8358e3cfd11c6d4341b50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jan 2023 18:27:08 +0000 Subject: [PATCH 292/326] pocketbase: 0.11.2 -> 0.11.3 --- pkgs/servers/pocketbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 2aa25521b300..71b1bf567847 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-px4rpVTOuQh7QuqqxiVqmB+iYrUdk82TE7MJSaGZLYw="; + sha256 = "sha256-M55IylFGAKy9TEIyLSHGbf9FjU5OjvoHjwYkiS31Zpk="; }; vendorHash = "sha256-D8nFoTggxYNj7ZSY1rvA4YSJHbB7wwpPSu1g+S3c1C0="; From 151b86ad6ab7e2161b2da2c599441ac3024422a3 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Mon, 23 Jan 2023 10:10:21 +0100 Subject: [PATCH 293/326] jellyfin-web: 10.8.8 -> 10.8.9 --- pkgs/servers/jellyfin/node-deps.nix | 4 ++-- pkgs/servers/jellyfin/web.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/jellyfin/node-deps.nix b/pkgs/servers/jellyfin/node-deps.nix index 73c65f0037ae..ceb53197182e 100644 --- a/pkgs/servers/jellyfin/node-deps.nix +++ b/pkgs/servers/jellyfin/node-deps.nix @@ -11817,8 +11817,8 @@ let args = { name = "jellyfin-web"; packageName = "jellyfin-web"; - version = "10.8.8"; - src = ../../../../../../../nix/store/bbsfbkaiq91gnf5ffcyh4gl8r9mqlyc4-source; + version = "10.8.9"; + src = ../../../../../../../nix/store/yvn7h8hrydjxiw23fhqj5ya6yilj0d57-source; dependencies = [ sources."@ampproject/remapping-2.1.2" (sources."@apideck/better-ajv-errors-0.3.3" // { diff --git a/pkgs/servers/jellyfin/web.nix b/pkgs/servers/jellyfin/web.nix index bf7c4d25d236..7dbab6683f3e 100644 --- a/pkgs/servers/jellyfin/web.nix +++ b/pkgs/servers/jellyfin/web.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "jellyfin-web"; - version = "10.8.8"; + version = "10.8.9"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - sha256 = "pIoMpNxRtIvs6bhFEoSlFU8aHZ2CBbHnZaA/FVAkGOI="; + sha256 = "hHZ8HVf8fidd5VPs06kB3/BHBHFxoV3fVObBesqfRJo="; }; nativeBuildInputs = [ From 575f56d82cdb3773b72a5f8e09ad8472cf4a3ddc Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Mon, 23 Jan 2023 10:18:08 +0100 Subject: [PATCH 294/326] jellyfin: 10.8.8 -> 10.8.9 --- pkgs/servers/jellyfin/default.nix | 4 ++-- pkgs/servers/jellyfin/disable-warnings.patch | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 1943d107ad0f..b7973a8e1d41 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.8.8"; # ensure that jellyfin-web has matching version + version = "10.8.9"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - sha256 = "3+JwcHZGENX9PgHdtRmzffi6p2p68Ngs3WOiEwAY8zU="; + sha256 = "kvtC9qtVuewR9W6sq963/tNgZbWSpygpBqcXnHuvX0Q="; }; patches = [ diff --git a/pkgs/servers/jellyfin/disable-warnings.patch b/pkgs/servers/jellyfin/disable-warnings.patch index 0127513b5ea7..1e13f77d0f1a 100644 --- a/pkgs/servers/jellyfin/disable-warnings.patch +++ b/pkgs/servers/jellyfin/disable-warnings.patch @@ -1,8 +1,8 @@ diff --git a/jellyfin.ruleset b/jellyfin.ruleset -index 5ac5f4923..88621857b 100644 +index 1c834de82..bf70fef1e 100644 --- a/jellyfin.ruleset +++ b/jellyfin.ruleset -@@ -54,6 +54,31 @@ +@@ -54,6 +54,33 @@ @@ -31,6 +31,8 @@ index 5ac5f4923..88621857b 100644 + + + ++ ++ From 48665a415038e5e04d8bef71c447e60077dba501 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 22 Jan 2023 18:47:20 +0100 Subject: [PATCH 295/326] linux_6_0: drop EOLed by upstream, doesn't receive any patches anymore, so let's drop it. Currently depends on #211886 which bumps the latest compatible ZFS version to 6.1. Also, clean up some old aliases. --- nixos/tests/kernel-generic.nix | 1 - .../linux/kernel/hardened/patches.json | 10 ---------- pkgs/os-specific/linux/kernel/linux-6.0.nix | 18 ------------------ pkgs/top-level/aliases.nix | 2 -- pkgs/top-level/linux-kernels.nix | 16 ++++------------ 5 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/linux-6.0.nix diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index ae3d47a49bd3..3e74554de339 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -30,7 +30,6 @@ let linux_5_4_hardened linux_5_10_hardened linux_5_15_hardened - linux_6_0_hardened linux_6_1_hardened linux_testing; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index fe406af8c3a8..849f1861403c 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -49,16 +49,6 @@ "sha256": "1bx77x4x10v38ygfiz0dcw938ybczq7f3srg11ifzvwm243r5if5", "version": "5.4.229" }, - "6.0": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-6.0.19-hardened1.patch", - "sha256": "11yn5mrvs170685pwa9k7asxlv64vgfqfg2b6m5yn2a11pr1rxg5", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.19-hardened1/linux-hardened-6.0.19-hardened1.patch" - }, - "sha256": "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb", - "version": "6.0.19" - }, "6.1": { "patch": { "extra": "-hardened1", diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix deleted file mode 100644 index 87050462e619..000000000000 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "6.0.19"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = versions.pad 3 version; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb"; - }; -} // (args.argsOverride or { })) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c857a06c832c..5181b19b0cee 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -840,7 +840,6 @@ mapAliases ({ linuxPackages_4_9 = linuxKernel.packages.linux_4_9; linuxPackages_5_10 = linuxKernel.packages.linux_5_10; linuxPackages_5_15 = linuxKernel.packages.linux_5_15; - linuxPackages_5_17 = linuxKernel.packages.linux_5_17; linuxPackages_5_18 = linuxKernel.packages.linux_5_18; linuxPackages_5_19 = linuxKernel.packages.linux_5_19; linuxPackages_5_4 = linuxKernel.packages.linux_5_4; @@ -861,7 +860,6 @@ mapAliases ({ linux_4_9 = linuxKernel.kernels.linux_4_9; linux_5_10 = linuxKernel.kernels.linux_5_10; linux_5_15 = linuxKernel.kernels.linux_5_15; - linux_5_17 = linuxKernel.kernels.linux_5_17; linux_5_18 = linuxKernel.kernels.linux_5_18; linux_5_19 = linuxKernel.kernels.linux_5_19; linux_5_4 = linuxKernel.kernels.linux_5_4; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 5de691a3b1d7..5d15cff25df1 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -159,18 +159,11 @@ in { ]; }; - linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream"; - linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream"; linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream"; - linux_6_0 = callPackage ../os-specific/linux/kernel/linux-6.0.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; + linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream"; linux_6_1 = callPackage ../os-specific/linux/kernel/linux-6.1.nix { kernelPatches = [ @@ -248,7 +241,7 @@ in { linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; - linux_6_0_hardened = hardenedKernelFor kernels.linux_6_0 { }; + linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream"; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; })); @@ -532,10 +525,9 @@ in { linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); - linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01 - linux_6_0 = recurseIntoAttrs (packagesFor kernels.linux_6_0); + linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20 linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); }; @@ -577,7 +569,7 @@ in { linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; - linux_6_0_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_0 { }); + linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream"; linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); From 1535f5974aca2ba1099ea22c03a0b9aa8b683349 Mon Sep 17 00:00:00 2001 From: Zig Uana Date: Fri, 20 Jan 2023 09:19:55 -0700 Subject: [PATCH 296/326] level-zero: 1.8.12 -> 1.9.4 --- pkgs/development/libraries/level-zero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index 85a803c010b1..89684080f9f0 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.8.12"; + version = "1.9.4"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "v${version}"; - sha256 = "sha256-87fnucPg8JygYo3QSuA6ll0acbHQvmWzNLEp4dqkAH8="; + sha256 = "sha256-4AQnMMKo4BvajfhhKmhTZA0snKPnO4WjOuZAeiWU5PY="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; From 544df362deeaf539bb7b4a4f37b8f7a5b8579b52 Mon Sep 17 00:00:00 2001 From: Zig Uana Date: Fri, 20 Jan 2023 09:19:15 -0700 Subject: [PATCH 297/326] intel-compute-runtime: add a patch to fix typo --- .../linux/intel-compute-runtime/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index d2d7c6218ae7..aa9a7b5dd430 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , patchelf , cmake , pkg-config @@ -21,6 +22,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-CWiWkv3CmHhXAk2M92voeQ06ximSOnT9hgIA4rIxWmM="; }; + patches = [ + # fix compile with level-zero 1.9.4 + (fetchpatch { + url = "https://github.com/intel/compute-runtime/commit/dce17d319f91b39806b2cd39b6eecd5c5cff2a68.patch"; + excludes = [ "manifests/manifest.yml" ]; + sha256 = "sha256-YGzS4LeNO8FO1GXowD2gARj0TL6tBFaeZJNLZOwSsWQ="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ intel-gmmlib intel-graphics-compiler libva level-zero ]; From 285bba82f6c393b89911b49538bdf411646186e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 10:22:32 +0000 Subject: [PATCH 298/326] crowdin-cli: 3.9.1 -> 3.9.3 --- pkgs/tools/text/crowdin-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index e2573861f300..5d97f8195f7c 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.9.1"; + version = "3.9.3"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - sha256 = "sha256-n5eDe29+HhH4YHNLzRhIpx2ceH1pw0TaXdTtVZYNT48="; + sha256 = "sha256-p8abIgCAXo/LW/AZN2esSYVkVoggQ2vj5QkAseHwXJo="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; From 8dda3f4a5207996b8ba60dee48d53ec2983f4187 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 23 Jan 2023 11:39:46 +0100 Subject: [PATCH 299/326] python3Packages.pyrainbird: 1.1.0 -> 1.1.1 Diff: https://github.com/allenporter/pyrainbird/compare/refs/tags/1.1.0...1.1.1 Changelog: https://github.com/allenporter/pyrainbird/releases/tag/1.1.1 --- pkgs/development/python-modules/pyrainbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index ccc3b90979aa..899e1cfd7b60 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qAFc1LPGG8O46He2cjhs567yqaZy7d5CMeDH/sqnriw="; + hash = "sha256-e+neyzH+sGTzGwdy/N7n6GUvctHlHQgwDkRQsnzL7Jw="; }; postPatch = '' From e3ce81781cf98872b3605d46bc65092db06418db Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 23 Jan 2023 11:40:54 +0100 Subject: [PATCH 300/326] home-assistant: 2023.1.6 -> 2023.1.7 https://github.com/home-assistant/core/releases/tag/2023.1.7 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 46b27d0b2036..79e14605bde9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.1.6"; + version = "2023.1.7"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index b2bfea501dd1..b1af7ca2e4ae 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -325,7 +325,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.1.6"; + hassVersion = "2023.1.7"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -343,7 +343,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-szD9smS1OZAECvFufmj0qfnIXFivB93D5XEwWeiIYh4="; + hash = "sha256-z8dTFRs7Tm4WTQcYeHu9jlGbva9yNPhjmQ+CQY+9DN4="; }; # leave this in, so users don't have to constantly update their downstream patch handling From 6262935d09f683335d35bbc6413f1fffb50bd5ac Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 23 Jan 2023 11:39:54 +0200 Subject: [PATCH 301/326] fzf: fix failing test on 32-bit platforms --- pkgs/tools/misc/fzf/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 6a29151a5178..8e84b5d6fc7c 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,6 +2,7 @@ , lib , buildGoModule , fetchFromGitHub +, fetchpatch , writeText , writeShellScriptBin , runtimeShell @@ -46,6 +47,16 @@ buildGoModule rec { "-s" "-w" "-X main.version=${version} -X main.revision=${src.rev}" ]; + patches = [ + # fix for test failure on 32-bit platforms + # can be removed in the next release of fzf + # https://github.com/junegunn/fzf/issues/3127 + (fetchpatch { + url = "https://github.com/junegunn/fzf/commit/aa7361337d3f78ae1e32283ba395446025323abb.patch"; + hash = "sha256-ZmBdJa7eq9f58f2pL7QrtDSApkQJQBH/Em12J5xk3Q4="; + }) + ]; + # The vim plugin expects a relative path to the binary; patch it to abspath. postPatch = '' sed -i -e "s|expand(':h:h')|'$out'|" plugin/fzf.vim From 27a557db61565fdf67bfe0a29f8d1518b3565b01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 10:49:52 +0000 Subject: [PATCH 302/326] git-machete: 3.14.2 -> 3.14.3 --- pkgs/applications/version-management/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index aae814440423..24fc850b31b0 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.14.2"; + version = "3.14.3"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-uIVt7pneJq7l/kMSa7VqhcQgXhHCrpBGEqE7QZaDyQQ="; + hash = "sha256-VOny8r00JYUT4Z7LukvWTH9ZTn86vn2Dc1YhPmtdE5s="; }; nativeBuildInputs = [ installShellFiles ]; From 86d0c9f603d20db3522a2ee2ae2d208723019097 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 23 Jan 2023 13:50:02 +0300 Subject: [PATCH 303/326] forgejo: 1.18.2-0 -> 1.18.2-1 --- pkgs/applications/version-management/forgejo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 819f9bf8b716..e00853393e05 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -14,13 +14,13 @@ buildGoPackage rec { pname = "forgejo"; - version = "1.18.2-0"; + version = "1.18.2-1"; src = fetchurl { name = "${pname}-src-${version}.tar.gz"; # see https://codeberg.org/forgejo/forgejo/releases - url = "https://codeberg.org/attachments/5d59ec04-9f29-4b32-a1ef-bec5c3132e26"; - hash = "sha256-RLShwdx8geyFr1Jk5qDVbsEt2hCjdrwX0lNHea7P+pk="; + url = "https://codeberg.org/attachments/44ff6fcb-1515-4bba-85bf-3d3795ced2f7"; + hash = "sha256-XSh17AwPtC+Y24lgjjXJzT/uBHg+0hWZ2RZ/eNF4mCY="; }; outputs = [ "out" "data" ]; From d000c1d19de0045cba1c120117f3c2548b713d57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 11:21:51 +0000 Subject: [PATCH 304/326] werf: 1.2.195 -> 1.2.197 --- pkgs/applications/networking/cluster/werf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 271d82f4d86c..cad2c936a331 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.195"; + version = "1.2.197"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-rNhCZO4Axeuc5jEAndjma7/jnst1kDNdtb/h/jD2rtE="; + hash = "sha256-cRpXdV/aHxVxMd54nmf9bMogiC9V8ryvCtSe+6Vx/Hk="; }; vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk="; From 406cf6373f2afb2cddd990361895d40e1afdb42d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 11:37:36 +0000 Subject: [PATCH 305/326] er-patcher: 1.06-2 -> 1.06-3 --- pkgs/tools/games/er-patcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/games/er-patcher/default.nix b/pkgs/tools/games/er-patcher/default.nix index 1eaad03a3291..4440277b664d 100644 --- a/pkgs/tools/games/er-patcher/default.nix +++ b/pkgs/tools/games/er-patcher/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "er-patcher"; - version = "1.06-2"; + version = "1.06-3"; src = fetchFromGitHub { owner = "gurrgur"; repo = "er-patcher"; rev = "v${version}"; - sha256 = "sha256-rFIuswn55FNVmBoDfIpG2cKxybNDaTwOeIUFFoncGF0="; + sha256 = "sha256-w/5cXxY4ua5Xo1BSz3MYRV+SdvVGFAx53KMIORS1uWE="; }; buildInputs = [ From edc8ac91f143b3c27e5c745a0cd2e8f2fc193bd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 13:24:32 +0000 Subject: [PATCH 306/326] oh-my-posh: 13.1.2 -> 13.3.1 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index e1676cf56805..3ba0b5ff4240 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "13.1.2"; + version = "13.3.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/of1jeyHdVyXJ5O8aAN/InaJ5CtCPVFUTk96Q9n5Gr4="; + hash = "sha256-ssZbeb1UczWEjeRY1WJBQPnbG/p6XcUSWVHLdreGJkk="; }; vendorHash = "sha256-WiH4qu8DODEhAkxUm6VDcBwFyQO7kNjaiaWPDHCHj9E="; From 5b22ff71e14262f98418a952cf4a516d31535831 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 Jan 2023 14:44:06 +0000 Subject: [PATCH 307/326] gcc: don't disable libgomp for uclibc targets I'm reasonably confident this is no longer necessary, as uclibc's libdl.a is empty, and I can cross-build stdenv.cc.cc for x86_64-unknown-linux-uclibc with libgomp enabled. --- pkgs/development/compilers/gcc/common/configure-flags.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 8e444d54bf39..7fce9299a298 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -94,10 +94,6 @@ let # libsanitizer requires netrom/netrom.h which is not # available in uclibc. "--disable-libsanitizer" - ] ++ lib.optionals (targetPlatform.libc == "uclibc") [ - # In uclibc cases, libgomp needs an additional '-ldl' - # and as I don't know how to pass it, I disable libgomp. - "--disable-libgomp" ] ++ lib.optional (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") "--with-newlib" ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" ); From 271dbd928e3d6b26237cc00d4f549349b8120554 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 23 Jan 2023 11:45:56 -0500 Subject: [PATCH 308/326] nixos/blocky: restart on failure --- nixos/modules/services/networking/blocky.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/blocky.nix b/nixos/modules/services/networking/blocky.nix index 971448545616..30a41fa6a421 100644 --- a/nixos/modules/services/networking/blocky.nix +++ b/nixos/modules/services/networking/blocky.nix @@ -31,6 +31,7 @@ in serviceConfig = { DynamicUser = true; ExecStart = "${pkgs.blocky}/bin/blocky --config ${configFile}"; + Restart = "on-failure"; AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; From 26096b537efda2949e31473f083187351cec30e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 18:34:08 +0000 Subject: [PATCH 309/326] kubeone: 1.5.4 -> 1.5.5 --- pkgs/applications/networking/cluster/kubeone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 65db0b689aab..96e0e4894ec6 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-s94o2/wInWMWbJcq8cpEbJYHL6vpD3Vurl/rOigzQRk="; + hash = "sha256-PdrU3kKuoT4MP5N2t4E1PIKZOMu8D0ZbUyMTIi/KZ7g="; }; vendorHash = "sha256-Y4eivDchnN2rtQWjFY3cFiJXRfj48UfVUKM/OLuWXGA="; From 99dc210065dffaa16c126546b1d81250b2892239 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 18:59:47 +0000 Subject: [PATCH 310/326] addlicense: 1.1.0 -> 1.1.1 --- pkgs/tools/misc/addlicense/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/addlicense/default.nix b/pkgs/tools/misc/addlicense/default.nix index a01ae0de0834..0ea6beadea80 100644 --- a/pkgs/tools/misc/addlicense/default.nix +++ b/pkgs/tools/misc/addlicense/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "addlicense"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "google"; repo = "addlicense"; rev = "v${version}"; - sha256 = "sha256-Vi+U0b9tTJitStZr1wSotr82Y2gA4IjvHLAa+rwGH/g="; + sha256 = "sha256-YMMHj6wctKtJi/rrcMIrLmNw/uvO6wCwokgYRQxcsFw="; }; - vendorSha256 = "sha256-2mncc21ecpv17Xp8PA9GIodoaCxNBacbbya/shU8T9Y="; + vendorHash = "sha256-2mncc21ecpv17Xp8PA9GIodoaCxNBacbbya/shU8T9Y="; subPackages = [ "." ]; From ec1cb4aaf71117d817d7d072bde74f169bf4c792 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Jan 2023 19:35:34 +0000 Subject: [PATCH 311/326] discocss: 0.2.1 -> 0.2.3 --- pkgs/tools/misc/discocss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/discocss/default.nix b/pkgs/tools/misc/discocss/default.nix index e010541c7182..a9e3d124c855 100644 --- a/pkgs/tools/misc/discocss/default.nix +++ b/pkgs/tools/misc/discocss/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "discocss"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "mlvzk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Qp1EixARxEnpNM+Yhn00anR0Ll4aFmkeaGtNju/iWlY="; + sha256 = "sha256-of7OMgbuwebnFmbefGD1/dOhyTX1Hy7TccnWSRCweW0="; }; dontBuild = true; From 981dd3761a7a91a00924ee73d54c08f693a255c3 Mon Sep 17 00:00:00 2001 From: Alexis Destrez Date: Mon, 23 Jan 2023 21:00:56 +0100 Subject: [PATCH 312/326] maintainers: add krostar --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3f534813908c..1a36ec5e033a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7787,6 +7787,12 @@ githubId = 17659803; name = "Matthias Axel Kröll"; }; + krostar = { + email = "alexis.destrez@pm.me"; + github = "krostar"; + githubId = 5759930; + name = "Alexis Destrez"; + }; kristian-brucaj = { email = "kbrucaj@gmail.com"; github = "Kristian-Brucaj"; From 5dc8d5c7450c3d8f4d500e5c288d40e802174b96 Mon Sep 17 00:00:00 2001 From: Alexis Destrez Date: Mon, 23 Jan 2023 21:01:12 +0100 Subject: [PATCH 313/326] gci: init at 0.9.0 --- pkgs/development/tools/gci/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/gci/default.nix diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/development/tools/gci/default.nix new file mode 100644 index 000000000000..170b9c41dc9f --- /dev/null +++ b/pkgs/development/tools/gci/default.nix @@ -0,0 +1,25 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "gci"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "daixiang0"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-qWEEcIbTgYmGVnnTW+hM8e8nw5VLWN1TwzdUIZrxF3s="; + }; + + vendorSha256 = "sha256-dlt+i/pEP3RzW4JwndKTU7my2Nn7/2rLFlk8n1sFR60="; + + meta = with lib; { + description = "Controls golang package import order and makes it always deterministic"; + homepage = "https://github.com/daixiang0/gci"; + license = licenses.bsd3; + maintainers = with maintainers; [krostar]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 718e941b508c..25df2f7f4d58 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26016,6 +26016,8 @@ with pkgs; iferr = callPackage ../development/tools/iferr { }; + gci = callPackage ../development/tools/gci { }; + ginkgo = callPackage ../development/tools/ginkgo { }; gdlv = darwin.apple_sdk_11_0.callPackage ../development/tools/gdlv { From 2e7127a9d0f03c87652d3669c411f422af021172 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 23 Jan 2023 15:30:05 -0500 Subject: [PATCH 314/326] gitea: 1.18.2 -> 1.18.3 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index b1373a7098b1..3126dde50549 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -15,12 +15,12 @@ buildGoPackage rec { pname = "gitea"; - version = "1.18.2"; + version = "1.18.3"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-NqlY5s3tZT9HO6X0knlTPwoY6tMsYm9SyH3CEZpIcy0="; + hash = "sha256-jqjpbDgcmwZoc/ovgburFeeta9mAJOmz7yrvmUKAwRU="; }; patches = [ From 08fdf296585c2ebdf2516ace3b4198b9b2e20795 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 11:10:47 +0000 Subject: [PATCH 315/326] build(deps): bump korthout/backport-action from 1.0.1 to 1.1.0 Bumps [korthout/backport-action](https://github.com/korthout/backport-action) from 1.0.1 to 1.1.0. - [Release notes](https://github.com/korthout/backport-action/releases) - [Commits](https://github.com/korthout/backport-action/compare/v1.0.1...v1.1.0) --- updated-dependencies: - dependency-name: korthout/backport-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 2e7051784640..f402376ebfb0 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -24,7 +24,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs - uses: korthout/backport-action@v1.0.1 + uses: korthout/backport-action@v1.1.0 with: # Config README: https://github.com/korthout/backport-action#backport-action pull_description: |- From 6040e7fe06ccdfec615be92959361fa2ea51553f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Jan 2023 12:42:31 -0800 Subject: [PATCH 316/326] aws-vault: 6.6.1 -> 6.6.2 (#212301) --- pkgs/tools/admin/aws-vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index 80a9aec563fe..a1aa06b4a6a5 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "aws-vault"; - version = "6.6.1"; + version = "6.6.2"; src = fetchFromGitHub { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oItDA7PWI6EzEyG9QYb8N1Zttm8yHwMSgpUDV2C5ae0="; + sha256 = "sha256-BijZpk0vograOGlyuK7Wpsv8Y5DJvHUoTJVCex7VTTo="; }; - vendorSha256 = "sha256-zC4v9TlKHGCYRWX0ZWAVdCM7yw9eaAZ/4ZIZ38sM4S0="; + vendorHash = "sha256-zC4v9TlKHGCYRWX0ZWAVdCM7yw9eaAZ/4ZIZ38sM4S0="; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 64233227bc5cd6892704f3cc297a0e94c2bc2ec3 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 23 Jan 2023 15:47:02 -0500 Subject: [PATCH 317/326] roon-server: 2.0-1182 -> 2.0-1193 --- pkgs/servers/roon-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 8cd89c2afcf5..f1ff08b930cf 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1182"; + version = "2.0-1193"; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; in stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-2mo45+cbOyej5stJ8DFobvqECTTMLandcoPFnD4nY7s="; + hash = "sha256-yvM4mEFBelT8Nox0vzI4tlQbxDUkoMAB6q8l5LW8+b4="; }; dontConfigure = true; From d530dfa98780ec16c401ffef64ccc32dbc617209 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 20 Jan 2023 21:09:33 +0000 Subject: [PATCH 318/326] dosfstools: fix build for FreeBSD --- pkgs/tools/filesystems/dosfstools/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index db27a20d24a7..cbc00b52bd54 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -12,12 +12,16 @@ stdenv.mkDerivation rec { }; patches = [ - # macOS build fixes backported from master + # macOS and FreeBSD build fixes backported from master # TODO: remove on the next release (fetchpatch { url = "https://github.com/dosfstools/dosfstools/commit/77ffb87e8272760b3bb2dec8f722103b0effb801.patch"; sha256 = "sha256-xHxIs3faHK/sK3vAVoG8JcTe4zAV+ZtkozWIIFBvPWI="; }) + (fetchpatch { + url = "https://github.com/dosfstools/dosfstools/commit/2d3125c4a74895eae1f66b93287031d340324524.patch"; + sha256 = "nlIuRDsNjk23MKZL9cZ05odOfTXvsyQaKcv/xEr4c+U="; + }) ]; nativeBuildInputs = [ autoreconfHook pkg-config ] @@ -37,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; homepage = "https://github.com/dosfstools/dosfstools"; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + platforms = lib.platforms.unix; license = lib.licenses.gpl3; }; } From 7f114ba908070240bafea60830222dfa29bc3af4 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 23 Jan 2023 15:52:07 -0500 Subject: [PATCH 319/326] cargo-deb: 1.30.0 -> 1.42.0 Diff: https://github.com/kornelski/cargo-deb/compare/v1.30.0...v1.42.0 --- .../tools/rust/cargo-deb/default.nix | 48 ++++++++----------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 21 insertions(+), 31 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix index 2eb2ddd2d984..0472dd8dfa69 100644 --- a/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/pkgs/development/tools/rust/cargo-deb/default.nix @@ -1,49 +1,41 @@ -{ stdenv -, lib -, fetchFromGitHub +{ lib , rustPlatform -, rust -, libiconv -, Security +, fetchFromGitHub +, makeWrapper +, dpkg }: rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "1.30.0"; + version = "1.42.0"; src = fetchFromGitHub { - owner = "mmstick"; + owner = "kornelski"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rAmG6Aj0D9dHVueh1BN1Chhit+XFhqGib1WTvMDy0LI="; + hash = "sha256-5IWx9tScm64Rwi6RMsbXl1Eajtc/c5PWaZEDrgibTAY="; }; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + cargoHash = "sha256-nwCfUxIrr4DxKqePu/vwxfLld08+GGXZwQWz6Gltmao="; - cargoSha256 = "sha256-MEpyEdjLWNZvqE7gJLvQ169tgmJRzec4vqQI9fF3xr8="; + nativeBuildInputs = [ + makeWrapper + ]; - preCheck = '' - substituteInPlace tests/command.rs \ - --replace 'target/debug' "target/${rust.toRustTarget stdenv.buildPlatform}/release" + # This is an FHS specific assert depending on glibc location + checkFlags = [ + "--skip=dependencies::resolve_test" + ]; - # This is an FHS specific assert depending on glibc location - substituteInPlace src/dependencies.rs \ - --replace 'assert!(deps.iter().any(|d| d.starts_with("libc")));' '// no libc assert here' + postInstall = '' + wrapProgram $out/bin/cargo-deb \ + --prefix PATH : ${lib.makeBinPath [ dpkg ]} ''; meta = with lib; { - description = "Generate Debian packages from information in Cargo.toml"; - homepage = "https://github.com/mmstick/cargo-deb"; + description = "A cargo subcommand that generates Debian packages from information in Cargo.toml"; + homepage = "https://github.com/kornelski/cargo-deb"; license = licenses.mit; - # test failures: - # control::tests::generate_scripts_generates_maintainer_scripts_for_unit - # dh_installsystemd::tests::find_units_in_empty_dir_finds_nothing - # dh_lib::tests::apply_with_no_matching_files - # dh_lib::tests::debhelper_script_subst_with_generated_file_only - # dh_lib::tests::debhelper_script_subst_with_no_matching_files - # dh_lib::tests::pkgfile_finds_most_specific_match_without_pkg_file - # dh_lib::tests::pkgfile_finds_most_specific_match_without_unit_file - broken = (stdenv.isDarwin && stdenv.isx86_64); maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d7229e7d07b..543392d4338f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15551,9 +15551,7 @@ with pkgs; cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-deb = callPackage ../development/tools/rust/cargo-deb { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cargo-deb = callPackage ../development/tools/rust/cargo-deb { }; cargo-deps = callPackage ../development/tools/rust/cargo-deps { }; cargo-edit = callPackage ../development/tools/rust/cargo-edit { inherit (darwin.apple_sdk.frameworks) Security; From c4e118444c756146ba677fc242d3e65f002e3f7b Mon Sep 17 00:00:00 2001 From: squalus Date: Mon, 23 Jan 2023 11:13:12 -0800 Subject: [PATCH 320/326] vouch-proxy: 0.37.3 -> 0.39.0 --- pkgs/servers/vouch-proxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix index 9ef0e17f9570..42257f73bc26 100644 --- a/pkgs/servers/vouch-proxy/default.nix +++ b/pkgs/servers/vouch-proxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vouch-proxy"; - version = "0.37.3"; + version = "0.39.0"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; rev = "v${version}"; - sha256 = "sha256-zXt1Xo6xq1g1putx4q6z7SEXK4lNGRgRnNPXajL5Znw="; + hash = "sha256-q4tylXW219jzWrdzOQxewRh1advYEouEKiNJvvnIp9U="; }; - vendorSha256 = "sha256-E1x1QTagXkL4NQ7REDuTHpUaadiz72e3jMLPVquSSV4="; + vendorHash = "sha256-IUjIGht/oQiWKHfbW7nJaybKpKs179mOkpLIwAb8/hk="; ldflags = [ "-s" "-w" From 1a711794d55423e02792005fc7daa5b5e072699f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 Jan 2023 21:03:25 +0100 Subject: [PATCH 321/326] vouch-proxy: add changelog to meta --- pkgs/servers/vouch-proxy/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/vouch-proxy/default.nix b/pkgs/servers/vouch-proxy/default.nix index 42257f73bc26..535ef7192d84 100644 --- a/pkgs/servers/vouch-proxy/default.nix +++ b/pkgs/servers/vouch-proxy/default.nix @@ -1,4 +1,7 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "vouch-proxy"; @@ -7,14 +10,15 @@ buildGoModule rec { src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-q4tylXW219jzWrdzOQxewRh1advYEouEKiNJvvnIp9U="; }; vendorHash = "sha256-IUjIGht/oQiWKHfbW7nJaybKpKs179mOkpLIwAb8/hk="; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X main.version=${version}" ]; @@ -25,8 +29,9 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/vouch/vouch-proxy"; description = "An SSO and OAuth / OIDC login solution for NGINX using the auth_request module"; + changelog = "https://github.com/vouch/vouch-proxy/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ leona erictapen ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } From 99225ef64daa5d2adb97e0b0de84d0e60c8d7b87 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Thu, 5 Jan 2023 19:53:26 +0100 Subject: [PATCH 322/326] tree-sitter: add `buildGrammar` to `passthru` `buildGrammar` is useful for building custom grammars. Also, improve perf by moving `callPackage` out of the fn call. Use more precise var name: `change` -> `build`. --- .../development/tools/parsing/tree-sitter/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 728100c540b3..f43bb1f4a93c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -51,10 +51,13 @@ let '' + (lib.concatStrings (lib.mapAttrsToList (name: grammar: "ln -s ${if grammar ? src then grammar.src else fetchGrammar grammar} $out/${name}\n") (import ./grammars { inherit lib; })))); + + buildGrammar = callPackage ./grammar.nix { }; + builtGrammars = let - change = name: grammar: - callPackage ./grammar.nix { } { + build = name: grammar: + buildGrammar { language = if grammar ? language then grammar.language else name; inherit version; source = if grammar ? src then grammar.src else fetchGrammar grammar; @@ -70,7 +73,7 @@ let { tree-sitter-markdown = grammars'.tree-sitter-markdown // { location = "tree-sitter-markdown"; }; } // { tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; }; in - lib.mapAttrs change (grammars); + lib.mapAttrs build (grammars); # Usage: # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ]) @@ -142,7 +145,7 @@ rustPlatform.buildRustPackage { updater = { inherit update-all-grammars; }; - inherit grammars builtGrammars withPlugins allGrammars; + inherit grammars buildGrammar builtGrammars withPlugins allGrammars; tests = { # make sure all grammars build From 95d770453d9d4e61185d953230822673ca2fe481 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 6 Jan 2023 10:08:33 +0100 Subject: [PATCH 323/326] vimPlugins.nvim-treesitter: use `tree-sitter.buildGrammar` --- .../editors/vim/plugins/nvim-treesitter/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 22caf6a1718e..bacebe9a7468 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -4,7 +4,7 @@ self: super: let generatedGrammars = callPackage ./generated.nix { - buildGrammar = callPackage ../../../../../development/tools/parsing/tree-sitter/grammar.nix { }; + inherit (tree-sitter) buildGrammar; }; generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars; From 5339c7ccf11bb111814f48e8b0a8b40240080c87 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Fri, 6 Jan 2023 10:28:52 +0100 Subject: [PATCH 324/326] tree-sitter/grammar: make fit for public use - Rename `source` to the more idiomatic `src`. - Pass `version` to `mkDerivation` so that it's available in `drvAttrs`/`overrideAttrs`. - Remove misleading comment about `version`. (nvim-treesitter sets the version to the grammar src hash.) --- .../vim/plugins/nvim-treesitter/generated.nix | 300 +++++++++--------- .../vim/plugins/nvim-treesitter/update.py | 2 +- .../tools/parsing/tree-sitter/default.nix | 6 +- .../tools/parsing/tree-sitter/grammar.nix | 8 +- 4 files changed, 157 insertions(+), 159 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 2a1deff81a38..2f2dd0416f27 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -6,7 +6,7 @@ ada = buildGrammar { language = "ada"; version = "e9e2ec9"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "briot"; repo = "tree-sitter-ada"; rev = "e9e2ec9d3b6302e9b455901bec00036e29d1c121"; @@ -17,7 +17,7 @@ agda = buildGrammar { language = "agda"; version = "80ea622"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "AusCyberman"; repo = "tree-sitter-agda"; rev = "80ea622cf952a0059e168e5c92a798b2f1925652"; @@ -28,7 +28,7 @@ arduino = buildGrammar { language = "arduino"; version = "c473c09"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; rev = "c473c09f23b13d9404ec5208fad3eddea89d70f8"; @@ -39,7 +39,7 @@ astro = buildGrammar { language = "astro"; version = "a1f66bf"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "virchau13"; repo = "tree-sitter-astro"; rev = "a1f66bf72ed68b87f779bce9a52e5c6521fc867e"; @@ -50,7 +50,7 @@ awk = buildGrammar { language = "awk"; version = "e559793"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; rev = "e559793754c60c2cdf00cbb0409842d75f0a41dc"; @@ -61,7 +61,7 @@ bash = buildGrammar { language = "bash"; version = "4488aa4"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; rev = "4488aa41406547e478636a4fcfd24f5bbc3f2f74"; @@ -72,7 +72,7 @@ beancount = buildGrammar { language = "beancount"; version = "4cbd1f0"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; rev = "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c"; @@ -83,7 +83,7 @@ bibtex = buildGrammar { language = "bibtex"; version = "ccfd77d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-bibtex"; rev = "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"; @@ -94,7 +94,7 @@ blueprint = buildGrammar { language = "blueprint"; version = "6ef91ca"; - source = fetchFromGitLab { + src = fetchFromGitLab { owner = "gabmus"; repo = "tree-sitter-blueprint"; rev = "6ef91ca8270f0112b9c6d27ecb9966c741a5d103"; @@ -105,7 +105,7 @@ c = buildGrammar { language = "c"; version = "7175a6d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; rev = "7175a6dd5fc1cee660dce6fe23f6043d75af424a"; @@ -116,7 +116,7 @@ c_sharp = buildGrammar { language = "c_sharp"; version = "a29bac0"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; rev = "a29bac0681802139710b4d3875540901504d15cb"; @@ -127,7 +127,7 @@ clojure = buildGrammar { language = "clojure"; version = "262d6d6"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-clojure"; rev = "262d6d60f39f0f77b3dd08da8ec895bd5a044416"; @@ -138,7 +138,7 @@ cmake = buildGrammar { language = "cmake"; version = "a322653"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; rev = "a32265307aa2d31941056d69e8b6633e61750b2f"; @@ -149,7 +149,7 @@ comment = buildGrammar { language = "comment"; version = "a37ca37"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-comment"; rev = "a37ca370310ac6f89b6e0ebf2b86b2219780494e"; @@ -160,7 +160,7 @@ commonlisp = buildGrammar { language = "commonlisp"; version = "c7e8149"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-commonlisp"; rev = "c7e814975ab0d0d04333d1f32391c41180c58919"; @@ -171,7 +171,7 @@ cooklang = buildGrammar { language = "cooklang"; version = "5e11341"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "addcninblue"; repo = "tree-sitter-cooklang"; rev = "5e113412aadb78955c27010daa4dbe1d202013cf"; @@ -182,7 +182,7 @@ cpp = buildGrammar { language = "cpp"; version = "2d2c4ae"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1"; @@ -193,7 +193,7 @@ css = buildGrammar { language = "css"; version = "769203d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; rev = "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"; @@ -204,7 +204,7 @@ cuda = buildGrammar { language = "cuda"; version = "0091006"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; rev = "0091006d6498ee5647f080ef6c09e5b95e481078"; @@ -215,7 +215,7 @@ d = buildGrammar { language = "d"; version = "c2fbf21"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "CyberShadow"; repo = "tree-sitter-d"; rev = "c2fbf21bd3aa45495fe13247e040ad5815250032"; @@ -227,7 +227,7 @@ dart = buildGrammar { language = "dart"; version = "53485a8"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; rev = "53485a8f301254e19c518aa20c80f1bcf7cf5c62"; @@ -238,7 +238,7 @@ devicetree = buildGrammar { language = "devicetree"; version = "ea30a05"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; rev = "ea30a05d0f0446a96d8b096ad11828ad4f8ad849"; @@ -250,7 +250,7 @@ diff = buildGrammar { language = "diff"; version = "1d63cd4"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-diff"; rev = "1d63cd49529ef3153393cf8f620718b274bba715"; @@ -261,7 +261,7 @@ dockerfile = buildGrammar { language = "dockerfile"; version = "09e316d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; rev = "09e316dba307b869831e9399b11a83bbf0f2a24b"; @@ -272,7 +272,7 @@ dot = buildGrammar { language = "dot"; version = "9ab8555"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "rydesun"; repo = "tree-sitter-dot"; rev = "9ab85550c896d8b294d9b9ca1e30698736f08cea"; @@ -283,7 +283,7 @@ ebnf = buildGrammar { language = "ebnf"; version = "ef241bc"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "RubixDev"; repo = "ebnf"; rev = "ef241bc09f2f105c35f5e4f2ccd8a522dd99071c"; @@ -295,7 +295,7 @@ eex = buildGrammar { language = "eex"; version = "f742f2f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-eex"; rev = "f742f2fe327463335e8671a87c0b9b396905d1d1"; @@ -306,7 +306,7 @@ elixir = buildGrammar { language = "elixir"; version = "b20eaa7"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; rev = "b20eaa75565243c50be5e35e253d8beb58f45d56"; @@ -317,7 +317,7 @@ elm = buildGrammar { language = "elm"; version = "28bb193"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; rev = "28bb193640d916dfaf947912c1413cebb0484841"; @@ -328,7 +328,7 @@ elvish = buildGrammar { language = "elvish"; version = "f32711e"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ckafi"; repo = "tree-sitter-elvish"; rev = "f32711e31e987fd5c2c002f3daba02f25c68672f"; @@ -339,7 +339,7 @@ embedded_template = buildGrammar { language = "embedded_template"; version = "a130858"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; rev = "a13085849cf69e2401ec44e38cffc3d73f22f3df"; @@ -350,7 +350,7 @@ erlang = buildGrammar { language = "erlang"; version = "f0e2f78"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; rev = "f0e2f78cdadb2e67323f9ed511656e47dcaa43bb"; @@ -361,7 +361,7 @@ fennel = buildGrammar { language = "fennel"; version = "5171959"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "travonted"; repo = "tree-sitter-fennel"; rev = "517195970428aacca60891b050aa53eabf4ba78d"; @@ -372,7 +372,7 @@ fish = buildGrammar { language = "fish"; version = "6675b56"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ram02z"; repo = "tree-sitter-fish"; rev = "6675b56266b3f615fb112205b6b83a79315309c4"; @@ -383,7 +383,7 @@ foam = buildGrammar { language = "foam"; version = "c238f4a"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "FoamScience"; repo = "tree-sitter-foam"; rev = "c238f4af9a5723a212cf1a4c9b31dd5c1d5270a2"; @@ -394,7 +394,7 @@ fortran = buildGrammar { language = "fortran"; version = "edcb337"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7"; @@ -405,7 +405,7 @@ fsh = buildGrammar { language = "fsh"; version = "fa33477"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "mgramigna"; repo = "tree-sitter-fsh"; rev = "fa3347712f7a59ed02ccf508284554689c6cde28"; @@ -416,7 +416,7 @@ fusion = buildGrammar { language = "fusion"; version = "19db2f4"; - source = fetchFromGitLab { + src = fetchFromGitLab { owner = "jirgn"; repo = "tree-sitter-fusion"; rev = "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"; @@ -427,7 +427,7 @@ gdscript = buildGrammar { language = "gdscript"; version = "a8fa839"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-gdscript"; rev = "a8fa839150d05baaf4d5a472520ee71e9b1d8b3c"; @@ -438,7 +438,7 @@ git_rebase = buildGrammar { language = "git_rebase"; version = "127f5b5"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; rev = "127f5b56c1ad3e8a449a7d6e0c7412ead7f7724c"; @@ -449,7 +449,7 @@ gitattributes = buildGrammar { language = "gitattributes"; version = "577a075"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gitattributes"; rev = "577a075d46ea109905c5cb6179809df88da61ce9"; @@ -460,7 +460,7 @@ gitcommit = buildGrammar { language = "gitcommit"; version = "190d288"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; rev = "190d288a1746bddb4abe96b597fb7d17b76e5522"; @@ -471,7 +471,7 @@ gitignore = buildGrammar { language = "gitignore"; version = "f4685bf"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "shunsambongi"; repo = "tree-sitter-gitignore"; rev = "f4685bf11ac466dd278449bcfe5fd014e94aa504"; @@ -483,7 +483,7 @@ gleam = buildGrammar { language = "gleam"; version = "cfcbca3"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "J3RN"; repo = "tree-sitter-gleam"; rev = "cfcbca3f8f734773878e00d7bfcedea98eb10be2"; @@ -494,7 +494,7 @@ glimmer = buildGrammar { language = "glimmer"; version = "c0bfd26"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; rev = "c0bfd260cdcbe2976f4633547c218f09f7222a89"; @@ -505,7 +505,7 @@ glsl = buildGrammar { language = "glsl"; version = "e2c2214"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; rev = "e2c2214045de2628b81089b1a739962f59654558"; @@ -516,7 +516,7 @@ go = buildGrammar { language = "go"; version = "64457ea"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; rev = "64457ea6b73ef5422ed1687178d4545c3e91334a"; @@ -527,7 +527,7 @@ godot_resource = buildGrammar { language = "godot_resource"; version = "b6ef076"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-godot-resource"; rev = "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"; @@ -539,7 +539,7 @@ gomod = buildGrammar { language = "gomod"; version = "4a65743"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-go-mod"; rev = "4a65743dbc2bb3094114dd2b43da03c820aa5234"; @@ -550,7 +550,7 @@ gowork = buildGrammar { language = "gowork"; version = "949a8a4"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "omertuc"; repo = "tree-sitter-go-work"; rev = "949a8a470559543857a62102c84700d291fc984c"; @@ -561,7 +561,7 @@ graphql = buildGrammar { language = "graphql"; version = "5e66e96"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "bkegley"; repo = "tree-sitter-graphql"; rev = "5e66e961eee421786bdda8495ed1db045e06b5fe"; @@ -572,7 +572,7 @@ hack = buildGrammar { language = "hack"; version = "b7bd692"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "slackhq"; repo = "tree-sitter-hack"; rev = "b7bd6928532ada34dddb1dece4a158ab62c6e783"; @@ -583,7 +583,7 @@ haskell = buildGrammar { language = "haskell"; version = "aee3725"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; rev = "aee3725d02cf3bca5f307b35dd3a96a97e109b4e"; @@ -594,7 +594,7 @@ hcl = buildGrammar { language = "hcl"; version = "0ff887f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; rev = "0ff887f2a60a147452d52db060de6b42f42f1441"; @@ -605,7 +605,7 @@ heex = buildGrammar { language = "heex"; version = "2e1348c"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-heex"; rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a"; @@ -616,7 +616,7 @@ help = buildGrammar { language = "help"; version = "9dee68e"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; rev = "9dee68e3912d16e9878b06e3cd87e21ada3d9029"; @@ -627,7 +627,7 @@ hjson = buildGrammar { language = "hjson"; version = "02fa3b7"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "winston0410"; repo = "tree-sitter-hjson"; rev = "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"; @@ -638,7 +638,7 @@ hlsl = buildGrammar { language = "hlsl"; version = "bd0d463"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; rev = "bd0d463d1380816240a8cb1fd747fc0d3fed24aa"; @@ -649,7 +649,7 @@ hocon = buildGrammar { language = "hocon"; version = "c390f10"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "antosha417"; repo = "tree-sitter-hocon"; rev = "c390f10519ae69fdb03b3e5764f5592fb6924bcc"; @@ -660,7 +660,7 @@ html = buildGrammar { language = "html"; version = "29f53d8"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; rev = "29f53d8f4f2335e61bf6418ab8958dac3282077a"; @@ -671,7 +671,7 @@ htmldjango = buildGrammar { language = "htmldjango"; version = "b2dba02"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "interdependence"; repo = "tree-sitter-htmldjango"; rev = "b2dba02eddab66be669022320273d0dfe1ff923d"; @@ -682,7 +682,7 @@ http = buildGrammar { language = "http"; version = "2c6c445"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; rev = "2c6c44574031263326cb1e51658bbc0c084326e7"; @@ -693,7 +693,7 @@ ini = buildGrammar { language = "ini"; version = "1a0ce07"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "justinmk"; repo = "tree-sitter-ini"; rev = "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"; @@ -704,7 +704,7 @@ java = buildGrammar { language = "java"; version = "09d650d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; rev = "09d650def6cdf7f479f4b78f595e9ef5b58ce31e"; @@ -715,7 +715,7 @@ javascript = buildGrammar { language = "javascript"; version = "7a29d06"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; rev = "7a29d06274b7cf87d643212a433d970b73969016"; @@ -726,7 +726,7 @@ jq = buildGrammar { language = "jq"; version = "13990f5"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "flurie"; repo = "tree-sitter-jq"; rev = "13990f530e8e6709b7978503da9bc8701d366791"; @@ -737,7 +737,7 @@ jsdoc = buildGrammar { language = "jsdoc"; version = "189a6a4"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-jsdoc"; rev = "189a6a4829beb9cdbe837260653b4a3dfb0cc3db"; @@ -748,7 +748,7 @@ json = buildGrammar { language = "json"; version = "7307675"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; rev = "73076754005a460947cafe8e03a8cf5fa4fa2938"; @@ -759,7 +759,7 @@ json5 = buildGrammar { language = "json5"; version = "5dd5cdc"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Joakker"; repo = "tree-sitter-json5"; rev = "5dd5cdc418d9659682556b6adca2dd9ace0ac6d2"; @@ -770,7 +770,7 @@ jsonc = buildGrammar { language = "jsonc"; version = "02b0165"; - source = fetchFromGitLab { + src = fetchFromGitLab { owner = "WhyNotHugo"; repo = "tree-sitter-jsonc"; rev = "02b01653c8a1c198ae7287d566efa86a135b30d5"; @@ -781,7 +781,7 @@ jsonnet = buildGrammar { language = "jsonnet"; version = "505f5bd"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "sourcegraph"; repo = "tree-sitter-jsonnet"; rev = "505f5bd90053ae895aa3d6f2bac8071dd9abd8b2"; @@ -792,7 +792,7 @@ julia = buildGrammar { language = "julia"; version = "0412178"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; rev = "041217800bf423099015e1654c9a4fdd75310bb1"; @@ -803,7 +803,7 @@ kotlin = buildGrammar { language = "kotlin"; version = "b953dbd"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; rev = "b953dbdd05257fcb2b64bc4d9c1578fac12e3c28"; @@ -814,7 +814,7 @@ lalrpop = buildGrammar { language = "lalrpop"; version = "7744b56"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "traxys"; repo = "tree-sitter-lalrpop"; rev = "7744b56f03ac1e5643fad23c9dd90837fe97291e"; @@ -825,7 +825,7 @@ latex = buildGrammar { language = "latex"; version = "6b7ea83"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; rev = "6b7ea839307670e6bda011f888717d3a882ecc09"; @@ -836,7 +836,7 @@ ledger = buildGrammar { language = "ledger"; version = "47b8971"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "cbarrete"; repo = "tree-sitter-ledger"; rev = "47b8971448ce5e9abac865f450c1b14fb3b6eee9"; @@ -847,7 +847,7 @@ llvm = buildGrammar { language = "llvm"; version = "e9948ed"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "benwilliamgraham"; repo = "tree-sitter-llvm"; rev = "e9948edc41e9e5869af99dddb2b5ff5cc5581af6"; @@ -858,7 +858,7 @@ lua = buildGrammar { language = "lua"; version = "0fc8996"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "MunifTanjim"; repo = "tree-sitter-lua"; rev = "0fc89962b7ff5c7d676b8592c1cbce1ceaa806fd"; @@ -869,7 +869,7 @@ m68k = buildGrammar { language = "m68k"; version = "d097b12"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "grahambates"; repo = "tree-sitter-m68k"; rev = "d097b123f19c6eaba2bf181c05420d88b9fc489d"; @@ -880,7 +880,7 @@ make = buildGrammar { language = "make"; version = "a4b9187"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "alemuller"; repo = "tree-sitter-make"; rev = "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"; @@ -891,7 +891,7 @@ markdown = buildGrammar { language = "markdown"; version = "16d0b5e"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; rev = "16d0b5e54d781150bea1070ffb360d47e6238659"; @@ -903,7 +903,7 @@ markdown_inline = buildGrammar { language = "markdown_inline"; version = "16d0b5e"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; rev = "16d0b5e54d781150bea1070ffb360d47e6238659"; @@ -915,7 +915,7 @@ menhir = buildGrammar { language = "menhir"; version = "db7953a"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Kerl13"; repo = "tree-sitter-menhir"; rev = "db7953acb0d5551f207373c81fa07a57d7b085cb"; @@ -926,7 +926,7 @@ mermaid = buildGrammar { language = "mermaid"; version = "d787c66"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "monaqa"; repo = "tree-sitter-mermaid"; rev = "d787c66276e7e95899230539f556e8b83ee16f6d"; @@ -937,7 +937,7 @@ meson = buildGrammar { language = "meson"; version = "5f3138d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-meson"; rev = "5f3138d555aceef976ec9a1d4a3f78e13b31e45f"; @@ -948,7 +948,7 @@ nickel = buildGrammar { language = "nickel"; version = "092e901"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; rev = "092e90142667482996880044d2c04837d3d1c266"; @@ -959,7 +959,7 @@ ninja = buildGrammar { language = "ninja"; version = "0a95cfd"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "alemuller"; repo = "tree-sitter-ninja"; rev = "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"; @@ -970,7 +970,7 @@ nix = buildGrammar { language = "nix"; version = "6b71a81"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; rev = "6b71a810c0acd49b980c50fc79092561f7cee307"; @@ -981,7 +981,7 @@ norg = buildGrammar { language = "norg"; version = "6348056"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; rev = "6348056b999f06c2c7f43bb0a5aa7cfde5302712"; @@ -992,7 +992,7 @@ ocaml = buildGrammar { language = "ocaml"; version = "f1106bf"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; rev = "f1106bf834703f1f2f795da1a3b5f8f40174ffcc"; @@ -1004,7 +1004,7 @@ ocaml_interface = buildGrammar { language = "ocaml_interface"; version = "f1106bf"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; rev = "f1106bf834703f1f2f795da1a3b5f8f40174ffcc"; @@ -1016,7 +1016,7 @@ ocamllex = buildGrammar { language = "ocamllex"; version = "ac1d595"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "atom-ocaml"; repo = "tree-sitter-ocamllex"; rev = "ac1d5957e719d49bd6acd27439b79843e4daf8ed"; @@ -1028,7 +1028,7 @@ org = buildGrammar { language = "org"; version = "081179c"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "milisims"; repo = "tree-sitter-org"; rev = "081179c52b3e8175af62b9b91dc099d010c38770"; @@ -1039,7 +1039,7 @@ pascal = buildGrammar { language = "pascal"; version = "9e99540"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Isopod"; repo = "tree-sitter-pascal"; rev = "9e995404ddff8319631d72d4b46552e737206912"; @@ -1050,7 +1050,7 @@ perl = buildGrammar { language = "perl"; version = "749d26f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ganezdragon"; repo = "tree-sitter-perl"; rev = "749d26fe13fb131b92e6515416096e572575b981"; @@ -1061,7 +1061,7 @@ php = buildGrammar { language = "php"; version = "973694f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; rev = "973694ffcdeebca245b7ecf0d7c4cadd4f41b3c9"; @@ -1072,7 +1072,7 @@ phpdoc = buildGrammar { language = "phpdoc"; version = "2f4d16c"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "claytonrcarter"; repo = "tree-sitter-phpdoc"; rev = "2f4d16c861b5a454b577d057f247f9902d7b47f5"; @@ -1083,7 +1083,7 @@ pioasm = buildGrammar { language = "pioasm"; version = "924aada"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "leo60228"; repo = "tree-sitter-pioasm"; rev = "924aadaf5dea2a6074d72027b064f939acf32e20"; @@ -1094,7 +1094,7 @@ prisma = buildGrammar { language = "prisma"; version = "eca2596"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "victorhqc"; repo = "tree-sitter-prisma"; rev = "eca2596a355b1a9952b4f80f8f9caed300a272b5"; @@ -1105,7 +1105,7 @@ proto = buildGrammar { language = "proto"; version = "42d82fa"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "mitchellh"; repo = "tree-sitter-proto"; rev = "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"; @@ -1116,7 +1116,7 @@ pug = buildGrammar { language = "pug"; version = "26f6ac8"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "zealot128"; repo = "tree-sitter-pug"; rev = "26f6ac805e11e19c4492089f24aa44fe71be7c1f"; @@ -1127,7 +1127,7 @@ python = buildGrammar { language = "python"; version = "9e53981"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; rev = "9e53981ec31b789ee26162ea335de71f02186003"; @@ -1138,7 +1138,7 @@ ql = buildGrammar { language = "ql"; version = "bd08702"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ql"; rev = "bd087020f0d8c183080ca615d38de0ec827aeeaf"; @@ -1149,7 +1149,7 @@ qmljs = buildGrammar { language = "qmljs"; version = "ab75be9"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; rev = "ab75be9750e6f2f804638824d1790034286a830c"; @@ -1160,7 +1160,7 @@ query = buildGrammar { language = "query"; version = "0717de0"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; rev = "0717de07078a20a8608c98ad5f26c208949d0e15"; @@ -1171,7 +1171,7 @@ r = buildGrammar { language = "r"; version = "80efda5"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; rev = "80efda55672d1293aa738f956c7ae384ecdc31b4"; @@ -1182,7 +1182,7 @@ racket = buildGrammar { language = "racket"; version = "dc9c334"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; rev = "dc9c33451fefc2d84d226e55c828adc8a66f2e37"; @@ -1193,7 +1193,7 @@ rasi = buildGrammar { language = "rasi"; version = "5f04634"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Fymyte"; repo = "tree-sitter-rasi"; rev = "5f04634dd4e12de4574c4a3dc9d6d5d4da4a2a1b"; @@ -1204,7 +1204,7 @@ regex = buildGrammar { language = "regex"; version = "e1cfca3"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-regex"; rev = "e1cfca3c79896ff79842f057ea13e529b66af636"; @@ -1215,7 +1215,7 @@ rego = buildGrammar { language = "rego"; version = "b2667c9"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "FallenAngel97"; repo = "tree-sitter-rego"; rev = "b2667c975f07b33be3ceb83bea5cfbad88095866"; @@ -1226,7 +1226,7 @@ rnoweb = buildGrammar { language = "rnoweb"; version = "502c112"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "bamonroe"; repo = "tree-sitter-rnoweb"; rev = "502c1126dc6777f09af5bef16e72a42f75bd081e"; @@ -1237,7 +1237,7 @@ rst = buildGrammar { language = "rst"; version = "25e6328"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-rst"; rev = "25e6328872ac3a764ba8b926aea12719741103f1"; @@ -1248,7 +1248,7 @@ ruby = buildGrammar { language = "ruby"; version = "7a1921b"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; rev = "7a1921bcfd90e3a04c1ad011059087aaf0168dd4"; @@ -1259,7 +1259,7 @@ rust = buildGrammar { language = "rust"; version = "f7fb205"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; rev = "f7fb205c424b0962de59b26b931fe484e1262b35"; @@ -1270,7 +1270,7 @@ scala = buildGrammar { language = "scala"; version = "067ee61"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; rev = "067ee61ff9484eac4f5bc4d57dfd007900c48f20"; @@ -1281,7 +1281,7 @@ scheme = buildGrammar { language = "scheme"; version = "67b90a3"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; rev = "67b90a365bebf4406af4e5a546d6336de787e135"; @@ -1292,7 +1292,7 @@ scss = buildGrammar { language = "scss"; version = "c478c68"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "serenadeai"; repo = "tree-sitter-scss"; rev = "c478c6868648eff49eb04a4df90d703dc45b312a"; @@ -1303,7 +1303,7 @@ slint = buildGrammar { language = "slint"; version = "0754752"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "jrmoulton"; repo = "tree-sitter-slint"; rev = "07547525cdf4627343dca5891f1743ae45e879bb"; @@ -1314,7 +1314,7 @@ smali = buildGrammar { language = "smali"; version = "d7f535e"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-smali"; rev = "d7f535e176c928d33b0e202dd808ac247cacf2ff"; @@ -1325,7 +1325,7 @@ solidity = buildGrammar { language = "solidity"; version = "52ed088"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "YongJieYongJie"; repo = "tree-sitter-solidity"; rev = "52ed0880c0126df2f2c7693f215fe6f38e4a2e0a"; @@ -1336,7 +1336,7 @@ sparql = buildGrammar { language = "sparql"; version = "05f949d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "BonaBeavis"; repo = "tree-sitter-sparql"; rev = "05f949d3c1c15e3261473a244d3ce87777374dec"; @@ -1347,7 +1347,7 @@ sql = buildGrammar { language = "sql"; version = "9d98029"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; rev = "9d9802991aa1d1bc00eee7713a838dab1eb4f149"; @@ -1359,7 +1359,7 @@ supercollider = buildGrammar { language = "supercollider"; version = "90c6d9f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "madskjeldgaard"; repo = "tree-sitter-supercollider"; rev = "90c6d9f777d2b8c4ce497c48b5f270a44bcf3ea0"; @@ -1370,7 +1370,7 @@ surface = buildGrammar { language = "surface"; version = "f4586b3"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-surface"; rev = "f4586b35ac8548667a9aaa4eae44456c1f43d032"; @@ -1381,7 +1381,7 @@ svelte = buildGrammar { language = "svelte"; version = "52e122a"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Himujjal"; repo = "tree-sitter-svelte"; rev = "52e122ae68b316d3aa960a0a422d3645ba717f42"; @@ -1392,7 +1392,7 @@ swift = buildGrammar { language = "swift"; version = "0fe0de5"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; rev = "0fe0de56b528cbf24a654c734ca181b48be3831d"; @@ -1404,7 +1404,7 @@ sxhkdrc = buildGrammar { language = "sxhkdrc"; version = "440d5f9"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "RaafatTurki"; repo = "tree-sitter-sxhkdrc"; rev = "440d5f913d9465c9c776a1bd92334d32febcf065"; @@ -1415,7 +1415,7 @@ t32 = buildGrammar { language = "t32"; version = "f8106fc"; - source = fetchFromGitea { + src = fetchFromGitea { domain = "codeberg.org"; owner = "xasc"; repo = "tree-sitter-t32"; @@ -1427,7 +1427,7 @@ teal = buildGrammar { language = "teal"; version = "1ae8c68"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "euclidianAce"; repo = "tree-sitter-teal"; rev = "1ae8c68e90523b26b93af56feb7868fe4214e2b2"; @@ -1439,7 +1439,7 @@ terraform = buildGrammar { language = "terraform"; version = "0ff887f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; rev = "0ff887f2a60a147452d52db060de6b42f42f1441"; @@ -1451,7 +1451,7 @@ thrift = buildGrammar { language = "thrift"; version = "999a27d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "duskmoon314"; repo = "tree-sitter-thrift"; rev = "999a27d87b8f90a74306d4e79c5e22db3ab61633"; @@ -1462,7 +1462,7 @@ tiger = buildGrammar { language = "tiger"; version = "a233ebe"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ambroisie"; repo = "tree-sitter-tiger"; rev = "a233ebe360a73a92c50978e5c4e9e471bc59ff42"; @@ -1473,7 +1473,7 @@ tlaplus = buildGrammar { language = "tlaplus"; version = "d3ef05e"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; rev = "d3ef05eec4473094e2d691243aa243ce63de6406"; @@ -1484,7 +1484,7 @@ todotxt = buildGrammar { language = "todotxt"; version = "0207f6a"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "arnarg"; repo = "tree-sitter-todotxt"; rev = "0207f6a4ab6aeafc4b091914d31d8235049a2578"; @@ -1495,7 +1495,7 @@ toml = buildGrammar { language = "toml"; version = "8bd2056"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ikatyang"; repo = "tree-sitter-toml"; rev = "8bd2056818b21860e3d756b5a58c4f6e05fb744e"; @@ -1506,7 +1506,7 @@ tsx = buildGrammar { language = "tsx"; version = "faad909"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7"; @@ -1518,7 +1518,7 @@ turtle = buildGrammar { language = "turtle"; version = "085437f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "BonaBeavis"; repo = "tree-sitter-turtle"; rev = "085437f5cb117703b7f520dd92161140a684f092"; @@ -1529,7 +1529,7 @@ twig = buildGrammar { language = "twig"; version = "2457993"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-twig"; rev = "2457993b13a06dec2706e6a6c3d5b65bb23024b8"; @@ -1540,7 +1540,7 @@ typescript = buildGrammar { language = "typescript"; version = "faad909"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7"; @@ -1552,7 +1552,7 @@ v = buildGrammar { language = "v"; version = "0b03983"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "vlang"; repo = "vls"; rev = "0b039830a33e759f0c9ee978b47ad10b82d37349"; @@ -1564,7 +1564,7 @@ vala = buildGrammar { language = "vala"; version = "8f690bf"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "vala-lang"; repo = "tree-sitter-vala"; rev = "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"; @@ -1575,7 +1575,7 @@ verilog = buildGrammar { language = "verilog"; version = "4457145"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-verilog"; rev = "4457145e795b363f072463e697dfe2f6973c9a52"; @@ -1586,7 +1586,7 @@ vhs = buildGrammar { language = "vhs"; version = "8a0df32"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "charmbracelet"; repo = "tree-sitter-vhs"; rev = "8a0df32b72a8cf8d3e3e84f16c19e9ba46d3dba5"; @@ -1597,7 +1597,7 @@ vim = buildGrammar { language = "vim"; version = "55ff1b0"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "vigoux"; repo = "tree-sitter-viml"; rev = "55ff1b080c09edeced9b748cf4c16d0b49d17fb9"; @@ -1608,7 +1608,7 @@ vue = buildGrammar { language = "vue"; version = "91fe275"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ikatyang"; repo = "tree-sitter-vue"; rev = "91fe2754796cd8fba5f229505a23fa08f3546c06"; @@ -1619,7 +1619,7 @@ wgsl = buildGrammar { language = "wgsl"; version = "40259f3"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "szebniok"; repo = "tree-sitter-wgsl"; rev = "40259f3c77ea856841a4e0c4c807705f3e4a2b65"; @@ -1630,7 +1630,7 @@ wgsl_bevy = buildGrammar { language = "wgsl_bevy"; version = "7cd38d6"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-wgsl-bevy"; rev = "7cd38d6895060b023353e04f7af099ec64add5d1"; @@ -1641,7 +1641,7 @@ yaml = buildGrammar { language = "yaml"; version = "0e36bed"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ikatyang"; repo = "tree-sitter-yaml"; rev = "0e36bed171768908f331ff7dff9d956bae016efb"; @@ -1652,7 +1652,7 @@ yang = buildGrammar { language = "yang"; version = "2c0e6be"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Hubro"; repo = "tree-sitter-yang"; rev = "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"; @@ -1663,7 +1663,7 @@ zig = buildGrammar { language = "zig"; version = "d90d38d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; rev = "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca"; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index 6963a82d46b6..380100978999 100755 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -36,7 +36,7 @@ def generate_grammar(item): generated = f""" {lang} = buildGrammar {{ language = "{lang}"; version = "{rev[:7]}"; - source = """ + src = """ generated += subprocess.check_output(["nurl", url, rev, "--indent=4"], text=True) generated += ";" diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index f43bb1f4a93c..13ba669bb4f2 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -58,10 +58,10 @@ let let build = name: grammar: buildGrammar { - language = if grammar ? language then grammar.language else name; + language = grammar.language or name; inherit version; - source = if grammar ? src then grammar.src else fetchGrammar grammar; - location = if grammar ? location then grammar.location else null; + src = grammar.src or fetchGrammar grammar; + location = grammar.location or null; }; grammars' = import ./grammars { inherit lib; } // extraGrammars; grammars = grammars' // diff --git a/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/pkgs/development/tools/parsing/tree-sitter/grammar.nix index 5b62959db0f0..c2c3ce4a8961 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammar.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammar.nix @@ -9,10 +9,8 @@ { # language name language - # version of tree-sitter , version - # source for the language grammar -, source +, src , location ? null , generate ? false , ... @@ -21,7 +19,7 @@ stdenv.mkDerivation ({ pname = "${language}-grammar"; - src = source; + inherit src version; nativeBuildInputs = lib.optionals generate [ nodejs tree-sitter ]; @@ -60,4 +58,4 @@ stdenv.mkDerivation ({ fi runHook postInstall ''; -} // removeAttrs args [ "language" "source" "location" "generate" ]) +} // removeAttrs args [ "language" "location" "generate" ]) From 42e555e65bdd9d6a709a4b96d90e6613cbbe3214 Mon Sep 17 00:00:00 2001 From: Joshua Giacone <71910145+jrgiacone@users.noreply.github.com> Date: Mon, 23 Jan 2023 15:11:24 -0800 Subject: [PATCH 325/326] polychromatic: 0.7.3 -> 0.8.0 (#206347) Co-authored-by: Sandro --- pkgs/applications/misc/polychromatic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index 42143cbc9772..f940f5a4af80 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -20,14 +20,14 @@ python3Packages.buildPythonApplication rec { name = "polychromatic"; - version = "0.7.3"; + version = "0.8.0"; format = "other"; src = fetchFromGitHub { owner = "polychromatic"; repo = "polychromatic"; rev = "v${version}"; - sha256 = "sha256-H++kQ3Fxw56avEsSE1ctu5p0s50s0eQ+jL5zXS3AA94="; + sha256 = "sha256-ym2pcGUWM5zCUx/lYs+WECj+wbyBtWnx04W/NRXNKlw="; }; postPatch = '' @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { substituteInPlace scripts/build-styles.sh \ --replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \ --replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass' - substituteInPlace pylib/common.py \ + substituteInPlace polychromatic/paths.py \ --replace "/usr/share/polychromatic" "$out/share/polychromatic" ''; From c510d1e646ae803ecf96d8e78be425a614895a00 Mon Sep 17 00:00:00 2001 From: laalsaas <43275254+laalsaas@users.noreply.github.com> Date: Tue, 24 Jan 2023 00:14:30 +0100 Subject: [PATCH 326/326] gti: refactor installation, install completion (#210682) Co-authored-by: Sandro --- pkgs/tools/misc/gti/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix index 21089caf0236..0246421e7fdc 100644 --- a/pkgs/tools/misc/gti/default.nix +++ b/pkgs/tools/misc/gti/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +}: stdenv.mkDerivation rec { pname = "gti"; @@ -15,10 +19,16 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace 'CC=cc' 'CC=${stdenv.cc.targetPrefix}cc' ''; + nativeBuildInputs = [ + installShellFiles + ]; + installPhase = '' - mkdir -p $out/bin $out/share/man/man6 - cp gti $out/bin - cp gti.6 $out/share/man/man6 + install -D gti $out/bin/gti + installManPage gti.6 + installShellCompletion --cmd gti \ + --bash completions/gti.bash \ + --zsh completions/gti.zsh ''; meta = with lib; {