diff options
author | Gabriel Ebner <gebner@gebner.org> | 2019-08-08 10:02:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-08 10:02:54 +0200 |
commit | 8febac00c377abab92dc81771f97c31ea14d0bb7 (patch) | |
tree | e48b74399b6a8bbd1dba7f334d9d6607d5aaabbc /pkgs/development/python-modules | |
parent | f6c363f81dbc43e02f16703620cb5315f66559e9 (diff) | |
parent | 9e0e36b9d9b84ad97d0dc19e3adf4bc93068ce7b (diff) | |
download | nixpkgs-8febac00c377abab92dc81771f97c31ea14d0bb7.tar nixpkgs-8febac00c377abab92dc81771f97c31ea14d0bb7.tar.gz nixpkgs-8febac00c377abab92dc81771f97c31ea14d0bb7.tar.bz2 nixpkgs-8febac00c377abab92dc81771f97c31ea14d0bb7.tar.lz nixpkgs-8febac00c377abab92dc81771f97c31ea14d0bb7.tar.xz nixpkgs-8febac00c377abab92dc81771f97c31ea14d0bb7.tar.zst nixpkgs-8febac00c377abab92dc81771f97c31ea14d0bb7.zip |
Merge pull request #66315 from gebner/cura421
cura: 4.1.0 -> 4.2.1
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/libarcus/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/python-modules/libsavitar/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/python-modules/uranium/default.nix | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index add1957dd6d..54d9193c25b 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "libarcus"; - version = "4.1.0"; + version = "4.2.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "1x06daijxbrqj0dlxmi2zn7ap74zf6hih3krmkwhvarm2nr052g4"; + sha256 = "0pk0g80ay9aghzmb8gfpqh0chl9rk47jh0ziicpianhklxx2jb44"; }; disabled = pythonOlder "3.4.0"; @@ -20,7 +20,7 @@ buildPythonPackage rec { buildInputs = [ protobuf ]; postPatch = '' - sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake + sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake ''; meta = with stdenv.lib; { @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = https://github.com/Ultimaker/libArcus; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar gebner ]; }; } diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index f0fbcf5f311..657df2dfb7c 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -2,18 +2,18 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.1.0"; + version = "4.2.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "132bgcvjkr61pzf244hwz8gxzpg1i50na4bkcipwnyxdravdkkgf"; + sha256 = "0cqskd8rcg7pih8nj3s2i137lwxpibmdmym6f8hii14ashny73i1"; }; postPatch = '' - sed -i 's#''${Python3_SITELIB}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake + sed -i 's#''${Python3_SITEARCH}#${placeholder "out"}/${python.sitePackages}#' cmake/SIPMacros.cmake ''; nativeBuildInputs = [ cmake ]; @@ -27,6 +27,6 @@ buildPythonPackage rec { homepage = https://github.com/Ultimaker/libSavitar; license = licenses.lgpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ abbradar orivej ]; + maintainers = with maintainers; [ abbradar orivej gebner ]; }; } diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 6365846bd26..aec0f731554 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, shapely, libarcus, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "4.1.0"; + version = "4.2.0"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "0vjlir9rd3xdlb8icdcr51qjmnh8nny6ajycria9idccriaqficj"; + sha256 = "1dc3s6zya7bbpvzh4acbs65aj899siwd8jr9snnsrdyl9qh8hhq9"; }; disabled = pythonOlder "3.5.0"; @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = https://github.com/Ultimaker/Uranium; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar gebner ]; }; } |