diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 937025c0840..5c12ebcbfeb 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -1,15 +1,14 @@ -{ stdenv, python27Packages, curaengine, makeDesktopItem, fetchgit }: +{ stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }: let py = python27Packages; + version = "14.07"; in stdenv.mkDerivation rec { name = "cura"; - src = fetchgit { - url = "https://github.com/daid/Cura"; - rev = "58414695269d60ca9b165e8cbc3424933ed79403"; - sha256 = "1nxrrz8sjjx9i9cyvz15vay6yarnywp3vlk7qzr65sw88lzxgq23"; - fetchSubmodules = false; + src = fetchurl { + url = "https://github.com/daid/Cura/archive/${version}.tar.gz"; + sha256 = "1jfgkb2qh1syakcssk66yhnfjm9p9qcx48v34bbza9nryrdlmxdb"; }; desktopItem = makeDesktopItem { @@ -67,5 +66,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/daid/Cura; license = licenses.agpl3; platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 256d337f679..e004b7db336 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,22 +1,25 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchurl }: +let + version = "14.03"; +in stdenv.mkDerivation { - name = "curaengine"; + name = "curaengine"; - src = fetchgit { - url = "https://github.com/Ultimaker/CuraEngine"; - rev = "62667ff2e7479b55d75e3d1dc9136242adf4a6a0"; - sha256 = "0c68xmnq4c49vzg2cyqb375kc72rcnghj21wp3919w8sfwil00vr"; - }; + src = fetchurl { + url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"; + sha256 = "0f37jk6w3zd9x29c1rydqmfdzybx9nbmwdi3y3nzynq1vq7zmxcc"; + }; - installPhase = '' - mkdir -p $out/bin - cp CuraEngine $out/bin/ - ''; + installPhase = '' + mkdir -p $out/bin + cp CuraEngine $out/bin/ + ''; - meta = with stdenv.lib; { - description = "Engine for processing 3D models into 3D printing instructions"; - homepage = https://github.com/Ultimaker/CuraEngine; - license = licenses.agpl3; - platforms = platforms.linux; - }; + meta = with stdenv.lib; { + description = "Engine for processing 3D models into 3D printing instructions"; + homepage = https://github.com/Ultimaker/CuraEngine; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + }; }