From be0c385a5dbff42eece4b9efec028932cf1b3bc7 Mon Sep 17 00:00:00 2001 From: piegames Date: Sun, 7 Nov 2021 22:18:22 +0100 Subject: [PATCH 01/33] matrix-appservice-irc: improve update script --- pkgs/servers/matrix-synapse/matrix-appservice-irc/REVISION | 1 - pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix | 2 +- pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 pkgs/servers/matrix-synapse/matrix-appservice-irc/REVISION diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/REVISION b/pkgs/servers/matrix-synapse/matrix-appservice-irc/REVISION deleted file mode 100644 index c25c8e5b741..00000000000 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/REVISION +++ /dev/null @@ -1 +0,0 @@ -0.30.0 diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index 33ac1fca467..f440a27acb6 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -5,7 +5,7 @@ let inherit pkgs nodejs; inherit (stdenv.hostPlatform) system; }; - version = builtins.replaceStrings [ "\n" ] [ "" ] (builtins.readFile ./REVISION); + version = (lib.importJSON ./package.json).version; in ourNodePackages.package.override { pname = "matrix-appservice-irc"; diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh index 462512dd0f4..d2c16dedfcd 100755 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/update.sh @@ -6,7 +6,7 @@ set -euo pipefail cd "$(dirname "$0")" CURRENT_VERSION=$(nix eval --raw '(with import ../../../../. {}; matrix-appservice-irc.version)') -TARGET_VERSION="$(curl https://api.github.com/repos/matrix-org/matrix-appservice-irc/releases/latest | jq -r ".tag_name")" +TARGET_VERSION="$(curl https://api.github.com/repos/matrix-org/matrix-appservice-irc/releases/latest | jq --exit-status -r ".tag_name")" if [[ "$CURRENT_VERSION" == "$TARGET_VERSION" ]]; then echo "matrix-appservice-irc is up-to-date: ${CURRENT_VERSION}" @@ -18,7 +18,6 @@ echo "matrix-appservice-irc: $CURRENT_VERSION -> $TARGET_VERSION" rm -f package.json package-lock.json wget https://github.com/matrix-org/matrix-appservice-irc/raw/$TARGET_VERSION/package.json wget -O package-lock-temp.json https://github.com/matrix-org/matrix-appservice-irc/raw/$TARGET_VERSION/package-lock.json -echo "$TARGET_VERSION" > ./REVISION ./generate-dependencies.sh From 2b7ab562eac330d451942fb11010a55a9190b811 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 13 Nov 2021 22:25:51 +0100 Subject: [PATCH 02/33] matrix-appservice-irc: remove piegames as maintainer --- pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index f440a27acb6..1465b9518ff 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -30,7 +30,7 @@ ourNodePackages.package.override { meta = with lib; { description = "Node.js IRC bridge for Matrix"; - maintainers = with maintainers; [ piegames ]; + maintainers = with maintainers; [ ]; homepage = "https://github.com/matrix-org/matrix-appservice-irc"; license = licenses.asl20; }; From cda90888f2ac1bdfefdf72141f993ca4449d5326 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Mon, 22 Nov 2021 10:44:10 -0700 Subject: [PATCH 03/33] heisenbridge: 1.7.0 -> 1.7.1 --- pkgs/servers/heisenbridge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index 0d1b538ceba..c538e366f6e 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "heisenbridge"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "hifi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rN+qoBS9zIy5EHlFQxgAlcz9haoYJNMKJ2wlS46UOi0="; + sha256 = "sha256-q1Rj8BehvYnV/Kah5YKAxBUz4j9WziSqn1fVeaKpy7g="; }; postPatch = '' From 9571ac967f3b186f866eb9ea11522a1ed57eeb51 Mon Sep 17 00:00:00 2001 From: taikx4 Date: Tue, 23 Nov 2021 20:06:39 +0100 Subject: [PATCH 04/33] phpExtensions.gnupg: init at 1.5.0 --- .../php-packages/gnupg/default.nix | 37 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/php-packages/gnupg/default.nix diff --git a/pkgs/development/php-packages/gnupg/default.nix b/pkgs/development/php-packages/gnupg/default.nix new file mode 100644 index 00000000000..d00c9781062 --- /dev/null +++ b/pkgs/development/php-packages/gnupg/default.nix @@ -0,0 +1,37 @@ +{ buildPecl, lib, gpgme, file, gnupg }: + +buildPecl { + pname = "gnupg"; + + version = "1.5.0"; + sha256 = "0r0akrjjf9i460z11llybdr6sg2rlcz38nwfy0yqz443ljdggxfl"; + + buildInputs = [ gpgme ]; + checkInputs = [ gnupg ]; + + postPhpize = '' + substituteInPlace configure \ + --replace '/usr/bin/file' '${file}/bin/file' \ + --replace 'SEARCH_PATH="/usr/local /usr /opt"' 'SEARCH_PATH="${gpgme.dev}"' + ''; + + postConfigure = with lib; '' + substituteInPlace Makefile \ + --replace 'run-tests.php' 'run-tests.php -q --offline' + substituteInPlace tests/gnupg_res_init_file_name.phpt \ + --replace '/usr/bin/gpg' '${gnupg}/bin/gpg' \ + --replace 'string(12)' 'string(${toString (stringLength "${gnupg}/bin/gpg")})' + substituteInPlace tests/gnupg_oo_init_file_name.phpt \ + --replace '/usr/bin/gpg' '${gnupg}/bin/gpg' \ + --replace 'string(12)' 'string(${toString (stringLength "${gnupg}/bin/gpg")})' + ''; + + doCheck = true; + + meta = with lib; { + description = "PHP wrapper for GpgME library that provides access to GnuPG"; + license = licenses.bsd3; + homepage = "https://pecl.php.net/package/gnupg"; + maintainers = with maintainers; [ taikx4 ] ++ teams.php.members; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index afcee93c3b2..e8baa541f3b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -173,6 +173,8 @@ lib.makeScope pkgs.newScope (self: with self; { event = callPackage ../development/php-packages/event { }; + gnupg = callPackage ../development/php-packages/gnupg { }; + igbinary = callPackage ../development/php-packages/igbinary { }; imagick = callPackage ../development/php-packages/imagick { }; From 97e808fecf8e348f09490bd3fe31458906740a46 Mon Sep 17 00:00:00 2001 From: taikx4 Date: Wed, 24 Nov 2021 17:38:05 +0100 Subject: [PATCH 05/33] maintainers: add taikx4 --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3cb4c652e18..09fcb698e30 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11296,6 +11296,16 @@ githubId = 321799; name = "Paul Colomiets"; }; + taikx4 = { + email = "taikx4@taikx4szlaj2rsdupcwabg35inbny4jk322ngeb7qwbbhd5i55nf5yyd.onion"; + github = "taikx4"; + githubId = 94917129; + name = "taikx4"; + keys = [{ + longkeyid = "ed25519/0xCCD52C7B37BB837E"; + fingerprint = "6B02 8103 C4E5 F68C D77C 9E54 CCD5 2C7B 37BB 837E"; + }]; + }; takagiy = { email = "takagiy.4dev@gmail.com"; github = "takagiy"; From 934d88778256c9564f7d061e4923c69eff16cb40 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Nov 2021 19:23:49 +0100 Subject: [PATCH 06/33] checkov: 2.0.598 -> 2.0.603 --- 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 a5018b110d1..fe8b73224bd 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.598"; + version = "2.0.603"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-h+pKg6rBF+f/EZaCcMQDISrE3jO55biHdn5tLPEUu1g="; + sha256 = "sha256-EJ0i3HOCurjCQEdZBzELBCcIS7sT71vEBjjdNpCmt00="; }; nativeBuildInputs = with py.pkgs; [ From e19be4776e3ba84d17b29efe161484642938e535 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Nov 2021 20:00:48 +0100 Subject: [PATCH 07/33] python3Packages.types-setuptools: 57.4.2 -> 57.4.3 --- pkgs/development/python-modules/types-setuptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 512b5386625..5a102a39577 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "57.4.2"; + version = "57.4.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1y0vx949wx5w4ra854ykwvgmdcwsb6v7jk29m4x1l79857sa16al"; + sha256 = "sha256-G8mgC66QHvk5wXIK4EDJ8RJ+eeYOBFiO0VBsYmhThe0="; }; # Module doesn't have tests From caa7aa15abb8fde128efa69ed342c033633ca794 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Nov 2021 20:03:17 +0100 Subject: [PATCH 08/33] python3Packages.types-pytz: 2021.3.0 -> 2021.3.1 --- pkgs/development/python-modules/types-pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index a6139eb9c9b..62f3d36208e 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2021.3.0"; + version = "2021.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hqYZZ4NNzuqvmLaQLtg1fv3SYruK/K9LyMzs90hZJ3g="; + sha256 = "sha256-3/138+/s07FVXxh6m/OmONVfrClnALgpxBvVHscqbrc="; }; # Modules doesn't have tests From d91ef9f8b9c7c6fec5c2a7c612fe02eb89985c1e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Nov 2021 20:11:03 +0100 Subject: [PATCH 09/33] python3Packages.slack-sdk: 3.11.2 -> 3.12.0 --- pkgs/development/python-modules/slack-sdk/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 7d2391daad9..2353def0da3 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,14 +20,16 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.11.2"; + version = "3.12.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-jfFNka+PZXXYz6r7gwoxoqK7SX2RRcDNlCSqVG3JPY0="; + sha256 = "sha256-1IR0pQOxLjxqmjbq6zmp2rU1rBDabADva1R4YBNw+PA="; }; propagatedBuildInputs = [ @@ -66,7 +68,9 @@ buildPythonPackage rec { "test_interactions" ]; - pythonImportsCheck = [ "slack_sdk" ]; + pythonImportsCheck = [ + "slack_sdk" + ]; meta = with lib; { description = "Slack Developer Kit for Python"; From 7457e3fb772be161606405f0137fe5ccd6fc5e6f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Nov 2021 20:18:45 +0100 Subject: [PATCH 10/33] python3Packages.starkbank-ecdsa: 2.0.2 -> 2.0.3 --- pkgs/development/python-modules/starkbank-ecdsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/starkbank-ecdsa/default.nix b/pkgs/development/python-modules/starkbank-ecdsa/default.nix index e7e114dadd6..25b7d0aa3c7 100644 --- a/pkgs/development/python-modules/starkbank-ecdsa/default.nix +++ b/pkgs/development/python-modules/starkbank-ecdsa/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "starkbank-ecdsa"; - version = "2.0.2"; + version = "2.0.3"; format = "setuptools"; src = fetchFromGitHub { owner = "starkbank"; repo = "ecdsa-python"; rev = "v${version}"; - sha256 = "sha256-4QFAtGqHJZSVyrGPuMdJwvF761/P6YAHjjKmCpPyGdU="; + sha256 = "sha256-UA+UuSxKZZN7Zb23HWsCD6UZK6lROpy3OfLN7MAlMM0="; }; checkInputs = [ From 62575c66e6a25cd3b11b5fdf74ce1a930eac2591 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Nov 2021 20:22:14 +0100 Subject: [PATCH 11/33] python3Packages.devolo-plc-api: 0.6.3 -> 0.6.4 --- pkgs/development/python-modules/devolo-plc-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index 91e734e45f6..7a513233b19 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "devolo-plc-api"; - version = "0.6.3"; + version = "0.6.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "2Fake"; repo = "devolo_plc_api"; rev = "v${version}"; - sha256 = "6EIT6ifC4M4qj/2dZYVZ3fb3bPs25R7IEh/MduYTTkU="; + sha256 = "sha256-hlIHNVJG/2hU5psGXhi05SCupORfgIjB+YT/ZlJEqFM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From a9868c307d849900c33bea8f48939d0cb3d48235 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 24 Nov 2021 23:10:34 +0100 Subject: [PATCH 12/33] python3Packages.python-smarttub: relax aiohttp constraint --- .../python-modules/python-smarttub/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index b4c994b2456..c6854084429 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -14,6 +14,8 @@ buildPythonPackage rec { pname = "python-smarttub"; version = "0.0.27"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { @@ -36,7 +38,14 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "smarttub" ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "aiohttp~=3.7.3" "aiohttp>=3.7.4,<4" + ''; + + pythonImportsCheck = [ + "smarttub" + ]; meta = with lib; { description = "Python API for SmartTub enabled hot tubs"; From bb0f6ad8d25fee7a9fe76d29b0d1e03ce84cf6da Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Thu, 25 Nov 2021 00:39:30 +0100 Subject: [PATCH 13/33] lnd: 0.14.0-beta -> 0.14.1-beta --- pkgs/applications/blockchains/lnd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index f9cef2898bf..3cc054cea59 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.14.0-beta"; + version = "0.14.1-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "0pf84l46cfhbmbzjdkpmqp494wqix8715zawm537mm94k3q25bis"; + sha256 = "0arm36682y4csdv9abqs0l8rgxkiqkamrps7q8wpyyg4n78yiij3"; }; - vendorSha256 = "1481zscd9lrnzxsaxkpaaa8fjazmfynhim13f8lj2yd9d21j5d31"; + vendorSha256 = "13zhs0gb7chi0zz5rabmw3sd5fcpxc4s553crfcg7lrnbn5hcwzv"; subPackages = [ "cmd/lncli" "cmd/lnd" ]; From f8fddafe3c8a48dc55a35e0693c61b243eb8a36a Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 24 Nov 2021 16:54:11 -0700 Subject: [PATCH 14/33] heisenbridge: add patch for compatibility with aiohttp 3.8.0 --- pkgs/servers/heisenbridge/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index c538e366f6e..3d3439b05d2 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, fetchpatch, python3Packages }: python3Packages.buildPythonApplication rec { pname = "heisenbridge"; @@ -11,6 +11,14 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-q1Rj8BehvYnV/Kah5YKAxBUz4j9WziSqn1fVeaKpy7g="; }; + patches = [ + # Compatibility with aiohttp 3.8.0 + (fetchpatch { + url = "https://github.com/hifi/heisenbridge/commit/cff5d33e0b617e6cf3a44dc00c72b98743175c9e.patch"; + sha256 = "sha256-y5X4mWvX1bq0XNZNTYUc0iK3SzvaHpS7px53I7xC9c8="; + }) + ]; + postPatch = '' echo "${version}" > heisenbridge/version.txt ''; From 1eeffcbc01300669c87d5e648af14fbe7eb633f1 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Wed, 24 Nov 2021 20:16:41 -0600 Subject: [PATCH 15/33] ArchiSteamFarm: fix build --- pkgs/applications/misc/ArchiSteamFarm/deps.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 6da12300439..3e6fa176148 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -55,10 +55,15 @@ (fetchNuGet { name = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) (fetchNuGet { name = "Markdig.Signed"; version = "0.26.0"; sha256 = "1giwdvmy6n4vfb0g7sxmdf9bklb4r2vdfhm1xfxvqys8rfm15d4z"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "5.0.10"; sha256 = "1dmcccml0lwxkiplfisxc70877h3s6p589nml19pi07iypvyxxjh"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "5.0.12"; sha256 = "1cv7s0gh54jfrdgwa2cyarh1f6m59fpbfmqsszi27cdik0llh24s"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.10"; sha256 = "1r9rf1j5v3hfn299zk71bjbbzslnypyqy1pz2xc4mirghwg18pqw"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.12"; sha256 = "1hmr4l20fs8qqjvcfnlyb6ik6dh37mg0xa2wrvkn229pmiwp1rm9"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1asph5v7kgmscfgsyv9gg7cwvg52gnm6m0ldm2m4pfkpsxqyp2mi"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "0ir75jh4qas1v70y63hvd0rbyprcf97l47b2pgljhxk138z96s4y"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "02kv8xh6xvpav7vqj281321ly1imghxcc18cdgadiq8dwgm87xwp"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0qhyrprvbhcn980ycqvkchd4qy5shydi7pl0lbcl9cljivn60if3"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.12"; sha256 = "062zb8gqbzxq2xrmr8lbl215pnhw1fdidq43m975vsfgzmqrga8f"; }) (fetchNuGet { name = "Microsoft.AspNetCore.JsonPatch"; version = "5.0.0"; sha256 = "192mn6r73xjw8fvlss6vrv34iiavq7k8pg0w7advgj6khklw4dzx"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "5.0.0"; sha256 = "1q3z35pxgvpf6l6ywh5wb6gfly055rk99a80rjqisyrbmza1msd1"; }) (fetchNuGet { name = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) @@ -73,14 +78,23 @@ (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm"; version = "5.0.10"; sha256 = "12zz674g6289z44rynnbsarqdh6md0qdl4srkzkqz9dvm1f2k4yn"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm"; version = "5.0.12"; sha256 = "0v3df0hdv02xr7gmc9fmnwfrxf8xbqp9bci31a55xwj16jia692x"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.10"; sha256 = "0v90w0cr8zjayj0w0rb5ds1kjg77n7za1nr9rr1pnszw2xs00fmq"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.12"; sha256 = "0jvfxnc743qcg1qwlvclh6ww612mnsk5pk459awz5rivp3mdkfsb"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.10"; sha256 = "1z8l02ypzbhbh0jp89ibc4dx61dvaa4l7cdn4s2zs0l492nz2ni8"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.12"; sha256 = "0950m6x86jp5dybzakfsp74qzrk4pk8wkazc178v36j14sqmj2zq"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.10"; sha256 = "07yr09al8cci38zmwqghpsf8jsg51a8qv6p156ph8b5714iq5jjq"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.12"; sha256 = "173zymcac00rjb0l4yvksglj32b6fnwxzi60kpi0ki3z3a2k8kd3"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "5.0.10"; sha256 = "12xw4czsnsy4nara23jbvbsi8id9lms17xfyv0w4wsqhrp5kqbxi"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "5.0.12"; sha256 = "197xfhk7rwpn5kgc59slclkd0rp53034mfrrpajn2xbgjnmb07sj"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.10"; sha256 = "0ccsk1baj0bx1k7jqm7pnw77ns3m6h50cl8kxikjcm74jsz0vyx1"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.12"; sha256 = "1bpzbivp0n9cl05vlnirigzbvjs25mq7w56bg9zrnzlzjnhcwry2"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1fdbrjrmjd31y1amp0inlmki9w3fwzv8nz41pqmc943g3cpmyg9f"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "1pphlbhs1swr14g07hnvvwj9p983qqf6vqaq455bhpn6lin3z81f"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "0z8l0gzy9dih0mn5a2rknyph1w73y4m03s250wghym1zp6rz910p"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0cn3nq7vmjwk8b5bh7hb5wzidz1msjmwyng6k1ngqdm49w9f0m2g"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.12"; sha256 = "1s4klc4p5wiqiiqcfqyi56cci9f29b588h52vj7na7gfqry4b51l"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) From 6dc23393d9a24abfff423a2ea4bfc574cebd4eca Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Wed, 24 Nov 2021 19:12:25 -0800 Subject: [PATCH 16/33] glymur: fix build --- pkgs/development/python-modules/glymur/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index f14245865f5..40748f86954 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -10,6 +10,7 @@ , mock , importlib-resources , isPy27 +, lxml }: buildPythonPackage rec { @@ -31,6 +32,7 @@ buildPythonPackage rec { scikitimage procps pytestCheckHook + lxml ]; postConfigure = '' From 7402bc6c2e12081e81ccb68ed32d638c5b62710d Mon Sep 17 00:00:00 2001 From: Vikram Narayanan Date: Wed, 24 Nov 2021 19:23:59 -0800 Subject: [PATCH 17/33] yfinance: fix build --- pkgs/development/python-modules/yfinance/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index b449ec59e96..059316f7a99 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -5,6 +5,7 @@ , numpy , pandas , requests +, lxml }: buildPythonPackage rec { @@ -23,6 +24,7 @@ buildPythonPackage rec { numpy pandas requests + lxml ]; doCheck = false; # Tests require internet access From 24b606e95a40544cfabdb9fb44409b42a3b08d90 Mon Sep 17 00:00:00 2001 From: Zack A Date: Thu, 25 Nov 2021 14:48:28 +0900 Subject: [PATCH 18/33] solaar: 1.0.6 -> 1.0.7 --- pkgs/applications/misc/solaar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 641353f53da..75d617bceeb 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -13,13 +13,13 @@ # logitech-udev-rules instead of adding this to services.udev.packages on NixOS python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = version; - sha256 = "sha256-Ys0005hIQ+fT4oMeU5iFtbLNqn1WM6iLdIKGwdyn7BM="; + sha256 = "sha256-RQ7iSiw/0xbPOYhuHg4cQpuJyRcaigWKVw4Jt12T9Uw="; }; nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ]; From 3c5996d1e6cebd3d15d0639994cce177459747a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Lucr=C3=A8ce=20C=C3=A9leste?= Date: Tue, 23 Nov 2021 22:58:21 -0500 Subject: [PATCH 19/33] jenkins: 2.303.1 -> 2.303.3 --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index a7d9aeda000..0b113a6fe8c 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.303.1"; + version = "2.303.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0rf06axz1hxssg942w2g66avak30jy6rfdwxynhriqv3vrf17bja"; + sha256 = "8a6ae7367755b3f31a050faa945f7a3991abdb43d941c7294cac890c1e2779d8"; }; nativeBuildInputs = [ makeWrapper ]; From 4ae4e9e28c0e620a7d01fbddc38cb85fe7f81449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 24 Nov 2021 21:56:39 -0800 Subject: [PATCH 20/33] python3Packages.keyring: 23.2.1 -> 23.3.0 https://github.com/jaraco/keyring/blob/v23.3.0/CHANGES.rst --- pkgs/development/python-modules/keyring/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 8f86e6a5dd3..799b0459c3f 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "keyring"; - version = "23.2.1"; + version = "23.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "6334aee6073db2fb1f30892697b1730105b5e9a77ce7e61fca6b435225493efe"; + sha256 = "sha256-Ct7Khr6zoveTYtksf7cZSb51HnJGPywTUOKrXA+9NwE="; }; nativeBuildInputs = [ @@ -43,12 +43,7 @@ buildPythonPackage rec { pytestCheckHook ]; - # Keychain communications isn't possible in our build environment - # keyring.errors.KeyringError: Can't get password from keychain: (-25307, 'Unknown Error') - disabledTests = lib.optionals (stdenv.isDarwin) [ - "test_multiprocess_get" - "test_multiprocess_get_after_native_get" - ] ++ [ + disabledTests = [ # E ValueError: too many values to unpack (expected 1) "test_entry_point" ]; From c591aba83f758235d1948a890659f32cbbf08544 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 25 Nov 2021 08:58:55 +0100 Subject: [PATCH 21/33] python3Packages.awesomeversion: 21.10.1 -> 21.11.0 --- .../python-modules/awesomeversion/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index b57a26060fd..f99407030cd 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -3,32 +3,35 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder -, requests }: buildPythonPackage rec { pname = "awesomeversion"; - version = "21.10.1"; + version = "21.11.0"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-y+QU8T1Cb6FpRcRqhao4KPdE9XlU5C+GURaEuahC25E="; + sha256 = "sha256-qxN5AdLlzadG0/raeAyJ/37PLgYLndl1JQSVkgdLv/4="; }; postPatch = '' - substituteInPlace setup.py --replace "main" ${version} + # Upstream doesn't set a version + substituteInPlace setup.py \ + --replace "main" ${version} ''; - propagatedBuildInputs = [ requests ]; - checkInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "awesomeversion" ]; + pythonImportsCheck = [ + "awesomeversion" + ]; meta = with lib; { description = "Python module to deal with versions"; From 7c4bbc7cd008fb3802e3b5ea44118ebfc013578d Mon Sep 17 00:00:00 2001 From: mwestphal Date: Thu, 25 Nov 2021 09:12:34 +0100 Subject: [PATCH 22/33] Updating F3D URLs for F3D migration (#147173) --- pkgs/applications/graphics/f3d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index bcf707bcced..d2313313dfa 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast and minimalist 3D viewer using VTK"; - homepage = "https://kitware.github.io/F3D"; + homepage = "https://f3d-app.github.io/f3d"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; platforms = with platforms; unix; From 81e2e672a45cbc7ead60aaba23d01b684d89f84f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Nov 2021 22:42:14 +0100 Subject: [PATCH 23/33] python3Packages.zeroconf: 0.36.13 -> 0.37.0 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index a6adbe7e597..a29a4bc8b1a 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.36.13"; + version = "0.37.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-aYNb67ESyz2Q2CKLhG+/Z8Xtt0Js8uf+xrVSEpY0X8c="; + sha256 = "sha256-KdcRG1YKtvhcqq/FNiOVQeXlyYepvPjRL5EZJA8Axyk="; }; propagatedBuildInputs = [ From ee718148c8d8e115e7143ee0dec94301358e1577 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 25 Nov 2021 18:54:23 +1000 Subject: [PATCH 24/33] audacious: 4.0.5 -> 4.1 --- pkgs/applications/audio/audacious/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index a6c8221c9f7..7cd22d25831 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -11,15 +11,15 @@ mkDerivation rec { pname = "audacious"; - version = "4.0.5"; + version = "4.1"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "028zjgz0p7ys15lk2a30m5zcv9xrx3ga50wjsh4m4zxilgkakbji"; + sha256 = "0p734psjjvjcmla2hg5h6a9v1prvy63jj9xm2g2ngs49jy7qan0z"; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "0ny5w1agr9jaz5w3wyyxf1ygmzmd1sivaf97lcm4z4w6529520lz"; + sha256 = "0k0xnqmxi5lna034i2cnzvfzrykxmv4fbs1nkrc9sd2ma1igrmns"; }; nativeBuildInputs = [ gettext pkg-config ]; @@ -36,8 +36,10 @@ mkDerivation rec { libopenmpt ]; + configureFlags = [ "--disable-gtk" ]; + # Here we build both audacious and audacious-plugins in one - # derivations, since they really expect to be in the same prefix. + # derivation, since they really expect to be in the same prefix. # This is slighly tricky. builder = builtins.toFile "builder.sh" '' # First build audacious. From 398168af5297d9b36ebd83ce9fc78ec3b5161fc1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 25 Nov 2021 10:49:51 +0100 Subject: [PATCH 25/33] platformio: override zeroconf --- pkgs/development/embedded/platformio/core.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index fdd9580ed1d..7d586760548 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -49,6 +49,16 @@ let sha256 = "074smp3448wcazlhc7sb8r54l4kfavr6yks3w5x60zl1qpijf52r"; }; }); + + zeroconf = super.zeroconf.overridePythonAttrs (oldAttrs: rec { + version = "0.36.13"; + src = fetchFromGitHub { + owner = "jstasiak"; + repo = "python-zeroconf"; + rev = version; + sha256 = "aYNb67ESyz2Q2CKLhG+/Z8Xtt0Js8uf+xrVSEpY0X8c="; + }; + }); }; }; in From 3024611e45c99bb500dc2b7756cc47aeb213cbae Mon Sep 17 00:00:00 2001 From: Florent C Date: Thu, 25 Nov 2021 10:55:30 +0100 Subject: [PATCH 26/33] maintainers: add florentc --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 41018c41728..670d8da76e6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3908,6 +3908,12 @@ githubId = 183879; name = "Florian Klink"; }; + florentc = { + email = "florentc@users.noreply.github.com"; + github = "florentc"; + githubId = 1149048; + name = "Florent Ch."; + }; FlorianFranzen = { email = "Florian.Franzen@gmail.com"; github = "FlorianFranzen"; From b5d3526bab47eb008b2183438e22165da8cfb84e Mon Sep 17 00:00:00 2001 From: Florent C Date: Thu, 25 Nov 2021 10:56:11 +0100 Subject: [PATCH 27/33] tlaplus: 1.7.0 -> 1.7.1 This updates tlaplus to the most recent stable version and directly fetches the tlatools jar file from the official Github release page instead of building from the sources. In the previous tlaplus nix package, there was an issue with the tools when passing some command line arguments such as `-workers 4` for TLC. A java string method was not found and the program would not proceed correctly. This solves this issue. --- .../science/logic/tlaplus/default.nix | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index f002b808e0a..7d447745a23 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -1,34 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper -, adoptopenjdk-bin, jre, ant -}: +{ lib, stdenv, fetchurl, makeWrapper, adoptopenjdk-bin, jre }: stdenv.mkDerivation rec { pname = "tlaplus"; - version = "1.7.0"; + version = "1.7.1"; - src = fetchFromGitHub { - owner = "tlaplus"; - repo = "tlaplus"; - rev = "refs/tags/v${version}"; - sha256 = "1mm6r9bq79zks50yk0agcpdkw9yy994m38ibmgpb3bi3wkpq9891"; + src = fetchurl { + url = "https://github.com/tlaplus/tlaplus/releases/download/v${version}/tla2tools.jar"; + sha256 = "d532ba31aafe17afba1130f92410d9257454ff7393d1eb2fe032f0c07f352da5"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ adoptopenjdk-bin ant ]; + buildInputs = [ adoptopenjdk-bin ]; - buildPhase = "ant -f tlatools/org.lamport.tlatools/customBuild.xml compile dist"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/java $out/bin - cp tlatools/org.lamport.tlatools/dist/*.jar $out/share/java + cp $src $out/share/java/tla2tools.jar - makeWrapper ${jre}/bin/java $out/bin/tlc2 \ - --add-flags "-cp $out/share/java/tla2tools.jar tlc2.TLC" - makeWrapper ${jre}/bin/java $out/bin/tla2sany \ - --add-flags "-cp $out/share/java/tla2tools.jar tla2sany.SANY" + makeWrapper ${jre}/bin/java $out/bin/tlc \ + --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tlc2.TLC" + makeWrapper ${jre}/bin/java $out/bin/tlasany \ + --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2sany.SANY" makeWrapper ${jre}/bin/java $out/bin/pcal \ - --add-flags "-cp $out/share/java/tla2tools.jar pcal.trans" - makeWrapper ${jre}/bin/java $out/bin/tla2tex \ - --add-flags "-cp $out/share/java/tla2tools.jar tla2tex.TLA" + --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar pcal.trans" + makeWrapper ${jre}/bin/java $out/bin/tlatex \ + --add-flags "-XX:+UseParallelGC -cp $out/share/java/tla2tools.jar tla2tex.TLA" ''; meta = { @@ -36,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "http://lamport.azurewebsites.net/tla/tla.html"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.thoughtpolice ]; + maintainers = with lib.maintainers; [ florentc thoughtpolice ]; }; } From ebee4b009010381d5ca0282f7f24a183ea2d528f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 25 Nov 2021 11:15:49 +0100 Subject: [PATCH 28/33] python3Packages.pyatv: remove version pinning --- .../python-modules/pyatv/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 092e5b91f16..6a883bbff33 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { pname = "pyatv"; version = "0.9.6"; - format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -32,11 +32,6 @@ buildPythonPackage rec { sha256 = "0navm7a0k1679kj7nbkbyl7s2q0wq0xmcnizmnvp0arkd5xqmqv1"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner" "" - ''; - propagatedBuildInputs = [ aiohttp bitarray @@ -57,6 +52,18 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + # Remove all version pinning + sed -i -e "s/==[0-9.]*//" requirements/requirements.txt + ''; + + disabledTestPaths = [ + # Test doesn't work in the sandbox + "tests/protocols/companion/test_companion_auth.py" + ]; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ From c1eb0dddea79c5b5911dc1bb818378abda2cdedf Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Thu, 25 Nov 2021 21:19:48 +1100 Subject: [PATCH 29/33] delly: 0.8.7 -> 0.9.1 --- pkgs/applications/science/biology/delly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index fe81ff44d24..f2e0d3a50c2 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "delly"; - version = "0.8.7"; + version = "0.9.1"; src = fetchFromGitHub { owner = "dellytools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DWwC35r8cQbePUzppkFQlev0YZdxk2+BSrNTW/DOY3M="; + sha256 = "sha256-p1pryP+ktGt8OHFiASJQ3T+K94cNBG9fLxsJ2n/T+DA="; }; buildInputs = [ zlib htslib bzip2 xz ncurses boost ]; From 8efc68c03f4a34004e71b57050edd44b4fecaeee Mon Sep 17 00:00:00 2001 From: Joel Date: Thu, 25 Nov 2021 20:33:48 +1000 Subject: [PATCH 30/33] syncthing: 1.18.3 -> 1.18.4 --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 261a9969872..d507dbc35bd 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.18.3"; + version = "1.18.4"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "sha256-wc4+j2kTSwZsxIdJHmznkNIq436p0yNrskchuEJtL5E="; + sha256 = "14vq14gfqlqi1gg1psq9gs2i0ki6xlcfrjfcxi148hpaf38ly7pw"; }; - vendorSha256 = "sha256-klbAVOHLefxG33zpEYFlPezrKrXfuWOaE+UnIsu462M="; + vendorSha256 = "0qzbp35j49z52fd67ffznlmfpv1xcn0i3sbwvx3gqyfbw5ac0mlj"; doCheck = false; From 28b5d59de2cbf34cc7af759b01b808a04777a15f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Min=C3=A1=C5=99?= Date: Thu, 25 Nov 2021 11:32:45 +0100 Subject: [PATCH 31/33] megasync: 4.5.3.0 -> 4.6.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit with ffmpeg with freeimage Signed-off-by: Michal Minář --- pkgs/applications/misc/megasync/default.nix | 17 +++++++++-------- pkgs/applications/misc/megasync/ffmpeg_44.patch | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/misc/megasync/ffmpeg_44.patch diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index 438a468afa1..4b273981fa9 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -7,7 +7,8 @@ , curl , doxygen , fetchFromGitHub -#, ffmpeg +, ffmpeg +, freeimage , libmediainfo , libraw , libsodium @@ -27,13 +28,13 @@ }: mkDerivation rec { pname = "megasync"; - version = "4.5.3.0"; + version = "4.6.1.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "1lwjmdbqyxx5wd8nx4mc830fna37jad4h93viwfh5x7sxn104js7"; + sha256 = "0v2fvji9hs7valya0wx5qjx01c7yjld6nnp6m9gpxfkr30h5s5wb"; fetchSubmodules = true; }; @@ -52,8 +53,8 @@ mkDerivation rec { c-ares cryptopp curl - # temporarily disable until patched for ffmpeg 4.4 - #ffmpeg + ffmpeg + freeimage libmediainfo libraw libsodium @@ -71,6 +72,7 @@ mkDerivation rec { ./noinstall-distro-version.patch # megasync target is not part of the install rule thanks to a commented block ./install-megasync.patch + ./ffmpeg_44.patch ]; postPatch = '' @@ -95,9 +97,8 @@ mkDerivation rec { "--with-cares" "--with-cryptopp" "--with-curl" - # temporarily disable until patched for ffmpeg 4.4 - #"--with-ffmpeg" - "--without-freeimage" # unreferenced even when found + "--with-ffmpeg" + "--with-freeimage" "--without-readline" "--without-termcap" "--with-sodium" diff --git a/pkgs/applications/misc/megasync/ffmpeg_44.patch b/pkgs/applications/misc/megasync/ffmpeg_44.patch new file mode 100644 index 00000000000..901635e43f3 --- /dev/null +++ b/pkgs/applications/misc/megasync/ffmpeg_44.patch @@ -0,0 +1,14 @@ +Index: megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp +=================================================================== +--- megasync-4.6.1.0.orig/src/MEGASync/mega/src/gfx/freeimage.cpp ++++ megasync-4.6.1.0/src/MEGASync/mega/src/gfx/freeimage.cpp +@@ -253,7 +253,8 @@ bool GfxProcFreeImage::readbitmapFfmpeg( + + // Force seeking to key frames + formatContext->seek2any = false; +- videoStream->skip_to_keyframe = true; ++ // no longer exposed in ffmpeg 4.4; the line above should be sufficient ++ //videoStream->skip_to_keyframe = true; + if (decoder->capabilities & CAP_TRUNCATED) + { + codecContext->flags |= CAP_TRUNCATED; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de0fe8f020f..7a9d7517def 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3288,7 +3288,9 @@ with pkgs; medusa = callPackage ../tools/security/medusa { }; - megasync = libsForQt515.callPackage ../applications/misc/megasync { }; + megasync = libsForQt5.callPackage ../applications/misc/megasync { + ffmpeg = ffmpeg-full; + }; megacmd = callPackage ../applications/misc/megacmd { }; From 80f5a12fa3e39789fe51e832385c39104b7d6fa3 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Thu, 25 Nov 2021 19:12:18 +0800 Subject: [PATCH 32/33] jetbrains.datagrip: 2021.2.4 -> 2021.3.1 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 4c65ddcc8f6..db5f8275386 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -255,12 +255,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.2.4"; /* updated by script */ + version = "2021.3.1"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1vj9ihzw07bh30ngy8mj027ljq9zzd904k61f8jbfpw75vknh8f6"; /* updated by script */ + sha256 = "18drbddcjbbv6q6j95wy7ila8d7imi0gh5nnf0lhj4gkkxhszmii"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; From b9f2c542ba87f7d668e1799b24340fe9c1b57eed Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 25 Nov 2021 11:13:51 +0000 Subject: [PATCH 33/33] deno: 1.16.2 -> 1.16.3 --- pkgs/development/web/deno/default.nix | 6 +++--- pkgs/development/web/deno/librusty_v8.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index d27dac79b7b..9882f95f528 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.16.2"; + version = "1.16.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Qf1eDQ6ZbBGOQIDh2q8hKjsKB0Ri9Hjqq1AMOTanML0="; + sha256 = "sha256-9qfBreviTcWgkvZCD7bSvCaC40G+u1v4geGissJ4jE4="; }; - cargoSha256 = "sha256-ZA9pR8yQV5v/Xa/B7M01PIqrkBe1DVIXC5VURoE1EtI="; + cargoSha256 = "sha256-20o3JgpL4tHVDoH/l3yM7kCZyXu/vciA8ACubzRvPKA="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 7539f41e3af..73dcd7593d8 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.34.0"; + version = "0.35.0"; shas = { - x86_64-linux = "sha256-Ly5bEfC993JH3/1VNpFu72Dv8kJYOFu+HIlEUJJcHps="; - aarch64-linux = "sha256-zazlvm4uyHD6Z+2JmeHS7gQ84C83KTWOGqNjSNPgoT0="; - x86_64-darwin = "sha256-RTgbtkCAuIj/ceJNbdA0yfKtFG8hSZgurEHEuUfJ7fk="; - aarch64-darwin = "sha256-xrOUPEZ4tj2BK6pDeoTpTKDx4E1KUEQ+lGMyduKDvBE="; + x86_64-linux = "sha256-vMqLxARbR39G7YSACvqxp+3WLDcfivDgMkvkAEtJ758="; + aarch64-linux = "sha256-8rU4Z+eOt4RduiYM97uPiVLAspPkvmf7oeTVuVfBjII="; + x86_64-darwin = "sha256-SIXXfK72FfwGv44Z+Qu+a5YAtUaqo/qEpMJZdpOdr3A="; + aarch64-darwin = "sha256-FAzwPlST02O5b/T9cz+uKNp6GFhFrgQnmabrAjMfmWc="; }; }