diff options
author | William A. Kennington III <william@wkennington.com> | 2015-07-27 08:17:19 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-07-27 08:17:19 -0700 |
commit | bd5f2c96380d60629fb46c1e99f41233a3ae9f58 (patch) | |
tree | d59c8c44a841c63f4211688e036c53753bb50412 /pkgs/applications | |
parent | e1f78bf677e10c6870b416148eef1b2755498097 (diff) | |
parent | 93ec36702e3ced8202bd93f12d53e2dfb7c898e0 (diff) | |
download | nixpkgs-bd5f2c96380d60629fb46c1e99f41233a3ae9f58.tar nixpkgs-bd5f2c96380d60629fb46c1e99f41233a3ae9f58.tar.gz nixpkgs-bd5f2c96380d60629fb46c1e99f41233a3ae9f58.tar.bz2 nixpkgs-bd5f2c96380d60629fb46c1e99f41233a3ae9f58.tar.lz nixpkgs-bd5f2c96380d60629fb46c1e99f41233a3ae9f58.tar.xz nixpkgs-bd5f2c96380d60629fb46c1e99f41233a3ae9f58.tar.zst nixpkgs-bd5f2c96380d60629fb46c1e99f41233a3ae9f58.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 90 | ||||
-rw-r--r-- | pkgs/applications/graphics/geeqie/default.nix | 15 | ||||
-rw-r--r-- | pkgs/applications/misc/cherrytree/default.nix | 37 | ||||
-rw-r--r-- | pkgs/applications/misc/electrum/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/misc/redshift/default.nix | 39 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/source/sources.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/networking/remote/putty/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/science/math/ecm/default.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/version-management/peru/default.nix | 28 | ||||
-rw-r--r-- | pkgs/applications/video/mpv/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/virtualization/bochs/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/window-managers/icewm/default.nix | 44 | ||||
-rw-r--r-- | pkgs/applications/window-managers/oroborus/default.nix | 27 |
13 files changed, 189 insertions, 141 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 7ae24b38c01..683e2721d87 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,11 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, libtool -, libcl ? null, perl ? null, jemalloc ? null, bzip2 ? null, zlib ? null -, libX11 ? null, libXext ? null, libXt ? null, dejavu_fonts ? null, fftw ? null -, libfpx ? null, djvulibre ? null, fontconfig ? null, freetype ? null -, ghostscript ? null, graphviz ? null, jbigkit ? null, libjpeg ? null -, lcms2 ? null, openjpeg ? null, liblqr1 ? null, xz ? null, openexr ? null -, pango ? null, libpng ? null, librsvg ? null, libtiff ? null, libwebp ? null -, libxml2 ? null +{ lib, stdenv, fetchurl, pkgconfig, libtool +, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg +, lcms2, openexr, libpng, librsvg, libtiff, libxml2 }: let @@ -17,15 +12,8 @@ let else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" else throw "ImageMagick is not supported on this platform."; - mkFlag = trueStr: falseStr: cond: val: "--${if cond then trueStr else falseStr}-${val}"; - mkWith = mkFlag "with" "without"; - mkEnable = mkFlag "enable" "disable"; - - hasX11 = libX11 != null && libXext != null && libXt != null; - in -with stdenv.lib; stdenv.mkDerivation rec { name = "imagemagick-${version}"; @@ -34,62 +22,26 @@ stdenv.mkDerivation rec { sha256 = "03lvj6rxv16xk0dpsbzvm2gq5bggkwff9wqbpkq0znihzijpax1j"; }; - enableParallelBuilding = true; + outputs = [ "out" "doc" ]; - configureFlags = [ - (mkEnable (libcl != null) "opencl") - (mkWith true "modules") - (mkWith true "gcc-arch=${arch}") - #(mkEnable true "hdri") This breaks some dependencies - (mkWith (perl != null) "perl") - (mkWith (jemalloc != null) "jemalloc") - (mkWith true "frozenpaths") - (mkWith (bzip2 != null) "bzlib") - (mkWith hasX11 "x") - (mkWith (zlib != null) "zlib") - (mkWith false "dps") - (mkWith (fftw != null) "fftw") - (mkWith (libfpx != null) "fpx") - (mkWith (djvulibre != null) "djvu") - (mkWith (fontconfig != null) "fontconfig") - (mkWith (freetype != null) "freetype") - (mkWith (ghostscript != null) "gslib") - (mkWith (graphviz != null) "gvc") - (mkWith (jbigkit != null) "jbig") - (mkWith (libjpeg != null) "jpeg") - (mkWith (lcms2 != null) "lcms2") - (mkWith false "lcms") - (mkWith (openjpeg != null) "openjp2") - (mkWith (liblqr1 != null) "lqr") - (mkWith (xz != null) "lzma") - (mkWith (openexr != null) "openexr") - (mkWith (pango != null) "pango") - (mkWith (libpng != null) "png") - (mkWith (librsvg != null) "rsvg") - (mkWith (libtiff != null) "tiff") - (mkWith (libwebp != null) "webp") - (mkWith (libxml2 != null) "xml") - ] ++ optional (dejavu_fonts != null) "--with-dejavu-font-dir=${dejavu_fonts}/share/fonts/truetype/" - ++ optional (ghostscript != null) "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts/"; - - buildInputs = [ - pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw - libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg - lcms2 openjpeg liblqr1 xz openexr pango libpng librsvg libtiff libwebp - libxml2 - ]; + enableParallelBuilding = true; - propagatedBuildInputs = [] - ++ (stdenv.lib.optional (lcms2 != null) lcms2) - ++ (stdenv.lib.optional (liblqr1 != null) liblqr1) - ++ (stdenv.lib.optional (fftw != null) fftw) - ++ (stdenv.lib.optional (libtool != null) libtool) - ++ (stdenv.lib.optional (jemalloc != null) jemalloc) - ++ (stdenv.lib.optional (libXext != null) libXext) - ++ (stdenv.lib.optional (libX11 != null) libX11) - ++ (stdenv.lib.optional (libXt != null) libXt) - ++ (stdenv.lib.optional (bzip2 != null) bzip2) - ; + configureFlags = + [ "--with-frozenpaths" ] + ++ [ "--with-gcc-arch=${arch}" ] + ++ lib.optional (librsvg != null) "--with-rsvg" + ++ lib.optionals (ghostscript != null) + [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" + "--with-gslib" + ]; + + buildInputs = + [ pkgconfig libtool zlib fontconfig freetype ghostscript libjpeg + openexr libpng librsvg libtiff libxml2 + ]; + + propagatedBuildInputs = + [ bzip2 freetype libjpeg libX11 libXext libXt lcms2 ]; postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index e1eb7bb5a7b..e2cc0ec5c01 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk, libpng, exiv2 -, lcms, intltool, gettext, fbida +{ stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2 +, lcms, intltool, gettext, libchamplain, fbida }: stdenv.mkDerivation rec { name = "geeqie-${version}"; - version = "1.2"; + version = "1.1"; # Don't upgrade to 1.2; see fee59b1235e658954b207ff6679264654c4708d2. src = fetchurl { - url = "mirror://debian/pool/main/g/geeqie/geeqie_${version}.orig.tar.gz"; - sha256 = "0wkcpyh3f6ig36x1q6h9iqgq225w37visip48m72j8rpghmv1rn3"; + url = "mirror://sourceforge/geeqie/${name}.tar.gz"; + sha256 = "1kzy39z9505xkayyx7rjj2wda76xy3ch1s5z35zn8yli54ffhi2m"; }; - preConfigure = "./autogen.sh"; - configureFlags = [ "--enable-gps" ]; buildInputs = [ - pkgconfig autoconf automake gtk libpng exiv2 lcms intltool gettext + pkgconfig gtk libpng exiv2 lcms intltool gettext + #libchamplain ]; postInstall = '' diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index eb73f48559a..97b67a3ae33 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -1,18 +1,24 @@ { stdenv, fetchurl, python, pythonPackages, gettext, pygtksourceview, sqlite }: +with stdenv.lib; stdenv.mkDerivation rec { - name = "cherrytree-0.35.8"; + + name = "cherrytree-${version}"; + version = "0.35.9"; src = fetchurl { url = "http://www.giuspen.com/software/${name}.tar.xz"; - sha256 = "0vqc1idzd73f4q5f4zwwypj4jiivwnb4y0r3041h2pm08y1wgsd8"; + sha256 = "14yahp0y13z3xkpwvprm7q9x3rj6jbzi0bryqlsn3bbafdq7wnac"; }; - propagatedBuildInputs = [ pythonPackages.sqlite3 ]; + propagatedBuildInputs = with pythonPackages; + [ sqlite3 ]; - buildInputs = with pythonPackages; [ python gettext wrapPython pygtk dbus pygtksourceview ]; + buildInputs = with pythonPackages; + [ python gettext wrapPython pygtk dbus pygtksourceview ]; - pythonPath = with pythonPackages; [ pygtk dbus pygtksourceview ]; + pythonPath = with pythonPackages; + [ pygtk dbus pygtksourceview ]; patches = [ ./subprocess.patch ]; @@ -27,10 +33,21 @@ stdenv.mkDerivation rec { doCheck = false; - meta = { - description = "A hierarchical note taking application, featuring rich text and syntax highlighting, storing data in a single xml or sqlite file"; + meta = { + description = "An hierarchical note taking application"; + longDescription = '' + Cherrytree is an hierarchical note taking application, + featuring rich text, syntax highlighting and powerful search + capabilities. It organizes all information in units called + "nodes", as in a tree, and can be very useful to store any piece + of information, from tables and links to pictures and even entire + documents. All those little bits of information you have scattered + around your hard drive can be conveniently placed into a + Cherrytree document where you can easily find it. + ''; homepage = http://www.giuspen.com/cherrytree; - license = stdenv.lib.licenses.gpl3; - platforms = with stdenv.lib.platforms; linux; - }; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.AndersonTorres ]; + }; } diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index b910b1796a3..7aff57a6af9 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { name = "electrum-${version}"; - version = "2.3.2"; + version = "2.4"; src = fetchurl { url = "https://download.electrum.org/Electrum-${version}.tar.gz"; - sha256 = "0idqm77d5rbwpw14wqg4ysvbjyqjw7zlqfcdxniy74i2qwz163bi"; + sha256 = "0z5ksr1wlywl4bpvxjmmqnsk7jh1jfjdz9lsjkhf2j391jx0wz9q"; }; propagatedBuildInputs = with pythonPackages; [ @@ -16,6 +16,7 @@ buildPythonPackage rec { protobuf pyasn1 pyasn1-modules + pycrypto pyqt4 qrcode requests diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 244464130be..dc799bd6ff5 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,7 +1,16 @@ -{ fetchurl, stdenv, gettext, geoclue, intltool, makeWrapper -, pkgconfig , python, pygobject3, pyxdg }: +{ fetchurl, stdenv, gettext, intltool, pkgconfig, makeWrapper +, geoclue, python, pygobject3, pyxdg +, libdrm, libX11, libxcb, libXxf86vm +, guiSupport ? true +, drmSupport ? true +, randrSupport ? true +, vidModeSupport ? true +}: -let version = "1.10"; in +let + version = "1.10"; + mkFlag = flag: name: if flag then "--enable-${name}" else "--disable-${name}"; +in stdenv.mkDerivation { name = "redshift-${version}"; src = fetchurl { @@ -9,19 +18,29 @@ stdenv.mkDerivation { url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz"; }; - buildInputs = [ - gettext intltool makeWrapper pkgconfig python pygobject3 pyxdg + buildInputs = [ geoclue ] + ++ stdenv.lib.optional guiSupport [ python pygobject3 pyxdg ] + ++ stdenv.lib.optional drmSupport [ libdrm ] + ++ stdenv.lib.optional randrSupport [ libxcb ] + ++ stdenv.lib.optional vidModeSupport [ libX11 libXxf86vm ]; + nativeBuildInputs = [ gettext intltool makeWrapper pkgconfig ]; + + configureFlags = [ + (mkFlag guiSupport "gui") + (mkFlag drmSupport "drm") + (mkFlag randrSupport "randr") + (mkFlag vidModeSupport "vidmode") ]; - preInstall = '' + preInstall = stdenv.lib.optionalString guiSupport '' substituteInPlace src/redshift-gtk/redshift-gtk python \ --replace "/usr/bin/env python3" "${python}/bin/${python.executable}" ''; -/* - postInstall = '' - wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : $PYTHONPATH + + postInstall = stdenv.lib.optionalString guiSupport '' + wrapProgram "$out/bin/redshift-gtk" --prefix PYTHONPATH : "$PYTHONPATH" ''; -*/ + meta = with stdenv.lib; { inherit version; description = "Gradually change screen color temperature"; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 6b2f542f34f..f6d663fcd14 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,10 +1,10 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "45.0.2454.7"; - sha256 = "19xjdp0zxr96r2fx9wf30wldalrh393p2dhqwp2n1m751vizbj5s"; - sha256bin32 = "1id1z3m0pc2lxh4lp9r6babh098gfyz4dda931yjkxhzb9rw1v0d"; - sha256bin64 = "1sksf651z1sqgh9pwdm5dksqnb0lzhwabxj3myg4w5kxi8s4pi8l"; + version = "45.0.2454.15"; + sha256 = "1zg562cpn9ddai92jdjg3frhmvbhbkf71ysprwqa3rgbg6w8ipzj"; + sha256bin32 = "1fcwzwb6zq7ld7fs0iws0d9jmxhjhdax4y744dx4d7bc77357x3m"; + sha256bin64 = "0273dy5b1r9s9g8ixrafnxm8jnn4ha36r3b3ckdabm9y4pqwx54s"; }; beta = { version = "44.0.2403.89"; @@ -13,9 +13,9 @@ sha256bin64 = "0kvrpqy3fpfzchly65nrh8z2z2i49xpa3pm2k7k18sn0x4bycji0"; }; stable = { - version = "44.0.2403.89"; - sha256 = "161shml5w2i0crl57hkfnizgmii6d70lxxg4rjxmays8g6lrmpds"; - sha256bin32 = "09a1k0xxmp6v1nfnngfkhv9vilnwvqlbgfsisbhwdnkk86pnv7r4"; - sha256bin64 = "1i7ylif5vd0yj0gddl2kv87gh3vgzvzmz91rrrs9za2bkf2gkf0p"; + version = "44.0.2403.107"; + sha256 = "0w9xk2jrpp98fgszswr5jc0g5ggpm8rfxqzxa8402n7iwkxlyqyh"; + sha256bin32 = "0x4j5ggb2dh56lz5fg2h79lvp92rgsk59gi5h3ml678vcghzyfvn"; + sha256bin64 = "0nhm9783b314dmicqky3424ak4z6xhb6rjia12pq2ajddz9qj9rj"; }; } diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index fe89ce61604..dda847fde07 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut, libtool }: stdenv.mkDerivation rec { - version = "0.64"; + version = "0.65"; name = "putty-${version}"; src = fetchurl { url = "http://the.earth.li/~sgtatham/putty/latest/${name}.tar.gz"; - sha256 = "089qbzd7w51sc9grm2x3lcbj61jdqsnakb4j4gnf6i2131xcjiia"; + sha256 = "180ccrsyh775hdmxqdnbclfbvsfdp2zk3gsadpa53sj497yw2hym"; }; preConfigure = '' perl mkfiles.pl ( cd doc ; make ); - sed '/AM_PATH_GTK(/d' -i unix/configure.ac - sed '/AC_OUTPUT/iAM_PROG_CC_C_O' -i unix/configure.ac - sed '/AC_OUTPUT/iAM_PROG_AR' -i unix/configure.ac + sed -e '/AM_PATH_GTK(/d' \ + -e '/AC_OUTPUT/iAM_PROG_CC_C_O' \ + -e '/AC_OUTPUT/iAM_PROG_AR' -i configure.ac ./mkauto.sh cd unix ''; diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix index 5d378a48dd9..53b289983a4 100644 --- a/pkgs/applications/science/math/ecm/default.nix +++ b/pkgs/applications/science/math/ecm/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl, gmp}: +{ stdenv, fetchurl, gmp, m4 }: let pname = "ecm"; - version = "6.2.3"; + version = "6.4.4"; name = "${pname}-${version}"; in @@ -10,11 +10,11 @@ stdenv.mkDerivation { inherit name; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/22124/ecm-6.2.3.tar.gz; - sha256 = "1iwwhbz5vwl7j6dyh292hahc8yy16pq9mmm7mxy49zhxd81vy08p"; + url = http://gforge.inria.fr/frs/download.php/file/32159/ecm-6.4.4.tar.gz; + sha256 = "0v5h2nicz9yx78c2d72plbhi30iq4nxbvphja1s9501db4aah4y8"; }; - buildInputs = [ gmp ]; + buildInputs = [ m4 gmp ]; doCheck = true; @@ -23,5 +23,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus; homepage = http://ecm.gforge.inria.fr/; maintainers = [ stdenv.lib.maintainers.roconnor ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix new file mode 100644 index 00000000000..d97aee23388 --- /dev/null +++ b/pkgs/applications/version-management/peru/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +let + version = "0.2.3"; +in + +python3Packages.buildPythonPackage rec { + + # Do not prefix name with python specific version identifier. + namePrefix = ""; + + name = "peru-${version}"; + + src = fetchFromGitHub { + owner = "buildinspace"; + repo = "peru"; + rev = "${version}"; + sha256 = "04bnaly50qmzkj0shdag94n8vr3ggarlqdny5zdb8nh31fqgln8b"; + }; + + pythonPath = with python3Packages; [ pyyaml docopt ]; + + meta = { + homepage = https://github.com/buildinspace/peru; + description = "A tool for including other people's code in your projects"; + license = stdenv.lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 1be0f5b9e0a..5ac70413d16 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -12,7 +12,7 @@ , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, jackaudioSupport ? true, libjack2 ? null +, jackaudioSupport ? false, libjack2 ? null , pulseSupport ? true, libpulseaudio ? null , bs2bSupport ? true, libbs2b ? null # For screenshots diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 914114467e6..b876403d632 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -4,7 +4,7 @@ , docbook_xml_dtd_45, docbook_xsl , sdlSupport ? true, SDL2 ? null , termSupport ? true , ncurses ? null -, wxSupport ? false, wxGTK ? null # Warning! Broken +, wxSupport ? true, wxGTK ? null # Optional, undocumented dependencies , wgetSupport ? false, wget ? null , curlSupport ? false, curl ? null @@ -19,11 +19,11 @@ assert curlSupport -> (curl != null); stdenv.mkDerivation rec { name = "bochs-${version}"; - version = "2.6.7"; + version = "2.6.8"; src = fetchurl { url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz"; - sha256 = "10l2pgzwnmng0rd44kqv7y46nwpcc18j53h3kf3dlqlnd7mlwdd4"; + sha256 = "1kl5cmbz6qgg33j5vv9898nzdppp1rqgy24r5pv762aaj7q0ww3r"; }; # The huge list of configurable options diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index f3d88c55c58..b1b63df574a 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -1,35 +1,39 @@ -{ stdenv, fetchurl, gettext, libjpeg, libtiff, libungif, libpng, freetype -, fontconfig, xlibs, automake, pkgconfig, gdk_pixbuf }: +{ stdenv, fetchurl, cmake, gettext +, libjpeg, libtiff, libungif, libpng, imlib, expat +, freetype, fontconfig, pkgconfig, gdk_pixbuf +, mkfontdir, libX11, libXft, libXext, libXinerama +, libXrandr, libICE, libSM, libXpm, libXdmcp, libxcb +, libpthreadstubs }: +with stdenv.lib; stdenv.mkDerivation rec { - name = "icewm-1.3.8"; + name = "icewm-${version}"; + version = "1.3.10"; buildInputs = - [ gettext libjpeg libtiff libungif libpng - xlibs.libX11 xlibs.libXft xlibs.libXext xlibs.libXinerama xlibs.libXrandr - xlibs.libICE xlibs.libSM freetype fontconfig - pkgconfig gdk_pixbuf - ]; + [ cmake gettext libjpeg libtiff libungif libpng imlib expat + freetype fontconfig pkgconfig gdk_pixbuf mkfontdir libX11 + libXft libXext libXinerama libXrandr libICE libSM libXpm + libXdmcp libxcb libpthreadstubs ]; src = fetchurl { - url = "mirror://sourceforge/icewm/${name}.tar.gz"; - sha256 = "066d1mw0vm9ygxnyxksfi6k4vzclvnlkvj04pj3kbcmv1fg8sn0p"; + url = "https://github.com/bbidulock/icewm/archive/${version}.tar.gz"; + sha256 = "01i7a21gf810spmzjx32dxsmx4527qivs744rhvhaw4gr00amrns"; }; - NIX_LDFLAGS = "-lfontconfig"; - - # The fuloong2f is not supported by 1.3.6 still - # - # Don't know whether 1.3.7 supports fuloong2f and don't know how to test it - # on x86_64 hardware. So I left this 'cp' -- urkud - preConfigure = '' - cp -v ${automake}/share/automake*/config.{sub,guess} . + export cmakeFlags="-DPREFIX=$out" ''; meta = { - description = "A window manager for the X Window System"; + description = "A simple, lightweight X window manager"; + longDescription = '' + IceWM is a window manager for the X Window System. The goal of + IceWM is speed, simplicity, and not getting in the user's way. + ''; homepage = http://www.icewm.org/; - platforms = stdenv.lib.platforms.unix; + license = licenses.lgpl2; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix new file mode 100644 index 00000000000..226b33be060 --- /dev/null +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig +, freetype, fribidi +, libSM, libICE, libXt, libXaw, libXmu +, libXext, libXft, libXpm, libXrandr +, libXrender, xextproto, libXinerama }: + +with stdenv.lib; +stdenv.mkDerivation rec { + + name = "oroborus-${version}"; + version = "2.0.20"; + + buildInputs = [ pkgconfig freetype fribidi libSM libICE libXt libXaw libXmu libXext libXft libXpm libXrandr libXrender xextproto libXinerama ]; + + src = fetchurl { + url = "http://ftp.debian.org/debian/pool/main/o/oroborus/oroborus_${version}.tar.gz"; + sha256 = "12bvk8x8rfnymbfbwmdcrd9g8m1zxbcq7rgvfdkjr0gnpi0aa82j"; + }; + + meta = { + description = "A really minimalistic X window manager"; + homepage = http://www.oroborus.org/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} |