diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/slic3r/default.nix | 26 | ||||
-rw-r--r-- | pkgs/applications/misc/slic3r/gcc6.patch | 40 | ||||
-rw-r--r-- | pkgs/applications/misc/xmr-stak/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/xmrig/default.nix | 8 |
4 files changed, 22 insertions, 56 deletions
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 21b55e6e7a0..7b28462d552 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -1,28 +1,27 @@ { stdenv, fetchgit, perl, makeWrapper, makeDesktopItem -, which, perlPackages +, which, perlPackages, boost }: stdenv.mkDerivation rec { - version = "1.2.9"; + version = "1.3.0"; name = "slic3r-${version}"; src = fetchgit { url = "git://github.com/alexrj/Slic3r"; - rev = "refs/tags/${version}"; - sha256 = "1z8h11k29b7z49z5k8ikyfiijyycy1q3krlzi8hfd0vdybvymw21"; + rev = version; + sha256 = "1pg4jxzb7f58ls5s8mygza8kqdap2c50kwlsdkf28bz1xi611zbi"; }; - patches = [ - ./gcc6.patch - ]; - - buildInputs = with perlPackages; [ perl makeWrapper which + buildInputs = + [boost] ++ + (with perlPackages; [ perl makeWrapper which EncodeLocale MathClipper ExtUtilsXSpp threads MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo IOStringy ClassXSAccessor Wx GrowlGNTP NetDBus ImportInto XMLSAX ExtUtilsMakeMaker OpenGL WxGLCanvas ModuleBuild LWP ExtUtilsCppGuess ModuleBuildWithXSpp ExtUtilsTypemapsDefault - ]; + DevelChecklib locallib + ]); desktopItem = makeDesktopItem { name = "slic3r"; @@ -34,6 +33,13 @@ stdenv.mkDerivation rec { categories = "Application;Development;"; }; + prePatch = '' + # In nix ioctls.h isn't available from the standard kernel-headers package + # on other distributions. As the copy in glibc seems to be identical to the + # one in the kernel, we use that one instead. + sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' xs/src/libslic3r/GCodeSender.cpp + ''; + buildPhase = '' export SLIC3R_NO_AUTO=true export LD=$CXX diff --git a/pkgs/applications/misc/slic3r/gcc6.patch b/pkgs/applications/misc/slic3r/gcc6.patch deleted file mode 100644 index f382a252f0d..00000000000 --- a/pkgs/applications/misc/slic3r/gcc6.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git i/xs/src/libslic3r/Config.hpp w/xs/src/libslic3r/Config.hpp -index 49e999b..d9b65d8 100644 ---- i/xs/src/libslic3r/Config.hpp -+++ w/xs/src/libslic3r/Config.hpp -@@ -65,7 +65,7 @@ class ConfigOptionFloat : public ConfigOption - - bool deserialize(std::string str) { - std::istringstream iss(str); -- return iss >> this->value; -+ return bool(iss >> this->value); - }; - }; - -@@ -124,7 +124,7 @@ class ConfigOptionInt : public ConfigOption - - bool deserialize(std::string str) { - std::istringstream iss(str); -- return iss >> this->value; -+ return bool(iss >> this->value); - }; - }; - -@@ -249,7 +249,7 @@ class ConfigOptionPercent : public ConfigOption - bool deserialize(std::string str) { - // don't try to parse the trailing % since it's optional - std::istringstream iss(str); -- return iss >> this->value; -+ return bool(iss >> this->value); - }; - }; - -@@ -279,7 +279,7 @@ class ConfigOptionFloatOrPercent : public ConfigOption - bool deserialize(std::string str) { - this->percent = str.find_first_of("%") != std::string::npos; - std::istringstream iss(str); -- return iss >> this->value; -+ return bool(iss >> this->value); - }; - }; - diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 8149c6fe853..a2b2410a1a1 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.5.2"; + version = "2.6.0"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "0fk51s0789arwkidgx4c5y4shdvawwc132dzn8z71fpi6kh6ggvm"; + sha256 = "15vb55bshgjxk77yys7p832mr8qf7fb1dv3l0ppl6cmdcg8k0sx2"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index f61cbf39759..c13f8ed4f40 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -1,20 +1,20 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd +{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl , donateLevel ? 0 }: stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.6.4"; + version = "2.8.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1c68qg7433chri6q1yhyggy4mbq2vnn3p2fxs8gqmgij9vpqn3m2"; + sha256 = "144i24c707fja89iqcc511b4077p53q8w2cq5zd26hry2i4i3abi"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libuv libmicrohttpd ]; + buildInputs = [ libuv libmicrohttpd openssl ]; postPatch = '' substituteInPlace src/donate.h --replace "kDonateLevel = 5;" "kDonateLevel = ${toString donateLevel};" |