From 884713bf091f08f82da1da5d03fcd01d0512b5eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 6 Apr 2015 16:21:33 +0200 Subject: [PATCH 1/2] perl-threads: new package A dependency of newer Slic3r (at least v1.2.6 needs it). --- pkgs/top-level/perl-packages.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f49c7ecb9934..d97d6e182e8a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10042,6 +10042,18 @@ let self = _self // overrides; _self = with self; { }; }; + threads = buildPerlPackage { + name = "threads-2.01"; + src = fetchurl { + url = mirror://cpan/authors/id/J/JD/JDHEDDEN/threads-2.01.tar.gz; + sha256 = "429fea88757e0a347dac2cf9e414dfe8f06c8ca3c5445f6da4a95c2f883b6399"; + }; + meta = { + description = "Perl interpreter-based threads"; + license = "perl"; + }; + }; + Throwable = buildPerlPackage rec { name = "Throwable-0.200010"; src = fetchurl { From 962690cc1853e501afd0f9fa3c2cd94429a18749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 6 Apr 2015 16:22:31 +0200 Subject: [PATCH 2/2] slic3r: update 1.2.1 -> 1.2.6 Release notes: http://slic3r.org/releases/1.2.6 Slic3r needs additional dependency, 'threads'. Add it. In addition to bug fixes and some new features, this update stops Slic3r from printing this on startup: Running Slic3r under Perl >= 5.16 is not supported nor recommended We don't have perl < 5.16 anymore, so we better update slic3r. --- pkgs/applications/misc/slic3r/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 1bd3b73ff49b..36669dd8ae80 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -3,17 +3,17 @@ }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.2.6"; name = "slic3r-${version}"; src = fetchgit { url = "git://github.com/alexrj/Slic3r"; rev = "refs/tags/${version}"; - sha256 = "03xj2kv2d4j6nwmdd5cyghnvjyj4g7g9z0ynynbviyfiplmka2ph"; + sha256 = "1ymk2n9dw1mpizwg6bxbzq60mg1cwljxlncaasdyakqrkkr22r8k"; }; buildInputs = with perlPackages; [ perl makeWrapper which - EncodeLocale MathClipper ExtUtilsXSpp + EncodeLocale MathClipper ExtUtilsXSpp threads MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX ExtUtilsMakeMaker OpenGL WxGLCanvas