From 3f4429cafc470dfec17885d1a4de0db407a2f06a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 7 Feb 2021 07:50:25 +0000 Subject: [PATCH 01/32] gnomeExtensions.unite: 44 -> 45 --- pkgs/desktops/gnome-3/extensions/unite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/unite/default.nix b/pkgs/desktops/gnome-3/extensions/unite/default.nix index 9d58a923740e..1949b97fafb0 100644 --- a/pkgs/desktops/gnome-3/extensions/unite/default.nix +++ b/pkgs/desktops/gnome-3/extensions/unite/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, gnome3, fetchFromGitHub, xprop, glib, coreutils }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite"; - version = "44"; + version = "45"; src = fetchFromGitHub { owner = "hardpixel"; repo = "unite-shell"; rev = "v${version}"; - sha256 = "0nqc1q2yz4xa3fdfx45w6da1wijmdwzhdrch0mqwblgbpjr4fs9g"; + sha256 = "sha256-ghmCnzlPvxHEy2ro1AL+T2yiavJVrPhRfIKbMBwMjac="; }; uuid = "unite@hardpixel.eu"; From 8e7955e5bf11815b56c6975fe990fcb3a6a4dd09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 10 Feb 2021 13:20:34 +0100 Subject: [PATCH 02/32] cudatoolkit_11_2: init at 11.2.1 --- pkgs/development/compilers/cudatoolkit/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index b3b7b305fba6..5d33ea785804 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -153,5 +153,12 @@ in rec { gcc = gcc9; }; + cudatoolkit_11_2 = common { + version = "11.2.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.2.1/local_installers/cuda_11.2.1_460.32.03_linux.run"; + sha256 = "sha256-HamMuJfMX1inRFpKZspPaSaGdwbLOvWKZpzc2Nw9F8g="; + gcc = gcc9; + }; + cudatoolkit_11 = cudatoolkit_11_1; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b0952fbe1135..050a4fcb7278 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3401,7 +3401,8 @@ in cudatoolkit_10_1 cudatoolkit_10_2 cudatoolkit_11 - cudatoolkit_11_0; + cudatoolkit_11_0 + cudatoolkit_11_2; cudatoolkit = cudatoolkit_10; From 23fecf0d5a1317ad9b1902674d4b2e79e92be080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 10 Feb 2021 13:22:14 +0100 Subject: [PATCH 03/32] cudatoolkit_11_1: add missing top-level attribute --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 050a4fcb7278..9ae0f6906f6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3402,6 +3402,7 @@ in cudatoolkit_10_2 cudatoolkit_11 cudatoolkit_11_0 + cudatoolkit_11_1 cudatoolkit_11_2; cudatoolkit = cudatoolkit_10; From 63cdb44b488f735eb330a428f03e772f00f9144f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 10 Feb 2021 13:22:47 +0100 Subject: [PATCH 04/32] cudnn_cudatoolkit_11_0: 8.0.2 -> 8.1.0 --- pkgs/development/libraries/science/math/cudnn/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index d99149c0e965..7de35092d504 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -82,10 +82,12 @@ in rec { cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_2; cudnn_cudatoolkit_11_0 = generic rec { - version = "8.0.2"; + version = "8.1.0"; cudatoolkit = cudatoolkit_11_0; - srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v8.0.2.39.tgz"; - sha256 = "0ib3v3bgcdxarqapkxngw1nwl0c2a7zz392ns7w9ipcficl4cbv7"; + # 8.1.0 is compatible with CUDA 11.0, 11.1, and 11.2: + # https://docs.nvidia.com/deeplearning/cudnn/support-matrix/index.html#cudnn-cuda-hardware-versions + srcName = "cudnn-11.2-linux-x64-v8.1.0.77.tgz"; + sha256 = "sha256-2+gvrwcdkbqbzwBIAUatM/RiSC3+5WyvRHnBuNq+Pss="; }; cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_0; From 961f53124236a4233fca78c45c03b47bb6156fe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 10 Feb 2021 13:25:50 +0100 Subject: [PATCH 05/32] cudnn_cudatoolkit_11_1: init at 8.1.0 --- pkgs/development/libraries/science/math/cudnn/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 7de35092d504..6efdc8c9361f 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,4 @@ -{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0 }: +{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -90,5 +90,9 @@ in rec { sha256 = "sha256-2+gvrwcdkbqbzwBIAUatM/RiSC3+5WyvRHnBuNq+Pss="; }; + cudnn_cudatoolkit_11_1 = cudnn_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_1; + }; + cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_0; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ae0f6906f6c..5b62f7da7f87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3422,7 +3422,8 @@ in cudnn_cudatoolkit_10_1 cudnn_cudatoolkit_10_2 cudnn_cudatoolkit_11 - cudnn_cudatoolkit_11_0; + cudnn_cudatoolkit_11_0 + cudnn_cudatoolkit_11_1; cudnn = cudnn_cudatoolkit_10; From cbbacce70a7ae3a241c34238d68bff46004fa722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 10 Feb 2021 13:27:55 +0100 Subject: [PATCH 06/32] cudnn_cudatoolkit_11_2: init at 8.1.0 --- pkgs/development/libraries/science/math/cudnn/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 6efdc8c9361f..265c05541e9c 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,4 @@ -{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1 }: +{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -94,5 +94,9 @@ in rec { cudatoolkit = cudatoolkit_11_1; }; + cudnn_cudatoolkit_11_2 = cudnn_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_2; + }; + cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_0; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b62f7da7f87..0f512cf16bec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3423,7 +3423,8 @@ in cudnn_cudatoolkit_10_2 cudnn_cudatoolkit_11 cudnn_cudatoolkit_11_0 - cudnn_cudatoolkit_11_1; + cudnn_cudatoolkit_11_1 + cudnn_cudatoolkit_11_2; cudnn = cudnn_cudatoolkit_10; From 18b5919d81244770178aea90cd6b6cd06afbba7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 10 Feb 2021 13:28:53 +0100 Subject: [PATCH 07/32] cudatoolkit_11: cudatoolkit_11_1 -> cudatoolkit_11_2 --- pkgs/development/compilers/cudatoolkit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 5d33ea785804..3c08e9030ffa 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -160,5 +160,5 @@ in rec { gcc = gcc9; }; - cudatoolkit_11 = cudatoolkit_11_1; + cudatoolkit_11 = cudatoolkit_11_2; } From f1db117b9f6af75fb5302bc99bbe14087024b6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 10 Feb 2021 13:29:38 +0100 Subject: [PATCH 08/32] cudnn_cudatoolkit_11: cudnn_cudatoolkit_11_0 -> cudnn_cudatoolkit_11_2 --- pkgs/development/libraries/science/math/cudnn/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 265c05541e9c..c9bf9a49e683 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -98,5 +98,5 @@ in rec { cudatoolkit = cudatoolkit_11_2; }; - cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_0; + cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_2; } From 280be6172a794c7eb8fab1b9de1af728f0e3d671 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 11 Feb 2021 23:53:39 +0000 Subject: [PATCH 09/32] teler: 1.0.1 -> 1.0.2-dev --- pkgs/tools/security/teler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/teler/default.nix b/pkgs/tools/security/teler/default.nix index 4a971243ad1b..2ca92c909b3e 100644 --- a/pkgs/tools/security/teler/default.nix +++ b/pkgs/tools/security/teler/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "teler"; - version = "1.0.1"; + version = "1.0.2-dev"; src = fetchFromGitHub { owner = "kitabisa"; repo = "teler"; rev = "v${version}"; - sha256 = "07pfqgms5cj4y6zm984qjmmw1c8j9yjbgrp2spi9vzk96s3k3qn3"; + sha256 = "sha256-Hmoj44/rprM9oSFAsRWLszew0RvCTjdHISUSrx/4IPs="; }; - vendorSha256 = "06szi2jw3nayd7pljjlww2gsllgnfg8scnjmc6qv5xl6gf797kdz"; + vendorSha256 = "sha256-L+wjurURpesCA2IK0r1sxvOUvNJT1wiRp75kpe6LH5s="; # test require internet access doCheck = false; From e8d4afeb1cb05c739f465286614e010af4d3d8c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 14:57:10 +0100 Subject: [PATCH 10/32] python3Packages.auroranoaa: init at 0.0.2 --- .../python-modules/auroranoaa/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/auroranoaa/default.nix diff --git a/pkgs/development/python-modules/auroranoaa/default.nix b/pkgs/development/python-modules/auroranoaa/default.nix new file mode 100644 index 000000000000..5d3fe1ff15dd --- /dev/null +++ b/pkgs/development/python-modules/auroranoaa/default.nix @@ -0,0 +1,32 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "auroranoaa"; + version = "0.0.2"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "djtimca"; + repo = "aurora-api"; + rev = version; + sha256 = "0bh8amixkg3xigwh3ryra22x6kzhbdassmf1iqv20lhbvzmsqjv0"; + }; + + propagatedBuildInputs = [ aiohttp ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "auroranoaa" ]; + + meta = with lib; { + description = "Python wrapper for the Aurora API"; + homepage = "https://github.com/djtimca/aurora-api"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17f6624c42ea..39392050bb94 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -542,6 +542,8 @@ in { augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; }; + auroranoaa = callPackage ../development/python-modules/auroranoaa { }; + auth0-python = callPackage ../development/python-modules/auth0-python { }; authheaders = callPackage ../development/python-modules/authheaders { }; From 3b57a4820ec276252a511569659c7348aebd9ca9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 14:57:48 +0100 Subject: [PATCH 11/32] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 40779f4bc198..ca8746c210e0 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -57,7 +57,7 @@ "aten_pe" = ps: with ps; [ atenpdu ]; "atome" = ps: with ps; [ ]; # missing inputs: pyatome "august" = ps: with ps; [ ]; # missing inputs: py-august - "aurora" = ps: with ps; [ ]; # missing inputs: auroranoaa + "aurora" = ps: with ps; [ auroranoaa ]; "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy "auth" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ aiohttp-cors ]; From 4d2f44992c508a38e781abea0b02ad9395d7da9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 15:16:35 +0100 Subject: [PATCH 12/32] python3Packages.metar: init at 1.8.0 --- .../python-modules/metar/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/metar/default.nix diff --git a/pkgs/development/python-modules/metar/default.nix b/pkgs/development/python-modules/metar/default.nix new file mode 100644 index 000000000000..e832c7cf56fe --- /dev/null +++ b/pkgs/development/python-modules/metar/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "metar"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "python-metar"; + repo = "python-metar"; + rev = "v${version}"; + sha256 = "019vfq9191cdvvq1afdcdgdgbzpj7wq6pz9li8ggim71azjnv5nn"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "metar" ]; + + meta = with lib; { + description = "Python parser for coded METAR weather reports"; + homepage = "https://github.com/python-metar/python-metar"; + license = with licenses; [ bsd1 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17f6624c42ea..fd5ad52e58e9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -542,6 +542,8 @@ in { augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; }; + auroranoaa = callPackage ../development/python-modules/auroranoaa { }; + auth0-python = callPackage ../development/python-modules/auth0-python { }; authheaders = callPackage ../development/python-modules/authheaders { }; @@ -4032,6 +4034,8 @@ in { metaphone = callPackage ../development/python-modules/metaphone { }; + metar = callPackage ../development/python-modules/metar { }; + mezzanine = callPackage ../development/python-modules/mezzanine { }; micawber = callPackage ../development/python-modules/micawber { }; From 838a98defb8bbe9b206e44435c9d0fa7c2836dc3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 15:17:57 +0100 Subject: [PATCH 13/32] python3Packages.pynws: init 1.3.0 --- .../python-modules/pynws/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +- 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/pynws/default.nix diff --git a/pkgs/development/python-modules/pynws/default.nix b/pkgs/development/python-modules/pynws/default.nix new file mode 100644 index 000000000000..abe4c93b818f --- /dev/null +++ b/pkgs/development/python-modules/pynws/default.nix @@ -0,0 +1,47 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, freezegun +, metar +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pynws"; + version = "1.3.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "MatthewFlamm"; + repo = pname; + rev = "v${version}"; + sha256 = "13ipmx60kicwh8qxjazap4vk94x8i3r0lnkdsap7gffaizwgp49d"; + }; + + propagatedBuildInputs = [ + aiohttp + metar + ]; + + checkInputs = [ + freezegun + pytest-aiohttp + pytest-asyncio + pytest-cov + pytestCheckHook + ]; + + pythonImportsCheck = [ "pynws" ]; + + meta = with lib; { + description = "Python library to retrieve data from NWS/NOAA"; + homepage = "https://github.com/MatthewFlamm/pynws"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fd5ad52e58e9..f7e239e50f86 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -542,8 +542,6 @@ in { augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; }; - auroranoaa = callPackage ../development/python-modules/auroranoaa { }; - auth0-python = callPackage ../development/python-modules/auth0-python { }; authheaders = callPackage ../development/python-modules/authheaders { }; @@ -4918,6 +4916,8 @@ in { pynuki = callPackage ../development/python-modules/pynuki { }; + pynws = callPackage ../development/python-modules/pynws { }; + pysbd = callPackage ../development/python-modules/pysbd { }; pyshark = callPackage ../development/python-modules/pyshark { }; From fe17d133a90941f549073159a263a750808a9d6a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 15:18:45 +0100 Subject: [PATCH 14/32] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 40779f4bc198..54209498167b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -565,7 +565,7 @@ "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio "number" = ps: with ps; [ ]; "nut" = ps: with ps; [ ]; # missing inputs: pynut2 - "nws" = ps: with ps; [ ]; # missing inputs: pynws + "nws" = ps: with ps; [ pynws ]; "nx584" = ps: with ps; [ ]; # missing inputs: pynx584 "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics From 920aefdde6bb2be1d3dba4bba55b92457f3ede75 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 18:06:42 +0100 Subject: [PATCH 15/32] python3Packages.guppy3: init at 3.1.0 --- .../python-modules/guppy3/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/guppy3/default.nix diff --git a/pkgs/development/python-modules/guppy3/default.nix b/pkgs/development/python-modules/guppy3/default.nix new file mode 100644 index 000000000000..578f979914cb --- /dev/null +++ b/pkgs/development/python-modules/guppy3/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, tkinter +}: + +buildPythonPackage rec { + pname = "guppy3"; + version = "3.1.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "zhuyifei1999"; + repo = pname; + rev = "v${version}"; + sha256 = "0yjsn8najbic4f50nj6jzhzrhj1bw6918w0gihdkzhqynwgqi64m"; + }; + + propagatedBuildInputs = [ tkinter ]; + + # Tests are starting a Tkinter GUI + doCheck = false; + pythonImportsCheck = [ "guppy" ]; + + meta = with lib; { + description = "Python Programming Environment & Heap analysis toolset"; + homepage = "https://zhuyifei1999.github.io/guppy3/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 17f6624c42ea..1468786383f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2854,6 +2854,8 @@ in { else callPackage ../development/python-modules/gunicorn { }; + guppy3 = callPackage ../development/python-modules/guppy3 { }; + gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" then callPackage ../development/python-modules/gurobipy/darwin.nix { inherit (pkgs.darwin) cctools insert_dylib; } else if stdenv.hostPlatform.system == "x86_64-linux" then From 3a095992b8b5cd9730fe52929692175c3fd04e57 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 18:07:39 +0100 Subject: [PATCH 16/32] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 40779f4bc198..dd4ee478dee2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -631,7 +631,7 @@ "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint "poolsense" = ps: with ps; [ poolsense ]; "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall - "profiler" = ps: with ps; [ objgraph pyprof2calltree ]; # missing inputs: guppy3 + "profiler" = ps: with ps; [ guppy3 objgraph pyprof2calltree ]; "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; From f61b15b00b828a264f9e9c0398414a7dc21d482a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Feb 2021 11:35:06 +0000 Subject: [PATCH 17/32] python37Packages.google-cloud-bigquery: 2.7.0 -> 2.8.0 --- .../python-modules/google-cloud-bigquery/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 2cada2e0b0f6..a26642651716 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -7,7 +7,6 @@ , google-cloud-storage , google-cloud-testutils , google-resumable-media -, grpcio , ipython , mock , pandas @@ -18,11 +17,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.7.0"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "29721972f5e539e486fbdc722ddf849ad86acd092680d16c271430dc16023544"; + sha256 = "c4c43f7f440d6e5bb2895d21122af5de65b487ea2c69cea466a516bb826ab921"; }; propagatedBuildInputs = [ From d72819ef808191b4b97a686a5435992025fac981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 13 Feb 2021 21:16:04 +0100 Subject: [PATCH 18/32] pythonPackages.transitions: 0.8.6 -> 0.8.7 --- .../python-modules/transitions/default.nix | 40 ++++++++++++++----- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index 2dda33fd9682..013cf73ee1f9 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -1,21 +1,39 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, six, pytestCheckHook, mock, dill, pycodestyle }: +{ lib +, buildPythonPackage +, fetchPypi +, six +, pygraphviz +, pytestCheckHook +, mock +, graphviz +, pycodestyle +}: buildPythonPackage rec { pname = "transitions"; - version = "0.8.6"; + version = "0.8.7"; - # test_codestyle.py fails in PyPI sdist - src = fetchFromGitHub { - owner = "pytransitions"; - repo = "transitions"; - rev = version; - sha256 = "1d913hzzyqhdhhbkbvjw65dqkajrw50a4sxhyxk0jlg8pcs7bs7v"; + src = fetchPypi { + inherit pname version; + sha256 = "8c60ec0828cd037820726283cad5d4d77a5e31514e058b51250420e9873e9bc7"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + pygraphviz # optional + ]; - checkInputs = [ pytestCheckHook mock dill pycodestyle ]; + checkInputs = [ + pytestCheckHook + mock + graphviz + pycodestyle + ]; + + disabledTests = [ + # Fontconfig error: Cannot load default config file + "test_diagram" + ]; meta = with lib; { homepage = "https://github.com/pytransitions/transitions"; From b0b855139d96f935e59432f8254a92ddb62f6a99 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sat, 13 Feb 2021 20:23:10 +0100 Subject: [PATCH 19/32] python3.pkgs.osmpythontools: 0.2.9 -> 0.3.0 also: - replace gpl3 with gpl3Only - add patch comment --- .../development/python-modules/osmpythontools/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/osmpythontools/default.nix b/pkgs/development/python-modules/osmpythontools/default.nix index ccb15aec01b3..3cb0bc49e724 100644 --- a/pkgs/development/python-modules/osmpythontools/default.nix +++ b/pkgs/development/python-modules/osmpythontools/default.nix @@ -13,15 +13,17 @@ buildPythonPackage rec { pname = "osmpythontools"; - version = "0.2.9"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mocnik-science"; repo = "osm-python-tools"; rev = "v${version}"; - sha256 = "1qpj03fgn8rmrg9a9vk7bw32k9hdy15g5p2q3a6q52ykpb78jdz5"; + sha256 = "0r72z7f7kmvvbd9zvgci8rwmfj85xj34mb3x5dj3jcv5ij5j72yh"; }; + # Upstream setup.py has test dependencies in `install_requires` argument. + # Remove them, as we don't run the tests. patches = [ ./remove-test-only-dependencies.patch ]; propagatedBuildInputs = [ @@ -55,7 +57,7 @@ buildPythonPackage rec { Nominatim, and the OpenStreetMap editing API. ''; homepage = "https://github.com/mocnik-science/osm-python-tools"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ das-g ]; }; } From b7e067969d8d50e104bd028ff681db63a4cb9a70 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 14 Feb 2021 05:56:48 +0900 Subject: [PATCH 20/32] erlang: update jdk to lts --- pkgs/development/interpreters/erlang/generic-builder.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 538b4224909c..ab37c726515d 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,7 +1,6 @@ { pkgs, lib, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused , libxml2, libxslt, ncurses, openssl, perl, autoconf -# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731 -, openjdk8 ? null # javacSupport +, openjdk11 ? null # javacSupport , unixODBC ? null # odbcSupport , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null , parallelBuild ? false @@ -17,7 +16,7 @@ , enableThreads ? true , enableSmpSupport ? true , enableKernelPoll ? true -, javacSupport ? false, javacPackages ? [ openjdk8 ] +, javacSupport ? false, javacPackages ? [ openjdk11 ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] , withSystemd ? stdenv.isLinux # systemd support in epmd , wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] @@ -37,7 +36,7 @@ assert wxSupport -> (if stdenv.isDarwin else libGL != null && libGLU != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; -assert javacSupport -> openjdk8 != null; +assert javacSupport -> openjdk11 != null; let inherit (lib) optional optionals optionalAttrs optionalString; From 94109e5b37fa9a16556f3dddbd127811393d3c16 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 14 Feb 2021 06:58:47 +1000 Subject: [PATCH 21/32] fzf: 0.25.0 -> 0.25.1 https://github.com/junegunn/fzf/releases/tag/0.25.1 --- pkgs/tools/misc/fzf/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 837277a5c858..25542543d658 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,28 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, perl }: buildGoModule rec { pname = "fzf"; - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "1j5bfxl4w8w3n89p051y8dhxg0py9l98v7r2gkr63bg4lj32faz8"; + sha256 = "085apa4msw8v8f57942xh7wfw3dkavrl9d58yj6i3yr75l3vg05r"; }; vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p"; outputs = [ "out" "man" ]; - patches = [ - # Fix test failure on go 1.15 - (fetchpatch { - url = "https://github.com/junegunn/fzf/commit/82791f7efccde5b30da0b4d44f10d214ae5c0c0d.patch"; - sha256 = "1nybsz09h8cnvxjnkmx9c52g8z0x6pvrn230hw1va5a3pvmg01z1"; - }) - ]; - fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings"; buildInputs = [ ncurses ]; From b3fce6596dfca030188821f15f54e386a208858f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 14 Feb 2021 07:09:13 +1000 Subject: [PATCH 22/32] packer: set ldflags, install zsh completion --- pkgs/development/tools/packer/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 16e5ac082039..7dc50d6246a5 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "packer"; version = "1.6.6"; @@ -14,6 +14,14 @@ buildGoPackage rec { sha256 = "sha256-kFDy8Zlx+D5JDyNlAmB/ICTe4K9s6KDbALP5pom5OQg="; }; + buildFlagsArray = [ "-ldflags=-s -w" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --zsh go/src/${goPackagePath}/contrib/zsh-completion/_packer + ''; + meta = with lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; homepage = "https://www.packer.io"; From 00a6e876e9aaf909fa58c7101a72eaadb6e10418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 13 Feb 2021 23:21:29 +0100 Subject: [PATCH 23/32] ansi2html: add alias to top level --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 698ec43fcdce..539c34066ba7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13089,6 +13089,8 @@ in amrwb = callPackage ../development/libraries/amrwb { }; + ansi2html = with python3.pkgs; toPythonApplication ansi2html; + anttweakbar = callPackage ../development/libraries/AntTweakBar { }; appstream = callPackage ../development/libraries/appstream { }; From 715292c1e5b7a88bfdc01c746f446f9ab4e0b907 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Feb 2021 23:52:06 +0100 Subject: [PATCH 24/32] python3Packages.asyncwhois: enable tests --- .../python-modules/asyncwhois/default.nix | 40 ++++++++++++++----- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index 53f9f7e8f942..5c42e53fde04 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -1,20 +1,23 @@ { lib -, buildPythonPackage -, fetchPypi -, pythonOlder , aiodns -, tldextract +, asynctest +, buildPythonPackage +, fetchFromGitHub , pytestCheckHook +, pythonOlder +, tldextract }: buildPythonPackage rec { pname = "asyncwhois"; version = "0.2.4"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "84677e90bc2d2975788e905ae9841bc91a732a452bc870991105b0a6cc3cd22f"; + src = fetchFromGitHub { + owner = "pogzyb"; + repo = pname; + rev = "v${version}"; + sha256 = "17w007hjnpggj6jvkv8wxwllxk6mir1q2nhw0dqg7glm4lfbx8kr"; }; propagatedBuildInputs = [ @@ -22,9 +25,24 @@ buildPythonPackage rec { tldextract ]; - # tests are only present at GitHub but not the released source tarballs - # https://github.com/pogzyb/asyncwhois/issues/10 - doCheck = false; + checkInputs = [ + asynctest + pytestCheckHook + ]; + + # Disable tests that require network access + disabledTests = [ + "test_pywhois_aio_get_hostname_from_ip" + "test_pywhois_get_hostname_from_ip" + "test_pywhois_aio_lookup_ipv4" + "test_not_found" + "test_aio_from_whois_cmd" + "test_aio_get_hostname_from_ip" + "test_from_whois_cmd" + "test_get_hostname_from_ip" + "test_whois_query_run" + ]; + pythonImportsCheck = [ "asyncwhois" ]; meta = with lib; { From b6ad8aec4eb3becf8d30b5bace6627892e57d088 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Feb 2021 23:39:11 +0000 Subject: [PATCH 25/32] clojure-lsp: 2021.02.10-21.13.12 -> 2021.02.13-18.04.19 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index d99649fd2a9b..9e9f3310d952 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "2021.02.10-21.13.12"; + version = "2021.02.13-18.04.19"; src = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar"; - sha256 = "sha256-kYetCpInY87l1NTaIhjzkNc2LQctMbSmcdQuI7zrFG4="; + sha256 = "sha256-v7+HH77xFxQc0LjVhcrXsdcmmZmrPiMSArxfoOaHkoI="; }; dontUnpack = true; From 498baf8fca3d8098a42b413752855e7125c7b164 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Feb 2021 23:53:05 +0000 Subject: [PATCH 26/32] convco: 0.3.2 -> 0.3.3 --- pkgs/development/tools/convco/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix index d6be170bb8f6..c152197358c9 100644 --- a/pkgs/development/tools/convco/default.nix +++ b/pkgs/development/tools/convco/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "0fqq6irbq1aikhhw08gc9kp0vbk2aminfbvwdlm58cvywyq91bn4"; + sha256 = "sha256-eWe7oTWl7QfIqq3GfMILi5S8zUi03ER1Mzfr8hqUvgw="; }; - cargoSha256 = "073sfv42fbl8rjm3dih1ghs9vq75mjshp66zdzdan2dmmrnw5m9z"; + cargoSha256 = "sha256-hAUg2mh4VyyjkBRBs5YWi14yeGlMXxt+cdoz5xOS+1A="; nativeBuildInputs = [ openssl perl pkg-config ]; From a8559f10e5ae6618e6a5c6e23bcf88d782ef56bf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 13 Feb 2021 23:58:53 +0000 Subject: [PATCH 27/32] coursier: 2.0.9 -> 2.0.11 --- pkgs/development/tools/coursier/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index e016f0ef7c92..ba96cfafe480 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -2,7 +2,7 @@ , coreutils, git, gnused, nix, nixfmt }: let - version = "2.0.9"; + version = "2.0.11"; zshCompletion = fetchurl { url = @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "sha256-jqSv9VBLotl6YVWgWNznvTThRIiMUStQ0WbN6u01b1c="; + sha256 = "sha256-jmKJPBPzO8DiXuJoHWibinkaAzneXdSK85SQfJ2nWhg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -37,14 +37,7 @@ in stdenv.mkDerivation rec { #!${stdenv.shell} set -o errexit PATH=${ - lib.makeBinPath [ - common-updater-scripts - coreutils - git - gnused - nix - nixfmt - ] + lib.makeBinPath [ common-updater-scripts coreutils git gnused nix nixfmt ] } oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} 'v*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" From 1c9d1783718afd77a88b7613e51fc27b01b90682 Mon Sep 17 00:00:00 2001 From: ilian Date: Sun, 24 Jan 2021 16:26:04 +0100 Subject: [PATCH 28/32] linux-rt: use latest version Take the last kernel version listed in sha256sums.asc when multiple versions are listed. We assume that the patches listed in sha256sums.asc are ordered by increasing version number. --- pkgs/os-specific/linux/kernel/update-rt.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/update-rt.sh b/pkgs/os-specific/linux/kernel/update-rt.sh index 4cbd45524a86..8cac5929252d 100755 --- a/pkgs/os-specific/linux/kernel/update-rt.sh +++ b/pkgs/os-specific/linux/kernel/update-rt.sh @@ -36,7 +36,8 @@ file-version() { latest-rt-version() { branch="$1" # e.g. 5.4 curl -sL "$mirror/projects/rt/$branch/sha256sums.asc" | - sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/; p; q }' + sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/p}' | + tail -n 1 } update-if-needed() { From bc704b5f63a6d695fef6c89ca0d29765ca9ba0ca Mon Sep 17 00:00:00 2001 From: ilian Date: Sun, 24 Jan 2021 16:28:54 +0100 Subject: [PATCH 29/32] linux-rt_5_4: 5.4.84-rt47 -> 5.4.93-rt51 --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 25e3172b0f3a..6fbfa23e7394 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.84-rt47"; # updated by ./update-rt.sh + version = "5.4.93-rt51"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "058mhczv6whjwxn7jjh1c6n5zrqjdnvbl2mp7jkfrg6frpvgr189"; + sha256 = "08nmwd13z10866pc16fqbj41krnvk6hxkl4nmhdkpk346r04jx6k"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0nccxf9l9ycvb782f48zrbl59vi674qq7yjyaks97440pgyd1jg0"; + sha256 = "1ffipbnzv8rnmawjlglm667jq67asdr1mwrfhsmwkvlmivm9k4x1"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; From fc3b385a4f1ec284f57fd8539eb90b7afb96add5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 26 Jan 2021 17:48:46 +1000 Subject: [PATCH 30/32] .github/workflows/rebase.yml: rebase for multiple branches - Error if the commenter doesn't have write access or maintainers can't edit the PR branch. - Close and comment on PR after rebase so that actions are run when it's reopened. This doesn't happen currently as we're using the default github token which isn't allowed to trigger other actions. - Disallow unwanted rebases. e.g. invalid branches, redundant rebases or rebasing permanent branches onto permanent branches. --- .github/workflows/rebase-staging.yml | 60 ------------ .github/workflows/rebase.yml | 134 +++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 60 deletions(-) delete mode 100644 .github/workflows/rebase-staging.yml create mode 100644 .github/workflows/rebase.yml diff --git a/.github/workflows/rebase-staging.yml b/.github/workflows/rebase-staging.yml deleted file mode 100644 index 41b06f95668a..000000000000 --- a/.github/workflows/rebase-staging.yml +++ /dev/null @@ -1,60 +0,0 @@ -on: - issue_comment: - types: - - created - -# This action allows people with write access to the repo to rebase a PRs base branch from -# master to staging by commenting `/rebase-staging` on the PR while avoiding CODEOWNER notifications. - -jobs: - rebase: - runs-on: ubuntu-latest - if: github.repository_owner == 'NixOS' && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase-staging') - steps: - - uses: peter-evans/create-or-update-comment@v1 - with: - comment-id: ${{ github.event.comment.id }} - reactions: eyes - - uses: scherermichael-oss/action-has-permission@1.0.6 - id: check-write-access - with: - required-permission: write - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: check base branch is master - if: steps.check-write-access.outputs.has-permission - run: | - if [ "$(curl https://api.github.com/repos/NixOS/nixpkgs/pulls/${{ github.event.issue.number }} | jq -r '.base.ref')" != "master" ]; then - echo "This action only works when the current base branch is master." - exit 1 - fi - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - if: steps.check-write-access.outputs.has-permission - - name: rebase pull request - if: steps.check-write-access.outputs.has-permission - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PULL_REQUEST: ${{ github.event.issue.number }} - run: | - git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" - git config --global user.name "github-actions[bot]" - git fetch origin - gh pr checkout "$PULL_REQUEST" - git rebase \ - --onto="$(git merge-base origin/master origin/staging)" \ - "HEAD~$(git rev-list --count HEAD ^master)" - git push --force - curl \ - -X POST \ - -H "Accept: application/vnd.github.v3+json" \ - -H "Authorization: token $GITHUB_TOKEN" \ - -d '{ "base": "staging" }' \ - "https://api.github.com/repos/NixOS/nixpkgs/pulls/$PULL_REQUEST" - - uses: peter-evans/create-or-update-comment@v1 - if: ${{ failure() }} - with: - issue-number: ${{ github.event.issue.number }} - body: | - [Failed to rebase on `staging`](https://github.com/NixOS/nixpkgs/actions/runs/${{ github.run_id }}) diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml new file mode 100644 index 000000000000..50d066dd754f --- /dev/null +++ b/.github/workflows/rebase.yml @@ -0,0 +1,134 @@ +on: + issue_comment: + types: + - created + +# This action allows people with write access to the repo to rebase a PRs base branch +# by commenting `/rebase ${branch}` on the PR while avoiding CODEOWNER notifications. + +jobs: + rebase: + runs-on: ubuntu-latest + if: github.repository_owner == 'NixOS' && github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') + steps: + - uses: peter-evans/create-or-update-comment@v1 + with: + comment-id: ${{ github.event.comment.id }} + reactions: eyes + - uses: scherermichael-oss/action-has-permission@1.0.6 + id: check-write-access + with: + required-permission: write + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: check permissions + run: | + echo "Commenter doesn't have write access to the repo" + exit 1 + if: "! steps.check-write-access.outputs.has-permission" + - name: setup + run: | + curl "https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.issue.number }}" 2>/dev/null >pr.json + cat <>"$GITHUB_ENV" + CAN_MODIFY=$(jq -r '.maintainer_can_modify' pr.json) + COMMITS=$(jq -r '.commits' pr.json) + CURRENT_BASE=$(jq -r '.base.ref' pr.json) + PR_BRANCH=$(jq -r '.head.ref' pr.json) + COMMENT_BRANCH=$(echo ${{ github.event.comment.body }} | awk "/^\/rebase / {print \$2}") + PULL_REQUEST=${{ github.event.issue.number }} + EOF + rm pr.json + - name: check branch + env: + PERMANENT_BRANCHES: "haskell-updates|master|nixos|nixpkgs|python-unstable|release|staging" + VALID_BRANCHES: "haskell-updates|master|python-unstable|release-20.09|staging|staging-20.09|staging-next" + run: | + message() { + cat < Date: Sun, 14 Feb 2021 03:24:18 +0100 Subject: [PATCH 31/32] maturin: 0.9.0 -> 0.9.1 (#113033) --- .../development/tools/rust/maturin/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index b9c2e08ba142..52993b3790d8 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-X5/1zEVhhdTuyXcUwC3jVv9Gblmv8LT+ftsVo8BnnZs="; + hash = "sha256-0HD/wtHCbaJ0J+TC6k2xvWsCMnpdJbvivW/UM3g+Gss="; }; - cargoHash = "sha256-PBmuPIpCwC7fr/MKFaeSd/0avoEATlxoeMHisjouAeI="; + cargoHash = "sha256-bH9NQg7wJUe0MHkbt4DbjZEEVYZiVCwSbL4A/H+6WDs="; nativeBuildInputs = [ pkg-config ]; @@ -29,9 +29,17 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with lib; { - description = "Build and publish crates with pyo3 bindings as python packages"; + description = "Build and publish Rust crates Python packages"; + longDescription = '' + Build and publish Rust crates with PyO3, rust-cpython, and + cffi bindings as well as Rust binaries as Python packages. + + This project is meant as a zero-configuration replacement for + setuptools-rust and Milksnake. It supports building wheels for + Python and can upload them to PyPI. + ''; homepage = "https://github.com/PyO3/maturin"; - license = licenses.mit; + license = licenses.asl20; maintainers = [ maintainers.danieldk ]; }; } From 142760c9fd48b11f410b1fc7c238778b0360bdba Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 13 Feb 2021 21:16:03 -0600 Subject: [PATCH 32/32] yosys: 0.9+3830 -> 0.9+3905 Signed-off-by: Austin Seipp --- pkgs/development/compilers/yosys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 9ac7603ea200..5d891a6d19f3 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "0.9+3830"; + version = "0.9+3905"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "b72c29465392c8d260ddf55def169438f7fb64b2"; - sha256 = "12h3pgj8bjb254q2qaafc3qxwhqdqrx0sxjhgjrfy8cmkdm92dvy"; + rev = "4e741adda976260f620e5787d6db3cb28e0e35e7"; + sha256 = "0ml4c7vfzmivcc289d12m6ki82qdsg5wj00f2aamcvq1y7l4062x"; }; enableParallelBuilding = true;