From 3fad80580ee66f264f02665fcb3fa0f7f467de1b Mon Sep 17 00:00:00 2001 From: nikita Date: Tue, 12 May 2020 18:53:44 +0200 Subject: [PATCH 01/53] libgnurl: reduce size of closure. Remove unnecessary/old dependencies, use python3, remove groff, remove nghttp2. --- pkgs/development/libraries/libgnurl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index a7d91d0c81ad..bc9a09ab9262 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, libtool, groff, perl, pkg-config, python2, zlib, gnutls, - libidn2, libunistring, nghttp2 }: +{ lib, stdenv, fetchurl, libtool, perl, pkg-config, python3, zlib, gnutls +, libidn2, libunistring }: stdenv.mkDerivation rec { pname = "libgnurl"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1y4laraq37kw8hc8jlzgcw7y37bfd0n71q0sy3d3z6yg7zh2prxi"; }; - nativeBuildInputs = [ libtool groff perl pkg-config python2 ]; + nativeBuildInputs = [ libtool perl pkg-config python3 ]; - buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ]; + buildInputs = [ gnutls zlib libidn2 libunistring ]; configureFlags = [ "--disable-ntlm-wb" From 2a29665d714bb6a4378bd0504e6916b92176f438 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 06:13:59 +0000 Subject: [PATCH 02/53] python38Packages.agate-sql: 0.5.6 -> 0.5.7 --- pkgs/development/python-modules/agate-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 68f166b3c7c5..e9747b6f393d 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "agate-sql"; - version = "0.5.6"; + version = "0.5.7"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "056dc9e587fbdfdf3f1c9950f4793a5ee87622c19deba31aa0a6d6681816dcde"; + sha256 = "7622c1f243b5a9a5efddfe28c36eeeb30081e43e3eb72e8f3da22c2edaecf4d8"; }; propagatedBuildInputs = [ agate sqlalchemy ]; From 0a8f13a368f1ecbda1e2502f5398ba90bfae9664 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 06:22:07 +0000 Subject: [PATCH 03/53] python38Packages.aioextensions: 20.11.1621472 -> 21.7.2261349 --- pkgs/development/python-modules/aioextensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioextensions/default.nix b/pkgs/development/python-modules/aioextensions/default.nix index 3fee1af2f176..cc1ebe3f6178 100644 --- a/pkgs/development/python-modules/aioextensions/default.nix +++ b/pkgs/development/python-modules/aioextensions/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aioextensions"; - version = "20.11.1621472"; + version = "21.7.2261349"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "abfb2a27590f20b04808192e6c9c5f93298656c013546850c4505b5070a8cc82"; + sha256 = "2eacc52692495f331437e8c8e9782ca71f4617ec84f174ca17acdd77631efc47"; }; propagatedBuildInputs = [ uvloop ]; From 96d3260bb6005721521e6a87ed2f477f5c0729f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 09:13:50 +0000 Subject: [PATCH 04/53] python38Packages.azure-batch: 10.0.0 -> 11.0.0 --- pkgs/development/python-modules/azure-batch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix index 942ae218fdd8..734f9ee04725 100644 --- a/pkgs/development/python-modules/azure-batch/default.nix +++ b/pkgs/development/python-modules/azure-batch/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-batch"; - version = "10.0.0"; + version = "11.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32d0"; + sha256 = "ce5fdb0ec962eddfe85cd82205e9177cb0bbdb445265746e38b3bbbf1f16dc73"; }; propagatedBuildInputs = [ From f89a48329970bd2c56f149f3da0fd5bbe3f0ee61 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 09:26:46 +0000 Subject: [PATCH 05/53] python38Packages.azure-eventgrid: 4.3.0 -> 4.5.0 --- pkgs/development/python-modules/azure-eventgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index 8d2c8f21f2b3..e2736b88e4f5 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.3.0"; + version = "4.5.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bf50c8a4dc022ff9b1810800cb431b2c68b748eed160dd71fb8eb9bd860c7ecc"; + sha256 = "41ce94305fd3c4e2534f7663fb1be79819fc7d59f2b20544593ea6c914839351"; }; propagatedBuildInputs = [ From c423e0bfbb22245125dc7f3d8e39fecfa6a60b0b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 09:31:27 +0000 Subject: [PATCH 06/53] python38Packages.azure-mgmt-apimanagement: 2.0.0 -> 2.1.0 --- .../python-modules/azure-mgmt-apimanagement/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 8ca4df197bb7..2b2327d9f0ec 100644 --- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.1.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "54fade87af54904c8ac9785efccebc537c58a3c1f8726e929e473698f06ebbfc"; + sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94"; extension = "zip"; }; From 66f9d3e97213eed83f1ee8a364370c7330c14c91 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 09:36:38 +0000 Subject: [PATCH 07/53] python38Packages.azure-mgmt-compute: 22.0.0 -> 22.1.0 --- .../development/python-modules/azure-mgmt-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 949de6d073c9..f134c5b5f106 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "22.0.0"; + version = "22.1.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7d582f3a4331f681f6bc358b796d9c33d7c0d55aa95c2874fc8dbe692e6bfa6d"; + sha256 = "2aad414843aee0f54427f887f7536cc5155d6852728d44dfeef633ac52135fdc"; }; propagatedBuildInputs = [ From 0f845cc4ecbe04d424215d79370d523cf02c8398 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 09:42:28 +0000 Subject: [PATCH 08/53] python38Packages.azure-mgmt-loganalytics: 10.0.0 -> 11.0.0 --- .../python-modules/azure-mgmt-loganalytics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index 5a93d3d0df18..7d957e96cc76 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "azure-mgmt-loganalytics"; - version = "10.0.0"; + version = "11.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "29330984d0f084dff26cea239d7b733c1a26844da85d33bf3bb53b515ce0bc23"; + sha256 = "41671fc6e95180fb6147cb40567410c34b85fb69bb0a9b3e09feae1ff370ee9d"; }; propagatedBuildInputs = [ From 0886db59a264756d6694c75d0b9f52632a191964 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 09:47:23 +0000 Subject: [PATCH 09/53] python38Packages.azure-mgmt-media: 7.0.0 -> 8.0.0 --- pkgs/development/python-modules/azure-mgmt-media/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix index b4d25a14938d..72f500d0f4e2 100644 --- a/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-media"; - version = "7.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b45e82a594ed91cd5aa7a5cd5d01f038b7ac3cf12233e7ba2beaaa3477900e8e"; + sha256 = "c08e687c0afa061a3e05acaf29ce81e737480d592b07e0de5f77e9a7f9f00c00"; }; propagatedBuildInputs = [ From 3017b8d1671e7838697f3918b334c6c9750e9ee1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 09:52:25 +0000 Subject: [PATCH 10/53] python38Packages.azure-mgmt-recoveryservicesbackup: 1.0.0 -> 2.0.0 --- .../azure-mgmt-recoveryservicesbackup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 25aae3ffad01..99b0c5ac8ebe 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "fd915aa6a76ef9e0e963615d4c909400c8d5646e26273ae25fa1418ce61e28d2"; + sha256 = "d3e60daefbc20a7fa381c7ad1498f4bf4bb5a1414c1c64188cc9d5c98c4e12ac"; }; propagatedBuildInputs = [ From a6fd24e9524b4e9cc7705c9d324f05087c08de9f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 09:57:29 +0000 Subject: [PATCH 11/53] python38Packages.azure-mgmt-resource: 18.0.0 -> 19.0.0 --- .../python-modules/azure-mgmt-resource/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 9ea6acbe8da7..3683a70ac1a9 100644 --- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { - version = "18.0.0"; + version = "19.0.0"; pname = "azure-mgmt-resource"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "551036e592f409ef477d30937ea7cc4dda5126576965d9c816fdb8401bbd774c"; + sha256 = "bbb60bb9419633c2339569d4e097908638c7944e782b5aef0f5d9535085a9100"; }; propagatedBuildInputs = [ From ad102ffc04f868469c610932dfc9202f4ad3baf4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 10:03:12 +0000 Subject: [PATCH 12/53] python38Packages.azure-mgmt-sql: 3.0.0 -> 3.0.1 --- pkgs/development/python-modules/azure-mgmt-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index a9e41e32799e..3361f036794c 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e2fe427ed8f6e368de7176696b38910a16b307dd9c2e1d2144d643a1c0f38e21"; + sha256 = "129042cc011225e27aee6ef2697d585fa5722e5d1aeb0038af6ad2451a285457"; }; propagatedBuildInputs = [ From 283e717635e4628d907eed530512ee1b228e4694 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 10:08:33 +0000 Subject: [PATCH 13/53] python38Packages.azure-synapse-accesscontrol: 0.6.0 -> 0.7.0 --- .../python-modules/azure-synapse-accesscontrol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix index b9a6a40e733c..05f509e89462 100644 --- a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix +++ b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "azure-synapse-accesscontrol"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "2f8f71561ca30ff3b04b172f5a64b231baeb02f4bce4bd6763df93a178c8b5d7"; + sha256 = "565aa26336d560c028775e8ae50d0691aa7089e96170e78342371b773da3137c"; extension = "zip"; }; From be3fca0d2a9ceda81c5276c16a6ea4316b9bc4c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 14:09:53 +0000 Subject: [PATCH 14/53] python38Packages.babelfish: 0.5.5 -> 0.6.0 --- pkgs/development/python-modules/babelfish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix index ba015f597ce6..63480b0fe4f7 100644 --- a/pkgs/development/python-modules/babelfish/default.nix +++ b/pkgs/development/python-modules/babelfish/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "babelfish"; - version = "0.5.5"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104"; + sha256 = "2dadfadd1b205ca5fa5dc9fa637f5b7933160a0418684c7c46a7a664033208a2"; }; propagatedBuildInputs = [ setuptools ]; From b46f10ec54dc3ac8f6c6a4c1bf638447b6a16fc4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 15:06:38 +0000 Subject: [PATCH 15/53] python38Packages.azure-synapse-spark: 0.5.0 -> 0.6.0 --- .../python-modules/azure-synapse-spark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-synapse-spark/default.nix b/pkgs/development/python-modules/azure-synapse-spark/default.nix index 09b25fe9d518..db998e00e697 100644 --- a/pkgs/development/python-modules/azure-synapse-spark/default.nix +++ b/pkgs/development/python-modules/azure-synapse-spark/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "azure-synapse-spark"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "2b037024dc7c034f47aac551cc918f78590a1e1ae30cd2370c8a14da15994970"; + sha256 = "ac7564a61ba314e0a9406c0f73c3cede04091a131a0c58971bcba0c158b7455d"; extension = "zip"; }; From d3d60a082a7d803ed1e2dc0f3156fb72b837be7a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 17:06:24 +0000 Subject: [PATCH 16/53] python38Packages.click-help-colors: 0.9 -> 0.9.1 --- pkgs/development/python-modules/click-help-colors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/click-help-colors/default.nix b/pkgs/development/python-modules/click-help-colors/default.nix index b17dc1a0c111..8fb8bdd2c828 100644 --- a/pkgs/development/python-modules/click-help-colors/default.nix +++ b/pkgs/development/python-modules/click-help-colors/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "click-help-colors"; - version = "0.9"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "eb037a2dd95a9e20b3897c2b3ca57e7f6797f76a8d93f7eeedda7fcdcbc9b635"; + sha256 = "78cbcf30cfa81c5fc2a52f49220121e1a8190cd19197d9245997605d3405824d"; }; propagatedBuildInputs = [ click ]; From a08f65b1f131352f7304c1b6998fc9f12da8908b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 20:04:00 +0000 Subject: [PATCH 17/53] python38Packages.debian: 0.1.39 -> 0.1.40 --- pkgs/development/python-modules/debian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index e97c3420f454..e2b21bb7f11c 100644 --- a/pkgs/development/python-modules/debian/default.nix +++ b/pkgs/development/python-modules/debian/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "python-debian"; - version = "0.1.39"; + version = "0.1.40"; src = fetchPypi { inherit pname version; - sha256 = "6cca96239b5981f5203216d2113fea522477628607ed0a8427e15094a792541c"; + sha256 = "385dfb965eca75164d256486c7cf9bae772d24144249fd18b9d15d3cffb70eea"; }; propagatedBuildInputs = [ chardet six ]; From ccba7b027e8a3e6191484728a0d0139f468d720f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 20:19:18 +0000 Subject: [PATCH 18/53] python38Packages.dockerspawner: 0.11.1 -> 12.1.0 --- pkgs/development/python-modules/dockerspawner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dockerspawner/default.nix b/pkgs/development/python-modules/dockerspawner/default.nix index 192fb94bd45a..cae32e4a2b44 100644 --- a/pkgs/development/python-modules/dockerspawner/default.nix +++ b/pkgs/development/python-modules/dockerspawner/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "dockerspawner"; - version = "0.11.1"; + version = "12.1.0"; src = fetchPypi { inherit pname version; - sha256 = "83fd8ee012bb32432cb57bd408ff65534749aed8696648e6ac029a87fc474928"; + sha256 = "3894ed8a9157f8ac8f42e0130f43932490ac5d1e89e6f295b1252f08c00ba36b"; }; propagatedBuildInputs = [ From c657711707f8bf14f1ba62fab6ac69b0cc5bd659 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 20:36:20 +0000 Subject: [PATCH 19/53] python38Packages.flexmock: 0.10.4 -> 0.10.5 --- pkgs/development/python-modules/flexmock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix index 74c3418b54b0..48a2f931f6b4 100644 --- a/pkgs/development/python-modules/flexmock/default.nix +++ b/pkgs/development/python-modules/flexmock/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "flexmock"; - version = "0.10.4"; + version = "0.10.5"; src = fetchPypi { inherit pname version; - sha256 = "0b6qw3grhgx58kxlkj7mdma7xdvlj02zabvcf7w2qifnfjwwwcsh"; + sha256 = "003422fdbcf5d6570e60a0eafeb54c0af624c6cddab5fc3bfe026e52dd0f9c5a"; }; checkInputs = [ pytest ]; From 128804a124870015d70a97f7e485e5a025319006 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 23:27:47 +0000 Subject: [PATCH 20/53] python38Packages.hmmlearn: 0.2.5 -> 0.2.6 --- pkgs/development/python-modules/hmmlearn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index d079b18a30c2..17f5126367bf 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hmmlearn"; - version = "0.2.5"; + version = "0.2.6"; src = fetchurl { url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz"; - sha256 = "14fb4ad3fb7529785844a25fae5d32272619fb5973cc02c8784018055470ca01"; + sha256 = "2a289cf28b31be59fa8ba5d3253d4a2a992401d45a8cdc221ae484fbf390c0d7"; }; buildInputs = [ setuptools-scm cython ]; From 6a1d4d2b3b65c872191e63b7101653f4e4128308 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 00:10:23 +0000 Subject: [PATCH 21/53] python38Packages.jupyterlab: 3.0.16 -> 3.1.6 --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 95ef21388590..6264bbb5c44e 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.0.16"; + version = "3.1.6"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7ad4fbe1f6d38255869410fd151a8b15692a663ca97c0a8146b3f5c40e275c23"; + sha256 = "6d2ada6a333861f33a1b555d3cb7b07aa9d1ab80f07997b3d0c43878a98c1174"; }; nativeBuildInputs = [ jupyter-packaging ]; From a924a12680ca86f8024e4d56f144cf3066e26aa1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 00:58:58 +0000 Subject: [PATCH 22/53] python38Packages.junos-eznc: 2.6.1 -> 2.6.2 --- pkgs/development/python-modules/junos-eznc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index c98f20be5234..871eba3a18fb 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.6.1"; + version = "2.6.2"; src = fetchPypi { inherit pname version; - sha256 = "2f5de7dedaac8dd71bfea23c6a7d883e29947c91de1ba299a9242e0a4406ee46"; + sha256 = "878c479c933346cc8cc60b6d145973568ac23e7c453e193cf55625e7921a9b62"; }; postPatch = '' From 68e98baa89902b34e7a2760a084d47b6bea76d68 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 01:11:35 +0000 Subject: [PATCH 23/53] python38Packages.jupyterlab_server: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/jupyterlab_server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 2c60d7b3b273..cca40463b024 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.6.0"; + version = "2.7.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f300adf6bb0a952bebe9c807a3b2a345d62da39b476b4f69ea0dc6b5f3f6b97d"; + sha256 = "31457ef564febc42043bc539356c804f6f9144f602e2852150bf0820ed6d7e18"; }; postPatch = '' From 5708e2a81e533e8f53b73bec48fcc74b299ac879 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 02:53:46 +0000 Subject: [PATCH 24/53] python38Packages.limnoria: 2021.06.15 -> 2021.07.21 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index b8b13fab29c2..ab46ade406f8 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2021.06.15"; + version = "2021.07.21"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "47290281f3f945261a7f8d8c6f207dcb1d277b241f58827d5a76ab8cd453a1d0"; + sha256 = "80ca1db9648e7678f81b373dab04d06025ec6532e68a9be773ddbd159de54e4c"; }; patchPhase = '' From 19822abfed1f7a0a7d34011552f797fd30dff83d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 07:32:48 +0000 Subject: [PATCH 25/53] xmlsec: 1.2.31 -> 1.2.32 --- pkgs/development/libraries/xmlsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 71a10764667c..2dceaeda6490 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -6,11 +6,11 @@ lib.fix (self: stdenv.mkDerivation rec { pname = "xmlsec"; - version = "1.2.31"; + version = "1.2.32"; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "mxC8Uswx5PdhYuOXXlDbJrcatJxXHYELMRymJr5aCyY="; + sha256 = "sha256-44NwKFMjYATlsI5CS4r+m1P+nzGqp6U4LznZUz63wEM="; }; patches = [ From 5d85451c1c6a47b3cdc8a0fc5523b6d20ded79cb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 12:56:36 +0000 Subject: [PATCH 26/53] s5cmd: 1.2.1 -> 1.3.0 --- pkgs/tools/networking/s5cmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/s5cmd/default.nix b/pkgs/tools/networking/s5cmd/default.nix index f4a6c2915be6..c472e2626e01 100644 --- a/pkgs/tools/networking/s5cmd/default.nix +++ b/pkgs/tools/networking/s5cmd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "s5cmd"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "peak"; repo = "s5cmd"; rev = "v${version}"; - sha256 = "sha256-09vBYwnTfLIuu2SPP7DYB+U6sUkQffglIOHNn4+47qQ="; + sha256 = "sha256-sood01wI0ZnkXUKDHX14ix3bWHR/PRu6+MDNeos5Jk0="; }; vendorSha256 = null; From 905a62e6c39411452efeaf2e2d9f243f58ed02a8 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Thu, 26 Aug 2021 10:16:28 +0900 Subject: [PATCH 27/53] purescript: 0.14.3 -> 0.14.4 --- .../development/compilers/purescript/purescript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index adf9dd13c71f..2d444578db54 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.14.3"; + version = "0.14.4"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "1ipksp6kx3h030xf1y3y30gazrdz893pklanwak27hbqfy3ckssj"; + sha256 = "0m6zwb5f890d025zpn006qr8cky6zhjycap5az9zh6h47jfbrcf9"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "158jyjpfgd84gbwpxqj41mvpy0fmb1d1iqq2h42sc7041v2f38p0"; + sha256 = "0hgsh6l52z873b2zk3llvqik18ifika48lmr71qyhlqf250ng9m0"; }; From aff01371c15af5bc2abffcb9851a550cdbe58dbb Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Thu, 26 Aug 2021 10:20:27 +0900 Subject: [PATCH 28/53] purescript: add updateScript for automatic updates --- .../purescript/purescript/default.nix | 8 +++- .../compilers/purescript/purescript/update.sh | 43 +++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) create mode 100755 pkgs/development/compilers/purescript/purescript/update.sh diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 2d444578db54..9b71975f5023 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -20,6 +20,7 @@ in stdenv.mkDerivation rec { pname = "purescript"; version = "0.14.4"; + # These hashes can be updated automatically by running the ./update.sh script. src = if stdenv.isDarwin then @@ -51,8 +52,11 @@ in stdenv.mkDerivation rec { $PURS --bash-completion-script $PURS > $out/share/bash-completion/completions/purs-completion.bash ''; - passthru.tests = { - minimal-module = pkgs.callPackage ./test-minimal-module {}; + passthru = { + updateScript = ./update.sh; + tests = { + minimal-module = pkgs.callPackage ./test-minimal-module {}; + }; }; meta = with lib; { diff --git a/pkgs/development/compilers/purescript/purescript/update.sh b/pkgs/development/compilers/purescript/purescript/update.sh new file mode 100755 index 000000000000..de8787ba4cca --- /dev/null +++ b/pkgs/development/compilers/purescript/purescript/update.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq -I nixpkgs=. +# +# This script will update the purescript derivation to the latest version. + +set -eo pipefail + +# This is the directory of this update.sh script. +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + +purescript_derivation_file="${script_dir}/default.nix" + +# This is the current revision of PureScript in Nixpkgs. +old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$purescript_derivation_file")" + +# This is the latest release version of PureScript on GitHub. +new_version=$(curl --silent "https://api.github.com/repos/purescript/purescript/releases" | jq '.[0].tag_name' --raw-output | sed -e 's/v//') + +echo "Updating purescript from old version v${old_version} to new version v${new_version}." +echo + +echo "Fetching both old and new release tarballs for Darwin and Linux in order to confirm hashes." +echo +old_linux_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${old_version}/linux64.tar.gz")" +echo "v${old_version} linux tarball hash (current version): $old_linux_version_hash" +new_linux_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/linux64.tar.gz")" +echo "v${new_version} linux tarball hash: $new_linux_version_hash" +old_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${old_version}/macos.tar.gz")" +echo "v${old_version} darwin tarball hash (current version): $old_darwin_version_hash" +new_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/macos.tar.gz")" +echo "v${new_version} darwin tarball hash: $new_darwin_version_hash" +echo + +echo "Replacing version and hashes in ${purescript_derivation_file}." +sed -i -e "s/${old_linux_version_hash}/${new_linux_version_hash}/" "$purescript_derivation_file" +sed -i -e "s/${old_darwin_version_hash}/${new_darwin_version_hash}/" "$purescript_derivation_file" +sed -i -e "s/${old_version}/${new_version}/" "$purescript_derivation_file" +echo + +echo "Finished. Make sure you run the following commands to confirm PureScript builds correctly:" +echo ' - `nix build -L -f ./. purescript`' +echo ' - `nix build -L -f ./. purescript.passthru.tests.minimal-module`' +echo ' - `sudo nix build -L -f ./. spago.passthru.tests --option sandbox relaxed`' From 3194cede123e5b607fa70805ba52eb6808368307 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Aug 2021 18:15:36 +0200 Subject: [PATCH 29/53] python3Packages.tokenizers: 0.10.3 -> unstable-2021-08-13 --- .../python-modules/tokenizers/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 544dbf1beafc..7813797a2f31 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -49,19 +49,19 @@ let }; in buildPythonPackage rec { pname = "tokenizers"; - version = "0.10.3"; + version = "unstable-2021-08-13"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; - rev = "python-v${version}"; - hash = "sha256-X7aUiJJjB2ZDlE8LbK7Pn/15SLTZbP8kb4l9ED7/xvU="; + rev = "e7dd6436dd4a4ffd9e8a4f110ca68e6a38677cb6"; + sha256 = "1p7w9a43a9h6ys5nsa4g89l65dj11037p7a1lqkj4x1yc9kv2y1r"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src sourceRoot; name = "${pname}-${version}"; - hash = "sha256-gRqxlL6q87sGC0birDhCmGF+CVbfxwOxW6Tl6+5mGoo="; + sha256 = "1yb4jsx6mp9jgd1g3mli6vr6mri2afnwqlmxq1rpvn34z6b3iw9q"; }; sourceRoot = "source/bindings/python"; @@ -97,6 +97,10 @@ in buildPythonPackage rec { ln -s ${openaiMerges} openai-gpt-merges.txt ) ''; + postPatch = '' + echo 'import multiprocessing; multiprocessing.set_start_method("fork")' >> tests/__init__.py + ''; + preCheck = '' HOME=$TMPDIR ''; From a7de8153f5b273f606a88a6b7afbefc54bbffbe9 Mon Sep 17 00:00:00 2001 From: Romanos Skiadas Date: Thu, 26 Aug 2021 21:11:54 +0300 Subject: [PATCH 30/53] =?UTF-8?q?gnucash:=204.5=20=E2=86=92=204.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The glibc patch is no longer needed, as it's included in 4.6. This release also includes https://github.com/Gnucash/gnucash/commit/888676eb31d0a942d1ee12dec4bd3767517d2bcb, which allows building gnucash as (enableDebugging gnucash) using nix. --- pkgs/applications/office/gnucash/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index c9390e70d254..22c9eef5d095 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -26,21 +26,13 @@ in stdenv.mkDerivation rec { pname = "gnucash"; - version = "4.5"; + version = "4.6"; src = fetchurl { url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; - sha256 = "sha256-vB9IqEU0iKLp9rg7aGE6pVyuvk0pg0YL2sfghLRs/9w="; + sha256 = "0csp8iddhc901vv09gl5lj970g6ili696vwj4vdpkiprp7gh26r5"; }; - patches = [ - # Fix build with GLib 2.68. - (fetchpatch { - url = "https://github.com/Gnucash/gnucash/commit/bbb4113a5a996dcd7bb3494e0be900b275b49a4f.patch"; - sha256 = "Pnvwoq5zutFw7ByduEEANiLM2J50WiXpm2aZ8B2MDMQ="; - }) - ]; - nativeBuildInputs = [ pkg-config makeWrapper cmake gtest swig ]; buildInputs = [ From aec8dc33d032861924c493ba4778d5c4387354fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 22:34:52 +0200 Subject: [PATCH 31/53] python39Packages.limnoria: minor cleanups, comment that import check cannot be added --- pkgs/development/python-modules/limnoria/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index ab46ade406f8..0afd8902d956 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, pkgs +, git }: buildPythonPackage rec { @@ -15,11 +15,12 @@ buildPythonPackage rec { sha256 = "80ca1db9648e7678f81b373dab04d06025ec6532e68a9be773ddbd159de54e4c"; }; - patchPhase = '' + postPatch = '' sed -i 's/version=version/version="${version}"/' setup.py ''; - buildInputs = [ pkgs.git ]; + buildInputs = [ git ]; + # cannot be imported doCheck = false; meta = with lib; { From 294a0b62c6f8fc88e184dc1c26fe3b38737a1dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 23:02:25 +0200 Subject: [PATCH 32/53] python39Packages.junos-eznc: add import check --- pkgs/development/python-modules/junos-eznc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 871eba3a18fb..6dcc8e927318 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -40,6 +40,8 @@ buildPythonPackage rec { nosetests -v --with-coverage --cover-package=jnpr.junos --cover-inclusive -a unit ''; + pythonImportsCheck = [ "jnpr.junos" ]; + meta = with lib; { homepage = "http://www.github.com/Juniper/py-junos-eznc"; description = "Junos 'EZ' automation for non-programmers"; From f5dd1aecf13c3f284df2cd45827c0982a62d1ca6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Aug 2021 23:47:49 +0200 Subject: [PATCH 33/53] httpx: 1.1.1 -> 1.1.2 --- pkgs/tools/security/httpx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 5905632294f2..08f4929bd240 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-uuHvU/KUHliY3FUwknp7ninKTY9qs+gI7WljgIvJEF4="; + sha256 = "sha256-8PX1jUbS5qf5KqeZXv3oijtZCPo5LsabqHSA3rsd3tQ="; }; - vendorSha256 = "sha256-/xip2lwmpaSvnQoGj3de8Tgeog+HPrI8mF6catC1O4s="; + vendorSha256 = "sha256-bkk/gXMLiZGHebrIeDsj3OyiEcH4hriI4TFNdoh3SBk="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; From 20e4e3a6f154b8ff926d717d051277b37ea84a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 03:07:57 +0200 Subject: [PATCH 34/53] python39Packages.azure-mgmt-sql: add import check --- pkgs/development/python-modules/azure-mgmt-sql/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/pkgs/development/python-modules/azure-mgmt-sql/default.nix index 3361f036794c..75b41758b3d0 100644 --- a/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -31,6 +31,8 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.sql" ]; + meta = with lib; { description = "This is the Microsoft Azure SQL Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; From 4608fefb32f65c32a6cf4f2b7f62d26a62580f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 03:10:13 +0200 Subject: [PATCH 35/53] python39Packages.babelfish: update meta, add import check, disable tests --- pkgs/development/python-modules/babelfish/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix index 63480b0fe4f7..4f64e65bae03 100644 --- a/pkgs/development/python-modules/babelfish/default.nix +++ b/pkgs/development/python-modules/babelfish/default.nix @@ -11,9 +11,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; + # no tests executed + doCheck = false; + + pythonImportsCheck = [ "babelfish" ]; + meta = with lib; { homepage = "https://pypi.python.org/pypi/babelfish"; description = "A module to work with countries and languages"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } From 8d2d845ec612de08a3840e14ea56749ae071184d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 03:11:45 +0200 Subject: [PATCH 36/53] python39Packages.azure-mgmt-recoveryservicesbackup: add import check --- .../azure-mgmt-recoveryservicesbackup/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 99b0c5ac8ebe..3ebc199599bd 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.recoveryservicesbackup" ]; + meta = with lib; { description = "This is the Microsoft Azure Recovery Services Backup Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; From 6f0036ea64c4ab50453927079bcca591228a18cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 03:12:58 +0200 Subject: [PATCH 37/53] python39Packages.azure-batch: add import check --- pkgs/development/python-modules/azure-batch/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix index 734f9ee04725..9202919ae6dd 100644 --- a/pkgs/development/python-modules/azure-batch/default.nix +++ b/pkgs/development/python-modules/azure-batch/default.nix @@ -25,6 +25,8 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.batch" ]; + meta = with lib; { description = "This is the Microsoft Azure Batch Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; From 309048fbc8136514174b4b7075eeec22c8b63c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 03:14:34 +0200 Subject: [PATCH 38/53] python39Packages.debian: format, add import check, update meta --- .../development/python-modules/debian/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/debian/default.nix index e2b21bb7f11c..48b5b015b11a 100644 --- a/pkgs/development/python-modules/debian/default.nix +++ b/pkgs/development/python-modules/debian/default.nix @@ -1,5 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi -, chardet, six}: +{ lib +, buildPythonPackage +, fetchPypi +, chardet +, six +}: buildPythonPackage rec { pname = "python-debian"; @@ -15,8 +19,11 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = { + pythonImportsCheck = [ "debian" ]; + + meta = with lib; { description = "Debian package related modules"; - license = lib.licenses.gpl2; + license = licenses.gpl2; + maintainers = with maintainers; [ ]; }; } From 155a9de6e89304986fa323b6e4654715e11a36f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 03:17:28 +0200 Subject: [PATCH 39/53] python39Packages.azure-mgmt-media: add import check --- pkgs/development/python-modules/azure-mgmt-media/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/azure-mgmt-media/default.nix b/pkgs/development/python-modules/azure-mgmt-media/default.nix index 72f500d0f4e2..e0dd1af1ad0f 100644 --- a/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -31,6 +31,8 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.media" ]; + meta = with lib; { description = "This is the Microsoft Azure Media Services Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; From 56e4c70dab3db4c99f64c031a0c1a03d08130354 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 05:13:22 +0000 Subject: [PATCH 40/53] teleport: 7.0.2 -> 7.0.3 --- pkgs/servers/teleport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 97c8568e4036..05094045fd32 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -10,14 +10,14 @@ let in buildGoModule rec { pname = "teleport"; - version = "7.0.2"; + version = "7.0.3"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-Sj7WQRgEiU5G/MDKFtEy/KJ2g0WENxbCnMA9CNcTUaY="; + sha256 = "sha256-pWe4n/HilieUYfoO0OElC9ccMaTOaMcVadUfWUJJGhk="; }; vendorSha256 = null; From 688eef3c0442bc023a94ba5cc3bc5b610ae56a82 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 27 Aug 2021 10:45:20 +0900 Subject: [PATCH 41/53] purescript: add missing dependency to update script Co-authored-by: Sandro --- pkgs/development/compilers/purescript/purescript/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/purescript/purescript/update.sh b/pkgs/development/compilers/purescript/purescript/update.sh index de8787ba4cca..ea6663d810c4 100755 --- a/pkgs/development/compilers/purescript/purescript/update.sh +++ b/pkgs/development/compilers/purescript/purescript/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq -I nixpkgs=. +#!nix-shell -i bash -p curl gnused jq -I nixpkgs=. # # This script will update the purescript derivation to the latest version. From 7be4e0ef84cb9b4ed3fc1056edde90d2771b92f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Aug 2021 01:54:42 +0000 Subject: [PATCH 42/53] python38Packages.azure-mgmt-datamigration: 9.0.0 -> 10.0.0 --- .../python-modules/azure-mgmt-datamigration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index f7d2b7b9db04..6fd6b4a2a7ff 100644 --- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datamigration"; - version = "9.0.0"; + version = "10.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "70373dbeb35a7768a47341bb3b570c559197bc1ba36fc8f8bf15139e4c8bad70"; + sha256 = "5cee70f97fe3a093c3cb70c2a190c2df936b772e94a09ef7e3deb1ed177c9f32"; }; propagatedBuildInputs = [ From 0400d5f210ac632084be7174a6a04a791231b357 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Aug 2021 02:00:00 +0000 Subject: [PATCH 43/53] python38Packages.azure-mgmt-iothub: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/azure-mgmt-iothub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index f4e1534a61d6..029a10251823 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "653a765f0beb6af0c9ecbd290b4101e1b5e0f6450405faf28ab8234c15d8b38b"; + sha256 = "2724f48cadb1be7ee96fc26c7bfa178f82cea5d325e785e91d9f26965fa8e46f"; }; propagatedBuildInputs = [ From 297b104171981e6950755e4cfa855a3701f78531 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Aug 2021 03:06:39 +0000 Subject: [PATCH 44/53] python38Packages.databricks-connect: 8.1.10 -> 8.1.11 --- .../development/python-modules/databricks-connect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 97d67cdbfe26..1e522059c5be 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "8.1.10"; + version = "8.1.11"; src = fetchPypi { inherit pname version; - sha256 = "831ba3d50552c4b7821670ad01b73406aef5092498b29d3ddb24a5063bbcf0b5"; + sha256 = "cd9d1b27edd9345a2a32b365a511f8457c5c1a8f107546fe1ef9063dd15aac00"; }; sourceRoot = "."; From 1748291445122f91aa305de48704fc384c1e6f20 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Thu, 26 Aug 2021 23:21:48 -0400 Subject: [PATCH 45/53] google-compute-engine: 20190124 -> 20200113.0 (#131761) Co-authored-by: Sandro --- .../google-compute-engine/default.nix | 91 ++++++++++++++----- 1 file changed, 66 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index ad187544aea2..fef461be7d74 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -3,26 +3,85 @@ , buildPythonPackage , bash , bashInteractive -, systemd , util-linux , boto , setuptools , distro +, stdenv +, pythonOlder +, pytestCheckHook }: +let + guest-configs = stdenv.mkDerivation rec { + pname = "guest-configs"; + version = "20210702.00"; + + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = "guest-configs"; + rev = version; + sha256 = "1965kdrb1ig3z4qwzvyzx1fb4282ak5vgxcvvg5k9c759pzbc5nn"; + }; + + buildInputs = [ bash ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + # allows to install the package in `services.udev.packages` in NixOS + mkdir -p $out/lib/udev $out/bin + + cp -r "src/lib/udev/rules.d" $out/lib/udev + cp "src/lib/udev/google_nvme_id" $out/bin + + for rules in $out/lib/udev/*.rules; do + substituteInPlace "$rules" \ + --replace /bin/sh "${bash}/bin/sh" \ + --replace /bin/umount "${util-linux}/bin/umount" \ + --replace /usr/bin/logger "${util-linux}/bin/logger" + done + + # sysctl snippets will be used by google-compute-config.nix + cp -r "src/etc/sysctl.d" $out + + patchShebangs $out/bin/* + + runHook postInstall + ''; + }; +in buildPythonPackage rec { pname = "google-compute-engine"; - version = "20190124"; + version = "20200113.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "compute-image-packages"; - rev = version; - sha256 = "08cy0jd463kng6hwbd3nfldsp4dpd2lknlvdm88cq795wy0kh4wp"; + rev = "506b9a0dbffec5620887660cd42c57b3cbbadba6"; + sha256 = "0lmc426mvrajghpavhs6hwl19mgnnh08ziqx5yi15fzpnvwmb8vz"; }; - buildInputs = [ bash ]; - propagatedBuildInputs = [ boto setuptools distro ]; + buildInputs = [ bash guest-configs ]; + propagatedBuildInputs = [ (if pythonOlder "3.7" then boto else distro) setuptools ]; + + preBuild = '' + cd packages/python-google-compute-engine + ''; + + disabledTests = [ + "testExtractInterfaceMetadata" + "testCallDhclientIpv6" + "testWriteConfig" + "testCreateInterfaceMapNetifaces" + "testCreateInterfaceMapSysfs" + "testGetNetworkInterface" + ]; + + checkInputs = [ pytestCheckHook ]; postPatch = '' for file in $(find google_compute_engine -type f); do @@ -32,33 +91,15 @@ buildPythonPackage rec { --replace /sbin/hwclock "${util-linux}/bin/hwclock" # SELinux tool ??? /sbin/restorecon done - - substituteInPlace google_config/udev/64-gce-disk-removal.rules \ - --replace /bin/sh "${bash}/bin/sh" \ - --replace /bin/umount "${util-linux}/bin/umount" \ - --replace /usr/bin/logger "${util-linux}/bin/logger" ''; - postInstall = '' - # allows to install the package in `services.udev.packages` in NixOS - mkdir -p $out/lib/udev/rules.d - cp -r google_config/udev/*.rules $out/lib/udev/rules.d - - # sysctl snippets will be used by google-compute-config.nix - mkdir -p $out/sysctl.d - cp google_config/sysctl/*.conf $out/sysctl.d - - patchShebangs $out/bin/* - ''; - - doCheck = false; pythonImportsCheck = [ "google_compute_engine" ]; meta = with lib; { description = "Google Compute Engine tools and services"; homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages"; license = licenses.asl20; - maintainers = with maintainers; [ zimbatm ]; + maintainers = with maintainers; [ cpcloud zimbatm ]; platforms = platforms.linux; }; } From e03f1bb3c44618ba43c8c2833fdb24b2e9bf8923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:28:12 +0200 Subject: [PATCH 46/53] python39Packages.click-help-colors: use pytestCheckHook --- .../python-modules/click-help-colors/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/click-help-colors/default.nix b/pkgs/development/python-modules/click-help-colors/default.nix index 8fb8bdd2c828..b63788c6060c 100644 --- a/pkgs/development/python-modules/click-help-colors/default.nix +++ b/pkgs/development/python-modules/click-help-colors/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage -, click, pytest +, click, pytestCheckHook }: buildPythonPackage rec { @@ -13,9 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - # tries to use /homeless-shelter to mimic container usage, etc - #doCheck = false; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "click_help_colors" ]; From 929905f8c7ce713709c6f04596a4b3e53bed1292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:30:04 +0200 Subject: [PATCH 47/53] python39Packages.azure-mgmt-compute: add import check --- pkgs/development/python-modules/azure-mgmt-compute/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index f134c5b5f106..c45eb691dece 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -25,6 +25,8 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.compute" ]; + meta = with lib; { description = "This is the Microsoft Azure Compute Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; From ba04294362ab22f509170588dc4956a8378d816a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:38:08 +0200 Subject: [PATCH 48/53] python39Packages.azure-synapse-accesscontrol: disable tests --- .../python-modules/azure-synapse-accesscontrol/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix index 05f509e89462..fc6cd765cdbb 100644 --- a/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix +++ b/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix @@ -20,6 +20,9 @@ buildPythonPackage rec { msrest ]; + # zero tests run + doCheck = false; + pythonImportsCheck = [ "azure.synapse.accesscontrol" ]; meta = with lib; { From 90b8f24818155e174734fa754f1435309e9533fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Aug 2021 05:40:17 +0200 Subject: [PATCH 49/53] python39Packages.azure-mgmt-loganalytics: remove unused inputs, add import check --- .../python-modules/azure-mgmt-loganalytics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index 7d957e96cc76..790e7cf86c1a 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -1,8 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, python -, isPy3k , msrest , msrestazure , azure-common @@ -33,6 +31,8 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.loganalytics" ]; + meta = with lib; { description = "This is the Microsoft Azure Log Analytics Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; From 558e5bfa449a724136b3fca02657d3661a6644b7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 20:43:28 -0700 Subject: [PATCH 50/53] python38Packages.aioprocessing: 1.1.0 -> 2.0.0 (#133714) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sandro Jäckel --- pkgs/development/python-modules/aioprocessing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix index 50e4140c183e..2f6b39678489 100644 --- a/pkgs/development/python-modules/aioprocessing/default.nix +++ b/pkgs/development/python-modules/aioprocessing/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "aioprocessing"; - version = "1.1.0"; + version = "2.0.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "4603c86ff3fea673d4c643ad3adc519988cd778771b75079bc3be9e5ed4c5b66"; + sha256 = "469dfb746e8c4e0c727ba135cfabf9e034c554f6a73c27f908bfe3625dd74b9e"; }; # Tests aren't included in pypi package From ff220d3b3f96fb3920946af8521494f19415e90f Mon Sep 17 00:00:00 2001 From: Akshay Date: Sun, 15 Aug 2021 10:53:13 +0530 Subject: [PATCH 51/53] maintainers: add nerdypepper --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 427314631c67..43968e4d80d8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7655,6 +7655,12 @@ githubId = 628342; name = "Tim Steinbach"; }; + nerdypepper = { + email = "nerdy@peppe.rs"; + github = "nerdypepper"; + githubId = 23743547; + name = "Akshay Oppiliappan"; + }; nessdoor = { name = "Tomas Antonio Lopez"; email = "entropy.overseer@protonmail.com"; From 2fe4420941201068b6d2ee63d94b654bb276ac9b Mon Sep 17 00:00:00 2001 From: Akshay Date: Sun, 15 Aug 2021 11:17:51 +0530 Subject: [PATCH 52/53] ocamlPackages.ocaml-print-intf: init at 1.2.0 --- .../ocaml-print-intf/default.nix | 31 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ocaml-print-intf/default.nix diff --git a/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix new file mode 100644 index 000000000000..5180b58601af --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, dune-build-info +, bos +}: +let + author = "avsm"; + pname = "ocaml-print-intf"; + version = "1.2.0"; +in +buildDunePackage rec { + inherit pname version; + useDune2 = true; + + src = fetchFromGitHub { + owner = author; + repo = pname; + rev = "v${version}"; + sha256 = "0hw4gl7irarcywibdjqxmrga8f7yj52wgy7sc7n0wyy74jzxb8np"; + }; + + buildInputs = [ dune-build-info bos ]; + + meta = with lib; { + description = "Pretty print an OCaml cmi/cmt/cmti file in human-readable OCaml signature form "; + homepage = "https://github.com/${author}/${pname}"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.nerdypepper ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 364aed68e22f..5ed0b29b4d56 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -878,6 +878,8 @@ let ocaml_pcre = callPackage ../development/ocaml-modules/pcre {}; + ocaml-print-intf = callPackage ../development/ocaml-modules/ocaml-print-intf { }; + pgocaml = callPackage ../development/ocaml-modules/pgocaml {}; pgocaml_ppx = callPackage ../development/ocaml-modules/pgocaml/ppx.nix {}; From 755b77f858a81a5e6c7250a5ac3f18c6c68a6dbe Mon Sep 17 00:00:00 2001 From: toastal Date: Mon, 16 Aug 2021 17:12:57 +0700 Subject: [PATCH 53/53] soupault: init at 3.1.0 --- pkgs/tools/typesetting/soupault/default.nix | 41 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/typesetting/soupault/default.nix diff --git a/pkgs/tools/typesetting/soupault/default.nix b/pkgs/tools/typesetting/soupault/default.nix new file mode 100644 index 000000000000..5b0619468efb --- /dev/null +++ b/pkgs/tools/typesetting/soupault/default.nix @@ -0,0 +1,41 @@ +{ fetchFromGitHub, ocamlPackages, lib }: + +ocamlPackages.buildDunePackage rec { + pname = "soupault"; + version = "3.1.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "dmbaturin"; + repo = pname; + rev = version; + sha256 = "sha256-SVNC2DbdciunSKTCmmX0SqaEXMe1DkVX4VJTqriI8Y4="; + }; + + buildInputs = with ocamlPackages; [ + base64 + containers + ezjsonm + fileutils + fmt + jingoo + lambdasoup + lua-ml + logs + odate + otoml + re + spelll + tsort + yaml + ]; + + meta = with lib; { + description = "A tool that helps you create and manage static websites"; + homepage = "https://soupault.app/"; + license = licenses.mit; + maintainers = [ maintainers.toastal ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54b649f88638..f6b6dbc117c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4497,6 +4497,8 @@ with pkgs; sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; + soupault = callPackage ../tools/typesetting/soupault { }; + strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; tealdeer = callPackage ../tools/misc/tealdeer {