From d78bf7598ac0da8d58a55b11e6f3d25f05786217 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Apr 2022 11:24:02 +0000 Subject: [PATCH 001/117] chatterino2: 2.3.4 -> 2.3.5 --- .../networking/instant-messengers/chatterino2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 7a2415199375..6f5255bf1860 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -2,12 +2,12 @@ mkDerivation rec { pname = "chatterino2"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZmUM56+YNH98J3XE/mWOOIfb0qBld2n4iuHpImbrU4o="; + sha256 = "sha256-ozfLLoNUN+1SPXbMNbF1V5sdZgPZEA/J3xXzJP9D3uI="; fetchSubmodules = true; }; nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; From caa832cbc6a48cc6ea4a9cc4c390fbb62002d4a9 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 5 May 2022 13:19:53 +0400 Subject: [PATCH 002/117] teamviewer: set outputs to reduce runtime closure --- pkgs/applications/networking/remote/teamviewer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 7ee1cc9ab4fa..ba6d3d3c0f85 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,6 +6,8 @@ mkDerivation rec { pname = "teamviewer"; + # teamviewer itself has not development files but the dev output removes propagated other dev outputs from runtime + outputs = [ "out" "dev" ]; version = "15.29.4"; src = fetchurl { From 4165ae53920a84ba14ce675d138592432e0a3a74 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 5 May 2022 13:20:16 +0400 Subject: [PATCH 003/117] pygtk: set outputs to reduce runtime closure --- pkgs/development/python2-modules/pygtk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python2-modules/pygtk/default.nix b/pkgs/development/python2-modules/pygtk/default.nix index 465d711ec6ff..08e1520c4c85 100644 --- a/pkgs/development/python2-modules/pygtk/default.nix +++ b/pkgs/development/python2-modules/pygtk/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { pname = "pygtk"; + outputs = [ "out" "dev" ]; version = "2.24.0"; disabled = isPy3k; From 49810cec5da9c15d3afc7f6a3f2e8ab477a4e0d7 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Mon, 16 May 2022 10:19:52 +0200 Subject: [PATCH 004/117] mjolnir: 1.4.1 -> 1.4.2 --- pkgs/servers/mjolnir/default.nix | 4 +- pkgs/servers/mjolnir/node-composition.nix | 2 +- pkgs/servers/mjolnir/node-deps.nix | 470 +++++++++++++--------- pkgs/servers/mjolnir/node-env.nix | 32 +- 4 files changed, 301 insertions(+), 207 deletions(-) diff --git a/pkgs/servers/mjolnir/default.nix b/pkgs/servers/mjolnir/default.nix index 318ee14eb9d3..75f60a883c08 100644 --- a/pkgs/servers/mjolnir/default.nix +++ b/pkgs/servers/mjolnir/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "mjolnir"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "v${version}"; - sha256 = "zVb0lD5tYhX2a2MzNVQ8u7rMuQ8yGC/JlodbY4nsqNU="; + sha256 = "887azmXT5PGpcOqtWtKwdoyEtsXGm5DzpNRgEMlgSfM="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/mjolnir/node-composition.nix b/pkgs/servers/mjolnir/node-composition.nix index 7b8937a3647c..03dc6f3e5be3 100644 --- a/pkgs/servers/mjolnir/node-composition.nix +++ b/pkgs/servers/mjolnir/node-composition.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/servers/mjolnir/node-deps.nix b/pkgs/servers/mjolnir/node-deps.nix index abdea7148824..b75e4ddfa731 100644 --- a/pkgs/servers/mjolnir/node-deps.nix +++ b/pkgs/servers/mjolnir/node-deps.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: @@ -31,13 +31,13 @@ let sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; }; }; - "@babel/highlight-7.16.10" = { + "@babel/highlight-7.17.9" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.16.10"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz"; - sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz"; + sha512 = "J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg=="; }; }; "@eslint/eslintrc-0.4.3" = { @@ -208,7 +208,7 @@ let version = "0.0.29"; src = fetchurl { url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"; - sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; + sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="; }; }; "@types/mime-1.3.2" = { @@ -220,22 +220,22 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/mocha-9.1.0" = { + "@types/mocha-9.1.1" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.0.tgz"; - sha512 = "QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg=="; + url = "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.1.tgz"; + sha512 = "Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw=="; }; }; - "@types/node-16.11.26" = { + "@types/node-16.11.35" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.26"; + version = "16.11.35"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.26.tgz"; - sha512 = "GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.35.tgz"; + sha512 = "QXu45LyepgnhUfnIAj/FyT4uM87ug5KpIrgXfQtUPNAlx8w5hmd8z8emqCLNvG11QkpRSCG9Qg2buMxvqfjfsQ=="; }; }; "@types/parse5-6.0.3" = { @@ -292,13 +292,13 @@ let sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="; }; }; - "@types/tough-cookie-4.0.1" = { + "@types/tough-cookie-4.0.2" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.1.tgz"; - sha512 = "Y0K95ThC3esLEYD6ZuqNek29lNX2EM1qxV8y2FTLUB0ff5wWrk7az+mLrnNFUnaXcgKye22+sFBRXOgpPILZNg=="; + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz"; + sha512 = "Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw=="; }; }; "@types/yargs-16.0.4" = { @@ -328,13 +328,13 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; - "abab-2.0.5" = { + "abab-2.0.6" = { name = "abab"; packageName = "abab"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz"; - sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; + url = "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz"; + sha512 = "j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="; }; }; "accepts-1.3.8" = { @@ -355,13 +355,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.7.0" = { + "acorn-8.7.1" = { name = "acorn"; packageName = "acorn"; - version = "8.7.0"; + version = "8.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz"; - sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz"; + sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; }; }; "acorn-globals-6.0.0" = { @@ -409,13 +409,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-8.10.0" = { + "ajv-8.11.0" = { name = "ajv"; packageName = "ajv"; - version = "8.10.0"; + version = "8.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz"; - sha512 = "bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz"; + sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; }; }; "ansi-colors-4.1.1" = { @@ -427,6 +427,15 @@ let sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; }; + "ansi-colors-4.1.2" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.2.tgz"; + sha512 = "cEG18jjLG0O74o/33eEfnmtXYDEY196ZjL0eQEISULF+Imi7vr25l6ntGYmqS5lIrQIEeze+CqUtPVItywE7ZQ=="; + }; + }; "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -496,7 +505,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; - sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + sha512 = "PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="; }; }; "arrify-1.0.1" = { @@ -505,7 +514,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; - sha1 = "898508da2226f380df904728456849c1501a4b0d"; + sha512 = "3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA=="; }; }; "asn1-0.2.6" = { @@ -523,7 +532,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; }; }; "astral-regex-2.0.0" = { @@ -541,7 +550,7 @@ let version = "0.4.0"; src = fetchurl { url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; }; }; "aws-sign2-0.7.0" = { @@ -550,7 +559,7 @@ let version = "0.7.0"; src = fetchurl { url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + sha512 = "08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="; }; }; "aws4-1.11.0" = { @@ -586,7 +595,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + sha512 = "qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w=="; }; }; "binary-extensions-2.2.0" = { @@ -607,13 +616,13 @@ let sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "body-parser-1.19.2" = { + "body-parser-1.20.0" = { name = "body-parser"; packageName = "body-parser"; - version = "1.19.2"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"; - sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz"; + sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg=="; }; }; "brace-expansion-1.1.11" = { @@ -667,7 +676,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; + sha512 = "wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ=="; }; }; "bytes-3.1.2" = { @@ -679,6 +688,15 @@ let sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; }; + "call-bind-1.0.2" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; + }; + }; "callsites-3.1.0" = { name = "callsites"; packageName = "callsites"; @@ -703,7 +721,7 @@ let version = "0.12.0"; src = fetchurl { url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; + sha512 = "4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="; }; }; "chalk-2.4.2" = { @@ -841,13 +859,13 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "cookie-0.4.2" = { + "cookie-0.5.0" = { name = "cookie"; packageName = "cookie"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"; - sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; + sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; }; }; "cookie-signature-1.0.6" = { @@ -1003,15 +1021,6 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "depd-1.1.2" = { - name = "depd"; - packageName = "depd"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; - }; - }; "depd-2.0.0" = { name = "depd"; packageName = "depd"; @@ -1021,13 +1030,13 @@ let sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; }; - "destroy-1.0.4" = { + "destroy-1.2.0" = { name = "destroy"; packageName = "destroy"; - version = "1.0.4"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; + url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"; + sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; }; }; "diff-3.5.0" = { @@ -1084,22 +1093,22 @@ let sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; }; }; - "dom-serializer-1.3.2" = { + "dom-serializer-1.4.1" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "1.3.2"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; - sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"; + sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="; }; }; - "domelementtype-2.2.0" = { + "domelementtype-2.3.0" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz"; - sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"; + sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; }; }; "domexception-2.0.1" = { @@ -1381,13 +1390,13 @@ let sha512 = "E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw=="; }; }; - "express-4.17.3" = { + "express-4.18.1" = { name = "express"; packageName = "express"; - version = "4.17.3"; + version = "4.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz"; - sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg=="; + url = "https://registry.npmjs.org/express/-/express-4.18.1.tgz"; + sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; }; }; "extend-3.0.2" = { @@ -1453,13 +1462,13 @@ let sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; - "finalhandler-1.1.2" = { + "finalhandler-1.2.0" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; - sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; + sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; }; }; "find-up-5.0.0" = { @@ -1588,6 +1597,15 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; + "get-intrinsic-1.1.1" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; + }; + }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -1606,6 +1624,15 @@ let sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; }; + "glob-7.2.3" = { + name = "glob"; + packageName = "glob"; + version = "7.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; + sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; + }; + }; "glob-parent-5.1.2" = { name = "glob-parent"; packageName = "glob-parent"; @@ -1624,22 +1651,22 @@ let sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; }; }; - "globals-13.13.0" = { + "globals-13.15.0" = { name = "globals"; packageName = "globals"; - version = "13.13.0"; + version = "13.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz"; - sha512 = "EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A=="; + url = "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz"; + sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; }; }; - "graceful-fs-4.2.9" = { + "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.9"; + version = "4.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; - sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; + sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; }; "growl-1.10.5" = { @@ -1696,6 +1723,15 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; + "has-symbols-1.0.3" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; + }; + }; "hash.js-1.1.7" = { name = "hash.js"; packageName = "hash.js"; @@ -1732,13 +1768,13 @@ let sha512 = "r0KNC5aqCAItsjlgtirW6RW25c92Ee3ybQj8z//4Sl4suE3HIPqM4deGpYCUJULLjtVPEP1+Ma+1ZeX1iMsCiA=="; }; }; - "html-to-text-8.1.0" = { + "html-to-text-8.2.0" = { name = "html-to-text"; packageName = "html-to-text"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.1.0.tgz"; - sha512 = "Z9iYAqYK2c18GswSbnxJSeMs7lyJgwR2oIkDOyOHGBbYsPsG4HvT379jj3Lcbfko8A5ceyyMHAfkmp/BiXA9/Q=="; + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.2.0.tgz"; + sha512 = "CLXExYn1b++Lgri+ZyVvbUEFwzkLZppjjZOwB7X1qv2jIi8MrMEvxWX5KQ7zATAzTvcqgmtO00M2kCRMtEdOKQ=="; }; }; "htmlencode-0.0.4" = { @@ -1768,13 +1804,13 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; - "http-errors-1.8.1" = { + "http-errors-2.0.0" = { name = "http-errors"; packageName = "http-errors"; - version = "1.8.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; - sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; + url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; + sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; }; }; "http-proxy-agent-4.0.1" = { @@ -1795,13 +1831,13 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; - "https-proxy-agent-5.0.0" = { + "https-proxy-agent-5.0.1" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; + sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; }; "humanize-duration-3.27.1" = { @@ -1894,13 +1930,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-core-module-2.8.1" = { + "is-core-module-2.9.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.8.1"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"; - sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz"; + sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; }; }; "is-extglob-2.1.1" = { @@ -2299,13 +2335,13 @@ let sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; - "micromatch-4.0.4" = { + "micromatch-4.0.5" = { name = "micromatch"; packageName = "micromatch"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"; - sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"; + sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; }; }; "mime-1.6.0" = { @@ -2371,13 +2407,13 @@ let sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; }; - "mkdirp-0.5.5" = { + "mkdirp-0.5.6" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; + sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; }; }; "mkdirp-1.0.4" = { @@ -2452,6 +2488,15 @@ let sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="; }; }; + "nanoid-3.3.4" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"; + sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; + }; + }; "natural-compare-1.4.0" = { name = "natural-compare"; packageName = "natural-compare"; @@ -2506,6 +2551,15 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; + "object-inspect-1.12.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz"; + sha512 = "Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="; + }; + }; "on-finished-2.3.0" = { name = "on-finished"; packageName = "on-finished"; @@ -2515,6 +2569,15 @@ let sha1 = "20f1336481b083cd75337992a16971aa2d906947"; }; }; + "on-finished-2.4.1" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; + sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; + }; + }; "on-headers-1.0.2" = { name = "on-headers"; packageName = "on-headers"; @@ -2704,13 +2767,13 @@ let sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; }; }; - "postcss-8.4.12" = { + "postcss-8.4.13" = { name = "postcss"; packageName = "postcss"; - version = "8.4.12"; + version = "8.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz"; - sha512 = "lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz"; + sha512 = "jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA=="; }; }; "prelude-ls-1.1.2" = { @@ -2785,6 +2848,15 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; + "qs-6.10.3" = { + name = "qs"; + packageName = "qs"; + version = "6.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz"; + sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; + }; + }; "qs-6.5.3" = { name = "qs"; packageName = "qs"; @@ -2794,15 +2866,6 @@ let sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; }; }; - "qs-6.9.7" = { - name = "qs"; - packageName = "qs"; - version = "6.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz"; - sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; - }; - }; "railroad-diagrams-1.0.0" = { name = "railroad-diagrams"; packageName = "railroad-diagrams"; @@ -2839,13 +2902,13 @@ let sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; - "raw-body-2.4.3" = { + "raw-body-2.5.1" = { name = "raw-body"; packageName = "raw-body"; - version = "2.4.3"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz"; - sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; + sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; }; }; "react-is-17.0.2" = { @@ -3019,22 +3082,22 @@ let sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; - "semver-7.3.5" = { + "semver-7.3.7" = { name = "semver"; packageName = "semver"; - version = "7.3.5"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; - sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; + sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; }; }; - "send-0.17.2" = { + "send-0.18.0" = { name = "send"; packageName = "send"; - version = "0.17.2"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz"; - sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; + url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz"; + sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; }; }; "serialize-javascript-6.0.0" = { @@ -3046,13 +3109,13 @@ let sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag=="; }; }; - "serve-static-1.14.2" = { + "serve-static-1.15.0" = { name = "serve-static"; packageName = "serve-static"; - version = "1.14.2"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz"; - sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"; + sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; }; }; "setprototypeof-1.2.0" = { @@ -3091,6 +3154,15 @@ let sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="; }; }; + "side-channel-1.0.4" = { + name = "side-channel"; + packageName = "side-channel"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; + sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; + }; + }; "sigmund-1.0.1" = { name = "sigmund"; packageName = "sigmund"; @@ -3172,13 +3244,13 @@ let sha512 = "xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA=="; }; }; - "statuses-1.5.0" = { + "statuses-2.0.1" = { name = "statuses"; packageName = "statuses"; - version = "1.5.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; - sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"; + sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; }; }; "stealthy-require-1.1.1" = { @@ -3343,13 +3415,13 @@ let sha512 = "15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw=="; }; }; - "ts-mocha-8.0.0" = { + "ts-mocha-9.0.2" = { name = "ts-mocha"; packageName = "ts-mocha"; - version = "8.0.0"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ts-mocha/-/ts-mocha-8.0.0.tgz"; - sha512 = "Kou1yxTlubLnD5C3unlCVO7nh0HERTezjoVhVw/M5S1SqoUec0WgllQvPk3vzPMc6by8m6xD1uR1yRf8lnVUbA=="; + url = "https://registry.npmjs.org/ts-mocha/-/ts-mocha-9.0.2.tgz"; + sha512 = "WyQjvnzwrrubl0JT7EC1yWmNpcsU3fOuBFfdps30zbmFBgKniSaSOyZMZx+Wq7kytUs5CY+pEbSYEbGfIKnXTw=="; }; }; "ts-node-7.0.1" = { @@ -3361,13 +3433,13 @@ let sha512 = "BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw=="; }; }; - "tsconfig-paths-3.14.0" = { + "tsconfig-paths-3.14.1" = { name = "tsconfig-paths"; packageName = "tsconfig-paths"; - version = "3.14.0"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.0.tgz"; - sha512 = "cg/1jAZoL57R39+wiw4u/SCC6Ic9Q5NqjBOb+9xISedOYurfog9ZNmKJSxAnb2m/5Bq4lE9lhUcau33Ml8DM0g=="; + url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"; + sha512 = "fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ=="; }; }; "tslib-1.14.1" = { @@ -3451,13 +3523,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typescript-4.6.2" = { + "typescript-4.6.4" = { name = "typescript"; packageName = "typescript"; - version = "4.6.2"; + version = "4.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.6.2.tgz"; - sha512 = "HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz"; + sha512 = "9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg=="; }; }; "typescript-formatter-7.2.2" = { @@ -3752,12 +3824,12 @@ let args = { name = "mjolnir"; packageName = "mjolnir"; - version = "1.4.1"; - src = ../../../../../../../nix/store/lb7jkhbcx6z00m9j6ck8pa237c26bhi0-source; + version = "1.4.2"; + src = ../../../../../../../nix/store/spvdzz0i3m55099ds9bjrd30c15cv8a6-source; dependencies = [ sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.16.10" // { + (sources."@babel/highlight-7.17.9" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -3800,21 +3872,21 @@ let sources."@types/jsdom-16.2.14" sources."@types/json5-0.0.29" sources."@types/mime-1.3.2" - sources."@types/mocha-9.1.0" - sources."@types/node-16.11.26" + sources."@types/mocha-9.1.1" + sources."@types/node-16.11.35" sources."@types/parse5-6.0.3" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/serve-static-1.13.10" sources."@types/shell-quote-1.7.1" sources."@types/stack-utils-2.0.1" - sources."@types/tough-cookie-4.0.1" + sources."@types/tough-cookie-4.0.2" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-21.0.0" sources."@ungap/promise-all-settled-1.1.2" - sources."abab-2.0.5" + sources."abab-2.0.6" sources."accepts-1.3.8" - sources."acorn-8.7.0" + sources."acorn-8.7.1" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -3829,7 +3901,7 @@ let ]; }) sources."ajv-6.12.6" - sources."ansi-colors-4.1.1" + sources."ansi-colors-4.1.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" @@ -3851,7 +3923,7 @@ let sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.2.0" sources."bluebird-3.7.2" - sources."body-parser-1.19.2" + sources."body-parser-1.20.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" @@ -3859,6 +3931,7 @@ let sources."buffer-from-1.1.2" sources."builtin-modules-1.1.1" sources."bytes-3.1.2" + sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-6.3.0" sources."caseless-0.12.0" @@ -3874,7 +3947,7 @@ let sources."config-3.3.7" sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.2" + sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" @@ -3893,14 +3966,14 @@ let sources."deep-is-0.1.4" sources."deepmerge-4.2.2" sources."delayed-stream-1.0.0" - sources."depd-1.1.2" - sources."destroy-1.0.4" + sources."depd-2.0.0" + sources."destroy-1.2.0" sources."diff-5.0.0" sources."diff-sequences-27.5.1" sources."discontinuous-range-1.0.0" sources."doctrine-3.0.0" - sources."dom-serializer-1.3.2" - sources."domelementtype-2.2.0" + sources."dom-serializer-1.4.1" + sources."domelementtype-2.3.0" (sources."domexception-2.0.1" // { dependencies = [ sources."webidl-conversions-5.0.0" @@ -3961,7 +4034,7 @@ let sources."esutils-2.0.3" sources."etag-1.8.1" sources."expect-27.5.1" - sources."express-4.17.3" + sources."express-4.18.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" @@ -3969,7 +4042,7 @@ let sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" - sources."finalhandler-1.1.2" + sources."finalhandler-1.2.0" sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" @@ -3983,24 +4056,26 @@ let sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" - sources."glob-7.2.0" + sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" - sources."globals-13.13.0" - sources."graceful-fs-4.2.9" + sources."globals-13.15.0" + sources."graceful-fs-4.2.10" sources."growl-1.10.5" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-symbols-1.0.3" sources."hash.js-1.1.7" sources."he-1.2.0" sources."html-encoding-sniffer-2.0.1" - sources."html-to-text-8.1.0" + sources."html-to-text-8.2.0" sources."htmlencode-0.0.4" sources."htmlparser2-6.1.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" (sources."http-proxy-agent-4.0.1" // { dependencies = [ sources."debug-4.3.4" @@ -4008,7 +4083,7 @@ let ]; }) sources."http-signature-1.2.0" - (sources."https-proxy-agent-5.0.0" // { + (sources."https-proxy-agent-5.0.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -4024,7 +4099,7 @@ let sources."inherits-2.0.4" sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" - sources."is-core-module-2.8.1" + sources."is-core-module-2.9.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -4074,7 +4149,7 @@ let sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."mime-1.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" @@ -4084,31 +4159,39 @@ let sources."mkdirp-1.0.4" (sources."mocha-9.2.2" // { dependencies = [ + sources."ansi-colors-4.1.1" (sources."debug-4.3.3" // { dependencies = [ sources."ms-2.1.2" ]; }) + (sources."glob-7.2.0" // { + dependencies = [ + sources."minimatch-3.1.2" + ]; + }) sources."minimatch-4.2.1" sources."ms-2.1.3" + sources."nanoid-3.3.1" sources."supports-color-8.1.1" ]; }) sources."moo-0.5.1" (sources."morgan-1.10.0" // { dependencies = [ - sources."depd-2.0.0" + sources."on-finished-2.3.0" ]; }) sources."ms-2.0.0" - sources."nanoid-3.3.1" + sources."nanoid-3.3.4" sources."natural-compare-1.4.0" sources."nearley-2.20.1" sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" - sources."on-finished-2.3.0" + sources."object-inspect-1.12.0" + sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" sources."optionator-0.8.3" @@ -4129,7 +4212,7 @@ let sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-3.0.0" - sources."postcss-8.4.12" + sources."postcss-8.4.13" sources."prelude-ls-1.1.2" (sources."pretty-format-27.5.1" // { dependencies = [ @@ -4141,12 +4224,12 @@ let sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."punycode-2.1.1" - sources."qs-6.9.7" + sources."qs-6.10.3" sources."railroad-diagrams-1.0.0" sources."randexp-0.4.6" sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."react-is-17.0.2" sources."readdirp-3.6.0" sources."regexpp-3.2.0" @@ -4174,18 +4257,19 @@ let sources."sanitize-html-2.7.0" sources."saxes-5.0.1" sources."selderee-0.6.0" - sources."semver-7.3.5" - (sources."send-0.17.2" // { + sources."semver-7.3.7" + (sources."send-0.18.0" // { dependencies = [ sources."ms-2.1.3" ]; }) sources."serialize-javascript-6.0.0" - sources."serve-static-1.14.2" + sources."serve-static-1.15.0" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shell-quote-1.7.3" + sources."side-channel-1.0.4" sources."sigmund-1.0.1" sources."slash-3.0.0" sources."slice-ansi-4.0.0" @@ -4199,7 +4283,7 @@ let sources."escape-string-regexp-2.0.0" ]; }) - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."stealthy-require-1.1.1" sources."steno-0.4.4" sources."string-width-4.2.3" @@ -4211,7 +4295,7 @@ let sources."symbol-tree-3.2.4" (sources."table-6.8.0" // { dependencies = [ - sources."ajv-8.10.0" + sources."ajv-8.11.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -4220,14 +4304,14 @@ let sources."toidentifier-1.0.1" sources."tough-cookie-4.0.0" sources."tr46-2.1.0" - sources."ts-mocha-8.0.0" + sources."ts-mocha-9.0.2" (sources."ts-node-7.0.1" // { dependencies = [ sources."diff-3.5.0" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" ]; }) - (sources."tsconfig-paths-3.14.0" // { + (sources."tsconfig-paths-3.14.1" // { dependencies = [ sources."json5-1.0.1" ]; @@ -4244,7 +4328,7 @@ let sources."escape-string-regexp-1.0.5" sources."has-flag-3.0.0" sources."js-yaml-3.14.1" - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."semver-5.7.1" sources."supports-color-5.5.0" ]; @@ -4255,7 +4339,7 @@ let sources."type-check-0.3.2" sources."type-fest-0.20.2" sources."type-is-1.6.18" - sources."typescript-4.6.2" + sources."typescript-4.6.4" sources."typescript-formatter-7.2.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" diff --git a/pkgs/servers/mjolnir/node-env.nix b/pkgs/servers/mjolnir/node-env.nix index 5f055785791b..2590dd267a4e 100644 --- a/pkgs/servers/mjolnir/node-env.nix +++ b/pkgs/servers/mjolnir/node-env.nix @@ -98,7 +98,7 @@ let '' + (lib.concatMapStrings (dependency: '' - if [ ! -e "${dependency.name}" ]; then + if [ ! -e "${dependency.packageName}" ]; then ${composePackage dependency} fi '' @@ -257,8 +257,8 @@ let var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); } if(packageLock.dependencies !== undefined) { @@ -390,7 +390,7 @@ let buildNodePackage = { name , packageName - , version + , version ? null , dependencies ? [] , buildInputs ? [] , production ? true @@ -409,7 +409,7 @@ let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "${name}-${version}"; + name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -441,6 +441,14 @@ let if [ -d "$out/lib/node_modules/.bin" ] then ln -s $out/lib/node_modules/.bin $out/bin + + # Patch the shebang lines of all the executables + ls $out/bin/* | while read i + do + file="$(readlink -f "$i")" + chmod u+rwx "$file" + patchShebangs "$file" + done fi # Create symlinks to the deployed manual page folders, if applicable @@ -471,7 +479,7 @@ let buildNodeDependencies = { name , packageName - , version + , version ? null , src , dependencies ? [] , buildInputs ? [] @@ -489,7 +497,7 @@ let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; in stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; + name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux @@ -519,6 +527,7 @@ let if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . + chmod 644 package-lock.json fi ''} @@ -541,7 +550,7 @@ let buildNodeShell = { name , packageName - , version + , version ? null , src , dependencies ? [] , buildInputs ? [] @@ -557,9 +566,10 @@ let let nodeDependencies = buildNodeDependencies args; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; + stdenv.mkDerivation ({ + name = "node-shell-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' @@ -578,7 +588,7 @@ let export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; - }; + } // extraArgs); in { buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; From 050e0aa6de82ca773bb763ad5715f38202ae3a22 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Mon, 16 May 2022 10:28:20 +0200 Subject: [PATCH 005/117] nixos/tests/mjolnir: set enable_registration_without_verification for matrix-synapse --- nixos/tests/matrix/mjolnir.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/matrix/mjolnir.nix b/nixos/tests/matrix/mjolnir.nix index 54094ab9d611..b7ba02cfafdd 100644 --- a/nixos/tests/matrix/mjolnir.nix +++ b/nixos/tests/matrix/mjolnir.nix @@ -44,6 +44,7 @@ import ../make-test-python.nix ( tls_private_key_path = "${key}"; enable_registration = true; registration_shared_secret = "supersecret-registration"; + enable_registration_without_verification = true; listeners = [ { # The default but tls=false From 0b1340f57b09e6cf290f0fe45509665aea14b5b3 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 26 Feb 2022 19:09:18 +0300 Subject: [PATCH 006/117] nixos/peertube: use redis.servers --- .../from_md/release-notes/rl-2205.section.xml | 22 +++++++++++++++++++ .../manual/release-notes/rl-2205.section.md | 11 ++++++++++ nixos/modules/services/web-apps/peertube.nix | 16 +++++++++----- nixos/tests/web-apps/peertube.nix | 7 +++--- 4 files changed, 47 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 19aaf12f26a1..40b467206252 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -1925,6 +1925,28 @@ redis-cli save cp /var/lib/redis/dump.rdb "/var/lib/redis-mastodon/dump.rdb" + + + + + Peertube now uses services.redis.servers to start a new redis + server, instead of using a global redis server. This improves + compatibility with other services that use redis. + + + Redis database is used for storage only cache and job queue. + More information can be found here - + Peertube + architecture. + + + If you do want to save the redis database, you can use the + following commands before upgrade OS: + + +redis-cli save +sudo mkdir /var/lib/redis-peertube +sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 9261511e7b8c..1d292cb737d4 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -718,6 +718,17 @@ In addition to numerous new and upgraded packages, this release has the followin redis-cli save cp /var/lib/redis/dump.rdb "/var/lib/redis-mastodon/dump.rdb" ``` +- Peertube now uses services.redis.servers to start a new redis server, instead of using a global redis server. + This improves compatibility with other services that use redis. + + Redis database is used for storage only cache and job queue. More information can be found here - [Peertube architecture](https://docs.joinpeertube.org/contribute-architecture). + + If you do want to save the redis database, you can use the following commands before upgrade OS: + ```bash + redis-cli save + sudo mkdir /var/lib/redis-peertube + sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb + ``` - If you are using Wayland you can choose to use the Ozone Wayland support in Chrome and several Electron apps by setting the environment variable diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index e195e6e6e824..e6b6aa273e7f 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -209,7 +209,7 @@ in { port = lib.mkOption { type = lib.types.nullOr lib.types.port; - default = if cfg.redis.createLocally && cfg.redis.enableUnixSocket then null else 6379; + default = if cfg.redis.createLocally && cfg.redis.enableUnixSocket then null else 31638; defaultText = lib.literalExpression '' if config.${opt.redis.createLocally} && config.${opt.redis.enableUnixSocket} then null @@ -344,7 +344,7 @@ in { }; }; } - (lib.mkIf cfg.redis.enableUnixSocket { redis = { socket = "/run/redis/redis.sock"; }; }) + (lib.mkIf cfg.redis.enableUnixSocket { redis = { socket = "/run/redis-peertube/redis.sock"; }; }) ]; systemd.tmpfiles.rules = [ @@ -441,13 +441,17 @@ in { enable = true; }; - services.redis = lib.mkMerge [ + services.redis.servers.peertube = lib.mkMerge [ (lib.mkIf cfg.redis.createLocally { enable = true; }) + (lib.mkIf (cfg.redis.createLocally && !cfg.redis.enableUnixSocket) { + bind = "127.0.0.1"; + port = cfg.redis.port; + }) (lib.mkIf (cfg.redis.createLocally && cfg.redis.enableUnixSocket) { - unixSocket = "/run/redis/redis.sock"; - unixSocketPerm = 770; + unixSocket = "/run/redis-peertube/redis.sock"; + unixSocketPerm = 660; }) ]; @@ -465,7 +469,7 @@ in { }; }) (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs-16_x pkgs.yarn ]) - (lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis" ];}) + (lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];}) ]; users.groups = lib.optionalAttrs (cfg.group == "peertube") { diff --git a/nixos/tests/web-apps/peertube.nix b/nixos/tests/web-apps/peertube.nix index d42b4e3d677b..ecc45bff2e2c 100644 --- a/nixos/tests/web-apps/peertube.nix +++ b/nixos/tests/web-apps/peertube.nix @@ -11,7 +11,7 @@ import ../make-test-python.nix ({pkgs, ...}: { address = "192.168.2.10"; prefixLength = 24; } ]; }; - firewall.allowedTCPPorts = [ 5432 6379 ]; + firewall.allowedTCPPorts = [ 5432 31638 ]; }; services.postgresql = { @@ -34,7 +34,7 @@ import ../make-test-python.nix ({pkgs, ...}: enable = true; bind = "0.0.0.0"; requirePass = "turrQfaQwnanGbcsdhxy"; - port = 6379; + port = 31638; }; }; @@ -76,6 +76,7 @@ import ../make-test-python.nix ({pkgs, ...}: redis = { host = "192.168.2.10"; + port = 31638; passwordFile = "/etc/peertube/password-redis-db"; }; @@ -113,7 +114,7 @@ import ../make-test-python.nix ({pkgs, ...}: database.wait_for_unit("redis-peertube.service") database.wait_for_open_port(5432) - database.wait_for_open_port(6379) + database.wait_for_open_port(31638) server.wait_for_unit("peertube.service") server.wait_for_open_port(9000) From 97a855ca0ec6509b6da8fed8232b97094ce97e97 Mon Sep 17 00:00:00 2001 From: linj Date: Mon, 23 May 2022 05:01:40 +0800 Subject: [PATCH 007/117] nixos/nvidia: only apply workarounds for finegrained when needed Accoriding to the doc[1], these workarounds is no needed for kernel 5.5 and newer. [1]: https://download.nvidia.com/XFree86/Linux-x86_64/515.43.04/README/dynamicpowermanagement.html#KnownIssuesAndW6426e --- nixos/modules/hardware/video/nvidia.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 210d45ac8415..8d9f4a486514 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -367,7 +367,8 @@ in RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%c{3} c 195 %c{3}" KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'" - '' + optionalString cfg.powerManagement.finegrained '' + '' + optionalString cfg.powerManagement.finegrained ( + optionalString (versionOlder config.boot.kernelPackages.kernel.version "5.5") '' # Remove NVIDIA USB xHCI Host Controller devices, if present ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{remove}="1" @@ -376,7 +377,7 @@ in # Remove NVIDIA Audio devices, if present ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{remove}="1" - + '' + '' # Enable runtime PM for NVIDIA VGA/3D controller devices on driver bind ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="auto" ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="auto" @@ -384,7 +385,7 @@ in # Disable runtime PM for NVIDIA VGA/3D controller devices on driver unbind ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="on" ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="on" - ''; + ''); boot.extraModprobeConfig = mkIf cfg.powerManagement.finegrained '' options nvidia "NVreg_DynamicPowerManagement=0x02" From d5a9c1dd08dab74d5d76b5ceb3079ab91e1778c6 Mon Sep 17 00:00:00 2001 From: linj Date: Mon, 23 May 2022 05:11:26 +0800 Subject: [PATCH 008/117] nixos/nvidia: remove a useless option According to the doc[1], NVreg_DynamicPowerManagement is a kernel module parameter, which it is already set as. So it should not be set as an xorg option. [1]: https://download.nvidia.com/XFree86/Linux-x86_64/515.43.04/README/dynamicpowermanagement.html#DriverSettingsfe624 --- nixos/modules/hardware/video/nvidia.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 210d45ac8415..a5412b0de764 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -255,7 +255,6 @@ in '' BusID "${pCfg.nvidiaBusId}" ${optionalString syncCfg.allowExternalGpu "Option \"AllowExternalGpus\""} - ${optionalString cfg.powerManagement.finegrained "Option \"NVreg_DynamicPowerManagement=0x02\""} ''; screenSection = '' From 3bb9f75827ee59f914dca0b0357a05259ec59354 Mon Sep 17 00:00:00 2001 From: Skyler Grey Date: Mon, 23 May 2022 09:47:30 +0100 Subject: [PATCH 009/117] maintainers: add minion3665 --- maintainers/maintainer-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d8eaff4a0d8d..6d7c57ca2366 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8418,6 +8418,17 @@ fingerprint = "3196 83D3 9A1B 4DE1 3DC2 51FD FEA8 88C9 F5D6 4F62"; }]; }; + minion3665 = { + name = "Skyler Grey"; + email = "skyler3665@gmail.com"; + matrix = "@minion3665:matrix.org"; + github = "Minion3665"; + githubId = 34243578; + keys = [{ + longkeyid = "rsa4096/0x1AFD10256B3C714D"; + fingerprint = "D520 AC8D 7C96 9212 5B2B BD3A 1AFD 1025 6B3C 714D"; + }]; + }; mir06 = { email = "armin.leuprecht@uni-graz.at"; github = "mir06"; From 446d2cb0216dc02c37f6f4eb815a5c1754594a44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anselm=20Sch=C3=BCler?= Date: Tue, 24 May 2022 11:46:50 +0200 Subject: [PATCH 010/117] nixos/nvidia: add hardware.nvidia.forceFullCompositionPipeline --- nixos/modules/hardware/video/nvidia.nix | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 210d45ac8415..7050c8cdbc77 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -163,8 +163,19 @@ in ''; }; + hardware.nvidia.forceFullCompositionPipeline = lib.mkOption { + default = false; + type = types.bool; + description = '' + Whether to force-enable the full composition pipeline. + This sometimes fixes screen tearing issues. + This has been reported to reduce the performance of some OpenGL applications and may produce issues in WebGL. + It also drastically increases the time the driver needs to clock down after load. + ''; + }; + hardware.nvidia.package = lib.mkOption { - type = lib.types.package; + type = types.package; default = config.boot.kernelPackages.nvidiaPackages.stable; defaultText = literalExpression "config.boot.kernelPackages.nvidiaPackages.stable"; description = '' @@ -260,8 +271,14 @@ in screenSection = '' Option "RandRRotation" "on" - ${optionalString syncCfg.enable "Option \"AllowEmptyInitialConfiguration\""} - ''; + '' + optionalString syncCfg.enable '' + Option "AllowEmptyInitialConfiguration" + '' + optionalString cfg.forceFullCompositionPipeline '' + Option "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}" + Option "AllowIndirectGLXProtocol" "off" + Option "TripleBuffer" "on" + '' + ; }; services.xserver.serverLayoutSection = optionalString syncCfg.enable '' From 6a925882648ca00b141ece4b95d66fe3f4afd0f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 02:16:30 +0000 Subject: [PATCH 011/117] ccache: 4.6 -> 4.6.1 --- pkgs/development/tools/misc/ccache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 8b5e61580590..98ae2d42ba40 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -15,13 +15,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.6"; + version = "4.6.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "011i1aczv4nixq4gvjixcd73df2xplcrldfv0w12yaz5iy4vaw6b"; + sha256 = "sha256-XcelGBb5bRLZKSbtC2J40d6CsSF/ZF3eJW0UXe1Y40A="; }; outputs = [ "out" "man" ]; From 4568934e9565c4599ffc94a3d2dd31d440656592 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 07:53:57 +0000 Subject: [PATCH 012/117] logseq: 0.6.9 -> 0.7.0 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index d0b02caff04c..70d21acc05b4 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.6.9"; + version = "0.7.0"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-ubhGDx5T1AAJjU6Ka1Pqy5kL8HPa097QhhK5Sp3HWEo="; + sha256 = "sha256-oXNSd0ZU2ZsMK51tq8iq2sfuLg0ZHaiXhpJpWZkEmeY="; name = "${pname}-${version}.AppImage"; }; From 3431c84b5d179efd7c830039d2fb2b88cd5ae3c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 May 2022 11:55:40 +0000 Subject: [PATCH 013/117] pypi-mirror: 4.2.0 -> 5.0.1 --- pkgs/development/tools/pypi-mirror/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pypi-mirror/default.nix b/pkgs/development/tools/pypi-mirror/default.nix index e6f9afd5dd94..015100a682f7 100644 --- a/pkgs/development/tools/pypi-mirror/default.nix +++ b/pkgs/development/tools/pypi-mirror/default.nix @@ -4,13 +4,13 @@ }: python3.pkgs.buildPythonApplication rec { pname = "pypi-mirror"; - version = "4.2.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "montag451"; repo = pname; - rev = "v${version}"; - sha256 = "1ci19bqyhig1s5myzw6klkiycd8k0lzhk3yqfx5fjirc2f0xpz5j"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-x0to3VrnuON1Ghj6LlMOjJfqSVh9eF3Yg6Cdcxtpbc8="; }; pythonImportsCheck = [ "pypi_mirror" ]; From c762acd8f138d0d40e7843d132c117809556c5f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 May 2022 07:52:03 +0000 Subject: [PATCH 014/117] mavproxy: 1.8.49 -> 1.8.50 --- 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 8b69539d6bc6..14cc2d8b4c2b 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.49"; + version = "1.8.50"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eJ/QxtMUq7DN/cH9qUHNIJv48r0NJrbZfML74DpYamQ="; + sha256 = "sha256-dTdXmhm6sWZphLhcoKRDQ2Ir0hcu0ev0xCul2O9hAXg="; }; postPatch = '' From df38903e7985d5aff55f9111bac5fa6e4a0a65c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Sat, 21 May 2022 10:15:01 -0300 Subject: [PATCH 015/117] Add @PedroHLC to maintainer-list --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5f5c5eab642d..3d6cc1253384 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9860,6 +9860,12 @@ githubId = 8641; name = "Pierre Carrier"; }; + pedrohlc = { + email = "root@pedrohlc.com"; + github = "PedroHLC"; + githubId = 1368952; + name = "Pedro Lara Campos"; + }; penguwin = { email = "penguwin@penguwin.eu"; github = "penguwin"; From 1e5b8da09de9dcb6ee56744d86a31de247fbe829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Sat, 28 May 2022 13:16:35 -0300 Subject: [PATCH 016/117] airgeddon: init at 11.01 --- pkgs/tools/networking/airgeddon/default.nix | 166 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 168 insertions(+) create mode 100644 pkgs/tools/networking/airgeddon/default.nix diff --git a/pkgs/tools/networking/airgeddon/default.nix b/pkgs/tools/networking/airgeddon/default.nix new file mode 100644 index 000000000000..2effd5508522 --- /dev/null +++ b/pkgs/tools/networking/airgeddon/default.nix @@ -0,0 +1,166 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper + # Required +, aircrack-ng +, bash +, coreutils-full +, gawk +, gnugrep +, gnused +, iproute2 +, iw +, pciutils +, procps +, tmux + # X11 Front +, xterm +, xorg + # what the author calls "Internals" +, usbutils +, wget +, ethtool +, util-linux +, ccze + # Optionals + # Missing in nixpkgs: beef, hostapd-wpe, asleap +, bettercap +, bully +, crunch +, dhcp +, dnsmasq +, ettercap +, hashcat +, hcxdumptool +, hcxtools +, hostapd +, john +, lighttpd +, mdk4 +, nftables +, openssl +, pixiewps +, reaverwps-t6x # Could be the upstream version too +, wireshark-cli + # Undocumented requirements (there is also ping) +, apparmor-bin-utils +, curl +, glibc +, ncurses +, networkmanager +, systemd + # Support groups +, supportWpaWps ? true # Most common use-case +, supportHashCracking ? false +, supportEvilTwin ? false +, supportX11 ? false # Allow using xterm instead of tmux, hard to test +}: +let + deps = [ + aircrack-ng + bash + coreutils-full + curl + gawk + glibc + gnugrep + gnused + iproute2 + iw + networkmanager + ncurses + pciutils + procps + tmux + usbutils + wget + ethtool + util-linux + ccze + systemd + ] ++ lib.optionals supportWpaWps [ + bully + pixiewps + reaverwps-t6x + ] ++ lib.optionals supportHashCracking [ + crunch + hashcat + hcxdumptool + hcxtools + john + wireshark-cli + ] ++ lib.optionals supportEvilTwin [ + bettercap + dhcp + dnsmasq + ettercap + hostapd + lighttpd + openssl + mdk4 + nftables + apparmor-bin-utils + ] ++ lib.optionals supportX11 [ + xterm + xorg.xset + xorg.xdpyinfo + ]; +in +stdenv.mkDerivation rec { + pname = "airgeddon"; + version = "11.01"; + + src = fetchFromGitHub { + owner = "v1s1t0r1sh3r3"; + repo = "airgeddon"; + rev = "v${version}"; + sha256 = "3TjaLEcerRk69Ys4kj7vOMCRUd0ifFJzL4MB5ifoK68="; + }; + + strictDeps = true; + nativeBuildInputs = [ makeWrapper ]; + + # What these replacings do? + # - Disable the auto-updates (we'll run from a read-only directory); + # - Silence the checks (NixOS will enforce the PATH, it will only see the tools as we listed); + # - Use "tmux", we're not patching XTerm commands; + # - Remove PWD and $0 references, forcing it to use the paths from store; + # - Force our PATH to all tmux sessions. + postPatch = '' + patchShebangs airgeddon.sh + sed -i ' + s|AIRGEDDON_AUTO_UPDATE=true|AIRGEDDON_AUTO_UPDATE=false| + s|AIRGEDDON_SILENT_CHECKS=false|AIRGEDDON_SILENT_CHECKS=true| + s|AIRGEDDON_WINDOWS_HANDLING=xterm|AIRGEDDON_WINDOWS_HANDLING=tmux| + ' .airgeddonrc + + sed -Ei ' + s|\$\(pwd\)|${placeholder "out"}/share/airgeddon;scriptfolder=${placeholder "out"}/share/airgeddon/| + s|\$\{0\}|${placeholder "out"}/bin/airgeddon| + s|tmux send-keys -t "([^"]+)" "|tmux send-keys -t "\1" "export PATH=\\"$PATH\\"; | + ' airgeddon.sh + ''; + + # ATTENTION: No need to chdir around, we're removing the occurrences of "$(pwd)" + postInstall = '' + wrapProgram $out/bin/airgeddon --prefix PATH : ${lib.makeBinPath deps} + ''; + + # Install only the interesting files + installPhase = '' + runHook preInstall + install -Dm 755 airgeddon.sh "$out/bin/airgeddon" + install -dm 755 "$out/share/airgeddon" + cp -dr .airgeddonrc known_pins.db language_strings.sh plugins/ "$out/share/airgeddon/" + runHook postInstall + ''; + + meta = with lib; { + description = "Multi-use TUI to audit wireless networks. "; + homepage = "https://github.com/v1s1t0r1sh3r3/airgeddon"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ pedrohlc ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdfcf5ff5266..5e3bcc6e9737 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1071,6 +1071,8 @@ with pkgs; airfield = callPackage ../tools/networking/airfield { }; + airgeddon = callPackage ../tools/networking/airgeddon { }; + apache-airflow = with python3.pkgs; toPythonApplication apache-airflow; airsonic = callPackage ../servers/misc/airsonic { }; From d70af2c3b685e0e487a00e151f4c8345b28cbeef Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 29 May 2022 03:01:44 +0000 Subject: [PATCH 017/117] git-lfs1: remove --- .../version-management/git-lfs/1.nix | 31 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 33 deletions(-) delete mode 100644 pkgs/applications/version-management/git-lfs/1.nix diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix deleted file mode 100644 index f72f51907500..000000000000 --- a/pkgs/applications/version-management/git-lfs/1.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "git-lfs"; - version = "1.5.6"; - rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0"; - - goPackagePath = "github.com/git-lfs/git-lfs"; - - src = fetchFromGitHub { - inherit rev; - owner = "git-lfs"; - repo = "git-lfs"; - sha256 = "0wddry1lqjccf4522fvhx6grx8h57xsz17lkaf5aybnrgw677w3d"; - }; - - subPackages = [ "." ]; - - preBuild = '' - pushd go/src/github.com/git-lfs/git-lfs - go generate ./commands - popd - ''; - - meta = with lib; { - description = "Git extension for versioning large files"; - homepage = "https://git-lfs.github.com/"; - license = [ licenses.mit ]; - maintainers = [ maintainers.twey ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74169cac397b..5376d39b5436 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6294,8 +6294,6 @@ with pkgs; git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { }); - git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { }; - git-ftp = callPackage ../development/tools/git-ftp { }; git-machete = python3Packages.callPackage ../applications/version-management/git-and-tools/git-machete { }; From f598554c7344a45bde1ed3207aad83c3131a3a9d Mon Sep 17 00:00:00 2001 From: Skyler Grey Date: Sat, 28 May 2022 23:50:18 +0100 Subject: [PATCH 018/117] pridefetch: init at 1.0.0 pridefetch is a cli tool to display system information (similarly to neofetch or pfetch) in your terminal along with a pride flag. --- pkgs/tools/misc/pridefetch/default.nix | 51 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/tools/misc/pridefetch/default.nix diff --git a/pkgs/tools/misc/pridefetch/default.nix b/pkgs/tools/misc/pridefetch/default.nix new file mode 100644 index 000000000000..9a93c6770e81 --- /dev/null +++ b/pkgs/tools/misc/pridefetch/default.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetchFromGitHub, python3, zip }: let + version = "1.0.0"; + sha256 = "sha256-/o4er8bO/3HUFXzP+sC+5DYv9EwmxW05o1RT5fEulEg="; + + pname = "pridefetch"; + src = fetchFromGitHub { + owner = "SpyHoodle"; + repo = pname; + rev = "v" + version; + inherit sha256; + }; +in stdenv.mkDerivation { + inherit pname version src; + nativeBuildInputs = [ + zip + ]; + buildInputs = [ + (python3.withPackages (pythonPackages: with pythonPackages; [ + distro + ])) + ]; + buildPhase = '' + runHook preBuild + pushd src + zip -r ../pridefetch.zip ./* + popd + echo '#!/usr/bin/env python' | cat - pridefetch.zip > pridefetch + rm pridefetch.zip + runHook postBuild + ''; + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mv pridefetch $out/bin/pridefetch + chmod +x $out/bin/pridefetch + runHook postInstall + ''; + meta = with lib; { + description = "Print out system statistics with pride flags"; + longDescription = '' + Pridefetch prints your system statistics (similarly to neofetch, screenfetch or pfetch) along with a pride flag. + The flag which is printed is configurable, as well as the width of the output. + ''; + homepage = "https://github.com/SpyHoodle/pridefetch"; + license = licenses.mit; + maintainers = [ + maintainers.minion3665 + ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e50917ea399a..7c601ba16033 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -406,6 +406,8 @@ with pkgs; pridecat = callPackage ../tools/misc/pridecat { }; + pridefetch = callPackage ../tools/misc/pridefetch { }; + proto-contrib = callPackage ../development/tools/proto-contrib { }; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { }; From 146a2545a0e399a7190e6e62612fa3043f996b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 30 May 2022 11:31:34 +0200 Subject: [PATCH 019/117] gparted: enable parallel building --- pkgs/tools/misc/gparted/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 8d6de0bbeb81..f6b5d9f5041b 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { }) ]; + enableParallelBuilding = true; + configureFlags = [ "--disable-doc" ]; buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome.adwaita-icon-theme ]; From eef2c762ce19c8cf7172b319a7f4cd5555b5f289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 29 May 2022 17:26:23 +0200 Subject: [PATCH 020/117] makeBinaryWrapper: fix cross-compilation and add test Fixes https://github.com/NixOS/nixpkgs/issues/175045 --- .../make-binary-wrapper/default.nix | 5 +- pkgs/test/make-binary-wrapper/cross.nix | 23 ++++++++ pkgs/test/make-binary-wrapper/default.nix | 58 ++++++++++--------- 3 files changed, 58 insertions(+), 28 deletions(-) create mode 100644 pkgs/test/make-binary-wrapper/cross.nix diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix index 34bed3bb297d..9f52a05f61ca 100644 --- a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix +++ b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix @@ -1,10 +1,11 @@ { stdenv +, targetPackages , lib , makeSetupHook , dieHook , writeShellScript , tests -, cc ? stdenv.cc +, cc ? targetPackages.stdenv.cc , sanitizers ? [] }: @@ -14,7 +15,7 @@ makeSetupHook { ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) cc; substitutions = { - cc = "${cc}/bin/cc ${lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers)}"; + cc = "${cc}/bin/${cc.targetPrefix}cc ${lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers)}"; # Extract the function call used to create a binary wrapper from its embedded docstring passthru.extractCmd = writeShellScript "extract-binary-wrapper-cmd" '' diff --git a/pkgs/test/make-binary-wrapper/cross.nix b/pkgs/test/make-binary-wrapper/cross.nix new file mode 100644 index 000000000000..36758086b92b --- /dev/null +++ b/pkgs/test/make-binary-wrapper/cross.nix @@ -0,0 +1,23 @@ +{ stdenv +, runCommand +, makeBinaryWrapper +, binutils +, expectedArch ? stdenv.hostPlatform.parsed.cpu.name +}: + +runCommand "make-binary-wrapper-test-cross" { + nativeBuildInputs = [ + makeBinaryWrapper + binutils + ]; + inherit expectedArch; +} '' + touch prog + chmod +x prog + makeWrapper prog $out + read -r _ arch < <($READELF --file-header $out | grep Machine:) + if [[ ''${arch,,} != *"''${expectedArch,,}"* ]]; then + echo "expected $expectedArch, got $arch" + exit 1 + fi +'' diff --git a/pkgs/test/make-binary-wrapper/default.nix b/pkgs/test/make-binary-wrapper/default.nix index 2d3389c4a012..afc2b41ff5a7 100644 --- a/pkgs/test/make-binary-wrapper/default.nix +++ b/pkgs/test/make-binary-wrapper/default.nix @@ -1,12 +1,19 @@ -{ lib, coreutils, python3, gcc, writeText, writeScript, runCommand, makeBinaryWrapper }: +{ lib +, stdenv +, pkgsCross +, makeBinaryWrapper +, writeText +, runCommand +, runCommandCC +}: let - env = { buildInputs = [ makeBinaryWrapper ]; }; - envCheck = runCommand "envcheck" env '' - ${gcc}/bin/cc -Wall -Werror -Wpedantic -o $out ${./envcheck.c} + env = { nativeBuildInputs = [ makeBinaryWrapper ]; }; + envCheck = runCommandCC "envcheck" env '' + cc -Wall -Werror -Wpedantic -o $out ${./envcheck.c} ''; - makeGoldenTest = testname: runCommand "test-wrapper_${testname}" env '' - mkdir -p ./tmp/foo + makeGoldenTest = testname: runCommand "make-binary-wrapper-test-${testname}" env '' + mkdir -p tmp/foo # for the chdir test params=$(<"${./.}/${testname}.cmdline") eval "makeCWrapper /send/me/flags $params" > wrapper.c @@ -32,24 +39,23 @@ let cp wrapper.c $out ''; - tests = let - names = [ - "add-flags" - "argv0" - "basic" - "chdir" - "combination" - "env" - "inherit-argv0" - "invalid-env" - "prefix" - "suffix" - "overlength-strings" - ]; - f = name: lib.nameValuePair name (makeGoldenTest name); - in builtins.listToAttrs (builtins.map f names); -in writeText "make-binary-wrapper-test" '' - ${lib.concatStringsSep "\n" (lib.mapAttrsToList (_: test: '' - "${test.name}" "${test}" - '') tests)} + tests = lib.genAttrs [ + "add-flags" + "argv0" + "basic" + "chdir" + "combination" + "env" + "inherit-argv0" + "invalid-env" + "overlength-strings" + "prefix" + "suffix" + ] makeGoldenTest // lib.optionalAttrs (! stdenv.isDarwin) { + cross = pkgsCross.aarch64-multiplatform.callPackage ./cross.nix { }; + }; +in + +writeText "make-binary-wrapper-tests" '' + ${lib.concatStringsSep "\n" (builtins.attrValues tests)} '' // tests From bb5f5eadf42258e5cf5e4a5c4f708ae5c01035aa Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Tue, 31 May 2022 09:32:26 -0400 Subject: [PATCH 021/117] matrix-synapse: 1.59.1 -> 1.60.0 https://github.com/matrix-org/synapse/releases/tag/v1.60.0 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index ce2009c4ed79..7a0297757bae 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.59.1"; + version = "1.60.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EASd+tlPIYQpQP2OOHJSPDzgJZyVoigVfcC2b2c2A2o="; + sha256 = "sha256-sR+DZhpAkPpurPs6jSBVphYp12z8qulcQSl3ngcCrcs="; }; buildInputs = [ openssl ]; From d0eda68f5b8bb5e3803c925aff973c4aeb288fa6 Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Tue, 31 May 2022 13:54:58 -0400 Subject: [PATCH 022/117] matrix-synapse: Warn about state_group_edges changes in release notes --- .../manual/from_md/release-notes/rl-2211.section.xml | 11 +++++++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 1 + 2 files changed, 12 insertions(+) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 55c20427cfde..b0a84de57e0b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -98,6 +98,17 @@ hardware.saleae-logic.package. + + + Matrix Synapse now requires entries in the + state_group_edges table to be unique, in + order to prevent accidentally introducing duplicate + information (for example, because a database backup was + restored multiple times). If your Synapse database already has + duplicate rows in this table, this could fail with an error + and require manual remediation. + + diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 97ecb725dfb5..acad456a4fd3 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -45,5 +45,6 @@ In addition to numerous new and upgraded packages, this release has the followin ## Other Notable Changes {#sec-release-22.11-notable-changes} * A new module was added for the Saleae Logic device family, providing the options `hardware.saleae-logic.enable` and `hardware.saleae-logic.package`. +* Matrix Synapse now requires entries in the `state_group_edges` table to be unique, in order to prevent accidentally introducing duplicate information (for example, because a database backup was restored multiple times). If your Synapse database already has duplicate rows in this table, this could fail with an error and require manual remediation. From ab67a02a10dffaa1c08bc14e7c8dfbd392a169b5 Mon Sep 17 00:00:00 2001 From: polynomialspace Date: Tue, 31 May 2022 15:26:21 -0700 Subject: [PATCH 023/117] hugo: broken = stdenv.isDarwin -> stdenv.isDarwin && stdenv.isx86_64 --- pkgs/applications/misc/hugo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index d4d76551a6de..070727b772a4 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -33,7 +33,7 @@ buildGoModule rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.isDarwin && stdenv.isx86_64; description = "A fast and modern static website engine"; homepage = "https://gohugo.io"; license = licenses.asl20; From fea6ebccfb945e4da6efd919d739a29ca680f0a1 Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Wed, 1 Jun 2022 00:11:58 +0200 Subject: [PATCH 024/117] qdigidoc: Drop unused darkhttpd dependency Introduced in 4b61b7814ee "qdigidoc: fetch TSL info" without further information or direct use in default.nix. Neither DigiDoc4-Client sources nor other distribution packages contain any reference to darkhttpd whatsoever. --- pkgs/tools/security/qdigidoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index b47a2455b672..03fbd98baf76 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, cmake, darkhttpd, gettext, makeWrapper +{ lib, mkDerivation, fetchurl, cmake, gettext, makeWrapper , pkg-config, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase , qttranslations, qtsvg }: @@ -17,7 +17,7 @@ mkDerivation rec { sha256 = "1cikz36w9phgczcqnwk4k3mx3kk919wy2327jksmfa4cjfjq4a8d"; }; - nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkg-config ]; + nativeBuildInputs = [ cmake gettext makeWrapper pkg-config ]; postPatch = '' substituteInPlace client/CMakeLists.txt \ From 96ac705f1b8e0ab900d3017d3bcb19e16ce1884d Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 31 May 2022 16:47:20 -0700 Subject: [PATCH 025/117] libspnav: fix cross-compilation Prior to this commit, pkgsCross.foo.libspnav would fail with something like: ``` /nix/store/...-bash-5.1-p16/bin/bash: line 1: ar: command not found ``` Let's fix that by passing `AR=` in `makeFlags`. --- pkgs/development/libraries/libspnav/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libspnav/default.nix b/pkgs/development/libraries/libspnav/default.nix index 99f2a64d7b12..f6908aa3314f 100644 --- a/pkgs/development/libraries/libspnav/default.nix +++ b/pkgs/development/libraries/libspnav/default.nix @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { ]; configureFlags = [ "--disable-debug"]; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" + ]; preInstall = '' mkdir -p $out/{lib,include} From 97d04668138c0799b9ea5b99c6800389d7a2ce74 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Jun 2022 04:20:00 +0000 Subject: [PATCH 026/117] tflint: 0.36.2 -> 0.37.0 https://github.com/terraform-linters/tflint/releases/tag/v0.37.0 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 9ecc01c0a483..2ed23f43a471 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.36.2"; + version = "0.37.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DPgYc0nUrRkidWqhv0X9v+2VSNPy1+0ZQ2gCe7T2gu0="; + sha256 = "sha256-2fcrKwbYuCOZE++Sin0zNuGaBQQd0dNs1MRL/doOLOw="; }; - vendorSha256 = "sha256-Is4dpBu/Nm34NZ3NftSGTZnSR8831kM56dvBjtfUTGU="; + vendorSha256 = "sha256-2v070TwDWkN4HZ/EOu85lotA9qIKLgpwD9TrfH7pGY4="; doCheck = false; From 539a971f6dfadab63a301910a65be3f286c783a2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Jun 2022 04:20:00 +0000 Subject: [PATCH 027/117] entr: 5.1 -> 5.2 https://github.com/eradman/entr/raw/5.2/NEWS --- pkgs/tools/misc/entr/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 39c1a6abea48..3c18345a0edf 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -1,20 +1,17 @@ -{ lib, stdenv, fetchurl, coreutils, ncurses, fetchpatch }: +{ lib, stdenv, fetchurl, coreutils }: stdenv.mkDerivation rec { pname = "entr"; - version = "5.1"; + version = "5.2"; src = fetchurl { url = "https://eradman.com/entrproject/code/${pname}-${version}.tar.gz"; - hash = "sha256-D4f1d7zodkHFJa3bm8xgu6pXn+mB2rdZBD484VVtu5I="; + hash = "sha256-I34wnUawdSEMDky3ib/Qycd37d9sswNBw/49vMZYw4A="; }; postPatch = '' - substituteInPlace Makefile.bsd --replace /bin/echo echo substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat - substituteInPlace entr.c --replace /usr/bin/clear ${ncurses.out}/bin/clear substituteInPlace entr.1 --replace /bin/cat cat - substituteInPlace entr.1 --replace /usr/bin/clear clear ''; dontAddPrefix = true; doCheck = true; From 51c38fa317e2abc75854d47ad994b1f846656f7d Mon Sep 17 00:00:00 2001 From: Kiskae Date: Sat, 21 May 2022 12:05:01 +0200 Subject: [PATCH 028/117] =?UTF-8?q?nvidia=5Fx11:=20390.147=20=E2=86=92=203?= =?UTF-8?q?90.151,=20470.103.01=20=E2=86=92=20470.129.06,=20510.68.02=20?= =?UTF-8?q?=E2=86=92=20515.48.07,=20beta=20=E2=86=92=20515.43.04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/os-specific/linux/nvidia-x11/default.nix | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 996db7480554..8e7b3cfa6c8e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -19,21 +19,21 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "510.68.02"; - sha256_64bit = "sha256-vSw0SskrL8ErBgQ1kKT+jU6wzLdNDEk1LwBM8tKZ9MU="; - settingsSha256 = "sha256-4TBA/ITpaaBiVDkpj7/Iydei1knRPpruPL4fRrqFAmU="; - persistencedSha256 = "sha256-Q1Rk6dAK4pnm6yDK4kmj5Vg4GRbi034C96ypywHYB2I="; + version = "515.48.07"; + sha256_64bit = "sha256-4odkzFsTwy52NwUT2ur8BcKJt37gURVSRQ8aAOMa4eM="; + settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU="; + persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY="; } else legacy_390; # see https://www.nvidia.com/en-us/drivers/unix/ "Production branch" - production = legacy_470; + production = stable; beta = generic { - version = "510.39.01"; - sha256_64bit = "sha256-Lj7cOvulhApeuRycIiyYy5kcPv3ZlM8qqpPUWl0bmRs="; - settingsSha256 = "sha256-qlSwNq0wC/twvrbQjY+wSTcDaV5KG4Raq6WkzTizyXw="; - persistencedSha256 = "sha256-UNrl/hfiNXKGACQ7aHpsNcfcHPWVnycQ51yaa3eKXhI="; + version = "515.43.04"; + sha256_64bit = "sha256-PodaTTUOSyMW8rtdtabIkSLskgzAymQyfToNlwxPPcc="; + settingsSha256 = "sha256-j47LtP6FNTPfiXFh9KwXX8vZOQzlytA30ZfW9N5F2PY="; + persistencedSha256 = "sha256-hULBy0wnVpLH8I0L6O9/HfgvJURtE2whpXOgN/vb3Wo="; }; # Vulkan developer beta driver @@ -54,21 +54,19 @@ rec { # Last one supporting Kepler architecture legacy_470 = generic { - version = "470.103.01"; - sha256_64bit = "VsIwn4nCE0Y7DEY2D3siddc3HTxyevP+3IjElu3Ih6U="; - settingsSha256 = "Roc2OFSNEnIGLVwP0D9f8vFTf5v3KkL99S0mZBWN7s0="; - persistencedSha256 = "AVI0j2bpfMCMBTKuQp+BoCewaXIW3Xt4NnV1fjAHOr0="; + version = "470.129.06"; + sha256_64bit = "sha256-QQkQtwBuFzBjMnaDKfS1PW+ekcxVXCiJkXWOKo8IqZg="; + settingsSha256 = "sha256-vUS4O/c4IrbC8offzUFGLlMdP/Tlz1GwQIV2geRfj/o="; + persistencedSha256 = "sha256-jCcYUsbhQ77IOQquXqbTZfh1N0IvKQOWrIMU9rEwSW0="; }; # Last one supporting x86 legacy_390 = generic { - version = "390.147"; - sha256_32bit = "00avsns7l0j1ai8bf8gav2qshvphfdngy388bwzz24p61mfv1i1a"; - sha256_64bit = "09qcdfn4j5jza3iw59wqwgq4a489qf7kx355yssrcahaw9g87lxz"; - settingsSha256 = "16qqw0jy31da65cdi17y3j2kcdhw09vra7g17bkcimaqnf70j0ni"; - persistencedSha256 = "1ad81y4qfpxrx0vqsk81a3h0bi1yg8hw5gi5y5d58p76vc8083i9"; - - broken = kernel.kernelAtLeast "5.17"; + version = "390.151"; + sha256_32bit = "sha256-lOOZtFllnBKxNE6Mj09e7h7VkV/0WfyLuDHJ4dRGd9s="; + sha256_64bit = "sha256-UibkhCBEz/2Qlt6tr2iTTBM9p04FuAzNISNlhLOvsfw="; + settingsSha256 = "sha256-teXQa0pQctQl1dvddVJtI7U/vVuMu6ER1Xd99Jprpvw="; + persistencedSha256 = "sha256-FxiTXYABplKFcBXr4orhYWiJq4zVePpplMbg2kvEuXk="; }; legacy_340 = generic { From fc29ad0a35382f24dce7ecd530d8f86cbd1926a8 Mon Sep 17 00:00:00 2001 From: Yuri Lemos Rodrigues Date: Wed, 1 Jun 2022 10:23:09 -0300 Subject: [PATCH 029/117] ocamlformat: 0.21.0 -> 0.22.4 --- pkgs/development/tools/ocaml/ocamlformat/default.nix | 6 +++++- pkgs/development/tools/ocaml/ocamlformat/generic.nix | 3 ++- pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index 5847f18ba3d9..c6e4891303f0 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -72,5 +72,9 @@ rec { version = "0.21.0"; }; - ocamlformat = ocamlformat_0_21_0; + ocamlformat_0_22_4 = mkOCamlformat { + version = "0.22.4"; + }; + + ocamlformat = ocamlformat_0_22_4; } diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 7eee57e9abcc..1d332a010ddc 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -26,6 +26,7 @@ let src = "0.20.0" = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk="; "0.20.1" = "sha256-fTpRZFQW+ngoc0T6A69reEUAZ6GmHkeQvxspd5zRAjU="; "0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0="; + "0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA="; }."${version}"; }; ocamlPackages = @@ -75,7 +76,7 @@ buildDunePackage { stdio uuseg uutf - ] + ] ++ lib.optionals (lib.versionAtLeast version "0.22.4") [ csexp ] else if lib.versionAtLeast version "0.19.0" then [ base diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7345955e993d..7d7c465484f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13607,7 +13607,8 @@ with pkgs; ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0 ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0 - ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0; + ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 + ocamlformat_0_22_4; orc = callPackage ../development/compilers/orc { }; From 2d3f74671fe24a88931d3fafe336fa6948679e75 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 1 Jun 2022 16:23:56 +0300 Subject: [PATCH 030/117] texlab: 3.3.2 -> 4.0.0 --- pkgs/development/tools/misc/texlab/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 8cf86d9d782e..47f08d4dcc8d 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "3.3.2"; + version = "4.0.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SpfX/3uM1y8skN5BqudUtswkCpinrmHWT7ixbgg8QNI="; + sha256 = "sha256-hRY1cJFakbq6pU2TKql+eVWvKtNDzVIQkE5BbRW5n5A="; }; - cargoSha256 = "sha256-0YipSDKss8qaINkUw9dW8n0fVKp4FmagI9+9jFyXaLA="; + cargoSha256 = "sha256-VwB02FfoAKL0fEvpvpxfkAR6PcWZFK/d5aVOtUq7f10="; outputs = [ "out" "man" ]; @@ -30,13 +30,6 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage texlab.1 - - # Remove generated dylib of html2md dependency. TexLab statically - # links to the generated rlib and doesn't reference the dylib. I - # couldn't find any way to prevent building this by passing cargo flags. - # See https://gitlab.com/Kanedias/html2md/-/blob/0.2.10/Cargo.toml#L20 - rm "$out/lib/libhtml2md${stdenv.hostPlatform.extensions.sharedLibrary}" - rmdir "$out/lib" ''; passthru.updateScript = nix-update-script { From 275f9025ca55e2f3f2c65a94ea9557be02a11cd9 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 1 Jun 2022 16:08:01 +0100 Subject: [PATCH 031/117] netdata: use disallowedReferences to guard against closure regressions Suggested by Mindavi in https://github.com/NixOS/nixpkgs/pull/175719#issuecomment-1143586412. --- pkgs/tools/system/netdata/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index dd50e48f0735..24c791bed4a4 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -55,6 +55,13 @@ in stdenv.mkDerivation rec { ./skip-CONFIGURE_COMMAND.patch ]; + # Guard against unused buld-time development inputs in closure. Without + # the ./skip-CONFIGURE_COMMAND.patch patch the closure retains inputs up + # to bootstrap tools: + # https://github.com/NixOS/nixpkgs/pull/175719 + # We pick zlib.dev as a simple canary package with pkg-config input. + disallowedReferences = [ zlib.dev ]; + NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; postInstall = '' From 30bc886e4d3d7351fd9d0e08e45ab360b3e76799 Mon Sep 17 00:00:00 2001 From: amesgen Date: Wed, 1 Jun 2022 17:27:50 +0200 Subject: [PATCH 032/117] gojq: 0.12.7 -> 0.12.8 --- pkgs/development/tools/gojq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gojq/default.nix b/pkgs/development/tools/gojq/default.nix index 08fe68e3a0a1..ab9dc5270d8c 100644 --- a/pkgs/development/tools/gojq/default.nix +++ b/pkgs/development/tools/gojq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gojq"; - version = "0.12.7"; + version = "0.12.8"; src = fetchFromGitHub { owner = "itchyny"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aQZLuwMFnggtwHZaE6KGBKJSbtmAz+Cs1RqLgvIsO24="; + sha256 = "sha256-WcPvsThYgXwYXwXyylOqopTZOfsXmDU4wbhEdS3neA8="; }; - vendorSha256 = "sha256-b7TQywIOxzFnUNwgxGFR3W++QGHYUROBG7P/lTRmhGc="; + vendorSha256 = "sha256-fFW+gWdGMxDApcyR6dy0491WvQcVMAJ5dgMQqgNmOkw="; ldflags = [ "-s" "-w" ]; From 7b3f02bd426f0c80ee4831788da4a1ca5d2900a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 17:55:07 +0200 Subject: [PATCH 033/117] liberasurecode: 1.6.2 -> 1.6.3 --- pkgs/applications/misc/liberasurecode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/liberasurecode/default.nix b/pkgs/applications/misc/liberasurecode/default.nix index 0546ec017dec..289423c61220 100644 --- a/pkgs/applications/misc/liberasurecode/default.nix +++ b/pkgs/applications/misc/liberasurecode/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "liberasurecode"; - version = "1.6.2"; + version = "1.6.3"; outputs = [ "out" "dev" "doc" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "openstack"; repo = pname; rev = version; - sha256 = "sha256-qV7DL/7zrwrYOaPj6iHnChGA6KHFwYKjeaMnrGrTPrQ="; + sha256 = "sha256-HCp+FQ9nq4twk6FtfKhzT80wXXJbvG+clrDO2/9ATpU="; }; postPatch = '' From a1102f6800519329f23f6b0e88014fe5f04d4c42 Mon Sep 17 00:00:00 2001 From: helium18 Date: Wed, 1 Jun 2022 11:51:27 +0530 Subject: [PATCH 034/117] gh-eco: init 0.1.0 Co-authored-by: Bobby Rong --- pkgs/tools/misc/gh-eco/default.nix | 32 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/misc/gh-eco/default.nix diff --git a/pkgs/tools/misc/gh-eco/default.nix b/pkgs/tools/misc/gh-eco/default.nix new file mode 100644 index 000000000000..327d510f8211 --- /dev/null +++ b/pkgs/tools/misc/gh-eco/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "gh-eco"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "coloradocolby"; + repo = "gh-eco"; + rev = "v${version}"; + sha256 = "sha256-rJG1k8lOyXQSP3FgyyHZvVrQkn2yEtAcgg9CpbPvCwY="; + }; + + vendorSha256 = "sha256-Qx/QGIurjKGFcIdCot1MFPatbGHfum48JOoHlvqA64c="; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; + + meta = with lib; { + homepage = "https://github.com/coloradocolby/gh-eco"; + description = "gh extension to explore the ecosystem"; + license = licenses.mit; + maintainers = with maintainers; [ helium ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7345955e993d..04b8492fc5a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1136,6 +1136,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + gh-eco = callPackage ../tools/misc/gh-eco { }; + glooctl = callPackage ../applications/networking/cluster/glooctl { }; gobgp = callPackage ../tools/networking/gobgp { }; From 35a005e6b58eb931701f797093df6a26ff4d683d Mon Sep 17 00:00:00 2001 From: helium18 Date: Wed, 1 Jun 2022 12:27:58 +0530 Subject: [PATCH 035/117] maintainers: add helium --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 99a75fa6bfea..5e3bd40d154d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5074,6 +5074,12 @@ githubId = 2405974; name = "Sébastian Méric de Bellefon"; }; + helium = { + email = "helium.dev@tuta.io"; + github = "helium18"; + githubId = 86223025; + name = "helium"; + }; henkkalkwater = { email = "chris+nixpkgs@netsoj.nl"; github = "HenkKalkwater"; From e208a5be039304801722c54fafe7f90714d9e3ce Mon Sep 17 00:00:00 2001 From: gruve-p Date: Wed, 1 Jun 2022 19:31:34 +0200 Subject: [PATCH 036/117] groestlcoin: 22.0 -> 23.0 --- pkgs/applications/blockchains/groestlcoin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix index b14076f808d7..57b6f719505c 100644 --- a/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/pkgs/applications/blockchains/groestlcoin/default.nix @@ -24,7 +24,7 @@ }: let - version = "22.0"; + version = "23.0"; desktop = fetchurl { url = "https://raw.githubusercontent.com/Groestlcoin/packaging/${version}/debian/groestlcoin-qt.desktop"; sha256 = "0mxwq4jvcip44a796iwz7n1ljkhl3a4p47z7qlsxcfxw3zmm0k0k"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "Groestlcoin"; repo = "groestlcoin"; rev = "v${version}"; - sha256 = "104zzcigpk976iqyinjn6mw3l36zb1if7249iz44ds1zaxv3g1v1"; + sha256 = "1ag7wpaw4zssx1g482kziqr95yl2vk9r332689s3093xv9i9pz4s"; }; nativeBuildInputs = [ autoreconfHook pkg-config ] From d02db54662c17518c046433e4701631e4af05d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 20:18:26 +0200 Subject: [PATCH 037/117] python310Packages.eventlet: 0.33.0 -> 0.33.1 --- pkgs/development/python-modules/eventlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index d24874ac5911..ff1d618ddb08 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.33.0"; + version = "0.33.1"; format = "setuptools"; src = fetchFromGitHub { owner = "eventlet"; repo = pname; rev = "v${version}"; - hash = "sha256-kE/eYBbaTt1mPGoUIMhonvFBlQOdAfPU5GvCvPaRHvs="; + hash = "sha256-8tIvvTTCcIG56VaPZMhdzAKnFRsYV3YC9xcf47nh838="; }; propagatedBuildInputs = [ From f80fca4e79af86e3bb66073f2ff18367c321d84a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 21:44:20 +0200 Subject: [PATCH 038/117] python310Packages.google-cloud-audit-log: 0.2.0 -> 0.2.2 --- .../python-modules/google-cloud-audit-log/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix index fabd8dad68e2..84bdaf7afe51 100644 --- a/pkgs/development/python-modules/google-cloud-audit-log/default.nix +++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-audit-log"; - version = "0.2.0"; + version = "0.2.2"; src = fetchPypi { inherit pname version; - sha256 = "d0852f525ad65705f9fbff6288be4493e1449a7906fb5e01bd71c8d1e424d1fc"; + sha256 = "sha256-bYmQOEiu6YF0d+zjBlRIUbkDpexWHalmu7pajRJQmk0="; }; propagatedBuildInputs = [ googleapis-common-protos protobuf ]; From 1182040972f0dd43060f4fa05fe9f24708afd564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 21:47:26 +0200 Subject: [PATCH 039/117] python310Packages.keystoneauth1: 4.5.0 -> 4.6.0 --- pkgs/development/python-modules/keystoneauth1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix index e4886e08c2d6..258b3a56180f 100644 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/pkgs/development/python-modules/keystoneauth1/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "4.5.0"; + version = "4.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SbNIiWakPusCAOpRG5l+ZAPCXVY6mExjMOgqDr/EVAw="; + sha256 = "sha256-Bm8a3diRFM1qG5yzVVyOqn0BNnPuEDS9/lBgaIBKngU="; }; postPatch = '' From 5ce8ac399eccca14a55cc2a9674ef044b0404f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 21:48:29 +0200 Subject: [PATCH 040/117] python310Packages.google-cloud-datacatalog: 3.7.1 -> 3.8.0 --- .../python-modules/google-cloud-datacatalog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index c3e748810ee3..304899f0c8ae 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.7.1"; + version = "3.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-99hJvY195iUjXOZEOwFQftDkfgtD5V8hSg5ZLWKyWZU="; + hash = "sha256-kGYfdvAnvdFm/1u0CS+n6rGKhV5GtGhW1zF7SVUu8PY="; }; propagatedBuildInputs = [ From e4fc3bea2fbe8bbf330b7062a4855801ef0ce779 Mon Sep 17 00:00:00 2001 From: Yuri Lemos Rodrigues Date: Wed, 1 Jun 2022 11:08:49 -0300 Subject: [PATCH 041/117] ocamlformat: remove older versions 0.12.x .. 0.18.x --- .../tools/ocaml/ocamlformat/default.nix | 49 ------ .../tools/ocaml/ocamlformat/generic.nix | 162 +++--------------- pkgs/top-level/aliases.nix | 13 ++ pkgs/top-level/all-packages.nix | 3 - 4 files changed, 37 insertions(+), 190 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index c6e4891303f0..84d3b850a5ff 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -7,55 +7,6 @@ let mkOCamlformat = callPackage ./generic.nix; in # https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433 rec { - ocamlformat_0_11_0 = mkOCamlformat { - version = "0.11.0"; - }; - - ocamlformat_0_12 = mkOCamlformat { - version = "0.12"; - }; - - ocamlformat_0_13_0 = mkOCamlformat rec { - version = "0.13.0"; - tarballName = "ocamlformat-${version}-2.tbz"; - }; - - ocamlformat_0_14_0 = mkOCamlformat { - version = "0.14.0"; - }; - - ocamlformat_0_14_1 = mkOCamlformat { - version = "0.14.1"; - }; - - ocamlformat_0_14_2 = mkOCamlformat { - version = "0.14.2"; - }; - - ocamlformat_0_14_3 = mkOCamlformat { - version = "0.14.3"; - }; - - ocamlformat_0_15_0 = mkOCamlformat { - version = "0.15.0"; - }; - - ocamlformat_0_15_1 = mkOCamlformat { - version = "0.15.1"; - }; - - ocamlformat_0_16_0 = mkOCamlformat { - version = "0.16.0"; - }; - - ocamlformat_0_17_0 = mkOCamlformat { - version = "0.17.0"; - }; - - ocamlformat_0_18_0 = mkOCamlformat { - version = "0.18.0"; - }; - ocamlformat_0_19_0 = mkOCamlformat { version = "0.19.0"; }; diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 1d332a010ddc..cf04df5a7884 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -11,17 +11,6 @@ let src = } else fetchurl { url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}"; sha256 = { - "0.12" = "1zi8x597dhp2822j6j28s84yyiqppl7kykpwqqclx6ybypvlzdpj"; - "0.13.0" = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq"; - "0.14.0" = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; - "0.14.1" = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa"; - "0.14.2" = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; - "0.14.3" = "13pfakdncddm41cp61p0l98scawbvhx1q4zdsglv7ph87l7zwqfl"; - "0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; - "0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a"; - "0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr"; - "0.17.0" = "0f1lxp697yq61z8gqxjjaqd2ns8fd1vjfggn55x0gh9dx098p138"; - "0.18.0" = "0571kzmb1h03qj74090n3mg8wfbh29qqrkdjkai6rnl5chll86lq"; "0.19.0" = "0ihgwl7d489g938m1jvgx8azdgq9f5np5mzqwwya797hx2m4dz32"; "0.20.0" = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk="; "0.20.1" = "sha256-fTpRZFQW+ngoc0T6A69reEUAZ6GmHkeQvxspd5zRAjU="; @@ -29,15 +18,8 @@ let src = "0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA="; }."${version}"; }; - ocamlPackages = - if lib.versionAtLeast version "0.19.0" - then ocaml-ng.ocamlPackages - else if lib.versionAtLeast version "0.17.0" - then ocaml-ng.ocamlPackages_4_12 - else if lib.versionAtLeast version "0.14.3" - then ocaml-ng.ocamlPackages_4_10 - else ocaml-ng.ocamlPackages_4_07 -; in + ocamlPackages = ocaml-ng.ocamlPackages; +in with ocamlPackages; @@ -45,10 +27,7 @@ buildDunePackage { pname = "ocamlformat"; inherit src version; - minimumOCamlVersion = - if lib.versionAtLeast version "0.17.0" - then "4.08" - else "4.06"; + minimumOCamlVersion = "4.08"; useDune2 = true; @@ -58,120 +37,27 @@ buildDunePackage { menhir ]; - buildInputs = - if lib.versionAtLeast version "0.20.0" - then [ - base - (if lib.versionAtLeast version "0.21.0" then cmdliner_1_1 else cmdliner_1_0) - dune-build-info - either - fix - fpath - menhirLib - menhirSdk - ocaml-version - ocp-indent - (if version == "0.20.0" then odoc-parser.override { version = "0.9.0"; } else odoc-parser) - re - stdio - uuseg - uutf - ] ++ lib.optionals (lib.versionAtLeast version "0.22.4") [ csexp ] - else if lib.versionAtLeast version "0.19.0" - then [ - base - cmdliner_1_0 - fpath - re - stdio - uuseg - uutf - fix - menhirLib - menhirSdk - ocp-indent - dune-build-info - (odoc-parser.override { version = "0.9.0"; }) - ] - else if lib.versionAtLeast version "0.18.0" - then [ - base - cmdliner_1_0 - fpath - odoc - re - stdio - uuseg - uutf - fix - menhirLib - menhirSdk - dune-build-info - ocaml-version - # Changed since 0.16.0: - (ppxlib.override { version = "0.22.0"; }) - ] - else if lib.versionAtLeast version "0.17.0" - then [ - base - cmdliner_1_0 - fpath - odoc - re - stdio - uuseg - uutf - fix - menhirLib - menhirSdk - dune-build-info - ocaml-version - # Changed since 0.16.0: - (ppxlib.override { version = "0.22.0"; }) - ocaml-migrate-parsetree-2 - ] - else if lib.versionAtLeast version "0.15.1" - then [ - base - cmdliner_1_0 - fpath - odoc - re - stdio - uuseg - uutf - fix - menhirLib - menhirSdk - (ppxlib.override { version = "0.18.0"; }) - dune-build-info # lib.versionAtLeast version "0.16.0" - ocaml-version # lib.versionAtLeast version "0.16.0" - ] - else if lib.versionAtLeast version "0.14" - then [ - base - cmdliner_1_0 - fpath - ocaml-migrate-parsetree - odoc - re - stdio - uuseg - uutf - fix - menhirLib - menhirSdk - ] else [ - base - cmdliner_1_0 - fpath - ocaml-migrate-parsetree - odoc - re - stdio - uuseg - uutf - ]; + buildInputs = [ + base + dune-build-info + fix + fpath + menhirLib + menhirSdk + ocp-indent + re + stdio + uuseg + uutf + ] + ++ lib.optionals (lib.versionAtLeast version "0.20.0") [ ocaml-version either ] + ++ (if lib.versionAtLeast version "0.20.1" + then [ odoc-parser ] + else [ (odoc-parser.override { version = "0.9.0"; }) ]) + ++ (if lib.versionAtLeast version "0.21.0" + then [ cmdliner_1_1 ] + else [ cmdliner_1_0 ]) + ++ lib.optionals (lib.versionAtLeast version "0.22.4") [ csexp ]; meta = { homepage = "https://github.com/ocaml-ppx/ocamlformat"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6c8fed798936..09c9a79f1f30 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1491,6 +1491,19 @@ mapAliases ({ ocaml_4_02 = throw "'ocamlPackages_4_02.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_02.ocaml'"; # Converted to throw 2022-02-22 ocaml_4_03 = throw "'ocamlPackages_4_03.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_03.ocaml'"; # Converted to throw 2022-02-22 + ocamlformat_0_11_0 = throw "ocamlformat_0_11_0 has been removed in favor of newer versions"; # Added 2022-06-01 + ocamlformat_0_12 = throw "ocamlformat_0_12 has been removed in favor of newer versions"; # Added 2022-06-01 + ocamlformat_0_13_0 = throw "ocamlformat_0_13_0 has been removed in favor of newer versions"; # Added 2022-06-01 + ocamlformat_0_14_0 = throw "ocamlformat_0_14_0 has been removed in favor of newer versions"; # Added 2022-06-01 + ocamlformat_0_14_1 = throw "ocamlformat_0_14_1 has been removed in favor of newer versions"; # Added 2022-06-01 + ocamlformat_0_14_2 = throw "ocamlformat_0_14_2 has been removed in favor of newer versions"; # Added 2022-06-01 + ocamlformat_0_14_3 = throw "ocamlformat_0_14_3 has been removed in favor of newer versions"; # Added 2022-06-01 + ocamlformat_0_15_0 = throw "ocamlformat_0_15_0 has been removed in favor of newer versions"; # Added 2022-06-01 + ocamlformat_0_15_1 = throw "ocamlformat_0_15_1 has been removed in favor of newer versions"; # Added 2022-06-01 + ocamlformat_0_16_0 = throw "ocamlformat_0_16_0 has been removed in favor of newer versions"; # Added 2022-06-01 + ocamlformat_0_17_0 = throw "ocamlformat_0_17_0 has been removed in favor of newer versions"; # Added 2022-06-01 + ocamlformat_0_18_0 = throw "ocamlformat_0_18_0 has been removed in favor of newer versions"; # Added 2022-06-01 + zabbix44 = throw '' Zabbix 4.4 is end of life. For details on upgrading to Zabbix 5.0 look at https://www.zabbix.com/documentation/current/manual/installation/upgrade_notes_500 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d7c465484f4..7027bd53d431 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13604,9 +13604,6 @@ with pkgs; inherit (callPackage ../development/tools/ocaml/ocamlformat { }) ocamlformat # latest version - ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 - ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0 - ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0 ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 ocamlformat_0_22_4; From 39eeecd6a48b28590c5a03aad69f91a9ace33290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 21:57:41 +0200 Subject: [PATCH 042/117] python310Packages.proto-plus: 1.20.3 -> 1.20.5 --- pkgs/development/python-modules/proto-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index defc28d9429a..ace9537c1d04 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.20.3"; + version = "1.20.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-8osiW8nmwU4gb7f46Zakb7LM2QJkjlEtSWq7anFqSuU="; + sha256 = "sha256-gXlOsb4zPGeYYzOUjfcOu4zfU44Dn4z6kv0qnXF21AU="; }; propagatedBuildInputs = [ protobuf ]; From d10cb7db4bfc53da75f2fe9e73cfaa0e85545f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 21:57:51 +0200 Subject: [PATCH 043/117] python310Packages.google-cloud-firestore: 2.5.0 -> 2.5.2 --- .../python-modules/google-cloud-firestore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index a8ed0be5e0e2..24085cf5ff25 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.5.0"; + version = "2.5.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g/IgGlVWHjkqJKDFvkmp/TVNA0TgN+Xf65M10+x3f+o="; + sha256 = "sha256-ltFXT+cU/YGPqu28WcStV6bJarbiIGbjsHLI+9UZU80="; }; propagatedBuildInputs = [ From 5016b5a8d42fb396aadf198d35e00bdaf2824248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 22:06:05 +0200 Subject: [PATCH 044/117] python310Packages.oslo-concurrency: 4.5.0 -> 4.5.1 --- pkgs/development/python-modules/oslo-concurrency/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index 18a381de9d08..90b49e5e77dd 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "oslo-concurrency"; - version = "4.5.0"; + version = "4.5.1"; src = fetchPypi { pname = "oslo.concurrency"; inherit version; - sha256 = "1h76pq9p1bpwcs6jl9m2w4280wcp2w3is88qlaqknqkd3pdaixwr"; + sha256 = "sha256-aGm5Rrk9lbq/IM0Wvgb8NaXsFNB+osHzFfSsbqXw2hc="; }; postPatch = '' From 5ce3fe64073b2db3a9393b9e6d5c35ae2a7c94fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 22:09:30 +0200 Subject: [PATCH 045/117] python310Packages.oslo-db: 11.2.0 -> 11.3.0 --- pkgs/development/python-modules/oslo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 3fd7c4e28c5c..c675848f38b1 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "11.2.0"; + version = "11.3.0"; src = fetchPypi { pname = "oslo.db"; inherit version; - sha256 = "sha256-ezppPrC1BEkUmiJWGMdQtvDhZWyEJoGEe0e4UK1FYL4="; + sha256 = "sha256-CSlZI05V8p+lCgjPcG6LZi4y2nVNrFhjI95TDM/WJnM="; }; nativeBuildInputs = [ pbr ]; From d37bd24dd1ebf206207c7e1acbf339572bb83263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 22:10:35 +0200 Subject: [PATCH 046/117] python310Packages.google-cloud-core: 2.2.3 -> 2.3.0 --- pkgs/development/python-modules/google-cloud-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index e59e6a5cb5f7..c446c7a6d2ea 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "2.2.3"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-idL3GJvG3HTeEo1CPqUsyHGfCl28zZyoBDP2UEogJVw="; + sha256 = "sha256-/apinmF0tBd8LVbrirHd2HZhBk0KPpuwa2Lk1+I0Rmk="; }; propagatedBuildInputs = [ google-api-core ]; From e606d4ebe8bc49b88fcce49266fafc0061d46044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 22:11:48 +0200 Subject: [PATCH 047/117] python310Packages.google-cloud-storage: 2.2.1 -> 2.3.0 --- .../python-modules/google-cloud-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 629c323506b1..c252b608f775 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.2.1"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AkT0YScQy17ERfxndDh1ZOI/mCM2P7QIsock4hAkAbc="; + hash = "sha256-9Muw3l4XIo6cCc3Il9geqnDiw5b1hRP3neDoJFhMj1s="; }; propagatedBuildInputs = [ From b64a1fa74ccd91213c82996ec89673b24c0e475e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 22:13:08 +0200 Subject: [PATCH 048/117] python310Packages.oslo-log: 4.7.0 -> 5.0.0 --- pkgs/development/python-modules/oslo-log/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 49fd2f3e677c..4b9920c577d3 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "4.7.0"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-ycLEyW098LLuuTG0djvbCpBbqvKbiVgW2Vd41p+hJwc="; + hash = "sha256-c6tyNKii1QvfUmyHTfocsrEIO6+a2VvC64r1YkidTQE="; }; propagatedBuildInputs = [ From ff44e8b01f5705539a8150989e824d587bdbc650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 22:13:18 +0200 Subject: [PATCH 049/117] python310Packages.google-i18n-address: 2.5.0 -> 2.5.1 --- .../python-modules/google-i18n-address/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix index e2724ac123c8..b0747a90942f 100644 --- a/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/pkgs/development/python-modules/google-i18n-address/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "google-i18n-address"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "mirumee"; repo = "google-i18n-address"; rev = version; - sha256 = "0fn5sph6fq68zrjssgvnnvrkavs8arshjwgxng5dr5fsn6qii3mq"; + sha256 = "sha256-VQEDZkGseZTKOsAMgNYyf6FcgnCjLPpWXijeUmtgyv0="; }; propagatedBuildInputs = [ requests ]; From ad34ff74347e5a541c4049f2bd1575b738d2e831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 22:18:42 +0200 Subject: [PATCH 050/117] python310Packages.oslo-utils: 4.12.2 -> 4.13.0 --- pkgs/development/python-modules/oslo-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-utils/default.nix b/pkgs/development/python-modules/oslo-utils/default.nix index aeea9b742a93..25bc4706f0de 100644 --- a/pkgs/development/python-modules/oslo-utils/default.nix +++ b/pkgs/development/python-modules/oslo-utils/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "4.12.2"; + version = "4.13.0"; src = fetchPypi { pname = "oslo.utils"; inherit version; - sha256 = "sha256-Qf0sT/bS6No4qttaW/JCWKhlDg4KaYprI51IuOQXfDs="; + sha256 = "sha256-RbqKql7QVqjo5GBZ75PVwte5yZvHSA42HPV4Pkfyj7o="; }; postPatch = '' From 07747e3884362ee5d57dd59858301bdd3d293f95 Mon Sep 17 00:00:00 2001 From: lom Date: Wed, 1 Jun 2022 14:57:27 -0600 Subject: [PATCH 051/117] ArchiSteamFarm: 5.2.5.7 -> 5.2.6.3 --- pkgs/applications/misc/ArchiSteamFarm/default.nix | 4 ++-- .../misc/ArchiSteamFarm/deps-aarch64-linux.nix | 8 ++++---- .../misc/ArchiSteamFarm/deps-x86_64-linux.nix | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index f6fe897518b2..4c0e1d6b7305 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -12,13 +12,13 @@ buildDotnetModule rec { pname = "archisteamfarm"; # nixpkgs-update: no auto update - version = "5.2.5.7"; + version = "5.2.6.3"; src = fetchFromGitHub { owner = "justarchinet"; repo = pname; rev = version; - sha256 = "sha256-NXRHLE9Y7j10l8mAUY68+556wcxRXLfdKeCI+b4Xs7I="; + sha256 = "sha256-ZsBOF3ZFZ0aicaAJ5j+6DQPwDyloxSafae8FTKSdwAI="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix index 461b98e5c45b..e8303f91f5b4 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix @@ -1,7 +1,7 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; }) (fetchNuGet { pname = "AngleSharp.XPath"; version = "1.1.7"; sha256 = "0lrk002nizq973zdmcm0wmcq17j5gizwp03xdv84hiqqd8cyy538"; }) - (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0"; sha256 = "0sklcgan0w0afvmd4akq7wvdbx5j353ifbhg8z7bxs80yi6f9q17"; }) + (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; }) (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; }) (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) @@ -110,9 +110,9 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "4.7.11"; sha256 = "0vvgypqh6cxzkrfymjaghads5dg88l2xvbz6dxwwrnjg5hhpcjaw"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "1.7.4"; sha256 = "1lilk9sv3j9jg23hl0vhxd8w63bh6xvns42rkz5n582wpf5k2r24"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "4.14.0"; sha256 = "1q2v44inp4xjynncxpv432k2qjkfara1bpipmv3p3in0yv14l3wg"; }) + (fetchNuGet { pname = "NLog"; version = "5.0.0"; sha256 = "10da1qfvqkfs7msb0f9yba3ias6dh9m0xjr2hbp95symbz8nrfwz"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.0"; sha256 = "0r06b64f7j1pi7qlsaqvbvnp0irpng3vkngszis7mj0g6415rz8c"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.0.0"; sha256 = "1fj4m1kdszcxva918pz2abpn31vp69vj0349gfzixz87gml8vbg4"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix b/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix index fe91bb8026f9..46de07329bfa 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix @@ -1,7 +1,7 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; }) (fetchNuGet { pname = "AngleSharp.XPath"; version = "1.1.7"; sha256 = "0lrk002nizq973zdmcm0wmcq17j5gizwp03xdv84hiqqd8cyy538"; }) - (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0"; sha256 = "0sklcgan0w0afvmd4akq7wvdbx5j353ifbhg8z7bxs80yi6f9q17"; }) + (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; }) (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; }) (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) @@ -110,9 +110,9 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "4.7.11"; sha256 = "0vvgypqh6cxzkrfymjaghads5dg88l2xvbz6dxwwrnjg5hhpcjaw"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "1.7.4"; sha256 = "1lilk9sv3j9jg23hl0vhxd8w63bh6xvns42rkz5n582wpf5k2r24"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "4.14.0"; sha256 = "1q2v44inp4xjynncxpv432k2qjkfara1bpipmv3p3in0yv14l3wg"; }) + (fetchNuGet { pname = "NLog"; version = "5.0.0"; sha256 = "10da1qfvqkfs7msb0f9yba3ias6dh9m0xjr2hbp95symbz8nrfwz"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.0"; sha256 = "0r06b64f7j1pi7qlsaqvbvnp0irpng3vkngszis7mj0g6415rz8c"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.0.0"; sha256 = "1fj4m1kdszcxva918pz2abpn31vp69vj0349gfzixz87gml8vbg4"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; }) From d60e225ffaaaffe99472c54214ddcc7990db1a36 Mon Sep 17 00:00:00 2001 From: lom Date: Wed, 1 Jun 2022 14:56:33 -0600 Subject: [PATCH 052/117] ArchiSteamFarm.ui: update --- .../misc/ArchiSteamFarm/web-ui/default.nix | 4 +- .../ArchiSteamFarm/web-ui/node-packages.nix | 621 +++++++++--------- 2 files changed, 313 insertions(+), 312 deletions(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index b055f176a60e..bbe37b5ed743 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -11,8 +11,8 @@ let repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "bb59242af6f17a54449e6f87e9df397da1a19525"; - sha256 = "0d9x0fcjxghmjqnfxj22x2hnx3k6jfsayb2ws7ayn3azcczfsccp"; + rev = "5c7d99928e2d390bc1cd5fa74b2f422aa760d78e"; + sha256 = "04wcmqav2q7dchvjyy0k6g8cv5ff1sw2a238sz38670cnwx569r2"; }; in diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix index b9bacf6aef1a..38f965ffa8b3 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix @@ -31,31 +31,31 @@ let sha512 = "GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw=="; }; }; - "@babel/core-7.17.10" = { + "@babel/core-7.18.2" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.17.10"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.17.10.tgz"; - sha512 = "liKoppandF3ZcBnIYFjfSDHZLKdLHGJRkoWtG8zQyGJBQfIYobpnVGI5+pLBNtS6psFLDzyq8+h5HiVljW9PNA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.18.2.tgz"; + sha512 = "A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ=="; }; }; - "@babel/eslint-parser-7.17.0" = { + "@babel/eslint-parser-7.18.2" = { name = "_at_babel_slash_eslint-parser"; packageName = "@babel/eslint-parser"; - version = "7.17.0"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz"; - sha512 = "PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA=="; + url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.18.2.tgz"; + sha512 = "oFQYkE8SuH14+uR51JVAmdqwKYXGRjEXx7s+WiagVjqQ+HPE+nnwyF2qlVG8evUsUHmPcA+6YXMEDbIhEyQc5A=="; }; }; - "@babel/generator-7.17.10" = { + "@babel/generator-7.18.2" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.17.10"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz"; - sha512 = "46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz"; + sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; }; }; "@babel/helper-annotate-as-pure-7.16.7" = { @@ -76,31 +76,31 @@ let sha512 = "C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA=="; }; }; - "@babel/helper-compilation-targets-7.17.10" = { + "@babel/helper-compilation-targets-7.18.2" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.17.10"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz"; - sha512 = "gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz"; + sha512 = "s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.17.9" = { + "@babel/helper-create-class-features-plugin-7.18.0" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.17.9"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz"; - sha512 = "kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz"; + sha512 = "Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.17.0" = { + "@babel/helper-create-regexp-features-plugin-7.17.12" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.17.0"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz"; - sha512 = "awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz"; + sha512 = "b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw=="; }; }; "@babel/helper-define-polyfill-provider-0.3.0" = { @@ -112,13 +112,13 @@ let sha512 = "7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg=="; }; }; - "@babel/helper-environment-visitor-7.16.7" = { + "@babel/helper-environment-visitor-7.18.2" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.16.7"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz"; - sha512 = "SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz"; + sha512 = "14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ=="; }; }; "@babel/helper-explode-assignable-expression-7.16.7" = { @@ -166,13 +166,13 @@ let sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; }; }; - "@babel/helper-module-transforms-7.17.7" = { + "@babel/helper-module-transforms-7.18.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.17.7"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz"; - sha512 = "VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz"; + sha512 = "kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA=="; }; }; "@babel/helper-optimise-call-expression-7.16.7" = { @@ -184,13 +184,13 @@ let sha512 = "EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w=="; }; }; - "@babel/helper-plugin-utils-7.16.7" = { + "@babel/helper-plugin-utils-7.17.12" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz"; - sha512 = "Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz"; + sha512 = "JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA=="; }; }; "@babel/helper-remap-async-to-generator-7.16.8" = { @@ -211,13 +211,13 @@ let sha512 = "y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw=="; }; }; - "@babel/helper-simple-access-7.17.7" = { + "@babel/helper-simple-access-7.18.2" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.17.7"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz"; - sha512 = "txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz"; + sha512 = "7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.16.0" = { @@ -265,13 +265,13 @@ let sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; }; }; - "@babel/helpers-7.17.9" = { + "@babel/helpers-7.18.2" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.17.9"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz"; - sha512 = "cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz"; + sha512 = "j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg=="; }; }; "@babel/highlight-7.16.7" = { @@ -283,58 +283,58 @@ let sha512 = "aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw=="; }; }; - "@babel/parser-7.17.10" = { + "@babel/parser-7.18.0" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.17.10"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.10.tgz"; - sha512 = "n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.0.tgz"; + sha512 = "AqDccGC+m5O/iUStSJy3DGRIUFu7WbY/CppZYwrEUB4N0tZlnI8CSTsgL7v5fHVFmUbRv2sd+yy27o8Ydt4MGg=="; }; }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" = { + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" = { name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz"; - sha512 = "anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz"; + sha512 = "xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz"; - sha512 = "di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz"; + sha512 = "/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.16.8" = { + "@babel/plugin-proposal-async-generator-functions-7.17.12" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.16.8"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz"; - sha512 = "71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz"; + sha512 = "RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ=="; }; }; - "@babel/plugin-proposal-class-properties-7.16.7" = { + "@babel/plugin-proposal-class-properties-7.17.12" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz"; - sha512 = "IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz"; + sha512 = "U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw=="; }; }; - "@babel/plugin-proposal-class-static-block-7.17.6" = { + "@babel/plugin-proposal-class-static-block-7.18.0" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.17.6"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz"; - sha512 = "X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz"; + sha512 = "t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA=="; }; }; "@babel/plugin-proposal-dynamic-import-7.16.7" = { @@ -346,40 +346,40 @@ let sha512 = "I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.16.7" = { + "@babel/plugin-proposal-export-namespace-from-7.17.12" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz"; - sha512 = "ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz"; + sha512 = "j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ=="; }; }; - "@babel/plugin-proposal-json-strings-7.16.7" = { + "@babel/plugin-proposal-json-strings-7.17.12" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz"; - sha512 = "lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz"; + sha512 = "rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.16.7" = { + "@babel/plugin-proposal-logical-assignment-operators-7.17.12" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz"; - sha512 = "K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz"; + sha512 = "EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.17.12" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz"; - sha512 = "aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz"; + sha512 = "ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag=="; }; }; "@babel/plugin-proposal-numeric-separator-7.16.7" = { @@ -391,13 +391,13 @@ let sha512 = "vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.17.3" = { + "@babel/plugin-proposal-object-rest-spread-7.18.0" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.17.3"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz"; - sha512 = "yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz"; + sha512 = "nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.16.7" = { @@ -409,40 +409,40 @@ let sha512 = "eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.16.7" = { + "@babel/plugin-proposal-optional-chaining-7.17.12" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz"; - sha512 = "eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz"; + sha512 = "7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ=="; }; }; - "@babel/plugin-proposal-private-methods-7.16.11" = { + "@babel/plugin-proposal-private-methods-7.17.12" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.16.11"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz"; - sha512 = "F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz"; + sha512 = "SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.16.7" = { + "@babel/plugin-proposal-private-property-in-object-7.17.12" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz"; - sha512 = "rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz"; + sha512 = "/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.16.7" = { + "@babel/plugin-proposal-unicode-property-regex-7.17.12" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz"; - sha512 = "QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz"; + sha512 = "Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -490,6 +490,15 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; + "@babel/plugin-syntax-import-assertions-7.17.12" = { + name = "_at_babel_slash_plugin-syntax-import-assertions"; + packageName = "@babel/plugin-syntax-import-assertions"; + version = "7.17.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz"; + sha512 = "n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw=="; + }; + }; "@babel/plugin-syntax-json-strings-7.8.3" = { name = "_at_babel_slash_plugin-syntax-json-strings"; packageName = "@babel/plugin-syntax-json-strings"; @@ -571,22 +580,22 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.16.7" = { + "@babel/plugin-transform-arrow-functions-7.17.12" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz"; - sha512 = "9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz"; + sha512 = "PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA=="; }; }; - "@babel/plugin-transform-async-to-generator-7.16.8" = { + "@babel/plugin-transform-async-to-generator-7.17.12" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.16.8"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz"; - sha512 = "MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz"; + sha512 = "J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ=="; }; }; "@babel/plugin-transform-block-scoped-functions-7.16.7" = { @@ -598,40 +607,40 @@ let sha512 = "JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg=="; }; }; - "@babel/plugin-transform-block-scoping-7.16.7" = { + "@babel/plugin-transform-block-scoping-7.17.12" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz"; - sha512 = "ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.17.12.tgz"; + sha512 = "jw8XW/B1i7Lqwqj2CbrViPcZijSxfguBWZP2aN59NHgxUyO/OcO1mfdCxH13QhN5LbWhPkX+f+brKGhZTiqtZQ=="; }; }; - "@babel/plugin-transform-classes-7.16.7" = { + "@babel/plugin-transform-classes-7.17.12" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz"; - sha512 = "WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.17.12.tgz"; + sha512 = "cvO7lc7pZat6BsvH6l/EGaI8zpl8paICaoGk+7x7guvtfak/TbIf66nYmJOH13EuG0H+Xx3M+9LQDtSvZFKXKw=="; }; }; - "@babel/plugin-transform-computed-properties-7.16.7" = { + "@babel/plugin-transform-computed-properties-7.17.12" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz"; - sha512 = "gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz"; + sha512 = "a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ=="; }; }; - "@babel/plugin-transform-destructuring-7.17.7" = { + "@babel/plugin-transform-destructuring-7.18.0" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.17.7"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz"; - sha512 = "XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz"; + sha512 = "Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw=="; }; }; "@babel/plugin-transform-dotall-regex-7.16.7" = { @@ -643,13 +652,13 @@ let sha512 = "Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.16.7" = { + "@babel/plugin-transform-duplicate-keys-7.17.12" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz"; - sha512 = "03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz"; + sha512 = "EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw=="; }; }; "@babel/plugin-transform-exponentiation-operator-7.16.7" = { @@ -661,13 +670,13 @@ let sha512 = "8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA=="; }; }; - "@babel/plugin-transform-for-of-7.16.7" = { + "@babel/plugin-transform-for-of-7.18.1" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.16.7"; + version = "7.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz"; - sha512 = "/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz"; + sha512 = "+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg=="; }; }; "@babel/plugin-transform-function-name-7.16.7" = { @@ -679,13 +688,13 @@ let sha512 = "SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA=="; }; }; - "@babel/plugin-transform-literals-7.16.7" = { + "@babel/plugin-transform-literals-7.17.12" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz"; - sha512 = "6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz"; + sha512 = "8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ=="; }; }; "@babel/plugin-transform-member-expression-literals-7.16.7" = { @@ -697,58 +706,58 @@ let sha512 = "mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw=="; }; }; - "@babel/plugin-transform-modules-amd-7.16.7" = { + "@babel/plugin-transform-modules-amd-7.18.0" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.16.7"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz"; - sha512 = "KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz"; + sha512 = "h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.17.9" = { + "@babel/plugin-transform-modules-commonjs-7.18.2" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.17.9"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz"; - sha512 = "2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz"; + sha512 = "f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.17.8" = { + "@babel/plugin-transform-modules-systemjs-7.18.0" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.17.8"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz"; - sha512 = "39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.0.tgz"; + sha512 = "vwKpxdHnlM5tIrRt/eA0bzfbi7gUBLN08vLu38np1nZevlPySRe6yvuATJB5F/WPJ+ur4OXwpVYq9+BsxqAQuQ=="; }; }; - "@babel/plugin-transform-modules-umd-7.16.7" = { + "@babel/plugin-transform-modules-umd-7.18.0" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.16.7"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz"; - sha512 = "EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz"; + sha512 = "d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.17.10" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.17.12" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.17.10"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.10.tgz"; - sha512 = "v54O6yLaJySCs6mGzaVOUw9T967GnH38T6CQSAtnzdNPwu84l2qAjssKzo/WSO8Yi7NF+7ekm5cVbF/5qiIgNA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz"; + sha512 = "vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA=="; }; }; - "@babel/plugin-transform-new-target-7.16.7" = { + "@babel/plugin-transform-new-target-7.17.12" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz"; - sha512 = "xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz"; + sha512 = "CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w=="; }; }; "@babel/plugin-transform-object-super-7.16.7" = { @@ -760,13 +769,13 @@ let sha512 = "14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw=="; }; }; - "@babel/plugin-transform-parameters-7.16.7" = { + "@babel/plugin-transform-parameters-7.17.12" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz"; - sha512 = "AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz"; + sha512 = "6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA=="; }; }; "@babel/plugin-transform-property-literals-7.16.7" = { @@ -778,22 +787,22 @@ let sha512 = "z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw=="; }; }; - "@babel/plugin-transform-regenerator-7.17.9" = { + "@babel/plugin-transform-regenerator-7.18.0" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.17.9"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz"; - sha512 = "Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz"; + sha512 = "C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw=="; }; }; - "@babel/plugin-transform-reserved-words-7.16.7" = { + "@babel/plugin-transform-reserved-words-7.17.12" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz"; - sha512 = "KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz"; + sha512 = "1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA=="; }; }; "@babel/plugin-transform-shorthand-properties-7.16.7" = { @@ -805,13 +814,13 @@ let sha512 = "hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg=="; }; }; - "@babel/plugin-transform-spread-7.16.7" = { + "@babel/plugin-transform-spread-7.17.12" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz"; - sha512 = "+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz"; + sha512 = "9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg=="; }; }; "@babel/plugin-transform-sticky-regex-7.16.7" = { @@ -823,22 +832,22 @@ let sha512 = "NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw=="; }; }; - "@babel/plugin-transform-template-literals-7.16.7" = { + "@babel/plugin-transform-template-literals-7.18.2" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.16.7"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz"; - sha512 = "VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz"; + sha512 = "/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.16.7" = { + "@babel/plugin-transform-typeof-symbol-7.17.12" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.16.7"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz"; - sha512 = "p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz"; + sha512 = "Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw=="; }; }; "@babel/plugin-transform-unicode-escapes-7.16.7" = { @@ -859,13 +868,13 @@ let sha512 = "oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q=="; }; }; - "@babel/preset-env-7.17.10" = { + "@babel/preset-env-7.18.2" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.17.10"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.17.10.tgz"; - sha512 = "YNgyBHZQpeoBSRBg0xixsZzfT58Ze1iZrajvv0lJc70qDDGuGfonEnMGfWeSY0mQ3JTuCWFbMkzFRVafOyJx4g=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.2.tgz"; + sha512 = "PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q=="; }; }; "@babel/preset-modules-0.1.5" = { @@ -895,22 +904,22 @@ let sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; }; }; - "@babel/traverse-7.17.10" = { + "@babel/traverse-7.18.2" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.17.10"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz"; - sha512 = "VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.2.tgz"; + sha512 = "9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA=="; }; }; - "@babel/types-7.17.10" = { + "@babel/types-7.18.2" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.17.10"; + version = "7.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz"; - sha512 = "9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.18.2.tgz"; + sha512 = "0On6B8A4/+mFUto5WERt3EEuG1NznDirvwca1O8UwXQHVY8g3R7OzYgxXdOfMwLO08UrpUD/2+3Bclyq+/C94Q=="; }; }; "@discoveryjs/json-ext-0.5.5" = { @@ -922,13 +931,13 @@ let sha512 = "6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA=="; }; }; - "@eslint/eslintrc-1.2.3" = { + "@eslint/eslintrc-1.3.0" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.2.3"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.3.tgz"; - sha512 = "uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz"; + sha512 = "UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw=="; }; }; "@fortawesome/fontawesome-common-types-0.3.0" = { @@ -1003,13 +1012,13 @@ let sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; }; }; - "@jridgewell/gen-mapping-0.1.1" = { + "@jridgewell/gen-mapping-0.3.1" = { name = "_at_jridgewell_slash_gen-mapping"; packageName = "@jridgewell/gen-mapping"; - version = "0.1.1"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; - sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz"; + sha512 = "GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg=="; }; }; "@jridgewell/resolve-uri-3.0.5" = { @@ -1021,13 +1030,13 @@ let sha512 = "VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew=="; }; }; - "@jridgewell/set-array-1.1.0" = { + "@jridgewell/set-array-1.1.1" = { name = "_at_jridgewell_slash_set-array"; packageName = "@jridgewell/set-array"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.0.tgz"; - sha512 = "SfJxIxNVYLTsKwzB3MoOQ1yxf4w/E6MdkvTgrgAt1bfxjSrLUoHMKrDOykwN14q65waezZIdqDneUIPh4/sKxg=="; + url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz"; + sha512 = "Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="; }; }; "@jridgewell/sourcemap-codec-1.4.11" = { @@ -1039,13 +1048,13 @@ let sha512 = "Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="; }; }; - "@jridgewell/trace-mapping-0.3.4" = { + "@jridgewell/trace-mapping-0.3.13" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.4"; + version = "0.3.13"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz"; - sha512 = "vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz"; + sha512 = "o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w=="; }; }; "@leichtgewicht/ip-codec-2.0.3" = { @@ -2704,13 +2713,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.15.0" = { + "eslint-8.16.0" = { name = "eslint"; packageName = "eslint"; - version = "8.15.0"; + version = "8.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.15.0.tgz"; - sha512 = "GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz"; + sha512 = "MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA=="; }; }; "eslint-config-airbnb-base-15.0.0" = { @@ -3271,22 +3280,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-13.12.0" = { + "globals-13.15.0" = { name = "globals"; packageName = "globals"; - version = "13.12.0"; + version = "13.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz"; - sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="; - }; - }; - "globals-13.13.0" = { - name = "globals"; - packageName = "globals"; - version = "13.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz"; - sha512 = "EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A=="; + url = "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz"; + sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; }; }; "globby-12.2.0" = { @@ -3532,13 +3532,13 @@ let sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; }; - "humanize-duration-3.27.1" = { + "humanize-duration-3.27.2" = { name = "humanize-duration"; packageName = "humanize-duration"; - version = "3.27.1"; + version = "3.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.1.tgz"; - sha512 = "jCVkMl+EaM80rrMrAPl96SGG4NRac53UyI1o/yAzebDntEY6K6/Fj2HOjdPg8omTqIe5Y0wPBai2q5xXrIbarA=="; + url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.2.tgz"; + sha512 = "A15OmA3FLFRnehvF4ZMocsxTZYvHq4ze7L+AgR1DeHw0xC9vMd4euInY83uqGU9/XXKNnVIEeKc1R8G8nKqtzg=="; }; }; "iconv-lite-0.4.24" = { @@ -5341,13 +5341,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.51.0" = { + "sass-1.52.1" = { name = "sass"; packageName = "sass"; - version = "1.51.0"; + version = "1.52.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.51.0.tgz"; - sha512 = "haGdpTgywJTvHC2b91GSq+clTKGbtkkZmVAb82jZQN/wTy6qs8DdFm2lhEQbEwrY0QDRgSQ3xDurqM977C3noA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.52.1.tgz"; + sha512 = "fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q=="; }; }; "sass-loader-12.6.0" = { @@ -6097,13 +6097,13 @@ let sha512 = "z5M7lJs0QluJnaoMFTIeGx6dIkYxOwHThlZDeQnWZBizKblb99GSejPnK37ZbNE/rVwDcYcHY+Io+AxdpY952w=="; }; }; - "vue-router-3.5.3" = { + "vue-router-3.5.4" = { name = "vue-router"; packageName = "vue-router"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz"; - sha512 = "FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg=="; + url = "https://registry.npmjs.org/vue-router/-/vue-router-3.5.4.tgz"; + sha512 = "x+/DLAJZv2mcQ7glH2oV9ze8uPwcI+H+GgTgTmb5I55bCgY3+vXWIsqbYUzbBSZnwFHEJku4eoaH/x98veyymQ=="; }; }; "vue-snotify-3.2.1" = { @@ -6205,13 +6205,13 @@ let sha512 = "81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg=="; }; }; - "webpack-dev-server-4.9.0" = { + "webpack-dev-server-4.9.1" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.9.0"; + version = "4.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.0.tgz"; - sha512 = "+Nlb39iQSOSsFv0lWUuUTim3jDQO8nhK3E68f//J2r5rIcp4lULHXz2oZ0UVdEeWXEh5lSzYUlzarZhDAeAVQw=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.1.tgz"; + sha512 = "CTMfu2UMdR/4OOZVHRpdy84pNopOuigVIsRbGX3LVDMWNP8EUgC5mUBMErbwBlHTEX99ejZJpVqrir6EXAEajA=="; }; }; "webpack-merge-5.8.0" = { @@ -6350,7 +6350,7 @@ let sources."@ampproject/remapping-2.1.1" sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.17.10" - (sources."@babel/core-7.17.10" // { + (sources."@babel/core-7.18.2" // { dependencies = [ sources."debug-4.3.4" sources."json5-2.2.1" @@ -6358,22 +6358,22 @@ let sources."semver-6.3.0" ]; }) - (sources."@babel/eslint-parser-7.17.0" // { + (sources."@babel/eslint-parser-7.18.2" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.17.10" + sources."@babel/generator-7.18.2" sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - (sources."@babel/helper-compilation-targets-7.17.10" // { + (sources."@babel/helper-compilation-targets-7.18.2" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.17.9" - sources."@babel/helper-create-regexp-features-plugin-7.17.0" + sources."@babel/helper-create-class-features-plugin-7.18.0" + sources."@babel/helper-create-regexp-features-plugin-7.17.12" (sources."@babel/helper-define-polyfill-provider-0.3.0" // { dependencies = [ sources."debug-4.3.3" @@ -6381,48 +6381,49 @@ let sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.16.7" + sources."@babel/helper-environment-visitor-7.18.2" sources."@babel/helper-explode-assignable-expression-7.16.7" sources."@babel/helper-function-name-7.17.9" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.17.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.17.7" + sources."@babel/helper-module-transforms-7.18.0" sources."@babel/helper-optimise-call-expression-7.16.7" - sources."@babel/helper-plugin-utils-7.16.7" + sources."@babel/helper-plugin-utils-7.17.12" sources."@babel/helper-remap-async-to-generator-7.16.8" sources."@babel/helper-replace-supers-7.16.7" - sources."@babel/helper-simple-access-7.17.7" + sources."@babel/helper-simple-access-7.18.2" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.17.9" + sources."@babel/helpers-7.18.2" sources."@babel/highlight-7.16.7" - sources."@babel/parser-7.17.10" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" - sources."@babel/plugin-proposal-async-generator-functions-7.16.8" - sources."@babel/plugin-proposal-class-properties-7.16.7" - sources."@babel/plugin-proposal-class-static-block-7.17.6" + sources."@babel/parser-7.18.0" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12" + sources."@babel/plugin-proposal-async-generator-functions-7.17.12" + sources."@babel/plugin-proposal-class-properties-7.17.12" + sources."@babel/plugin-proposal-class-static-block-7.18.0" sources."@babel/plugin-proposal-dynamic-import-7.16.7" - sources."@babel/plugin-proposal-export-namespace-from-7.16.7" - sources."@babel/plugin-proposal-json-strings-7.16.7" - sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" + sources."@babel/plugin-proposal-export-namespace-from-7.17.12" + sources."@babel/plugin-proposal-json-strings-7.17.12" + sources."@babel/plugin-proposal-logical-assignment-operators-7.17.12" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.17.12" sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-object-rest-spread-7.17.3" + sources."@babel/plugin-proposal-object-rest-spread-7.18.0" sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" - sources."@babel/plugin-proposal-optional-chaining-7.16.7" - sources."@babel/plugin-proposal-private-methods-7.16.11" - sources."@babel/plugin-proposal-private-property-in-object-7.16.7" - sources."@babel/plugin-proposal-unicode-property-regex-7.16.7" + sources."@babel/plugin-proposal-optional-chaining-7.17.12" + sources."@babel/plugin-proposal-private-methods-7.17.12" + sources."@babel/plugin-proposal-private-property-in-object-7.17.12" + sources."@babel/plugin-proposal-unicode-property-regex-7.17.12" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" + sources."@babel/plugin-syntax-import-assertions-7.17.12" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -6432,39 +6433,39 @@ let sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.16.7" - sources."@babel/plugin-transform-async-to-generator-7.16.8" + sources."@babel/plugin-transform-arrow-functions-7.17.12" + sources."@babel/plugin-transform-async-to-generator-7.17.12" sources."@babel/plugin-transform-block-scoped-functions-7.16.7" - sources."@babel/plugin-transform-block-scoping-7.16.7" - sources."@babel/plugin-transform-classes-7.16.7" - sources."@babel/plugin-transform-computed-properties-7.16.7" - sources."@babel/plugin-transform-destructuring-7.17.7" + sources."@babel/plugin-transform-block-scoping-7.17.12" + sources."@babel/plugin-transform-classes-7.17.12" + sources."@babel/plugin-transform-computed-properties-7.17.12" + sources."@babel/plugin-transform-destructuring-7.18.0" sources."@babel/plugin-transform-dotall-regex-7.16.7" - sources."@babel/plugin-transform-duplicate-keys-7.16.7" + sources."@babel/plugin-transform-duplicate-keys-7.17.12" sources."@babel/plugin-transform-exponentiation-operator-7.16.7" - sources."@babel/plugin-transform-for-of-7.16.7" + sources."@babel/plugin-transform-for-of-7.18.1" sources."@babel/plugin-transform-function-name-7.16.7" - sources."@babel/plugin-transform-literals-7.16.7" + sources."@babel/plugin-transform-literals-7.17.12" sources."@babel/plugin-transform-member-expression-literals-7.16.7" - sources."@babel/plugin-transform-modules-amd-7.16.7" - sources."@babel/plugin-transform-modules-commonjs-7.17.9" - sources."@babel/plugin-transform-modules-systemjs-7.17.8" - sources."@babel/plugin-transform-modules-umd-7.16.7" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.17.10" - sources."@babel/plugin-transform-new-target-7.16.7" + sources."@babel/plugin-transform-modules-amd-7.18.0" + sources."@babel/plugin-transform-modules-commonjs-7.18.2" + sources."@babel/plugin-transform-modules-systemjs-7.18.0" + sources."@babel/plugin-transform-modules-umd-7.18.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.17.12" + sources."@babel/plugin-transform-new-target-7.17.12" sources."@babel/plugin-transform-object-super-7.16.7" - sources."@babel/plugin-transform-parameters-7.16.7" + sources."@babel/plugin-transform-parameters-7.17.12" sources."@babel/plugin-transform-property-literals-7.16.7" - sources."@babel/plugin-transform-regenerator-7.17.9" - sources."@babel/plugin-transform-reserved-words-7.16.7" + sources."@babel/plugin-transform-regenerator-7.18.0" + sources."@babel/plugin-transform-reserved-words-7.17.12" sources."@babel/plugin-transform-shorthand-properties-7.16.7" - sources."@babel/plugin-transform-spread-7.16.7" + sources."@babel/plugin-transform-spread-7.17.12" sources."@babel/plugin-transform-sticky-regex-7.16.7" - sources."@babel/plugin-transform-template-literals-7.16.7" - sources."@babel/plugin-transform-typeof-symbol-7.16.7" + sources."@babel/plugin-transform-template-literals-7.18.2" + sources."@babel/plugin-transform-typeof-symbol-7.17.12" sources."@babel/plugin-transform-unicode-escapes-7.16.7" sources."@babel/plugin-transform-unicode-regex-7.16.7" - (sources."@babel/preset-env-7.17.10" // { + (sources."@babel/preset-env-7.18.2" // { dependencies = [ sources."semver-6.3.0" ]; @@ -6472,20 +6473,20 @@ let sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.14.6" sources."@babel/template-7.16.7" - (sources."@babel/traverse-7.17.10" // { + (sources."@babel/traverse-7.18.2" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.17.10" + sources."@babel/types-7.18.2" sources."@discoveryjs/json-ext-0.5.5" - (sources."@eslint/eslintrc-1.2.3" // { + (sources."@eslint/eslintrc-1.3.0" // { dependencies = [ sources."debug-4.3.3" sources."eslint-visitor-keys-3.3.0" sources."espree-9.3.2" - sources."globals-13.12.0" + sources."globals-13.15.0" sources."ms-2.1.2" ]; }) @@ -6509,11 +6510,11 @@ let ]; }) sources."@humanwhocodes/object-schema-1.2.1" - sources."@jridgewell/gen-mapping-0.1.1" + sources."@jridgewell/gen-mapping-0.3.1" sources."@jridgewell/resolve-uri-3.0.5" - sources."@jridgewell/set-array-1.1.0" + sources."@jridgewell/set-array-1.1.1" sources."@jridgewell/sourcemap-codec-1.4.11" - sources."@jridgewell/trace-mapping-0.3.4" + sources."@jridgewell/trace-mapping-0.3.13" sources."@leichtgewicht/ip-codec-2.0.3" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" @@ -6759,7 +6760,7 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.15.0" // { + (sources."eslint-8.16.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6777,7 +6778,7 @@ let sources."espree-9.3.2" sources."estraverse-5.3.0" sources."glob-parent-6.0.2" - sources."globals-13.13.0" + sources."globals-13.15.0" sources."has-flag-4.0.0" sources."ms-2.1.2" sources."supports-color-7.2.0" @@ -6951,7 +6952,7 @@ let sources."http-proxy-1.18.1" sources."http-proxy-middleware-2.0.4" sources."human-signals-2.1.0" - sources."humanize-duration-3.27.1" + sources."humanize-duration-3.27.2" sources."iconv-lite-0.4.24" sources."icss-utils-5.1.0" sources."ignore-5.2.0" @@ -7202,7 +7203,7 @@ let sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sass-1.51.0" + sources."sass-1.52.1" sources."sass-loader-12.6.0" sources."schema-utils-3.1.1" sources."select-hose-2.0.0" @@ -7336,7 +7337,7 @@ let sources."vue-meta-2.4.0" sources."vue-multiselect-2.1.6" sources."vue-resize-1.0.1" - sources."vue-router-3.5.3" + sources."vue-router-3.5.4" sources."vue-snotify-3.2.1" sources."vue-style-loader-4.1.3" sources."vue-template-compiler-2.6.14" @@ -7370,7 +7371,7 @@ let sources."schema-utils-4.0.0" ]; }) - (sources."webpack-dev-server-4.9.0" // { + (sources."webpack-dev-server-4.9.1" // { dependencies = [ sources."ajv-8.11.0" sources."ajv-keywords-5.1.0" From f88db0ef449440151c9698dbbde2c36e1e930d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 23:30:08 +0200 Subject: [PATCH 053/117] python310Packages.pyaxmlparser: 0.3.26 -> 0.3.27 --- pkgs/development/python-modules/pyaxmlparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index 961b00e15332..12c4851e3470 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -1,14 +1,14 @@ { buildPythonPackage, lib, lxml, click, fetchFromGitHub, pytestCheckHook, asn1crypto }: buildPythonPackage rec { - version = "0.3.26"; + version = "0.3.27"; pname = "pyaxmlparser"; src = fetchFromGitHub { owner = "appknox"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wD0rN00q4ipKnKubptrgrjNwkBpqsA+ix2xedOOr8Yg="; + sha256 = "sha256-NtAsO/I1jDEv676yhAgLguQnB/kHdAqPoLt2QFWbvmw="; }; propagatedBuildInputs = [ asn1crypto click lxml ]; From fbaef9d855e98cfbb5829f2f36aa7f0ca2d3eb8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 1 Jun 2022 23:37:49 +0200 Subject: [PATCH 054/117] python310Packages.python-magic: 0.4.25 -> 0.4.26 --- .../python-modules/python-magic/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index a9fa50a11c69..852b66b44e5f 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -5,18 +5,18 @@ , fetchFromGitHub , substituteAll , file -, glibcLocales +, pytestCheckHook }: buildPythonPackage rec { pname = "python-magic"; - version = "0.4.25"; + version = "0.4.26"; src = fetchFromGitHub { owner = "ahupp"; repo = "python-magic"; rev = version; - sha256 = "sha256-h7YQVH5Z7zunT6AdLPBh3TWpxLpZ5unSHDhkVDFOWDI="; + sha256 = "sha256-RcKldMwSRroNZNEl0jwuJG9C+3OIPBzk+CjqkxKK/eY="; }; patches = [ @@ -26,12 +26,14 @@ buildPythonPackage rec { }) ]; - checkInputs = [ glibcLocales ]; - - checkPhase = '' - LC_ALL="en_US.UTF-8" ${python.interpreter} test/test.py + preCheck = '' + export LC_ALL=en_US.UTF-8 ''; + checkInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "A python interface to the libmagic file type identification library"; homepage = "https://github.com/ahupp/python-magic"; From 1622a6cdeb22f92b6875ee00c1ef03e6a5486335 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Wed, 1 Jun 2022 18:30:05 -0400 Subject: [PATCH 055/117] mono: be more precise in flagging broken builds --- pkgs/development/compilers/mono/generic.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 7083945e73ab..e79a06cae7f5 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -76,7 +76,9 @@ stdenv.mkDerivation rec { inherit enableParallelBuilding; meta = with lib; { - broken = stdenv.isDarwin; + # Per nixpkgs#151720 the build failures for aarch64-darwin are fixed upstream, but a + # stable release with the fix is not available yet. + broken = stdenv.isDarwin && stdenv.isAarch64 && lib.versionOlder version "6.12.0.129"; homepage = "https://mono-project.com/"; description = "Cross platform, open source .NET development framework"; platforms = with platforms; darwin ++ linux; From 9ce157afc89e8a146d1cb5581db5a6c2bd1a51cf Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Wed, 1 Jun 2022 18:30:17 -0400 Subject: [PATCH 056/117] mono: fix broken mono4 build on Darwin --- pkgs/development/compilers/mono/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/mono/4.nix b/pkgs/development/compilers/mono/4.nix index 02c6177c9df0..0b283d4f1778 100644 --- a/pkgs/development/compilers/mono/4.nix +++ b/pkgs/development/compilers/mono/4.nix @@ -1,9 +1,9 @@ -{ callPackage, Foundation, libobjc }: +{ callPackage, Foundation, libobjc, stdenv, lib }: callPackage ./generic.nix ({ inherit Foundation libobjc; version = "4.8.1.0"; sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq"; enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645 - extraPatches = [ ./mono4-glibc.patch ]; + extraPatches = lib.optionals stdenv.isLinux [ ./mono4-glibc.patch ]; }) From cabf369f833af817f19b8ae11f15b91aed2121f3 Mon Sep 17 00:00:00 2001 From: colin Date: Wed, 1 Jun 2022 15:43:14 -0700 Subject: [PATCH 057/117] phosh: allow fractional scaling --- nixos/modules/services/x11/desktop-managers/phosh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix index 4bf78fa16e7d..68402ed160bd 100644 --- a/nixos/modules/services/x11/desktop-managers/phosh.nix +++ b/nixos/modules/services/x11/desktop-managers/phosh.nix @@ -78,7 +78,7 @@ let description = '' Display scaling factor. ''; - type = types.nullOr types.ints.unsigned; + type = types.nullOr (types.either types.ints.unsigned types.float); default = null; example = 2; }; From 9ea5e3d040cb693f11d7423fdeb2701ad6c8c0af Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 2 Jun 2022 06:28:58 +0000 Subject: [PATCH 058/117] podman-tui: 0.3.1 -> 0.4.0 --- .../virtualization/podman-tui/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix index bfd6ba4135b3..6b563dc8b8e5 100644 --- a/pkgs/applications/virtualization/podman-tui/default.nix +++ b/pkgs/applications/virtualization/podman-tui/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , pkg-config , fetchFromGitHub , buildGoModule @@ -11,25 +12,21 @@ }: buildGoModule rec { pname = "podman-tui"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - sha256 = "sha256-Xc6F87evQiv4jRbxxRBzJBeI8653HvlQL+UwcVWY0wk="; + sha256 = "sha256-2WugN5JdTkz3OOt3ggzT7HwMXy1jxn85RwF7409D8m8="; }; vendorSha256 = null; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - btrfs-progs - gpgme - libassuan - lvm2 - ]; + buildInputs = [ gpgme libassuan ] + ++ lib.optionals stdenv.isLinux [ btrfs-progs lvm2 ]; ldflags = [ "-s" "-w" ]; @@ -44,6 +41,5 @@ buildGoModule rec { description = "Podman Terminal UI"; license = licenses.asl20; maintainers = with maintainers; [ aaronjheng ]; - platforms = platforms.linux; }; } From 422838f261171c1682120aa654e088564a09c500 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jun 2022 07:41:44 +0000 Subject: [PATCH 059/117] python310Packages.hahomematic: 1.7.2 -> 1.7.3 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index f39e62da0dca..dd41845129b3 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.7.2"; + version = "1.7.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-lLv3DrBPxw5M903ehKMYqsbBicmXcVS2v7P7FgTNkSQ="; + sha256 = "sha256-p1eVlOJQok8Wh9mld6EB2mtAGv97jQ9nf46SqPK8zVs="; }; propagatedBuildInputs = [ From d4ee686fbf058ef9debe374e56e40e2c62ae3d83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jun 2022 07:53:59 +0000 Subject: [PATCH 060/117] python310Packages.google-cloud-bigtable: 2.8.1 -> 2.10.0 --- .../python-modules/google-cloud-bigtable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 1fbe806db3c4..baa6957c35ab 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.8.1"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Gy/CS06uGQyQoPLjm8ChR6MkO6CYkpC/n5wM/VncDDs="; + hash = "sha256-nicUpEaPhDBmWU2jP/R01d54xu9tgNUxZVD4gZGAyAw="; }; propagatedBuildInputs = [ From dbb9d9ab296d66200654634fa301f2332a522e80 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Apr 2022 12:38:25 +0200 Subject: [PATCH 061/117] python310Packages.statmake: relax cattrs constaint - disable failing tests - add pythonImportsCheck - update inputs --- .../python-modules/statmake/default.nix | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/statmake/default.nix b/pkgs/development/python-modules/statmake/default.nix index 7de42d5bc945..13187285db31 100644 --- a/pkgs/development/python-modules/statmake/default.nix +++ b/pkgs/development/python-modules/statmake/default.nix @@ -1,12 +1,14 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, poetry-core , attrs +, buildPythonPackage , cattrs +, fetchFromGitHub , fonttools , fs +, importlib-metadata +, poetry-core , pytestCheckHook +, pythonOlder , ufo2ft , ufoLib2 }: @@ -14,14 +16,15 @@ buildPythonPackage rec { pname = "statmake"; version = "0.4.1"; - format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "daltonmaag"; - repo = "statmake"; + repo = pname; rev = "v${version}"; - sha256 = "OXhoQAD4LEh80iRUZE2z8sCtWJDv/bSo0bwHbOOPVE0="; + sha256 = "sha256-OXhoQAD4LEh80iRUZE2z8sCtWJDv/bSo0bwHbOOPVE0="; }; nativeBuildInputs = [ @@ -34,6 +37,8 @@ buildPythonPackage rec { fonttools # required by fonttools[ufo] fs + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; checkInputs = [ @@ -46,9 +51,21 @@ buildPythonPackage rec { # https://github.com/daltonmaag/statmake/pull/41 substituteInPlace pyproject.toml \ --replace 'requires = ["poetry>=1.0.0"]' 'requires = ["poetry-core"]' \ - --replace 'build-backend = "poetry.masonry.api"' 'build-backend = "poetry.core.masonry.api"' + --replace 'build-backend = "poetry.masonry.api"' 'build-backend = "poetry.core.masonry.api"' \ + --replace 'cattrs = "^1.1"' 'cattrs = ">= 1.1"' ''; + disabledTests = [ + # cattrs.errors.IterableValidationError: While structuring typing.List[statmake.classes.Axis] + # https://github.com/daltonmaag/statmake/issues/42 + "test_load_stylespace_broken_range" + "test_load_stylespace_broken_multilingual_no_en" + ]; + + pythonImportsCheck = [ + "statmake" + ]; + meta = with lib; { description = "Applies STAT information from a Stylespace to a variable font"; homepage = "https://github.com/daltonmaag/statmake"; From 95fc12d1b1ad564969a2624bce2d1a60dbbae900 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Jun 2022 10:06:26 +0200 Subject: [PATCH 062/117] python310Packages.adafruit-platformdetect: 3.23.0 -> 3.24.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index a976c3de1b02..918a37e3b313 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.23.0"; + version = "3.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-4OWDwvdQBtV+ZqpITr027z0jwfge5/yOof9Xm7QRtuM="; + hash = "sha256-XeaRtdw23mNJ+kgSthGRhq4PCGAwTjpjVyNlNRshoQg="; }; nativeBuildInputs = [ From e5b836ac81450a7653a5e9f30093a853c686d755 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Jun 2022 10:10:45 +0200 Subject: [PATCH 063/117] python310Packages.aiopyarr: 22.2.2 -> 22.6.0 --- pkgs/development/python-modules/aiopyarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix index b1618081b878..b3789c291f70 100644 --- a/pkgs/development/python-modules/aiopyarr/default.nix +++ b/pkgs/development/python-modules/aiopyarr/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiopyarr"; - version = "22.2.2"; + version = "22.6.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - hash = "sha256-gkiUPznAJ5nkrdbDKAvODsf6UStsxFugCfkZ0fCJkng="; + hash = "sha256-LfZEM1vPccQBrvNz9CGVlihg6YAB7FAvUZogu/ngZ4Y="; }; propagatedBuildInputs = [ From 7df93e3e1cb7c774d9ba97d92730c70d0e6135eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jun 2022 08:26:51 +0000 Subject: [PATCH 064/117] python310Packages.pytest-testmon: 1.3.1 -> 1.3.3 --- pkgs/development/python-modules/pytest-testmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 0f8d09e597d2..667927bfe105 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.3.1"; + version = "1.3.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6gWWCtm/GHknhjLyRdVf42koeaSKzk5/V0173DELmj0="; + sha256 = "sha256-Csg5wIm9+ZdAQYdZozlx09rMaVz3GazeS5Z/f4jRECw="; }; propagatedBuildInputs = [ pytest coverage ]; From 45e44285c366a2e691a3e04ab66bc5415409acbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jun 2022 08:32:44 +0000 Subject: [PATCH 065/117] python310Packages.twilio: 7.9.1 -> 7.9.2 --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 75549030f6eb..fb11b1f63c6d 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.9.1"; + version = "7.9.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-oi8LqyeqN8gn06B/m1wNI9iNu7hU3NrdkL7xTsImYPI="; + hash = "sha256-JFCYHiPvKYveHYf6SWkmovuvas5+9IGpsnQWqVIaTto="; }; propagatedBuildInputs = [ From 58aef42768cb7c72b1da9f6ef1367fbcca52d88f Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 2 Jun 2022 14:11:27 +0530 Subject: [PATCH 066/117] fclones: 0.24.0 -> 0.25.0 --- pkgs/tools/misc/fclones/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 09ace554d7be..1f7bab8cb969 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yiOoknhKGRGUgZShz9gGOsaX1+IOr23UFviIx/Uva6M="; + sha256 = "sha256-7MNVLfBH6hWoNy+UQzK6gwZuPbBPMfG660my+E6FT5Q="; }; - cargoSha256 = "sha256-CEfFCYUmFv1cG2DEAfgK+wr3UTgFMZlEQVqUaWnqzdk="; + cargoSha256 = "sha256-8Ur3KwGuIY8QAGNTcyTpFg2C1CBcIpZJp6EO9g8XuE8="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit From 1d0649f9296d909b7bcc83a3b36558a18177e5e3 Mon Sep 17 00:00:00 2001 From: colin Date: Thu, 2 Jun 2022 01:40:43 -0700 Subject: [PATCH 067/117] phosh: restrict the `scale` config value to strictly positive values or null --- nixos/modules/services/x11/desktop-managers/phosh.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix index 68402ed160bd..5efe645d8aa2 100644 --- a/nixos/modules/services/x11/desktop-managers/phosh.nix +++ b/nixos/modules/services/x11/desktop-managers/phosh.nix @@ -78,7 +78,13 @@ let description = '' Display scaling factor. ''; - type = types.nullOr (types.either types.ints.unsigned types.float); + type = types.nullOr ( + types.addCheck + (types.either types.int types.float) + (x : x > 0) + ) // { + description = "null or positive integer or float"; + }; default = null; example = 2; }; From 31194524277dbba788123cf926348c2a85385178 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Thu, 2 Jun 2022 09:47:23 +0100 Subject: [PATCH 068/117] ocamlformat: remove unnecessary version check --- pkgs/development/tools/ocaml/ocamlformat/generic.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index cf04df5a7884..97cc9699920b 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -4,11 +4,7 @@ }: let src = - if version == "0.11.0" - then fetchzip { - url = "https://github.com/ocaml-ppx/ocamlformat/archive/0.11.0.tar.gz"; - sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx"; - } else fetchurl { + fetchurl { url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}"; sha256 = { "0.19.0" = "0ihgwl7d489g938m1jvgx8azdgq9f5np5mzqwwya797hx2m4dz32"; From a142ecae78e994db1aac9573b165198deb7c9a7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jun 2022 08:59:56 +0000 Subject: [PATCH 069/117] python310Packages.scmrepo: 0.0.23 -> 0.0.24 --- pkgs/development/python-modules/scmrepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 984491be9be9..2443c68c1e76 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.0.23"; + version = "0.0.24"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Yg08twcxXKtDlkOxmD5eafeaeij4zX/3XQQQN948xxs="; + hash = "sha256-S1jeLls0do9sCqTWe8h8+8CO3oM160J97UmISUhTU/s="; }; propagatedBuildInputs = [ From fcea400842318d833e39e3be2e45d0a7447681a8 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Mon, 28 Feb 2022 13:00:29 +0100 Subject: [PATCH 070/117] citrix_workspace: 21.12.0 -> 22.05.0 --- .../networking/remote/citrix-workspace/sources.nix | 13 ++++++++++++- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 12bda3f98ad4..80df15785aa1 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -120,7 +120,7 @@ let x86hash = "c646c52889e88aa0bb051070076763d5407f21fb6ad6dfcb0fe635ac01180c51"; x64suffix = "25"; x86suffix = "25"; - homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2109.html"; }; "21.12.0" = { @@ -131,6 +131,17 @@ let x86hash = "3746cdbe26727f7f6fb85fbe5f3e6df0322d79bb66e3a70158b22cb4f6b6b292"; x64suffix = "18"; x86suffix = "18"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2112.html"; + }; + + "22.05.0" = { + major = "22"; + minor = "5"; + patch = "0"; + x64hash = "49786fd3b5361b1f42b7bb0e36572a209e95acb1335737da5216345b6420f053"; + x86hash = "f2dc1fd64e5314b62ba87f384958c2bbd48b06b55bed10345cddb05fdc8cffa1"; + x64suffix = "16"; + x86suffix = "16"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c03ac3d468..1011b8a02566 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4635,7 +4635,7 @@ with pkgs; circus = callPackage ../tools/networking/circus { }; - citrix_workspace = citrix_workspace_21_12_0; + citrix_workspace = citrix_workspace_22_05_0; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_20_04_0 @@ -4649,6 +4649,7 @@ with pkgs; citrix_workspace_21_08_0 citrix_workspace_21_09_0 citrix_workspace_21_12_0 + citrix_workspace_22_05_0 ; cmigemo = callPackage ../tools/text/cmigemo { }; From 8235de6d5c9ef0d904a9fc8c20e017fd7db7092b Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Thu, 2 Jun 2022 11:06:47 +0200 Subject: [PATCH 071/117] citrix_workspace: added myself as maintainer --- .../applications/networking/remote/citrix-workspace/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index bfd9e402f956..1ecf805944e2 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -207,7 +207,7 @@ stdenv.mkDerivation rec { license = licenses.unfree; description = "Citrix Workspace"; platforms = platforms.linux; - maintainers = with maintainers; [ pmenke ]; + maintainers = with maintainers; [ pmenke michaeladler ]; inherit homepage; }; } From 75a6c931cbc063922c8f295438ef401902cd9e9b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Jun 2022 11:18:28 +0200 Subject: [PATCH 072/117] checkov: 2.0.1175 -> 2.0.1186 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 0235d35aab73..b8c1e301f53e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,14 +32,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1175"; + version = "2.0.1186"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-nLh00DaSpKT6rngiXKa6z0+Ouu1/hMWzIYa54PHPD1k="; + hash = "sha256-5EFB/BgSJny3AdgtgsmIszcM5Wum/dtdmmP/40/sH0Y="; }; nativeBuildInputs = with py.pkgs; [ From b6307446af0cce4e8a23669959b0b8820b21ae7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Jun 2022 11:30:46 +0200 Subject: [PATCH 073/117] python310Packages.types-requests: 2.27.29 -> 2.27.30 --- pkgs/development/python-modules/types-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index c908eade2059..4af9b4a42ab3 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.27.29"; + version = "2.27.30"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+0U7OnakjspmOBzqgAT+quoSg16DgZb1x6yHx1xcGe8="; + sha256 = "sha256-yo18xUnD0Q28s8acG1Pj/9EnAInBABplwenhAX615wQ="; }; propagatedBuildInputs = [ From 29696267a9ccd856cb8d9828f0737adeda2869ea Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Thu, 2 Jun 2022 11:42:07 +0300 Subject: [PATCH 074/117] swaynag-battery: init at version `0.2.0` --- .../misc/swaynag-battery/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/misc/swaynag-battery/default.nix diff --git a/pkgs/applications/misc/swaynag-battery/default.nix b/pkgs/applications/misc/swaynag-battery/default.nix new file mode 100644 index 000000000000..546b365b3684 --- /dev/null +++ b/pkgs/applications/misc/swaynag-battery/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "swaynag-battery"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "m00qek"; + repo = "swaynag-battery"; + rev = "v${version}"; + hash = "sha256-7f9+4Fzw5B5ATuud4MJC3iyuNRTx6kwJ7/KsusGtQM8="; + }; + + vendorSha256 = "h9Zj3zmQ0Xpili5Pl6CXh1L0bb2uL1//B79I4/ron08="; + + meta = with lib; { + homepage = "https://github.com/m00qek/swaynag-battery"; + description = "Shows a message when your battery is discharging "; + maintainers = with maintainers; [ asbachb ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c8f5d232fc7..a2a593f0b897 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27205,6 +27205,8 @@ with pkgs; swaynotificationcenter = callPackage ../applications/misc/swaynotificationcenter { }; + swaynag-battery = callPackage ../applications/misc/swaynag-battery {}; + tiramisu = callPackage ../applications/misc/tiramisu { }; rootbar = callPackage ../applications/misc/rootbar {}; From a833aefc2a94b2550e076ced9132b9b7b17df0e8 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 2 Jun 2022 10:09:10 +0000 Subject: [PATCH 075/117] buf: 1.4.0 -> 1.5.0 --- pkgs/development/tools/buf/default.nix | 14 +++++--------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 746233fb0dee..8fcc8bad2269 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cKb9pZYEsO1thgtl/8XFJHpNrO6P3OR8Lox/Gf9ccYk="; + sha256 = "sha256-Jcj1tpcG64mSVn444isGsK9AcITh171ibECukv3bXDI="; }; - vendorSha256 = "sha256-zXLvKEdiIFnmwWQBgbJHCEBe2i7FobgeUOnA3LvHl8w="; + vendorSha256 = "sha256-aHGV8UfPn7xsySPXRSzsEpcaz1Ll49Mj1S9izvaIRWY="; patches = [ # Skip a test that requires networking to be available to work. @@ -48,13 +48,9 @@ buildGoModule rec { runHook preInstall # Binaries - mkdir -p "$out/bin" # Only install required binaries, don't install testing binaries - for FILE in \ - "buf" \ - "protoc-gen-buf-breaking" \ - "protoc-gen-buf-lint"; do - cp "$GOPATH/bin/$FILE" "$out/bin/" + for FILE in buf protoc-gen-buf-breaking protoc-gen-buf-lint; do + install -D -m 555 -t $out/bin $GOPATH/bin/$FILE done # Completions diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c03ac3d468..37af1dcf3d59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -262,7 +262,9 @@ with pkgs; breakpad = callPackage ../development/misc/breakpad { }; - buf = callPackage ../development/tools/buf { }; + buf = callPackage ../development/tools/buf { + buildGoModule = buildGo118Module; + }; cfn-nag = callPackage ../development/tools/cfn-nag { }; From 1a729fc8308455609c8c79543b7b8736430a621b Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Thu, 2 Jun 2022 12:19:28 +0200 Subject: [PATCH 076/117] citrix_workspace: drop support for 20.X --- .../remote/citrix-workspace/sources.nix | 55 ------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 60 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 80df15785aa1..5e1b831f73b1 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -13,61 +13,6 @@ let # # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/ supportedVersions = lib.mapAttrs mkVersionInfo { - "20.04.0" = { - major = "20"; - minor = "04"; - patch = "0"; - x64hash = "E923592216F9541173846F932784E6C062CB09C9E8858219C7489607BF82A0FB"; - x86hash = "A2E2E1882723DA6796E68916B3BB2B44DD575A83DEB03CA90A262F6C81B1A53F"; - x64suffix = "21"; - x86suffix = "21"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2004.html"; - }; - - "20.06.0" = { - major = "20"; - minor = "06"; - patch = "0"; - x64hash = "1kpfcfg95mpprlca6cccnjlsqbj3xvv77cn3fc5msd304nsi9x1v"; - x86hash = "1di29hrimbw3myjnf2nn26a14klidhdwvjqla6yxhwd3s6lil194"; - x64suffix = "15"; - x86suffix = "15"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2006.html"; - }; - - "20.09.0" = { - major = "20"; - minor = "9"; - patch = "0"; - x64hash = "15gjq1vk1y76c39p72xnam9h9rnr0632i4n11l6xbjnfnad8d4pr"; - x86hash = "1b4gdmnnpa61ydiv2fnmap8cnfhskrq6swcs6i1nqrp5zvvkqrv4"; - x64suffix = "15"; - x86suffix = "15"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2009.html"; - }; - - "20.10.0" = { - major = "20"; - minor = "10"; - patch = "0"; - x64hash = "13g7r92mhwqwqkm6a4k4yn232ighkmxifs7j8wdi1yva0dvklqdf"; - x86hash = "04cr2da25v8x098ccyjwa47d4krk3jpldqkyf4kk2j3hwzbqh9yx"; - x64suffix = "6"; - x86suffix = "6"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2010.html"; - }; - - "20.12.0" = { - major = "20"; - minor = "12"; - patch = "0"; - x64hash = "1268nriqjp27nxqqi4dvkv8r01yj3bhglxv21xd185761da2mzry"; - x86hash = "0f982d5y9k4hscqfmqpfs277cqw1pvp191ybvg5p8rxk12fh67vf"; - x64suffix = "12"; - x86suffix = "12"; - homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-2012.html"; - }; - "21.01.0" = { major = "21"; minor = "1"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1011b8a02566..dfc657537f49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4638,11 +4638,6 @@ with pkgs; citrix_workspace = citrix_workspace_22_05_0; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) - citrix_workspace_20_04_0 - citrix_workspace_20_06_0 - citrix_workspace_20_09_0 - citrix_workspace_20_10_0 - citrix_workspace_20_12_0 citrix_workspace_21_01_0 citrix_workspace_21_03_0 citrix_workspace_21_06_0 From 6b825503333268f04a57e7e8ba79cddb501bfdac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 2 Jun 2022 12:20:51 +0200 Subject: [PATCH 077/117] pgadmin: unpin eventlet dependency, cleanup --- pkgs/tools/admin/pgadmin/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 276cbbbf8767..ccc046ba6293 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -9,7 +9,6 @@ }: let - pname = "pgadmin"; version = "6.9"; @@ -112,12 +111,17 @@ pythonPackages.buildPythonApplication rec { postPatch = '' # patching Makefile, so it doesn't try to build sphinx documentation here # (will do so later) - substituteInPlace Makefile --replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true" + substituteInPlace Makefile \ + --replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true" + # fix document which refers a non-existing document and fails - substituteInPlace docs/en_US/contributions.rst --replace "code_snippets" "" + substituteInPlace docs/en_US/contributions.rst \ + --replace "code_snippets" "" patchShebangs . + # relax dependencies substituteInPlace requirements.txt \ + --replace "eventlet==0.33.0" "eventlet>=0.33.0" \ --replace "psycopg2==2.9.*" "psycopg2>=2.9" \ --replace "cryptography==3.*" "cryptography>=3.0" \ --replace "requests==2.25.*" "requests>=2.25.0" \ @@ -188,7 +192,7 @@ pythonPackages.buildPythonApplication rec { passthru.tests = { standalone = nixosTests.pgadmin4-standalone; # regression and function tests of the package itself - package = (import ../../../../nixos/tests/pgadmin4.nix ({ inherit pkgs; buildDeps = buildDeps; pythonEnv = pythonPackages; })); + package = import ../../../../nixos/tests/pgadmin4.nix { inherit pkgs buildDeps; pythonEnv = pythonPackages; }; }; meta = with lib; { From bb70f2587ba4ea1d239aa1b22e12435037bcd6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 2 Jun 2022 13:04:41 +0200 Subject: [PATCH 078/117] python310Packages.selenium: cleanup --- pkgs/development/python-modules/selenium/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 7a1d1439c1f7..e606819159c0 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -9,7 +9,6 @@ , nixosTests }: - let # Recompiling x_ignore_nofocus.so as the original one dlopen's libX11.so.6 by some # absolute paths. Replaced by relative path so it is found when used in nix. @@ -31,15 +30,15 @@ buildPythonPackage rec { sha256 = "039hf9knvl4s3hp21bzwsp1g5ri9gxsh504dp48lc6nr1av35byy"; }; - buildInputs = [xorg.libX11]; + buildInputs = [ xorg.libX11 ]; propagatedBuildInputs = [ geckodriver urllib3 ]; - patchPhase = lib.optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.isLinux '' cp "${x_ignore_nofocus}/cpp/linux-specific/"* . - substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${xorg.libX11.out}/lib/libX11.so.6" + substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${lib.getLib xorg.libX11}/lib/libX11.so.6" cc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o cc -shared \ -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \ From db228fed78133ae3c7078772b43267c803702d5e Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 13 May 2022 20:59:12 +0400 Subject: [PATCH 079/117] gimp: add pygtk dev output to build inputs --- pkgs/applications/graphics/gimp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 55c95c95cf73..cefba7ff7747 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -115,6 +115,8 @@ in stdenv.mkDerivation rec { libwebp libheif python + # Duplicated here because python.withPackages does not expose the dev output with pkg-config files + python2.pkgs.pygtk libexif xorg.libXpm glib-networking From 1be67172269238fd5d3491d2ac6c29d3a22ab66a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jun 2022 11:49:03 +0000 Subject: [PATCH 080/117] python310Packages.asyncstdlib: 3.10.4 -> 3.10.5 --- pkgs/development/python-modules/asyncstdlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index 47cd54405f86..6a9d911f66bc 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.10.4"; + version = "3.10.5"; format = "flit"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "maxfischer2781"; repo = pname; - rev = "v${version}"; - hash = "sha256-zPWXI5iHMCkSVjyNRcXplTadobYCeMv3Unjt+QVF8D8="; + rev = "refs/tags/v${version}"; + hash = "sha256-ILb+iWg2xYWBEQY1a4jPITm4QCPO8qfVCPgO3YWIVAQ="; }; propagatedBuildInputs = [ From e50e5c05c3cca92180f7e4bbded23a0c6ac232cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Jun 2022 13:54:02 +0200 Subject: [PATCH 081/117] python310Packages.datadiff: 1.1.6 -> 2.0.0 --- .../python-modules/datadiff/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix index 4124457586cc..4b6338412673 100644 --- a/pkgs/development/python-modules/datadiff/default.nix +++ b/pkgs/development/python-modules/datadiff/default.nix @@ -1,25 +1,32 @@ { lib , buildPythonPackage , fetchPypi -, nose +, pythonOlder }: buildPythonPackage rec { pname = "datadiff"; - version = "1.1.6"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "f1402701063998f6a70609789aae8dc05703f3ad0a34882f6199653654c55543"; + hash = "sha256-VASUQKiW3lJH7i57eqVCX5OayDLDftshAfjTA26Jyqg="; }; - buildInputs = [ nose ]; + # Tests are not part of the PyPI releases + doCheck = false; + + pythonImportsCheck = [ + "datadiff" + ]; meta = with lib; { - description = "DataDiff"; + description = "Library to provide human-readable diffs of Python data structures"; homepage = "https://sourceforge.net/projects/datadiff/"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; - } From d955d8882939c37e6484512f58120a382d5e34f1 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 2 Jun 2022 11:56:55 +0000 Subject: [PATCH 082/117] goklp: remove --- pkgs/tools/networking/goklp/default.nix | 24 ----------- pkgs/tools/networking/goklp/deps.nix | 56 ------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 pkgs/tools/networking/goklp/default.nix delete mode 100644 pkgs/tools/networking/goklp/deps.nix diff --git a/pkgs/tools/networking/goklp/default.nix b/pkgs/tools/networking/goklp/default.nix deleted file mode 100644 index 10c5c8ea64fe..000000000000 --- a/pkgs/tools/networking/goklp/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "goklp"; - version = "1.6"; - - goPackagePath = "github.com/AppliedTrust/goklp"; - - src = fetchFromGitHub { - owner = "AppliedTrust"; - repo = "goklp"; - rev = "v${version}"; - sha256 = "054qmwfaih8qbvdyy4rqbb1ip3jpnm547n390hgab8yc3bdd840c"; - }; - - goDeps = ./deps.nix; - - meta = with lib; { - description = "Golang OpenSSH Keys Ldap Provider for AuthorizedKeysCommand"; - homepage = "https://github.com/AppliedTrust/goklp"; - maintainers = with maintainers; [ disassembler ]; - license = licenses.bsd2; - }; -} diff --git a/pkgs/tools/networking/goklp/deps.nix b/pkgs/tools/networking/goklp/deps.nix deleted file mode 100644 index 2f6481f237f8..000000000000 --- a/pkgs/tools/networking/goklp/deps.nix +++ /dev/null @@ -1,56 +0,0 @@ -[ - { - goPackagePath = "github.com/asaskevich/govalidator"; - fetch = { - type = "git"; - url = "https://github.com/asaskevich/govalidator"; - rev = "ca5f9e638c83bac66bfac70ded5bded1503135a7"; - sha256 = "0lk4irlf4a4q8qharwjxl71y1s2cf5bjpg9cv5jlyp574331pn1w"; - }; - } - { - goPackagePath = "github.com/docopt/docopt-go"; - fetch = { - type = "git"; - url = "https://github.com/docopt/docopt-go"; - rev = "784ddc588536785e7299f7272f39101f7faccc3f"; - sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; - }; - } - { - goPackagePath = "github.com/vaughan0/go-ini"; - fetch = { - type = "git"; - url = "https://github.com/vaughan0/go-ini"; - rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; - sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; - }; - } - { - goPackagePath = "gopkg.in/asn1-ber.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/asn1-ber.v1"; - rev = "379148ca0225df7a432012b8df0355c2a2063ac0"; - sha256 = "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx"; - }; - } - { - goPackagePath = "gopkg.in/ldap.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/ldap.v2"; - rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f"; - sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895"; - }; - } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 921827488255..b942bb31f08b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -509,6 +509,7 @@ mapAliases ({ gobby5 = gobby; # Added 2021-02-01 gobjectIntrospection = throw "'gobjectIntrospection' has been renamed to/replaced by 'gobject-introspection'"; # Converted to throw 2022-02-22 gogoclient = throw "gogoclient has been removed, because it was unmaintained"; # Added 2021-12-15 + goklp = throw "goklp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02 golly-beta = throw "golly-beta has been removed: use golly instead"; # Added 2022-03-21 goimports = throw "'goimports' has been renamed to/replaced by 'gotools'"; # Converted to throw 2022-02-22 gometalinter = throw "gometalinter was abandoned by upstream. Consider switching to golangci-lint instead"; # Added 2020-04-23 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c03ac3d468..da1d314fba4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6535,8 +6535,6 @@ with pkgs; godot-server = callPackage ../development/tools/godot/server.nix { }; - goklp = callPackage ../tools/networking/goklp {}; - go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; goofys = callPackage ../tools/filesystems/goofys { }; From 01db68fcf18507eed614a0ac9373bc91a44875d9 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 2 Jun 2022 12:00:11 +0000 Subject: [PATCH 083/117] curl_unix_socket: remove --- .../networking/curl-unix-socket/default.nix | 32 ------------------- pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/tools/networking/curl-unix-socket/default.nix diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix deleted file mode 100644 index 3366001042d7..000000000000 --- a/pkgs/tools/networking/curl-unix-socket/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ buildGoPackage, lib, fetchFromGitHub }: - -buildGoPackage rec { - pname = "curl-unix-socket"; - version = "unstable-2015-04-10"; - - src = fetchFromGitHub { - owner = "Soulou"; - repo = "curl-unix-socket"; - rev = "a7da90b01ed43e8c0d606f760c9da82f8e3ed307"; - sha256 = "1ynrrav90y3dhk8jq2fxm3jswj5nvrffwslgykj429hk6n0czb3d"; - }; - - goPackagePath = "github.com/Soulou/curl-unix-socket"; - - buildPhase = '' - runHook preBuild - ( - cd go/src/${goPackagePath} - go build -o $NIX_BUILD_TOP/go/bin/curl-unix-socket - ) - runHook postBuild - ''; - - meta = with lib; { - description = "Run HTTP requests over UNIX socket"; - license = licenses.mit; - homepage = "https://github.com/Soulou/curl-unix-socket"; - maintainers = with maintainers; [offline]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 921827488255..336580ab7bc6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -264,7 +264,7 @@ mapAliases ({ cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18 cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18 cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18 - + curl_unix_socket = throw "curl_unix_socket has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02 cutensor = throw "cutensor is now part of cudaPackages*"; # Added 2022-04-04 cutensor_cudatoolkit_10 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 cutensor_cudatoolkit_10_1 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c03ac3d468..c4f029150044 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5031,8 +5031,6 @@ with pkgs; curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; - curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; - curlie = callPackage ../tools/networking/curlie { }; cunit = callPackage ../tools/misc/cunit { }; From 44891c51c621baa2ae255cf436bb61b660416485 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 2 Jun 2022 12:10:50 +0000 Subject: [PATCH 084/117] ical2org: remove --- pkgs/tools/misc/ical2org/default.nix | 27 --------------------------- pkgs/tools/misc/ical2org/deps.nix | 11 ----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/tools/misc/ical2org/default.nix delete mode 100644 pkgs/tools/misc/ical2org/deps.nix diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix deleted file mode 100644 index 78f40974ace4..000000000000 --- a/pkgs/tools/misc/ical2org/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, fetchFromGitHub, buildGoPackage}: - -buildGoPackage rec { - pname = "ical2org"; - version="1.1.5"; - - goPackagePath = "github.com/rjhorniii/ical2org"; - - src = fetchFromGitHub { - owner = "rjhorniii"; - repo = "ical2org"; - rev = "v.${version}"; - sha256 = "0hdx2j2innjh0z4kxcfzwdl2d54nv0g9ai9fyacfiagjhnzgf7cm"; - fetchSubmodules = true; - }; - - goDeps = ./deps.nix; - - meta = with lib; { - description = "Convert an iCal file to org agenda format, optionally deduplicating entries"; - homepage = "https://github.com/rjhorniii/ical2org"; - license = licenses.gpl3; - maintainers = with maintainers; [ swflint ]; - platforms = platforms.unix; - }; - -} diff --git a/pkgs/tools/misc/ical2org/deps.nix b/pkgs/tools/misc/ical2org/deps.nix deleted file mode 100644 index b948fac3d116..000000000000 --- a/pkgs/tools/misc/ical2org/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/rjhorniii/ics-golang"; - fetch = { - type = "git"; - url = "https://github.com/rjhorniii/ics-golang"; - rev = "da66d6f502fac65073773ea3779cae2959545cb2"; - sha256 = "1mm5rssvyjk29n1gq4l5xw26gm8bhvbzrs5c059i41zh9af121px"; - }; - } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 921827488255..b33b1f96e879 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -573,6 +573,7 @@ mapAliases ({ iana_etc = throw "'iana_etc' has been renamed to/replaced by 'iana-etc'"; # Converted to throw 2022-02-22 iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08 + ical2org = throw "ical2org has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-02 icecat-bin = throw "icecat-bin has been removed, the binary builds are not maintained upstream"; # Added 2022-02-15 icedtea8_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 icedtea_web = adoptopenjdk-icedtea-web; # Added 2019-08-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c03ac3d468..928a4e0263a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -910,8 +910,6 @@ with pkgs; useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh; - ical2org = callPackage ../tools/misc/ical2org {}; - iconConvTools = callPackage ../build-support/icon-conv-tools {}; validatePkgConfig = makeSetupHook From 9488ef9504802bb417d40e2935069b9e4c4ed0bb Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 2 Jun 2022 12:39:25 +0000 Subject: [PATCH 085/117] i3cat: remove --- pkgs/tools/misc/i3cat/default.nix | 24 ------------------------ pkgs/tools/misc/i3cat/deps.nix | 11 ----------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 pkgs/tools/misc/i3cat/default.nix delete mode 100644 pkgs/tools/misc/i3cat/deps.nix diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix deleted file mode 100644 index 79e93847932f..000000000000 --- a/pkgs/tools/misc/i3cat/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "i3cat"; - version = "1.0"; - - goPackagePath = "github.com/vincent-petithory/i3cat"; - - src = fetchFromGitHub { - owner = "vincent-petithory"; - repo = "i3cat"; - rev = "v${version}"; - sha256 = "sha256-BxiiYzSjvXAMUQSUTKviLvrmGjkCLW6QPrgBBHvvF+Q="; - }; - - goDeps = ./deps.nix; - - meta = with lib; { - description = "combine multiple i3bar JSON inputs into one to forward to i3bar"; - homepage = "https://vincent-petithory.github.io/i3cat/"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/tools/misc/i3cat/deps.nix b/pkgs/tools/misc/i3cat/deps.nix deleted file mode 100644 index 01e85cbd824d..000000000000 --- a/pkgs/tools/misc/i3cat/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/vincent-petithory/structfield"; - fetch = { - type = "git"; - url = "https://github.com/vincent-petithory/structfield"; - rev = "01a738558a47fbf16712994d1737fb31c77e7d11"; - sha256 = "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw"; - }; - } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 921827488255..72c654182e94 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -571,6 +571,7 @@ mapAliases ({ ### I ### + i3cat = throw "i3cat has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02 iana_etc = throw "'iana_etc' has been renamed to/replaced by 'iana-etc'"; # Converted to throw 2022-02-22 iasl = throw "iasl has been removed, use acpica-tools instead"; # Added 2021-08-08 icecat-bin = throw "icecat-bin has been removed, the binary builds are not maintained upstream"; # Added 2022-02-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c03ac3d468..0b382afd4630 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27250,8 +27250,6 @@ with pkgs; i3blocks-gaps = callPackage ../applications/window-managers/i3/blocks-gaps.nix { }; - i3cat = callPackage ../tools/misc/i3cat { }; - i3ipc-glib = callPackage ../applications/window-managers/i3/i3ipc-glib.nix { }; i3lock = callPackage ../applications/window-managers/i3/lock.nix { From 74414ea759523ec85d18725fcd53ef82a845e338 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 2 Jun 2022 12:41:46 +0000 Subject: [PATCH 086/117] gawp: remove --- pkgs/tools/misc/gawp/default.nix | 23 ----------------------- pkgs/tools/misc/gawp/deps.nix | 29 ----------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 pkgs/tools/misc/gawp/default.nix delete mode 100644 pkgs/tools/misc/gawp/deps.nix diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix deleted file mode 100644 index bd102e868aeb..000000000000 --- a/pkgs/tools/misc/gawp/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "gawp"; - version = "unstable-2016-01-21"; - - goPackagePath = "github.com/martingallagher/gawp"; - - src = fetchFromGitHub { - owner = "martingallagher"; - repo = "gawp"; - rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f"; - sha256 = "sha256-DGTSz+4gaEd+FMSPvtY6kY4gJGnJah3exvu13sNadS0="; - }; - - goDeps = ./deps.nix; - - meta = { - homepage = "https://github.com/martingallagher/gawp"; - description = "A simple, configurable, file watching, job execution tool"; - license = lib.licenses.asl20; - }; -} diff --git a/pkgs/tools/misc/gawp/deps.nix b/pkgs/tools/misc/gawp/deps.nix deleted file mode 100644 index cf577a30354c..000000000000 --- a/pkgs/tools/misc/gawp/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; - sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0"; - sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; - }; - } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 921827488255..aec2b39e5b70 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -449,6 +449,7 @@ mapAliases ({ g4py = python3Packages.geant4; # Added 2020-06-06 gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06 + gawp = throw "gawp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02 gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead"; # Added 2021-04-03 gdb-multitarget = throw "'gdb-multitarget' has been renamed to/replaced by 'gdb'"; # Converted to throw 2022-02-22 gdk_pixbuf = throw "'gdk_pixbuf' has been renamed to/replaced by 'gdk-pixbuf'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c03ac3d468..1599a33618fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6132,8 +6132,6 @@ with pkgs; gawkInteractive = gawk.override { interactive = true; }; - gawp = callPackage ../tools/misc/gawp { }; - gbdfed = callPackage ../tools/misc/gbdfed { gtk = gtk2-x11; }; From fbb3af63675ddc4a6481e9f489ba9d451fbf9a7a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Jun 2022 14:51:25 +0200 Subject: [PATCH 087/117] python310Packages.hahomematic: 1.7.3 -> 1.8.0 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index dd41845129b3..034c5e15da73 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.7.3"; + version = "1.8.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-p1eVlOJQok8Wh9mld6EB2mtAGv97jQ9nf46SqPK8zVs="; + sha256 = "sha256-5nW+IOjBkbgEn1VGHwny1iT771UqWA4BhDLamqS/xAM="; }; propagatedBuildInputs = [ From 5d06b5b8d4f02c33951580bbb5f6fb112151fbf4 Mon Sep 17 00:00:00 2001 From: Bogdan Drozd Date: Thu, 2 Jun 2022 16:02:05 +0300 Subject: [PATCH 088/117] ventoy-bin: 1.0.74 -> 1.0.75 --- pkgs/tools/cd-dvd/ventoy-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 926c2247e2de..bbc5f40e7045 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -24,7 +24,7 @@ let }.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); in stdenv.mkDerivation rec { pname = "ventoy-bin"; - version = "1.0.74"; + version = "1.0.75"; nativeBuildInputs = [ autoPatchelfHook makeWrapper ] ++ lib.optional withQt5 qt5.wrapQtAppsHook; @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - sha256 = "sha256-raoVbj1+6nSR4knq/FmgVpzXRV71Hrcqd8C6Zsi34Uo="; + sha256 = "64487c11da3be1aa95ae5631c12fcfefbabf3d27c80d8992145e572c5e44a535"; }; patches = [ (fetchpatch { From 237366d847485423c592e2c9a22def4e373e8d64 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 2 Jun 2022 13:26:45 +0000 Subject: [PATCH 089/117] pond: remove --- .../instant-messengers/pond/default.nix | 36 -------------- .../instant-messengers/pond/deps.nix | 47 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/pond/default.nix delete mode 100644 pkgs/applications/networking/instant-messengers/pond/deps.nix diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix deleted file mode 100644 index 568a2a5bd51b..000000000000 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkg-config, gtk3, gtkspell3, - fetchFromGitHub }: - -let - gui = true; # Might be implemented with nixpkgs config. -in -buildGoPackage rec { - pname = "pond"; - version = "unstable-2015-08-30"; - - goPackagePath = "github.com/agl/pond"; - - src = fetchFromGitHub { - owner = "agl"; - repo = "pond"; - rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; - sha256 = "sha256-BE7+146E9hz8enrfA+sQhtqgHiSZAtjrW1OOqchbr7Y="; - }; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ trousers gtk3 gtkspell3 ] - ++ lib.optional stdenv.hostPlatform.isx86_64 dclxvi - ++ lib.optionals gui [ wrapGAppsHook ]; - tags = lib.optionals (!gui) [ "nogui" ]; - excludedPackages = [ "appengine" "bn256cgo" ]; - postPatch = lib.optionalString stdenv.hostPlatform.isx86_64 '' - grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \ - -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \ - -e "s,bn256\.,bn256cgo.,g" - ''; - - # https://hydra.nixos.org/build/150102618/nixlog/2 - meta.broken = stdenv.isAarch64; -} diff --git a/pkgs/applications/networking/instant-messengers/pond/deps.nix b/pkgs/applications/networking/instant-messengers/pond/deps.nix deleted file mode 100644 index 55850f0a89c2..000000000000 --- a/pkgs/applications/networking/instant-messengers/pond/deps.nix +++ /dev/null @@ -1,47 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } - { - goPackagePath = "github.com/agl/ed25519"; - fetch = { - type = "git"; - url = "https://github.com/agl/ed25519"; - rev = "278e1ec8e8a6e017cd07577924d6766039146ced"; - sha256 = "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; - }; - } - { - goPackagePath = "github.com/agl/go-gtk"; - fetch = { - type = "git"; - url = "https://github.com/agl/go-gtk"; - rev = "91c1edb38c241d73129e6b098ca1c9fa83abfc15"; - sha256 = "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d"; - }; - } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 921827488255..1e7b08f434d9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1062,6 +1062,7 @@ mapAliases ({ pocketsphinx = throw "pocketsphinx has been removed: unmaintained"; # Added 2022-04-24 polarssl = throw "'polarssl' has been renamed to/replaced by 'mbedtls'"; # Converted to throw 2022-02-22 polysh = throw "polysh has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01 + pond = throw "pond has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02 poppler_qt5 = throw "'poppler_qt5' has been renamed to/replaced by 'libsForQt5.poppler'"; # Converted to throw 2022-02-22 powerdns = pdns; # Added 2022-03-28 portaudio2014 = throw "'portaudio2014' has been removed"; # Added 2022-05-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c03ac3d468..6f5bc6320fcc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29090,8 +29090,6 @@ with pkgs; electron = electron_9; }; - pond = callPackage ../applications/networking/instant-messengers/pond { }; - ponymix = callPackage ../applications/audio/ponymix { }; portfolio-filemanager = callPackage ../applications/misc/portfolio-filemanager { }; From 4e4429797467dfd74d137c5f4934fc22313d0b31 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 2 Jun 2022 13:30:19 +0000 Subject: [PATCH 090/117] xmpp-client: remove --- .../xmpp-client/default.nix | 25 ------------------- .../instant-messengers/xmpp-client/deps.nix | 20 --------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/xmpp-client/default.nix delete mode 100644 pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix deleted file mode 100644 index 4367230f7756..000000000000 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "xmpp-client"; - version = "20160916-${lib.strings.substring 0 7 rev}"; - rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e"; - - goPackagePath = "github.com/agl/xmpp-client"; - - src = fetchFromGitHub { - owner = "agl"; - repo = "xmpp-client"; - inherit rev; - sha256 = "0j9mfr208cachzm39i8b94v5qk9hws278vv2ms9ma4wn16wns81s"; - }; - - goDeps = ./deps.nix; - - meta = with lib; { - description = "An XMPP client with OTR support"; - homepage = "https://github.com/agl/xmpp-client"; - license = licenses.bsd3; - maintainers = with maintainers; [ codsl ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix deleted file mode 100644 index caa41024fc61..000000000000 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; - sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 921827488255..e33dc8a9f590 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1450,6 +1450,7 @@ mapAliases ({ xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22 + xmpp-client = throw "xmpp-client has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; xp-pen-g430 = pentablet-driver; # Added 2020-05-03 xpf = throw "xpf has been removed: abandoned by upstream"; # Added 2022-04-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c03ac3d468..ecf9fa64001a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30880,8 +30880,6 @@ with pkgs; xmountains = callPackage ../applications/graphics/xmountains { }; - xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { }; - libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { }; xpra = callPackage ../tools/X11/xpra { }; From a7de9e82d297e0f61cedd160e14bbc4d2b2f475f Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 2 Jun 2022 13:36:53 +0000 Subject: [PATCH 091/117] git-annex-remote-b2: remove --- .../git-annex-remote-b2/default.nix | 17 ---------------- .../git-annex-remote-b2/deps.nix | 20 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix delete mode 100644 pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix deleted file mode 100644 index c32d29f2561a..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "git-annex-remote-b2"; - version = "unstable-2015-12-12"; - - goPackagePath = "github.com/encryptio/git-annex-remote-b2"; - - src = fetchFromGitHub { - owner = "encryptio"; - repo = "git-annex-remote-b2"; - rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba"; - sha256 = "sha256-QhotoSdCpiuDyMARW5jExP2887XRMaaxVXBIutvPaYQ="; - }; - - goDeps = ./deps.nix; -} diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix deleted file mode 100644 index 479b3e7d6372..000000000000 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/pquerna/ffjson"; - fetch = { - type = "git"; - url = "https://github.com/pquerna/ffjson"; - rev = "674bc015b5b3f50f9bb2561179778586b9af68c5"; - sha256 = "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a"; - }; - } - { - goPackagePath = "gopkg.in/kothar/go-backblaze.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/kothar/go-backblaze.v0"; - rev = "373819725fc560fa962c6cd883b533d2ebec4844"; - sha256 = "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx"; - }; - } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 921827488255..da4f1683a9cc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -457,6 +457,7 @@ mapAliases ({ gfm = throw "gfm has been removed"; # Added 2021-01-15 giblib = throw " giblib has been removed from nixpkgs because upstream is gone"; # Added 2022-01-23 giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # Added 2020-02-12 + git-annex-remote-b2 = throw "git-annex-remote-b2 has been dropped due to the lack of maintanence from upstream since 2016"; # Added 2022-06-02 git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2"; # Added 2022-01-01 gitAndTools = self // { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c03ac3d468..c8de3b5b4303 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6216,8 +6216,6 @@ with pkgs; inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; }; - git-annex-remote-b2 = callPackage ../applications/version-management/git-and-tools/git-annex-remote-b2 { }; - git-annex-remote-dbx = callPackage ../applications/version-management/git-and-tools/git-annex-remote-dbx { inherit (python3Packages) buildPythonApplication From 887c7e4eb761ba84f6bc7140d0d4f327673c5c4b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 Jun 2022 15:49:02 +0200 Subject: [PATCH 092/117] python310Packages.marshmallow: 3.15.0 -> 3.16.0 --- pkgs/development/python-modules/marshmallow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 50e7e71cc9e3..5f41a048760a 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.15.0"; + version = "3.16.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = pname; rev = version; - hash = "sha256-ZqMrMNfP/RKW2jQDNPgfhyeqmSc40pZbnrcXHbw2emc="; + hash = "sha256-bR10hYViK7OrAaBpKaeM7S5XyHQZhlGUQTwH/EJ0kME="; }; propagatedBuildInputs = [ From 2c8ed7e04b50f95800099743ae97bbd61c63c0cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jun 2022 14:03:23 +0000 Subject: [PATCH 093/117] python310Packages.azure-mgmt-applicationinsights: 3.0.0 -> 3.1.0 --- .../python-modules/azure-mgmt-applicationinsights/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 78605fd429c2..f547c7fe2b32 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-applicationinsights"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-K46J0WqQt4vwr1CE4yjxKUT/Atds5BLs0k8EjOA4yzA="; + sha256 = "sha256-mFUKupq4IXywGs6aQQYFYSNNH9PCNxicS1mRneSdhHU="; }; propagatedBuildInputs = [ From 8bfbb8c6c38cd2d4f864e2319eb5505cd946c730 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 1 Jun 2022 13:30:16 +1000 Subject: [PATCH 094/117] etcd_3_5: 3.5.1 -> 3.5.4 --- pkgs/servers/etcd/3.5.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/etcd/3.5.nix b/pkgs/servers/etcd/3.5.nix index ba52feaa9a3b..ff07116e2bd2 100644 --- a/pkgs/servers/etcd/3.5.nix +++ b/pkgs/servers/etcd/3.5.nix @@ -1,12 +1,12 @@ { lib, buildGoModule, fetchFromGitHub, symlinkJoin }: let - etcdVersion = "3.5.1"; + etcdVersion = "3.5.4"; etcdSrc = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; rev = "v${etcdVersion}"; - sha256 = "sha256-Ip7JAWbZBZcc8MXd+Sw05QmTs448fQXpQ5XXo6RW+Gs="; + sha256 = "sha256-mTQHxLLfNiihvHg5zaTeVNWKuzvE0KBiJdY3qMJHMCM="; }; commonMeta = with lib; { @@ -21,7 +21,7 @@ let pname = "etcdserver"; version = etcdVersion; - vendorSha256 = "sha256-hJzmxCcwN6MTgE0NpjtFlm8pjZ83clQXv1k5YM8Gmes="; + vendorSha256 = "sha256-4djUQvWp9hScua9l1ZTq298zWSeDYRDojEt2AWmarzw="; src = etcdSrc; modRoot = "./server"; @@ -45,7 +45,7 @@ let pname = "etcdutl"; version = etcdVersion; - vendorSha256 = "sha256-My0kzsN2i8DgPm2yIkbql3VyMXPaHmQSeaa/uK/RFxo="; + vendorSha256 = "sha256-nk56XGpNsDwcGrTKithKGnPCX0NhpQmzNSXHk3vmdtg="; src = etcdSrc; modRoot = "./etcdutl"; @@ -56,10 +56,10 @@ let }; etcdctl = buildGoModule rec { - pname = "etcdutl"; + pname = "etcdctl"; version = etcdVersion; - vendorSha256 = "sha256-XZKBA95UrhbiefnDvpaXcBA0wUjnpH+Pb6yXp7yc4HQ="; + vendorSha256 = "sha256-WIMYrXfay6DMz+S/tIc/X4ffMizxub8GS1DDgIR40D4="; src = etcdSrc; modRoot = "./etcdctl"; From 055f2cb18ecc702d1639a735c3ca953466e8f47e Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 2 Jun 2022 14:21:17 +0000 Subject: [PATCH 095/117] corgi: remove --- pkgs/development/tools/corgi/default.nix | 27 -------------- pkgs/development/tools/corgi/deps.nix | 47 ------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 pkgs/development/tools/corgi/default.nix delete mode 100644 pkgs/development/tools/corgi/deps.nix diff --git a/pkgs/development/tools/corgi/default.nix b/pkgs/development/tools/corgi/default.nix deleted file mode 100644 index ce003457e23d..000000000000 --- a/pkgs/development/tools/corgi/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "corgi"; - version = "0.2.4"; - - goPackagePath = "github.com/DrakeW/corgi"; - - src = fetchFromGitHub { - owner = "DrakeW"; - repo = "corgi"; - rev = "v${version}"; - sha256 = "0h9rjv1j129n1ichwpiiyspgim1273asi3s6hgizvbc75gbbb8fn"; - }; - - goDeps = ./deps.nix; - - meta = with lib; { - description = "CLI workflow manager"; - longDescription = '' - Corgi is a command-line tool that helps with your repetitive command usages by organizing them into reusable snippet. - ''; - homepage = "https://github.com/DrakeW/corgi"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - }; -} diff --git a/pkgs/development/tools/corgi/deps.nix b/pkgs/development/tools/corgi/deps.nix deleted file mode 100644 index d48b141627c7..000000000000 --- a/pkgs/development/tools/corgi/deps.nix +++ /dev/null @@ -1,47 +0,0 @@ -[ - { - goPackagePath = "github.com/chzyer/readline"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/readline"; - rev = "2972be24d48e78746da79ba8e24e8b488c9880de"; - sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "2d684516a8861da43017284349b7e303e809ac21"; - sha256 = "1fcfmz4wji3gqmmsdx493r7d101s58hwjalqps6hy25nva5pvmfs"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "99dc123558852f67743bd0b2caf8383cb3c6d720"; - sha256 = "0b2rjgycgpkpvpsqgvilqkr66bfk477lyd6l0jxmgxb1h0za5s25"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "d929dcbb10863323c436af3cf76cb16a6dfc9b29"; - sha256 = "1qjmqvszs9cmic7brm7pknq86zjra4hq923bn88blfvr3bap5bc4"; - }; - } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 921827488255..7bd79cfc2717 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -209,6 +209,7 @@ mapAliases ({ couchdb = throw "couchdb was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 couchdb2 = throw "couchdb2 was removed from nixpkgs, use couchdb3 instead"; # Added 2021-03-03 coreclr = throw "coreclr has been removed from nixpkgs, use dotnet-sdk instead"; # added 2022-06-12 + corgi = throw "corgi has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-02 cpp-gsl = throw "'cpp-gsl' has been renamed to/replaced by 'microsoft_gsl'"; # Converted to throw 2022-02-22 cpp_ethereum = throw "cpp_ethereum has been removed; abandoned upstream"; # Added 2020-11-30 cpuminer-multi = throw "cpuminer-multi has been removed: deleted by upstream"; # Added 2022-01-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c03ac3d468..40d731edfed3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -333,8 +333,6 @@ with pkgs; conftest = callPackage ../development/tools/conftest { }; - corgi = callPackage ../development/tools/corgi { }; - colmena = callPackage ../tools/admin/colmena { }; colorz = callPackage ../tools/misc/colorz { }; From a7b9951bf086d697c9baa6af0b590f3ccac700ad Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 2 Jun 2022 14:26:00 +0000 Subject: [PATCH 096/117] go-repo-root: remove --- .../tools/go-repo-root/default.nix | 17 ---------------- pkgs/development/tools/go-repo-root/deps.nix | 20 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/development/tools/go-repo-root/default.nix delete mode 100644 pkgs/development/tools/go-repo-root/deps.nix diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix deleted file mode 100644 index d17b2d0c5388..000000000000 --- a/pkgs/development/tools/go-repo-root/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "go-repo-root"; - version = "unstable-2014-09-11"; - - goPackagePath = "github.com/cstrahan/go-repo-root"; - - src = fetchFromGitHub { - owner = "cstrahan"; - repo = "go-repo-root"; - rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; - sha256 = "sha256-5FVELoUq34KjBl1kzYpExDQFvH2PYQ+dbUOBLSe6n+Y="; - }; - - goDeps = ./deps.nix; -} diff --git a/pkgs/development/tools/go-repo-root/deps.nix b/pkgs/development/tools/go-repo-root/deps.nix deleted file mode 100644 index 2554b3cad1a5..000000000000 --- a/pkgs/development/tools/go-repo-root/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/tools/go/vcs"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; - sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; - }; - } - { - goPackagePath = "code.google.com/p/go.tools/go/vcs"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; - sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; - }; - } -] diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 921827488255..519892ca4b6f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -518,6 +518,7 @@ mapAliases ({ google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07 google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07 go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22 + go-repo-root = throw "go-repo-root has been dropped due to the lack of maintanence from upstream since 2014"; # Added 2022-06-02 gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06 gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68c03ac3d468..477060698e65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13138,8 +13138,6 @@ with pkgs; go = go_1_17; - go-repo-root = callPackage ../development/tools/go-repo-root { }; - go-junit-report = callPackage ../development/tools/go-junit-report { }; gobang = callPackage ../development/tools/database/gobang { From 94cc2f9c9f0accc56c8fad8a9c9106d8fef5ac46 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 2 Jun 2022 17:31:02 +0300 Subject: [PATCH 097/117] exa: fix build with rustc 1.61 --- pkgs/tools/misc/exa/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 632eb4590586..40fcc8b01c21 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -18,6 +18,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ah8IjShmivS6IWL3ku/4/j+WNr/LdUnh1YJnPdaFdcM="; + # FIXME: LTO is broken with rustc 1.61, see https://github.com/rust-lang/rust/issues/97255 + # remove this with rustc 1.61.1+ + CARGO_PROFILE_RELEASE_LTO = "false"; + nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; From 57b107c726ca4d0da44b703f0cb3be14149020f6 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 2 Jun 2022 23:34:29 +0800 Subject: [PATCH 098/117] gnome.geary: fix build with vala 0.56 --- pkgs/desktops/gnome/misc/geary/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/desktops/gnome/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix index 37eca7ccc729..db79db65cb1f 100644 --- a/pkgs/desktops/gnome/misc/geary/default.nix +++ b/pkgs/desktops/gnome/misc/geary/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , gtk3 , vala @@ -54,6 +55,21 @@ stdenv.mkDerivation rec { sha256 = "1c2nd35500ng28223y5pszc7fh8g16njj34f6p5xc9594lvj0mik"; }; + patches = [ + # Fix accessibility issues with initializer of constants (Fix build with vala 0.56) + # https://gitlab.gnome.org/GNOME/geary/-/merge_requests/720 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/geary/-/commit/9bd4c82952a0a2c3308c5cc86c0b85650c1fb484.patch"; + sha256 = "sha256-mSms0MOfw8xHxOrEQwrIv+d4h01xLPgyvX2oWmmFQVw="; + }) + # Util.Cache.Lru: Workaround missing generic type argument (Fix build with vala 0.56) + # https://gitlab.gnome.org/GNOME/geary/-/merge_requests/721 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/geary/-/commit/0f75e7a84a39492d0748cec2ba6028e08cae3644.patch"; + sha256 = "sha256-1ADQqKm3DxtjDGPSThq3c7s5S+q/3u/qr9JQEsLaFMI="; + }) + ]; + nativeBuildInputs = [ appstream-glib desktop-file-utils From 24d3a1410e4d6a9001328c6b589161bda619e9ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jun 2022 16:12:48 +0000 Subject: [PATCH 099/117] python310Packages.zigpy: 0.45.1 -> 0.46.0 --- pkgs/development/python-modules/zigpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index da0ae7872dae..6f37c11fc67c 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.45.1"; + version = "0.46.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; - rev = version; - sha256 = "sha256-85Bi8qjbUKLXFW7VGOxzelMa1gY9giGeQRmOeoZ1idE="; + rev = "refs/tags/${version}"; + sha256 = "sha256-YCkNjygNSvGNuhP7N1apCWYevl18GASgUFSSTLHj2YU="; }; propagatedBuildInputs = [ From ef126af56ee559a031ec88b0519f272211ed6129 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jun 2022 16:40:14 +0000 Subject: [PATCH 100/117] python310Packages.google-cloud-secret-manager: 2.10.0 -> 2.11.0 --- .../python-modules/google-cloud-secret-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 76c686c951ad..b5c9f186fe55 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.10.0"; + version = "2.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-nQfdej2SveO0Qxam57ZRAyTQ0NnGoyb4nx2YFnqtAhI="; + hash = "sha256-naE1e7T1E0P3MxJCMYc3YZ79v/3VTW19D/LhzRie7jk="; }; propagatedBuildInputs = [ From c3cb6d53ed8b6109e37b3f547a85da054870f60a Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Thu, 2 Jun 2022 18:47:36 +0200 Subject: [PATCH 101/117] dolphin-emu-primehack: 1.0.5 -> 1.0.6 --- pkgs/applications/emulators/dolphin-emu/primehack.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index fdfc6d44ecad..1840548a48ff 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -48,13 +48,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu-primehack"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "shiiion"; repo = "dolphin"; rev = version; - sha256 = "011qghswgh9l7k993lfn1hrwhgyrv9m33smgspsjq50jww6r27fl"; + sha256 = "sha256-ywCh6wiBjXY5baWfu7cBgwc8w8yJaLM3QQ0FATsrweQ="; fetchSubmodules = true; }; From 6d4dfe7906d77f699d1887671ba96792903d5bd4 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Thu, 2 Jun 2022 18:47:53 +0200 Subject: [PATCH 102/117] dolphin-emu-{beta,primehack}: adjust platforms --- pkgs/applications/emulators/dolphin-emu/master.nix | 4 +--- pkgs/applications/emulators/dolphin-emu/primehack.nix | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index 1455b01f4c9c..63a638640800 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -81,9 +81,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ MP2E ashkitten xfix ]; branch = "master"; - # x86_32 is an unsupported platform. - # Enable generic build if you really want a JIT-less binary. broken = stdenv.isDarwin; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index 1840548a48ff..b59001930e61 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -143,9 +143,7 @@ stdenv.mkDerivation rec { description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; maintainers = with maintainers; [ MP2E ashkitten Madouura ]; - # x86_32 is an unsupported platform. - # Enable generic build if you really want a JIT-less binary. broken = stdenv.isDarwin; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; }; } From 0d317531670bec6def20bc4dddfcaf0e705f6b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 2 Jun 2022 17:25:01 +0000 Subject: [PATCH 103/117] ooniprobe-cli: 3.14.2 -> 3.15.0 https://github.com/ooni/probe-cli/releases/tag/v3.15.0 --- pkgs/tools/networking/ooniprobe-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ooniprobe-cli/default.nix b/pkgs/tools/networking/ooniprobe-cli/default.nix index 01c5b6376765..c1161ea8d475 100644 --- a/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.14.2"; + version = "3.15.0"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; rev = "v${version}"; - hash = "sha256-9n/Ozyy1QzjFum/R/X2DChzTHl70e+JQuo09nToAIcE="; + hash = "sha256-lIRU6TM76/uX2LA4hdWbF4fbbcfGMUzmGz4e1PTyH3c="; }; - vendorSha256 = "/fN9nRYOy00EeI8zZQFkCgTMGLZ0pFbYmRdTr2NLIsc="; + vendorSha256 = "h06WoKykuVzNgco74YbpSP+1nu/bOEf2mT4rUEX8MxU="; subPackages = [ "cmd/ooniprobe" ]; From 33e7b2cdcbeaa7883a9e34482ac161f721f4f5b2 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 2 Jun 2022 15:04:20 +0200 Subject: [PATCH 104/117] notmuch: 0.35 -> 0.36 --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 06bbf293f1d6..ac0716bfa347 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "notmuch"; - version = "0.35"; + version = "0.36"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; - sha256 = "0fdc81m24xrbhfrhw00g12ak4b8hap4961sq7ap6q2pjqhac8cd8"; + sha256 = "0h6f6mh9m9vrijm638x5sbsl321b74a25cdasbxhx67x62w320hk"; }; nativeBuildInputs = [ From 352dd81758b44e670e0cb7193e44a591d8d24152 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 2 Jun 2022 17:09:26 +0200 Subject: [PATCH 105/117] notmuch: Cleanup unnecessary workaround --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index ac0716bfa347..bacf399fdb16 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -79,11 +79,6 @@ stdenv.mkDerivation rec { in '' mkdir -p test/test-databases ln -s ${test-database} test/test-databases/database-v1.tar.xz - '' - # TODO: restore after resolved upstream - # https://www.mail-archive.com/notmuch@notmuchmail.org/msg52808.html - + '' - rm test/T355-smime.sh ''; doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3"); From 1d46988e136fec6d885877b74dba7f70ee9c70df Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Mon, 30 May 2022 01:08:49 +0200 Subject: [PATCH 106/117] qdigidoc: Wrap just once Merge `LD_LIBRARY_PATH` fixing into the automatic Qt wrapping hook. Otherwise `argv[0]` ends up as ".qdigidoc4-wrapped" due extra wrapping. --- pkgs/tools/security/qdigidoc/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 03fbd98baf76..e14889296751 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, cmake, gettext, makeWrapper +{ lib, mkDerivation, fetchurl, cmake, gettext , pkg-config, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase , qttranslations, qtsvg }: @@ -17,7 +17,7 @@ mkDerivation rec { sha256 = "1cikz36w9phgczcqnwk4k3mx3kk919wy2327jksmfa4cjfjq4a8d"; }; - nativeBuildInputs = [ cmake gettext makeWrapper pkg-config ]; + nativeBuildInputs = [ cmake gettext pkg-config ]; postPatch = '' substituteInPlace client/CMakeLists.txt \ @@ -35,10 +35,9 @@ mkDerivation rec { qttranslations ]; - postInstall = '' - wrapProgram $out/bin/qdigidoc4 \ - --prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/ - ''; + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/" + ]; meta = with lib; { description = "Qt-based UI for signing and verifying DigiDoc documents"; From e4dbad58d2b43a9c40808a117c976f787f0a06f7 Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Mon, 23 May 2022 00:10:33 +0200 Subject: [PATCH 107/117] libdigidocpp: Fix PKCS11 module library path By default, the OpenSC module is loaded as relative filename, i.e. "opensc-pkcs11.so" is searched for in the default library path. Point `LD_LIBRARY_PATH` for `digidoc-tool` to the OpenSC package just like pkgs/tools/seurity/qdigidoc/deafult.nix already does. This makes `digidoc-tool` work by default without manually setting `LD_LIBRARY_PATH` or passing `--pkcs11=/path/to/module`. Follow upstream once an appropiate patch has been merged. --- pkgs/development/libraries/libdigidocpp/default.nix | 11 +++++++++-- pkgs/tools/security/qdigidoc/default.nix | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 171f830032d2..94254b936658 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, minizip, pcsclite, opensc, openssl +{ lib, stdenv, fetchurl, cmake, makeWrapper, minizip, pcsclite, opensc, openssl , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { @@ -10,13 +10,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-U5i5IAyJF4359q6M6mQemEuG7+inPYIXqLy8GHv4dkg="; }; - nativeBuildInputs = [ cmake pkg-config xxd ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config xxd ]; buildInputs = [ minizip pcsclite opensc openssl xercesc xml-security-c xsd zlib xalanc ]; + # replace this hack with a proper cmake variable or environment variable + # once https://github.com/open-eid/cmake/pull/34 (or #35) gets merged. + postInstall = '' + wrapProgram $out/bin/digidoc-tool \ + --prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/ + ''; + meta = with lib; { description = "Library for creating DigiDoc signature files"; homepage = "http://www.id.ee/"; diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index e14889296751..183acbcfe463 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -35,6 +35,8 @@ mkDerivation rec { qttranslations ]; + # replace this hack with a proper cmake variable or environment variable + # once https://github.com/open-eid/cmake/pull/34 (or #35) gets merged. qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/" ]; From ff3f2a403701d9b5b8915d98d902a257d9c7c0cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jun 2022 18:56:20 +0000 Subject: [PATCH 108/117] python310Packages.flask-jwt-extended: 4.4.0 -> 4.4.1 --- .../development/python-modules/flask-jwt-extended/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index 0d99a08ab17a..ac7cf59f9f6f 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flask-jwt-extended"; - version = "4.4.0"; + version = "4.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Flask-JWT-Extended"; inherit version; - hash = "sha256-P+gVBL3JGtjxy5db0tlexgElHzG94YQRXjn8fm7SPqY="; + hash = "sha256-CYh/o3K91Omrtg2KcVWpZr8Rt0mZVUQQsgl1gCrsJ34="; }; propagatedBuildInputs = [ From 4bc488ddfea589673459d980d05349281c738b89 Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Thu, 2 Jun 2022 12:32:21 -0700 Subject: [PATCH 109/117] wiimms-iso-tools: add -fcommon workaround --- pkgs/tools/filesystems/wiimms-iso-tools/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix index 2b107d1af191..b9eefb0b02c2 100644 --- a/pkgs/tools/filesystems/wiimms-iso-tools/default.nix +++ b/pkgs/tools/filesystems/wiimms-iso-tools/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { patchShebangs gen-text-file.sh ''; - NIX_CFLAGS_COMPILE = "-Wno-error=format-security"; + # Workaround build failure on -fno-common toolchains like upstream gcc-10. + NIX_CFLAGS_COMPILE = "-Wno-error=format-security -fcommon"; INSTALL_PATH = "$out"; installPhase = '' From 98e0b747df49e3edd1aa2c4e7fcc98361a17b09f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 2 Jun 2022 19:20:23 +0200 Subject: [PATCH 110/117] organicmaps: 2022.04.27-2 -> 2022.05.31-10 --- pkgs/applications/misc/organicmaps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix index 15f804165f2f..0930edbd4158 100644 --- a/pkgs/applications/misc/organicmaps/default.nix +++ b/pkgs/applications/misc/organicmaps/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.04.27-2"; + version = "2022.05.31-10"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-HsskddXne5xClBZoT3aXP+51VRQQJhlUPda/M20SrH0="; + sha256 = "sha256-2GeWa4CQoY7hi24q0/cZBbq1Ofl2Jane9BiZ0N+IsSc="; fetchSubmodules = true; }; From 0454ad0dcf454ce4b67b45993790005584bda6d6 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 26 Nov 2021 14:32:47 +0100 Subject: [PATCH 111/117] libvgm: init at unstable-2022-05-27 --- pkgs/development/libraries/libvgm/default.nix | 122 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 2 files changed, 126 insertions(+) create mode 100644 pkgs/development/libraries/libvgm/default.nix diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix new file mode 100644 index 000000000000..6575561691a6 --- /dev/null +++ b/pkgs/development/libraries/libvgm/default.nix @@ -0,0 +1,122 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, cmake +, libiconv +, zlib +, enableShared ? true + +, enableAudio ? true +, withWaveWrite ? true +, withWinMM ? stdenv.hostPlatform.isWindows +, withDirectSound ? stdenv.hostPlatform.isWindows +, withXAudio2 ? stdenv.hostPlatform.isWindows +, withWASAPI ? stdenv.hostPlatform.isWindows +, withOSS ? stdenv.hostPlatform.isFreeBSD +, withSADA ? stdenv.hostPlatform.isSunOS +, withALSA ? stdenv.hostPlatform.isLinux +, alsa-lib +, withPulseAudio ? stdenv.hostPlatform.isLinux +, libpulseaudio +, withCoreAudio ? stdenv.hostPlatform.isDarwin +, CoreAudio +, AudioToolbox +, withLibao ? true +, libao + +, enableEmulation ? true +, withAllEmulators ? true +, emulators ? [ ] + +, enableLibplayer ? true + +, enableTools ? false +}: + +assert enableTools -> enableAudio && enableEmulation && enableLibplayer; + +let + inherit (lib) optional optionals; + onOff = val: if val then "ON" else "OFF"; +in +stdenv.mkDerivation rec { + pname = "libvgm"; + version = "unstable-2022-05-27"; + + src = fetchFromGitHub { + owner = "ValleyBell"; + repo = "libvgm"; + rev = "ec6ddae3e3488b6dc9e993cb0f76d3015d2f6fff"; + sha256 = "AwIx4LuVSuCf7xgtximcB6N+rzC7g1ajeBdaBz6RSyk="; + }; + + outputs = [ + "out" + "dev" + ] ++ optional enableTools "bin"; + + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + libiconv + zlib + ] ++ optionals withALSA [ + alsa-lib + ] ++ optionals withPulseAudio [ + libpulseaudio + ] ++ optionals withCoreAudio [ + CoreAudio + AudioToolbox + ] ++ optionals withLibao [ + libao + ]; + + cmakeFlags = [ + "-DBUILD_LIBAUDIO=${onOff enableAudio}" + "-DBUILD_LIBEMU=${onOff enableEmulation}" + "-DBUILD_LIBPLAYER=${onOff enableLibplayer}" + "-DBUILD_TESTS=${onOff enableTools}" + "-DBUILD_PLAYER=${onOff enableTools}" + "-DBUILD_VGM2WAV=${onOff enableTools}" + "-DLIBRARY_TYPE=${if enableShared then "SHARED" else "STATIC"}" + "-DUSE_SANITIZERS=ON" + ] ++ optionals enableAudio [ + "-DAUDIODRV_WAVEWRITE=${onOff withWaveWrite}" + "-DAUDIODRV_WINMM=${onOff withWinMM}" + "-DAUDIODRV_DSOUND=${onOff withDirectSound}" + "-DAUDIODRV_XAUDIO2=${onOff withXAudio2}" + "-DAUDIODRV_WASAPI=${onOff withWASAPI}" + "-DAUDIODRV_OSS=${onOff withOSS}" + "-DAUDIODRV_SADA=${onOff withSADA}" + "-DAUDIODRV_ALSA=${onOff withALSA}" + "-DAUDIODRV_PULSE=${onOff withPulseAudio}" + "-DAUDIODRV_APPLE=${onOff withCoreAudio}" + "-DAUDIODRV_LIBAO=${onOff withLibao}" + ] ++ optionals enableEmulation ([ + "-DSNDEMU__ALL=${onOff withAllEmulators}" + ] ++ optionals (!withAllEmulators) + (lib.lists.forEach emulators (x: "-DSNDEMU_${x}=ON")) + ) ++ optionals enableTools [ + "-DUTIL_CHARCNV_ICONV=ON" + "-DUTIL_CHARCNV_WINAPI=${onOff stdenv.hostPlatform.isWindows}" + ]; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/ValleyBell/libvgm.git"; + }; + + meta = with lib; { + homepage = "https://github.com/ValleyBell/libvgm"; + description = "More modular rewrite of most components from VGMPlay"; + license = + if (enableEmulation && (withAllEmulators || (lib.lists.any (core: core == "WSWAN_ALL") emulators))) then + licenses.unfree # https://github.com/ValleyBell/libvgm/issues/43 + else + licenses.gpl2Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63f42a7a800e..42b558c02e83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19348,6 +19348,10 @@ with pkgs; libversion = callPackage ../development/libraries/libversion { }; + libvgm = callPackage ../development/libraries/libvgm { + inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; + }; + libvirt = callPackage ../development/libraries/libvirt { inherit (darwin.apple_sdk.frameworks) Carbon AppKit; }; From bcef993bd2854b61b94cab833fabc3c6dc324ff5 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 26 Nov 2021 14:42:59 +0100 Subject: [PATCH 112/117] vgmplay-libvgm: init at unstable-2022-03-17 --- .../audio/vgmplay-libvgm/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/audio/vgmplay-libvgm/default.nix diff --git a/pkgs/applications/audio/vgmplay-libvgm/default.nix b/pkgs/applications/audio/vgmplay-libvgm/default.nix new file mode 100644 index 000000000000..9647eef681ac --- /dev/null +++ b/pkgs/applications/audio/vgmplay-libvgm/default.nix @@ -0,0 +1,43 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, cmake +, pkg-config +, zlib +, libvgm +, inih +}: + +stdenv.mkDerivation rec { + pname = "vgmplay-libvgm"; + version = "unstable-2022-03-17"; + + src = fetchFromGitHub { + owner = "ValleyBell"; + repo = "vgmplay-libvgm"; + rev = "a2c21cb134b58043a013ac2efc060144cdecf13d"; + sha256 = "0g251laqjvvzblyflkg8xac424dbxm1v35ckfazsfchmcqiaqfw4"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ zlib libvgm inih ]; + + postInstall = '' + install -Dm644 ../VGMPlay.ini $out/share/vgmplay/VGMPlay.ini + ''; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/ValleyBell/vgmplay-libvgm.git"; + }; + + meta = with lib; { + mainProgram = "vgmplay"; + homepage = "https://github.com/ValleyBell/vgmplay-libvgm"; + description = "New VGMPlay, based on libvgm"; + license = licenses.unfree; # no licensing text anywhere yet + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42b558c02e83..465f72ca18db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28825,6 +28825,8 @@ with pkgs; owamp = callPackage ../applications/networking/owamp { }; + vgmplay-libvgm = callPackage ../applications/audio/vgmplay-libvgm { }; + vieb = callPackage ../applications/networking/browsers/vieb { }; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; From 65db75774bcbbd64afe58147e70191003bd3d504 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 2 Mar 2022 01:12:26 +0100 Subject: [PATCH 113/117] mmlgui: init at unstable-2022-05-24 --- pkgs/applications/audio/mmlgui/default.nix | 87 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 11 +++ 2 files changed, 98 insertions(+) create mode 100644 pkgs/applications/audio/mmlgui/default.nix diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix new file mode 100644 index 000000000000..0a29b7aad939 --- /dev/null +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -0,0 +1,87 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, pkg-config +, glfw +, libvgm +, libX11 +, libXau +, libXdmcp +, Carbon +, Cocoa +, cppunit +}: + +stdenv.mkDerivation rec { + pname = "mmlgui"; + version = "unstable-2022-05-24"; + + src = fetchFromGitHub { + owner = "superctr"; + repo = "mmlgui"; + rev = "fe2b298c1eddae4cc38096f6c1ba1ccaed562cf1"; + fetchSubmodules = true; + sha256 = "Q34zzZthdThMbduXcc/qMome89mAMrn1Vinr073u4zo="; + }; + + postPatch = '' + # Actually wants pkgconf but that seems abit broken: + # https://github.com/NixOS/nixpkgs/pull/147503#issuecomment-1055943897 + # Removing a pkgconf-specific option makes it work with pkg-config + substituteInPlace libvgm.mak \ + --replace '--with-path=/usr/local/lib/pkgconfig' "" + substituteInPlace Makefile \ + --replace 'all: $(MMLGUI_BIN) test' 'all: $(MMLGUI_BIN)' + ''; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + glfw + libvgm + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libXau + libXdmcp + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Carbon + Cocoa + ]; + + checkInputs = [ + cppunit + ]; + + makeFlags = [ + "RELEASE=1" + ]; + + enableParallelBuilding = true; + + doCheck = true; + + installPhase = '' + runHook preInstall + + install -Dm755 {,$out/}bin/mmlgui + mkdir -p $out/share/ctrmml + mv ctrmml/sample $out/share/ctrmml/ + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/superctr/mmlgui.git"; + }; + + meta = with lib; { + homepage = "https://github.com/superctr/mmlgui"; + description = "MML (Music Macro Language) editor and compiler GUI, powered by the ctrmml framework"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 465f72ca18db..5a1a4dcc18ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28153,6 +28153,17 @@ with pkgs; }; }; + mmlgui = callPackage ../applications/audio/mmlgui { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + libvgm = libvgm.override { + withAllEmulators = false; + emulators = [ + "_PRESET_SMD" + ]; + enableLibplayer = false; + }; + }; + mmsd = callPackage ../tools/networking/mmsd { }; mmtc = callPackage ../applications/audio/mmtc { }; From 1cda678ea067236ffd98476bf1084c2d45ada81c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 2 Mar 2022 14:47:37 +0100 Subject: [PATCH 114/117] vgmtools: init at unstable-2022-05-23 --- pkgs/tools/audio/vgmtools/default.nix | 44 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/audio/vgmtools/default.nix diff --git a/pkgs/tools/audio/vgmtools/default.nix b/pkgs/tools/audio/vgmtools/default.nix new file mode 100644 index 000000000000..ce6add702e74 --- /dev/null +++ b/pkgs/tools/audio/vgmtools/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, cmake +, zlib +}: + +stdenv.mkDerivation rec { + pname = "vgmtools"; + version = "unstable-2022-05-23"; + + src = fetchFromGitHub { + owner = "vgmrips"; + repo = "vgmtools"; + rev = "e0df1511ddf7b1207b448487616ff18a9049c278"; + sha256 = "2nM3E/XeZ1OeOj3fPqvuJgQcPOtBerduGpVfpGLVhHQ="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + zlib + ]; + + # Some targets are not enabled by default + makeFlags = [ + "all" "opt_oki" "optdac" "optvgm32" + ]; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/vgmrips/vgmtools.git"; + }; + + meta = with lib; { + homepage = "https://github.com/vgmrips/vgmtools"; + description = "A collection of tools for the VGM file format"; + license = licenses.gpl2; # Not clarified whether Only or Plus + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a1a4dcc18ba..d296e2c518f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28838,6 +28838,8 @@ with pkgs; vgmplay-libvgm = callPackage ../applications/audio/vgmplay-libvgm { }; + vgmtools = callPackage ../tools/audio/vgmtools { }; + vieb = callPackage ../applications/networking/browsers/vieb { }; vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; From 1bab0eb399a7dc2e28060346758e31668ff7b14c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 2 Mar 2022 23:16:03 +0100 Subject: [PATCH 115/117] fmtoy: init at unstable-2021-12-24 --- pkgs/tools/audio/fmtoy/default.nix | 72 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/tools/audio/fmtoy/default.nix diff --git a/pkgs/tools/audio/fmtoy/default.nix b/pkgs/tools/audio/fmtoy/default.nix new file mode 100644 index 000000000000..dd3f04021327 --- /dev/null +++ b/pkgs/tools/audio/fmtoy/default.nix @@ -0,0 +1,72 @@ +{ stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, dos2unix +, pkg-config +, zlib +, alsa-lib +, libjack2 +}: + +stdenv.mkDerivation rec { + pname = "fmtoy"; + version = "unstable-2021-12-24"; + + src = fetchFromGitHub { + owner = "vampirefrog"; + repo = "fmtoy"; + rev = "0de6703b3373eb5bf19fd3deaae889286f330c21"; + sha256 = "0sr6klkmjd2hd2kyb9y0x986d6lsy8bziizfc6cmhkqcq92fh45c"; + }; + + postPatch = '' + dos2unix Makefile + # Don't hardcode compilers + sed -i -e '/CC=/d' -e '/CXX=/d' Makefile + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Remove Linux-only program & its dependencies + sed -i -e '/PROGS/ s/fmtoy_jack//' Makefile + substituteInPlace Makefile \ + --replace '$(shell pkg-config alsa jack --cflags)' "" + ''; + + nativeBuildInputs = [ + dos2unix + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + pkg-config + ]; + + buildInputs = [ + zlib + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libjack2 + ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + for prog in $(grep 'PROGS=' Makefile | cut -d= -f2-); do + install -Dm755 $prog $out/bin/$prog + done + + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/vampirefrog/fmtoy.git"; + }; + + meta = with lib; { + homepage = "https://github.com/vampirefrog/fmtoy"; + description = "Tools for FM voices for Yamaha YM chips (OPL, OPM and OPN series)"; + # Unknown license situation + # https://github.com/vampirefrog/fmtoy/issues/1 + license = licenses.unfree; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d296e2c518f4..8338e92ac687 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26567,6 +26567,8 @@ with pkgs; firefox_decrypt = python3Packages.callPackage ../tools/security/firefox_decrypt { }; + fmtoy = callPackage ../tools/audio/fmtoy { }; + flac = callPackage ../applications/audio/flac { }; redoflacs = callPackage ../applications/audio/redoflacs { }; From 4b190c0888a4171e93e07eabbc88e45885dc9130 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 2 Jun 2022 23:02:33 +0200 Subject: [PATCH 116/117] famistudio: init at 3.3.0 --- .../applications/audio/famistudio/default.nix | 66 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/applications/audio/famistudio/default.nix diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix new file mode 100644 index 000000000000..f1971ad0216e --- /dev/null +++ b/pkgs/applications/audio/famistudio/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, fetchzip +, autoPatchelfHook +, makeWrapper +, alsa-lib +, gtk-sharp-2_0 +, glib +, gtk2 +, mono +, openal +}: + +stdenv.mkDerivation rec { + pname = "famistudio"; + version = "3.3.0"; + + src = fetchzip { + url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip"; + stripRoot = false; + sha256 = "1r7y7z3s3b0zm7lvdgr9z70iall1swzlr3npx7g5azz6vza00vva"; + }; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + buildInputs = [ alsa-lib gtk-sharp-2_0 glib gtk2 mono openal ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib/famistudio} + mv * $out/lib/famistudio + + makeWrapper ${mono}/bin/mono $out/bin/famistudio \ + --add-flags $out/lib/famistudio/FamiStudio.exe \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk2 gtk-sharp-2_0 ]} + + # Fails to find openal32.dll on its own, needs abit of help + rm $out/lib/famistudio/libopenal32.so + cat <$out/lib/famistudio/OpenTK.dll.config + + + + EOF + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://famistudio.org/"; + description = "NES Music Editor"; + longDescription = '' + FamiStudio is very simple music editor for the Nintendo Entertainment System + or Famicom. It is targeted at both chiptune artists and NES homebrewers. + ''; + license = licenses.mit; + # Maybe possible to build from source but I'm not too familiar with C# packaging + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63f42a7a800e..774894931cd1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26163,6 +26163,8 @@ with pkgs; faircamp = callPackage ../applications/misc/faircamp { }; + famistudio = callPackage ../applications/audio/famistudio { }; + fasttext = callPackage ../applications/science/machine-learning/fasttext { }; fbmenugen = callPackage ../applications/misc/fbmenugen { }; From a1a9aa11f6062c8d3a0e47f69e67ad11f9bb3d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 2 Jun 2022 01:32:55 +0000 Subject: [PATCH 117/117] python310Packages.ua-parser: run tests --- .../python-modules/ua-parser/default.nix | 40 +++++++++++++++---- .../ua-parser/dont-fetch-submodule.patch | 17 ++++++++ 2 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/python-modules/ua-parser/dont-fetch-submodule.patch diff --git a/pkgs/development/python-modules/ua-parser/default.nix b/pkgs/development/python-modules/ua-parser/default.nix index d2fc2461a446..ec55add71d69 100644 --- a/pkgs/development/python-modules/ua-parser/default.nix +++ b/pkgs/development/python-modules/ua-parser/default.nix @@ -1,20 +1,44 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyyaml +, pytestCheckHook +}: buildPythonPackage rec { pname = "ua-parser"; version = "0.10.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0csh307zfz666kkk5idrw3crj1x8q8vsqgwqil0r1n1hs4p7ica7"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "ua-parser"; + repo = "uap-python"; + rev = version; + fetchSubmodules = true; + hash = "sha256-kaTAfUtHj2vH7i7eIU61efuB4/XVHoc/z6o3ny+sgrQ="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pyyaml"' "" + patches = [ + ./dont-fetch-submodule.patch + ]; + + nativeBuildInputs = [ + pyyaml + ]; + + preBuild = '' + mkdir -p build/lib/ua_parser ''; - doCheck = false; # requires files from uap-core + checkInputs = [ + pytestCheckHook + ]; + + preCheck = '' + # import from $out + rm ua_parser/__init__.py + ''; pythonImportsCheck = [ "ua_parser" ]; diff --git a/pkgs/development/python-modules/ua-parser/dont-fetch-submodule.patch b/pkgs/development/python-modules/ua-parser/dont-fetch-submodule.patch new file mode 100644 index 000000000000..fa0cfdeabf32 --- /dev/null +++ b/pkgs/development/python-modules/ua-parser/dont-fetch-submodule.patch @@ -0,0 +1,17 @@ +diff --git a/setup.py b/setup.py +index a976eee..6919795 100644 +--- a/setup.py ++++ b/setup.py +@@ -64,12 +64,6 @@ class build_regexes(Command): + + def run(self): + work_path = self.work_path +- if not os.path.exists(os.path.join(work_path, ".git")): +- return +- +- log.info("initializing git submodules") +- check_output(["git", "submodule", "init"], cwd=work_path) +- check_output(["git", "submodule", "update"], cwd=work_path) + + yaml_src = os.path.join(work_path, "uap-core", "regexes.yaml") + if not os.path.exists(yaml_src):