diff options
25 files changed, 73 insertions, 282 deletions
diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index e1d6a886b674..6f930f84f7be 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchgit, qt4, cmake, libxml2, libxslt}: let + srcComponents = fetchgit { - url = git://git.tuxfamily.org/gitroot/caneda/components.git; - rev = "9ff20b6ad1b8f639441123f195337121f3b02404"; - sha256 = "32f12e72eaadca7b8e409ee12c55fbbdbf43dfa9bc9675ac8458da6393ef3cad"; + url = git://caneda.git.sourceforge.net/gitroot/caneda/components; + rev = "34cd36b620e0dfc57ba2d2b6168734ea9a2cfa9a"; + sha256 = "840f07921eecbf10e38e44e5c61c716295a16c98fbb75016d9a44e7dfee40e59"; }; in @@ -13,9 +14,9 @@ stdenv.mkDerivation rec { name = "caneda-git-2010-10-24"; src = fetchgit { - url = git://git.tuxfamily.org/gitroot/caneda/caneda.git; - rev = "62fc0d8e248705ea51269dce8f291ff69924728e"; - sha256 = "8fa928b7dbd235eff3d938c5a1212ee360c6a90aab7b396eea2f5fe68aba7ab0"; + url = git://caneda.git.sourceforge.net/gitroot/caneda/caneda; + rev = "fff9e2f7988fe5d062548cafeda1e5cd660769d1"; + sha256 = "dfbcac97f5a1b41ad9a63392394f37fb294cbf78c576673c9bc4a5370957b2c8"; }; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; diff --git a/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix index 9d31cc763f21..9810a98551ed 100644 --- a/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix +++ b/pkgs/desktops/kde-4.7/kdegraphics/libkdcraw.nix @@ -1,7 +1,7 @@ -{ kde, kdelibs }: +{ kde, kdelibs, libjpeg, lcms1 }: kde { - buildInputs = [ kdelibs ]; + buildInputs = [ kdelibs libjpeg lcms1 ]; meta = { description = "Library for decoding RAW images"; diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix index 1fbcc40a8147..a12542e38463 100644 --- a/pkgs/development/libraries/haskell/http-date/default.nix +++ b/pkgs/development/libraries/haskell/http-date/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "http-date"; - version = "0.0.1"; - sha256 = "1dqnglz1l6h14339nd5q8sq90fak64ab8fs9fkhf8ipg5y0pzwbd"; + version = "0.0.2"; + sha256 = "18nijf3hswbvcd5amhbccqmgnanmslsmqpd2iixlvwz5hqb3ncvj"; buildDepends = [ attoparsec ]; meta = { description = "HTTP Date parser/formatter"; diff --git a/pkgs/development/libraries/qt-4.x/4.6/default.nix b/pkgs/development/libraries/qt-4.x/4.6/default.nix deleted file mode 100644 index 904e29beae9b..000000000000 --- a/pkgs/development/libraries/qt-4.x/4.6/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ stdenv, fetchurl -, libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu -, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig -, zlib, libjpeg, libpng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib -, mysql, postgresql -, perl, coreutils, libXi, sqlite, alsaLib -, buildDemos ? false, buildExamples ? false, useDocs ? true}: - -stdenv.mkDerivation rec { - name = "qt-4.6.3"; - - src = fetchurl { - url = ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-4.6.3.tar.gz; - sha256 = "f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768"; - }; - - preConfigure = '' - export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" - configureFlags+=" - -docdir $out/share/doc/${name} - -plugindir $out/lib/qt4/plugins - -examplesdir $out/share/doc/${name}/examples - -demosdir $out/share/doc/${name}/demos - -datadir $out/share/qt4 - " - ''; - - propagatedBuildInputs = [ - alsaLib - sqlite - libXft - libXrender - libXrandr - libXi - randrproto - xextproto - libXinerama - xineramaproto - libXcursor - zlib - libjpeg - mysql - postgresql - libpng - which - mesa - libXmu - openssl - dbus.libs - cups - pkgconfig - libXext - freetype - fontconfig - inputproto - fixesproto - libXfixes - glib - libtiff - ]; - - buildInputs = [ perl ]; - - # libQtNetwork will call libQtCore for it to dlopen openssl. - NIX_LDFLAGS = "-rpath ${openssl}/lib"; - # Don't shrink the rpath, to keep ${openssl} in it. - dontPatchELF = 1; - - prefixKey = "-prefix "; - - configureFlags = '' - -v -no-separate-debug-info -release - -system-zlib -system-libpng -system-libjpeg -fast - -qt-gif -confirm-license -opensource - -opengl -xrender -xrandr -xinerama -xcursor -qt-sql-mysql -system-sqlite - -qdbus -cups -glib -xfixes -dbus-linked - -fontconfig -I${freetype}/include/freetype2 - -exceptions -xmlpatterns - ${if buildDemos == true then "" else "-nomake demos"} - ${if buildExamples == true then "" else "-nomake examples"} - ${if useDocs then "" else "-nomake docs"} - ''; - - patchPhase = '' - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - sed -e 's@/usr@/FOO@' -i config.tests/*/*.test -i mkspecs/*/*.conf - ''; - - postInstall = if useDocs then "rm -rf $out/share/doc/${name}/{html,src}" else ""; - - enableParallelBuilding = true; - - meta = { - homepage = http://qt.nokia.com/products; - description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh b/pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh deleted file mode 100644 index f9ecacbbb7df..000000000000 --- a/pkgs/development/libraries/qt-4.x/4.6/setup-hook.sh +++ /dev/null @@ -1,9 +0,0 @@ -export QTDIR=@out@ - -if [ -n "$includeAllQtDirs" ]; then - # This helps for g++, but not for moc. And no qt4 package should expect - # having all qt4 header files dirs into -I. - for d in @out@/include/*; do - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d" - done -fi diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 66e4870aa59c..c611764cc012 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -3,7 +3,7 @@ , gtkmm, libglademm, boost, perl, sqlite }: stdenv.mkDerivation rec { - name = "systemtap-1.2"; + name = "systemtap-1.2-${linux.version}"; src = fetchurl { url = "http://sources.redhat.com/systemtap/ftp/releases/${name}.tar.gz"; diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 1a9b3cbf74dc..d7c9e2c3695e 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchgit, kernel, ...}: +{ stdenv, fetchgit, kernel }: stdenv.mkDerivation { + name = "acpi-call-${kernel.version}"; + src = fetchgit { - url="git://github.com/mkottman/acpi_call.git"; - rev="4f71ce83392bc52b3497"; - sha256="1f20516dc7d42bc7d9d71eaa54f48f38cd56b8683062f81d6f3857990056bdd3"; + url = "git://github.com/mkottman/acpi_call.git"; + rev = "4f71ce83392bc52b3497"; + sha256 = "1f20516dc7d42bc7d9d71eaa54f48f38cd56b8683062f81d6f3857990056bdd3"; }; - name = "acpi-call"; - + preBuild = '' kernelVersion=$(cd ${kernel}/lib/modules && ls) sed -e 's/break/true/' -i test_off.sh diff --git a/pkgs/os-specific/linux/atheros/0.9.4.nix b/pkgs/os-specific/linux/atheros/0.9.4.nix index b139867be603..87470da9649c 100644 --- a/pkgs/os-specific/linux/atheros/0.9.4.nix +++ b/pkgs/os-specific/linux/atheros/0.9.4.nix @@ -17,7 +17,7 @@ postInstall = fullDepEntry ('' '') [minInit doMakeInstall]; in stdenv.mkDerivation rec { - name = "atheros-0.9.4"; + name = "atheros-0.9.4-${kernel.version}"; builder = writeScript (name + "-builder") (textClosure localDefs [doMakeInstall postInstall doForceShare doPropagate]); diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 248e24c90bdb..703895b4f341 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl , kernel, xlibs, which, imake +{ stdenv, fetchurl, kernel, xlibs, which, imake , mesa # for fgl_glxgears , libXxf86vm, xf86vidmodeproto # for fglrx_gamma , xorg, makeWrapper, glibc, patchelf @@ -14,33 +14,32 @@ # The gentoo ebuild contains much more magic.. -let lib = stdenv.lib; - inherit (lib) concatStringsSep; -in # http://wiki.cchtml.com/index.php/Main_Page +assert stdenv.system == "x86_64-linux"; + stdenv.mkDerivation rec { - name = "ati-drivers-${version}"; + name = "ati-drivers-${version}-${kernel.version}"; version = "10-11-x86"; builder = ./builder.sh; inherit libXxf86vm xf86vidmodeproto; - src = - assert stdenv.system == "x86_64-linux"; - fetchurl { + src = fetchurl { url = https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-11-x86.x86_64.run; sha256 = "1z33w831ayx1j5lm9d1xv6whkmzsz9v8li3s8c96hwnwki6zpimr"; }; - buildInputs = [xlibs.libXext xlibs.libX11 - xlibs.libXrandr which imake makeWrapper - patchelf - ]; + buildInputs = + [ xlibs.libXext xlibs.libX11 + xlibs.libXrandr which imake makeWrapper + patchelf + ]; + inherit kernel glibc /* glibc only used for setting interpreter */; - LD_LIBRARY_PATH = concatStringsSep ":" + LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" [ "${xorg.libXrandr}/lib" "${xorg.libXrender}/lib" "${xorg.libXext}/lib" diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index d64701a1d072..502d24d32d8b 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -3,9 +3,11 @@ let version = "0.4.1"; - name = "bbswitch-${version}"; + name = "bbswitch-${version}-${kernel.version}"; -in stdenv.mkDerivation { +in + +stdenv.mkDerivation { inherit name; src = fetchurl { diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 48ab458d402c..e03e4a5cda46 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -6,7 +6,8 @@ let version = "5_100_82_112"; in stdenv.mkDerivation { - name = "broadcom-sta-${version}"; + name = "broadcom-sta-${version}-${kernel.version}"; + src = fetchurl { url = "http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_${bits}-v${version}.tar.gz"; sha256 = if bits == "32" diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix index b4d921580544..709befd9dc5b 100644 --- a/pkgs/os-specific/linux/e1000e/default.nix +++ b/pkgs/os-specific/linux/e1000e/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, kernel }: stdenv.mkDerivation { - name = "e1000e-1.5.1"; + name = "e1000e-1.5.1-${kernel.version}"; src = fetchurl { url = "http://downloads.sourceforge.net/e1000/e1000e-1.5.1.tar.gz"; diff --git a/pkgs/os-specific/linux/exmap/default.nix b/pkgs/os-specific/linux/exmap/default.nix index da5e00e33772..4f9f85e648a0 100644 --- a/pkgs/os-specific/linux/exmap/default.nix +++ b/pkgs/os-specific/linux/exmap/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, kernel, pkgconfig, gtkmm, boost, pcre }: stdenv.mkDerivation rec { - name = "exmap-0.10"; + name = "exmap-0.10-${kernel.version}"; src = fetchurl { url = "http://www.berthels.co.uk/exmap/download/${name}.tgz"; diff --git a/pkgs/os-specific/linux/frandom/default.nix b/pkgs/os-specific/linux/frandom/default.nix index 9f07e7c8eb09..fb2c50a778d5 100644 --- a/pkgs/os-specific/linux/frandom/default.nix +++ b/pkgs/os-specific/linux/frandom/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, kernel }: stdenv.mkDerivation rec { - name = "frandom-1.1"; + name = "frandom-1.1-${kernel.version}"; src = fetchurl { url = "http://sourceforge.net/projects/frandom/files/${name}.tar.gz"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = []; meta = { - description = "A very fast random number generator kernel module."; + description = "A very fast random number generator kernel module"; homepage = http://frandom.sourceforge.net/; license = "GPLv2"; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/os-specific/linux/iscsitarget/default.nix b/pkgs/os-specific/linux/iscsitarget/default.nix index 03d01db27851..214fae01cfcc 100644 --- a/pkgs/os-specific/linux/iscsitarget/default.nix +++ b/pkgs/os-specific/linux/iscsitarget/default.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl, kernel, module_init_tools}: stdenv.mkDerivation rec { - name = "iscsitarget-1.4.20.2"; + name = "iscsitarget-1.4.20.2-${kernel.version}"; + src = fetchurl { url = "mirror://sourceforge/iscsitarget/iscsitarget/1.4.20.2/${name}.tar.gz"; sha256 = "126kp0yc7vmvdbaw2xfav89340b0h91dvvyib5qbvyrq40n8wg0g"; }; KSRC = "${kernel}/lib/modules/*/build"; - DESTDIR="$(out)"; + + DESTDIR = "$(out)"; preConfigure = '' export PATH=$PATH:${module_init_tools}/sbin @@ -18,8 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ module_init_tools ]; meta = { - description = "iSCSI Enterprise Target (IET) software is for building an iSCSI storage system on Linux."; + description = "iSCSI Enterprise Target (IET), software for building an iSCSI storage system on Linux"; license = "GPLv2+"; - homepage = http://iscsitarget.sourceforge.net ; + homepage = http://iscsitarget.sourceforge.net; }; } diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index e1b8c0d28364..e1f347af23cb 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -1,13 +1,4 @@ -{ - stdenv, - fetchurl, - perl, - bison, - mktemp, - linuxHeaders, - linuxHeadersCross, - kernel ? null -}: +{ stdenv, fetchurl, perl, bison, mktemp, linuxHeaders, linuxHeadersCross, kernel ? null }: assert stdenv.isLinux; @@ -17,7 +8,7 @@ let in stdenv.mkDerivation { - name = "klibc-${version}"; + name = "klibc-${version}${stdenv.lib.optionalString (kernel != null) "-${kernel.version}"}"; src = fetchurl { url = "http://ftp.eu.openbsd.org/pub/linux/libs/klibc/1.5/klibc-${version}.tar.bz2"; diff --git a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix deleted file mode 100644 index d9dc076d92f3..000000000000 --- a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix +++ /dev/null @@ -1,38 +0,0 @@ -args : with args; -rec { - name = "kqemu-"+version; - src = fetchurl { - url = http://www.nongnu.org/qemu/kqemu-1.3.0pre11.tar.gz; - sha256 = "03svg2x52ziglf9r9irf6ziiz8iwa731fk1mdskwdip5jxbyy6jl"; - }; - - buildInputs = []; - configureFlags = [''--PREFIx=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'']; - debugStep = fullDepEntry ('' - cat config-host.mak - '') ["minInit"]; - preConfigure = fullDepEntry ('' - sed -e 's/`uname -r`/'"$(basename ${kernel}/lib/modules/*)"'/' -i install.sh - sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh - sed -e '/depmod/d' -i install.sh - cat install.sh - sed -e '/linux\/ioctl.h/a#include <linux\/sched.h>' -i kqemu-linux.c - '') ["minInit" "doUnpack"]; - fixInc = { - text = '' - sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c - ''; - deps = ["minInit" "doUnpack"]; - }; - fixMemFunc = { - text='' - sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c - ''; - deps = ["minInit" "doUnpack"]; - }; - phaseNames = ["fixInc" "fixMemFunc" "preConfigure" "doConfigure" "debugStep" "doMakeInstall"]; - - meta = { - description = "Kernel module for Qemu acceleration"; - }; -} diff --git a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix b/pkgs/os-specific/linux/kqemu/default.nix index a24e65b378f3..c703ca4e4a43 100644 --- a/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix +++ b/pkgs/os-specific/linux/kqemu/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, kernel, perl, fullDepEntry, ... }: +{ stdenv, fetchurl, kernel, perl }: stdenv.mkDerivation rec { - name = "kqemu-1.4.0pre1"; + name = "kqemu-1.4.0pre1-${kernel.version}"; src = fetchurl { url = "http://www.nongnu.org/qemu/${name}.tar.gz"; sha256 = "14dlmawn3gia1j401ag5si5k1a1vav7jpv86rl37p1hwmr7fihxs"; }; - buildInputs = [perl]; + buildInputs = [ perl ]; - configureFlags = [''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'']; + configureFlags = [ ''--PREFIX=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'' ]; - preConfigure = fullDepEntry ('' + preConfigure = '' sed -e '/#include/i#include <linux/sched.h>' -i kqemu-linux.c sed -e 's/memset/mymemset/g; s/memcpy/mymemcpy/g; s/void [*]my/static void *my/g' -i common/kernel.c @@ -20,11 +20,9 @@ stdenv.mkDerivation rec { sed -e '/kernel_path=/akernel_path=$out$kernel_path' -i install.sh sed -e '/depmod/d' -i install.sh cat install.sh - '') ["minInit" "doUnpack"]; + ''; - phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; - meta = { - description = "Kernel module for Qemu acceleration"; + description = "Kernel module for QEMU acceleration"; }; } diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix index 75ff3fba3c6a..c41649e0285b 100644 --- a/pkgs/os-specific/linux/ndiswrapper/default.nix +++ b/pkgs/os-specific/linux/ndiswrapper/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, kernel, perl }: stdenv.mkDerivation { - name = "ndiswrapper-1.56-stable"; + name = "ndiswrapper-1.56-${kernel.version}"; # need at least .config and include inherit kernel; diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix index 807039907784..eccdde30b130 100644 --- a/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/pkgs/os-specific/linux/open-iscsi/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, kernel}: stdenv.mkDerivation rec { - name = "open-iscsi-2.0-871"; + name = "open-iscsi-2.0-871-${kernel.version}"; + src = fetchurl { url = "http://www.open-iscsi.org/bits/${name}.tar.gz"; sha256 = "1jvx1agybaj4czhz41bz37as076spicsmlh5pjksvwl2mr38gsmw"; }; KSRC = "${kernel}/lib/modules/*/build"; - DESTDIR="$(out)"; + DESTDIR = "$(out)"; preConfigure = '' sed -i 's|/usr/|/|' Makefile @@ -17,8 +18,8 @@ stdenv.mkDerivation rec { patches = [./kernel.patch]; meta = { - description = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720."; + description = "A high performance, transport independent, multi-platform implementation of RFC3720"; license = "GPLv2+"; - homepage = http://www.open-iscsi.org ; + homepage = http://www.open-iscsi.org; }; } diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index c8924f91c57a..aedfe9ac6861 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, klibc, kernel, withKlibc ? true}: stdenv.mkDerivation rec { - name = "v86d-0.1.10"; + name = "v86d-0.1.10-${kernel.version}"; src = fetchurl { url = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/${name}.tar.bz2"; diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix index ba00bb6b5987..c0dbf710ffb9 100644 --- a/pkgs/tools/networking/telnet/default.nix +++ b/pkgs/tools/networking/telnet/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { description = "A client and daemon for the Telnet protocol"; homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/; license = "BSD"; + platforms = stdenv.lib.platforms.gnu; }; } diff --git a/pkgs/tools/text/kdiff3/adjust-docbook-xml-version-to-4.2.patch b/pkgs/tools/text/kdiff3/adjust-docbook-xml-version-to-4.2.patch deleted file mode 100644 index fdb96176abd3..000000000000 --- a/pkgs/tools/text/kdiff3/adjust-docbook-xml-version-to-4.2.patch +++ /dev/null @@ -1,45 +0,0 @@ -The DocBook DTD must be 4.2 to validate with KDE 4.5.2. In the upstream release 0.9.95 -of kdiff3 some languages have index.docbook with the 4.1.2 DTD. This patch changes -the version number in the DOCTYPE to 4.2 for these languages. - - -diff -Naur kdiff3-upstream-0.9.95/doc/de/index.docbook kdiff3-0.9.95/doc/de/index.docbook ---- kdiff3-upstream-0.9.95/doc/de/index.docbook 2010-10-18 22:38:40.043252907 -0430 -+++ kdiff3-0.9.95/doc/de/index.docbook 2010-10-18 22:41:05.954329524 -0430 -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kdiff3 "<application - >KDiff3</application - >"> -diff -Naur kdiff3-upstream-0.9.95/doc/fr/index.docbook kdiff3-0.9.95/doc/fr/index.docbook ---- kdiff3-upstream-0.9.95/doc/fr/index.docbook 2010-10-18 22:38:40.043252907 -0430 -+++ kdiff3-0.9.95/doc/fr/index.docbook 2010-10-18 22:41:05.965408604 -0430 -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kdiff3 "<application - >KDiff3</application - >"> -diff -Naur kdiff3-upstream-0.9.95/doc/it/index.docbook kdiff3-0.9.95/doc/it/index.docbook ---- kdiff3-upstream-0.9.95/doc/it/index.docbook 2010-10-18 22:38:40.044252773 -0430 -+++ kdiff3-0.9.95/doc/it/index.docbook 2010-10-18 22:41:05.976408528 -0430 -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kdiff3 "<application - >KDiff3</application - >"> -diff -Naur kdiff3-upstream-0.9.95/doc/nl/index.docbook kdiff3-0.9.95/doc/nl/index.docbook ---- kdiff3-upstream-0.9.95/doc/nl/index.docbook 2010-10-18 22:38:40.043252907 -0430 -+++ kdiff3-0.9.95/doc/nl/index.docbook 2010-10-18 22:41:05.986408860 -0430 -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kdiff3 "<application - >KDiff3</application - >"> diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index a474a036661b..d8807bda08bc 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -1,23 +1,20 @@ -{ stdenv, fetchurl, cmake, qt4, perl, kdelibs, automoc4, phonon, gettext, kde_baseapps }: +{ stdenv, fetchurl, cmake, kdelibs, gettext }: stdenv.mkDerivation rec { - name = "kdiff3-0.9.95"; + name = "kdiff3-0.9.96"; src = fetchurl { url = "mirror://sourceforge/kdiff3/${name}.tar.gz"; - sha256 = "03rg41vdi44wh7kygv46nkzyrirl6qyar901hnlmdwjpi6ycwwh3"; + sha256 = "14fnflp5ansi7b59h8vn81mb8pdqpbanz0qzyw9sxk2pgp24xrqh"; }; - # kdebase allows having a konqueror plugin built - buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon gettext kde_baseapps ]; - - # Adjust the version of the DocBook XML to 4.2 ( so that it validates ). - patches = [ ./adjust-docbook-xml-version-to-4.2.patch ]; + buildInputs = [ kdelibs ]; + buildNativeInputs = [ cmake gettext ]; meta = { homepage = http://kdiff3.sourceforge.net/; license = "GPLv2+"; description = "Compares and merges 2 or 3 files or directories"; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [viric urkud]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14ad4b1cf756..b94e8b047744 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4543,11 +4543,6 @@ let qt4 = pkgs.kde4.qt4; - qt46 = callPackage ../development/libraries/qt-4.x/4.6 { - inherit (gnome) glib; - libpng = pkgs.libpng12; - }; - qt47 = callPackage ../development/libraries/qt-4.x/4.7 { inherit (pkgs.gnome) glib; }; @@ -5901,9 +5896,7 @@ let wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { }; - kqemu = builderDefsPackage ../os-specific/linux/kqemu/1.4.0pre1.nix { - inherit kernel perl; - }; + kqemu = callPackage ../os-specific/linux/kqemu { }; klibc = callPackage ../os-specific/linux/klibc { linuxHeaders = glibc.kernelHeaders; @@ -8453,10 +8446,7 @@ let ### SCIENCE / ELECTRONICS - caneda = callPackage ../applications/science/electronics/caneda { - # At the time of writing, it fails to build with qt47 - qt4 = qt46; - }; + caneda = callPackage ../applications/science/electronics/caneda { }; gtkwave = callPackage ../applications/science/electronics/gtkwave { }; |