diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-06-02 09:05:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-02 09:05:50 +0200 |
| commit | 1606bd2a17b0807ff45cc8ab7ea4082c8cc81e8f (patch) | |
| tree | 4d164e7fa6be79583ad49e38e91b9b9e13e21691 | |
| parent | 68faf5d5e5e1583568f9f14a6dbc5dacb3334e7d (diff) | |
| parent | 5ae61ce156d9b7d77f09ecd87dc86f31119e2a8f (diff) | |
| download | nixpkgs-1606bd2a17b0807ff45cc8ab7ea4082c8cc81e8f.tar nixpkgs-1606bd2a17b0807ff45cc8ab7ea4082c8cc81e8f.tar.gz nixpkgs-1606bd2a17b0807ff45cc8ab7ea4082c8cc81e8f.tar.bz2 nixpkgs-1606bd2a17b0807ff45cc8ab7ea4082c8cc81e8f.tar.lz nixpkgs-1606bd2a17b0807ff45cc8ab7ea4082c8cc81e8f.tar.xz nixpkgs-1606bd2a17b0807ff45cc8ab7ea4082c8cc81e8f.tar.zst nixpkgs-1606bd2a17b0807ff45cc8ab7ea4082c8cc81e8f.zip | |
Merge pull request #26308 from rnhmjoj/uncertainties
pythonPackages.uncertainties: move to development/python-modules
| -rw-r--r-- | pkgs/development/python-modules/uncertainties/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 22 |
2 files changed, 25 insertions, 21 deletions
diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix new file mode 100644 index 00000000000..a0aa1478944 --- /dev/null +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchPypi, buildPythonPackage, nose, numpy }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "uncertainties"; + version = "3.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "de0765cac6911e5afa93ee941063a07b4a98dbd9c314c5eea4ab14bfff0054a4"; + }; + + buildInputs = [ nose numpy ]; + + # No tests included + doCheck = false; + + meta = with stdenv.lib; { + homepage = "http://pythonhosted.org/uncertainties/"; + description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; + maintainer = with maintainers; [ rnhmjoj ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11340382708..72a97e7d673 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28026,27 +28026,7 @@ EOF }; - uncertainties = buildPythonPackage rec { - name = "uncertainties-${version}"; - version = "3.0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/u/uncertainties/${name}.tar.gz"; - sha256 = "de0765cac6911e5afa93ee941063a07b4a98dbd9c314c5eea4ab14bfff0054a4"; - }; - - buildInputs = with self; [ nose numpy ]; - - meta = { - homepage = "http://pythonhosted.org/uncertainties/"; - description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; - license = licenses.bsd3; - }; - - # No tests included - doCheck = false; - }; - + uncertainties = callPackage ../development/python-modules/uncertainties { }; funcy = buildPythonPackage rec { name = "funcy-1.6"; |