diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index a409ba1f28b..809a02e1c7a 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, jackaudio -, libxslt, lv2, pkgconfig, premake, xlibs }: +, libxslt, lv2, pkgconfig, premake3, xlibs }: let rev = "99efbf0b"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake + alsaLib fftwSinglePrec freetype jackaudio pkgconfig premake3 xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext xlibs.libXinerama xlibs.libXrender ]; diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 580b2761fa9..a9149a0f919 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchurl, emacs, texinfo, unzip }: +{ stdenv, fetchurl, emacs, texinfo }: let version = "1.2.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "magit-${version}"; src = fetchurl { - url = "https://github.com/magit/magit/zipball/${version}"; - sha256 = "1877s8ikvcb457mmljmw366h6pgg4zzx98qfazhqj8snl4yqsj4i"; - name = "magit-${version}.zip"; + url = "https://github.com/downloads/magit/magit/${name}.tar.gz"; + sha256 = "1a8vvilhd5y5vmlpsh194qpl4qlg0a1brylfscxcacpfp0cmhlzg"; }; - buildInputs = [ emacs texinfo unzip ]; + buildInputs = [ emacs texinfo ]; configurePhase = "makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )"; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 9343f3ec135..64cbdb0ca9a 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,32 +1,40 @@ -{stdenv, fetchgit, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal +{stdenv, fetchurl, qt4, bison, flex, eigen, boost, mesa, glew, opencsg, cgal , mpfr, gmp }: stdenv.mkDerivation rec { - version = "git-20121213"; + version = "2013.01"; name = "openscad-${version}"; - # src = fetchurl { - # url = "https://github.com/downloads/openscad/openscad/${name}.src.tar.gz"; - # sha256 = "0gaqwzxbbzc21lhb4y26j8g0g28dhrwrgkndizp5ddab5axi4zjh"; - # }; - src = fetchgit { - url = "https://github.com/openscad/openscad.git"; - rev = "c0612a9ed0899c96963e04c848a59b0164a689a2"; - sha256 = "1zqiwk1cjbj7sng9sdarbrs0zxkn9fsa84dyv8n0zlyh40s7kvw2"; - }; + + src = fetchurl { + url = "https://openscad.googlecode.com/files/${name}.src.tar.gz"; + sha256 = "01r013l8zyfkgmqn05axh3rlfsjwd6j403w5ffl7nby4i2spiw1f"; + }; buildInputs = [qt4 bison flex eigen boost mesa glew opencsg cgal gmp mpfr]; configurePhase = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${eigen}/include/eigen*) " - qmake PREFIX="$out" + qmake PREFIX="$out" VERSION=${version} ''; doCheck = false; meta = { description = "3D parametric model compiler"; + longDescription = '' + OpenSCAD is a software for creating solid 3D CAD objects. It is free + software and available for Linux/UNIX, MS Windows and Mac OS X. + + Unlike most free software for creating 3D models (such as the famous + application Blender) it does not focus on the artistic aspects of 3D + modelling but instead on the CAD aspects. Thus it might be the + application you are looking for when you are planning to create 3D models of + machine parts but pretty sure is not what you are looking for when you are more + interested in creating computer-animated movies. + ''; homepage = "http://openscad.org/"; + license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index a3726fd460d..e5eae771d8b 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils }: +{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1ja2j9ygymr259fxf02j1vkvalypac48gpadq8fn3qbclxxj61k5"; }; - buildInputs = [ pkgconfig gtk girara gettext ]; + buildInputs = [ pkgconfig gtk girara gettext makeWrapper ]; # Bug in zathura build system: we should remove empty manfiles in order them # to be compiled properly @@ -22,6 +22,10 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ]; + postInstall = '' + wrapProgram "$out/bin/zathura" --prefix PATH ":" "${file}/bin" + ''; + meta = { homepage = http://pwmt.org/projects/zathura/; description = "A core component for zathura PDF viewer"; diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix new file mode 100644 index 00000000000..65a60b88477 --- /dev/null +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, patchelf }: + +# this package contains the daemon version of bittorrent sync + +# it's unfortunately closed source. + +let + # TODO: arm, ppc, osx + + arch = if stdenv.system == "x86_64-linux" then "x64" + else if stdenv.system == "i686-linux" then "i386" + else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; + + interpreter = if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" + else if stdenv.system == "i686-linux" then "ld-linux.so.2" + else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; + + version = "1.0.116"; + sha256 = if stdenv.system == "x86_64-linux" then "108c11x8lp0a4irq88raclz3zfvmkxsqymxx3y8amc1lc6kc3n8i" + else if stdenv.system == "i686-linux" then "0kkxi04rggq6lrvn7g1xjay2nskqn7z4qkm0h0lcra7h2jz09mf1" + else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; + +in stdenv.mkDerivation { + name = "btsync-bin-${version}"; + src = fetchurl { + # TODO: using version-specific URL: http://forum.bittorrent.com/topic/18070-versioned-binary-downloads/#entry45868 + url = "http://btsync.s3-website-us-east-1.amazonaws.com/btsync_${arch}.tar.gz"; + inherit sha256; + }; + + sourceRoot = "."; + + installPhase = '' + ensureDir "$out/bin/" + cp -r "btsync" "$out/bin/" + + patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \ + "$out/bin/btsync" + ''; + + buildInputs = [ patchelf ]; + + meta = { + homepage = "http://labs.bittorrent.com/experiments/sync.html"; + description = "Automatically sync files via secure, distributed technology."; + license = stdenv.lib.licenses.unfreeRedistributable; + maintainers = [ stdenv.lib.maintainers.iElectric ]; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index a4f71ffcb25..682de909067 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -13,13 +13,7 @@ , gcc, bison, gperf , glib, gtk, dbus_glib , libXScrnSaver, libXcursor, mesa -, protobuf - -# dependencies for v25 only -, libvpx - -# dependencies for >= v26 -, speechd, libXdamage +, protobuf, speechd, libXdamage # dependencies for >= v27 , libXtst @@ -69,7 +63,7 @@ let use_system_xdg_utils = true; use_system_yasm = true; use_system_zlib = false; # http://crbug.com/143623 - use_system_protobuf = post25; + use_system_protobuf = true; use_system_harfbuzz = false; use_system_icu = false; @@ -77,9 +71,6 @@ let use_system_skia = false; use_system_sqlite = false; # http://crbug.com/22208 use_system_v8 = false; - } // optionalAttrs pre26 { - use_system_libvpx = true; - use_system_protobuf = true; }; defaultDependencies = [ @@ -90,10 +81,10 @@ let libusb1 libexif ]; - pre26 = versionOlder sourceInfo.version "26.0.0.0"; pre27 = versionOlder sourceInfo.version "27.0.0.0"; - post25 = !pre26; + pre28 = versionOlder sourceInfo.version "28.0.0.0"; post26 = !pre27; + post27 = !pre28; in stdenv.mkDerivation rec { name = "${packageName}-${version}"; @@ -116,14 +107,12 @@ in stdenv.mkDerivation rec { krb5 glib gtk dbus_glib libXScrnSaver libXcursor mesa - pciutils protobuf + pciutils protobuf speechd libXdamage ] ++ optional gnomeKeyringSupport libgnome_keyring ++ optionals gnomeSupport [ gconf libgcrypt ] ++ optional enableSELinux libselinux ++ optional cupsSupport libgcrypt ++ optional pulseSupport pulseaudio - ++ optional pre26 libvpx - ++ optionals post25 [ speechd libXdamage ] ++ optional post26 libXtst; opensslPatches = optional useOpenSSL openssl.patches; @@ -138,9 +127,11 @@ in stdenv.mkDerivation rec { sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi '' + optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl - '' + optionalString post25 '' + '' + '' sed -i -e 's|/usr/bin/gcc|gcc|' \ - third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp + third_party/WebKit/Source/${if post27 + then "core/core.gyp/core.gyp" + else "WebCore/WebCore.gyp/WebCore.gyp"} ''; gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index b1f145bbbe8..0e041ee9518 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -1,14 +1,14 @@ # This file is autogenerated from update.sh in the same directory. { dev = { - version = "27.0.1453.47"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz"; - sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9"; + version = "28.0.1485.0"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1485.0.tar.xz"; + sha256 = "04whky5bwsj909cc1ycwrc91d04iynwncwh21cbbbvg93jsj2pq9"; }; beta = { - version = "27.0.1453.47"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.47.tar.xz"; - sha256 = "0dyyxdn75a6b35a7wv9xqzcnskbcxj19bmfd7cq9ya5jdhcvy9j9"; + version = "27.0.1453.65"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.65.tar.xz"; + sha256 = "1flv9870p0bqglnbm4gfzbxzcvz30k2chxgnlbqgpfk5c4qq9mpb"; }; stable = { version = "26.0.1410.63"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 365fd1e2613..8cc62aa02db 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -47,18 +47,18 @@ stdenv.mkDerivation rec { name = "google-talk-plugin-${version}"; # Use the following to determine the current upstream version: # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | sed -nr 's/^Version: *([^ ]+)-1$/\1/p' - version = "3.10.2.0"; + version = "3.17.0.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha256 = "0ivjmqrxy3xkwqjp20aqz47smdcdds0i82pfyb5k9jywi8afvchr"; + sha256 = "1annx2zhxgn3wl468w7sk93k4xhmnx5bbdjr0d1ar7979hvrdl1x"; } else if stdenv.system == "i686-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha256 = "1bac95r9721sc7fsklsmv0lq673901zppdgabjjarpnx8z280jvj"; + sha256 = "13fza920vg3qig2pnlr65mzcmmy3izla95zdpa3pk28qlfij0ryc"; } else throw "Google Talk does not support your platform."; diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 43ee98b55dc..24fdd105341 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,23 +1,30 @@ -{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext, pkgconfig, xdg_utils, gtk2, sqlite36 }: +{ stdenv, fetchurl, dbus, gnutls2, wxGTK28, libidn, tinyxml, gettext, pkgconfig, xdg_utils, gtk2, sqlite }: let version = "3.6.0.2"; in stdenv.mkDerivation { name = "filezilla-${version}"; - + src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; sha256 = "01n6k1q21i21451rdx3rgc4hhxghdn5b0ldzpjsp44ipgww5wsjk"; }; - + configureFlags = [ "--disable-manualupdatecheck" ]; - - buildInputs = [ dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite36 ]; - + + buildInputs = [ dbus gnutls2 wxGTK28 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite ]; + meta = { homepage = "http://filezilla-project.org/"; - description = "FileZilla is a cross-platform graphical FTP, FTPS and SFTP client a lot of features, supporting Windows, Linux, Mac OS X and more."; + description = "Graphical FTP, FTPS and SFTP client"; license = "GPLv2"; + + longDescription = '' + FileZilla Client is a free, open source FTP client. It supports + FTP, SFTP, and FTPS (FTP over SSL/TLS). The client is available + under many platforms, binaries for Windows, Linux and Mac OS X are + provided. + ''; }; } diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 1477cd82cf4..ebab3a42af6 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, bash, emacs, gdb, glib, gmime, gnupg1, +{ fetchurl, stdenv, bash, emacs, gdb, glib, gmime, gnupg, pkgconfig, talloc, xapian }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "03cwylm0y9xld0hn753v0hn62f96nagdmzxv8jlz8vdbh9iszs56"; }; - buildInputs = [ bash emacs gdb glib gmime gnupg1 pkgconfig talloc xapian ]; + buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian ]; patchPhase = '' (cd test && for prg in \ @@ -55,6 +55,14 @@ stdenv.mkDerivation rec { substituteInPlace "$prg" \ --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" done) + + for src in \ + crypto.c \ + emacs/notmuch-crypto.el + do + substituteInPlace "$src" \ + --replace \"gpg\" \"${gnupg}/bin/gpg2\" + done ''; # XXX: emacs tests broken diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 8fb1a00ec32..67037a07132 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation { cp dist/freenet.jar $out/share/freenet cat < $out/bin/freenet + #!${stdenv.shell} ${jre}/bin/java -cp $out/share/freenet/bcprov.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\ -Xmx1024M freenet.node.NodeStarter EOF diff --git a/pkgs/applications/office/hledger-interest/default.nix b/pkgs/applications/office/hledger-interest/default.nix index e66166f4713..d53a8fe63e2 100644 --- a/pkgs/applications/office/hledger-interest/default.nix +++ b/pkgs/applications/office/hledger-interest/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "hledger-interest"; - version = "1.4.2"; - sha256 = "1his6pxrvs5p28bmk77bd8vaq6rhjlilwq598mbkgfvlqg7q076v"; + version = "1.4.3"; + sha256 = "1nj50zi4p6rs0nl4656rr0vkbh7kdi49z1l53nypfqs3rmjgicsn"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal hledgerLib mtl time ]; diff --git a/pkgs/applications/office/ledger/3.0.nix b/pkgs/applications/office/ledger/3.0.nix index 325ab3b0a0f..d564f2f561e 100644 --- a/pkgs/applications/office/ledger/3.0.nix +++ b/pkgs/applications/office/ledger/3.0.nix @@ -1,36 +1,22 @@ -{ stdenv, fetchgit, python, autoconf, automake, libtool, gettext, emacs, gmp -, pcre, expat, boost, mpfr, git, texinfo }: +{ stdenv, fetchgit, cmake, boost, gmp, mpfr, libedit, python, texinfo }: let - rev = "d2915c66"; + rev = "2c7ab8be"; in stdenv.mkDerivation { - name = "ledger3-2012.01.${rev}"; + name = "ledger3-2013.04.${rev}"; src = fetchgit { url = "git://github.com/jwiegley/ledger.git"; inherit rev; - sha256 = "a489c8b1c48889040d2cebaac1a0019e90acac0b51c9abf7914944dcb4b801e7"; + sha256 = "1ng5ymzqzbgdrn2ghhr7jvcjv5y7ikhyck5p1yv5j024s17xdyj5"; }; - buildInputs = [ - python autoconf automake libtool gettext emacs gmp pcre expat boost mpfr - git texinfo - ]; + buildInputs = [ cmake boost gmp mpfr libedit python texinfo ]; - CPPFLAGS = "-I${gmp}/include -I${mpfr}/include"; - - LDFLAGS = "-L${gmp}/lib -L${mpfr}/lib"; - - buildPhase = '' - sed -i acprep \ - -e 's|search_prefixes = .*|search_prefixes = ["${boost}"]|' \ - -e 's|/usr/bin/python|${python}/bin/python|' - export MAKEFLAGS="-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES" - python acprep update --no-pch --prefix=$out - ''; - - doCheck = !stdenv.isDarwin; + # Unit tests fail in the current git snapshot. Try enabling them again + # when updating this package! + doCheck = false; enableParallelBuilding = true; diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 8cc1de6e8da..d36956d1375 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="eprover"; - version="1.6"; + version="1.7"; name="${baseName}-${version}"; - hash="140cnw4qck1hancrqdh0f77yfba5ljhdnfxdxsl0a86a6y7ydbwi"; - url="http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_1.6/E.tgz"; - sha256="140cnw4qck1hancrqdh0f77yfba5ljhdnfxdxsl0a86a6y7ydbwi"; + hash="1prkgjpg8lajcylz9nj2hfjxl3l42cqbfvilg30z9b5br14l36rh"; + url="http://www4.in.tum.de/~schulz/WORK/E_DOWNLOAD/V_1.7/E.tgz"; + sha256="1prkgjpg8lajcylz9nj2hfjxl3l42cqbfvilg30z9b5br14l36rh"; }; in stdenv.mkDerivation { diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix new file mode 100644 index 00000000000..a6b3ac7ccfd --- /dev/null +++ b/pkgs/applications/search/doodle/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, libextractor, gettext }: + +stdenv.mkDerivation rec { + name = "doodle-0.7.0"; + + buildInputs = [ libextractor gettext ]; + + src = fetchurl { + url = "http://grothoff.org/christian/doodle/download/${name}.tar.gz"; + sha256 = "0ayx5q7chzll9sv3miq35xl36r629cvgdzphf379kxzlzhjldy3j"; + }; + + meta = { + homepage = http://grothoff.org/christian/doodle/; + description = "Tool to quickly index and search documents on a computer"; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 81362ec4d04..a5aeb1bf6a4 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -10,7 +10,7 @@ rec { git = lib.makeOverridable (import ./git) { inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt - cpio tcl tk makeWrapper subversionClient hardlink gzip; + cpio tcl tk makeWrapper subversionClient gzip; svnSupport = false; # for git-svn support guiSupport = false; # requires tcl/tk sendEmailSupport = false; # requires plenty of perl libraries diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index b3a9f02ed9e..1a2e637bff0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -10,14 +10,14 @@ }: let - version = "4.20130405"; + version = "4.20130501"; in stdenv.mkDerivation { name = "git-annex-${version}"; src = fetchurl { url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}"; - sha256 = "13lzkvk5095qj8026lc1p56w0q1c95v7nx8g9p9zrf8mhx6yxb9n"; + sha256 = "0g89lmkrs02qdb1k1bfq9gz3j4yv35320vb8ddmj99f4nnhqc6vv"; name = "git-annex-${version}.tar.gz"; }; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index b144064f093..7e8ec8a6aad 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep, gzip , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 -, libxslt, tcl, tk, makeWrapper, hardlink +, libxslt, tcl, tk, makeWrapper , svnSupport, subversionClient, perlLibs, smtpPerlLibs , guiSupport , withManual ? true @@ -10,7 +10,7 @@ let - version = "1.8.2"; + version = "1.8.2.1"; svn = subversionClient.override { perlBindings = true; }; @@ -21,10 +21,10 @@ stdenv.mkDerivation { src = fetchurl { url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; - sha256 = "1rhkya4kfs7iayasgj3bk8zg1pfk3h7wqhfy9d6aaqjgzb75pwy2"; + sha1 = "ad9f833e509ba31c83efe336fd3599e89a39394b"; }; - patches = [ ./docbook2texi.patch ]; + patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x @@ -42,6 +42,8 @@ stdenv.mkDerivation { # so that `SPARSE_FLAGS' corresponds to the current architecture... #doCheck = true; + installFlags = "NO_INSTALL_HARDLINKS=1"; + postInstall = '' notSupported() { @@ -119,15 +121,10 @@ stdenv.mkDerivation { done ''); - # Git installs many copies of the same binary using hardlinks, but unfortunately - # our patchELF phase re-writes those files and destroys the hardlinks in the - # process. This utility re-generates them afterwards. - postFixup = "${hardlink}/bin/hardlink $out"; - enableParallelBuilding = true; meta = { - homepage = "http://git-scm.com/"; + homepage = http://git-scm.com/; description = "Git, a popular distributed version control system"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch new file mode 100644 index 00000000000..29d537db25f --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch @@ -0,0 +1,13 @@ +diff -ru -x '*~' git-1.8.2.1-orig/Makefile git-1.8.2.1/Makefile +--- git-1.8.2.1-orig/Makefile 2013-04-08 00:52:04.000000000 +0200 ++++ git-1.8.2.1/Makefile 2013-04-22 15:46:42.906026940 +0200 +@@ -2319,8 +2319,7 @@ + { test "$$bindir/" = "$$execdir/" || \ + for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \ + $(RM) "$$execdir/$$p" && \ +- test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \ +- ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \ ++ ln -s "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \ + cp "$$bindir/$$p" "$$execdir/$$p" || exit; \ + done; \ + } && \ diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 885e4310a59..9743b73345c 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport; stdenv.mkDerivation rec { - version = "1.7.8"; + version = "1.7.9"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion//${name}.tar.bz2"; - sha1 = "12c7d8d5414bba74c9777c4d1dae74f152df63c2"; + sha1 = "453757bae78a800997559f2232483ab99238ec1e"; }; buildInputs = [ zlib apr aprutil sqlite ] diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index c2563b5e298..7d2eb514c94 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -4,7 +4,6 @@ , libvorbis , file , boost -, lzo , xdg_utils , expat , wxGTK @@ -16,14 +15,14 @@ }: stdenv.mkDerivation rec { - name = "mkvtoolnix-6.1.0"; + name = "mkvtoolnix-6.2.0"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "01k5al3886cyi97kynx5hf98z5p7mb8vd2m057gbp1k10zblcb9x"; + sha256 = "0864vmdcnfwk5cb2fv1y60yvp9kqcyaqxwbvy4nsj7bzwv1iqysn"; }; - buildInputs = [ libmatroska flac libvorbis file boost lzo xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ]; + buildInputs = [ libmatroska flac libvorbis file boost xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ]; configureFlags = "--with-boost-libdir=${boost}/lib"; buildPhase = '' diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index dfac8a4b292..6ede3f56923 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -96,7 +96,9 @@ assert enableCheckPhase -> stdenv.lib.versionOlder "7" ghc.ghcVersion; jailbreak = false; # pass the '--enable-split-objs' flag to cabal in the configure stage - enableSplitObjs = !stdenv.isDarwin; # http://hackage.haskell.org/trac/ghc/ticket/4013 + enableSplitObjs = !( stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013 + || stdenv.lib.versionOlder "7.6.99" ghc.ghcVersion # -fsplit-ojbs is broken in 7.7 snapshot + ); # pass the '--enable-tests' flag to cabal in the configure stage # and run any regression test suites the package might have diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 9d9aa344f42..d6ad25afbad 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -154,6 +154,7 @@ rec { ftp://ftp.nl.uu.net/pub/CPAN/ http://ftp.funet.fi/pub/CPAN/ http://cpan.perl.org/ + http://backpan.perl.org/ # for old releases ]; # Debian. diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 1251866252c..68ecb512901 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1322,6 +1322,40 @@ rec { packages = commonDebPackages ++ [ "diffutils" ]; }; + ubuntu1304i386 = { + name = "ubuntu-13.04-raring-i386"; + fullName = "Ubuntu 13.04 Raring (i386)"; + packagesLists = + [ (fetchurl { + url = mirror://ubuntu/dists/raring/main/binary-i386/Packages.bz2; + sha256 = "b7da6802c5302439d9abf05ebe1ab4c3b82d7be9356f51a12c5bf4994f009181"; + }) + (fetchurl { + url = mirror://ubuntu/dists/raring/universe/binary-i386/Packages.bz2; + sha256 = "1db19982fc3689b00a918e2cdbb936dfccebbac2ed82f81bb0164a3d51039012"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + + ubuntu1304x86_64 = { + name = "ubuntu-13.04-raring-amd64"; + fullName = "Ubuntu 13.04 Raring (amd64)"; + packagesList = + [ (fetchurl { + url = mirror://ubuntu/dists/raring/main/binary-amd64/Packages.bz2; + sha256 = "9ee6a67bedbda80b668a868bb81b5b3f30bbabac01f69d2a08961c37c8536356"; + }) + (fetchurl { + url = mirror://ubuntu/dists/raring/universe/binary-amd64/Packages.bz2; + sha256 = "0caf561bad359e8a82a987a076c0f1cb7a43412a5de053c105b160477c192978"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + debian40i386 = { name = "debian-4.0r9-etch-i386"; fullName = "Debian 4.0r9 Etch (i386)"; diff --git a/pkgs/desktops/kde-4.10/applications/kate.nix b/pkgs/desktops/kde-4.10/applications/kate.nix new file mode 100644 index 00000000000..a0dbf2aaba9 --- /dev/null +++ b/pkgs/desktops/kde-4.10/applications/kate.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, kactivities, qjson, pyqt4, sip }: + +kde { +#todo: PythonLibrary, SIP, PyQt4, PyKDE4 + buildInputs = [ kdelibs kactivities qjson pyqt4 sip ]; + + meta = { + description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/applications/konsole.nix b/pkgs/desktops/kde-4.10/applications/konsole.nix new file mode 100644 index 00000000000..0db47fb2d7c --- /dev/null +++ b/pkgs/desktops/kde-4.10/applications/konsole.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, kde_baseapps }: + +kde { + + buildInputs = [ kdelibs kde_baseapps ]; + + meta = { + description = "Konsole, the KDE terminal emulator"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/default.nix b/pkgs/desktops/kde-4.10/default.nix new file mode 100644 index 00000000000..9a682d6b93a --- /dev/null +++ b/pkgs/desktops/kde-4.10/default.nix @@ -0,0 +1,72 @@ +{ callPackage, callPackageOrig, stdenv, qt48 }: + +let + release = "4.10.2"; + + # Need callPackageOrig to avoid infinite cycle + kde = callPackageOrig ./kde-package { + inherit release ignoreList extraSubpkgs callPackage; + }; + + # The list of igored individual modules + ignoreList = { + # Doesn't work yet + kdeutils = [ "ksecrets" ]; + # kdeadmin/strigi-analyzer has no real code + kdeadmin = [ "strigi-analyzer" ]; + # fake package to make things just work + kdesdk = [ "fake" ]; + # Most of kdebindings do not compile due to a bug in the buildsystem + kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ]; + }; + + # Extra subpackages in the manifest format + extraSubpkgs = { + kdesdk = [ + { name="cervisia"; } + { name="lokalize"; } + { name = "kioslave-svn"; sane = "kioslave_svn"; subdir = "kioslave"; } + { name = "kioslave-perldoc"; sane = "kioslave_perldoc"; subdir = "kioslave"; } + { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; } + { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; } + { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; } + { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; } + { name="kcachegrind"; } + { name="kapptemplate"; } + { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers";} + { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers";} + { name="okteta"; } + { name="kompare"; } + { name="poxml"; } + { name="kde-dev-scripts"; sane = "kde_dev_scripts"; } + { name="kde-dev-utils"; sane="kde_dev_utils";} + #{ name="kprofilemethod"; subdir = "kde-dev-utils/kprofilemethod";} + #{ name="kstartperf"; } + #{ name="kmtrace"; subdir = "kde-dev-utils/kmtrace"; } + #{ name="kpartloader"; } + #{ name="kuiviewer"; } + { name="umbrello"; } + ]; + }; + +in + +kde.modules // kde.individual // +{ + inherit (kde) manifest modules individual splittedModuleList; + + akonadi = callPackage ./support/akonadi { }; + + qt4 = qt48; + + kdebase_workspace = kde.modules.kde_workspace; + + inherit release; + + full = stdenv.lib.attrValues kde.modules; + + l10n = callPackage ./l10n { + inherit release; + inherit (kde.manifest) stable; + }; +} diff --git a/pkgs/desktops/kde-4.10/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.10/files/kde-wallpapers-buildsystem.patch new file mode 100644 index 00000000000..378cdb64694 --- /dev/null +++ b/pkgs/desktops/kde-4.10/files/kde-wallpapers-buildsystem.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d3e247..f78db67 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,10 @@ +-find_package(KDE4 REQUIRED) +-include(KDE4Defaults) ++project(kde-wallpapers NONE) ++if( WALLPAPER_INSTALL_DIR ) ++ message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}") ++else() ++ find_package(KDE4 REQUIRED) ++ include(KDE4Defaults) ++endif() + + install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE) + diff --git a/pkgs/desktops/kde-4.10/files/polkit-install.patch b/pkgs/desktops/kde-4.10/files/polkit-install.patch new file mode 100644 index 00000000000..d2ecac663ec --- /dev/null +++ b/pkgs/desktops/kde-4.10/files/polkit-install.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake +--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake 2011-05-20 22:24:54.000000000 +0200 ++++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake 2011-07-12 14:03:00.000000000 +0200 +@@ -139,7 +139,7 @@ + ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR + ${POLKITQT-1_POLICY_FILES_INSTALL_DIR}) + +- set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING ++ set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING + "Where policy files generated by KAuth will be installed" FORCE) + elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE") + set (KAUTH_COMPILING_FAKE_BACKEND TRUE) diff --git a/pkgs/desktops/kde-4.10/kactivities.nix b/pkgs/desktops/kde-4.10/kactivities.nix new file mode 100644 index 00000000000..06381bb13d7 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kactivities.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, nepomuk_core }: + +kde { + propagatedBuildInputs = [ kdelibs nepomuk_core ]; + + meta = { + description = "KDE activities library and daemon"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kde-base-artwork.nix b/pkgs/desktops/kde-4.10/kde-base-artwork.nix new file mode 100644 index 00000000000..3f416cebddc --- /dev/null +++ b/pkgs/desktops/kde-4.10/kde-base-artwork.nix @@ -0,0 +1,14 @@ +{ kde, kdelibs }: + +kde { + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE Base artwork"; + license = "GPL"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.10/kde-baseapps/kde-baseapps.nix new file mode 100644 index 00000000000..b564e339eb1 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kde-baseapps/kde-baseapps.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, shared_desktop_ontologies, glib, htmlTidy, kactivities +, nepomuk_core, nepomuk_widgets, libXt }: + +kde { + buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ]; + + meta = { + description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kde-package/4.10.2.nix b/pkgs/desktops/kde-4.10/kde-package/4.10.2.nix new file mode 100644 index 00000000000..64bc7d56e69 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kde-package/4.10.2.nix @@ -0,0 +1,399 @@ +{stable=true; +hashes=builtins.listToAttrs[ + {name="analitza";value="1k950n7rq081qy2pv7cbwzr81qp6bifll7cddgwgxk9kv16wrmh1";} + {name="ark";value="11jfdw4hkma564r6b9mn6vn2h5s6b6mf4imjad6iw7z3lxq6v7w9";} + {name="audiocd-kio";value="0zgil29ig2n5km3wzsx0gpwxk7l6zpcnxqgws9mgaqm3vnfqcjh6";} + {name="blinken";value="19jxlqalxfbxh1dshgpdyjkb8n7bynfr09p4hy38kv6nfil890y8";} + {name="bomber";value="08g82id9sf1m9zg38k47vannqcpm3fmskpgz4j41bcn24yfwynvf";} + {name="bovo";value="1zsbly04bcn00gyl751vszw82pvakdlw6l1n67hsgg3h5wa5z1fb";} + {name="cantor";value="1f3xwl9da0cz25qrx47p9b1bkcsbdj4i740py6awvhrrq60s0870";} + {name="dragon";value="0f9ma8aaglxh91inm711y64xqscxlqfil53gpk8c1bbanb8m99xp";} + {name="ffmpegthumbs";value="12fljrxyv8zgr1vl0ki8hxahwm4dn15pqhb1xgkw5pld0lvcq4sy";} + {name="filelight";value="0jiahda52k4knka4b0an4g2brbp263b2q8c09ayzmcd4mp9a4cgv";} + {name="granatier";value="0npp24j7bxmnfi743qsjn4ymi5b5icli0fb6g4x2f713z7i6raf8";} + {name="gwenview";value="1bznjfki05mydgjb3bmj5dymh33rac9lxrzlczqmah87c0f8fbc7";} + {name="jovie";value="17fbyja7ffsx0q6wlls9lagfcv8b21cnjnww06k90cyg0vn7sng4";} + {name="juk";value="0ni0iqprfrypx1iwgphhxwyw9216nc5s7hb0hv5j3v2kl1v2ir2n";} + {name="kaccessible";value="1zqbs26nl6wxnkya6nqzvnjfwmsqciraixi1awra4nzzx7n736rg";} + {name="kactivities";value="1d0xalwk2hlz0xxfgkrkfp0kgl347psgfhixsl8axhjgfxxi3bmx";} + {name="kajongg";value="1k401zxhkw8nha69kqr5igfwfgzlbmlvsy24fn4m2h2k1sh3vdcj";} + {name="kalgebra";value="1dzj9m6rm07xfr7plf9f7qrs44fzs4j9ncj02h9hzjli7zb44c3p";} + {name="kalzium";value="03zwwsbnizqm23zrhh5iagayw7jynmx87fwv0piiz65mgn4kxr5p";} + {name="kamera";value="1qvq4flqw1hw3513mcqdhsdvvr12sac272lhaf3jzxsm7p1qc3p1";} + {name="kanagram";value="0b5h2b8jm9zssn1hcl0wzf3mh11yh5hhaiay1i5db9k9g6y2nbn1";} + {name="kapman";value="1ghlfhmjivxnbga255x2lcdi6kxddyb3hnq93n6bzpg30m4j95sx";} + {name="kate";value="0cfdpg5j0zfi1zi0cjq8m3lgnbc9pwb2wlr9dvm4m0hy7byp88p3";} + {name="katomic";value="1r2nxya5c6dazvi7810hr24ydkyyb11ganbxkc4d1m8735i6fbqw";} + {name="kblackbox";value="0hslyixnw5bb2z71jncahjhnnf08baid8vxsp9n6a4ckcvbmldw4";} + {name="kblocks";value="1ds06amafp2igkhcjlwmaszbdvx4kfzlqpx57r5r4nlypnqfvv7k";} + {name="kbounce";value="0qp5ayyv3vacr2vak797wzxvkl5b9wn3db1rrzldiixb067f8jzy";} + {name="kbreakout";value="1ywk8zwpgqichq12idracld1gjv8gzhfyzxfi1n7165jyqqf9ba6";} + {name="kbruch";value="0vr1pbh7ds30vys3gd71c056fc96m5jpi7ihdbvm96p0bz94s7s4";} + {name="kcalc";value="1wni970xvd0inpxgw6mb85h6j9acp8vv62v7ipxcm4s4ay5jj9n1";} + {name="kcharselect";value="1rigpqyykd9s3gsai61y0jm6vbcza9gafwr2a4kgr72w7rn767fk";} + {name="kcolorchooser";value="0k60hbx41snpx83ivmnakl0a4li72pdimbgg987pl9ydjb7ja8gy";} + {name="kdeadmin";value="1a6412g8083g9b1xf75cwf0x3x3szadcqw3r4415vxww6kmb8br1";} + {name="kdeartwork";value="0a12fcmvhbc11vlmgds43mqbc6zf5j00dpsnj27ylz0nckjlajlb";} + {name="kde-baseapps";value="1gmyy9lkgcjhhbffzq51rjqr4m59x16qcsplcyywz218zr28gpfs";} + {name="kde-base-artwork";value="1vz5y6qb1wy3vcinnbsxydy39gz2ifls56dyg082j2f709hijzy3";} + {name="kdegraphics-mobipocket";value="0nf2k94bz8iqrr60zrql5mg14q14przq5lxscm71kk1bhdh711si";} + {name="kdegraphics-strigi-analyzer";value="10l1bmnskmfrwln78pzagfhz5kc2nipdm57i1c3fyp15d0msdgjz";} + {name="kdegraphics-thumbnailers";value="0p6bmllgzamfc3f9vigdq8knlblsmp4308lhh4f5bw5wkncjglqg";} + {name="kdelibs";value="1bylppbp6bzqyhkw5cavccmxh6zixjzc3z4g28d2lqixga1l16qz";} + {name="kdenetwork";value="0kjjwj69a79rfx7z3qxp5gjpykqq3nkwr5cm50f0phsfnflzx9l8";} + {name="kdepim";value="14q30gf3al23sx7cf8mhp89xa5c5xd1ns7dwq26igzkvji79kwlk";} + {name="kdepimlibs";value="1m56ljhssdj581hsb4irkgi6dwx25s5x8axk4fpipzvj6dq6yplz";} + {name="kdepim-runtime";value="1c9wv2wr843090jg41dwhqmvvvzqw875asmvydhj6kw625k62hr1";} + {name="kdeplasma-addons";value="1n1yar1rqw3swfnjmazqs1qm7yg19pki97204xa8dnlispbqk21s";} + {name="kde-runtime";value="0gmirvzs5cvh6rzps59hqkj4zk3nixh7i5hrxmm1ib7g1qnh0kfg";} + {name="kdesdk";value="1nyff19fv186n1j14qpvgslnaphl5y4rls8rn0yc0vxh31x769d9";} + {name="kdetoys";value="12c4h8vv5fd12k1wkbpmsf95c0gqa8nnwhszri72danal1qak7jj";} + {name="kde-wallpapers";value="17kavdzxql2cgpqrw0v9c2aflajv0l1qgllsg0l5qr7w68fqdjn7";} + {name="kdewebdev";value="0hv4ly6323f64wiqvizdn1ia0z50chhravm796wczb8xw8mcidh8";} + {name="kde-workspace";value="0rv8gdwlkvhajbn5s8mybrqc4ilpq4b0v7r55zp9dcb27c8jkr1n";} + {name="kdf";value="1bkj5yr7ds74gqlfsvyxf26kdqsyac8kg04phnc2rkzp31dvgldg";} + {name="kdiamond";value="1y1fyv211mvh5sbw55f827b7nx4da3aaly7c1bm2c13nnj7j5r9s";} + {name="kfloppy";value="063zzya13jmcdr2y3vig5k54hx1asnzs6lg2r5sckqp5lsmpdaz5";} + {name="kfourinline";value="1af58yrhpjhj61ppxfymw5z43ks9j5cz6ldagxiblp67w4bpa468";} + {name="kgamma";value="167z8ycnvi59kvmyar856hkcpb4znwhkkxvn4gg4g74byjzwlf3a";} + {name="kgeography";value="04p6ypf72gd2k54qaarsgyvji0bvsi0iqbbjr4qdyd9dhxihhzzp";} + {name="kgoldrunner";value="13m1j31fjiz6j0wfivkvgcmicz274h0jvdm8mkjzlp10g3691x4p";} + {name="kgpg";value="00zs8x2dhli8dlmj0365gq9517pzkpyf31kb4398zfrrcmja2qip";} + {name="khangman";value="1wj439z0n6sy1l5vknh9nrq2d1q2bq5sh0963g1zb9hp8l13bf8a";} + {name="kig";value="0hhfvl38czabramgyxjlazqp4dlkkc859fs36wq042iip05kyy3q";} + {name="kigo";value="0bvcqsq8w983lnrgi85pjajb7phbg826ky50w5wk5vql1afl02c6";} + {name="killbots";value="08j9p8wyqpjj78b9sj13f4vhlkcrhc7sgzwakcv4bg2dvmpr95mp";} + {name="kimono";value="14z3ca8s7swwxwnm198bq4ndfsl2m0brc9k465k7rj50l15y0rhl";} + {name="kiriki";value="13cay0dllcf5618yjjs1hz3392hcig8bj7r09b0hbqhay65z9l5y";} + {name="kiten";value="0lrdkha6xmlxfq9f36rb5ysk8hg9m5zmc9x1y206gxk3rf3k1wzj";} + {name="kjumpingcube";value="179p3lw1vl9vxvsdwzx8qjfrahii0igakw0qrdpkcmx4yr0a9gfx";} + {name="klettres";value="149xgrxqbp2bq8v2abzhmb8w2b2ssd7xmb06j6k1s707wc9kcs5g";} + {name="klickety";value="00x4f4nxfi9xasrddnc84vayn36dd0chyl8jxryswg8dabzazb25";} + {name="klines";value="0vamlsz3a945zcm34gb3w0iq2rknwkh9cbv1syh3cc2s9dn5sg29";} + {name="kmag";value="06jcp2nhgqbw6yrr5xhajsy2lxklk31kjfmq0pphssfs9yhi1pan";} + {name="kmahjongg";value="07hj806mix703h9x676rnwmklrfms04hfxidvzl0324idjw6v5m9";} + {name="kmines";value="07nrv4qn7wg590id83dgw7l5kyh4prj3nbi9np4x9ik1rr5bq9nm";} + {name="kmix";value="1hwmn4rvr7jid4y3gycsvxvvfxmkv128jxsdfjdhzqz8lcp2q87q";} + {name="kmousetool";value="1mrhppgrwwr3cyr3fna0hgypclssixhw9yx6wvqgqj3sc5wd6n4f";} + {name="kmouth";value="1s7789qsvg18548bdhmmgcs3w9843naxhcwsiqhc8x0dvaxlgd5r";} + {name="kmplot";value="0jzrc47c4v6hvrs6p0yhki70diyfgs55vnjac4gfrfn17jgh562w";} + {name="knavalbattle";value="1mqvlvhqd7sa4qsz6cf6gffysamgfml3nd4h71x5qzw8qqw778yq";} + {name="knetwalk";value="14nizf7nrvsmqg6d5vaazl8wf74q64gwxq6nmj86brinf7d5nn5h";} + {name="kolf";value="1qghkmzbpaajb91xcwd22fx87cfpmgmjjwqisdzkjz4qn3z5mpx0";} + {name="kollision";value="1z0xg967q3l2gxmnigjbrnqwvw5fm7cpscpfavn31zp4vbmk937m";} + {name="kolourpaint";value="135i7h1lf23cggzx7l2p2hsh7s4zrik3298fwwbhly0jl564ribb";} + {name="konquest";value="133zjqqpzwrai34f8gb4nk3im50i61c2my8hnqzr61pbbgd61ff3";} + {name="konsole";value="1iaih9c6i5ad0bvalwykrdgrwz6wb7k6x808na1df0yynw76r4s7";} + {name="korundum";value="1h8rr229hwkckrvpz6zkkxpfkrpg18fvyxsqb01sjaky7c6i4649";} + {name="kpat";value="1imr9w6jymx4379ba7drpa9nmaq6z28hrf5jwi06crhp5fyi08dh";} + {name="kremotecontrol";value="0zzhjgpy17wrgcrr70z582zh7rj0n4vgbxksz7gl3qm543y15kry";} + {name="kreversi";value="0dmfsg38hhav78j4s34arjr09ahfblv4k7s8llpafg7cicm8g0iv";} + {name="kross-interpreters";value="043wpb05di9pw3h206lpccgpfghc4v23s0n2bwv30246ig75rmk1";} + {name="kruler";value="1g7f810d7940j9lylzj0k7d89mbblz8ai9gs5cc7n0mkrczb9ws9";} + {name="ksaneplugin";value="1svsfgsvd21f9fhrsvi2fasffrx0r5rf8a8r4jx19hlzcvha0kza";} + {name="kscd";value="1ipl9sq8zikdjs044lbi519jyvdaahi0f8a877zfdp0xspzqi398";} + {name="kshisen";value="06qkl8fwh8rql6hdl8fygvfybp7w6c3ys0qsnjpxk5bz4m5xap1d";} + {name="ksirk";value="1hqp00dilzkbkada7dc5j56sh2rp19xcirhvj26560whlwdxhcj5";} + {name="ksnakeduel";value="0nbn1pn0hzh6wmhxkabrga50y06k4gv4pbb5235jbynjmk539n31";} + {name="ksnapshot";value="09na29nydwi0cmgg9g6yqr3wl9npgiqpvdq3wxc5jk1kxadlb0aj";} + {name="kspaceduel";value="1xf5qb8a08ar0v0ws1iyiqbax6qc8crbhn59nzy2hrc12451lbkc";} + {name="ksquares";value="1iz9r80mnkyq5mx4i95gx5a5qk5y5by8bwq9599ypamrb9fr1zpl";} + {name="kstars";value="0p86fpcyb1ipgmi2ypckdb5zzwanky9b3c1n5ddcr25y84b2m7iy";} + {name="ksudoku";value="0k5qdy0i20kxcsqdwzxhrw6rn3lzh2mgbw97rlxw5gmr3619irdz";} + {name="ktimer";value="149zlkpdz38pfg0yy9mi6xkrc3wcz790kc3026x1c5zyvb2nnwm7";} + {name="ktouch";value="109dwxxz1hcwj5506k33a0zy86ky50rp058x6pgqh1m0a6ljvswi";} + {name="ktuberling";value="1vsdkx7kz4gz35g3ggn6h5gmk43sww7mawdfl4r11q5rq7r2nlnx";} + {name="kturtle";value="1jvj34jlbvzvwmr7q8c12rh9q47d78dl6vx6lhjhvs1b0969zzrq";} + {name="kubrick";value="1vqjbf6p6adrmnrl4i4y1jh80rimzlp4fyfmgscpfncdnc5pzgb0";} + {name="kwallet";value="0sc6xn1gyl2jvfqqvln2x4cb68b2x5cjmb8gvxhgwizx93jmwkc1";} + {name="kwordquiz";value="1i7kdfp8x1r109jmj1a86bmn69cgjc8q9c4n92j1imr17ig063is";} + {name="libkcddb";value="1krr3jh46q3q02rps3wawv59bv9jzri7i4gi4qgszk5v8gn67nqb";} + {name="libkcompactdisc";value="1y7sznz6sdrgs8jiqxs2y7imqywq91l46w1dv8fkc9mcpx5233zb";} + {name="libkdcraw";value="1nhhnj6hir347g6jp20k5jq0faygp8x9k3lic9ixdw2byigy9c3p";} + {name="libkdeedu";value="0m0ipprcldg1l2yi0hpq87npvqic9vfh6pn60fg4wvl56syn0sfg";} + {name="libkdegames";value="1qs59v68nwli5438ax3am6694r1c04i7crv34bs9hksnmr51l499";} + {name="libkexiv2";value="0n93d4s37m2jdg04wgvmljrs7j14967bjjk6mk7fibv0jqmp65i5";} + {name="libkipi";value="0kjp9y2rngvhskzk63az6zfzjrysir2qlapy56ynscdgq3yl0ygm";} + {name="libkmahjongg";value="0g7fp0wzrhxfyhj46bv0in8z4iwal6ipjjcm38qz1j4ric71l1kf";} + {name="libksane";value="0pqgh21ymq0pclbvq411aglclak6afqll5d0y8hz8m6afkmjhqxc";} + {name="lskat";value="04gvh3266hllfzl5syai3qw7zvkd7jipqdrwzynqvzpdg725a05g";} + {name="marble";value="0v4c1psyl5342f01n0794wk0ckg5chblibvap0vicanlq16pp65f";} + {name="mplayerthumbs";value="198b8f3s7zv4sprbj22flzdpxsag91p283iym5q9mkialf51789y";} + {name="nepomuk-core";value="15zzraacig4qqmwabw7xy38ddvcxam7djw96yhxc0z8zr3xffysj";} + {name="nepomuk-widgets";value="1kjzp7px5l7q9bal0dxpm24wq05s0wbjgqli6bhx7d5hipfr53w2";} + {name="okular";value="0zvmfh9ijwx10zy9nq6295x1w9x1xljkdcsz5269m230ff6wwmnh";} + {name="oxygen-icons";value="1z46zmazg1hf6yy2krfqpb5i5xmf7kpw9l7wvh3ihfqsdh77qmn8";} + {name="pairs";value="0i9wg6a3y71m3bdp5qjk6f9bmmd45r9hi7b8fqxp8srxcqn5hzx1";} + {name="palapeli";value="1cq8vggcc1358nf4n15pycmbn7m50lndd1w0541c85qirlnrq7wm";} + {name="parley";value="0cqdmjcsjqa8p42p7j8ni9mkf898p5hs3wdb757b4c1vyzkkdlpx";} + {name="perlkde";value="0w628fdxqmwv8k0x22307a4cpwlvq3lfsbhl5b3bv7naqjnwf549";} + {name="perlqt";value="11g5rh32i2x8klg5y5bapg581k4gm38jdfsmqsrjdcmxfw94bjil";} + {name="picmi";value="0y3s3k1x78z2asbcrcl8xkrk7kkz2ci4lbh1jfbnd66bx7lmwv0l";} + {name="print-manager";value="0x8lqjndi3ln90n8bgw26k09kz5ghkfm2xgqi4y0295ggbm3cm24";} + {name="pykde4";value="02qih6jw13mv9x4wf85ff9m5akdmxrz2jf2nlldyimh879dn0hxr";} + {name="qtruby";value="15wv6rh8d1f0d96f42bawyljlkpnamwxqng69jfd3q44j54gjkc5";} + {name="qyoto";value="1jpk5vp4ymvy8hhqia7b4mw0pzgdskb3aff30ik154mngzaqbdzc";} + {name="rocs";value="131gb6xfcrmwnl7nbxpm1rip9q2r8wzw8pb8f8a47vvswf200n7g";} + {name="smokegen";value="1vcc7yz6j7ndk8ppg7zr546cji6x5w38nlfc1lanq1pb3lbsddwn";} + {name="smokekde";value="1ib1xj6lkh2z80l9dci6w58f62f2mmpfz6hm81hygxqyxbf8rl64";} + {name="smokeqt";value="1fpv9c1qsl08p8s5a86ql0342hbalbh2inxv9a3risqg6qd0is6l";} + {name="step";value="1iayd98rqsl5qm1r4jiabnhw68691kakajgp9kpmn302ljn2wx5j";} + {name="superkaramba";value="1g86gacs1ss2sa3vdyg1ciwbpcd6d3i8yfb7fjmgvjm4qiyl3npg";} + {name="svgpart";value="0iy01cl4p37bfmr5779shbp202w25ik3phsqq6yjzfb7521xbm4r";} + {name="sweeper";value="1np09is041rb7bk8q1bhl0wmv3dypmsgyvd5yxg1qlsibn8mwbiw";} +]; +modules=[ +{ + module="kdemultimedia"; + split=true; + pkgs=[ + { name="audiocd-kio"; sane="audiocd_kio"; } + { name="dragon"; } + { name="ffmpegthumbs"; } + { name="juk"; } + { name="kmix"; } + { name="kscd"; } + { name="libkcddb"; } + { name="libkcompactdisc"; } + { name="mplayerthumbs"; } + ]; +} +{ + module="kdegraphics"; + split=true; + pkgs=[ + { name="gwenview"; } + { name="kamera"; } + { name="kcolorchooser"; } + { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } + { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } + { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } + { name="kgamma"; } + { name="kolourpaint"; } + { name="kruler"; } + { name="ksaneplugin"; } + { name="ksnapshot"; } + { name="libkdcraw"; } + { name="libkexiv2"; } + { name="libkipi"; } + { name="libksane"; } + { name="okular"; } + { name="svgpart"; } + ]; +} +{ + module="kdelibs"; + split=true; + pkgs=[ + { name="kdelibs"; } + { name="nepomuk-core"; sane="nepomuk_core"; } + { name="nepomuk-widgets"; sane="nepomuk_widgets"; } + ]; +} +{ + module="kdeutils"; + split=true; + pkgs=[ + { name="ark"; } + { name="filelight"; } + { name="kcalc"; } + { name="kcharselect"; } + { name="kdf"; } + { name="kfloppy"; } + { name="kgpg"; } + { name="kremotecontrol"; } + { name="ktimer"; } + { name="kwallet"; } + { name="print-manager"; sane="print_manager"; } + { name="superkaramba"; } + { name="sweeper"; } + ]; +} +{ + module="applications"; + split=true; + pkgs=[ + { name="kate"; } + { name="konsole"; } + ]; +} +{ + module="kdegames"; + split=true; + pkgs=[ + { name="bomber"; } + { name="bovo"; } + { name="granatier"; } + { name="kajongg"; } + { name="kapman"; } + { name="katomic"; } + { name="kblackbox"; } + { name="kblocks"; } + { name="kbounce"; } + { name="kbreakout"; } + { name="kdiamond"; } + { name="kfourinline"; } + { name="kgoldrunner"; } + { name="kigo"; } + { name="killbots"; } + { name="kiriki"; } + { name="kjumpingcube"; } + { name="klickety"; } + { name="klines"; } + { name="kmahjongg"; } + { name="kmines"; } + { name="knavalbattle"; } + { name="knetwalk"; } + { name="kolf"; } + { name="kollision"; } + { name="konquest"; } + { name="kpat"; } + { name="kreversi"; } + { name="kshisen"; } + { name="ksirk"; } + { name="ksnakeduel"; } + { name="kspaceduel"; } + { name="ksquares"; } + { name="ksudoku"; } + { name="ktuberling"; } + { name="kubrick"; } + { name="libkdegames"; } + { name="libkmahjongg"; } + { name="lskat"; } + { name="palapeli"; } + { name="picmi"; } + ]; +} +{ + module="kdeedu"; + split=true; + pkgs=[ + { name="analitza"; } + { name="blinken"; } + { name="cantor"; } + { name="kalgebra"; } + { name="kalzium"; } + { name="kanagram"; } + { name="kbruch"; } + { name="kgeography"; } + { name="khangman"; } + { name="kig"; } + { name="kiten"; } + { name="klettres"; } + { name="kmplot"; } + { name="kstars"; } + { name="ktouch"; } + { name="kturtle"; } + { name="kwordquiz"; } + { name="libkdeedu"; } + { name="marble"; } + { name="pairs"; } + { name="parley"; } + { name="rocs"; } + { name="step"; } + ]; +} +{ + module="kdebindings"; + split=true; + pkgs=[ + { name="kimono"; } + { name="korundum"; } + { name="kross-interpreters"; sane="kross_interpreters"; } + { name="perlkde"; } + { name="perlqt"; } + { name="pykde4"; } + { name="qtruby"; } + { name="qyoto"; } + { name="smokegen"; } + { name="smokekde"; } + { name="smokeqt"; } + ]; +} +{ + module="kdeaccessibility"; + split=true; + pkgs=[ + { name="jovie"; } + { name="kaccessible"; } + { name="kmag"; } + { name="kmousetool"; } + { name="kmouth"; } + ]; +} +{ + module="kde-baseapps"; +sane="kde_baseapps"; split=true; + pkgs=[ + { name="kde-baseapps"; sane="kde_baseapps"; } + ]; +} +{ module="kactivities"; split=false;} +{ module="kdeadmin"; split=false; + pkgs=[ + { name="strigi-analyzer"; sane="strigi_analyzer";} + { name="kuser"; } + { name="kcron"; } + { name="ksystemlog"; } + ]; + +} +{ module="kdeartwork"; split=false; + pkgs=[ + { name="ColorSchemes"; } + { name="IconThemes"; } + { name="emoticons"; } + { name="kscreensaver"; } + { name="kwin-styles"; sane="kwin_styles";} + { name="sounds"; } + { name="styles"; } + { name="wallpapers"; } + { name="HighResolutionWallpapers"; } + { name="WeatherWallpapers"; } + { name="desktopthemes"; } + ]; + +} +{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;} +{ module="kdenetwork"; split=false; + pkgs=[ + { name="kfile-plugins"; sane="kfile_plugins";} + { name="kget"; } + { name="kopete"; } + { name="krdc"; } + { name="kppp"; } + { name="krfb"; } + { name="kdnssd"; } + { name="filesharing"; } + ]; + +} +{ module="kdepim"; split=false;} +{ module="kdepimlibs"; split=false;} +{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} +{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} +{ module="kde-runtime"; sane="kde_runtime"; split=false;} +#had to add fake pkgs to kdesdk to get it to be treated like a split module +{ module="kdesdk"; split=false; pkgs = [{ name="fake"; }]; } +{ module="kdetoys"; split=false; + pkgs=[ + { name="kteatime"; } + { name="ktux"; } + { name="amor"; } + ]; + +} +{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} +{ module="kdewebdev"; split=false; + pkgs=[ + { name="klinkstatus"; } + { name="kfilereplace"; } + { name="kimagemapeditor"; } + { name="kommander"; } + ]; + +} +{ module="kde-workspace"; sane="kde_workspace"; split=false;} +{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} +]; +} diff --git a/pkgs/desktops/kde-4.10/kde-package/default.nix b/pkgs/desktops/kde-4.10/kde-package/default.nix new file mode 100644 index 00000000000..cd2860920d6 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kde-package/default.nix @@ -0,0 +1,127 @@ +{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4 +, release, ignoreList, extraSubpkgs +}: + +let + inherit (stdenv.lib) filter fold; + inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head; +in +rec { + manifest = import (./. + "/${release}.nix"); + + # src attribute for $name tarball + kdesrc = name: fetchurl { + url = "mirror://kde/" + (if manifest.stable then "" else "un") + + "stable/${release}/src/${name}-${release}.tar.xz"; + sha256 = getAttr name manifest.hashes; + }; + + # Default meta attribute + defMeta = { + homepage = http://www.kde.org; + inherit (qt4.meta) platforms maintainers; + }; + + # KDE package built from the whole tarball + # This function is used both for monolithic modules and modules which are + # released as individual tarballs + kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, ...}: + stdenv.mkDerivation ({ + name = "${name}-${release}"; + src = kdesrc name; + meta = defMeta // meta; + enableParallelBuilding = true; + } // (removeAttrs a [ "meta" "name" ])); + + # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs + # API. + kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name; + + # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz + kdeSubdirPkg = module: + {name, subdir ? name, sane ? name}: + let name_ = name; in + a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}: + stdenv.mkDerivation ({ + name = "${name}-${release}"; + src = kdesrc module; + cmakeFlags = + [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE" + "-DBUILD_doc=TRUE" + "-DBUILD_${subdir}=TRUE" + ] ++ cmakeFlags; + meta = defMeta // meta; + enableParallelBuilding = module.enableParallelBuilding or true; + } // (removeAttrs a [ "meta" "name" "cmakeFlags" ])); + + # A KDE monolithic module + kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; }; + + # Combine packages in one module. + # Arguments: + # * pkgFun --- a function of the following signature: + # module: manifest_attrs: manual_attrs: derivation; + # * module --- name of the module + # * pkgs --- list of packages in manifest format + combinePkgs = pkgFun: module: pkgs: + let + f = p@{name, ...}: + callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; }; + list = map f pkgs; + attrs = listToAttrs (map + ({name, sane ? name, ...}@p: { name = sane; value = f p; }) + pkgs); + in + runCommand "${module}-${release}" + ({passthru = attrs // { + propagatedUserEnvPackages = list; + projects = attrs; + };}) + '' + mkdir -pv $out/nix-support + echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages + ''; + + # Given manifest module data, return the module + kdeModule = { module, sane ? module, split, pkgs ? [] }: + let + pkgs_ = filterPkgs module pkgs; + in + # Module is splitted by upstream + if split then combinePkgs kdeSplittedPkg module pkgs_ + # Monolithic module + else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix") + # Module is splitted by us + else combinePkgs kdeSubdirPkg module pkgs_; + + # The same, as nameValuePair with sane name + kdeModuleNV = a@{ module, sane ? module, ... }: + { name = sane; value = kdeModule a; }; + + filterPkgs = module: (p: + removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p + ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs)); + + # Remove attrsets with x.name in subst. Optimized for empty subst. + removeNames = subst: big: + fold (s: out: filter (x: x.name != s) out) big subst; + + modules = listToAttrs (map kdeModuleNV manifest.modules); + + splittedModuleList = + let + splitted = filter (a: a ? pkgs) manifest.modules; + names = map ({module, sane ? module, ...}: sane) splitted; + in + map (m: m.projects) (stdenv.lib.attrVals names modules); + + individual = + stdenv.lib.zipAttrsWith + ( + name: list: + if tail list == [] + then head list + else abort "Multiple modules define ${name}" + ) + splittedModuleList; +} diff --git a/pkgs/desktops/kde-4.10/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.10/kde-package/kde-manifest.sh new file mode 100755 index 00000000000..e964ce3ddc1 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kde-package/kde-manifest.sh @@ -0,0 +1,146 @@ +#! /bin/sh + +# Usage: download kde release to $dir, then run +# $0 $dir + +dir="$1" + +# Detect release number & whether it is a stable release +if [[ ! -d "${dir}" ]]; then + echo "${dir} is not a directory (or doesn't exist)!" >&2 + exit 1 +fi + +release=$(ls "${dir}"/kdelibs-*.tar.xz | \ + sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//') + +if [[ ${release##*.} -gt 50 ]]; then + stable="false" +else + stable="true" +fi + +echo "Detected release ${release}" >&2 + +declare -A hash +declare -A modules +declare -a packages +declare -a top_level + +# xsltproc output declares -A module +if [[ ! -f kde_projects.xml ]]; then + curl -O -J http://projects.kde.org/kde_projects.xml +fi +eval `xsltproc kde-submodules.xslt kde_projects.xml` + +module[kde-baseapps]=kde-baseapps +unset module[kactivities] + +print_sane() { + echo "Called print_sane $1" >&2 + sane="${1//[^a-z0-9_]/_}" + if [[ "$sane" != "$1" ]]; then + echo "Sane version is $sane" >&2 + echo -n "sane=\"$sane\";" + fi +} + +for i in `cd "${dir}"; ls *-${release}.tar.xz`; do + package=${i%-${release}.tar.xz} + packages+=( "$package" ) + echo -n "${package}.. " >&2 + hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") + echo -n ${hash[$package]} >&2 + + if [ -n "${module[$package]}" ]; then + m="${module[$package]}" + echo " (${m})" >&2 + modules[$m]=1 + else + top_level+=( "$package" ) + echo " (top-level)" >&2 + fi + #nix-store --add-fixed sha256 "${dir}/${i}" >&2 +done + + +print_pkg_hash() { + echo " {name=\"${1}\";value=\"${hash[$1]}\";}" +} + +print_hashes(){ + echo "hashes=builtins.listToAttrs[" + for p in "${packages[@]}"; do print_pkg_hash "$p"; done + echo "];" +} + +print_split_module(){ + echo -n "$1:" >&2 + echo -e "{\n module=\"$1\";" + print_sane "$1" + echo " split=true;" + echo " pkgs=[" + for p in "${packages[@]}"; do + if [[ "${module[$p]}" == "$1" ]]; then + echo -n " { name=\"$p\"; " + print_sane "$p" + echo " }" + echo -n " $p" >&2 + fi + done + echo " ];" + echo "}" + echo >&2 +} + +print_mono_module(){ + echo -en "{ module=\"$1\"; " + print_sane "$1" + echo -n "$1 ... " >&2 + echo -n " split=false;" + cml="$1-$release/CMakeLists.txt" + tar -xf "${dir}/$1-${release}.tar.xz" "$cml" + if grep '^[^#]*add_subdirectory' $cml >/dev/null; then + if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then + echo " is monolithic (has unconditionally added subdirs)" >&2 + else + subdirs=( `grep '^[^#]*add_subdirectory' $cml | + sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' | + grep -v '\(doc\|cmake\)'` ) + echo " seems splittable, subdirs: ${subdirs[*]}" >&2 + echo -e "\n pkgs=[" + for s in "${subdirs[@]}"; do + echo -en " {" + echo -n " name=\"${s//\//-}\"; " + print_sane "$s" + if [[ $s != "${s//\//-}" ]]; then + echo -n "subdir=\"$s\"; " + fi + echo "}" + done + echo -e " ];\n" + fi + else + echo " is monolithic (has no subdirs)" >&2 + fi + rm $cml + rmdir $1-$release + echo "}" +} + +print_modules(){ + echo "modules=[" + echo "Printing modules splitted by upstream" >&2 + for m in "${!modules[@]}"; do print_split_module "$m"; done + echo >&2 + echo "Printing modules not splitted by upstream (${top_level[*]})" >&2 + for m in "${top_level[@]}"; do print_mono_module "$m"; done + echo "];" +} + +echo "Writing ${release}.nix" >&2 +exec > "${release}.nix" +echo "{stable=${stable};" +print_hashes +print_modules +echo "}" diff --git a/pkgs/desktops/kde-4.10/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.10/kde-package/kde-submodules.xslt new file mode 100644 index 00000000000..952a05a9d27 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kde-package/kde-submodules.xslt @@ -0,0 +1,22 @@ + + + + + + + + + declare -A module + + + + module[" + + "]=" + + " + + + + + diff --git a/pkgs/desktops/kde-4.10/kde-runtime.nix b/pkgs/desktops/kde-4.10/kde-runtime.nix new file mode 100644 index 00000000000..a0e58deb0b2 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kde-runtime.nix @@ -0,0 +1,21 @@ +{ kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica +, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio +, networkmanager, nepomuk_core, kactivities, kdepimlibs +}: + +kde { + buildInputs = [ + kdelibs attica xz bzip2 nepomuk_core libssh libjpeg exiv2 ntrack + qca2 samba (libcanberra.override { gtk = null; }) pulseaudio + networkmanager kactivities kdepimlibs +#todo: add openslp, openexr + ]; + + nativeBuildInputs = [ pkgconfig ]; + + passthru.propagatedUserEnvPackages = [ virtuoso ]; + + meta = { + license = "LGPL"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kde-wallpapers.nix b/pkgs/desktops/kde-4.10/kde-wallpapers.nix new file mode 100644 index 00000000000..fe463786e4c --- /dev/null +++ b/pkgs/desktops/kde-4.10/kde-wallpapers.nix @@ -0,0 +1,17 @@ +{ kde, cmake }: + +kde { + nativeBuildInputs = [ cmake ]; + + patches = [ ./files/kde-wallpapers-buildsystem.patch ]; + + cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers"; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1qpnv4f8f2aga3i1w9k0f0s6myilnm0f9mja8ikkkgi2qpv1q66f"; + + meta = { + description = "Wallpapers for KDE"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kde-workspace.nix b/pkgs/desktops/kde-4.10/kde-workspace.nix new file mode 100644 index 00000000000..a478dc975fe --- /dev/null +++ b/pkgs/desktops/kde-4.10/kde-workspace.nix @@ -0,0 +1,38 @@ +{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies, + lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate, + xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi, + libjpeg, pkgconfig, libXft, libXxf86misc, kactivities, qjson, networkmanager +}: + +kde { + +#todo: googlegadgets, consolekit, xmms + buildInputs = + [ kdelibs qimageblitz libdbusmenu_qt libjpeg xorg.libxcb xorg.xcbutilimage + xorg.xcbutilrenderutil libXft #libXxf86misc + xorg.libxkbfile xorg.libXcomposite xorg.libXtst #xorg.libXScrnSaver + xorg.libXdamage xorg.libXau xorg.libXdmcp xorg.libpthreadstubs + boost gpsd lm_sensors pciutils libraw1394 + libusb python libqalculate kdepimlibs pam prison akonadi qjson networkmanager + kactivities + ]; + + nativeBuildInputs = [ pkgconfig ]; + + preConfigure = + '' + # Fix incorrect path to kde4-config. + substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config + + # Fix the path to the keyboard configuration files. + substituteInPlace kcontrol/keyboard/xkb_rules.cpp \ + --replace /usr/share/X11 ${xkeyboard_config}/etc/X11 + ''; + + enableParallelBuilding = false; # frequent problems on Hydra + + meta = { + description = "KDE workspace components such as Plasma, Kwin and System Settings"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.10/kdeaccessibility/jovie.nix new file mode 100644 index 00000000000..d38c80c4c36 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeaccessibility/jovie.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, speechd }: + +kde { + buildInputs = [ kdelibs speechd ]; + + meta = { + description = "Text-to-speech synthesis daemon"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.10/kdeaccessibility/kaccessible.nix new file mode 100644 index 00000000000..98fae7c983f --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeaccessibility/kaccessible.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, speechd }: + +kde { + buildInputs = [ kdelibs speechd ]; + + meta = { + description = "Bridge that provides accessibility services to applications"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.10/kdeaccessibility/kmag.nix new file mode 100644 index 00000000000..606c61cddb6 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeaccessibility/kmag.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs }: + +kde { +#todo: package qaccessibilityclient + buildInputs = [ kdelibs ]; + + meta = { + description = "Screen magnifier for KDE"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.10/kdeaccessibility/kmousetool.nix new file mode 100644 index 00000000000..8e0caa76ed9 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeaccessibility/kmousetool.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, libXtst, libXt }: + +kde { + buildInputs = [ kdelibs libXtst libXt ]; + + meta = { + description = "A program that clicks the mouse for you"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.10/kdeaccessibility/kmouth.nix new file mode 100644 index 00000000000..4159501967c --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeaccessibility/kmouth.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A type-and-say front end for speech synthesizers"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.10/kdeadmin/kcron.nix new file mode 100644 index 00000000000..bada0c1cb10 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeadmin/kcron.nix @@ -0,0 +1,5 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; +} diff --git a/pkgs/desktops/kde-4.10/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.10/kdeadmin/ksystemlog.nix new file mode 100644 index 00000000000..bada0c1cb10 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeadmin/ksystemlog.nix @@ -0,0 +1,5 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; +} diff --git a/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix new file mode 100644 index 00000000000..fa140765e7f --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeadmin/kuser.nix @@ -0,0 +1,5 @@ +{ kde, kdelibs, kdepimlibs, nepomuk_core }: + +kde { + buildInputs = [ kdelibs kdepimlibs nepomuk_core]; +} diff --git a/pkgs/desktops/kde-4.10/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.10/kdeartwork/ColorSchemes.nix new file mode 100644 index 00000000000..acccf66976f --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeartwork/ColorSchemes.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde { + name = "kde-color-schemes"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "Additional KDE color schemes"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.10/kdeartwork/FindXscreensaver.cmake new file mode 100644 index 00000000000..499ed75268e --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeartwork/FindXscreensaver.cmake @@ -0,0 +1,73 @@ +#Macro to find xscreensaver directory + +# Copyright (c) 2006, Laurent Montel, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (NOT XSCREENSAVER_FOUND) + FIND_PATH(XSCREENSAVER_DIR deco + HINTS + ${KDE4_INCLUDE_DIR} + PATHS + /usr + /usr/local + /opt/local + /usr/X11R6 + /opt/kde + /opt/kde3 + /usr/kde + /usr/local/kde + /usr/local/xscreensaver + /usr/openwin/lib/xscreensaver + /etc + PATH_SUFFIXES + lib${LIB_SUFFIX}/xscreensaver + lib${LIB_SUFFIX}/misc/xscreensaver + lib/xscreensaver + lib64/xscreensaver + lib/misc/xscreensaver + libexec/xscreensaver + bin/xscreensaver-hacks + hacks) + message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>") + + FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml + PATHS + ${KDE4_INCLUDE_DIR} + /usr/ + /usr/local/ + /opt/local/ + /usr/X11R6/ + /opt/kde/ + /opt/kde3/ + /usr/kde/ + /usr/local/kde/ + /usr/openwin/lib/xscreensaver/ + /etc/ + PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config + ) + MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") + +endif(NOT XSCREENSAVER_FOUND) + +#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>") +#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>") + +# Need to fix hack +if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) + set(XSCREENSAVER_FOUND TRUE) +endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR) + +if (XSCREENSAVER_FOUND) + if (NOT Xscreensaver_FIND_QUIETLY) + message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>") + endif (NOT Xscreensaver_FIND_QUIETLY) +else (XSCREENSAVER_FOUND) + if (Xscreensaver_FIND_REQUIRED) + message(FATAL_ERROR "XScreenSaver not found") + endif (Xscreensaver_FIND_REQUIRED) +endif (XSCREENSAVER_FOUND) + + +MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR) diff --git a/pkgs/desktops/kde-4.10/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.10/kdeartwork/HighResolutionWallpapers.nix new file mode 100644 index 00000000000..edffca1562e --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeartwork/HighResolutionWallpapers.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde rec { + name = "kde-wallpapers-high-resolution"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE wallpapers in high resolution"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.10/kdeartwork/IconThemes.nix new file mode 100644 index 00000000000..43071e8bd14 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeartwork/IconThemes.nix @@ -0,0 +1,13 @@ +{ kde, kdelibs }: + +kde { + name = "kdeartwork-icon-themes"; + + # Sources contain primary and kdeclassic as well but they're not installed + + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE nuvola and mono icon themes"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.10/kdeartwork/WeatherWallpapers.nix new file mode 100644 index 00000000000..947e5e17ab0 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeartwork/WeatherWallpapers.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde rec { + name = "kde-weather-wallpapers"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "Additional KDE wallpapers (weather)"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.10/kdeartwork/desktopthemes.nix new file mode 100644 index 00000000000..93dd361af73 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeartwork/desktopthemes.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde { + name = "kde-desktop-themes"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "Additional KDE desktop themes"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.10/kdeartwork/emoticons.nix new file mode 100644 index 00000000000..5ef9f78a719 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeartwork/emoticons.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde { + name = "kde-emotion-icons"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "Additional KDE emotion icons (smiles)"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.10/kdeartwork/kscreensaver.nix new file mode 100644 index 00000000000..7028b9db228 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeartwork/kscreensaver.nix @@ -0,0 +1,15 @@ +{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }: + +kde { + buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ]; + + nativeBuildInputs = [ pkgconfig ]; + + preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake"; + + cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ]; + + meta = { + description = "KDE screensavers"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.10/kdeartwork/kwin-styles.nix new file mode 100644 index 00000000000..b5d769b216d --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeartwork/kwin-styles.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, kde_workspace }: + +kde { + buildInputs = [ kdelibs kde_workspace ]; + + meta = { + description = "Styles for KWin"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeartwork/sounds.nix b/pkgs/desktops/kde-4.10/kdeartwork/sounds.nix new file mode 100644 index 00000000000..e98705da889 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeartwork/sounds.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde rec { + name = "kde-sounds"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "New login/logout sounds"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeartwork/styles.nix b/pkgs/desktops/kde-4.10/kdeartwork/styles.nix new file mode 100644 index 00000000000..6a1306c3710 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeartwork/styles.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde rec { + name = "kde-style-phase"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "Phase, a widget style for KDE"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix new file mode 100644 index 00000000000..611c6a70f6b --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeartwork/wallpapers.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs }: + +kde rec { + name = "kde-wallpapers"; + + buildInputs = [ kdelibs ]; + + meta = { + description = "Additional KDE wallpapers"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdebindings/perlqt-include-smokeqt.patch b/pkgs/desktops/kde-4.10/kdebindings/perlqt-include-smokeqt.patch new file mode 100644 index 00000000000..fd67860283b --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdebindings/perlqt-include-smokeqt.patch @@ -0,0 +1,19 @@ +commit 48b92b74bc6fd270c33a726257e2879203cf5064 +Author: Yury G. Kudryashov [diff odt] +Date: Wed Mar 21 00:47:43 2012 +0400 + + Include SMOKE_QTCORE_INCLUDE_DIR + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 48020a1..2263a73 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,7 +14,7 @@ find_package(Smoke COMPONENTS QtCore QtGui QtNetwork Qt3Support QtDeclarative Qt + QtOpenGl QtScript QtSql QtSvg QtTest QtUiTools QtWebKit QtXml QtXmlPatterns + Phonon Qwt QSci QImageBlitz) + +-include_directories(${SMOKE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src) ++include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/src) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${SMOKE_CMAKE_MODULE_DIR}) + include(MacroOptionalFindPackage) + include(MacroOptionalAddBindings) diff --git a/pkgs/desktops/kde-4.10/kdebindings/perlqt-rewrite-FindPerlMore.patch b/pkgs/desktops/kde-4.10/kdebindings/perlqt-rewrite-FindPerlMore.patch new file mode 100644 index 00000000000..c7f73815f54 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdebindings/perlqt-rewrite-FindPerlMore.patch @@ -0,0 +1,118 @@ +commit e702abfd16f610e773fb0310d8c6512991794c63 +Author: Yury G. Kudryashov [diff odt] +Date: Wed Mar 21 00:50:02 2012 +0400 + + Rewrite FindPerlMore.cmake + + * Ask perl for expanded paths + * Move execute_process to a macro + * Add PERL_*_INSTALL_DIR variables that point to CMAKE_INSTALL_PREFIX + + The last change makes it easy to install a file into CMAKE_INSTALL_PREFIX + instead of perl install prefix.Add debug message + +diff --git a/cmake/FindPerlMore.cmake b/cmake/FindPerlMore.cmake +index 6412a47..cc8faf8 100644 +--- a/cmake/FindPerlMore.cmake ++++ b/cmake/FindPerlMore.cmake +@@ -5,54 +5,52 @@ + # + # PERL_INCLUDE_PATH = path to where perl.h can be found + +-if(PERL_INCLUDE_PATH) +- # Already in cache, be silent +- SET(PERL_HEADERS_FOUND TRUE) +-endif (PERL_INCLUDE_PATH) +- +-IF(PERL_EXECUTABLE) +- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{archlib}" +- OUTPUT_VARIABLE PERL_ARCH_LIB_DIR) +- +- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitearch}" +- OUTPUT_VARIABLE PERL_SITE_ARCH_DIR) +- +- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorarch}" +- OUTPUT_VARIABLE PERL_VENDOR_ARCH_DIR) +- +- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitelib}" +- OUTPUT_VARIABLE PERL_SITE_LIB_DIR) +- +- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorlib}" +- OUTPUT_VARIABLE PERL_VENDOR_LIB_DIR) +- +- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{version}" +- OUTPUT_VARIABLE PERL_VERSION) +- +- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccflags}" +- OUTPUT_VARIABLE PERL_CXX_FLAGS) +- +- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccdlflags}" +- OUTPUT_VARIABLE PERL_CCDL_FLAGS) +- +- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')" +- OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS) +- +- EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{perllibs}" +- OUTPUT_VARIABLE PERL_LIBS) +- +- FIND_PATH(PERL_INCLUDE_PATH +- NAMES perl.h +- PATHS ${PERL_ARCH_LIB_DIR}/CORE +- ) +- +- if(PERL_INCLUDE_PATH) +- SET(PERL_HEADERS_FOUND TRUE) +- endif (PERL_INCLUDE_PATH) +- +- MARK_AS_ADVANCED( +- PERL_INCLUDE_PATH +- ) ++if(FIND_PERLMORE_REQUIRED) ++ find_package(Perl REQUIRED) ++else() ++ find_package(Perl) ++endif() ++ ++macro(_perl_get_config_var name output) ++ execute_process(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{${name}}" ++ OUTPUT_VARIABLE PERL_${output}) ++endmacro() ++ ++macro(_perl_get_config_dir name) ++ string(TOLOWER ${name} _tmp) ++ string(REPLACE "_" "" _tmp ${_tmp}) ++ _perl_get_config_var(${_tmp}exp ${name}_DIR) ++ string(REPLACE "${PERL_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" PERL_${name}_INSTALL_DIR "${PERL_${name}_DIR}") ++endmacro() ++ ++if(PERL_EXECUTABLE) ++ _perl_get_config_var(prefixexp ROOT_DIR) ++ ++ _perl_get_config_dir(ARCH_LIB) ++ _perl_get_config_dir(SITE_ARCH) ++ _perl_get_config_dir(VENDOR_ARCH) ++ _perl_get_config_dir(SITE_LIB) ++ _perl_get_config_dir(VENDOR_LIB) ++ ++ _perl_get_config_var(version VERSION) ++ _perl_get_config_var(ccflags CXX_FLAGS) ++ _perl_get_config_var(ccdlflags CCDL_FLAGS) ++ ++ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')" ++ OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS) ++ ++ _perl_get_config_var(perllibs LIBS) ++ ++ FIND_PATH(PERL_INCLUDE_PATH ++ NAMES perl.h ++ HINTS ${PERL_ARCH_LIB_DIR}/CORE ++ ) ++ ++ if(PERL_INCLUDE_PATH) ++ SET(PERL_HEADERS_FOUND TRUE) ++ endif (PERL_INCLUDE_PATH) ++ ++ MARK_AS_ADVANCED(PERL_INCLUDE_PATH) + ENDIF(PERL_EXECUTABLE) + + IF(PERL_HEADERS_FOUND) diff --git a/pkgs/desktops/kde-4.10/kdebindings/perlqt-use-site-arch-install-dir.patch b/pkgs/desktops/kde-4.10/kdebindings/perlqt-use-site-arch-install-dir.patch new file mode 100644 index 00000000000..04f0c558677 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdebindings/perlqt-use-site-arch-install-dir.patch @@ -0,0 +1,454 @@ +commit c78779fcaff587818ee37bec3ded5e0617625b95 +Author: Yury G. Kudryashov [diff odt] +Date: Wed Mar 21 01:01:27 2012 +0400 + + Install to PERL_SITE_ARCH_INSTALL_DIR + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 48020a1..16188df 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,7 +36,6 @@ macro_log_feature(Qwt5_Qt4_FOUND "Qwt5 for Qt4" "Qwt5 libraries for Qt4" "http:/ + add_definitions(-DDEBUG) + + include (FindPerlMore) +-set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_SITE_ARCH_DIR} CACHE DIR "Custom installation directory for perl binary extension") + + # the RPATH to be used when installing, but only if it's not a system directory + GET_FILENAME_COMPONENT(SMOKE_LIB_DIR ${SMOKE_BASE_LIBRARY} PATH) +diff --git a/INSTALL b/INSTALL +index d19f97e..97cc9f1 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -36,7 +36,6 @@ ccmake step. + The standard options are: + CMAKE_BUILD_TYPE = The type of build ('Debug', 'Release', etc) + CMAKE_INSTALL_PREFIX = The location for any executables ( e.g. puic4 ) +- CUSTOM_PERL_SITE_ARCH_DIR = The location for the perl modules themselves. + QT_QMAKE_EXECUTABLE = The path to your system's qmake. + + cmake looks in your path for a qmake executable. If it can't find it, it will +diff --git a/Makefile.PL b/Makefile.PL +index df9a13c..31dd912 100755 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -3,7 +3,7 @@ + use strict; + use Config; + +-my ($prefix, $sitearch, $qmake) = ($Config{prefix}, $Config{sitearch}); ++my ($prefix, $qmake) = ($Config{prefix}); + my @cmakeArgs; + foreach my $arg (@ARGV) { + my $key = $arg; +@@ -12,7 +12,6 @@ foreach my $arg (@ARGV) { + $value =~ s/^[^=]*=//g; + if ($key eq 'PREFIX' or $key eq 'INSTALL_BASE') { + $prefix = $value; +- $sitearch = "$prefix"; + } + elsif ($key eq 'QMAKE') { + $qmake = $value; +@@ -34,7 +33,6 @@ if($^O =~ /win/i){ + } + push @args, "-DCMAKE_INSTALL_PREFIX=$prefix" if $prefix; + push @args, "-DQT_QMAKE_EXECUTABLE=$qmake" if $qmake; +-push @args, "-DCUSTOM_PERL_SITE_ARCH_DIR=$sitearch" if $sitearch; + push @args, @cmakeArgs; + + if ( eval "require Alien::SmokeQt" ) { +diff --git a/phonon/lib/CMakeLists.txt b/phonon/lib/CMakeLists.txt +index f2857c3..78674ea 100644 +--- a/phonon/lib/CMakeLists.txt ++++ b/phonon/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(phononpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Phonon.pm ${CMAKE_BINARY_DIR}/blib/lib/Phonon.pm) +-install(FILES Phonon.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES Phonon.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/phonon/src/CMakeLists.txt b/phonon/src/CMakeLists.txt +index a04db11..9933dfd 100644 +--- a/phonon/src/CMakeLists.txt ++++ b/phonon/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_phonon + set_target_properties(perl_phonon PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_phonon PROPERTIES PREFIX "") + +-install(TARGETS perl_phonon DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_phonon DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qimageblitz/lib/CMakeLists.txt b/qimageblitz/lib/CMakeLists.txt +index 0809ba8..22fc1c0 100644 +--- a/qimageblitz/lib/CMakeLists.txt ++++ b/qimageblitz/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qimageblitzpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QImageBlitz.pm ${CMAKE_BINARY_DIR}/blib/lib/QImageBlitz.pm) +-install(FILES QImageBlitz.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QImageBlitz.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qimageblitz/src/CMakeLists.txt b/qimageblitz/src/CMakeLists.txt +index 02ef494..4f02c1b 100644 +--- a/qimageblitz/src/CMakeLists.txt ++++ b/qimageblitz/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_qimageblitz + set_target_properties(perl_qimageblitz PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qimageblitz PROPERTIES PREFIX "") + +-install(TARGETS perl_qimageblitz DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qimageblitz DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qsci/lib/CMakeLists.txt b/qsci/lib/CMakeLists.txt +index 63b451f..d22869f 100644 +--- a/qsci/lib/CMakeLists.txt ++++ b/qsci/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qscipm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qsci.pm ${CMAKE_BINARY_DIR}/blib/lib/Qsci.pm) +-install(FILES Qsci.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES Qsci.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qsci/src/CMakeLists.txt b/qsci/src/CMakeLists.txt +index 8c1659b..bdcb5a8 100644 +--- a/qsci/src/CMakeLists.txt ++++ b/qsci/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_qsci + set_target_properties(perl_qsci PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qsci PROPERTIES PREFIX "") + +-install(TARGETS perl_qsci DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qsci DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qt3support/lib/CMakeLists.txt b/qt3support/lib/CMakeLists.txt +index 2f04cfa..dda5afa 100644 +--- a/qt3support/lib/CMakeLists.txt ++++ b/qt3support/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qt3support4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qt3Support4.pm ${CMAKE_BINARY_DIR}/blib/lib/Qt3Support4.pm) +-install(FILES Qt3Support4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES Qt3Support4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qt3support/src/CMakeLists.txt b/qt3support/src/CMakeLists.txt +index b24532e..bed99aa 100644 +--- a/qt3support/src/CMakeLists.txt ++++ b/qt3support/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_qt3support4 + set_target_properties(perl_qt3support4 PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qt3support4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qt3support4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qt3support4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qtcore/lib/CMakeLists.txt b/qtcore/lib/CMakeLists.txt +index ef07d10..1d78196 100644 +--- a/qtcore/lib/CMakeLists.txt ++++ b/qtcore/lib/CMakeLists.txt +@@ -1,3 +1,3 @@ + add_subdirectory( QtCore4 ) + add_custom_target(perlqtcore4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtCore4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtCore4.pm) +-install( FILES QtCore4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR} ) ++install( FILES QtCore4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR} ) +diff --git a/qtcore/lib/QtCore4/CMakeLists.txt b/qtcore/lib/QtCore4/CMakeLists.txt +index 44c7893..06aef20 100644 +--- a/qtcore/lib/QtCore4/CMakeLists.txt ++++ b/qtcore/lib/QtCore4/CMakeLists.txt +@@ -1,3 +1,3 @@ +-install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/QtCore4 ) ++install( FILES signals.pm slots.pm isa.pm debug.pm classinfo.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/QtCore4 ) + add_custom_target(perlqt4pmlibmkdir ALL ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/blib/lib/QtCore4) + add_custom_target(perlqt4pmlibsubdir ALL ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/blib/lib/QtCore4) +diff --git a/qtcore/src/CMakeLists.txt b/qtcore/src/CMakeLists.txt +index 3910636..b5e645c 100644 +--- a/qtcore/src/CMakeLists.txt ++++ b/qtcore/src/CMakeLists.txt +@@ -53,10 +53,10 @@ target_link_libraries(perlqtcore4 + set_target_properties(perlqtcore4 PROPERTIES + OUTPUT_NAME ${libraryName} + PREFIX "" +- INSTALL_NAME_DIR ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/ ++ INSTALL_NAME_DIR ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/ + ) + +-install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perlqtcore4 EXPORT PerlQtExport DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) + install(FILES binding.h handlers.h listclass_macros.h marshall_basetypes.h marshall_complex.h + marshall.h marshall_macros.h marshall_primitives.h marshall_types.h perlqt.h ppport.h + QtCore4.h smokehelp.h smokeperl.h util.h +diff --git a/qtdbus/lib/CMakeLists.txt b/qtdbus/lib/CMakeLists.txt +index d03a672..a60d603 100644 +--- a/qtdbus/lib/CMakeLists.txt ++++ b/qtdbus/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qtdbus4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDBus4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDBus4.pm) +-install(FILES QtDBus4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QtDBus4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qtdbus/src/CMakeLists.txt b/qtdbus/src/CMakeLists.txt +index 9aa05a0..5786ea2 100644 +--- a/qtdbus/src/CMakeLists.txt ++++ b/qtdbus/src/CMakeLists.txt +@@ -31,4 +31,4 @@ target_link_libraries(perl_qtdbus4 + set_target_properties(perl_qtdbus4 PROPERTIES OUTPUT_NAME "QtDBus4") + set_target_properties(perl_qtdbus4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qtdbus4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/QtDBus4/) ++install(TARGETS perl_qtdbus4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/QtDBus4/) +diff --git a/qtdeclarative/lib/CMakeLists.txt b/qtdeclarative/lib/CMakeLists.txt +index e8d2847..b458858 100644 +--- a/qtdeclarative/lib/CMakeLists.txt ++++ b/qtdeclarative/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qtdeclarative4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtDeclarative4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtDeclarative4.pm) +-install(FILES QtDeclarative4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QtDeclarative4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qtdeclarative/src/CMakeLists.txt b/qtdeclarative/src/CMakeLists.txt +index 1662167..ec2a8fc 100644 +--- a/qtdeclarative/src/CMakeLists.txt ++++ b/qtdeclarative/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_qtdeclarative4 + set_target_properties(perl_qtdeclarative4 PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qtdeclarative4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qtdeclarative4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qtdeclarative4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qtgui/lib/CMakeLists.txt b/qtgui/lib/CMakeLists.txt +index 82626c8..e62a4ac 100644 +--- a/qtgui/lib/CMakeLists.txt ++++ b/qtgui/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qtgui4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtGui4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtGui4.pm) +-install(FILES QtGui4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QtGui4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qtgui/src/CMakeLists.txt b/qtgui/src/CMakeLists.txt +index 4cc8b36..44041b6 100644 +--- a/qtgui/src/CMakeLists.txt ++++ b/qtgui/src/CMakeLists.txt +@@ -38,4 +38,4 @@ target_link_libraries(perl_qtgui4 + set_target_properties(perl_qtgui4 PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qtgui4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qtgui4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qtgui4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qthelp/lib/CMakeLists.txt b/qthelp/lib/CMakeLists.txt +index dcf5ebe..da817d4 100644 +--- a/qthelp/lib/CMakeLists.txt ++++ b/qthelp/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qthelp4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtHelp4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtHelp4.pm) +-install(FILES QtHelp4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QtHelp4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qthelp/src/CMakeLists.txt b/qthelp/src/CMakeLists.txt +index c00359d..689cb29 100644 +--- a/qthelp/src/CMakeLists.txt ++++ b/qthelp/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_qthelp4 + set_target_properties(perl_qthelp4 PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qthelp4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qthelp4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qthelp4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qtmultimedia/lib/CMakeLists.txt b/qtmultimedia/lib/CMakeLists.txt +index e55f697..5384539 100644 +--- a/qtmultimedia/lib/CMakeLists.txt ++++ b/qtmultimedia/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qtmultimedia4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtMultimedia4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtMultimedia4.pm) +-install(FILES QtMultimedia4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QtMultimedia4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qtmultimedia/src/CMakeLists.txt b/qtmultimedia/src/CMakeLists.txt +index 0728aba..df8e552 100644 +--- a/qtmultimedia/src/CMakeLists.txt ++++ b/qtmultimedia/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_qtmultimedia4 + set_target_properties(perl_qtmultimedia4 PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qtmultimedia4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qtmultimedia4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qtmultimedia4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qtnetwork/lib/CMakeLists.txt b/qtnetwork/lib/CMakeLists.txt +index 12cd5dd..d1fb0e6 100644 +--- a/qtnetwork/lib/CMakeLists.txt ++++ b/qtnetwork/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qtnetwork4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtNetwork4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtNetwork4.pm) +-install(FILES QtNetwork4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QtNetwork4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qtnetwork/src/CMakeLists.txt b/qtnetwork/src/CMakeLists.txt +index caf8327..0994d57 100644 +--- a/qtnetwork/src/CMakeLists.txt ++++ b/qtnetwork/src/CMakeLists.txt +@@ -39,4 +39,4 @@ target_link_libraries(perl_qtnetwork4 + set_target_properties(perl_qtnetwork4 PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qtnetwork4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qtnetwork4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qtnetwork4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qtopengl/lib/CMakeLists.txt b/qtopengl/lib/CMakeLists.txt +index f3b5640..d8dc9e4 100644 +--- a/qtopengl/lib/CMakeLists.txt ++++ b/qtopengl/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qtopengl4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtOpenGL4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtOpenGL4.pm) +-install(FILES QtOpenGL4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QtOpenGL4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qtopengl/src/CMakeLists.txt b/qtopengl/src/CMakeLists.txt +index 20493a9..777af89 100644 +--- a/qtopengl/src/CMakeLists.txt ++++ b/qtopengl/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_qtopengl4 + set_target_properties(perl_qtopengl4 PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qtopengl4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qtopengl4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qtopengl4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qtscript/lib/CMakeLists.txt b/qtscript/lib/CMakeLists.txt +index d21dbe5..320ff93 100644 +--- a/qtscript/lib/CMakeLists.txt ++++ b/qtscript/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qtscript4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtScript4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtScript4.pm) +-install(FILES QtScript4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QtScript4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qtscript/src/CMakeLists.txt b/qtscript/src/CMakeLists.txt +index dd395be..6ff47d8 100644 +--- a/qtscript/src/CMakeLists.txt ++++ b/qtscript/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_qtscript4 + set_target_properties(perl_qtscript4 PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qtscript4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qtscript4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qtscript4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qtsql/lib/CMakeLists.txt b/qtsql/lib/CMakeLists.txt +index 59336d3..d9dd4d5 100644 +--- a/qtsql/lib/CMakeLists.txt ++++ b/qtsql/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qtsql4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSql4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSql4.pm) +-install(FILES QtSql4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QtSql4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qtsql/src/CMakeLists.txt b/qtsql/src/CMakeLists.txt +index 3ec2028..59096ba 100644 +--- a/qtsql/src/CMakeLists.txt ++++ b/qtsql/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsql4 + set_target_properties(perl_qtsql4 PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qtsql4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qtsql4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qtsql4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qtsvg/lib/CMakeLists.txt b/qtsvg/lib/CMakeLists.txt +index 33f6deb..bf1dc1f 100644 +--- a/qtsvg/lib/CMakeLists.txt ++++ b/qtsvg/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qtsvg4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtSvg4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtSvg4.pm) +-install(FILES QtSvg4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QtSvg4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qtsvg/src/CMakeLists.txt b/qtsvg/src/CMakeLists.txt +index 11eccd2..449bf0f 100644 +--- a/qtsvg/src/CMakeLists.txt ++++ b/qtsvg/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_qtsvg4 + set_target_properties(perl_qtsvg4 PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qtsvg4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qtsvg4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qtsvg4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qttest/lib/CMakeLists.txt b/qttest/lib/CMakeLists.txt +index 3bfa78c..5a8d8da 100644 +--- a/qttest/lib/CMakeLists.txt ++++ b/qttest/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qttest4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtTest4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtTest4.pm) +-install(FILES QtTest4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QtTest4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qttest/src/CMakeLists.txt b/qttest/src/CMakeLists.txt +index 5492e55..d4662b1 100644 +--- a/qttest/src/CMakeLists.txt ++++ b/qttest/src/CMakeLists.txt +@@ -38,4 +38,4 @@ target_link_libraries(perl_qttest4 + set_target_properties(perl_qttest4 PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qttest4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qttest4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qttest4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qtuitools/lib/CMakeLists.txt b/qtuitools/lib/CMakeLists.txt +index 119e40e..3a5f472 100644 +--- a/qtuitools/lib/CMakeLists.txt ++++ b/qtuitools/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qtuitools4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtUiTools4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtUiTools4.pm) +-install(FILES QtUiTools4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QtUiTools4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qtuitools/src/CMakeLists.txt b/qtuitools/src/CMakeLists.txt +index a8ae4a2..ecc079f 100644 +--- a/qtuitools/src/CMakeLists.txt ++++ b/qtuitools/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_qtuitools4 + set_target_properties(perl_qtuitools4 PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qtuitools4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qtuitools4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qtuitools4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qtwebkit/lib/CMakeLists.txt b/qtwebkit/lib/CMakeLists.txt +index a02f7ee..3846227 100644 +--- a/qtwebkit/lib/CMakeLists.txt ++++ b/qtwebkit/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qtwebkit4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtWebKit4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtWebKit4.pm) +-install(FILES QtWebKit4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QtWebKit4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qtwebkit/src/CMakeLists.txt b/qtwebkit/src/CMakeLists.txt +index a6e00f8..dbebc44 100644 +--- a/qtwebkit/src/CMakeLists.txt ++++ b/qtwebkit/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_qtwebkit4 + set_target_properties(perl_qtwebkit4 PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qtwebkit4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qtwebkit4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qtwebkit4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qtxml/lib/CMakeLists.txt b/qtxml/lib/CMakeLists.txt +index 5505bc4..7db743c 100644 +--- a/qtxml/lib/CMakeLists.txt ++++ b/qtxml/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qtxml4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXml4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXml4.pm) +-install(FILES QtXml4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QtXml4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qtxml/src/CMakeLists.txt b/qtxml/src/CMakeLists.txt +index 018508c..a351609 100644 +--- a/qtxml/src/CMakeLists.txt ++++ b/qtxml/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxml4 + set_target_properties(perl_qtxml4 PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qtxml4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qtxml4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qtxml4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qtxmlpatterns/lib/CMakeLists.txt b/qtxmlpatterns/lib/CMakeLists.txt +index a35f3df..3d86103 100644 +--- a/qtxmlpatterns/lib/CMakeLists.txt ++++ b/qtxmlpatterns/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qtxmlpatterns4pm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/QtXmlPatterns4.pm ${CMAKE_BINARY_DIR}/blib/lib/QtXmlPatterns4.pm) +-install(FILES QtXmlPatterns4.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES QtXmlPatterns4.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qtxmlpatterns/src/CMakeLists.txt b/qtxmlpatterns/src/CMakeLists.txt +index 9970a98..563e922 100644 +--- a/qtxmlpatterns/src/CMakeLists.txt ++++ b/qtxmlpatterns/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_qtxmlpatterns4 + set_target_properties(perl_qtxmlpatterns4 PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qtxmlpatterns4 PROPERTIES PREFIX "") + +-install(TARGETS perl_qtxmlpatterns4 DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qtxmlpatterns4 DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) +diff --git a/qwt/lib/CMakeLists.txt b/qwt/lib/CMakeLists.txt +index 0013c4d..d67ffbf 100644 +--- a/qwt/lib/CMakeLists.txt ++++ b/qwt/lib/CMakeLists.txt +@@ -1,2 +1,2 @@ + add_custom_target(qwtpm ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Qwt.pm ${CMAKE_BINARY_DIR}/blib/lib/Qwt.pm) +-install(FILES Qwt.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/) ++install(FILES Qwt.pm DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/) +diff --git a/qwt/src/CMakeLists.txt b/qwt/src/CMakeLists.txt +index 869d818..b644e80 100644 +--- a/qwt/src/CMakeLists.txt ++++ b/qwt/src/CMakeLists.txt +@@ -37,4 +37,4 @@ target_link_libraries(perl_qwt + set_target_properties(perl_qwt PROPERTIES OUTPUT_NAME ${libraryName}) + set_target_properties(perl_qwt PROPERTIES PREFIX "") + +-install(TARGETS perl_qwt DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/${libraryName}/) ++install(TARGETS perl_qwt DESTINATION ${PERL_SITE_ARCH_INSTALL_DIR}/auto/${libraryName}/) diff --git a/pkgs/desktops/kde-4.10/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.10/kdebindings/perlqt.nix new file mode 100644 index 00000000000..73d89155e28 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdebindings/perlqt.nix @@ -0,0 +1,17 @@ +{ kde, cmake, smokeqt, perl }: + +kde { +#todo: qscintilla2, qwt5 + buildInputs = [ smokeqt perl ]; + nativeBuildInputs = [ cmake ]; + + patches = + # The order is important + [ ./perlqt-include-smokeqt.patch ./perlqt-rewrite-FindPerlMore.patch + ./perlqt-use-site-arch-install-dir.patch + ]; + + meta = { + description = "Perl bindings for Qt library"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdebindings/pykde4-hardcode-lib-python.patch b/pkgs/desktops/kde-4.10/kdebindings/pykde4-hardcode-lib-python.patch new file mode 100644 index 00000000000..e7a7cb4c661 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdebindings/pykde4-hardcode-lib-python.patch @@ -0,0 +1,18 @@ +diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt +index 41fa0fe..642d867 100644 +--- a/kpythonpluginfactory/CMakeLists.txt ++++ b/kpythonpluginfactory/CMakeLists.txt +@@ -3,7 +3,12 @@ + set(kpythonpluginfactory_SRCS + kpythonpluginfactory.cpp) + +-GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME) ++option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF) ++if(HARDCODE_LIB_PYTHON_PATH) ++ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH) ++else(HARDCODE_LIB_PYTHON_PATH) ++ get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME) ++endif(HARDCODE_LIB_PYTHON_PATH) + ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\") + ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000) + diff --git a/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix new file mode 100644 index 00000000000..baa5e807236 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdebindings/pykde4.nix @@ -0,0 +1,32 @@ +{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies, + boost, lndir }: + +let pydir = "lib/python${python.majorVersion}"; in + +kde { +#todo: doesn't build + buildInputs = [ python kdepimlibs +# shared_desktop_ontologies boost +]; + + propagatedBuildInputs = [ pyqt4 sip ]; + +# patches = [ ./pykde4-hardcode-lib-python.patch ]; + + cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON "; + + preConfigure = + '' + # Symlink PyQt into PyKDE. This is necessary because PyQt looks + # in its PyQt4/uic/widget-plugins directory for plugins, and KDE + # needs to install a plugin. + mkdir -pv $out/${pydir} + ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir} + cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" ) + ''; + + meta = { + description = "Python bindings for KDE"; + kde.name = "pykde4"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdebindings/qtruby-include-smokeqt.patch b/pkgs/desktops/kde-4.10/kdebindings/qtruby-include-smokeqt.patch new file mode 100644 index 00000000000..7d20a3c1c0b --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdebindings/qtruby-include-smokeqt.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 33078b4..1a6ad2e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,7 +5,7 @@ set(COMPILE_RUBY FALSE CACHE INTERNAL "") + find_package(Ruby REQUIRED) + find_package(Qt4 REQUIRED) + find_package(Smoke COMPONENTS QtCore QtGui QtXml QtOpenGl QtSql QtNetwork QtDbus QtSvg Phonon QSci QtDeclarative QtScript QtWebkit QtUiTools QtTest Qwt) +-include_directories(${SMOKE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES}) ++include_directories(${SMOKE_INCLUDE_DIR} ${SMOKE_QTCORE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${QT_INCLUDES}) + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SMOKE_CMAKE_MODULE_DIR}) + include(MacroOptionalFindPackage) diff --git a/pkgs/desktops/kde-4.10/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.10/kdebindings/qtruby-install-prefix.patch new file mode 100644 index 00000000000..bd95a0d8bd3 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdebindings/qtruby-install-prefix.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 33078b4..30aec0e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY) + return() + endif (NOT COMPILE_RUBY) + +-SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" ) +-SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" ) ++string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR}) ++string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR}) + + # compute an overall version number which can be compared at once + MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}") diff --git a/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix new file mode 100644 index 00000000000..29faf2af15c --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdebindings/qtruby.nix @@ -0,0 +1,17 @@ +{ kde, cmake, smokeqt, ruby }: + +kde { +#todo: scintilla2, qwt5 + buildInputs = [ smokeqt ruby ]; + nativeBuildInputs = [ cmake ]; + + # The second patch is not ready for upstream submmission. I should add an + # option() instead. + patches = [ ./qtruby-include-smokeqt.patch ./qtruby-install-prefix.patch ]; + + cmakeFlags="-DRUBY_ROOT_DIR=${ruby}"; + + meta = { + description = "Ruby bindings for Qt library"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch new file mode 100644 index 00000000000..03df484b63e --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 79945c4..a244d0f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,10 +32,6 @@ set(generator_SRC + type.cpp + ) + +-# force RPATH so that the binary is usable from within the build tree +-set (CMAKE_SKIP_BUILD_RPATH FALSE) +-set (CMAKE_SKIP_RPATH FALSE) +- + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY ) + + add_executable(smokegen ${generator_SRC}) +diff --git a/cmake/SmokeConfig.cmake.in b/cmake/SmokeConfig.cmake.in +index 947315c..de8d66c 100644 +--- a/cmake/SmokeConfig.cmake.in ++++ b/cmake/SmokeConfig.cmake.in +@@ -44,21 +44,19 @@ macro (find_smoke_component name) + set (SMOKE_${uppercase}_FOUND FALSE CACHE INTERNAL "") + + find_path(SMOKE_${uppercase}_INCLUDE_DIR +- ${lowercase}_smoke.h +- PATH ${SMOKE_INCLUDE_DIR} +- NO_DEFAULT_PATH ++ ${lowercase}_smoke.h ++ HINTS ${SMOKE_INCLUDE_DIR} ++ PATH_SUFFIXES smoke + ) + if(WIN32) + # DLLs are in the bin directory. + find_library(SMOKE_${uppercase}_LIBRARY + smoke${lowercase} +- PATHS "@CMAKE_INSTALL_PREFIX@/bin" +- NO_DEFAULT_PATH) ++ PATHS "@CMAKE_INSTALL_PREFIX@/bin") + else(WIN32) + find_library(SMOKE_${uppercase}_LIBRARY + smoke${lowercase} +- PATHS "@SMOKE_LIBRARY_PREFIX@" +- NO_DEFAULT_PATH) ++ PATHS "@SMOKE_LIBRARY_PREFIX@") + endif(WIN32) + + if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY) diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix new file mode 100644 index 00000000000..8b5da2a641d --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen.nix @@ -0,0 +1,13 @@ +{ kde, qt4, cmake }: + +kde { + buildInputs = [ qt4 ]; + nativeBuildInputs = [ cmake ]; + + patches = [ ./smokegen-nix.patch ]; + + meta = { + description = "C++ parser used to generate language bindings for Qt/KDE"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix new file mode 100644 index 00000000000..e7e5101c972 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdebindings/smokekde.nix @@ -0,0 +1,16 @@ +{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular +, shared_desktop_ontologies, attica, nepomuk_core }: + +kde { + # attica, akonadi and kdepimlibs are disabled due to smokegen crash + # okular is disabled because the code generated is broken + buildInputs = [ + smokeqt kdelibs shared_desktop_ontologies + ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = "-DQTDEFINES_FILE=${smokeqt}/share/smokegen/qtdefines"; + meta = { + description = "SMOKE bindings for kdelibs"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.10/kdebindings/smokeqt.nix new file mode 100644 index 00000000000..e95b686aee2 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdebindings/smokeqt.nix @@ -0,0 +1,13 @@ +{ kde, qt4, cmake, phonon, qimageblitz, smokegen }: + +kde { +#todo: Qwt5, QScintilla2 + propagatedBuildInputs = [ qt4 phonon qimageblitz ]; + nativeBuildInputs = [ cmake ]; + propagatedNativeBuildInputs = [ smokegen ]; + + meta = { + description = "C++ parser used to generate language bindings for Qt/KDE"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/analitza.nix b/pkgs/desktops/kde-4.10/kdeedu/analitza.nix new file mode 100644 index 00000000000..74c3a1ebb20 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/analitza.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs, readline }: +kde { + buildInputs = [ kdelibs readline ]; + + meta = { + description = "Library part of KAlgebra"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/blinken.nix b/pkgs/desktops/kde-4.10/kdeedu/blinken.nix new file mode 100644 index 00000000000..cdf9728833c --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/blinken.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs }: +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Memory Enhancement Game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/cantor.nix b/pkgs/desktops/kde-4.10/kdeedu/cantor.nix new file mode 100644 index 00000000000..d2a1b095b82 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/cantor.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, libspectre, analitza, rLang, pkgconfig, gfortran, libqalculate }: +kde { + + buildInputs = [ kdelibs libspectre analitza rLang gfortran libqalculate]; + + nativeBuildInputs = [ pkgconfig ]; + + meta = { + description = "KDE Frontend to Mathematical Software"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.10/kdeedu/kalgebra.nix new file mode 100644 index 00000000000..3675c3a225f --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/kalgebra.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs, libkdeedu, analitza }: +kde { + buildInputs = [ kdelibs libkdeedu analitza ]; + + meta = { + description = "2D and 3D Graph Calculator"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.10/kdeedu/kalzium.nix new file mode 100644 index 00000000000..78fa8119583 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/kalzium.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro, pkgconfig }: +kde { +#todo:chemical mime data + buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ]; + + nativeBuildInputs = [ pkgconfig ]; + + meta = { + description = "Periodic Table of Elements"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.10/kdeedu/kanagram.nix new file mode 100644 index 00000000000..8759c96d78c --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/kanagram.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs, libkdeedu }: +kde { + buildInputs = [ kdelibs libkdeedu ]; + + meta = { + description = "Letter Order Game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.10/kdeedu/kbruch.nix new file mode 100644 index 00000000000..dc50f1e85a3 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/kbruch.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs }: +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Practice Fractions"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.10/kdeedu/kgeography.nix new file mode 100644 index 00000000000..bd8d27c8d6e --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/kgeography.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs }: +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Geography Trainer"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/khangman.nix b/pkgs/desktops/kde-4.10/kdeedu/khangman.nix new file mode 100644 index 00000000000..997b50e906a --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/khangman.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs, libkdeedu }: +kde { + buildInputs = [ kdelibs libkdeedu ]; + + meta = { + description = "KDE hangman game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/kig.nix b/pkgs/desktops/kde-4.10/kdeedu/kig.nix new file mode 100644 index 00000000000..bd5ef67529c --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/kig.nix @@ -0,0 +1,12 @@ +{ kde, kdelibs, boost, python}: +kde { + buildInputs = [ kdelibs boost python ]; + + cmakeFlags = '' + -DBOOST_PYTHON_INCLUDES:PATH=${boost}/include;${python}/include/${python.libPrefix} + -DBOOST_PYTHON_LIBS=boost_python;${python.libPrefix} -DKIG_ENABLE_PYTHON_SCRIPTING=1 + ''; + meta = { + description = "KDE Interactive Geometry"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/kiten.nix b/pkgs/desktops/kde-4.10/kdeedu/kiten.nix new file mode 100644 index 00000000000..939b7a9f77a --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/kiten.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Japanese Reference/Study Tool"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/klettres.nix b/pkgs/desktops/kde-4.10/kdeedu/klettres.nix new file mode 100644 index 00000000000..7a0fa83078e --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/klettres.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A KDE alphabet tutorial"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.10/kdeedu/kmplot.nix new file mode 100644 index 00000000000..18458cf6f0b --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/kmplot.nix @@ -0,0 +1,12 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A KDE mathematical function plotter"; + kde = { + name = "kmplot"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/kstars.nix b/pkgs/desktops/kde-4.10/kdeedu/kstars.nix new file mode 100644 index 00000000000..0f63afe9e0d --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/kstars.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, eigen, xplanet, indilib }: + +kde { +#todo:wcslib, doesn't build + buildInputs = [ kdelibs eigen xplanet indilib ]; + + meta = { + description = "A KDE graphical desktop planetarium"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.10/kdeedu/ktouch.nix new file mode 100644 index 00000000000..9e606adde33 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/ktouch.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, libxkbfile }: + +kde { + buildInputs = [ kdelibs libxkbfile ]; + + meta = { + description = "Touch Typing Tutor"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.10/kdeedu/kturtle.nix new file mode 100644 index 00000000000..1e1922b1410 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/kturtle.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Educational Programming Environment"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.10/kdeedu/kwordquiz.nix new file mode 100644 index 00000000000..1b33ba2e469 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/kwordquiz.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, libkdeedu }: + +kde { + buildInputs = [ kdelibs libkdeedu ]; + + meta = { + description = "Flash Card Trainer"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.10/kdeedu/libkdeedu.nix new file mode 100644 index 00000000000..def6c85fefe --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/libkdeedu.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs }: +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Libraries used by KDE Education applications"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/marble.nix b/pkgs/desktops/kde-4.10/kdeedu/marble.nix new file mode 100644 index 00000000000..4f73472f631 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/marble.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, gpsd }: + +kde { +#todo: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate + buildInputs = [ kdelibs gpsd ]; + + meta = { + description = "Marble Virtual Globe"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/pairs.nix b/pkgs/desktops/kde-4.10/kdeedu/pairs.nix new file mode 100644 index 00000000000..36c4aba9604 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/pairs.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A memory and pairs game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/parley.nix b/pkgs/desktops/kde-4.10/kdeedu/parley.nix new file mode 100644 index 00000000000..f9f86dde150 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/parley.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, libkdeedu, attica }: + +kde { + buildInputs = [ kdelibs libkdeedu attica ]; + + meta = { + description = "Vocabulary Trainer"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/rocs.nix b/pkgs/desktops/kde-4.10/kdeedu/rocs.nix new file mode 100644 index 00000000000..91976b84001 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/rocs.nix @@ -0,0 +1,14 @@ +{ kde, kdelibs, boost }: + +kde { + buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) ]; + + NIX_CFLAGS_COMPILE = "-fexceptions"; + + meta = { + description = "A KDE graph theory viewer"; + kde = { + name = "rocs"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeedu/step.nix b/pkgs/desktops/kde-4.10/kdeedu/step.nix new file mode 100644 index 00000000000..fac9974baf1 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeedu/step.nix @@ -0,0 +1,12 @@ +{ kde, kdelibs, gsl, libqalculate, eigen }: + +kde { + buildInputs = [ kdelibs gsl libqalculate eigen ]; + + meta = { + description = "A KDE interactive physical simulator"; + kde = { + name = "step"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/bomber.nix b/pkgs/desktops/kde-4.10/kdegames/bomber.nix new file mode 100644 index 00000000000..026227910f2 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/bomber.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a single player arcade game. The player is invading various cities in a plane that is decreasing in height"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/bovo.nix b/pkgs/desktops/kde-4.10/kdegames/bovo.nix new file mode 100644 index 00000000000..b0e7d99c589 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/bovo.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board"; + }; + +} diff --git a/pkgs/desktops/kde-4.10/kdegames/granatier.nix b/pkgs/desktops/kde-4.10/kdegames/granatier.nix new file mode 100644 index 00000000000..9f1ab005309 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/granatier.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kajongg.nix b/pkgs/desktops/kde-4.10/kdegames/kajongg.nix new file mode 100644 index 00000000000..609850c3abf --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kajongg.nix @@ -0,0 +1,13 @@ +{ kde, kdelibs, libkdegames, pythonPackages, sqlite, pykde4 }: +kde rec { +#todo: doesn't build + buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath; + + pythonPath = [ pythonPackages.twisted pykde4 ]; + + postInstall = "wrapPythonPrograms"; + + meta = { + description = "an ancient Chinese board game for 4 players"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kapman.nix b/pkgs/desktops/kde-4.10/kdegames/kapman.nix new file mode 100644 index 00000000000..f10e099da3c --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kapman.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a clone of the well known game Pac-Man"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/katomic.nix b/pkgs/desktops/kde-4.10/kdegames/katomic.nix new file mode 100644 index 00000000000..a9936c04f0e --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/katomic.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a fun and educational puzzle game built around molecular geometry"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.10/kdegames/kblackbox.nix new file mode 100644 index 00000000000..27eeff2f65b --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kblackbox.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kblocks.nix b/pkgs/desktops/kde-4.10/kdegames/kblocks.nix new file mode 100644 index 00000000000..98cf068de09 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kblocks.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a classic single player falling blocks puzzle game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kbounce.nix b/pkgs/desktops/kde-4.10/kdegames/kbounce.nix new file mode 100644 index 00000000000..77fa0db6352 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kbounce.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a single player arcade game with the elements of puzzle"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.10/kdegames/kbreakout.nix new file mode 100644 index 00000000000..3a484d919bb --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kbreakout.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.10/kdegames/kdiamond.nix new file mode 100644 index 00000000000..06dfcee5ac3 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kdiamond.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a single player puzzle game. The object of the game is to build lines of three similar diamonds"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.10/kdegames/kfourinline.nix new file mode 100644 index 00000000000..11b8838e708 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kfourinline.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a board game for two players based on the Connect-Four game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.10/kdegames/kgoldrunner.nix new file mode 100644 index 00000000000..6217c47a806 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kgoldrunner.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "an action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kigo.nix b/pkgs/desktops/kde-4.10/kdegames/kigo.nix new file mode 100644 index 00000000000..32eee67cc1e --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kigo.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "an open-source implementation of the popular Go game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/killbots.nix b/pkgs/desktops/kde-4.10/kdegames/killbots.nix new file mode 100644 index 00000000000..d9c1472495e --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/killbots.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a simple game of evading killer robots"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kiriki.nix b/pkgs/desktops/kde-4.10/kdegames/kiriki.nix new file mode 100644 index 00000000000..72f7ab67501 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kiriki.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "an addictive and fun dice game, designed to be played by as many as six players"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.10/kdegames/kjumpingcube.nix new file mode 100644 index 00000000000..a6d22cff51c --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kjumpingcube.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a simple dice driven tactical game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/klickety.nix b/pkgs/desktops/kde-4.10/kdegames/klickety.nix new file mode 100644 index 00000000000..b592bc40641 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/klickety.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a puzzle game where the player removes groups of colored marbles to clear the board"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/klines.nix b/pkgs/desktops/kde-4.10/kdegames/klines.nix new file mode 100644 index 00000000000..90952fe91c0 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/klines.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.10/kdegames/kmahjongg.nix new file mode 100644 index 00000000000..946b531ff12 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kmahjongg.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames, libkmahjongg }: +kde { + buildInputs = [ kdelibs libkdegames libkmahjongg ]; + meta = { + description = "the tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kmines.nix b/pkgs/desktops/kde-4.10/kdegames/kmines.nix new file mode 100644 index 00000000000..538454e9598 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kmines.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a classic Minesweeper game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.10/kdegames/knavalbattle.nix new file mode 100644 index 00000000000..42ffd2fcb4d --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/knavalbattle.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a Battle Ship game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.10/kdegames/knetwalk.nix new file mode 100644 index 00000000000..a16e578ce84 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/knetwalk.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a small game where you have to build up a computer network by rotating the wires to connect the terminals to the server"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kolf.nix b/pkgs/desktops/kde-4.10/kdegames/kolf.nix new file mode 100644 index 00000000000..78815ee5799 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kolf.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a miniature golf game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kollision.nix b/pkgs/desktops/kde-4.10/kdegames/kollision.nix new file mode 100644 index 00000000000..3147c7305ea --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kollision.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a simple ball dodging game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/konquest.nix b/pkgs/desktops/kde-4.10/kdegames/konquest.nix new file mode 100644 index 00000000000..53ddd64928c --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/konquest.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "the KDE version of Gnu-Lactic Konquest"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kpat.nix b/pkgs/desktops/kde-4.10/kdegames/kpat.nix new file mode 100644 index 00000000000..f8d9bad36dc --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kpat.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a relaxing card sorting game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kreversi.nix b/pkgs/desktops/kde-4.10/kdegames/kreversi.nix new file mode 100644 index 00000000000..2aed981428e --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kreversi.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kshisen.nix b/pkgs/desktops/kde-4.10/kdegames/kshisen.nix new file mode 100644 index 00000000000..9c888034038 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kshisen.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames, libkmahjongg }: +kde { + buildInputs = [ kdelibs libkdegames libkmahjongg ]; + meta = { + description = "a solitaire-like game played using the standard set of Mahjong tiles"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/ksirk.nix b/pkgs/desktops/kde-4.10/kdegames/ksirk.nix new file mode 100644 index 00000000000..767eb67971a --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/ksirk.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames, qca2 }: +kde { + buildInputs = [ kdelibs libkdegames qca2 ]; + meta = { + description = "a computerized version of the well known strategic board game Risk"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.10/kdegames/ksnakeduel.nix new file mode 100644 index 00000000000..ccf1fb551e9 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/ksnakeduel.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a simple Tron-Clone"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.10/kdegames/kspaceduel.nix new file mode 100644 index 00000000000..5285f7916ca --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kspaceduel.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/ksquares.nix b/pkgs/desktops/kde-4.10/kdegames/ksquares.nix new file mode 100644 index 00000000000..a17be2da632 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/ksquares.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a game modeled after the well known pen and paper based game of Dots and Boxes"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.10/kdegames/ksudoku.nix new file mode 100644 index 00000000000..ea4e13a5e4f --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/ksudoku.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a logic-based symbol placement puzzle"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.10/kdegames/ktuberling.nix new file mode 100644 index 00000000000..1a6ba9d653c --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/ktuberling.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a simple constructor game suitable for children and adults alike"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/kubrick.nix b/pkgs/desktops/kde-4.10/kdegames/kubrick.nix new file mode 100644 index 00000000000..9bdc6879db4 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/kubrick.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a game based on the Rubik's Cube™ puzzle"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/libkdegames.nix b/pkgs/desktops/kde-4.10/kdegames/libkdegames.nix new file mode 100644 index 00000000000..3819dcdc9ae --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/libkdegames.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, openal, libsndfile }: +kde { + buildInputs = [ kdelibs openal libsndfile ]; + meta = { + description = "KDE games library"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.10/kdegames/libkmahjongg.nix new file mode 100644 index 00000000000..383b347dc33 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/libkmahjongg.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a library for KMahjongg game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/lskat.nix b/pkgs/desktops/kde-4.10/kdegames/lskat.nix new file mode 100644 index 00000000000..2a5050cd667 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/lskat.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/palapeli.nix b/pkgs/desktops/kde-4.10/kdegames/palapeli.nix new file mode 100644 index 00000000000..555ffe43c45 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/palapeli.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs, libkdegames }: +kde { +#todo:package qvoronoi + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a single-player jigsaw puzzle game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegames/picmi.nix b/pkgs/desktops/kde-4.10/kdegames/picmi.nix new file mode 100644 index 00000000000..165d7422f95 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegames/picmi.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkdegames }: +kde { + buildInputs = [ kdelibs libkdegames ]; + meta = { + description = "a single player logic-based puzzle game"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.10/kdegraphics/gwenview.nix new file mode 100644 index 00000000000..00910ab9d46 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/gwenview.nix @@ -0,0 +1,15 @@ +{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi +, libjpeg, libtiff, pkgconfig, kactivities, lcms2 }: + +kde { + + buildInputs = + [ kdelibs exiv2 shared_desktop_ontologies kactivities kde_baseapps libkipi libjpeg lcms2 ]; + + nativeBuildInputs = [ pkgconfig ]; + + meta = { + description = "Gwenview, the KDE image viewer"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.10/kdegraphics/kamera.nix new file mode 100644 index 00000000000..70904b17c23 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/kamera.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, libgphoto2 }: + +kde { + buildInputs = [ kdelibs libgphoto2 ]; + + meta = { + description = "KDE camera interface library"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.10/kdegraphics/kcolorchooser.nix new file mode 100644 index 00000000000..58528cb186b --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/kcolorchooser.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A small utility to select a color"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-mobipocket.nix new file mode 100644 index 00000000000..2c2ba3796a2 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-mobipocket.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, okular }: + +kde { + buildInputs = [ kdelibs okular ]; + + meta = { + description = "A collection of plugins to handle mobipocket files"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-strigi-analyzer.nix new file mode 100644 index 00000000000..35af39aa611 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-strigi-analyzer.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, libtiff }: + +kde { + buildInputs = [ kdelibs libtiff ]; + + meta = { + description = "Strigi analyzers for various graphics file formats"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-thumbnailers.nix new file mode 100644 index 00000000000..55bf8309b2a --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/kdegraphics-thumbnailers.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, libkexiv2, libkdcraw }: + +kde { + buildInputs = [ kdelibs libkexiv2 libkdcraw ]; + + meta = { + description = "Thumbnailers for various graphics file formats"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.10/kdegraphics/kgamma.nix new file mode 100644 index 00000000000..28d9252187e --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/kgamma.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, libXxf86vm }: + +kde { + buildInputs = [ kdelibs libXxf86vm ]; + + meta = { + description = "KDE monitor calibration tool"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.10/kdegraphics/kolourpaint.nix new file mode 100644 index 00000000000..5276ec09f46 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/kolourpaint.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, qimageblitz }: + +kde { + buildInputs = [ kdelibs qimageblitz ]; + + meta = { + description = "KDE paint program"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.10/kdegraphics/kruler.nix new file mode 100644 index 00000000000..c5c2c6e05d7 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/kruler.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE screen ruler"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.10/kdegraphics/ksaneplugin.nix new file mode 100644 index 00000000000..1381ed7dd26 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/ksaneplugin.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, libksane }: + +kde { + buildInputs = [ kdelibs libksane ]; + + meta = { + description = "A KScan plugin that implements the scanning through libksane"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.10/kdegraphics/ksnapshot.nix new file mode 100644 index 00000000000..f01a609e20d --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/ksnapshot.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, libkipi }: + +kde { + buildInputs = [ kdelibs libkipi ]; + + meta = { + description = "KDE screenshot utility"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.10/kdegraphics/libkdcraw.nix new file mode 100644 index 00000000000..e8790205cae --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/libkdcraw.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, libjpeg, lcms1, jasper }: + +kde { + buildInputs = [ kdelibs libjpeg lcms1 jasper ]; + + meta = { + description = "Library for decoding RAW images"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.10/kdegraphics/libkexiv2.nix new file mode 100644 index 00000000000..096b0a6e957 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/libkexiv2.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, exiv2 }: + +kde { + buildInputs = [ kdelibs exiv2 ]; + + meta = { + description = "Exiv2 support library"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.10/kdegraphics/libkipi.nix new file mode 100644 index 00000000000..6b16265e7a3 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/libkipi.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Interface library to kipi-plugins"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.10/kdegraphics/libksane.nix new file mode 100644 index 00000000000..b539eab3899 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/libksane.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, saneBackends }: + +kde { + buildInputs = [ kdelibs saneBackends ]; + + meta = { + description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/okular.nix b/pkgs/desktops/kde-4.10/kdegraphics/okular.nix new file mode 100644 index 00000000000..efc1e8f0742 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/okular.nix @@ -0,0 +1,17 @@ +{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2 +, qimageblitz, libtiff, kactivities, pkgconfig }: + +kde { + + #todo: package activeapp + + buildInputs = + [ chmlib djvulibre ebook_tools kdelibs libspectre popplerQt4 qca2 qimageblitz libtiff kactivities ]; + + nativeBuildInputs = [ pkgconfig ]; + + meta = { + description = "Okular, the KDE document viewer"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.10/kdegraphics/svgpart.nix new file mode 100644 index 00000000000..a344cc4b4b4 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdegraphics/svgpart.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "SVG KPart"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix new file mode 100644 index 00000000000..16e082ac07b --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix @@ -0,0 +1,64 @@ +{ kde, gcc, cmake, perl +, qt4, bzip2, pcre, fam, libxml2, libxslt, shared_mime_info, giflib, jasper +, openexr, avahi, kerberos, attr, shared_desktop_ontologies, libXScrnSaver +, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee +, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 +, getopt, udev, herqq, phonon, libjpeg, xz +, pkgconfig +}: + +kde { + buildInputs = + [ pkgconfig +# attr + attica #todo: update to 4.1 + avahi + bzip2 + enchant + fam +# getopt + giflib + grantlee # todo: update to 0.3 + herqq + jasper + libdbusmenu_qt #todo: update to 0.9.2 + libXScrnSaver + libxslt +# pcre + polkit_qt_1 qca2 + shared_desktop_ontologies xz udev +# libxml2 + libjpeg + kerberos + +#openexr # todo: update openexr to 1.7.1. make it compile maybe need ilmbase although it's supposedly propagated + ]; + + propagatedBuildInputs = [ qt4 soprano + strigi # todo: update to 0.7.8 + phonon ]; + + propagatedNativeBuildInputs = [ automoc4 cmake perl + shared_mime_info #todo: update to 1.1 + ]; + + # TODO: make sonnet plugins (dictionaries) really work. + # There are a few hardcoded paths. + # Let kdelibs find openexr + # Split plugins from libs? + + patches = [ ../files/polkit-install.patch ]; + + # cmake fails to find acl.h because of C++-style comment + # TODO: OpenEXR + cmakeFlags = [ + "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" + "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" + "-DHUPNP_ENABLED=ON" + ]; + + meta = { + description = "KDE libraries"; + license = "LGPL"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.10/kdelibs/nepomuk-core.nix new file mode 100644 index 00000000000..cd6f3a179c2 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdelibs/nepomuk-core.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4 }: + +kde { + + buildInputs = [ kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg popplerQt4 ]; + + meta = { + description = "NEPOMUK core"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.10/kdelibs/nepomuk-widgets.nix new file mode 100644 index 00000000000..0d29a4f97de --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdelibs/nepomuk-widgets.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, nepomuk_core }: + +kde { + + buildInputs = [ kdelibs nepomuk_core ]; + + meta = { + description = "NEPOMUK Widgets"; + license = "GPLv2"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.10/kdemultimedia/audiocd-kio.nix new file mode 100644 index 00000000000..4c56e7529dd --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdemultimedia/audiocd-kio.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libkcompactdisc, cdparanoia, libkcddb, libvorbis, flac, lame }: +kde { + buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ]; + meta = { + description = "transparent audio CD access for applications using the KDE Platform"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.10/kdemultimedia/dragon.nix new file mode 100644 index 00000000000..006300742ec --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdemultimedia/dragon.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs }: +kde { + buildInputs = [ kdelibs ]; + meta = { + description = "a multimedia player with the focus on simplicity"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.10/kdemultimedia/ffmpegthumbs.nix new file mode 100644 index 00000000000..45f6c9abcb6 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdemultimedia/ffmpegthumbs.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, ffmpeg }: +kde { + buildInputs = [ kdelibs ffmpeg ]; + meta = { + description = "a video thumbnail generator for KDE file managers like Dolphin and Konqueror"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.10/kdemultimedia/juk.nix new file mode 100644 index 00000000000..7a1aab85ed7 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdemultimedia/juk.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, taglib }: +kde { + buildInputs = [ kdelibs taglib ]; + meta = { + description = "an audio jukebox application"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.10/kdemultimedia/kmix.nix new file mode 100644 index 00000000000..1dd8108166f --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdemultimedia/kmix.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libcanberra, pulseaudio }: +kde { + buildInputs = [ kdelibs libcanberra pulseaudio ]; + meta = { + description = "sound mixer, an application to allow you to change the volume of your sound card"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/kscd.nix b/pkgs/desktops/kde-4.10/kdemultimedia/kscd.nix new file mode 100644 index 00000000000..e99ae53935b --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdemultimedia/kscd.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libmusicbrainz }: +kde { + buildInputs = [ kdelibs libmusicbrainz ]; + meta = { + description = "KDE CD player"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.10/kdemultimedia/libkcddb.nix new file mode 100644 index 00000000000..720b01d1861 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdemultimedia/libkcddb.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs }: +kde { +#todo: libmusicbrainz5 + buildInputs = [ kdelibs ]; + meta = { + description = "a library used to retrieve audio CD meta data from the internet"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/libkcompactdisc.nix b/pkgs/desktops/kde-4.10/kdemultimedia/libkcompactdisc.nix new file mode 100644 index 00000000000..6ed08af89f3 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdemultimedia/libkcompactdisc.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs }: +kde { + buildInputs = [ kdelibs ]; + meta = { + description = "KDE library for playing & ripping CDs"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.10/kdemultimedia/mplayerthumbs.nix new file mode 100644 index 00000000000..c88ebcc2a5a --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdemultimedia/mplayerthumbs.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs }: +kde { + buildInputs = [ kdelibs ]; + meta = { + description = "a video thumbnail generator for KDE"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdenetwork/FindmsiLBC.cmake b/pkgs/desktops/kde-4.10/kdenetwork/FindmsiLBC.cmake new file mode 100644 index 00000000000..c40b0bed310 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/FindmsiLBC.cmake @@ -0,0 +1,19 @@ +# cmake macro to test msiLBC + +# Copyright (c) 2009-2010 Pali Rohár +# +# MSILBC_FOUND +# MSILBC_LIBRARY + +include ( FindPackageHandleStandardArgs ) + +if ( MSILBC_LIBRARY ) + set ( MSILBC_FOUND true ) + set ( msiLBC_FIND_QUIETLY true ) +else ( MSILBC_LIBRARY ) + find_library ( MSILBC_LIBRARY NAMES msilbc + PATH_SUFFIXES mediastreamer/plugins) +endif ( MSILBC_LIBRARY ) + +find_package_handle_standard_args ( msiLBC DEFAULT_MSG MSILBC_LIBRARY ) +mark_as_advanced ( MSILBC_LIBRARY ) diff --git a/pkgs/desktops/kde-4.10/kdenetwork/filesharing.nix b/pkgs/desktops/kde-4.10/kdenetwork/filesharing.nix new file mode 100644 index 00000000000..2f32f4d6b2c --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/filesharing.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + patches = [ ./kdenetwork.patch ]; +} diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch new file mode 100644 index 00000000000..ebadbfad9ba --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/kdenetwork.patch @@ -0,0 +1,24 @@ +diff -r -u kdenetwork-4.7.1.orig/CMakeLists.txt kdenetwork-4.7.1/CMakeLists.txt +--- kdenetwork-4.7.1.orig/CMakeLists.txt 2011-03-29 15:25:42.174521812 +0400 ++++ kdenetwork-4.7.1/CMakeLists.txt 2011-03-29 15:27:43.268140322 +0400 +@@ -28,7 +28,8 @@ + set(CMAKE_REQUIRED_INCLUDES ${KDEWIN_INCLUDES} ) + endif (WIN32) + +-find_package(KdepimLibs REQUIRED) ++macro_optional_find_package(KdepimLibs) ++macro_log_feature(KDEPIMLIBS_FOUND "KDEPimLibs" "KDE pim-related libraries" "http://pim.kde.org.org/" FALSE "" "Required for Kopete") + # find_package(X11VidMode) not used at this time + + # NX support is not ready for KDE 4.2; disabled (uwolfer) +@@ -79,7 +80,9 @@ + macro_optional_add_subdirectory(kfile-plugins) + macro_optional_add_subdirectory(kget) + +-macro_optional_add_subdirectory(kopete) ++if(KDEPIMLIBS_FOUND) ++ macro_optional_add_subdirectory(kopete) ++endif(KDEPIMLIBS_FOUND) + + if(Q_WS_X11) + macro_optional_add_subdirectory(krdc) diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix b/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix new file mode 100644 index 00000000000..2f32f4d6b2c --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/kdnssd.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + patches = [ ./kdenetwork.patch ]; +} diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kfile-plugins.nix b/pkgs/desktops/kde-4.10/kdenetwork/kfile-plugins.nix new file mode 100644 index 00000000000..f90fd356079 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/kfile-plugins.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, boost }: + +kde { + name = "strigi-analyzer-torrent"; + + buildInputs = [ kdelibs boost ]; + + preConfigure = "mv -v strigi-analyzer kfile-plugins"; + + patches = [ ./kdenetwork.patch ]; +} diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kget.nix b/pkgs/desktops/kde-4.10/kdenetwork/kget.nix new file mode 100644 index 00000000000..25028ef974e --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/kget.nix @@ -0,0 +1,17 @@ +{ kde, kdelibs, libktorrent, kde_workspace, kdepimlibs, sqlite +, shared_desktop_ontologies, kde_baseapps, gpgme, boost, libmms, qca2 }: + +kde { + buildInputs = + [ kdelibs libktorrent +#kde_workspace +shared_desktop_ontologies +#kdepimlibs +# kde_baseapps +gpgme boost libmms qca2 sqlite + ]; + + KDEDIRS = libktorrent; + + patches = [ ./kdenetwork.patch ]; +} diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix new file mode 100644 index 00000000000..1d401aca021 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/kopete.nix @@ -0,0 +1,28 @@ +{ kde, kdelibs, speex, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent, + jasper, libidn, mediastreamer, msilbc, pkgconfig, libxslt, giflib, + libgadu, boost, qca2, gpgme, sqlite, telepathy_qt, shared_desktop_ontologies, + libjpeg, nepomuk_core, libmms }: + +kde { +#todo: libmeanwhile, xmms + buildInputs = [ + kdelibs telepathy_qt shared_desktop_ontologies qca2 gpgme libgadu mediastreamer + kdepimlibs qimageblitz libktorrent libjpeg sqlite jasper giflib libmsn libotr + libxslt libidn speex nepomuk_core boost libmms msilbc +]; + + nativeBuildInputs = [ pkgconfig ]; + + KDEDIRS = libktorrent; + + patchPhase = + '' + cp -v ${./FindmsiLBC.cmake} kopete/cmake/modules/FindmsiLBC.cmake + ''; + + cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ]; + + meta = { + description = "A KDE multi-protocol IM client"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix new file mode 100644 index 00000000000..2f32f4d6b2c --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/kppp.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + patches = [ ./kdenetwork.patch ]; +} diff --git a/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix new file mode 100644 index 00000000000..2932fecb191 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/krdc.nix @@ -0,0 +1,8 @@ +{ kde, kdelibs, libvncserver, libjpeg }: + +kde { +#todo: doesn't build + buildInputs = [ kdelibs libvncserver libjpeg ]; + + patches = [ ./kdenetwork.patch ]; +} diff --git a/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix new file mode 100644 index 00000000000..80013f430d3 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdenetwork/krfb.nix @@ -0,0 +1,7 @@ +{ kde, kdelibs, libvncserver, libXdamage, libXtst }: + +kde { + buildInputs = [ kdelibs libvncserver libXdamage libXtst]; + + patches = [ ./kdenetwork.patch ]; +} diff --git a/pkgs/desktops/kde-4.10/kdepim-runtime.nix b/pkgs/desktops/kde-4.10/kdepim-runtime.nix new file mode 100644 index 00000000000..191ce1080b8 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdepim-runtime.nix @@ -0,0 +1,14 @@ +{ kde, fetchurl, cmake, kdelibs, libxslt, boost, kdepimlibs, akonadi +, shared_desktop_ontologies, nepomuk_core }: + +kde { + buildInputs = [ + kdepimlibs akonadi boost shared_desktop_ontologies + libxslt nepomuk_core + ]; +#todo: libkgapi, libkolab, libkolabxml + meta = { + description = "KDE PIM runtime"; + license = "GPL"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdepim.nix b/pkgs/desktops/kde-4.10/kdepim.nix new file mode 100644 index 00000000000..56d18eab185 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdepim.nix @@ -0,0 +1,22 @@ +{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime +, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison +, nepomuk_core, nepomuk_widgets, dblatex }: + +kde { +#todo: update grantlee to 0.3 + buildInputs = + [ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_core nepomuk_widgets + libxslt cyrus_sasl gpgme libassuan grantlee prison dblatex + ]; + + passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ]; + + meta = { + description = "KDE PIM tools"; + longDescription = '' + Contains various personal information management tools for KDE, such as an organizer. + ''; + license = "GPL"; + homepage = http://pim.kde.org; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdepimlibs.nix b/pkgs/desktops/kde-4.10/kdepimlibs.nix new file mode 100644 index 00000000000..27ec1de5a61 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdepimlibs.nix @@ -0,0 +1,17 @@ +{ kde, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info +, kdelibs, akonadi, libxslt, prison, nepomuk_core +, shared_desktop_ontologies, qjson }: + +kde { + buildInputs = + [ boost gpgme libical libxslt nepomuk_core qjson + openldap cyrus_sasl akonadi shared_desktop_ontologies + ]; + + propagatedBuildInputs = [ kdelibs ]; + + meta = { + description = "KDE PIM libraries"; + license = "LGPL"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeplasma-addons.nix b/pkgs/desktops/kde-4.10/kdeplasma-addons.nix new file mode 100644 index 00000000000..3b30a257ddf --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeplasma-addons.nix @@ -0,0 +1,22 @@ +{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig +, boost, eigen, kde_workspace, attica, python, qca2, qimageblitz +, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt +, qjson, qoauth, nepomuk_core }: +# TODO: qwt, scim, ibus + +kde { + + KDEDIRS=marble; + + buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth + eigen qca2 libXtst qimageblitz nepomuk_core + libqalculate shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt +]; + + nativeBuildInputs = [ pkgconfig ]; + + meta = { + description = "KDE Plasma Addons"; + license = "GPL"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.10/kdesdk/cervisia.nix new file mode 100644 index 00000000000..1dabe46cd42 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/cervisia.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A KDE CVS frontend"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix new file mode 100644 index 00000000000..9b3a474d3fc --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-bazaar.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, kde_baseapps }: + +kde { +#todo: doesn't build + # Needs kdebase for libkonq + buildInputs = [ kdelibs kde_baseapps ]; + + meta = { + description = "Svn plugin for dolphin"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix new file mode 100644 index 00000000000..d28a8d726cc --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-git.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, kde_baseapps }: + +kde { +#todo: doesn't build + # Needs kdebase for libkonq + buildInputs = [ kdelibs kde_baseapps ]; + + meta = { + description = "Git plugin for dolphin"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix new file mode 100644 index 00000000000..9b3a474d3fc --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-hg.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, kde_baseapps }: + +kde { +#todo: doesn't build + # Needs kdebase for libkonq + buildInputs = [ kdelibs kde_baseapps ]; + + meta = { + description = "Svn plugin for dolphin"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix new file mode 100644 index 00000000000..9b3a474d3fc --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/dolphin-plugins-svn.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, kde_baseapps }: + +kde { +#todo: doesn't build + # Needs kdebase for libkonq + buildInputs = [ kdelibs kde_baseapps ]; + + meta = { + description = "Svn plugin for dolphin"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/find-svn.patch b/pkgs/desktops/kde-4.10/kdesdk/find-svn.patch new file mode 100644 index 00000000000..f6f4df942dd --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/find-svn.patch @@ -0,0 +1,57 @@ +diff --git a/cmake/modules/FindSVN.cmake b/cmake/modules/FindSVN.cmake +index 59bcb96..2eac05d 100644 +--- a/cmake/modules/FindSVN.cmake ++++ b/cmake/modules/FindSVN.cmake +@@ -17,6 +17,9 @@ FIND_PROGRAM(SVNCONFIG_EXECUTABLE NAMES svn-config PATHS + FIND_PROGRAM(APRCONFIG_EXECUTABLE NAMES apr-1-config apr-config PATHS + /usr/local/apr/bin + ) ++find_program(APUCONFIG_EXECUTABLE NAMES apu-1-config apu-config PATHS ++ /usr/local/apr/bin ++) + + if(SVNCONFIG_EXECUTABLE) + +@@ -56,15 +59,8 @@ else(SVNCONFIG_EXECUTABLE) + set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) + else(APRCONFIG_EXECUTABLE) + FIND_PATH(_INCLUDES apr_pools.h +- ${SVN_INCLUDES}/apr-0/ +- ${SVN_INCLUDES}/apr-1/ +- ${SVN_INCLUDES}/apr-1.0/ +- /usr/include/apr-0/ +- /usr/include/apr-1/ +- /usr/include/apr-1.0/ +- /usr/local/include/apr-0/ +- /usr/local/include/apr-1/ +- /usr/local/include/apr-1.0/ ++ HINTS ${SVN_INCLUDES} ++ SUFFIXES apr-0 apr-1 apr-1.0 + ) + if(_INCLUDES) + set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) +@@ -72,6 +69,24 @@ else(SVNCONFIG_EXECUTABLE) + set(SVN_FOUND FALSE) # no apr == can't compile! + endif(_INCLUDES) + endif(APRCONFIG_EXECUTABLE) ++ ++ # Use apu-config if it exists ++ if(APUCONFIG_EXECUTABLE) ++ EXEC_PROGRAM(${APUCONFIG_EXECUTABLE} ARGS --includes RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _INCLUDES) ++ string(REPLACE "-I" "" _INCLUDES ${_INCLUDES}) ++ string(REPLACE " " ";" _INCLUDES ${_INCLUDES}) ++ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) ++ else(APUCONFIG_EXECUTABLE) ++ FIND_PATH(_INCLUDES apu.h ++ HINTS ${SVN_INCLUDES} ++ SUFFIXES apr-0 apr-1 apr-1.0 ++ ) ++ if(_INCLUDES) ++ set(SVN_INCLUDES ${SVN_INCLUDES} ${_INCLUDES}) ++ else(_INCLUDES) ++ set(SVN_FOUND FALSE) # no apr == can't compile! ++ endif(_INCLUDES) ++ endif(APUCONFIG_EXECUTABLE) + FIND_LIBRARY(SVN_LIBRARIES NAMES svn_client-1) + if(SVN_LIBRARIES) + FIND_LIBRARY(_LIBRARIES NAMES svn_subr-1) diff --git a/pkgs/desktops/kde-4.10/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.10/kdesdk/kapptemplate.nix new file mode 100644 index 00000000000..391536248dd --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/kapptemplate.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A KDE 4 project template generator"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.10/kdesdk/kcachegrind.nix new file mode 100644 index 00000000000..65d410cca48 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/kcachegrind.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE Frontend for Callgrind/Cachegrind"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/kde-dev-scripts.nix b/pkgs/desktops/kde-4.10/kdesdk/kde-dev-scripts.nix new file mode 100644 index 00000000000..df81145e5d6 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/kde-dev-scripts.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Various scripts to ease KDE development"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.10/kdesdk/kde-dev-utils.nix new file mode 100644 index 00000000000..85b6ea6ac00 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/kde-dev-utils.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, gcc }: + +kde { + buildInputs = [ kdelibs ]; + + preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}"; + + meta = { + description = "various KDE development utilities"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/kdesdk-strigi-analyzers.nix b/pkgs/desktops/kde-4.10/kdesdk/kdesdk-strigi-analyzers.nix new file mode 100644 index 00000000000..4d579b88ba8 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/kdesdk-strigi-analyzers.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Strigi analyzers for diff, po and ts"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix new file mode 100644 index 00000000000..782ef72ce5a --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/kdesdk-thumbnailers.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs, gettext }: + +kde { +#todo: doesn't build + buildInputs = [ kdelibs gettext ]; + + meta = { + description = "PO file format thumbnailer"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix b/pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix new file mode 100644 index 00000000000..6f1029539f8 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/kioslave-perldoc.nix @@ -0,0 +1,12 @@ +{ kde, kdelibs, perl }: + +kde { +#todo: doesn't build + buildInputs = [ kdelibs perl ]; + + cmakeFlags = [ "-DBUILD_perldoc=ON" ]; + + meta = { + description = "perldoc: kioslave"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix b/pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix new file mode 100644 index 00000000000..13fc035e606 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/kioslave-svn.nix @@ -0,0 +1,12 @@ +{ kde, kdelibs, subversionClient, apr, aprutil }: + +kde { +#todo: doesn't build + buildInputs = [ kdelibs subversionClient apr aprutil ]; + + patches = [ ./find-svn.patch ]; + + meta = { + description = "Subversion kioslave"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/kompare.nix b/pkgs/desktops/kde-4.10/kdesdk/kompare.nix new file mode 100644 index 00000000000..1ddb4b8ea5b --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/kompare.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A program to view the differences between files and optionally generate a diff"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.10/kdesdk/lokalize.nix new file mode 100644 index 00000000000..1565426eb1f --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/lokalize.nix @@ -0,0 +1,13 @@ +{ kde, kdelibs, hunspell }: + +kde { + buildInputs = [ kdelibs hunspell ]; + + meta = { + description = "KDE 4 Computer-aided translation system"; + longDescription = '' + Computer-aided translation system. + Do not translate what had already been translated. + ''; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/okteta.nix b/pkgs/desktops/kde-4.10/kdesdk/okteta.nix new file mode 100644 index 00000000000..058636596ad --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/okteta.nix @@ -0,0 +1,13 @@ +{ kde, kdelibs, qca2 }: + +kde { + buildInputs = [ kdelibs qca2 ]; + +# TODO: Look what does -DBUILD_mobile add + + enableParallelBuilding = false; + + meta = { + description = "KDE byte editor"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/poxml.nix b/pkgs/desktops/kde-4.10/kdesdk/poxml.nix new file mode 100644 index 00000000000..1ab9ed49df5 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/poxml.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, antlr }: + +kde { + buildInputs = [ kdelibs antlr ]; + + meta = { + description = "Po<->xml tools"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.10/kdesdk/umbrello.nix new file mode 100644 index 00000000000..e83a2d9a901 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdesdk/umbrello.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, libxml2, libxslt, boost }: + +kde { + buildInputs = [ kdelibs libxml2 libxslt boost ]; + + meta = { + description = "Umbrello UML modeller"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdetoys/amor.nix b/pkgs/desktops/kde-4.10/kdetoys/amor.nix new file mode 100644 index 00000000000..936d63d544a --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdetoys/amor.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE creature for your desktop"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.10/kdetoys/kteatime.nix new file mode 100644 index 00000000000..dacf54def4b --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdetoys/kteatime.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE utility for making a fine cup of tea"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdetoys/ktux.nix b/pkgs/desktops/kde-4.10/kdetoys/ktux.nix new file mode 100644 index 00000000000..108f9be7c72 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdetoys/ktux.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, kde_workspace }: + +kde { + buildInputs = [ kdelibs kde_workspace ]; + + meta = { + description = "Tux Screen Saver"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeutils/ark.nix b/pkgs/desktops/kde-4.10/kdeutils/ark.nix new file mode 100644 index 00000000000..eb3e12281d6 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeutils/ark.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson }: + +kde { + buildInputs = [ kdelibs kde_baseapps libarchive bzip2 lzma qjson ]; + + meta = { + description = "KDE Archiving Tool"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeutils/filelight.nix b/pkgs/desktops/kde-4.10/kdeutils/filelight.nix new file mode 100644 index 00000000000..25ecabed27c --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeutils/filelight.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Tool to visualise file and directory sizes"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.10/kdeutils/kcalc.nix new file mode 100644 index 00000000000..08b202e8f0e --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeutils/kcalc.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, gmp }: + +kde { + buildInputs = [ kdelibs gmp ]; + + meta = { + description = "KDE Calculator"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.10/kdeutils/kcharselect.nix new file mode 100644 index 00000000000..d4c9c06f483 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeutils/kcharselect.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE character selection utility"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeutils/kdf.nix b/pkgs/desktops/kde-4.10/kdeutils/kdf.nix new file mode 100644 index 00000000000..3f9da58d0a6 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeutils/kdf.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE free disk space utility"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.10/kdeutils/kfloppy.nix new file mode 100644 index 00000000000..2434a4fa671 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeutils/kfloppy.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Floppy disk formatting utility"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix new file mode 100644 index 00000000000..3027e2357a4 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeutils/kgpg.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, kdepimlibs, nepomuk_core }: + +kde { + buildInputs = [ kdelibs kdepimlibs nepomuk_core ]; + + meta = { + description = "Simple KDE GUI for GPG"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.10/kdeutils/kremotecontrol.nix new file mode 100644 index 00000000000..70311a789f9 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeutils/kremotecontrol.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs, libXtst }: + +kde { + buildInputs = [ kdelibs libXtst ]; + + meta = { + description = "KDE remote control"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.10/kdeutils/ktimer.nix new file mode 100644 index 00000000000..5700977349e --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeutils/ktimer.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE Timer"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeutils/kwallet.nix b/pkgs/desktops/kde-4.10/kdeutils/kwallet.nix new file mode 100644 index 00000000000..9ec0e6c0396 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeutils/kwallet.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "KDE Wallet (password storage) management tool"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.10/kdeutils/print-manager.nix new file mode 100644 index 00000000000..1b0d748e6cc --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeutils/print-manager.nix @@ -0,0 +1,28 @@ +{ kde, kdelibs +, pythonPackages, sip, pyqt4, pykde4, pycups, rhpl, system_config_printer +, pythonDBus, makeWrapper }: + +let s_c_p = system_config_printer.override { withGUI = false; }; in + +kde rec { + buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython + ] ++ pythonPath; + + pythonPath = [ pyqt4 pykde4 pycups s_c_p ]; + + passthru.propagatedUserEnvPackages = [ s_c_p ]; + + postInstall = + '' + wrapPythonPrograms + + # ‘system-config-printer’ supplies some D-Bus policy that we need. + mkdir -p $out/nix-support + echo ${s_c_p} > $out/nix-support/propagated-user-env-packages + ''; + + meta = { + description = "KDE printer manager"; + longDescription = "Applet to view current print jobs and configure new printers"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.10/kdeutils/superkaramba.nix new file mode 100644 index 00000000000..cbe7a285606 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeutils/superkaramba.nix @@ -0,0 +1,11 @@ +{ kde, kdelibs, qimageblitz, python }: + +kde { + buildInputs = [ kdelibs qimageblitz python ]; + + cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ]; + + meta = { + description = "A KDE Eye-candy Application"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.10/kdeutils/sweeper.nix new file mode 100644 index 00000000000..78d56c7df30 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdeutils/sweeper.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Helps clean unwanted traces the user leaves on the system"; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.10/kdewebdev/kfilereplace.nix new file mode 100644 index 00000000000..55e37809e07 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdewebdev/kfilereplace.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "Batch search and replace tool"; + homepage = http://www.kdewebdev.org; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.10/kdewebdev/kimagemapeditor.nix new file mode 100644 index 00000000000..6d22f72461f --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdewebdev/kimagemapeditor.nix @@ -0,0 +1,10 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "An HTML imagemap editor"; + homepage = http://www.nongnu.org/kimagemap/; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix new file mode 100644 index 00000000000..09f409cc474 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdewebdev/klinkstatus.nix @@ -0,0 +1,12 @@ +{ kde, kdelibs, libxml2, libxslt, kdepimlibs, nepomuk_core, htmlTidy, boost }: + +kde { +#todo: ruby is not found. needed for some example scripts + buildInputs = + [ kdelibs kdepimlibs htmlTidy nepomuk_core boost ]; + + meta = { + description = "A KDE link checker"; + homepage = http://klinkstatus.kdewebdev.org; + }; +} diff --git a/pkgs/desktops/kde-4.10/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.10/kdewebdev/kommander.nix new file mode 100644 index 00000000000..d5f4337f714 --- /dev/null +++ b/pkgs/desktops/kde-4.10/kdewebdev/kommander.nix @@ -0,0 +1,9 @@ +{ kde, kdelibs }: + +kde { + buildInputs = [ kdelibs ]; + + meta = { + description = "A graphical editor of scripted dialogs"; + }; +} diff --git a/pkgs/desktops/kde-4.10/l10n/default.nix b/pkgs/desktops/kde-4.10/l10n/default.nix new file mode 100644 index 00000000000..57d41fb35bf --- /dev/null +++ b/pkgs/desktops/kde-4.10/l10n/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, kdelibs, gettext, release, stable }: + +let + + inherit (stdenv.lib) attrByPath singleton; + + kdeL10nDerivation = + { lang, saneName, sha256 }: + + stdenv.mkDerivation rec { + name = "kde-l10n-${saneName}-${release}"; + + src = fetchurl { + url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz"; + name = "${name}.tar.xz"; + inherit sha256; + }; + + buildInputs = [ gettext kdelibs ]; + + cmakeFlags = "-Wno-dev"; + + meta = { + description = "KDE translation for ${lang}"; + license = "GPL"; + inherit (kdelibs.meta) maintainers platforms homepage; + }; + }; + + kdeL10nRelease = + builtins.listToAttrs ( + map ({lang, saneName, sha256}: + { + name = saneName; + value = kdeL10nDerivation { inherit lang saneName sha256; }; + } + ) (import (./manifest + "-${release}.nix")) + ); + +in +{ + inherit kdeL10nDerivation; + recurseForDerivations = true; +} // kdeL10nRelease diff --git a/pkgs/desktops/kde-4.10/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.10/l10n/l10n-manifest.sh new file mode 100755 index 00000000000..ec159a1e204 --- /dev/null +++ b/pkgs/desktops/kde-4.10/l10n/l10n-manifest.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +# Usage: download kde-l10n to $dir, then run +# $0 $dir + +dir=$1 + +if [[ ! -d "${dir}" ]]; then + echo "${dir} is not a directory (or doesn't exist)!" >&2 + exit 1 +fi + +release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \ + sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//') + +echo "Detected release ${release}" >&2 + +exec > "manifest-${release}.nix" +echo "[" +for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do + lang=${i%-${release}.tar.xz} + lang=${lang#kde-l10n-} + echo -n "${lang}.. " >&2 + hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}") + echo "{" + echo " lang = \"${lang}\";" + echo " saneName = \"$(echo $lang | sed s^@^_^g)\";" + echo " sha256 = \"${hash}\";" + echo "}" + echo $hash >&2 +done +echo "]" diff --git a/pkgs/desktops/kde-4.10/l10n/manifest-4.10.2.nix b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.2.nix new file mode 100644 index 00000000000..93e47d2e63a --- /dev/null +++ b/pkgs/desktops/kde-4.10/l10n/manifest-4.10.2.nix @@ -0,0 +1,282 @@ +[ +{ + lang = "ar"; + saneName = "ar"; + sha256 = "1si3hkxag2s93vywr8spiwaz8rr287b8ms0akw7ba4hr3mccgllz"; +} +{ + lang = "bg"; + saneName = "bg"; + sha256 = "1dfp2zkzj5h0qqz03sicdvw024afc49vlj59k973vqnziwqwkvil"; +} +{ + lang = "bs"; + saneName = "bs"; + sha256 = "0v56by3jxpn76dcbrz89np6par2ndmz6l9lgpyzi3qgh7c1flh3k"; +} +{ + lang = "ca"; + saneName = "ca"; + sha256 = "0xj157l9h6frac4pnfsirh06j7kdq37wlikm7rnybnpdg7nv4kls"; +} +{ + lang = "ca@valencia"; + saneName = "ca_valencia"; + sha256 = "0zrc3cpbiarsfh2jqrrhxalmz62k5bb9wf9vbfcvbh90a0v5csaw"; +} +{ + lang = "cs"; + saneName = "cs"; + sha256 = "1scy726cxyv6gmh77wnfb8qb00vhhxxg1wwg8lk56r79jsh77pbh"; +} +{ + lang = "da"; + saneName = "da"; + sha256 = "1qdhzw9v1q188bky8phv3wj0sj3imf08j3bqqf2gcniw2zr0nkhq"; +} +{ + lang = "de"; + saneName = "de"; + sha256 = "13r97in3yl17scq41fncbzp3s99c2ahspxixcjb5b066c9ln4n4z"; +} +{ + lang = "el"; + saneName = "el"; + sha256 = "0c3w2cxmv46l85kg9d68v037br0ck423k0zfkyi01hgh76jixhnm"; +} +{ + lang = "en_GB"; + saneName = "en_GB"; + sha256 = "158i25z1b5hj5fhhsczf52l2369xmzyxfjjr1xp9pp5aga2kp3dc"; +} +{ + lang = "es"; + saneName = "es"; + sha256 = "0vm2sr5nqzjssm2mzjw56wwsygzasrr04pl77y4mvq1d573gaks3"; +} +{ + lang = "et"; + saneName = "et"; + sha256 = "0w4dqvgain4m14cr8vmr49a890lmjiz203vw347fyq6mvqg57f3z"; +} +{ + lang = "eu"; + saneName = "eu"; + sha256 = "1809g1jdbrp22572h68zr7a5riymzv240hpmh633v8qmdqyzmnlk"; +} +{ + lang = "fa"; + saneName = "fa"; + sha256 = "1y1m9zagw1wras6vfrw6zbhy08xm1djfg7wg0fqvr2pnw01b903f"; +} +{ + lang = "fi"; + saneName = "fi"; + sha256 = "0fd6zbxn1dcq3i8vp6m4ifsrfhpghbgvwrh0gqmpw60kr9ms72pj"; +} +{ + lang = "fr"; + saneName = "fr"; + sha256 = "1ybdnvsb2fi8hymad4fj7dhgfqjabbhgjgmcs4g0px583gbx38ys"; +} +{ + lang = "ga"; + saneName = "ga"; + sha256 = "1hcdx82213dhy6v2hy9c543fci8pj3p5lz2bb0sds14wscryngiy"; +} +{ + lang = "gl"; + saneName = "gl"; + sha256 = "0p0k0r42wqp9ww0w4k4dp0cp9mv4is1zffsnpb1vdj8fr4n73lms"; +} +{ + lang = "he"; + saneName = "he"; + sha256 = "0wfyx7w2igz078f9s3nf2gr2s2bj6kdrpsd4cycdrvi7lpkv97mg"; +} +{ + lang = "hi"; + saneName = "hi"; + sha256 = "0nr6lskvq4v885hlnwyn5c6r76lj923lnmzz7f3ymxsm8ahgy9i1"; +} +{ + lang = "hr"; + saneName = "hr"; + sha256 = "1zg11q416rlcwygbapllmhwy577gwrvxyrr2hv0knz8r6jdwxnxj"; +} +{ + lang = "hu"; + saneName = "hu"; + sha256 = "1km3w6m7m3w3315ivy80rwmn82g41cfw3id21ks8sykqray60jyf"; +} +{ + lang = "ia"; + saneName = "ia"; + sha256 = "1rb6qsvhp8r7ivsjcp2980vdkb5pczxky6wix884xdd2jyb4dqbs"; +} +{ + lang = "is"; + saneName = "is"; + sha256 = "0kngwsasyw36g05xbxcgn71mkl89xs3sg8lx3qzd6g7drk2s5r1w"; +} +{ + lang = "it"; + saneName = "it"; + sha256 = "1ckb7alln8f72x9q6hi4ji7xylaipd3zwilnrr7978y1q5b8297l"; +} +{ + lang = "ja"; + saneName = "ja"; + sha256 = "1s0m6kl0wdd22pbnrnmxq19y1nzyvmln64g5gqr9c33x08lwd3jz"; +} +{ + lang = "kk"; + saneName = "kk"; + sha256 = "1jn3pd4j5jpw8ing7hi0npkrk4cy5vbfp62jcpn93dizq71g0cis"; +} +{ + lang = "km"; + saneName = "km"; + sha256 = "1y6492rmh8hw3fw8yss80j8dnn6gah4mp207wnjx7savxdganrk9"; +} +{ + lang = "ko"; + saneName = "ko"; + sha256 = "05r7cslynx4yxlkaqq2lhjg2rmvjzz74h41if5fj3lkm9p848663"; +} +{ + lang = "lt"; + saneName = "lt"; + sha256 = "1xa7jc3jbhicqzikayssmm08mnqwhwy3gbr2xp2wyxvrwgy0vd7b"; +} +{ + lang = "lv"; + saneName = "lv"; + sha256 = "1xr2938yqkl81rwcfg43mqksm9r6zcw5bp49cm5ybrrr1np08d4p"; +} +{ + lang = "mr"; + saneName = "mr"; + sha256 = "0w4g863da74vabbx6dc7hpf6lqa09bsxm5bdl33bqp6wxz0qbrxf"; +} +{ + lang = "nb"; + saneName = "nb"; + sha256 = "1axqkkwgm3x12fpfnvxzm2bf22rh2fxic15rrk70sjc0xzkmbfc2"; +} +{ + lang = "nds"; + saneName = "nds"; + sha256 = "1y72jrw7s6afznj0axwrxczvcxm2i3m9dldjjb32w8lr2gbibhz9"; +} +{ + lang = "nl"; + saneName = "nl"; + sha256 = "01ps3fgwhzffsb52zcjgi4frgy719wlgjmrva9hl320wgi6bgs30"; +} +{ + lang = "nn"; + saneName = "nn"; + sha256 = "0a9zrn54x38c4jn2p59s3wiv42g1f7nwar2gppn992q2awq05m6x"; +} +{ + lang = "pa"; + saneName = "pa"; + sha256 = "1782vpj199ck5fswv3jc0adff0k7bv699b4la604kb0a7dl43cf2"; +} +{ + lang = "pl"; + saneName = "pl"; + sha256 = "0lldhl2jd51j3srf2dqq6gd4nxy6y3qxd585bgxpclvnmz7zqq9b"; +} +{ + lang = "pt"; + saneName = "pt"; + sha256 = "10w740h5h3ag2jpj44xyclpya59d8jmgv5ma1rz27wcvwl38jggx"; +} +{ + lang = "pt_BR"; + saneName = "pt_BR"; + sha256 = "1rn5jc9dihi0mwvly1rk1fqzdbhyg9gxax1bip0l80wg8mj9d0h5"; +} +{ + lang = "ro"; + saneName = "ro"; + sha256 = "1l1b9j9ixianyvbg2msc4d4bkm2km3w0h6xkbcyl7rg0cja9ys8l"; +} +{ + lang = "ru"; + saneName = "ru"; + sha256 = "0rgasg2c0ds96yqky1rnqj7fc9w3g6p0ng27v5vq3ja7paij1yv9"; +} +{ + lang = "si"; + saneName = "si"; + sha256 = "0124dhn1ng225zhyz8lmc2lf6cpxbbirr3bl3h6cq8lyjs4p078l"; +} +{ + lang = "sk"; + saneName = "sk"; + sha256 = "0xfp2wh1qyyh1cixypam9qnni0zin580vcbnhpmbx5disy3znmga"; +} +{ + lang = "sl"; + saneName = "sl"; + sha256 = "1hfqq8k5n48hjypj5sribh761gpgn930410qbdnrxjmm0l95rzlp"; +} +{ + lang = "sr"; + saneName = "sr"; + sha256 = "1rma3l9mpm1xakkf2mkjpa6nxhl076hnm6fiirna7nsgvsk2c3jz"; +} +{ + lang = "sv"; + saneName = "sv"; + sha256 = "02rg9hm0j1lfdv9nb80bh4yy41z3rvfh39w8xwrmv941y6k58q7w"; +} +{ + lang = "tg"; + saneName = "tg"; + sha256 = "16731c2bjg3c8r7i6lm6j3gsj9yqs2yd69sl04y9nv5yh1i0km15"; +} +{ + lang = "th"; + saneName = "th"; + sha256 = "032zwwn5za8cknmqxd8yzr3djylnvrzjldgygqlshf0pxkryjkrp"; +} +{ + lang = "tr"; + saneName = "tr"; + sha256 = "1bp8bndwyw33rkkv2dhs1l9qbzkhccsrqcflxnjrm98shks2vgzr"; +} +{ + lang = "ug"; + saneName = "ug"; + sha256 = "0hhdj4yb208rmpd9a77jf7x9p5iq35iyvn68sr6n1m228pncddi6"; +} +{ + lang = "uk"; + saneName = "uk"; + sha256 = "0sw07alwjw7qiss93bgf4h5ix9kpz2czfwbbgdydfwqcwz5nzvcy"; +} +{ + lang = "vi"; + saneName = "vi"; + sha256 = "06fchmphkp7rpg6i0gd50qyjlfr6drj0xnlkdczw54iy1zklrlmh"; +} +{ + lang = "wa"; + saneName = "wa"; + sha256 = "1pm3wvs88h03gch6nzn5hd268r2q4jd13slh6bh2nvhq719g8zsa"; +} +{ + lang = "zh_CN"; + saneName = "zh_CN"; + sha256 = "0k8j3dprpzxi87rd6xhp1qr93jg91i0hym87y7wlqb239aqz41dn"; +} +{ + lang = "zh_TW"; + saneName = "zh_TW"; + sha256 = "05ks7gdl3x6wkxs2rdj6f48bpd4cishw9zfh0a264kix6mh2fzcq"; +} +] diff --git a/pkgs/desktops/kde-4.10/oxygen-icons.nix b/pkgs/desktops/kde-4.10/oxygen-icons.nix new file mode 100644 index 00000000000..34af88a3193 --- /dev/null +++ b/pkgs/desktops/kde-4.10/oxygen-icons.nix @@ -0,0 +1,15 @@ +{ kde, cmake }: + +kde { + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "10dpbgidn7rwdhm044ydd294dv97hrhaz7jakf1yncszqbhbxksc"; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "KDE Oxygen theme icons"; + longDescription = "Icons for KDE's default theme"; + license = "GPL"; + }; +} diff --git a/pkgs/desktops/kde-4.10/support/akonadi/default.nix b/pkgs/desktops/kde-4.10/support/akonadi/default.nix new file mode 100644 index 00000000000..0ba61722621 --- /dev/null +++ b/pkgs/desktops/kde-4.10/support/akonadi/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }: + +stdenv.mkDerivation rec { + name = "akonadi-1.9.1"; + + src = fetchurl { + url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2"; + sha256 = "1w10kb4m8ri6yi1mii2j0sckj3vq11y6qkzijm3lbh4w0fi4kbjk"; + }; + + buildInputs = [ qt4 soprano libxslt boost sqlite ]; + + nativeBuildInputs = [ cmake automoc4 shared_mime_info ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "KDE PIM Storage Service"; + license = "LGPL"; + homepage = http://pim.kde.org/akonadi; + maintainers = [ maintainers.sander maintainers.urkud ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix index 62c5bbe5220..5873ef9cd68 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, intltool +{ stdenv, fetchurl, pkgconfig, intltool, libnotify , gtk , libxfce4util, libxfce4ui, xfconf }: stdenv.mkDerivation rec { p_name = "xfce4-notifyd"; ver_maj = "0.2"; - ver_min = "2"; + ver_min = "3"; src = fetchurl { url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0s4ilc36sl5k5mg5727rmqims1l3dy5pwg6dk93wyjqnqbgnhvmn"; + sha256 = "0fx6z89rxs6ypb8bb6l1pg8fdbxn995fgs413sbhnaxjkm6gch6x"; }; name = "${p_name}-${ver_maj}.${ver_min}"; - buildInputs = [ pkgconfig intltool gtk libxfce4util libxfce4ui xfconf ]; + buildInputs = [ pkgconfig intltool libnotify gtk libxfce4util libxfce4ui xfconf ]; preFixup = '' rm $out/share/icons/hicolor/icon-theme.cache # to be able to run the daemon we need it in PATH - cp -l $out/lib/xfce4/notifyd/xfce4-notifyd $out/bin + ln -rs $out/lib/xfce4/notifyd/xfce4-notifyd $out/bin ''; + doCheck = true; + meta = { homepage = "http://goodies.xfce.org/projects/applications/${p_name}"; description = "Notification daemon for Xfce"; diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix new file mode 100644 index 00000000000..dc3a912a34a --- /dev/null +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: + +stdenv.mkDerivation rec { + version = "7.6.3"; + + name = "ghc-${version}"; + + src = fetchurl { + url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2"; + sha256 = "1669m8k9q72rpd2mzs0bh2q6lcwqiwd1ax3vrard1dgn64yq4hxx"; + }; + + buildInputs = [ ghc perl gmp ncurses ]; + + enableParallelBuilding = true; + + buildMK = '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" + ''; + + preConfigure = '' + echo "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + ''; + + configureFlags = [ + "--with-gcc=${stdenv.gcc}/bin/gcc" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags=["-S" "--keep-file-symbols"]; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = [ + stdenv.lib.maintainers.marcweber + stdenv.lib.maintainers.andres + stdenv.lib.maintainers.simons + ]; + inherit (ghc.meta) license platforms; + }; + +} diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 8258ac27419..035ebc8b268 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.7.20130223"; + version = "7.7"; name = "ghc-${version}"; src = fetchurl { url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2"; - sha256 = "1naw6x1mjij10h9k4biard2pkzi6zml26vv4h34asprv0h6ymdbg"; + sha256 = "1f4grj1lw25vb5drn4sn8fc1as3hwhk8dl659spi5fnbrs5k4wgb"; }; buildInputs = [ ghc perl gmp ncurses ]; @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { DYNAMIC_BY_DEFAULT = NO ''; + # The tarball errorneously contains an executable that doesn't work in + # Nix. Deleting it will cause the program to be re-built locally. + postUnpack = '' + rm -v $sourceRoot/libraries/integer-gmp/cbits/mkGmpDerivedConstants + ''; + preConfigure = '' echo "${buildMK}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix new file mode 100644 index 00000000000..c3cbf8422bf --- /dev/null +++ b/pkgs/development/compilers/go/1.1.nix @@ -0,0 +1,94 @@ +{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}: + +let + loader386 = "${glibc}/lib/ld-linux.so.2"; + loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; + loaderArm = "${glibc}/lib/ld-linux.so.3"; +in + +stdenv.mkDerivation { + name = "go-1.1rc1"; + + src = fetchurl { + url = http://go.googlecode.com/files/go1.1rc1.src.tar.gz; + sha1 = "c999c36e7bb5c9ef05d309b0bb4275feb62c44e3"; + }; + + buildInputs = [ bison glibc bash makeWrapper ]; + + # I'm not sure what go wants from its 'src', but the go installation manual + # describes an installation keeping the src. + preUnpack = '' + mkdir -p $out/share + cd $out/share + ''; + + prePatch = '' + cd .. + if [ ! -d go ]; then + mv * go + fi + cd go + + patchShebangs ./ # replace /bin/bash + # !!! substituteInPlace does not seems to be effective. + sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go + + #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ + # -e 's,/bin/echo,${coreutils}/bin/echo,' \ + # src/pkg/exec/exec_test.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} + # The os test wants to read files in an existing path. Just it don't be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + # Disable a failing icmp test + sed -i '/ip[46]:.*icmp.*nil/d' src/pkg/net/ipraw_test.go + ''; + + patches = [ ./cacert.patch ]; + + GOOS = "linux"; + GOARCH = if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "armv5tel-linux" then "arm" + else throw "Unsupported system"; + GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; + + installPhase = '' + mkdir -p "$out/bin" + export GOROOT="$(pwd)/" + export GOBIN="$out/bin" + export PATH="$GOBIN:$PATH" + cd ./src + ./all.bash + cd - + + # Wrap the tools to define the location of the + # libraries. + for a in go gofmt godoc; do + wrapProgram "$out/bin/$a" \ + --set "GOROOT" $out/share/go \ + ${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""} + done + + # Copy the emacs configuration for Go files. + mkdir -p "$out/share/emacs/site-lisp" + cp ./misc/emacs/* $out/share/emacs/site-lisp/ + ''; + + meta = { + homepage = http://golang.org/; + description = "The Go Programming language"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ pierron viric ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix deleted file mode 100644 index 982f43ec2e9..00000000000 --- a/pkgs/development/compilers/idris/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ cabal, binary, Cabal, filepath, happy, haskeline, mtl, parsec -, split, transformers -}: - -cabal.mkDerivation (self: { - pname = "idris"; - version = "0.9.7"; - sha256 = "0y3rnxbs2s7kxlzlc347vwpylw2p0pdz50zgkyii21gd6klqvd45"; - isLibrary = false; - isExecutable = true; - buildDepends = [ - binary Cabal filepath haskeline mtl parsec split transformers - ]; - buildTools = [ happy ]; - meta = { - homepage = "http://www.idris-lang.org/"; - description = "Functional Programming Language with Dependent Types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/compilers/llvm/clang.nix b/pkgs/development/compilers/llvm/clang.nix index 0c578828888..c2117798666 100644 --- a/pkgs/development/compilers/llvm/clang.nix +++ b/pkgs/development/compilers/llvm/clang.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, perl, groff, llvm, cmake, libxml2 }: -let version = "3.2"; in +let + version = "3.2"; + gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc; +in stdenv.mkDerivation { name = "clang-${version}"; @@ -13,6 +16,7 @@ stdenv.mkDerivation { "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_TARGETS_TO_BUILD=all" + "-DGCC_INSTALL_PREFIX=${gccReal}" ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" ]; diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 817559ffecc..7f4ae9646af 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.informatik.uni-kiel.de/~pakcs/"; - description = "an implementation of the multi-paradigm declarative language Curry"; + description = "An implementation of the multi-paradigm declarative language Curry"; license = stdenv.lib.licenses.bsd3; longDescription = '' @@ -77,6 +77,6 @@ stdenv.mkDerivation { ''; maintainers = [ stdenv.lib.maintainers.kkallio ]; - platforms = stdenv.lib.platforms.linux; + #platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 6c8c83fe056..f4c45b390fe 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -4,11 +4,11 @@ let s= # Generated upstream information rec { baseName="sbcl"; - version="1.1.5"; + version="1.1.6"; name="${baseName}-${version}"; - hash="01wi9aah9rrs7rbjrjrkwjxq03kapyzm48iyhz38fvaqhl7phw78"; - url="mirror://sourceforge/project/sbcl/sbcl/1.1.5/sbcl-1.1.5-source.tar.bz2"; - sha256="01wi9aah9rrs7rbjrjrkwjxq03kapyzm48iyhz38fvaqhl7phw78"; + hash="1idrbjqi4m5p4dmxzwwx3rgsdq887njzi67gr1f4b26v56a3qnx2"; + url="mirror://sourceforge/project/sbcl/sbcl/1.1.6/sbcl-1.1.6-source.tar.bz2"; + sha256="1idrbjqi4m5p4dmxzwwx3rgsdq887njzi67gr1f4b26v56a3qnx2"; }; buildInputs = with a; [ clisp makeWrapper diff --git a/pkgs/development/interpreters/clisp/2.44.1.nix b/pkgs/development/interpreters/clisp/2.44.1.nix index 891fd809bf0..521933b0ed1 100644 --- a/pkgs/development/interpreters/clisp/2.44.1.nix +++ b/pkgs/development/interpreters/clisp/2.44.1.nix @@ -14,16 +14,22 @@ stdenv.mkDerivation rec { buildInputs = [ libsigsegv gettext ncurses readline libX11 libXau libXt pcre zlib libXpm xproto libXext xextproto libffi libffcall ]; - + + patches = [ ./bits_ipctypes_to_sys_ipc.patch ]; # from Gentoo + # First, replace port 9090 (rather low, can be used) # with 64237 (much higher, IANA private area, not # anything rememberable). - patchPhase = '' + # Also remove reference to a type that disappeared from recent glibc + # (seems the correct thing to do, found no reference to any solution) + postPatch = '' sed -e 's@9090@64237@g' -i tests/socket.tst sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i - ''; + substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" "" + ''; + configureFlags = '' --with-readline builddir --with-dynamic-ffi diff --git a/pkgs/development/interpreters/cython/default.nix b/pkgs/development/interpreters/cython/default.nix index 42dafcb7f2e..34bd63c29ab 100644 --- a/pkgs/development/interpreters/cython/default.nix +++ b/pkgs/development/interpreters/cython/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { meta = { description = "An interpreter to help writing C extensions for Python"; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix new file mode 100644 index 00000000000..d775b74c903 --- /dev/null +++ b/pkgs/development/interpreters/dart/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl }: + +assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; + +stdenv.mkDerivation { + name = "dart-0.4"; + + installPhase = '' + mkdir -p $out + cp -R * $out/ + echo $libPath + patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-rpath $libPath \ + $out/bin/dart + + # Hack around weird dart2js resolving bug + mv $out/bin/dart2js $out/bin/.dart2js + echo "#!/bin/sh" > $out/bin/dart2js + echo "$out/bin/.dart2js \$*" >> $out/bin/dart2js + chmod +x $out/bin/dart2js + ''; + + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://download.zef.s3.amazonaws.com/dartsdk-m4-linux-64.tar.gz; + sha256 = "1riwxxczskfsaax7n03m7isnbxf3walky0cac1w8j5apr1xvg5ma"; + } + else + fetchurl { + url = http://download.zef.s3.amazonaws.com/dartsdk-m4-linux-32.tar.gz; + sha256 = "00935c4vxfj2h3x354g75qdazswwissbwc7kj5k05l1m3lizikf6"; + }; + + libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc ]; + + dontStrip = true; +} \ No newline at end of file diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 45793b25d25..66b5b79083a 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -7,11 +7,11 @@ else stdenv.mkDerivation) (rec { - name = "guile-2.0.7"; + name = "guile-2.0.9"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "0f53pxkia4v17n0avwqlcjpy0n89hkazm2xsa6p84lv8k6k8y9vg"; + sha256 = "0nw9y8vjyz4r61v06p9msks5lm58pd91irmzg4k487vmv743h2pp"; }; nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; @@ -106,10 +106,8 @@ // -(if stdenv.isFreeBSD - then { - # XXX: Thread support is currently broken on FreeBSD and Solaris (namely - # the `SCM_I_IS_THREAD' assertion in `scm_spawn_thread' is hit.) - configureFlags = [ "--without-threads" ]; - } - else {})) +(stdenv.lib.optionalAttrs (!stdenv.isLinux) { + # Work around . + SHELL = "/bin/sh"; + CONFIG_SHELL = "/bin/sh"; +})) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index 6d81ca9eea6..fce9c0f152b 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -143,6 +143,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) configureFlags = ["--enable-zip"]; }; + ftp = { + configureFlags = ["--enable-ftp"]; + }; + /* php is build within this derivation in order to add the xdebug lines to the php.ini. So both Apache and command line php both use xdebug without having to configure anything. @@ -180,6 +184,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) mcryptSupport = config.php.mcrypt or false; bz2Support = config.php.bz2 or false; zipSupport = config.php.zip or true; + ftpSupport = config.php.ftp or true; }; configurePhase = '' diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix new file mode 100644 index 00000000000..7d579c4adb1 --- /dev/null +++ b/pkgs/development/interpreters/php/5.4.nix @@ -0,0 +1,212 @@ +{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison +, apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext +, openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype +, libxslt, libmcrypt, bzip2, icu }: + +let + libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; +in + +composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { + + version = "5.4.14"; + + name = "php-${version}"; + + enableParallelBuilding = true; + + buildInputs = ["flex" "bison" "pkgconfig"]; + + flags = { + + # much left to do here... + + # SAPI modules: + + apxs2 = { + configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"]; + buildInputs = [apacheHttpd]; + }; + + # Extensions + + curl = { + configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"]; + buildInputs = [curl openssl]; + }; + + zlib = { + configureFlags = ["--with-zlib=${zlib}"]; + buildInputs = [zlib]; + }; + + libxml2 = { + configureFlags = [ + "--with-libxml-dir=${libxml2}" + #"--with-iconv-dir=${libiconv}" + ]; + buildInputs = [ libxml2 ]; + }; + + readline = { + configureFlags = ["--with-readline=${readline}"]; + buildInputs = [ readline ]; + }; + + sqlite = { + configureFlags = ["--with-pdo-sqlite=${sqlite}"]; + buildInputs = [ sqlite ]; + }; + + postgresql = { + configureFlags = ["--with-pgsql=${postgresql}"]; + buildInputs = [ postgresql ]; + }; + + mysql = { + configureFlags = ["--with-mysql=${mysql}"]; + buildInputs = [ mysql ]; + }; + + mysqli = { + configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"]; + buildInputs = [ mysql]; + }; + + mysqli_embedded = { + configureFlags = ["--enable-embedded-mysqli"]; + depends = "mysqli"; + assertion = fixed.mysqliSupport; + }; + + pdo_mysql = { + configureFlags = ["--with-pdo-mysql=${mysql}"]; + buildInputs = [ mysql ]; + }; + + bcmath = { + configureFlags = ["--enable-bcmath"]; + }; + + gd = { + # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108. + configureFlags = ["--with-gd=shared --with-freetype-dir=${freetype} --with-png-dir=${libpng}"]; + buildInputs = [ libpng libjpeg freetype ]; + }; + + soap = { + configureFlags = ["--enable-soap"]; + }; + + sockets = { + configureFlags = ["--enable-sockets"]; + }; + + openssl = { + configureFlags = ["--with-openssl=${openssl}"]; + buildInputs = ["openssl"]; + }; + + mbstring = { + configureFlags = ["--enable-mbstring"]; + }; + + gettext = { + configureFlags = ["--with-gettext=${gettext}"]; + buildInputs = [gettext]; + }; + + intl = { + configureFlags = ["--enable-intl"]; + buildInputs = [icu]; + }; + + exif = { + configureFlags = ["--enable-exif"]; + }; + + xsl = { + configureFlags = ["--with-xsl=${libxslt}"]; + buildInputs = [libxslt]; + }; + + mcrypt = { + configureFlags = ["--with-mcrypt=${libmcrypt}"]; + buildInputs = [libmcryptOverride]; + }; + + bz2 = { + configureFlags = ["--with-bz2=${bzip2}"]; + buildInputs = [bzip2]; + }; + + zip = { + configureFlags = ["--enable-zip"]; + }; + + /* + php is build within this derivation in order to add the xdebug lines to the php.ini. + So both Apache and command line php both use xdebug without having to configure anything. + Xdebug could be put in its own derivation. + * / + meta = { + description = "debugging support for PHP"; + homepage = http://xdebug.org; + license = "based on the PHP license - as is"; + }; + */ + }; + + cfg = { + mysqlSupport = config.php.mysql or true; + mysqliSupport = config.php.mysqli or true; + pdo_mysqlSupport = config.php.pdo_mysql or true; + libxml2Support = config.php.libxml2 or true; + apxs2Support = config.php.apxs2 or true; + bcmathSupport = config.php.bcmath or true; + socketsSupport = config.php.sockets or true; + curlSupport = config.php.curl or true; + gettextSupport = config.php.gettext or true; + postgresqlSupport = config.php.postgresql or true; + readlineSupport = config.php.readline or true; + sqliteSupport = config.php.sqlite or true; + soapSupport = config.php.soap or true; + zlibSupport = config.php.zlib or true; + opensslSupport = config.php.openssl or true; + mbstringSupport = config.php.mbstring or true; + gdSupport = config.php.gd or true; + intlSupport = config.php.intl or true; + exifSupport = config.php.exif or true; + xslSupport = config.php.xsl or false; + mcryptSupport = config.php.mcrypt or false; + bz2Support = config.php.bz2 or false; + zipSupport = config.php.zip or true; + }; + + configurePhase = '' + iniFile=$out/etc/php-recommended.ini + [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin + ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags + echo configurePhase end + ''; + + installPhase = '' + unset installPhase; installPhase; + cp php.ini-production $iniFile + ''; + + src = fetchurl { + url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror"; + sha256 = "02p23g4gjijazq16r5kwbkval2lkw76g0086n0zynlf67f2g6l2l"; + name = "php-${version}.tar.bz2"; + }; + + meta = { + description = "The PHP language runtime engine"; + homepage = http://www.php.net/; + license = "PHP-3"; + }; + + patches = [ ./fix-5.4.patch ]; + +}) diff --git a/pkgs/development/interpreters/php/fix-5.4.patch b/pkgs/development/interpreters/php/fix-5.4.patch new file mode 100644 index 00000000000..51d98549eee --- /dev/null +++ b/pkgs/development/interpreters/php/fix-5.4.patch @@ -0,0 +1,68 @@ +diff -ru php-5.4.14/configure php-5.4.14-new/configure +--- php-5.4.14/configure 2013-04-10 09:53:26.000000000 +0200 ++++ php-5.4.14-new/configure 2013-04-22 17:13:55.039043622 +0200 +@@ -6513,7 +6513,7 @@ + + case $host_alias in + *aix*) +- APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR` ++ APXS_LIBEXECDIR="$prefix/modules" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" + PHP_AIX_LDFLAGS="-Wl,-brtl" + build_type=shared +@@ -6706,7 +6706,7 @@ + if test "$?" != "0"; then + APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option + else +- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` ++ APXS_LIBEXECDIR="$prefix/modules" + if test -z `$APXS -q SYSCONFDIR`; then + APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ +@@ -7909,7 +7909,7 @@ + { (exit 1); exit 1; }; } + fi + +- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` ++ APXS_LIBEXECDIR="$prefix/modules" + if test -z `$APXS -q SYSCONFDIR`; then + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ +@@ -8779,7 +8779,7 @@ + { (exit 1); exit 1; }; } + fi + +- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` ++ APXS_LIBEXECDIR="$prefix/modules" + if test -z `$APXS -q SYSCONFDIR`; then + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ +@@ -9634,7 +9634,7 @@ + + case $host_alias in + *aix*) +- APXS_LIBEXECDIR=`$APXS -q LIBEXECDIR` ++ APXS_LIBEXECDIR="$prefix/modules" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" + PHP_AIX_LDFLAGS="-Wl,-brtl" + build_type=shared +@@ -9827,7 +9827,7 @@ + if test "$?" != "0"; then + APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option + else +- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` ++ APXS_LIBEXECDIR="$prefix/modules" + if test -z `$APXS -q SYSCONFDIR`; then + APACHE_HOOKS_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ +@@ -59657,9 +59657,7 @@ + + + if test "$PHP_GETTEXT" != "no"; then +- for i in $PHP_GETTEXT /usr/local /usr; do +- test -r $i/include/libintl.h && GETTEXT_DIR=$i && break +- done ++ GETTEXT_DIR=$PHP_GETTEXT + + if test -z "$GETTEXT_DIR"; then + { { $as_echo "$as_me:$LINENO: error: Cannot locate header file libintl.h" >&5 diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index c1dab82e37a..ba441b1082b 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -5,11 +5,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation (rec { - name = "gnutls-3.1.3"; + name = "gnutls-3.1.10"; src = fetchurl { - url = "mirror://gnu/gnutls/${name}.tar.xz"; - sha256 = "0fff9frz0ycbnppfn0w4a2s9x27k21l4hh9zbax3v7a8cg33dcpw"; + url = "mirror://gnupg/gnutls/v3.1/${name}.tar.xz"; + sha256 = "0in6wxlvpv48maawmbg3jysq2rhjqxypgi6kkr173hc8kksp6lsk"; }; # Note: GMP is a dependency of Nettle, whose public headers include diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index 54106de1e09..a412ee9eeb5 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -1,17 +1,17 @@ -{ cabal, caseInsensitive, cmdargs, httpConduit, httpTypes, lens -, liftedBase, mtl, network, resourcet, transformers, xmlConduit -, xmlHamlet +{ cabal, caseInsensitive, httpConduit, httpTypes, lens, liftedBase +, mtl, network, optparseApplicative, resourcet, transformers +, xmlConduit, xmlHamlet }: cabal.mkDerivation (self: { pname = "DAV"; - version = "0.3.1"; - sha256 = "0ql6sf61gq55iyn189papnid91n4ab5s2i24zvkqrgixjz7998rd"; + version = "0.4.1"; + sha256 = "0bcrnlixrzvbdvw7ffv2xl2d0k0w71jf0i5ayf97ymxly8ii8s0c"; isLibrary = true; isExecutable = true; buildDepends = [ - caseInsensitive cmdargs httpConduit httpTypes lens liftedBase mtl - network resourcet transformers xmlConduit xmlHamlet + caseInsensitive httpConduit httpTypes lens liftedBase mtl network + optparseApplicative resourcet transformers xmlConduit xmlHamlet ]; meta = { homepage = "http://floss.scru.org/hDAV"; diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix index c276e1eac80..70430f9f3c7 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/default.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix @@ -1,10 +1,10 @@ -{ cabal, mtl, random }: +{ cabal, mtl, random, transformers }: cabal.mkDerivation (self: { pname = "MonadRandom"; - version = "0.1.8"; - sha256 = "1zin7qyv86gza60q6a6r8az2dwxm80wh23idvmjapgbjn2kfvfim"; - buildDepends = [ mtl random ]; + version = "0.1.9"; + sha256 = "1n947650xlz47rj6y6ik2mknyr9smwragjr5akccinmfm1krg6lz"; + buildDepends = [ mtl random transformers ]; meta = { description = "Random-number generation monad"; license = "unknown"; diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix index 24f056af5ce..1e55feeb989 100644 --- a/pkgs/development/libraries/haskell/NumInstances/default.nix +++ b/pkgs/development/libraries/haskell/NumInstances/default.nix @@ -2,9 +2,10 @@ cabal.mkDerivation (self: { pname = "NumInstances"; - version = "1.2"; - sha256 = "0s26j3h0xg16lcz95qs21iyfnzx8q8w2k2lnq55gakkr1wl4ap59"; + version = "1.3"; + sha256 = "0w1hls5azsg95c0v510xqgr8hs195y2rxzjc7hpjg8q44d4z78sh"; meta = { + homepage = "https://github.com/conal/NumInstances"; description = "Instances of numeric classes for functions and tuples"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/asn1-types/default.nix b/pkgs/development/libraries/haskell/asn1-types/default.nix index 1475de89274..3dacaa6353f 100644 --- a/pkgs/development/libraries/haskell/asn1-types/default.nix +++ b/pkgs/development/libraries/haskell/asn1-types/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "asn1-types"; - version = "0.1.0"; - sha256 = "1520jq65fzlpi4jfrqwry3dg4lajdk6pssb7cqbrmplda0zi2d12"; + version = "0.1.3"; + sha256 = "1d55vhax71d29c2b6238pz1hqp4jnyvvfhs8f05qpcv754b4s4jg"; buildDepends = [ time ]; meta = { homepage = "http://github.com/vincenthz/hs-asn1-types"; diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix index 445cf0a9038..60cd5ffb73a 100644 --- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix +++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl random resourcet RSA SHA time transformers ]; + jailbreak = true; meta = { homepage = "http://github.com/yesodweb/authenticate"; description = "Library to authenticate with OAuth for Haskell web applications"; diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix index 0d18233ef21..95ce58e4b92 100644 --- a/pkgs/development/libraries/haskell/basic-prelude/default.nix +++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "basic-prelude"; - version = "0.3.4.0"; - sha256 = "0layc06df7df4mf4zafj87c4klsvkxbhi69dkv4ag9fkzvs62sz6"; + version = "0.3.5.0"; + sha256 = "1nrfibvvh5vzzr2jz5hipsj29b7ml6d90ijlr917n9aq200w14ar"; buildDepends = [ hashable liftedBase ReadArgs systemFilepath text transformers unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/default.nix index d7a5edbf58d..adfcc16a180 100644 --- a/pkgs/development/libraries/haskell/binary/default.nix +++ b/pkgs/development/libraries/haskell/binary/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "binary"; - version = "0.7.0.1"; - sha256 = "16srrp0qx9hsr7820b2q3sp9wp8y8sxxi8rvsh63n48w4l3canxq"; + version = "0.7.1.0"; + sha256 = "16cb94z57ijw0q3h5p8jbvrv1vmnchsfjhrzvh3gdm3wf75fy8ln"; testDepends = [ Cabal filepath HUnit QuickCheck random testFramework testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix index d3af223418b..8addc3cc628 100644 --- a/pkgs/development/libraries/haskell/byteorder/default.nix +++ b/pkgs/development/libraries/haskell/byteorder/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "byteorder"; - version = "1.0.3"; - sha256 = "056jb47r4pkimi6z2z49prnsmjnhnijk57zm0divl1k55igi5way"; + version = "1.0.4"; + sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x"; meta = { homepage = "http://community.haskell.org/~aslatter/code/byteorder"; description = "Exposes the native endianness or byte ordering of the system"; diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index ffdf3026854..168ccb113b6 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -4,14 +4,13 @@ cabal.mkDerivation (self: { pname = "certificate"; - version = "1.3.6"; - sha256 = "1w7xndslapy4ycgf2xshgx90i3v04nsck9l2mzc74nrnwm817b2m"; + version = "1.3.7"; + sha256 = "06sfka5p381gayx2q7vvyr7dl8q8d4jfqdrys3k0z8fjxdbqrqya"; isLibrary = true; isExecutable = true; buildDepends = [ asn1Data cryptohash cryptoPubkeyTypes filepath mtl pem time ]; - jailbreak = true; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; description = "Certificates and Key Reader/Writer"; diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix new file mode 100644 index 00000000000..284c1ee2c05 --- /dev/null +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix @@ -0,0 +1,14 @@ +{ cabal, mtl, network, parsec, xhtml }: + +cabal.mkDerivation (self: { + pname = "cgi"; + version = "3001.1.7.5"; + sha256 = "1zdgdzkrzclf492pb9px5a490mxfxl5c1099axcxxm9wlpmf49ji"; + buildDepends = [ mtl network parsec xhtml ]; + meta = { + homepage = "http://andersk.mit.edu/haskell/cgi/"; + description = "A library for writing CGI programs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix similarity index 58% rename from pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix rename to pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix index 08b0477039d..4f5fed76b41 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.8.3.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.8.4.nix @@ -1,14 +1,10 @@ -{ cabal, extensibleExceptions, MonadCatchIOMtl, mtl, network -, parsec, xhtml -}: +{ cabal, MonadCatchIOMtl, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { pname = "cgi"; - version = "3001.1.8.3"; - sha256 = "1pacv0qxfs7l71xvf9amd7qsw5g725qbrm8r6fgdb2awyl925sf4"; - buildDepends = [ - extensibleExceptions MonadCatchIOMtl mtl network parsec xhtml - ]; + version = "3001.1.8.4"; + sha256 = "1h0ynrrda18g5pn1sw2n94rhhp3k39nb7wmx53b52dhxkp2izlgn"; + buildDepends = [ MonadCatchIOMtl mtl network parsec xhtml ]; meta = { homepage = "http://andersk.mit.edu/haskell/cgi/"; description = "A library for writing CGI programs"; diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 1a5ef7b4f70..cf4c17ceb45 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "conduit"; - version = "1.0.4.2"; - sha256 = "11xrqn7jc4vccfwds6hy0d3jpm0d0ycwaszv18xk237zwl63w159"; + version = "1.0.5"; + sha256 = "0w8japlx0darpf67ki753l0kw64lgisr1dww3alfwjlya0k84z65"; buildDepends = [ liftedBase mmorph monadControl resourcet text transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix index 402e80f6c34..a888b0e6242 100644 --- a/pkgs/development/libraries/haskell/crypto-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-api/default.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "crypto-api"; - version = "0.11"; - sha256 = "1v42dmm4cx8brb5mpz34wa20c3s27r0v7qiqlb54svzsl0jkfmiy"; + version = "0.12"; + sha256 = "09ra5bz2s5n2zq57n6ylsj7a482bsxpxhybmp04g796h87xgy7xs"; buildDepends = [ cereal entropy tagged transformers ]; jailbreak = true; meta = { - homepage = "http://trac.haskell.org/crypto-api/wiki"; + homepage = "https://github.com/TomMD/crypto-api"; description = "A generic interface for cryptographic operations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index eca7e52fe90..b7624499dd3 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.5.1"; - sha256 = "04z8z7bipa40xnjr8civ1sj3df2iyvlv929ibkrdqv87gj0qv2dp"; + version = "0.5.2"; + sha256 = "0ncqwr2a9nxl6q7qys9gb5db62lx622g5db1xhpfni045x324kbz"; buildDepends = [ cereal conduit cryptoApi transformers ]; testDepends = [ cereal conduit cryptoApi cryptocipher cryptohashCryptoapi hspec diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index 81cfdac0151..5ccb1e7e0ce 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -1,9 +1,10 @@ -{ cabal }: +{ cabal, asn1Types }: cabal.mkDerivation (self: { pname = "crypto-pubkey-types"; - version = "0.2.0"; - sha256 = "1arzkyxcm1ffnwk7imxkwvyi20dp8n960vzj7cbl7fhv3j04c9xq"; + version = "0.3.2"; + sha256 = "12gzx4mj8rc243vvjkzvrxnj2f7x3z86yfgahx3my5vsaw4bix2h"; + buildDepends = [ asn1Types ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; description = "Generic cryptography Public keys algorithm types"; diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index dc088551877..3db4dc2b9c1 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey"; - version = "0.1.2"; - sha256 = "1law5l7j0r0v89dnibmaipjp0yshffq10xs4rvg2j247v29lhns5"; + version = "0.1.3"; + sha256 = "154bclz7mg2v7q72y6y0ylw0b28527nsmc8f6zf6ja5l9c9skw0g"; buildDepends = [ cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandomApi ]; diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 12392e43925..0aff493ac87 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -1,17 +1,16 @@ { cabal, cereal, cipherAes, cipherRc4, cpu, cryptoApi, cryptohash -, cryptoPubkeyTypes, entropy, primitive, QuickCheck, tagged -, testFramework, testFrameworkQuickcheck2, vector +, entropy, primitive, QuickCheck, testFramework +, testFrameworkQuickcheck2, vector }: cabal.mkDerivation (self: { pname = "cryptocipher"; - version = "0.4.0"; - sha256 = "1qbnhzbzypin7h62sn2sibij7clsgmaiq24q3xhgbjrirb6bhqf0"; + version = "0.5.0"; + sha256 = "16gqsy23y3g9089ng94124g5pvc4d0vnh2r47ii789f8j96062nd"; isLibrary = true; isExecutable = true; buildDepends = [ - cereal cipherAes cipherRc4 cpu cryptoApi cryptoPubkeyTypes - primitive tagged vector + cereal cipherAes cipherRc4 cpu cryptoApi primitive vector ]; testDepends = [ cryptoApi cryptohash entropy QuickCheck testFramework diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix index 01561f426c5..1e1174ad303 100644 --- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix +++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix @@ -8,6 +8,7 @@ cabal.mkDerivation (self: { diagramsContrib diagramsCore diagramsLib diagramsSvg ]; noHaddock = true; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative vector graphics"; diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index ae466ad2623..fc99e80ddad 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -10,6 +10,7 @@ cabal.mkDerivation (self: { active colour dataDefault diagramsCore monoidExtras newtype NumInstances semigroups vectorSpace ]; + jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix index 1d86fa26d7b..ac489da34d9 100644 --- a/pkgs/development/libraries/haskell/fsnotify/default.nix +++ b/pkgs/development/libraries/haskell/fsnotify/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "fsnotify"; - version = "0.0.8"; - sha256 = "05vfiddp5m28rm02ci7fcfg1zgw5ydj084173mpp1w124bfqf940"; + version = "0.0.11"; + sha256 = "03m911pncyzgfdx4aj38azbbmj25fdm3s9l1w27zv0l730fy8ywq"; buildDepends = [ hinotify systemFileio systemFilepath text time ]; testDepends = [ Cabal Glob hinotify hspec QuickCheck random systemFileio @@ -13,7 +13,7 @@ cabal.mkDerivation (self: { ]; doCheck = false; meta = { - description = "Cross platform library for file creation, modification, and deletion notification"; + description = "Cross platform library for file change notification"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.simons ]; diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix index 6213734881d..6e7450d099a 100644 --- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -1,10 +1,10 @@ -{ cabal, transformers }: +{ cabal, binary, transformers }: cabal.mkDerivation (self: { pname = "ghc-heap-view"; - version = "0.4.2.0"; - sha256 = "0c9yz47j0ddy0l04dabglc99hl7n9wwnz4xj9r8ljafag6l221gp"; - buildDepends = [ transformers ]; + version = "0.5.0.1"; + sha256 = "1zqzv6r4nkzam51bb6pp2i1kkzhx5mnaqcn8wzr0hxbi5lc1088h"; + buildDepends = [ binary transformers ]; meta = { description = "Extract the heap representation of Haskell values and thunks"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index 5b87923f06b..8b6dc19653f 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-vis"; - version = "0.6.1.1"; - sha256 = "1fg8bxkhw2s3y8w0ljnnqbf8f5ld17p70v4aikc26ybmb0938yl6"; + version = "0.7.0.1"; + sha256 = "0k6pm1lqmcmgdqzcdbygdyg6bgx4k0gi77k1mxwprgr9vv3ly26w"; buildDepends = [ cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 890636e2150..78711cc7c44 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "github"; - version = "0.6.0"; - sha256 = "1bg443rhh57p10q9dwx4aa2964qwg00swmdlvh1r72c343lrv1gj"; + version = "0.7.0"; + sha256 = "0r803hpyyd0nfhlk5jn4ripzi2cpj708zp9g961g7wvvvi66013p"; buildDepends = [ aeson attoparsec caseInsensitive conduit dataDefault failure HTTP httpConduit httpTypes network text time unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix b/pkgs/development/libraries/haskell/hashable/1.2.0.7.nix similarity index 56% rename from pkgs/development/libraries/haskell/hashable/1.2.0.5.nix rename to pkgs/development/libraries/haskell/hashable/1.2.0.7.nix index d7d89ee8612..b97d168d412 100644 --- a/pkgs/development/libraries/haskell/hashable/1.2.0.5.nix +++ b/pkgs/development/libraries/haskell/hashable/1.2.0.7.nix @@ -1,10 +1,17 @@ -{ cabal, text }: +{ cabal, HUnit, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text +}: cabal.mkDerivation (self: { pname = "hashable"; - version = "1.2.0.5"; - sha256 = "0frqr294bsx4i21xxd5pw59xpaf0nww0dh4bqn0ywblsm9c7nyqh"; + version = "1.2.0.7"; + sha256 = "1v70b85g9kx0ikgxpiqpl8dp3w9hdxm75h73g69giyiy7swn9630"; buildDepends = [ text ]; + testDepends = [ + HUnit QuickCheck random testFramework testFrameworkHunit + testFrameworkQuickcheck2 text + ]; + doCheck = false; meta = { homepage = "http://github.com/tibbe/hashable"; description = "A class for types that can be converted to a hash value"; diff --git a/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix b/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix deleted file mode 100644 index 9dff76cfe47..00000000000 --- a/pkgs/development/libraries/haskell/haskeline/0.6.4.7.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ cabal, extensibleExceptions, filepath, mtl, terminfo, utf8String -}: - -cabal.mkDerivation (self: { - pname = "haskeline"; - version = "0.6.4.7"; - sha256 = "18ma4i2i6hx8bhbkh1d7mqzsqbfj0zc2bkv3czjyylizqwhpq6ih"; - buildDepends = [ - extensibleExceptions filepath mtl terminfo utf8String - ]; - configureFlags = "-fterminfo"; - meta = { - homepage = "http://trac.haskell.org/haskeline"; - description = "A command-line interface for user input, written in Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ - self.stdenv.lib.maintainers.andres - self.stdenv.lib.maintainers.simons - ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix b/pkgs/development/libraries/haskell/haskeline/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/haskeline/0.7.0.3.nix rename to pkgs/development/libraries/haskell/haskeline/default.nix diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index f0edce80233..e00c07d83a8 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -1,14 +1,14 @@ -{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, regexpr, safe -, split, time, transformers, utf8String +{ cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow +, regexCompat, regexpr, safe, split, time, transformers, utf8String }: cabal.mkDerivation (self: { pname = "hledger-lib"; - version = "0.19.3"; - sha256 = "1wn72ycy1hvcn2ikaplq446hggpkbabyj1d8201vajwn862waxra"; + version = "0.20"; + sha256 = "040r797whajgy5xvb8ixlj5w8izx2q42mgd5554pzvjys18lsb5j"; buildDepends = [ - cmdargs csv filepath HUnit mtl parsec regexpr safe split time - transformers utf8String + cmdargs csv filepath HUnit mtl parsec prettyShow regexCompat + regexpr safe split time transformers utf8String ]; meta = { homepage = "http://hledger.org"; diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index c33026f5fd6..494e729e741 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -1,30 +1,26 @@ { cabal, blazeHtml, blazeMarkup, clientsession, cmdargs , dataDefault, filepath, hamlet, hjsmin, hledger, hledgerLib -, httpConduit, HUnit, ioStorage, monadControl, networkConduit -, parsec, regexpr, safe, shakespeareCss, shakespeareJs -, shakespeareText, text, time, transformers, wai, waiExtra, warp -, yaml, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic -, yesodTest +, httpConduit, HUnit, monadControl, networkConduit, parsec, regexpr +, safe, shakespeareCss, shakespeareJs, shakespeareText, text, time +, transformers, wai, waiExtra, waiHandlerLaunch, warp, yaml, yesod +, yesodCore, yesodDefault, yesodForm, yesodStatic, yesodTest }: cabal.mkDerivation (self: { pname = "hledger-web"; - version = "0.19.3"; - sha256 = "1kx5mn6drm90clz132vrd2lkssm73hlwvxb9cxg6z82i5qa9jqn9"; + version = "0.20"; + sha256 = "0imjr2cl68f6xp1vqv35z6pvbdmlbr9knsydwiazmw5s13r8sj21"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml blazeMarkup clientsession cmdargs dataDefault filepath - hamlet hjsmin hledger hledgerLib httpConduit HUnit ioStorage - monadControl networkConduit parsec regexpr safe shakespeareCss - shakespeareJs shakespeareText text time transformers wai waiExtra - warp yaml yesod yesodCore yesodDefault yesodForm yesodStatic + hamlet hjsmin hledger hledgerLib httpConduit HUnit monadControl + networkConduit parsec regexpr safe shakespeareCss shakespeareJs + shakespeareText text time transformers wai waiExtra + waiHandlerLaunch warp yaml yesod yesodCore yesodDefault yesodForm + yesodStatic ]; testDepends = [ yesodCore yesodDefault yesodTest ]; - patchPhase = '' - sed -r -i -e 's|blaze-html * >= 0.5 *&& < 0.6|blaze-html >= 0.5|' hledger-web.cabal - ''; - jailbreak = true; doCheck = false; meta = { homepage = "http://hledger.org"; diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 8de78340b1c..b840242dd88 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hledger"; - version = "0.19.3"; - sha256 = "1kxkv2dwl5ir2vqvbi1ppbwns8mw1lkg5lkfdkdwwbjj7dq0ysr6"; + version = "0.20"; + sha256 = "1jdh01y8jys1ha3qrmx509ka4wb1bgv28xz3rwz8aklz2nfzn4zb"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index 8378a3dd921..3ed061ba115 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "http-reverse-proxy"; - version = "0.1.1.4"; - sha256 = "0j77hp1ddbxrsv65xf6kqbl8jnvl6qzx98p0lg73j7s76j7vg9cd"; + version = "0.1.1.6"; + sha256 = "0fh61rm3k00shzis2dkgifnkfn78vx124dzmmdzlf550kjmhxb9l"; buildDepends = [ blazeBuilder caseInsensitive classyPrelude conduit dataDefault httpConduit httpTypes liftedBase monadControl network diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix index e085cebcef5..f48db1d12be 100644 --- a/pkgs/development/libraries/haskell/io-choice/default.nix +++ b/pkgs/development/libraries/haskell/io-choice/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "io-choice"; - version = "0.0.2"; - sha256 = "0kxn357cc31gvaajg41h6xwpivq049dl1zd551xfvrvzndvy061f"; + version = "0.0.3"; + sha256 = "1dfl6n3r8hifl9rli2qvwgichz3h7nxq0v6m1k29vb8dv35ldsd8"; buildDepends = [ liftedBase monadControl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index bd3dd503245..05f8f008f86 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.2.0.3"; - sha256 = "1sfrak4jf3mvns9y6iadyhj8zvy4wyrqiaxihrxv2qby14c45psx"; + version = "0.2.0.4"; + sha256 = "0ljqa56gd4760x7x32v75n6a4h8f03p2g4xajaj3917w4w2rf5rp"; buildDepends = [ baseUnicodeSymbols monadControl transformersBase ]; diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix index 21110ffdbe7..db03a6022db 100644 --- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "mainland-pretty"; - version = "0.2.5"; - sha256 = "0h3q7xw69dc0lcqwlacsnv36dlbj0sfgv5imjlqrixy6m5cniq9x"; + version = "0.2.6"; + sha256 = "1mjw79jg0vq8qvgvjdinidw1pvfj3mych3z0f6g031vmqz7fqvzy"; buildDepends = [ srcloc text ]; meta = { homepage = "http://www.eecs.harvard.edu/~mainland/"; diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix index aa794357b9f..4b6431f678c 100644 --- a/pkgs/development/libraries/haskell/monad-control/default.nix +++ b/pkgs/development/libraries/haskell/monad-control/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "monad-control"; - version = "0.3.2"; - sha256 = "1gw1g89cjr993kcxjd1lvj94klrb8hsxn0yzyl1gmfk4273z39pa"; + version = "0.3.2.1"; + sha256 = "17wfdg3a2kkx1jwh7gfgbyx4351b420krsf8syb8l9xrl9gdz5a3"; buildDepends = [ baseUnicodeSymbols transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index bec8f7882f1..b414c2a70f0 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -1,10 +1,12 @@ -{ cabal, resourcePool, resourcet, transformers }: +{ cabal, monadControl, resourcePool, resourcet, transformers }: cabal.mkDerivation (self: { pname = "pool-conduit"; - version = "0.1.1"; - sha256 = "1gaj0gwwbr950jkxhpl326py758j2mvh557xz737js9qcs9g3cg1"; - buildDepends = [ resourcePool resourcet transformers ]; + version = "0.1.2"; + sha256 = "10lvq18pk9d4la5irr1qv1c9y4qbwlglmzgs7bz1d0g5232w3rv8"; + buildDepends = [ + monadControl resourcePool resourcet transformers + ]; meta = { homepage = "http://www.yesodweb.com/book/persistent"; description = "Resource pool allocations via ResourceT"; diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix index d18f711cab3..8cdd36da014 100644 --- a/pkgs/development/libraries/haskell/reflection/default.nix +++ b/pkgs/development/libraries/haskell/reflection/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "reflection"; - version = "1.2.0.1"; - sha256 = "17pzw45yr13nq9y9nb3siypj5amkixy82xm8bpy0nzs1cdfyawx6"; + version = "1.3.1"; + sha256 = "0d81zvyg846jp0xkdkj4220w6hbrnzf46zcxs5qb5frm41rwcsj8"; buildDepends = [ tagged ]; meta = { homepage = "http://github.com/ekmett/reflection"; diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 2421b64b374..aca334e20b2 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "0.4.7"; - sha256 = "0cmh9hhiy0qksigm2rvycyaw58r8357fl6xhv8x465ykw1va0by8"; + version = "0.4.7.1"; + sha256 = "1x9njf5amxv04fvn7fsgpagvzl09sl6bnnx686i554frg66b2azh"; buildDepends = [ liftedBase mmorph monadControl mtl transformers transformersBase ]; diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 486b8a1cc27..3e9a5fb250c 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-css"; - version = "1.0.3"; - sha256 = "0zk4nb4v9x04vkkgbzqanfpqgw9pqinf76l7d85fzclfgwacd0bz"; + version = "1.0.5.1"; + sha256 = "06x57cm9ni7cgdizdwzqzpqdmgzhchax7c4mbqvk3ymgf3lybrss"; buildDepends = [ parsec shakespeare text transformers ]; testDepends = [ hspec HUnit shakespeare text ]; meta = { diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 12a48605d03..d492b6d2505 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "shakespeare-js"; - version = "1.1.3"; - sha256 = "091yygp2gfp290m76iwpjddzgn7qjq1h5f8ma8sd3lvy6pv2pzcz"; + version = "1.1.4"; + sha256 = "05hnqpg1icf6akvchhiam8sd2xkfiyvbwq504gnys55rxgjabfy3"; buildDepends = [ aeson shakespeare text ]; testDepends = [ aeson hspec HUnit shakespeare text ]; meta = { diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 302a6720de4..d90812c21cd 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -1,16 +1,13 @@ -{ cabal, fetchurl, hspec, parsec, text }: +{ cabal, hspec, parsec, systemFileio, systemFilepath, text, time }: cabal.mkDerivation (self: { pname = "shakespeare"; - version = "1.0.4"; - sha256 = "0aqcgfx3y9sbp7wvjmx6rxwi4r13qrfxs9a40gc00np03bpk1hxb"; - buildDepends = [ parsec text ]; - testDepends = [ hspec parsec text ]; - patchFlags = "-p2"; - patches = [ (fetchurl { url = "https://github.com/yesodweb/shakespeare/pull/102.patch"; - sha256 = "02fp87sw7k8zyn8kgmjg8974gi7pp5fyvb4f84i983qycmlmh8xq"; - }) - ]; + version = "1.0.5"; + sha256 = "1dc1yg35pxh45fv20fvnlpas0svqi18h6bdalpjaqjb164s114vf"; + buildDepends = [ parsec systemFileio systemFilepath text time ]; + testDepends = [ + hspec parsec systemFileio systemFilepath text time + ]; meta = { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index f7b3bbd5c41..9bb3efc6503 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -2,11 +2,10 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "1.0.1"; - sha256 = "1mvyq6wp03fs6sjppgalaacargvi69yf5d59k473pgr1g89v4ni1"; + version = "1.0.3"; + sha256 = "15vzydywhwjdgybabvv6lfk1vjs7blvs3k2apwxjdjh2q7jmgkam"; buildDepends = [ cereal cryptoApi tagged ]; testDepends = [ cereal cryptoApi filepath hspec tagged ]; - jailbreak = true; meta = { homepage = "https://github.com/meteficha/skein"; description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 3243fce6a36..9c7c350c517 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -1,22 +1,22 @@ { cabal, aeson, attoparsec, cereal, clientsession, comonad , configurator, directoryTree, dlist, errors, filepath, hashable , heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom -, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, tagged -, text, time, transformers, unorderedContainers, vector -, vectorAlgorithms, xmlhtml +, pwstoreFast, regexPosix, snapCore, snapServer, stm, syb, text +, time, transformers, unorderedContainers, vector, vectorAlgorithms +, xmlhtml }: cabal.mkDerivation (self: { pname = "snap"; - version = "0.11.2.2"; - sha256 = "1fwm60rx2ginlphi00kn3ghs9rxdx4br8p4f3prpfmhvjikwgv8n"; + version = "0.11.3.1"; + sha256 = "0hlwpzrckq89wpa8603j7p3aghlqshrp3kzsdrryf44k24q3vgrj"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec cereal clientsession comonad configurator directoryTree dlist errors filepath hashable heist lens logict MonadCatchIOTransformers mtl mwcRandom pwstoreFast regexPosix - snapCore snapServer stm syb tagged text time transformers + snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/text/0.11.3.1.nix b/pkgs/development/libraries/haskell/text/0.11.3.1.nix new file mode 100644 index 00000000000..8c3de985955 --- /dev/null +++ b/pkgs/development/libraries/haskell/text/0.11.3.1.nix @@ -0,0 +1,25 @@ +{ cabal, deepseq, HUnit, QuickCheck, random, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "text"; + version = "0.11.3.1"; + sha256 = "17smd4h8xiqlggwd3n4j2dszfqsjpjjbjgk9badhkmya8ykd9akn"; + buildDepends = [ deepseq ]; + testDepends = [ + deepseq HUnit QuickCheck random testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + doCheck = false; + meta = { + homepage = "https://github.com/bos/text"; + description = "An efficient packed Unicode text type"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/unordered-containers/default.nix b/pkgs/development/libraries/haskell/unordered-containers/default.nix index 4c3fbbc2e52..df0be2ea477 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/default.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "unordered-containers"; - version = "0.2.3.0"; - sha256 = "1vzgjr9jxdkmgq970ng9zi2j60awvx8iv1v6kzjlrkwzxx1a9dpd"; + version = "0.2.3.1"; + sha256 = "10wz5y42r9b2ym7vl5sqrcawyjixmhy370h0kzpvczs8mlzvrlx8"; buildDepends = [ deepseq hashable ]; testDepends = [ ChasingBottoms hashable HUnit QuickCheck testFramework diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index b8c72a4251e..5b74c74b490 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "uuid"; - version = "1.2.10"; - sha256 = "17njmmh190pg9bpb8iaw2kniyn7z7j70mzdmxr9h29kydl1xmky6"; + version = "1.2.12"; + sha256 = "023954gx1hqf1v4qlzwy3nlxwn9yll0642p16w3vayrahcm27ljb"; buildDepends = [ binary cryptohash maccatcher random time ]; testDepends = [ criterion deepseq HUnit mersenneRandomPure64 QuickCheck random diff --git a/pkgs/development/libraries/haskell/vector-binary-instances/default.nix b/pkgs/development/libraries/haskell/vector-binary-instances/default.nix new file mode 100644 index 00000000000..62d1c0506ed --- /dev/null +++ b/pkgs/development/libraries/haskell/vector-binary-instances/default.nix @@ -0,0 +1,14 @@ +{ cabal, binary, cereal, vector }: + +cabal.mkDerivation (self: { + pname = "vector-binary-instances"; + version = "0.2.1.0"; + sha256 = "028rsf2w193rhs1gic5yvvrwidw9sblczcn10aw64npfc6502l4l"; + buildDepends = [ binary cereal vector ]; + meta = { + homepage = "https://github.com/bos/vector-binary-instances"; + description = "Instances of Data.Binary and Data.Serialize for vector"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index 043a9a925bf..fcc9dcc3ecc 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "1.3.8"; - sha256 = "0lpyrdwgsaxzds6qrh0drp0r90x1va4d7z2n65xb0rhkslr3sk3l"; + version = "1.3.8.1"; + sha256 = "07kzfv8j9x6qhl9kjhyl6gricq88y6ys48vml4chqnd8sg9vki3x"; buildDepends = [ blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable httpTypes liftedBase network networkConduit simpleSendfile diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 8a3beafb8e4..f8f2ca51049 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.2.3"; - sha256 = "1ds6969gbkxgkm2fha0ifmssjl7by9glgix165v0h8i7fx9wx3wa"; + version = "0.8.2.4"; + sha256 = "0gk2h3wfx818jibj51jh5ksrrkghx4ykvdqfji4lrh1mv08ah3d0"; buildDepends = [ aeson attoparsec conduit resourcet text transformers unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 59c2167dc5e..ef919fc1721 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.1.2.2"; - sha256 = "1z1afpr9xbclpwswlbys7f7w8761vvr06hxhqhnqfzf4ky8g3671"; + version = "1.1.2.3"; + sha256 = "15wk7kpr5xdxia07wyx7msfdlyafqn2pkkrzzdfqvij972n17xmh"; buildDepends = [ base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed httpTypes systemFilepath text transformers unixCompat wai diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 1a956f84ca9..09b0f9e2a16 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.1.9.2"; - sha256 = "1rv9mk842b9qwdzal9y5cn2z5z2rl6490600jg1xbsg0x0nl7hdj"; + version = "1.1.9.3"; + sha256 = "16w96lyd0z9slhzggbvmb23yfr3jkwywpmp15kbilwn7ghjlkm41"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/pkgs/development/libraries/javascript/jquery-ui/default.nix index 2334a04f9b8..e2d48f25bb5 100644 --- a/pkgs/development/libraries/javascript/jquery-ui/default.nix +++ b/pkgs/development/libraries/javascript/jquery-ui/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "jquery-ui-1.8.10"; + name = "jquery-ui-1.10.2"; src = fetchurl { - url = "http://jqueryui.com/download/${name}.custom.zip"; - sha256 = "0yglab9zmxr1il2rmxxd7gycpfaavgpi03h8nc5b2yx2kz80jlik"; + url = "http://jqueryui.com/resources/download/${name}.custom.zip"; + sha256 = "0r1fmqpym7bjqhjay9br4h3izky781bsda7v7552yjwkgiv391hl"; }; - sourceRoot = "."; - buildInputs = [ unzip ]; installPhase = diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index b8aaa020972..2de50c4a304 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation (rec { #doCheck = true; # report: No suitable file for testing purposes + enableParallelBuilding = true; + meta = { description = "MIT Kerberos 5"; homepage = webpage; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index 3be67d18040..b2987689be7 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { ''; license = "mBSD"; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 8fbc7da49c2..b1aaaa7f2c8 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,9 +1,9 @@ { fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis , exiv2, libgsf, rpm, pkgconfig -, gtkSupport ? true, glib ? null, gtk ? null +, gtkSupport ? true, glib ? null, gtk3 ? null , videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}: -assert gtkSupport -> glib != null && gtk != null; +assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg != null && libmpeg2 != null; stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { [ libtool gettext zlib bzip2 flac libvorbis exiv2 libgsf rpm pkgconfig - ] ++ stdenv.lib.optionals gtkSupport [ glib gtk ] + ] ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] ++ stdenv.lib.optionals videoSupport [ ffmpeg libmpeg2 ]; configureFlags = "--disable-ltdl-install " diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 386b92f2684..33397e8b98e 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, zlib, ctl, ilmbase }: stdenv.mkDerivation rec { - name = "openexr-1.6.1"; + name = "openexr-1.7.1"; src = fetchurl { url = "http://download.savannah.nongnu.org/releases/openexr/${name}.tar.gz"; diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix index 24a261065eb..f297bd792c7 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix @@ -2,7 +2,7 @@ , gst_plugins_base }: let - version = "4.6.0"; + version = "4.6.3"; pname = "phonon-backend-gstreamer"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "0bwkd1dmj8p4m5xindh6ixfvifq36qmvfn246vx22syqfl6f1m2v"; + sha256 = "0n5ggap1xzspq8x1j9bvnf7wqqh5495sysri7zyg42g32gqp7qjm"; }; buildInputs = [ phonon qt4 gstreamer gst_plugins_base ]; diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index ee449f6471b..ab9cd43d63b 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -14,7 +14,7 @@ with stdenv.lib; -let v = "4.8.3"; in +let v = "4.8.4"; in # TODO: # * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${v}.tar.gz"; - sha256 = "0a67riy4i0xj6j7vmckd0nakras3rl3rzx0r83h1p1i4z5s2kxzi"; + sha256 = "0w1j16q6glniv4hppdgcvw52w72gb2jab35ylkw0qjn5lj5y7c1k"; }; patches = diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index 7a3d6eacde5..c5fac00be14 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -2,11 +2,11 @@ , pkgconfig }: stdenv.mkDerivation rec { - name = "soprano-2.8.0"; + name = "soprano-2.9.0"; src = fetchurl { url = "mirror://sourceforge/soprano/${name}.tar.bz2"; - sha256 = "1israssklrb4mhx2dgkfnabh21ll1jyis1c5c42rc9gi23mkb7ah"; + sha256 = "1sz4d1rqvdhfmbf7afdwdd49ynvjwawhym3qwbld83nydqw274xk"; }; patches = [ ./find-virtuoso.patch ]; diff --git a/pkgs/development/libraries/sqlite/3.6.x.nix b/pkgs/development/libraries/sqlite/3.7.14.nix similarity index 50% rename from pkgs/development/libraries/sqlite/3.6.x.nix rename to pkgs/development/libraries/sqlite/3.7.14.nix index 6a1c02dede1..be3a24c1e4c 100644 --- a/pkgs/development/libraries/sqlite/3.6.x.nix +++ b/pkgs/development/libraries/sqlite/3.7.14.nix @@ -3,18 +3,19 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.6.23.1"; + name = "sqlite-3.7.14.1"; src = fetchurl { - url = "http://www.sqlite.org/sqlite-amalgamation-3.6.23.1.tar.gz"; - sha256 = "0n1maahlqxk7p6kmsv0v2afy6qbv15n85mgkr4ylbf3ghcjdg06h"; + url = http://www.sqlite.org/sqlite-autoconf-3071401.tar.gz; + sha1 = "c464e0e3efe98227c6546b9b1e786b51b8b642fc"; }; - buildInputs = [readline ncurses]; + buildInputs = [ readline ncurses ]; + configureFlags = "--enable-threadsafe"; - NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1"; - NIX_CFLAGS_LINK = if readline != null then "-lncurses" else ""; + CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; + LDFLAGS = if readline != null then "-lncurses" else ""; meta = { homepage = http://www.sqlite.org/; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/3.7.16.nix similarity index 79% rename from pkgs/development/libraries/sqlite/default.nix rename to pkgs/development/libraries/sqlite/3.7.16.nix index 08d0396a53d..231f4e5d69c 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/3.7.16.nix @@ -3,11 +3,11 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.7.16.1"; + name = "sqlite-3.7.16.2"; src = fetchurl { - url = http://www.sqlite.org/2013/sqlite-autoconf-3071601.tar.gz; - sha1 = "b0d9b3e2ca3c50f72e5921e9532130787871b7ae"; + url = http://www.sqlite.org/2013/sqlite-autoconf-3071602.tar.gz; + sha1 = "85bf857cf86f34831d55d7ba97606dba581b8d62"; }; buildInputs = [ readline ncurses ]; diff --git a/pkgs/development/libraries/sqlite/full.nix b/pkgs/development/libraries/sqlite/3.7.9-full.nix similarity index 100% rename from pkgs/development/libraries/sqlite/full.nix rename to pkgs/development/libraries/sqlite/3.7.9-full.nix diff --git a/pkgs/development/tools/documentation/haddock/2.13.1.nix b/pkgs/development/tools/documentation/haddock/2.13.2.nix similarity index 82% rename from pkgs/development/tools/documentation/haddock/2.13.1.nix rename to pkgs/development/tools/documentation/haddock/2.13.2.nix index a932e6ce1e2..a5a63f6c90a 100644 --- a/pkgs/development/tools/documentation/haddock/2.13.1.nix +++ b/pkgs/development/tools/documentation/haddock/2.13.2.nix @@ -2,12 +2,12 @@ cabal.mkDerivation (self: { pname = "haddock"; - version = "2.13.1"; - sha256 = "0zsflbc3ayjsn542sa58zl62dd78ykr489f18sh467hrrnaj4pkf"; + version = "2.13.2"; + sha256 = "1qwj13ks3fzar14s587svv1pdiwk80m7x5pzn74v3jrqkn0xbrr5"; isLibrary = true; isExecutable = true; buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; - testDepends = [ Cabal filepath ]; + testDepends = [ Cabal deepseq filepath ]; buildTools = [ alex happy ]; doCheck = false; meta = { diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 83dc4d72929..44f95543c85 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.43"; - sha256 = "0wffswyx60qig1is3ki5asp8i4wvd3gqg2r811rw0zxwi3nrjiv6"; + version = "1.8.44"; + sha256 = "075m8q933yqzq85m07j9m22f1gh38vjnr04wvpw4h4dl552ivzp6"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index c3f9de4bc89..e1afceebaa2 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] - ++ stdenv.lib.optional gold [dejagnu flex2535 bison /* Some Gold tests require this: */ bc]; + ++ stdenv.lib.optional gold bison; inherit noSysDirs; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index a9b3dec5092..45bd988a471 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -8,7 +8,7 @@ let - basename = "gdb-7.5.1"; + basename = "gdb-7.6"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.bz2"; - sha256 = "084xs90545an51biyy4qd53hsw6p1k6arviq2wlz1a4z526q02q7"; + md5 = "fda57170e4d11cdde74259ca575412a8"; }; # I think python is not a native input, but I leave it diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix new file mode 100644 index 00000000000..fe7b0ba3150 --- /dev/null +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, libusb1 }: + +# IMPORTANT: You need permissions to access the stlink usb devices. Here are +# example udev rules for stlink v1 and v2 so you don't need to have root +# permissions (copied from /49-stlink*.rules): +# +# SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3744", MODE:="0666", SYMLINK+="stlinkv1_%n" +# SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0666", SYMLINK+="stlinkv2_%n" + +stdenv.mkDerivation { + name = "stlink-git20130306"; + + src = fetchgit { + url = git://github.com/texane/stlink.git; + rev = "5be889e3feb75fc7f594012c4855b4dc16940050"; + }; + + buildInputs = [ autoconf automake libtool pkgconfig libusb1 ]; + preConfigure = "./autogen.sh"; + + meta = { + description = "In-circuit debug and programming for ST-Link devices"; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix index 461c602a886..ac1bc2f1abc 100644 --- a/pkgs/development/tools/misc/xxdiff/default.nix +++ b/pkgs/development/tools/misc/xxdiff/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchhg, qt4, flex, bison }: +{ stdenv, fetchhg, qt4, flex, bison, docutils }: stdenv.mkDerivation { - name = "xxdiff-4.0-beta1-20110723"; + name = "xxdiff-2013.03.08"; src = fetchhg { name = "xxdiff"; - tag = "fdc247a7d9e5"; + tag = "6a86d8353eef"; url = https://hg.furius.ca/public/xxdiff; - sha256 = "7ae7d81becc25b1adabc9383bb5b9005dddb31510cdc404ce8a0d6ff6c3dc47e"; + sha256 = "1c1krgmf1cfkrmg48w6zw61wgy01xm171ifkkh6givm8v6c8i340"; }; - nativeBuildInputs = [ flex bison qt4 ]; + nativeBuildInputs = [ flex bison qt4 docutils ]; buildInputs = [ qt4 ]; @@ -23,4 +23,7 @@ stdenv.mkDerivation { ''; installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin"; + + meta.platforms = stdenv.lib.platforms.linux; + } diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index aa7d2f1e914..856d9afe0f9 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -1,17 +1,22 @@ { stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg , libvorbis, freetype, openal, mesa }: + stdenv.mkDerivation rec { name = "alienarena-7.52"; + src = fetchurl { url = "http://icculus.org/alienarena/Files/alienarena-7_52-linux20110929.tar.gz"; sha256 = "1s1l3apxsxnd8lyi568y38a1fcdr0gwmc3lkgq2nkc676k4gki3m"; }; + buildInputs = [ pkgconfig libjpeg libX11 curl libogg libvorbis freetype openal mesa libXxf86vm ]; + patchPhase = '' substituteInPlace ./configure \ --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 ''; + meta = { description = "A free, stand-alone first-person shooter computer game"; longDescription = '' @@ -27,6 +32,6 @@ stdenv.mkDerivation rec { # Engine is under GPLv2, everything else is under license = [ "unfree-redistributable" ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + #platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index 8a706896ba5..ae7938c02b8 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="gnuchess"; - version="6.0.2"; + version="6.0.3"; name="${baseName}-${version}"; - hash="1xd3g28glz2xyjnca0zfw3k0jl5vhgd7wvy4n9km5wnn9z7287l2"; - url="http://ftp.gnu.org/gnu/chess/gnuchess-6.0.2.tar.gz"; - sha256="1xd3g28glz2xyjnca0zfw3k0jl5vhgd7wvy4n9km5wnn9z7287l2"; + hash="01ff8qd8pk39c6pv24wbcqkx78kvay8rxvgxqq9cqp9gqv39jfkw"; + url="http://ftp.gnu.org/gnu/chess/gnuchess-6.0.3.tar.gz"; + sha256="01ff8qd8pk39c6pv24wbcqkx78kvay8rxvgxqq9cqp9gqv39jfkw"; }; buildInputs = [ flex diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index e14b9b26a4f..e920b8c633e 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = http://speed-dreams.sourceforge.net/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric raskin]; - platforms = with stdenv.lib.platforms; linux; + #platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 80f3d72c579..d9955aec3eb 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "A squad-based tactical strategy game in the tradition of X-Com"; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + #platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 63a8f508684..97bd1ab432d 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = http://vdrift.net/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + #platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 3553649dccb..957d7b2c7f4 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,29 +1,37 @@ { stdenv, fetchurl, unzip, SDL, libjpeg, zlib, libvorbis, curl }: + stdenv.mkDerivation rec { name = "xonotic-0.5.0"; + src = fetchurl { url = "http://dl.xonotic.org/${name}.zip"; sha256 = "03vkbddffnz6ws3gkwc3qvi6icfsyiqq0dqw2vw5hj2kidm25rsq"; }; + # Commented out things needed to build cl-release because of errors. #buildInputs = [ libX11 libXpm libXext xf86dgaproto libXxf86dga libXxf86vm mesa ]; buildInputs = [ unzip SDL libjpeg ]; + sourceRoot = "Xonotic/source/darkplaces"; + #patchPhase = '' # substituteInPlace glquake.h \ # --replace 'typedef char GLchar;' '/*typedef char GLchar;*/' #''; - NIX_LDFLAGS=" + + NIX_LDFLAGS = '' -rpath ${zlib}/lib -rpath ${libvorbis}/lib -rpath ${curl}/lib - "; + ''; + buildPhase = '' DP_FS_BASEDIR="$out/share/xonotic" #make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-release make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release ''; + installPhase = '' mkdir -p "$out/bin" cp darkplaces-dedicated "$out/bin/xonotic-dedicated" @@ -32,7 +40,9 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/xonotic" mv data "$out/share/xonotic" ''; + dontPatchELF = true; + meta = { description = "A free fast-paced first-person shooter"; longDescription = '' @@ -46,6 +56,6 @@ stdenv.mkDerivation rec { homepage = http://www.xonotic.org; license = with stdenv.lib.licenses; gpl2Plus; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + #platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix index 50816f99ec6..bfa61169efb 100644 --- a/pkgs/lib/customisation.nix +++ b/pkgs/lib/customisation.nix @@ -34,7 +34,7 @@ rec { overrideDerivation = drv: f: let newDrv = derivation (drv.drvAttrs // (f drv)); - in newDrv // + in addPassthru newDrv ( { meta = drv.meta or {}; passthru = if drv ? passthru then drv.passthru else {}; } @@ -46,7 +46,7 @@ rec { crossDrv = overrideDerivation drv.crossDrv f; nativeDrv = overrideDerivation drv.nativeDrv f; } - else { }); + else { })); # usage: (you can use override multiple times) diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 4c47ee85f47..6d026efa005 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -30,7 +30,7 @@ neznalek = "Vladimír Čunát "; orbitz = "Malcolm Matalka "; page = "Carles Pagès "; - phreedom = "Evgeny Egorochkin "; + phreedom = "Evgeny Egorochkin "; pierron = "Nicolas B. Pierron "; piotr = "Piotr Pietraszkiewicz "; qknight = "Joachim Schiele "; diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix new file mode 100644 index 00000000000..e4eeff9cd54 --- /dev/null +++ b/pkgs/misc/emulators/hatari/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, zlib, SDL, cmake }: + +stdenv.mkDerivation rec { + name = "hatari-1.6.2"; + + src = fetchurl { + url = "http://download.tuxfamily.org/hatari/1.6.2/${name}.tar.bz2"; + sha256 = "0gqvfqqd0lg3hi261rwh6gi2b5kmza480kfzx43d4l49xcq09pi0"; + }; + + # For pthread_cancel + cmakeFlags = "-DCMAKE_EXE_LINKER_FLAGS=-lgcc_s"; + + buildInputs = [ zlib SDL cmake ]; + + meta = { + homepage = "http://hatari.tuxfamily.org/"; + description = "Hatari is an Atari ST/STE/TT/Falcon emulator."; + license = "GPLv2+"; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index fd6d1a6cc7f..19bd931f32f 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; stdenv.mkDerivation rec { - version = "1.5.25"; + version = "1.5.28"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0812ryv1v0gqr13vmvjci09k89qhcr1qs0n052z4zw0vpipjd4rx"; + sha256 = "0ik02c11bp1glafcw82drkmjp8lxrkycvas3jlrvf1rv46blpy0b"; }; gecko = fetchurl { diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix new file mode 100644 index 00000000000..561f2d8e1e7 --- /dev/null +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, python, makeWrapper +, pythonDBus, pygobject, readline, libsndfile, udev, libical, systemd }: + +assert stdenv.isLinux; + +let + pythonpath = "${pythonDBus}/lib/${python.libPrefix}/site-packages:" + + "${pygobject}/lib/${python.libPrefix}/site-packages"; +in + +stdenv.mkDerivation rec { + name = "bluez-5.3"; + + src = fetchurl { + url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; + sha256 = "41b0559e3a8436a739eb7cc79156ca91daf8c115f57971b6bcb422ee0213db42"; + }; + + buildInputs = + [ pkgconfig dbus.libs glib libusb alsaLib python makeWrapper + readline libsndfile udev libical + # Disables GStreamer; not clear what it gains us other than a + # zillion extra dependencies. + # gstreamer gst_plugins_base + ]; + + preConfigure = '' + substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm + substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci " + ''; + + configureFlags = [ + "--localstatedir=/var" + "--enable-library" + "--enable-cups" + "--with-dbusconfdir=$(out)/etc" + "--with-dbussystembusdir=$(out)/share/dbus-1/system-services" + "--with-dbussessionbusdir=$(out)/share/dbus-1/services" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-systemduserunitdir=$(out)/etc/systemd/user" + "--with-udevdir=$(out)/lib/udev" + ]; + + # Work around `make install' trying to create /var/lib/bluetooth. + installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth"; + + makeFlags = "rulesdir=$(out)/lib/udev/rules.d"; + + # FIXME: Move these into a separate package to prevent Bluez from + # depending on Python etc. + postInstall = '' + pushd test + for a in \ + simple-agent \ + test-adapter \ + test-device \ + test-thermometer \ + list-devices \ + monitor-bluetooth \ + ; do + cp $a $out/bin/bluez-$a + wrapProgram $out/bin/bluez-$a --prefix PYTHONPATH : ${pythonpath} + done + popd + ''; + + meta = { + homepage = http://www.bluez.org/; + description = "Bluetooth support for Linux"; + }; +} diff --git a/pkgs/os-specific/linux/kernel/linux-3.0.nix b/pkgs/os-specific/linux/kernel/linux-3.0.nix index fc681e03ebd..42c89217ba3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.0.nix @@ -231,7 +231,7 @@ in import ./generic.nix ( rec { - version = "3.0.74"; + version = "3.0.75"; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -239,7 +239,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "016a16sfvdkjgzwndr985mgqny7cl3rbyz8mrnsh9l55czckiq5x"; + sha256 = "08b4ibyxihsy36n0grg08iywxi23f29s15l3h0sa1dssxxhr1kf9"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 7703b4b4cfb..ef62fae3f52 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -240,7 +240,7 @@ in import ./generic.nix ( rec { - version = "3.2.43"; + version = "3.2.44"; modDirVersion = version; @@ -250,7 +250,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.0/linux-${version}.tar.xz"; - sha256 = "0cg88mdlqs7zj2ndj4i9hmvmxasmgv2fqlpzr87qm7bqkmmb6p58"; + sha256 = "1rlv4j0y75ymj74vwdd2m0z3jzn5lxk1g4cliqmambhycg5jxlb0"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index ed13c282639..0bfb4cc8482 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -245,7 +245,7 @@ in import ./generic.nix ( rec { - version = "3.4.41"; + version = "3.4.42"; testing = false; preConfigure = '' @@ -254,7 +254,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "18zj4biji3vmy7d1gg6lwfpc77856nsfalfpc00vk3pis6yd2k22"; + sha256 = "189rpb5jd073x0fhkh1yqmgg759lpmdj0ldysq57sibs4prb0km2"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.8.nix b/pkgs/os-specific/linux/kernel/linux-3.8.nix index 3ec9ab18155..a8dacfda4a3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.8.nix @@ -252,7 +252,7 @@ in import ./generic.nix ( rec { - version = "3.8.8"; + version = "3.8.10"; testing = false; preConfigure = '' @@ -261,7 +261,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0idybkn574hkb8xp2zs3ahkvmy98qwx4599lanskzq2nfrd065kc"; + sha256 = "0nhjprr1yvkb9fvyjxxdds0j71vidpbqqnmrf0cym3a4l3fxqj5p"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/kernel/linux-3.9.nix b/pkgs/os-specific/linux/kernel/linux-3.9.nix index 0b621dec6c5..764395d2642 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.9.nix @@ -252,9 +252,9 @@ in import ./generic.nix ( rec { - version = "3.9-rc7"; - modDirVersion = "3.9.0-rc7"; - testing = true; + version = "3.9"; + modDirVersion = "3.9.0"; + testing = false; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" @@ -262,7 +262,7 @@ import ./generic.nix ( src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/${if testing then "testing/" else ""}linux-${version}.tar.xz"; - sha256 = "0bl58byszb3pg5dplzc19kgx7gif5cnbfykqqp1jmskpxzf1splx"; + sha256 = "0ha5ym9ssvz14kb8w6zksk4s867mmd07dkfp5kg7iisxxrj3xg30"; }; config = configWithPlatform stdenv.platform; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3f95aee77be..35b35d4e6fa 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { '' # FIXME: patch this in systemd properly (and send upstream). # FIXME: use sulogin from util-linux once updated. - for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in; do + for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in src/journal/cat.c; do test -e $i substituteInPlace $i \ --replace /bin/mount ${utillinux}/bin/mount \ @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { --replace /sbin/swapoff ${utillinux}/sbin/swapoff \ --replace /sbin/fsck ${utillinux}/sbin/fsck \ --replace /bin/echo ${coreutils}/bin/echo \ + --replace /bin/cat ${coreutils}/bin/cat \ --replace /sbin/sulogin ${sysvtools}/sbin/sulogin done diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 2f0b9be96b0..d5768da4c82 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -1,21 +1,19 @@ { stdenv, fetchurl, unzip, jdk, lib }: stdenv.mkDerivation { - name = "jboss-5.1.0.GA"; + name = "jboss-as-7.1.1.Final"; src = fetchurl { - url = mirror://sourceforge/jboss/jboss-5.1.0.GA-jdk6.zip; - sha256 = "0wy5666h554x1qq4w0rzg3krp4rqrijq0ql7dkx6qgl3vpj9xr5y"; + url = http://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz; + sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8"; }; buildInputs = [ unzip ]; - - buildPhase = '' - sed -i -e "/GREP/aJAVA_HOME=${jdk}" bin/run.sh - ''; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; installPhase = '' - mkdir -p $out - cp -av * $out + mv $PWD $out + find $out/bin -name \*.sh -print0 | xargs -0 sed -i -e '/#!\/bin\/sh/aJAVA_HOME=${jdk}' ''; meta = { diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 66bc45de942..463840fcf4c 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2, which, file }: +{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2, which, file, openssl }: stdenv.mkDerivation { name = "lighttpd-1.4.32"; @@ -8,7 +8,9 @@ stdenv.mkDerivation { sha256 = "1hgd9bi4mrak732h57na89lqg58b1kkchnddij9gawffd40ghs0k"; }; - buildInputs = [ pcre libxml2 zlib attr bzip2 which file ]; + buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ]; + + configureFlags = "--with-openssl --with-openssl-libs=${openssl}"; preConfigure = '' sed -i "s:/usr/bin/file:${file}/bin/file:g" configure diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/default.nix index 6d732fde182..9453b8d2cdb 100644 --- a/pkgs/servers/sql/virtuoso/default.nix +++ b/pkgs/servers/sql/virtuoso/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxml2, openssl, readline, gawk }: stdenv.mkDerivation rec { - name = "virtuoso-opensource-6.1.5"; + name = "virtuoso-opensource-6.1.6"; src = fetchurl { url = "mirror://sourceforge/virtuoso/${name}.tar.gz"; - sha256 = "02aax76f51ya5slp1slv4r1ihcb7zpb040n33b581g8n1ppgj2ps"; + sha256 = "0dx0lp7cngdchi0772hp93zzn6sdap7z8s3vay3mzb9xgf0sdgy6"; }; buildInputs = [ libxml2 openssl readline gawk ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index dc8eb85fa7b..6cb4907aa96 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1181,7 +1181,7 @@ let name = "xcb-util-renderutil-0.3.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2; + url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2; sha256 = "0lkl9ij9b447c0br2qc5qsynjn09c4fdz7sd6yp7pyi8az2sb2cp"; }; buildInputs = [pkgconfig gperf m4 libxcb xproto ]; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 1244b50838a..fe17af44c2c 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -85,6 +85,7 @@ let # include it in the result, it *is* available to nix-env for # queries. meta = attrs.meta or {}; + passthru = attrs.passthru or {}; } // # Pass through extra attributes that are not inputs, but # should be made available to Nix expressions using the diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix new file mode 100644 index 00000000000..871dc5e130a --- /dev/null +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, libX11, libXaw}: + +let + name = "autocutsel-0.9.0"; +in +stdenv.mkDerivation { + inherit name; + + src = fetchurl { + url = "http://savannah.nongnu.org/download/autocutsel/${name}.tar.gz"; + sha256 = "0hp335qq57l0kp58pfwb0bk930zx5497frq8y0lzr4icvk1fpw5y"; + }; + + buildInputs = [ libX11 libXaw ]; + installPhase = '' + mkdir -p $out/bin + cp autocutsel $out/bin/ + ''; + + meta = { + homepage = "http://www.nongnu.org/autocutsel/"; + description = "Autocutsel tracks changes in the server's cutbuffer and CLIPBOARD selection."; + license = "GPLv2+"; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 4c7e8997148..23b0aaa55e8 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -23,9 +23,7 @@ stdenv.mkDerivation rec { --replace '"/bin/su"' '"/var/setuid-wrappers/su"' \ --replace '"/bin/true"' '"${coreutils}/bin/true"' - substituteInPlace x11vnc/ssltools.h \ - --replace /bin/su /var/setuid-wrappers/su \ - --replace xdpyinfo ${xorg.xdpyinfo}/bin/xdpyinfo + sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:$PATH\\n"' -e 's|/bin/su|/var/setuid-wrappers/su|g' x11vnc/ssltools.h ''; meta = { diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 2188668d3bf..6b04fe17268 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="622"; + version="625"; name="${baseName}-${version}"; - hash="19avac9spq5kgcgbixd9kvjhy9j0ga75izwqhif44h3jlzdydsmc"; - url="http://mattmahoney.net/dc/zpaq622.zip"; - sha256="19avac9spq5kgcgbixd9kvjhy9j0ga75izwqhif44h3jlzdydsmc"; + hash="0d3ly8l6mzbqxkg68yz7mid3dr056fgr5n49rlkjwcfg533c5gwx"; + url="http://mattmahoney.net/dc/zpaq625.zip"; + sha256="0d3ly8l6mzbqxkg68yz7mid3dr056fgr5n49rlkjwcfg533c5gwx"; }; buildInputs = [ unzip diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index bdc2f832ff3..e683df5a7fe 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -52,5 +52,8 @@ stdenv.mkDerivation { Highly efficient file backup system based on the git packfile format. Capable of doing *fast* incremental backups of virtual machine images. ''; + + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 944b6ea77e1..2d3a67db8c5 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { description = "An ncurses disk usage analyzer."; homepage = http://dev.yorhel.nl/ncdu; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 0f44c67e01c..eb93c9ef4f6 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -10,11 +10,11 @@ assert sslSupport -> openssl != null; assert scpSupport -> libssh2 != null; stdenv.mkDerivation rec { - name = "curl-7.29.0"; + name = "curl-7.30.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "0bw3sclhjqb2zwgcp6njjpaca62rwlj2mrw2r9wic47sqsxfhy4x"; + sha256 = "04dgm9aqvplsx43n8xin5rkr8mwmc6mdd1gcp80jda5yhw1l273b"; }; # Zlib and OpenSSL must be propagated because `libcurl.la' contains @@ -55,8 +55,6 @@ stdenv.mkDerivation rec { inherit sslSupport openssl; }; - patches = [ ./fix-curl-multi-cleanup.patch ]; - preConfigure = '' sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure ''; diff --git a/pkgs/tools/networking/curl/fix-curl-multi-cleanup.patch b/pkgs/tools/networking/curl/fix-curl-multi-cleanup.patch deleted file mode 100644 index f6e42040cb8..00000000000 --- a/pkgs/tools/networking/curl/fix-curl-multi-cleanup.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 249c981407b8c52edf2b0833a78cd3d3d8bd2823 -Author: Shea Levy -Date: Sun Feb 10 13:27:10 2013 -0500 - - curl_multi_cleanup: Don't try to cleanup the closure_handle if it is NULL. - - Without this, curl_multi_cleanup(curl_multi_init()) segfaults. - - Signed-off-by: Shea Levy - -diff --git a/lib/multi.c b/lib/multi.c -index fa0afb9..5b9d0bb 100644 ---- a/lib/multi.c -+++ b/lib/multi.c -@@ -1773,11 +1773,13 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle) - /* Close all the connections in the connection cache */ - close_all_connections(multi); - -- multi->closure_handle->dns.hostcache = multi->hostcache; -- Curl_hostcache_clean(multi->closure_handle); -+ if (multi->closure_handle) { -+ multi->closure_handle->dns.hostcache = multi->hostcache; -+ Curl_hostcache_clean(multi->closure_handle); - -- Curl_close(multi->closure_handle); -- multi->closure_handle = NULL; -+ Curl_close(multi->closure_handle); -+ multi->closure_handle = NULL; -+ } - - Curl_hash_destroy(multi->sockhash); - multi->sockhash = NULL; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 6ed89adee6e..9b3b6238420 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dhcpcd-5.6.7"; + name = "dhcpcd-5.6.8"; src = fetchurl { url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2"; - sha256 = "144cjcjnr85jiwbw5iv3hvn97sc0z25ya3r31cn0wv11jrsw6b0h"; + sha256 = "1i7fv1l0n7q1mnia7g0789ch63x5zhwk5gsrwvs78dv2f2kmvcd3"; }; configureFlags = "--sysconfdir=/etc"; diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix new file mode 100644 index 00000000000..b32c43d0a76 --- /dev/null +++ b/pkgs/tools/networking/filegive/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, fetchgit, go }: + +assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); + +let + + # Code with BSD license + srcNatPMP = fetchgit { + url = "https://code.google.com/p/go-nat-pmp/"; + rev = "e04deda90d56"; + sha256 = "1swwfyzaj3l40yh9np3x4fcracgs79nwryc85sxbdakx8wwxs2xb"; + }; + + version = "0.5.1"; + +in +stdenv.mkDerivation rec { + name = "filegive-${version}"; + + src = fetchurl { + url = "http://viric.name/cgi-bin/filegive/tarball/${name}.tar.gz?uuid=v${version}"; + name = "${name}.tar.gz"; + sha256 = "0b8x2g5c9j5v36s62yzdcnj4b76ahiz1brkilm3mv1qkck2y6wwb"; + }; + + buildInputs = [ go ]; + + buildPhase = '' + ${stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "export GOARM=5"} + + mkdir $TMPDIR/go + export GOPATH=$TMPDIR/go + + GONATPMP=$GOPATH/src/code.google.com/p/go-nat-pmp + mkdir -p $GONATPMP + cp -R ${srcNatPMP}/* $GONATPMP/ + go build -o filegive + ''; + + installPhase = '' + ensureDir $out/bin + cp filegive $out/bin + ''; + + meta = { + homepage = http://viric.name/cgi-bin/filegive; + description = "Easy p2p file sending program"; + license = "AGPLv3+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index aca9b47195d..9587dfee613 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, openssl, pkgconfig, db4 }: stdenv.mkDerivation rec { - name = "isync-1.0.4"; + name = "isync-1.0.6"; src = fetchurl { - url = "mirror://sourceforge/isync/isync-1.0.4.tar.gz"; - sha256 = "1xmgzypl5a3i0fz1ca55vfbs5mv2l9icwf2gk8rvlbwrkn2wid68"; + url = "mirror://sourceforge/isync/${name}.tar.gz"; + sha256 = "0bv3hw6mc9xi55q6lpyz1w3dyrk6rlxa8ny2x1b44mrnbrx7chz5"; }; patches = [ ./isync-recursice-imap.patch ]; # usefull patch to enable subfolders listing diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index af299674fa9..2bc575bbd02 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "lftp-4.4.5"; src = fetchurl { - url = "ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/${name}.tar.xz"; + url = "ftp://ftp.tuwien.ac.at/infosys/browsers/ftp/lftp/${name}.tar.xz"; sha256 = "1p3nxsd2an9pdwc3vgwxy8p5nnjrc7mhilikjaddy62cyvxdbpxq"; }; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 6ecba1add76..1b1aa768a25 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchurl, buildPythonPackage }: +{ pkgs, fetchurl, buildPythonPackage, sqlite3 }: buildPythonPackage rec { version = "6.5.5-rc2"; @@ -12,6 +12,10 @@ buildPythonPackage rec { doCheck = false; + propagatedBuildInputs = [ + sqlite3 + ]; + meta = { description = "OfflineImap synchronizes emails between two repositories, so that you can read the same mailbox from multiple computers."; homepage = "http://offlineimap.org"; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 0c04d76e23f..277e95eac96 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -8,15 +8,15 @@ # some loss of functionality because of it. let - name = "tahoe-lafs-1.8.3"; + name = "tahoe-lafs-1.9.2"; in buildPythonPackage { inherit name; namePrefix = ""; src = fetchurl { - url = "http://tahoe-lafs.org/source/tahoe-lafs/snapshots/allmydata-tahoe-1.8.3.tar.bz2"; - sha256 = "00pm7fvwci5ncg2jhsqsl9r79kn495yni8nmr7p5i98f3siwvjd8"; + url = "http://tahoe-lafs.org/source/tahoe-lafs/snapshots/allmydata-tahoe-1.9.2.tar.bz2"; + sha256 = "0111gmavyrnglx10kj8z7wm7y97fyg9isv71c0gx9kq4c03knxq4"; }; # The patch doesn't apply cleanly to the current version. @@ -37,7 +37,7 @@ buildPythonPackage { -es"|cmd = find_exe.find_exe('twistd')|cmd = ['${twisted}/bin/twistd']|g" sed -i "src/allmydata/util/iputil.py" \ - -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/sbin/ifconfig'|g" + -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g" # Chroots don't have /etc/hosts and /etc/resolv.conf, so work around # that. diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix new file mode 100644 index 00000000000..a057985b48c --- /dev/null +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, libpcap, sqlite }: + +stdenv.mkDerivation rec { + name = "reaver-wps-1.4"; + + src = fetchurl { + url = http://reaver-wps.googlecode.com/files/reaver-1.4.tar.gz; + sha256 = "0bdjai4p8xbsw8zdkkk43rgsif79x0nyx4djpyv0mzh59850blxd"; + }; + + buildInputs = [ libpcap sqlite ]; + + prePatch = '' + cd src + ''; + + preInstall = '' + ensureDir $out/bin + ''; + + meta = { + description = "Brute force attack against Wifi Protected Setup"; + homepage = http://code.google.com/p/reaver-wps; + license = "GPLv2+"; + }; +} diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index a2b9c11eb09..f3153100008 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -29,11 +29,12 @@ stdenv.mkDerivation { # Fix a `conflicting types for 'scandir'' error on Glibc 2.11. ./scandir.patch + ] + ++ stdenv.lib.optional (stdenv.system == "x86_64-linux") # Force use of old memcpy so that installwatch works on Glibc < # 2.14. - ./use-old-memcpy.patch - ]; + ./use-old-memcpy.patch; buildInputs = [gettext]; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index fe409526e71..d66a156c33e 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.5.2pre3082_2398417"; + name = "nix-1.5.2pre3091_772b709"; src = fetchurl { - url = "http://hydra.nixos.org/build/4480483/download/5/${name}.tar.xz"; - sha256 = "efea03fd9e15f52564ecfe6942bf9e8a757ef2e83b6ad9832f214342b2cbba83"; + url = "http://hydra.nixos.org/build/4796316/download/5/${name}.tar.xz"; + sha256 = "f1acf131842d9604d886d5f98aaa4739bea63536023d7287ce48613c38d49fbd"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix new file mode 100644 index 00000000000..2b6cd224371 --- /dev/null +++ b/pkgs/tools/security/munge/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, gnused, perl, libgcrypt, zlib, bzip2 }: + +stdenv.mkDerivation rec { + name = "munge-0.5.10"; + + src = fetchurl { + url = "http://munge.googlecode.com/files/${name}.tar.bz2"; + sha256 = "1imbmpd70vkcpca8d9yd9ajkhf6ik057nr3jb1app1wm51f15q00"; + }; + + buildInputs = [ gnused perl libgcrypt zlib bzip2 ]; + + preConfigure = '' + # Remove the install-data stuff, since it tries to write to /var + sed -i '434,465d' src/etc/Makefile.in + ''; + + configureFlags = [ + "--localstatedir=/var" + ]; + + meta = { + homepage = http://code.google.com/p/munge/; + description = '' + An authentication service for creating and validating credentials + ''; + maintainers = [ stdenv.lib.maintainers.rickynils ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d09d4fffff9..c43449d1956 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -433,18 +433,18 @@ let apg = callPackage ../tools/security/apg { }; xcodeenv = callPackage ../development/mobile/xcodeenv { }; - + titaniumenv_2_1 = import ../development/mobile/titaniumenv { inherit pkgs; pkgs_i686 = pkgsi686Linux; version = "2.1"; }; - + titaniumenv_3_1 = import ../development/mobile/titaniumenv { inherit pkgs; pkgs_i686 = pkgsi686Linux; }; - + titaniumenv = titaniumenv_3_1; inherit (androidenv) androidsdk_4_1; @@ -767,6 +767,8 @@ let file = callPackage ../tools/misc/file { }; + filegive = callPackage ../tools/networking/filegive { }; + fileschanged = callPackage ../tools/misc/fileschanged { }; findutils = callPackage ../tools/misc/findutils { }; @@ -1213,6 +1215,8 @@ let mtutils = callPackage ../tools/text/multitran/mtutils { }; }); + munge = callPackage ../tools/security/munge { }; + muscleframework = callPackage ../tools/security/muscleframework { }; muscletool = callPackage ../tools/security/muscletool { }; @@ -1296,7 +1300,9 @@ let odt2txt = callPackage ../tools/text/odt2txt { }; - offlineimap = callPackage ../tools/networking/offlineimap { }; + offlineimap = callPackage ../tools/networking/offlineimap { + inherit (pythonPackages) sqlite3; + }; opendbx = callPackage ../development/libraries/opendbx { }; @@ -1479,6 +1485,8 @@ let rtmpdump = callPackage ../tools/video/rtmpdump { }; + reaverwps = callPackage ../tools/networking/reaver-wps {}; + recutils = callPackage ../tools/misc/recutils { }; recoll = callPackage ../applications/search/recoll { }; @@ -2488,7 +2496,8 @@ let haskellPackages_ghc742_profiling = recurseIntoAttrs (haskell.packages_ghc742.profiling); haskellPackages_ghc742 = recurseIntoAttrs (haskell.packages_ghc742.highPrio); haskellPackages_ghc761 = haskell.packages_ghc761; - haskellPackages_ghc762 = recurseIntoAttrs (haskell.packages_ghc762); + haskellPackages_ghc762 = haskell.packages_ghc762; + haskellPackages_ghc763 = recurseIntoAttrs haskell.packages_ghc763; # Reasonably current HEAD snapshot. haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; @@ -2507,6 +2516,8 @@ let go = callPackage ../development/compilers/go { }; + go_1_1 = lowPrio (callPackage ../development/compilers/go/1.1.nix { }); + gprolog = callPackage ../development/compilers/gprolog { }; gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; @@ -2903,7 +2914,11 @@ let perl = if system != "i686-cygwin" then perl516 else sysPerl; - php = callPackage ../development/interpreters/php/5.3.nix { }; + php = php54; + + php53 = callPackage ../development/interpreters/php/5.3.nix { }; + + php54 = callPackage ../development/interpreters/php/5.4.nix { }; php_apc = callPackage ../development/libraries/php-apc { }; @@ -3056,6 +3071,8 @@ let autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; + autocutsel = callPackage ../tools/X11/autocutsel{ }; + automake = automake112x; automake110x = callPackage ../development/tools/misc/automake/automake-1.10.x.nix { }; @@ -4997,24 +5014,28 @@ let srtp = callPackage ../development/libraries/srtp {}; - sqlite = lowPrio (callPackage ../development/libraries/sqlite { + sqlite_3_7_16 = lowPrio (callPackage ../development/libraries/sqlite/3.7.16.nix { readline = null; ncurses = null; }); - sqlite36 = callPackage ../development/libraries/sqlite/3.6.x.nix { + sqlite_3_7_14 = lowPrio (callPackage ../development/libraries/sqlite/3.7.14.nix { readline = null; ncurses = null; - }; + }); + + sqlite = sqlite_3_7_16; sqliteInteractive = appendToName "interactive" (sqlite.override { inherit readline ncurses; }); - sqliteFull = lowPrio (callPackage ../development/libraries/sqlite/full.nix { + sqliteFull = lowPrio (callPackage ../development/libraries/sqlite/3.7.9-full.nix { inherit readline ncurses; }); + stlink = callPackage ../development/tools/misc/stlink { }; + stlport = callPackage ../development/libraries/stlport { }; strigi = callPackage ../development/libraries/strigi {}; @@ -5728,7 +5749,10 @@ let bcm43xx = callPackage ../os-specific/linux/firmware/bcm43xx { }; - bluez = callPackage ../os-specific/linux/bluez { }; + bluez4 = callPackage ../os-specific/linux/bluez { }; + bluez5 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5.nix { }); + + bluez = bluez4; beret = callPackage ../games/beret { }; @@ -5965,8 +5989,7 @@ let ]; }; - # low-priority because it is RC - linux_3_9 = lowPrio (makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) { + linux_3_9 = makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) { inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser; kernelPatches = [ @@ -5976,7 +5999,7 @@ let kernelPatches.mips_fpu_sigill kernelPatches.mips_ext3_n32 ]; - }); + }; /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -6081,6 +6104,7 @@ let virtualbox = callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome) libIDL; + enableExtensionPack = config.virtualbox.enableExtensionPack or false; }; virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; @@ -6096,8 +6120,9 @@ let linuxPackages_3_6_rpi = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi); linuxPackages_3_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_7 linuxPackages_3_7); linuxPackages_3_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_8 linuxPackages_3_8); + linuxPackages_3_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_9 linuxPackages_3_9); # Update this when adding a new version! - linuxPackages_latest = pkgs.linuxPackages_3_8; + linuxPackages_latest = pkgs.linuxPackages_3_9; # The current default kernel / kernel modules. linux = linuxPackages.kernel; @@ -6811,6 +6836,8 @@ let inherit (xlibs) libX11; }; + doodle = callPackage ../applications/search/doodle { }; + dunst = callPackage ../applications/misc/dunst { }; dvb_apps = callPackage ../applications/video/dvb-apps { }; @@ -7438,9 +7465,7 @@ let links = callPackage ../applications/networking/browsers/links { }; ledger = callPackage ../applications/office/ledger/2.6.3.nix { }; - ledger3 = callPackage ../applications/office/ledger/3.0.nix { - boost = boost149; - }; + ledger3 = callPackage ../applications/office/ledger/3.0.nix { }; links2 = callPackage ../applications/networking/browsers/links2 { }; @@ -7812,6 +7837,8 @@ let st = callPackage ../applications/misc/st { }; + bittorrentSync = callPackage ../applications/networking/bittorrentsync { }; + dropbox = callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; @@ -8553,6 +8580,12 @@ let libotr = libotr_3_2; }) ../desktops/kde-4.8; + kde410 = kdePackagesFor (pkgs.kde410 // { + boost = boost149; + eigen = eigen2; + libotr = libotr_3_2; + }) ../desktops/kde-4.10; + kdePackagesFor = self: dir: let callPackageOrig = callPackage; in let @@ -8973,6 +9006,8 @@ let gxemul = callPackage ../misc/gxemul { }; + hatari = callPackage ../misc/emulators/hatari { }; + hplip = callPackage ../misc/drivers/hplip { }; # using the new configuration style proposal which is unstable @@ -9214,4 +9249,6 @@ let bullet = callPackage ../development/libraries/bullet {}; + dart = callPackage ../development/interpreters/dart { }; + }; in pkgs diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index a4793077517..58b48b06ffe 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -288,6 +288,12 @@ prefFun = ghcHEADPrefs; }; + packages_ghc763 = + packages { ghcPath = ../development/compilers/ghc/7.6.3.nix; + ghcBinary = ghc704Binary; + prefFun = ghcHEADPrefs; + }; + # Reasonably current HEAD snapshot. Should *always* be lowPrio. packages_ghcHEAD = packages { ghcPath = ../development/compilers/ghc/head.nix; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7c6c237b194..cb5a6176fd1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -130,7 +130,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformArgs_future = self : { inherit (self) cabal ghc; async = self.async_2_0_1_4; # 7.6 ok - cgi = self.cgi_3001_1_8_3; # 7.6 ok + cgi = self.cgi_3001_1_7_5; # 7.6 ok fgl = self.fgl_5_4_2_4; # 7.6 ok GLUT = self.GLUT_2_4_0_0; # 7.6 ok haskellSrc = self.haskellSrc_1_0_1_5; # 7.6 ok @@ -150,14 +150,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); split = self.split_0_2_2; # 7.6 ok stm = self.stm_2_4_2; # 7.6 ok syb = self.syb_0_4_0; # 7.6 ok - text = self.text_0_11_2_3; # 7.6 ok + text = self.text_0_11_3_1; # 7.6 ok transformers = self.transformers_0_3_0_0; # 7.6 ok vector = self.vector_0_10_0_1; # 7.6 ok xhtml = self.xhtml_3000_2_1; # 7.6 ok zlib = self.zlib_0_5_4_1; # 7.6 ok cabalInstall = self.cabalInstall_1_16_0_2; # 7.6 ok alex = self.alex_3_0_5; # 7.6 ok - haddock = self.haddock_2_13_1; # 7.6 ok + haddock = self.haddock_2_13_2; # 7.6 ok happy = self.happy_1_18_10; # 7.6 ok primitive = self.primitive_0_5_0_1; # semi-official, but specified }; @@ -439,7 +439,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); acidState = callPackage ../development/libraries/haskell/acid-state {}; - Agda = callPackage ../development/libraries/haskell/Agda {}; + Agda = callPackage ../development/libraries/haskell/Agda { + hashable = self.hashable_1_1_2_5; + hashtables = self.hashtables.override { hashable = self.hashable_1_1_2_5; }; + unorderedContainers = self.unorderedContainers.override { hashable = self.hashable_1_1_2_5; }; + }; accelerate = callPackage ../development/libraries/haskell/accelerate {}; @@ -599,8 +603,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cgi_3001_1_7_2 = callPackage ../development/libraries/haskell/cgi/3001.1.7.2.nix {}; cgi_3001_1_7_3 = callPackage ../development/libraries/haskell/cgi/3001.1.7.3.nix {}; cgi_3001_1_7_4 = callPackage ../development/libraries/haskell/cgi/3001.1.7.4.nix {}; - cgi_3001_1_8_3 = callPackage ../development/libraries/haskell/cgi/3001.1.8.3.nix {}; - cgi = self.cgi_3001_1_8_3; + cgi_3001_1_7_5 = callPackage ../development/libraries/haskell/cgi/3001.1.7.5.nix {}; + cgi_3001_1_8_4 = callPackage ../development/libraries/haskell/cgi/3001.1.8.4.nix {}; + cgi = self.cgi_3001_1_8_4; Chart = callPackage ../development/libraries/haskell/Chart {}; @@ -993,16 +998,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); happstackHamlet = callPackage ../development/libraries/haskell/happstack/happstack-hamlet.nix {}; hashable_1_1_2_5 = callPackage ../development/libraries/haskell/hashable/1.1.2.5.nix {}; - hashable_1_2_0_5 = callPackage ../development/libraries/haskell/hashable/1.2.0.5.nix {}; - hashable = self.hashable_1_1_2_5; + hashable_1_2_0_7 = callPackage ../development/libraries/haskell/hashable/1.2.0.7.nix {}; + hashable = self.hashable_1_2_0_7; hashedStorage = callPackage ../development/libraries/haskell/hashed-storage {}; hashtables = callPackage ../development/libraries/haskell/hashtables {}; - haskeline_0_6_4_7 = callPackage ../development/libraries/haskell/haskeline/0.6.4.7.nix {}; - haskeline_0_7_0_3 = callPackage ../development/libraries/haskell/haskeline/0.7.0.3.nix {}; - haskeline = self.haskeline_0_7_0_3; + haskeline = callPackage ../development/libraries/haskell/haskeline {}; haskelineClass = callPackage ../development/libraries/haskell/haskeline-class {}; @@ -1788,7 +1791,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); text_0_11_1_13 = callPackage ../development/libraries/haskell/text/0.11.1.13.nix {}; text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {}; text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; - text = self.text_0_11_2_3; + text_0_11_3_1 = callPackage ../development/libraries/haskell/text/0.11.3.1.nix {}; + text = self.text_0_11_3_1; textIcu = callPackage ../development/libraries/haskell/text-icu {}; @@ -1883,6 +1887,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; + vectorBinaryInstances = callPackage ../development/libraries/haskell/vector-binary-instances {}; + vectorSpace = callPackage ../development/libraries/haskell/vector-space {}; vectorSpacePoints = callPackage ../development/libraries/haskell/vector-space-points {}; @@ -2048,8 +2054,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); flapjax = callPackage ../development/compilers/flapjax {}; - idris = callPackage ../development/compilers/idris {}; - pakcs = callPackage ../development/compilers/pakcs {}; # Development tools. @@ -2080,8 +2084,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haddock_2_10_0 = callPackage ../development/tools/documentation/haddock/2.10.0.nix {}; haddock_2_11_0 = callPackage ../development/tools/documentation/haddock/2.11.0.nix {}; haddock_2_12_0 = callPackage ../development/tools/documentation/haddock/2.12.0.nix {}; - haddock_2_13_1 = callPackage ../development/tools/documentation/haddock/2.13.1.nix {}; - haddock = self.haddock_2_13_1; + haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {}; + haddock = self.haddock_2_13_2; happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 64dc04f0bd8..e99065e1089 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -25,10 +25,10 @@ rec { ack = buildPerlPackage rec { - name = "ack-1.92"; + name = "ack-2.02"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "8689156cb0639ff60adee47fc4b77e656cf0fc58e6c123ee6c481d9d48e99b88"; + sha256 = "de5560f2ce6334f3f83bef4ee942fdb09b792f05cf534fe67be3cb0431bf758f"; }; propagatedBuildInputs = [ FileNext ]; meta = { @@ -36,6 +36,10 @@ rec { homepage = http://betterthangrep.com/; license = "free"; # Artistic 2.0 }; + # t/swamp/{0,perl-without-extension} are datafiles for the test + # t/ack-show-types.t, but the perl generic builder confuses them + # for scripts and purifies them, making the test fail. + preCheck = "sed -i '1s,.*,#!/usr/bin/perl -w,' t/swamp/0 t/swamp/perl-without-extension"; }; AlgorithmAnnotate = buildPerlPackage { @@ -76,6 +80,15 @@ rec { }; }; + AlienWxWidgets = buildPerlPackage rec { + name = "Alien-wxWidgets-0.64"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; + sha256 = "1frmvdppzw1vrbk2jvwxh5a5qafl7bigflpgwpkzdg4v9nswgbmx"; + }; + propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ]; + }; + AnyMoose = buildPerlPackage rec { name = "Any-Moose-0.10"; src = fetchurl { @@ -241,6 +254,15 @@ rec { }; }; + BoostGeometryUtils = buildPerlModule rec { + name = "Boost-Geometry-Utils-0.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AA/AAR/${name}.tar.gz"; + sha256 = "0wgd36rxd5lj0vlkp7l9zgx8bgbv0nj4kia83ipb7p64xpyysghg"; + }; + propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsTypemapsDefault ]; + }; + CacheCache = buildPerlPackage rec { name = "Cache-Cache-1.06"; src = fetchurl { @@ -1061,6 +1083,14 @@ rec { }; }; + constant-defer = buildPerlPackage rec { + name = "constant-defer-5"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KR/KRYDE/${name}.tar.gz"; + sha256 = "05fjw2n6liwlillrj3bkfm5fzxw1mcfbxrnk9m18vibx6yzf8pwq"; + }; + }; + ContextPreserve = buildPerlPackage rec { name = "Context-Preserve-0.01"; src = fetchurl { @@ -1368,10 +1398,10 @@ rec { }; DataUUID = buildPerlPackage rec { - name = "Data-UUID-1.217"; + name = "Data-UUID-1.218"; src = fetchurl { url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz"; - sha256 = "0vgykclw1mn06a53d8y3g7s7vanks8078dh2j4jb84djk0cw9h0q"; + sha256 = "1cb4i0j48g5dk2dwzz32myl6wv4ngxqnrkdnixq80pzjcmz1qkpl"; }; }; @@ -1528,10 +1558,10 @@ rec { }; DBI = buildPerlPackage { - name = "DBI-1.616"; + name = "DBI-1.625"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.616.tar.gz; - sha256 = "0m6hk66xprjl314d5c665hnd1vch9a0b9y6ywvmf04kdqj33kkk0"; + url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.625.tar.gz; + sha256 = "1rl1bnirf1hshc0z04vk41qplx2ixzciabvwy50a1sld7vs46q4w"; }; meta = { homepage = http://dbi.perl.org/; @@ -1541,15 +1571,13 @@ rec { }; DBIxClass = buildPerlPackage { - name = "DBIx-Class-0.08210"; + name = "DBIx-Class-0.08250"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.08210.tar.gz; - sha256 = "0sajw5j3zpgf44zaif5sp98xpkdfmzfn76c8anljfx48qh7r22y4"; + url = mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.08250.tar.gz; + sha256 = "0nsqvj34klc9pf4l5kj3nqkq7agbsn11ys4115100awf7gxjbad6"; }; - buildInputs = [ DBDSQLite PackageStash TestException TestWarn ]; + buildInputs = [ DBDSQLite PackageStash TestException TestWarn TestDeep ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ClassMethodModifiers ConfigAny ContextPreserve DataCompare DataDumperConcise DataPage DBI DevelGlobalDestruction HashMerge ModuleFind Moo MROCompat namespaceclean PathClass ScopeGuard SQLAbstract strictures SubName TryTiny ]; - # !!! tests broken with latest sqlite, see http://lists.scsys.co.uk/pipermail/dbix-class/2013-April/011271.html - doCheck = false; meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper"; @@ -1887,11 +1915,20 @@ rec { }; }; - ExtUtilsMakeMaker = buildPerlPackage rec{ - name = "ExtUtils-MakeMaker-6.59"; + ExtUtilsCppGuess = buildPerlModule rec { + name = "ExtUtils-CppGuess-0.07"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "0fwhb2cf5x7y87xwml66p624iynf0mzvhy1q4aq5yv7l3lhwhaby"; + sha256 = "1a77hxf2pa8ia9na72rijv1yhpn2bjrdsybwk2dj2l938pl3xn0w"; + }; + propagatedBuildInputs = [ CaptureTiny ]; + }; + + ExtUtilsMakeMaker = buildPerlPackage rec{ + name = "ExtUtils-MakeMaker-6.66"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + sha256 = "1w9pbjajas60a9i29j8h10nz9jf86w7jb197llnfs9fqcf4yvfha"; }; propagatedBuildInputs = [ ParseCPANMeta version JSONPP CPANMetaYAML CPANMeta @@ -1900,10 +1937,10 @@ rec { }; ExtUtilsManifest = buildPerlPackage rec { - name = "ExtUtils-Manifest-1.59"; + name = "ExtUtils-Manifest-1.61"; src = fetchurl { url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; - sha256 = "0cb7mjmfsk2rlwdr5y91x2w5ffb0yjf9gblibk9wplivlpa48jhs"; + sha256 = "18jj4lrip2g580b2fw5khxvdx6h3pavgihvb87snggrlgabpj20n"; }; }; @@ -1915,6 +1952,23 @@ rec { }; }; + ExtUtilsTypemapsDefault = buildPerlModule rec { + name = "ExtUtils-Typemaps-Default-1.01"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + sha256 = "0k03rr7bmhnn6j0505w9id5apss85yvqnx76hxf3javn3klj1m5z"; + }; + }; + + ExtUtilsXSpp = buildPerlModule rec { + name = "ExtUtils-XSpp-0.1700"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/ExtUtils/${name}.tar.gz"; + sha256 = "1msp79bdjzi59vignfz1cxwk5a2cjiahblvi0ka60pi8nnn0alrm"; + }; + buildInputs = [ Spiffy TestBase TestDifferences ]; + }; + FileChangeNotify = buildPerlModule rec { name = "File-ChangeNotify-0.20"; src = fetchurl { @@ -1998,10 +2052,10 @@ rec { }; FileNext = buildPerlPackage rec { - name = "File-Next-1.06"; + name = "File-Next-1.12"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz"; - sha256 = "36cc0a4e5e4e44e04f7bea6f7453db517acc1a1b35a2b5fe5bc14cea0f560662"; + sha256 = "cc3afd8eaf6294aba93b8152a269cc36a9df707c6dc2c149aaa04dabd869e60a"; }; }; @@ -2199,6 +2253,15 @@ rec { }; }; + GrowlGNTP = buildPerlModule rec { + name = "Growl-GNTP-0.20"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Growl/${name}.tar.gz"; + sha256 = "150x65lwf7pfsygcpmvj3679lhlfwx87xylwnrmwll67f9dpkjdi"; + }; + buildInputs = [ DataUUID CryptCBC ]; + }; + HashFlatten = buildPerlPackage rec { name = "Hash-Flatten-1.19"; src = fetchurl { @@ -3010,6 +3073,49 @@ rec { propagatedBuildInputs = [TimeDate TestPod]; }; + MathLibm = buildPerlPackage rec { + name = "Math-Libm-1.00"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + sha256 = "0xn2a950mzzs5q1c4q98ckysn9dz20x7r35g02zvk35chgr0klxz"; + }; + }; + + MathClipper = buildPerlModule rec { + name = "Math-Clipper-1.19"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + sha256 = "1hrdand4i937bgsr3f3yma5ckkdwkprdwmkyyl37v1vqcjdrjr7j"; + }; + propagatedBuildInputs = [ ModuleBuildWithXSpp ExtUtilsXSpp ExtUtilsTypemapsDefault TestDeep ]; + }; + + MathConvexHullMonotoneChain = buildPerlPackage rec { + name = "Math-ConvexHull-MonotoneChain-0.01"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + sha256 = "1xcl7cz62ydddji9qzs4xsfxss484jqjlj4iixa4aci611cw92r8"; + }; + }; + + MathGeometryVoronoi = buildPerlPackage rec { + name = "Math-Geometry-Voronoi-1.3"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + sha256 = "0b206k2q5cznld45cjhgm0as0clc9hk135ds8qafbkl3k175w1vj"; + }; + propagatedBuildInputs = [ ClassAccessor ParamsValidate ]; + }; + + MathPlanePath = buildPerlPackage rec { + name = "Math-PlanePath-101"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Math/${name}.tar.gz"; + sha256 = "0g24zhgyxs56zv966xb487vvmhqqxvvsbbz4mck8n4l31rabk8jj"; + }; + propagatedBuildInputs = [ MathLibm constant-defer ]; + }; + MathRound = buildPerlPackage rec { name = "Math-Round-0.06"; src = fetchurl { @@ -3060,6 +3166,15 @@ rec { }; }; + ModuleBuildWithXSpp = buildPerlModule rec { + name = "Module-Build-WithXSpp-0.13"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SM/SMUELLER/${name}.tar.gz"; + sha256 = "05c5dssgl7ykj64nkzy4nwfrs0hd1lvfidhflrs3f1c7hc0z9g46"; + }; + propagatedBuildInputs = [ ExtUtilsXSpp ExtUtilsCppGuess ]; + }; + ModuleFind = buildPerlPackage { name = "Module-Find-0.11"; src = fetchurl { @@ -3548,6 +3663,15 @@ rec { buildInputs = [ DBI DBDSQLite ]; }; + NetDBus = buildPerlPackage rec { + name = "Net-DBus-1.0.0"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DA/DANBERR/${name}.tar.gz"; + sha256 = "03srw98nn7r4k6fmnr5bhwsxbhgrsmzdja98jl8b8a72iayg7l5z"; + }; + propagatedBuildInputs = [ pkgs.pkgconfig pkgs.dbus XMLTwig ]; + }; + NetDNS = buildPerlPackage { name = "Net-DNS-0.63"; src = fetchurl { @@ -4234,6 +4358,15 @@ rec { }; }; + Spiffy = buildPerlPackage rec { + name = "Spiffy-0.31"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; + sha256 = "11pnsbyjzpp8y8ss7mrmz8nnbvv5vr7x71f13pwii9m8cam04blj"; + }; + buildInputs = [ ExtUtilsMakeMaker ]; + }; + SpreadsheetParseExcel = buildPerlPackage rec { name = "Spreadsheet-ParseExcel-0.58"; src = fetchurl { @@ -4689,6 +4822,15 @@ rec { buildInputs = [ LogTrace ]; }; + TestBase = buildPerlPackage rec { + name = "Test-Base-0.60"; + src = fetchurl { + url = "mirror://cpan/modules/by-module/Test/${name}.tar.gz"; + sha256 = "0yf030nay85xzas1qxn1nw6lhfsrcbgh3nq7bxbb11nxhvdaj2bx"; + }; + buildInputs = [ Spiffy ]; + }; + TestCheckDeps = buildPerlPackage { name = "Test-CheckDeps-0.002"; src = fetchurl { @@ -5298,18 +5440,18 @@ rec { }; version = buildPerlPackage rec { - name = "version-0.93"; + name = "version-0.9902"; src = fetchurl { url = "mirror://cpan/modules/by-module/version/${name}.tar.gz"; - sha256 = "1lfq27hshq1gvdqksicp22ag8n1aiijhjw68q3r254kp6zimrz69"; + sha256 = "17fdj3hxks33plapj3hinjgmyblnh302z52rq4b9spnz22q5vhww"; }; }; VersionRequirements = buildPerlPackage rec { - name = "Version-Requirements-0.101020"; + name = "Version-Requirements-0.101022"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "18bcfxwn21gcih0bc6p1sp42iis8lwnqh7fpprkniflj8q0ps0x4"; + sha256 = "0gn4cfx28sfsinxbf9lrxg4lzma8bsj99zb66lsg9irplrkx1pgl"; }; }; @@ -5371,6 +5513,18 @@ rec { }; }; + Wx = buildPerlPackage rec { + name = "Wx-0.9922"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MD/MDOOTSON/${name}.tar.gz"; + sha256 = "11x3cvffcyi4b2c6pz9awks3zrg83bg1cwapm4psdiqnd568safw"; + }; + propagatedBuildInputs = [ ExtUtilsXSpp AlienWxWidgets ]; + # Testing requires an X server: + # Error: Unable to initialize GTK+, is DISPLAY set properly?" + doCheck = false; + }; + X11GUITest = buildPerlPackage rec { name = "X11-GUITest-0.21"; src = fetchurl { @@ -5471,6 +5625,7 @@ rec { sha256 = "07zdsfzw9dlrx6ril9clf1jfif09vpf27rz66laja7mvih9izd1v"; }; propagatedBuildInputs = [XMLParser]; + doCheck = false; # requires lots of extra packages }; XMLWriter = buildPerlPackage rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 90f2f67c0ee..8ff21b68dbc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -301,11 +301,11 @@ pythonPackages = python.modules // rec { argparse = buildPythonPackage (rec { - name = "argparse-1.1"; + name = "argparse-1.2.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/a/argparse/${name}.zip"; - sha256 = "ee6da1aaad8b08a74a33eb82264b1a2bf12a7d5aefc7e9d7d40a8f8fa9912e62"; + url = "http://argparse.googlecode.com/files/${name}.tar.gz"; + sha256 = "192174mys40m0bwk6l5jlfnzps0xi81sxm34cqms6dc3c454pbyx"; }; buildInputs = [ pkgs.unzip ]; @@ -891,6 +891,8 @@ pythonPackages = python.modules // rec { md5 = "2ed7b69644a6d8f4e1404e1892329240"; }; + buildInputs = [] ++ optional isPy26 unittest2; + propagatedBuildInputs = [ pythonPackages.beautifulsoup4 pythonPackages.peppercorn @@ -994,7 +996,7 @@ pythonPackages = python.modules // rec { webtest zope_component zope_interface - ]; + ] ++ optional isPy26 unittest2; propagatedBuildInputs = [ chameleon @@ -1198,6 +1200,8 @@ pythonPackages = python.modules // rec { md5 = "df72458bf3dd26a744dcff5ad555c34b"; }; + buildInputs = [] ++ optionals isPy26 [ ordereddict unittest2 ]; + # TODO: https://github.com/malthe/chameleon/issues/139 doCheck = false; @@ -1472,6 +1476,22 @@ pythonPackages = python.modules // rec { }; }; + doxypy = buildPythonPackage rec { + name = "doxypy-0.4.2"; + + src = fetchurl { + url = "http://code.foosel.org/files/${name}.tar.gz"; + sha256 = "1afmb30zmy7942b53qa5vd3js883wwqqls35n8xfb3rnj0qnll8g"; + }; + + meta = { + homepage = http://code.foosel.org/doxypy; + description = "An input filter for Doxygen"; + }; + + doCheck = false; + }; + dtopt = buildPythonPackage rec { name = "dtopt-0.1"; @@ -1507,6 +1527,23 @@ pythonPackages = python.modules // rec { }; + epc = buildPythonPackage rec { + name = "epc-0.0.3"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/e/epc/${name}.tar.gz"; + md5 = "04a93c0cd32b496969ead09f414dac74"; + }; + + propagatedBuildInputs = [ sexpdata ]; + doCheck = false; + + meta = { + description = "EPC (RPC stack for Emacs Lisp) implementation in Python"; + homepage = "https://github.com/tkf/python-epc"; + }; + }; + + eventlet = buildPythonPackage rec { name = "eventlet-0.9.16"; @@ -1624,11 +1661,11 @@ pythonPackages = python.modules // rec { foolscap = buildPythonPackage (rec { - name = "foolscap-0.6.1"; + name = "foolscap-0.6.4"; src = fetchurl { url = "http://foolscap.lothar.com/releases/${name}.tar.gz"; - sha256 = "8b3e4fc678c5c41483b3130666583a1c3909713adcd325204daded7b67171ed5"; + sha256 = "16cddyk5is0gjfn0ia5n2l4lhdzvbjzlx6sfpy7ddjd3d3fq7ckl"; }; propagatedBuildInputs = [ twisted pkgs.pyopenssl ]; @@ -2012,6 +2049,28 @@ pythonPackages = python.modules // rec { }); + limnoria = buildPythonPackage (rec { + name = "limnoria-20130327"; + + src = fetchurl { + url = https://pypi.python.org/packages/source/l/limnoria/limnoria-2013-03-27T16:32:26+0100.tar.gz; + name = "limnoria-2013-03-27.tar.gz"; + sha256 = "0xfaa6h8css3yhsmx5vcffizrz6mvmgm46q7449z3hq7g3793184"; + }; + + propagatedBuildInputs = [ python.modules.sqlite3 ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A modified version of Supybot, an IRC bot"; + homepage = http://supybot.fr.cr; + license = licenses.bsd3; + maintainers = [ maintainers.goibhniu ]; + }; + }); + + lockfile = buildPythonPackage rec { name = "lockfile-0.9.1"; @@ -3732,13 +3791,12 @@ pythonPackages = python.modules // rec { }; }; - requests = buildPythonPackage rec { - name = "requests-1.1.0"; + name = "requests-1.2.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; - md5 = "a0158815af244c32041a3147ee09abf3"; + md5 = "22af2682233770e5468a986f451c51c0"; }; meta = { @@ -3996,6 +4054,22 @@ pythonPackages = python.modules // rec { }); + sexpdata = buildPythonPackage rec { + name = "sexpdata-0.0.2"; + src = fetchurl { + url = "http://pypi.python.org/packages/source/s/sexpdata/${name}.tar.gz"; + md5 = "efc44265bc27cb3d6ffed4fbf5733fc1"; + }; + + doCheck = false; + + meta = { + description = "S-expression parser for Python"; + homepage = "https://github.com/tkf/sexpdata"; + }; + }; + + six = buildPythonPackage rec { name = "six-1.1.0"; @@ -4551,7 +4625,11 @@ pythonPackages = python.modules // rec { md5 = "a1266d4db421963fd3deb172c6689e4b"; }; - buildInputs = [ pkgs.unzip ]; + buildInputs = [ pkgs.unzip ] ++ optionals isPy26 [ pythonPackages.ordereddict + pythonPackages.unittest2 ]; + + # XXX: skipping two tests fails in python2.6 + doCheck = ! isPy26; propagatedBuildInputs = [ nose @@ -4559,7 +4637,6 @@ pythonPackages = python.modules // rec { six beautifulsoup4 waitress - unittest2 mock pyquery wsgiproxy2 @@ -5094,7 +5171,7 @@ pythonPackages = python.modules // rec { md5 = "e7e581af8193551831560a736a53cf58"; }; - propagatedBuildInputs = [ zope_event zope_interface zope_testing ]; + propagatedBuildInputs = [ zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict; # ignore circular dependency on zope_location installCommand = '' diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 98a62047aa5..efd0b4569f8 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -10,10 +10,10 @@ let ghc6123 = "ghc6123"; ghc704 = "ghc704"; ghc742 = "ghc742"; - ghc762 = "ghc762"; + ghc763 = "ghc763"; default = [ ghc742 ]; - defaultOrLater = default ++ [ ghc762 ]; - all = [ ghc6104 ghc6123 ghc704 ghc742 ghc762 ]; + latest = [ ghc763 ]; + all = [ ghc6104 ghc6123 ghc704 ghc742 ghc763 ]; allBut = platform: pkgs.lib.filter (x: platform != x) all; @@ -55,10 +55,10 @@ mapHaskellTestOn { ansiWlPprint = default; asn1Data = default; AspectAG = default; - async = defaultOrLater; + async = default ++ latest; attempt = default; - attoparsecEnumerator = default; attoparsec = default; + attoparsecEnumerator = default; authenticate = default; base64Bytestring = default; baseUnicodeSymbols = default; @@ -67,13 +67,13 @@ mapHaskellTestOn { binaryShared = default; bitmap = default; bktrees = default; - blazeBuilderEnumerator = default; blazeBuilder = default; + blazeBuilderEnumerator = default; blazeHtml = default; blazeTextual = default; bloomfilter = default; bmp = default; - BNFC = defaultOrLater; + BNFC = default ++ latest; BNFCMeta = default; Boolean = default; bytestringMmap = default; @@ -81,8 +81,8 @@ mapHaskellTestOn { bytestringTrie = default; cabal2Ghci = default; cabal2nix = allBut ghc6104; - cabalDev = defaultOrLater; - cabalGhci = defaultOrLater; + cabalDev = default ++ latest; + cabalGhci = default ++ latest; cabalInstall = all; cairo = default; caseInsensitive = default; @@ -94,7 +94,7 @@ mapHaskellTestOn { citeprocHs = default; clientsession = default; cmdargs = default; - cmdlib = defaultOrLater; + cmdlib = default ++ latest; colorizeHaskell = default; colour = default; comonadsFd = default; @@ -106,7 +106,7 @@ mapHaskellTestOn { cookie = default; cpphs = default; cprngAes = default; - criterion = defaultOrLater; + criterion = default ++ latest; cryptoApi = default; cryptocipher = default; Crypto = default; @@ -128,13 +128,13 @@ mapHaskellTestOn { digest = default; digestiveFunctorsHeist = default; digestiveFunctorsSnap = default; - dimensional = defaultOrLater; - dimensionalTf = defaultOrLater; + dimensional = default ++ latest; + dimensionalTf = default ++ latest; directoryTree = default; distributedProcess = default; dlist = default; dns = default; - doctest = defaultOrLater; + doctest = default ++ latest; dotgen = default; doubleConversion = default; Ebnf2ps = default; @@ -153,12 +153,13 @@ mapHaskellTestOn { filestore = default; fingertree = default; flexibleDefaults = default; + fsnotify = [ ghc704 ghc742 ghc763 ]; funcmp = all; gamma = default; gdiff = default; - ghcEvents = default; ghc = default; - ghcMod = defaultOrLater; + ghcEvents = default; + ghcMod = default ++ latest; ghcMtl = default; ghcPaths = default; ghcSybUtils = default; @@ -171,10 +172,10 @@ mapHaskellTestOn { gloss = default; GLUT = all; gnutls = default; - graphviz = defaultOrLater; + graphviz = default ++ latest; gtk = default; gtksourceview2 = default; - hackageDb = defaultOrLater; + hackageDb = default ++ latest; haddock = all; hakyll = default; hamlet = default; @@ -186,9 +187,9 @@ mapHaskellTestOn { hashedStorage = default; haskeline = default; haskellLexer = default; - haskellPlatform = allBut ghc762; - haskellSrcExts = default; + haskellPlatform = allBut ghc763; haskellSrc = all; + haskellSrcExts = default; haskellSrcMeta = default; HaXml = default; haxr = default; @@ -200,14 +201,14 @@ mapHaskellTestOn { hinotify = default; hint = default; Hipmunk = default; - hledger = defaultOrLater; - hledgerInterest = defaultOrLater; - hledgerLib = defaultOrLater; + hledger = default ++ latest; + hledgerInterest = default ++ latest; + hledgerLib = default ++ latest; hledgerWeb = default; - hlint = defaultOrLater; - HList = defaultOrLater; + hlint = default ++ latest; + HList = default ++ latest; hmatrix = default; - hoogle = defaultOrLater; + hoogle = default ++ latest; hopenssl = all; hostname = default; hp2anyCore = default; @@ -218,16 +219,16 @@ mapHaskellTestOn { hsemail = allBut ghc6104; hslogger = default; hsloggerTemplate = default; - hspec = defaultOrLater; + hspec = default ++ latest; hspread = default; HsSyck = default; - HStringTemplate = defaultOrLater; + HStringTemplate = default ++ latest; hsyslog = all; html = all; + HTTP = all; httpConduit = default; httpDate = default; httpdShed = default; - HTTP = all; httpTypes = default; HUnit = all; hxt = default; @@ -260,7 +261,7 @@ mapHaskellTestOn { MonadCatchIOTransformers = default; monadControl = default; monadLoops = default; - monadPar = defaultOrLater; + monadPar = default ++ latest; monadPeel = default; MonadPrompt = default; MonadRandom = default; @@ -288,7 +289,7 @@ mapHaskellTestOn { OpenAL = all; optparseApplicative = allBut ghc6104; packunused = default; - pandoc = defaultOrLater; + pandoc = default ++ latest; pandocTypes = default; pango = default; parallel = all; @@ -299,7 +300,7 @@ mapHaskellTestOn { pathPieces = default; pathtype = default; pcreLight = default; - permutation = defaultOrLater; + permutation = default ++ latest; persistent = default; persistentPostgresql = default; persistentSqlite = default; @@ -313,8 +314,8 @@ mapHaskellTestOn { pwstoreFast = default; QuickCheck2 = default; QuickCheck = all; + random = default ++ latest; randomFu = default; - random = defaultOrLater; randomShuffle = default; randomSource = default; RangedSets = default; @@ -343,13 +344,13 @@ mapHaskellTestOn { Shellac = default; shelly = default; simpleSendfile = default; - smallcheck = defaultOrLater; + smallcheck = default ++ latest; SMTPClient = default; snapCore = default; snap = default; snapLoaderStatic = default; snapServer = default; - split = defaultOrLater; + split = default ++ latest; srcloc = default; stateref = default; StateVar = default; @@ -363,26 +364,26 @@ mapHaskellTestOn { strict = default; strptime = default; svgcairo = default; - syb = [ ghc704 ghc742 ghc762 ]; + syb = [ ghc704 ghc742 ghc763 ]; sybWithClass = default; sybWithClassInstancesText = default; tabular = default; tagged = default; tagsoup = default; - tar = defaultOrLater; + tar = default ++ latest; Tensor = default; terminfo = default; - testFramework = defaultOrLater; - testFrameworkHunit = defaultOrLater; + testFramework = default ++ latest; + testFrameworkHunit = default ++ latest; texmath = default; text = all; thLift = default; timeplot = default; - tlsExtra = default; tls = default; + tlsExtra = default; + transformers = all; transformersBase = default; transformersCompat = default; - transformers = all; tuple = default; typeLlevelNaturalNumber = default; uniplate = default; @@ -395,7 +396,7 @@ mapHaskellTestOn { utilityHt = default; uuagc = default; uuid = default; - uulib = defaultOrLater; + uulib = default ++ latest; uuParsinglib = default; vacuumCairo = default; vacuum = default; @@ -406,32 +407,32 @@ mapHaskellTestOn { vectorSpace = default; vty = default; waiAppStatic = default; - waiExtra = default; wai = default; + waiExtra = default; waiLogger = default; warp = default; + wlPprint = default ++ latest; wlPprintExtras = default; - wlPprint = defaultOrLater; wlPprintTerminfo = default; wxcore = default; - wxdirect = default; wx = default; + wxdirect = default; X11 = default; xhtml = all; xmlConduit = default; xml = default; xmlHamlet = default; xmlTypes = default; - xmobar = defaultOrLater; - xmonadContrib = defaultOrLater; - xmonadExtras = defaultOrLater; - xmonad = defaultOrLater; + xmobar = default ++ latest; + xmonadContrib = default ++ latest; + xmonad = default ++ latest; + xmonadExtras = default ++ latest; xssSanitize = default; yesodAuth = default; yesodCore = default; + yesod = default; yesodDefault = default; yesodForm = default; - yesod = default; yesodJson = default; yesodPersistent = default; yesodStatic = default; @@ -439,8 +440,8 @@ mapHaskellTestOn { zeromqHaskell = default; zipArchive = default; zipper = default; + zlib = all; zlibBindings = default; zlibEnum = default; - zlib = all; } diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index c51f45d6c5f..ba9b20c99de 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -41,7 +41,6 @@ in acl2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; adobeReader = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; agg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - alienarena = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; allegro = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; allegro5 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; alliance = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1594,7 +1593,6 @@ in sourceHighlight = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; spaceOrbit = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; speechd = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - speed_dreams = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; spice = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; spidermonkey_185 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; spin = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1692,7 +1690,6 @@ in udev = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; udev145 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; udisks = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - ufoai = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ufraw = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ultimatestunts = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ultrastardx = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1714,7 +1711,6 @@ in valkyrie = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; vde2 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; vdpauinfo = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - vdrift = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; vectoroids = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; veracity = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; vfdecrypt = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; @@ -1962,7 +1958,6 @@ in xnee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xneur = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xneur_0_8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xonotic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xorg_sys_opengl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xorgVideoUnichrome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xoscope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };