From 4ba42ffd815c0d931fa73f32cfb5ba9d376b8d96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 23 Feb 2023 21:15:47 +0000 Subject: [PATCH 1/2] python310Packages.moku: 2.6.0 -> 2.6.2 --- pkgs/development/python-modules/moku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moku/default.nix b/pkgs/development/python-modules/moku/default.nix index 3aba750f22e7..34e37a851fec 100644 --- a/pkgs/development/python-modules/moku/default.nix +++ b/pkgs/development/python-modules/moku/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "moku"; - version = "2.6.0"; + version = "2.6.2"; /* @@ -22,7 +22,7 @@ buildPythonPackage rec { */ src = fetchPypi { inherit pname version; - hash = "sha256-tG54V26H7viu5DPs3EWTg7ouCsdC3EXoeb8iexO6YBw="; + hash = "sha256-LqHHxSWjPKhgcjBkSqMf9MKyS/4DFrIRZcaVIFzCxaQ="; }; /* From f49ebf25d053f1adfb500e745aded05d1e1ed7dc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 26 Feb 2023 10:17:26 +0200 Subject: [PATCH 2/2] python3.pkgs.moku: Remove Unusable. Upstream recommends instead utilities from https://www.liquidinstruments.com/software/utilities/ which don't seem opensource, and require new packaging from the bottom up. --- .../python-modules/moku/default.nix | 57 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 pkgs/development/python-modules/moku/default.nix diff --git a/pkgs/development/python-modules/moku/default.nix b/pkgs/development/python-modules/moku/default.nix deleted file mode 100644 index 34e37a851fec..000000000000 --- a/pkgs/development/python-modules/moku/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, zeroconf -, requests -, setuptools -}: - -buildPythonPackage rec { - pname = "moku"; - version = "2.6.2"; - - /* - - Pypi's webpage lists - https://github.com/liquidinstruments/moku/archive/${version}.tar.gz as the - download link, but that repository doesn't exist from some reason :/. When - packaging this, I didn't find any mention of a git repo of the sources. Note - that the pymoku repo holds the - sources of the legacy API package. - - */ - src = fetchPypi { - inherit pname version; - hash = "sha256-LqHHxSWjPKhgcjBkSqMf9MKyS/4DFrIRZcaVIFzCxaQ="; - }; - /* - - Note: If you run `moku download` and encounter the error: - - [Errno 13] Permission denied: '/nix/store/.../lib/python 3.9/site-packages/moku/data' - - Then use the $MOKU_DATA_PATH environment variable to control where the - downloaded files will go to. It is undocumented upstream and there's no - repository to contribute such documentation unfortunately. Also there is no - suitable default value for this on Nix systems, so there's no patch we can - apply locally to make the situation better. - - */ - - propagatedBuildInputs = [ - zeroconf - requests - setuptools - ]; - - pythonImportsCheck = [ - "moku" - ]; - - meta = with lib; { - description = "Python scripting interface to the Liquid Instruments Moku"; - homepage = "https://apis.liquidinstruments.com/starting-python.html"; - license = licenses.mit; - maintainers = with maintainers; [ doronbehar ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5a4d2fbb189c..b031f675ec85 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -982,6 +982,7 @@ mapAliases ({ moby = throw "moby has been removed, merged into linuxkit in 2018. Use linuxkit instead"; module_init_tools = throw "'module_init_tools' has been renamed to/replaced by 'kmod'"; # Converted to throw 2022-02-22 monero = monero-cli; # Added 2021-11-28 + moku = throw "moku: Unusable since 2.6.2, not maintained upstream anymore"; # Added 2022-02-26 mongodb-3_4 = throw "mongodb-3_4 has been removed, it's end of life since January 2020"; # Added 2022-11-30 mongodb-3_6 = throw "mongodb-3_6 has been removed, it's end of life since April 2021"; # Added 2022-11-30 mongodb-4_0 = throw "mongodb-4_0 has been removed, it's end of life since April 2022"; # Added 2023-01-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2726985ad89c..46dff0297164 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6023,8 +6023,6 @@ self: super: with self; { mohawk = callPackage ../development/python-modules/mohawk { }; - moku = callPackage ../development/python-modules/moku { }; - monai = callPackage ../development/python-modules/monai { }; monero = callPackage ../development/python-modules/monero { };