From 15d43bb0c1141e4d0f9e901d347b465314a17e50 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Tue, 20 Dec 2016 18:19:04 -0200 Subject: [PATCH 1/6] pythonPackages.noise: init at 1.2.2 --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1d2a3983007..da6313d9fdc4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1610,6 +1610,23 @@ in { }; }; + noise = buildPythonPackage rec { + name = "noise-${version}"; + version = "1.2.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/n/noise/${name}.tar.gz"; + sha256 = "0rcv40dcshqpchwkdlhsv3n68h9swm9fh4d1cgzr2hsp6rs7k8jp"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/caseman/noise"; + description = "Native-code and shader implementations of Perlin noise"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + awscli = buildPythonPackage rec { name = "awscli-${version}"; version = "1.11.45"; From 47d1e698a934efc6399859ec01bf9a8c25e7643c Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Tue, 20 Dec 2016 18:41:49 -0200 Subject: [PATCH 2/6] pythonPackages.pyplatec: init at 1.4.0 --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da6313d9fdc4..a445fe9bbbc8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21481,6 +21481,22 @@ in { }; }; + pyplatec = buildPythonPackage rec { + name = "PyPlatec-${version}"; + version = "1.4.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/P/PyPlatec/${name}.tar.gz"; + sha256 = "0kqx33flcrrlipccmqs78d14pj5749bp85b6k5fgaq2c7yzz02jg"; + }; + + meta = { + description = "Library to simulate plate tectonics with Python bindings"; + homepage = https://github.com/Mindwerks/plate-tectonics; + license = licenses.lgpl3; + }; + }; + pymaging = buildPythonPackage rec { name = "pymaging-unstable-2016-11-16"; From 311da64a0bdfefc5db577b1aa7a71750b5d8bdf3 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Tue, 20 Dec 2016 18:43:46 -0200 Subject: [PATCH 3/6] pythonPackages.purepng: init at 0.2.0 --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a445fe9bbbc8..18706001b214 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -21497,6 +21497,22 @@ in { }; }; + purepng = buildPythonPackage rec { + name = "purepng-${version}"; + version = "0.2.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/purepng/${name}.tar.gz"; + sha256 = "1kcl7a6d7d59360fbz2jwfk6ha6pmqgn396962p4s62j893d2r0d"; + }; + + meta = { + description = "Pure Python library for PNG image encoding/decoding"; + homepage = https://github.com/scondo/purepng; + license = licenses.mit; + }; + }; + pymaging = buildPythonPackage rec { name = "pymaging-unstable-2016-11-16"; From a431dd265cbc271eda6567095e1e2c1366e3e567 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Tue, 20 Dec 2016 20:30:22 -0200 Subject: [PATCH 4/6] pythonPackages.worldengine: init at 0.19.0 --- pkgs/top-level/python-packages.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 18706001b214..e62fb2fb6593 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28601,6 +28601,35 @@ EOF }; }; + worldengine = buildPythonPackage rec { + name = "worldengine-${version}"; + version = "0.19.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/w/worldengine/${name}.tar.gz"; + sha256 = "0wnpp0zm4idc4242a970yf1blf8y2f1ikwha0q781wfz1dg4z0i6"; + }; + + propagatedBuildInputs = with self; [ noise numpy pyplatec protobuf3_2 purepng argparse h5py gdal ]; + + prePatch = '' + substituteInPlace setup.py \ + --replace pypng>=0.0.18 purepng \ + --replace 'numpy>=1.9.2, <= 1.10.0.post2' 'numpy' \ + --replace 'argparse==1.2.1' 'argparse' \ + --replace 'protobuf==3.0.0a3' 'protobuf' \ + --replace 'noise==1.2.2' 'noise' \ + --replace 'PyPlatec==1.4.0' 'PyPlatec' \ + ''; + + meta = { + homepage = http://world-engine.org; + description = "World generator using simulation of plates, rain shadow, erosion, etc"; + platforms = platforms.all; + maintainers = with maintainers; [ rardiol ]; + }; + }; + carbon = buildPythonPackage rec { name = "carbon-${version}"; version = graphiteVersion; From ec9500793666395844a1409d702013f9e23b1291 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Thu, 23 Mar 2017 00:22:16 -0300 Subject: [PATCH 5/6] pythonPackages.worldengine: enable testing --- pkgs/top-level/python-packages.nix | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e62fb2fb6593..94d667cba36c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28605,11 +28605,25 @@ EOF name = "worldengine-${version}"; version = "0.19.0"; - src = pkgs.fetchurl { - url = "mirror://pypi/w/worldengine/${name}.tar.gz"; - sha256 = "0wnpp0zm4idc4242a970yf1blf8y2f1ikwha0q781wfz1dg4z0i6"; + src = pkgs.fetchFromGitHub { + owner = "Mindwerks"; + repo = "worldengine"; + rev = "v${version}"; + sha256 = "1xrckb0dn2841gvp32n18gib14bpi77hmjw3r9jiyhg402iip7ry"; }; + src-data = pkgs.fetchFromGitHub { + owner = "Mindwerks"; + repo = "worldengine-data"; + rev = "029051e"; + sha256 = "06xbf8gj3ljgr11v1n8jbs2q8pdf9wz53xdgkhpm8hdnjahgdxdm"; + }; + + postUnpack = '' + ln -s ${src-data} worldengine-data + ''; + + buildInputs = with self; [ nose ]; propagatedBuildInputs = with self; [ noise numpy pyplatec protobuf3_2 purepng argparse h5py gdal ]; prePatch = '' @@ -28622,6 +28636,11 @@ EOF --replace 'PyPlatec==1.4.0' 'PyPlatec' \ ''; + doCheck = true; + postCheck = '' + nosetests tests + ''; + meta = { homepage = http://world-engine.org; description = "World generator using simulation of plates, rain shadow, erosion, etc"; From 56812b6c94b1fa9ac62706560d18205b3da1ea8c Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Thu, 23 Mar 2017 01:07:42 -0300 Subject: [PATCH 6/6] worldengine-cli: add to all-packages.nix --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 385030188e9c..b7f4a5eafce0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16014,6 +16014,8 @@ with pkgs; inherit (python27Packages) cheetah; }; + worldengine-cli = python3Packages.worldengine; + wpsoffice = callPackage ../applications/office/wpsoffice {}; wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { };