diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/mupdf/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/mupdf/default.upstream | 7 | ||||
-rw-r--r-- | pkgs/applications/misc/sweethome3d/default.nix | 66 | ||||
-rw-r--r-- | pkgs/applications/misc/sweethome3d/editors.nix | 90 |
5 files changed, 169 insertions, 4 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index c2d8e7979e45..6c25a67147af 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-1.31.0"; + name = "calibre-1.35.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1fl42y8ppw8s51v66dqsrg1ib28yi6z5779r9wfvdbl9v1clilfc"; + sha256 = "0pzxp1f9d4pw7vksdfkdz6fdgrb8jfwgh4fckjfrarqs039422bi"; }; inherit python; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index ebf3d52ea61d..a56460827f50 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg , libX11, libXext }: stdenv.mkDerivation rec { - name = "mupdf-1.4"; + version = "1.5"; + name = "mupdf-${version}"; src = fetchurl { url = "http://mupdf.com/download/archive/${name}-source.tar.gz"; - sha256 = "08pc6fv42sb9k9dzjs8ph32nixzrzmr08yxh7arkpsdm42asp2q1"; + sha256 = "0sl47zqf4c9fhs4h5zg046vixjmwgy4vhljhr5g4md733nash7z4"; }; buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ]; @@ -67,5 +68,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; linux; + inherit version; }; } diff --git a/pkgs/applications/misc/mupdf/default.upstream b/pkgs/applications/misc/mupdf/default.upstream new file mode 100644 index 000000000000..07cafdb0c2a4 --- /dev/null +++ b/pkgs/applications/misc/mupdf/default.upstream @@ -0,0 +1,7 @@ +url http://mupdf.com/downloads/archive/ +do_overwrite(){ + ensure_hash + ensure_version + set_var_value version $CURRENT_VERSION + set_var_value sha256 $CURRENT_HASH +} diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix new file mode 100644 index 000000000000..ab7a8240ebfb --- /dev/null +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant +, p7zip }: + +let + + mkSweetHome3D = + { name, module, version, src, license, description }: + + stdenv.mkDerivation rec { + inherit name version src description; + exec = stdenv.lib.toLower module; + sweethome3dItem = makeDesktopItem { + inherit name exec; + comment = description; + desktopName = name; + genericName = "Computer Aided (Interior) Design"; + categories = "Application;CAD;"; + }; + + buildInputs = [ ant jdk jre makeWrapper p7zip ]; + + buildPhase = '' + ant furniture textures help + mkdir -p $out/share/{java,applications} + mv build/*.jar $out/share/java/. + ant + ''; + + installPhase = '' + mkdir -p $out/bin + cp install/${module}-${version}.jar $out/share/java/. + cp ${sweethome3dItem}/share/applications/* $out/share/applications + makeWrapper ${jre}/bin/java $out/bin/$exec \ + --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" + ''; + + dontStrip = true; + + meta = { + homepage = "http://www.sweethome3d.com/index.jsp"; + inherit description; + inherit license; + maintainers = [ stdenv.lib.maintainers.edwtjo ]; + platforms = stdenv.lib.platforms.linux; + }; + }; + + d2u = stdenv.lib.replaceChars ["."] ["_"]; + +in rec { + + application = mkSweetHome3D rec { + version = "4.3.1"; + module = "SweetHome3D"; + name = stdenv.lib.toLower module + "-application-" + version; + description = "Design and visualize your future home"; + license = stdenv.lib.licenses.gpl2Plus; + src = fetchcvs { + cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; + sha256 = "0jn3xamghz8rsmzvpd57cvz32yk8mni8dyx15xizjcki0450bp3f"; + module = module; + tag = "V_" + d2u version; + }; + }; + +} diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix new file mode 100644 index 000000000000..9eca1df59f5d --- /dev/null +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -0,0 +1,90 @@ +{ stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant +, p7zip, sweethome3dApp }: + +let + + sweetExec = with stdenv.lib; + m: "sweethome3d-" + + removeSuffix "libraryeditor" (toLower m) + + "-editor"; + sweetName = m: v: sweetExec m + "-" + v; + + mkEditorProject = + { name, module, version, src, license, description }: + + stdenv.mkDerivation rec { + application = sweethome3dApp; + inherit name module version src description; + exec = sweetExec module; + editorItem = makeDesktopItem { + inherit name exec; + comment = description; + desktopName = name; + genericName = "Computer Aided (Interior) Design"; + categories = "Application;CAD;"; + }; + + buildInputs = [ ant jre jdk makeWrapper ]; + + patchPhase = '' + sed -i -e 's,../SweetHome3D,${application.src},g' build.xml + ''; + + buildPhase = '' + ant -lib ${application.src}/libtest -lib ${application.src}/lib -lib ${jdk}/lib + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/{java,applications} + cp ${module}-${version}.jar $out/share/java/. + cp ${editorItem}/share/applications/* $out/share/applications + makeWrapper ${jre}/bin/java $out/bin/$exec \ + --add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" + ''; + + dontStrip = true; + + meta = { + homepage = "http://www.sweethome3d.com/index.jsp"; + inherit description; + inherit license; + maintainers = [ stdenv.lib.maintainers.edwtjo ]; + platforms = stdenv.lib.platforms.linux; + }; + + }; + + d2u = stdenv.lib.replaceChars ["."] ["_"]; + +in rec { + + textures-editor = mkEditorProject rec { + version = "1.3"; + module = "TexturesLibraryEditor"; + name = sweetName module version; + description = "Easily create SH3T files and edit the properties of the texture images it contain"; + license = stdenv.lib.licenses.gpl2Plus; + src = fetchcvs { + cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; + sha256 = "1caf1hmf87bj5dr7w2swnlbvkb3q1jdjr1zgjn1k07d0fxh0ikbx"; + module = module; + tag = "V_" + d2u version; + }; + }; + + furniture-editor = mkEditorProject rec { + version = "1.13"; + module = "FurnitureLibraryEditor"; + name = sweetName module version; + description = "Quickly create SH3F files and edit the properties of the 3D models it contain"; + license = stdenv.lib.licenses.gpl2; + src = fetchcvs { + cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d"; + sha256 = "1nll5589rc0g71zd86cwmzl4p2icynykj106schmxric9v17jbv5"; + module = module; + tag = "V_" + d2u version; + }; + }; + +} |