From 798468570779b3d9c4a349e02e50e80e34e6421f Mon Sep 17 00:00:00 2001 From: Etienne JEAN Date: Mon, 14 Feb 2022 15:53:30 +0100 Subject: [PATCH 1/7] python3Packages.logical-unification: init at 0.4.5 --- .../logical-unification/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/logical-unification/default.nix diff --git a/pkgs/development/python-modules/logical-unification/default.nix b/pkgs/development/python-modules/logical-unification/default.nix new file mode 100644 index 000000000000..b89fcb25339e --- /dev/null +++ b/pkgs/development/python-modules/logical-unification/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, toolz +, multipledispatch +, pytestCheckHook +, pytest-html +, pytest-benchmark +}: + +buildPythonPackage rec { + pname = "logical-unification"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "unification"; + rev = "707cf4a39e27a4a8bf06b7e7dce7223085574e65"; + sha256 = "sha256-3wqO0pWWFRQeoGNvbSDdLNYFyjNnv+O++F7+vTBUJoI="; + }; + + propagatedBuildInputs = [ + toolz + multipledispatch + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + pytest-benchmark # Needed for the `--benchmark-skip` flag + ]; + + pytestFlagsArray = [ + "--benchmark-skip" + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "unification" ]; + + meta = with lib; { + description = "Straightforward unification in Python that's extensible via generic functions"; + homepage = "https://github.com/pythological/unification"; + changelog = "https://github.com/pythological/unification/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index defea641afa5..5e0f19028a8e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4759,6 +4759,8 @@ in { logfury = callPackage ../development/python-modules/logfury { }; + logical-unification = callPackage ../development/python-modules/logical-unification { }; + logilab_astng = callPackage ../development/python-modules/logilab_astng { }; logilab_common = callPackage ../development/python-modules/logilab/common.nix { }; From b5ce29f490b5c9c4b195ee8df6d0aceceb11971f Mon Sep 17 00:00:00 2001 From: Etienne JEAN Date: Mon, 14 Feb 2022 15:55:13 +0100 Subject: [PATCH 2/7] python3Packages.cons: init at 0.4.5 --- .../python-modules/cons/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/cons/default.nix diff --git a/pkgs/development/python-modules/cons/default.nix b/pkgs/development/python-modules/cons/default.nix new file mode 100644 index 000000000000..2977051d87b2 --- /dev/null +++ b/pkgs/development/python-modules/cons/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, logical-unification +, pytestCheckHook +, pytest-html +}: + +buildPythonPackage rec { + pname = "cons"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "python-cons"; + rev = "fbeedfc8a3d1bff4ba179d492155cdd55538365e"; + sha256 = "sha256-ivHFep9iYPvyiBIZKMAzqrLGnQkeuxd0meYMZwZFFH0="; + }; + + propagatedBuildInputs = [ + logical-unification + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + ]; + + pytestFlagsArray = [ + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "cons" ]; + + meta = with lib; { + description = "An implementation of Lisp/Scheme-like cons in Python"; + homepage = "https://github.com/pythological/python-cons"; + changelog = "https://github.com/pythological/python-cons/releases"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e0f19028a8e..d83860f5273a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1807,6 +1807,8 @@ in { connexion = callPackage ../development/python-modules/connexion { }; + cons = callPackage ../development/python-modules/cons { }; + consonance = callPackage ../development/python-modules/consonance { }; constantly = callPackage ../development/python-modules/constantly { }; From 0f4273b87a37c048de8db942de0f415d8a6b5833 Mon Sep 17 00:00:00 2001 From: Etienne JEAN Date: Mon, 14 Feb 2022 15:57:00 +0100 Subject: [PATCH 3/7] python3Packages.etuples: init at 0.3.4 --- .../python-modules/etuples/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/etuples/default.nix diff --git a/pkgs/development/python-modules/etuples/default.nix b/pkgs/development/python-modules/etuples/default.nix new file mode 100644 index 000000000000..bfb4552732b2 --- /dev/null +++ b/pkgs/development/python-modules/etuples/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cons +, multipledispatch +, pytestCheckHook +, pytest-html +}: + +buildPythonPackage rec { + pname = "etuples"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "etuples"; + rev = "35d760ceb64ec318f302a6e4d3a4a80feda97a9e"; + sha256 = "sha256-CXD8MhsdWYAcG5WDVTT/A2HDtiO1xfQbrwlYVnxXpBU="; + }; + + propagatedBuildInputs = [ + cons + multipledispatch + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + ]; + + pytestFlagsArray = [ + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "etuples" ]; + + meta = with lib; { + description = "Python S-expression emulation using tuple-like objects"; + homepage = "https://github.com/pythological/etuples"; + changelog = "https://github.com/pythological/etuples/releases"; + license = licenses.asl20; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d83860f5273a..7e3b55efeac0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2655,6 +2655,8 @@ in { eth-utils = callPackage ../development/python-modules/eth-utils { }; + etuples = callPackage ../development/python-modules/etuples { }; + et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; ev3dev2 = callPackage ../development/python-modules/ev3dev2 { }; From 4ff8eccf820e6e17f839c3cc735a437eb18db5d2 Mon Sep 17 00:00:00 2001 From: Etienne JEAN Date: Mon, 14 Feb 2022 15:58:46 +0100 Subject: [PATCH 4/7] python3Packages.minikanren: init at 1.0.3 --- .../python-modules/minikanren/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/minikanren/default.nix diff --git a/pkgs/development/python-modules/minikanren/default.nix b/pkgs/development/python-modules/minikanren/default.nix new file mode 100644 index 000000000000..7452148e8e47 --- /dev/null +++ b/pkgs/development/python-modules/minikanren/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, toolz +, cons +, multipledispatch +, etuples +, logical-unification +, pytestCheckHook +, pytest-html +}: + +buildPythonPackage rec { + pname = "minikanren"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "pythological"; + repo = "kanren"; + rev = "5aa9b1734cbb3fe072a7c72b46e1b72a174d28ac"; + sha256 = "sha256-daAtREgm91634Q0mc0/WZivDiyZHC7TIRoGRo8hMnGE="; + }; + + propagatedBuildInputs = [ + toolz + cons + multipledispatch + etuples + logical-unification + ]; + + checkInputs = [ + pytestCheckHook + pytest-html + ]; + + pytestFlagsArray = [ + "--html=testing-report.html" + "--self-contained-html" + ]; + + pythonImportsCheck = [ "kanren" ]; + + meta = with lib; { + description = "Relational programming in Python"; + homepage = "https://github.com/pythological/kanren"; + changelog = "https://github.com/pythological/kanren/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e3b55efeac0..6a7218ed8377 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5060,6 +5060,8 @@ in { minidump = callPackage ../development/python-modules/minidump { }; + minikanren = callPackage ../development/python-modules/minikanren { }; + minikerberos = callPackage ../development/python-modules/minikerberos { }; minimock = callPackage ../development/python-modules/minimock { }; From 31268215848522d81eee25a7771966c79d9c3b89 Mon Sep 17 00:00:00 2001 From: Etienne JEAN Date: Tue, 15 Feb 2022 12:55:05 +0100 Subject: [PATCH 5/7] python3Packages.numba-scipy: init at 0.3.0 --- .../python-modules/numba-scipy/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/numba-scipy/default.nix diff --git a/pkgs/development/python-modules/numba-scipy/default.nix b/pkgs/development/python-modules/numba-scipy/default.nix new file mode 100644 index 000000000000..c8f84cbf43f5 --- /dev/null +++ b/pkgs/development/python-modules/numba-scipy/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, scipy +, numba +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "numba-scipy"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-qJeoWiG1LdtFB9cME1d8xVaC0BXGDJEYjCOEdHvSkmQ="; + }; + + propagatedBuildInputs = [ + scipy + numba + ]; + + postPatch = '' + substituteInPlace setup.py --replace "scipy>=0.16,<=1.6.2" "scipy>=0.16,<=1.7.3" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "numba" ]; + + meta = with lib; { + description = "Extends Numba to make it aware of SciPy"; + homepage = "https://github.com/numba/numba-scipy"; + changelog = "https://github.com/numba/numba-scipy/blob/master/CHANGE_LOG"; + license = licenses.bsd2; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a7218ed8377..64550f510c0c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5554,6 +5554,8 @@ in { numba = callPackage ../development/python-modules/numba { }; + numba-scipy = callPackage ../development/python-modules/numba-scipy { }; + numcodecs = callPackage ../development/python-modules/numcodecs { }; numericalunits = callPackage ../development/python-modules/numericalunits { }; From a7ca974dbd0cb2420b13b4a34491c3dc157d0b07 Mon Sep 17 00:00:00 2001 From: Etienne JEAN Date: Mon, 14 Feb 2022 16:00:11 +0100 Subject: [PATCH 6/7] python3Packages.aesara: init at 2.4.0 --- .../python-modules/aesara/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/aesara/default.nix diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix new file mode 100644 index 000000000000..06836fba5812 --- /dev/null +++ b/pkgs/development/python-modules/aesara/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scipy +, filelock +, etuples +, logical-unification +, minikanren +, cons +, numba +, numba-scipy +, libgpuarray +, sympy +, cython +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aesara"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "aesara-devs"; + repo = "aesara"; + rev = "38d7a813646c1e350170c46bafade0e7d0e2427c"; + sha256 = "sha256-933bM15BZi4sTjnIOGAg5dc5tXVWQ9lFzktOtzj5DNQ="; + }; + + buildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + numpy + scipy + filelock + etuples + logical-unification + minikanren + cons + numba + numba-scipy + libgpuarray + sympy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "aesara" ]; + + meta = with lib; { + description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays"; + homepage = "https://github.com/aesara-devs/aesara"; + changelog = "https://github.com/aesara-devs/aesara/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ Etjean ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64550f510c0c..f4b86ca44111 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -222,6 +222,8 @@ in { aenum = callPackage ../development/python-modules/aenum { }; + aesara = callPackage ../development/python-modules/aesara { }; + afdko = callPackage ../development/python-modules/afdko { }; affine = callPackage ../development/python-modules/affine { }; From c2deb7a921f29a3583eaf7b3b535ef0f86913b51 Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 25 Feb 2022 12:53:01 +0100 Subject: [PATCH 7/7] python3Packages.aesara: move cython to nativeBuildInputs --- pkgs/development/python-modules/aesara/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix index 06836fba5812..3e2e9cb2cf37 100644 --- a/pkgs/development/python-modules/aesara/default.nix +++ b/pkgs/development/python-modules/aesara/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { sha256 = "sha256-933bM15BZi4sTjnIOGAg5dc5tXVWQ9lFzktOtzj5DNQ="; }; - buildInputs = [ + nativeBuildInputs = [ cython ];