diff options
| author | Lancelot SIX <lsix@lancelotsix.com> | 2016-02-26 17:33:45 +0100 |
|---|---|---|
| committer | Lancelot SIX <lsix@lancelotsix.com> | 2016-03-02 09:41:02 +0100 |
| commit | 8f4a7d6c4c4eae6fb82ccf2fc33a88e03d5fd8c4 (patch) | |
| tree | f878af390645efd0599382e22217f1fa091e655f /pkgs | |
| parent | 999bf7c9c710486b8a92cf8998c385fbc64ac762 (diff) | |
| download | nixlib-8f4a7d6c4c4eae6fb82ccf2fc33a88e03d5fd8c4.tar nixlib-8f4a7d6c4c4eae6fb82ccf2fc33a88e03d5fd8c4.tar.gz nixlib-8f4a7d6c4c4eae6fb82ccf2fc33a88e03d5fd8c4.tar.bz2 nixlib-8f4a7d6c4c4eae6fb82ccf2fc33a88e03d5fd8c4.tar.lz nixlib-8f4a7d6c4c4eae6fb82ccf2fc33a88e03d5fd8c4.tar.xz nixlib-8f4a7d6c4c4eae6fb82ccf2fc33a88e03d5fd8c4.tar.zst nixlib-8f4a7d6c4c4eae6fb82ccf2fc33a88e03d5fd8c4.zip | |
pkgs.motuclient: move application away from pythonPackages
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/science/misc/motu-client/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 26 |
3 files changed, 24 insertions, 27 deletions
diff --git a/pkgs/applications/science/misc/motu-client/default.nix b/pkgs/applications/science/misc/motu-client/default.nix new file mode 100644 index 000000000000..b5e9fa6a51ee --- /dev/null +++ b/pkgs/applications/science/misc/motu-client/default.nix @@ -0,0 +1,23 @@ +{ python27Packages, fetchurl, lib } : +python27Packages.buildPythonApplication rec { + name = "motu-client-${version}"; + version = "1.0.8"; + + src = fetchurl { + url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${name}.tar.gz"; + sha256 = "1naqmav312agn72iad9kyxwscn2lz4v1cfcqqi1qcgvc82vnwkw2"; + }; + + meta = with lib; { + homepage = https://github.com/quiet-oceans/motuclient-setuptools; + description = "CLI to query oceanographic data to Motu servers"; + longDescription = '' + Access data from (motu)[http://sourceforge.net/projects/cls-motu/] servers. + This is a refactored fork of the original release in order to simplify integration, + deployment and packaging. Upstream code can be found at + http://sourceforge.net/projects/cls-motu/ . + ''; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.lsix ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd24b79e54b2..976063d8dd60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2458,7 +2458,7 @@ let inherit (perlPackages) IOTty; }; - motuclient = python27Packages.motuclient; + motuclient = callPackage ../applications/science/misc/motu-client { }; mpage = callPackage ../tools/text/mpage { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff2fe1e840af..ce794867e27f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6397,32 +6397,6 @@ in modules // { }; }; - motuclient = buildPythonPackage rec { - name = "motu-client-${version}"; - version = "1.0.8"; - - namePrefix = ""; - disabled = !isPy27; - - src = pkgs.fetchurl { - url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${name}.tar.gz"; - sha256 = "1naqmav312agn72iad9kyxwscn2lz4v1cfcqqi1qcgvc82vnwkw2"; - }; - - meta = { - homepage = https://github.com/quiet-oceans/motuclient-setuptools; - description = "CLI to query oceanographic data to Motu servers"; - longDescription = '' - Access data from (motu)[http://sourceforge.net/projects/cls-motu/] servers. - This is a refactored fork of the original release in order to simplify integration, - deployment and packaging. Upstream code can be found at - http://sourceforge.net/projects/cls-motu/ . - ''; - license = licenses.lgpl3Plus; - maintainers = [ maintainers.lsix ]; - }; - }; - mwlib-ext = buildPythonPackage rec { version = "0.13.2"; name = "mwlib.ext-${version}"; |