diff --git a/pkgs/desktops/kde-4/support/akode.nix b/pkgs/desktops/kde-4/support/akode.nix index 1385def6b559..8fdf6736572e 100644 --- a/pkgs/desktops/kde-4/support/akode.nix +++ b/pkgs/desktops/kde-4/support/akode.nix @@ -2,12 +2,6 @@ args: with args; stdenv.mkDerivation { name = "akode-2.0.0dev"; - - src = fetchsvn { - url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/akode; - rev = 732646; - md5 = "6629ffedc42c020d2e8645910a4efdf5"; - }; - + src = svnSrc "akode" "0xkzv386wvh16njjv8z84mg3czp7j7n60lwhwns5fwqhx1s30h5y"; buildInputs = [ cmake qt openssl gettext cyrus_sasl alsaLib ]; } diff --git a/pkgs/desktops/kde-4/support/default.nix b/pkgs/desktops/kde-4/support/default.nix index af1dc175bedd..426a5811bd79 100644 --- a/pkgs/desktops/kde-4/support/default.nix +++ b/pkgs/desktops/kde-4/support/default.nix @@ -1,36 +1,22 @@ -args: +oldArgs: +let + args = oldArgs // { + svnSrc = name: hash: + oldArgs.fetchsvn { + url = "svn://anonsvn.kde.org/home/kde/trunk/kdesupport/${name}"; + rev = 747269; + sha256 = hash; + }; + }; +in rec { - qca = (import ./qca.nix) args; akode = (import ./akode.nix) args; - gmm = (import ./gmm.nix) args; eigen = (import ./eigen.nix) args; - taglib = (import ./taglib.nix) args; + gmm = (import ./gmm.nix) args; + qca = (import ./qca.nix) args; + qimageblitz = (import ./qimageblitz.nix) args; soprano = (import ./soprano.nix) args; strigi = (import ./strigi.nix) args; - qimageblitz = (import ./qimageblitz.nix) args; + taglib = (import ./taglib.nix) args; all = [qca gmm eigen taglib soprano strigi qimageblitz]; } -#args: with args; -# -#stdenv.mkDerivation { -# name = "kdesupport-4.0svn-r729462"; -# -# src = fetchsvn { -# url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport; -# rev = 729462; -# md5 = "aa50ec8e5c8d49e1dfd53143345cb4b3"; -# }; -# -# propagatedBuildInputs = [ -# exiv2 -# cmake inputproto kbproto scrnsaverproto xextproto xf86miscproto xf86vidmodeproto -# xineramaproto xproto libICE libX11 libXau libXcomposite libXcursor -# libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXrandr -# libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libxkbfile zlib -# perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2 libxslt expat -# libtool freetype bzip2 shared_mime_info alsaLib libungif cups -# gettext cluceneCore redland stdenv.gcc.libc dbus bison cppunit -# ]; -# CLUCENE_HOME=cluceneCore; -# patchPhase = "sed -e '/set(qca_PLUGINSDIR/s@\${QT_PLUGINS_DIR}@\${CMAKE_INSTALL_PREFIX}/plugins@' -i ../qca/CMakeLists.txt"; -#} diff --git a/pkgs/desktops/kde-4/support/eigen.nix b/pkgs/desktops/kde-4/support/eigen.nix index a3ac9eff3910..163683a29215 100644 --- a/pkgs/desktops/kde-4/support/eigen.nix +++ b/pkgs/desktops/kde-4/support/eigen.nix @@ -2,12 +2,6 @@ args: with args; stdenv.mkDerivation { name = "eigen-1.0.5"; - - src = fetchsvn { - url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/eigen; - rev = 732646; - md5 = "f91ad5d3dd992984fb61107fd9050a36"; - }; - + src = svnSrc "eigen" "0dr2gzrf17bdgxj4f9ibk7x5j7fqwwjsl800dzfvrhgj6v1mxm4x"; buildInputs = [ cmake ]; } diff --git a/pkgs/desktops/kde-4/support/gmm.nix b/pkgs/desktops/kde-4/support/gmm.nix index d32c9b9f765e..843f9f6aaed5 100644 --- a/pkgs/desktops/kde-4/support/gmm.nix +++ b/pkgs/desktops/kde-4/support/gmm.nix @@ -2,12 +2,6 @@ args: with args; stdenv.mkDerivation { name = "gmm-svn"; - - src = fetchsvn { - url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/gmm; - rev = 732646; - md5 = "09ee4cfcbb3c428bc681c2da022648bf"; - }; - + src = svnSrc "gmm" "0qvx9jf17z0mpwy8k6w6bla94gkkslkiv5w98aajfcq34n0zxcpc"; buildInputs = [ cmake ]; } diff --git a/pkgs/desktops/kde-4/support/qca.nix b/pkgs/desktops/kde-4/support/qca.nix index 64b00da91ce7..fda435c7bffe 100644 --- a/pkgs/desktops/kde-4/support/qca.nix +++ b/pkgs/desktops/kde-4/support/qca.nix @@ -2,14 +2,7 @@ args: with args; stdenv.mkDerivation { name = "qca-2.0.0dev"; - - src = fetchsvn { - url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qca; - rev = 732646; - md5 = "1df54bf3bf327b14ea1948f9080717c3"; - }; - + src = svnSrc "qca" "0dycmk8fn57mz2pfxck6d0g833fqg9zrw17789vxb4ks0xz0p3zp"; buildInputs = [ cmake qt openssl gettext cyrus_sasl libgcrypt gnupg ]; - patchPhase = "sed -e '/set(qca_PLUGINSDIR/s@\${QT_PLUGINS_DIR}@\${CMAKE_INSTALL_PREFIX}/plugins@' -i ../CMakeLists.txt"; } diff --git a/pkgs/desktops/kde-4/support/qimageblitz.nix b/pkgs/desktops/kde-4/support/qimageblitz.nix index fe6a03ca7c78..3364b4eac5da 100644 --- a/pkgs/desktops/kde-4/support/qimageblitz.nix +++ b/pkgs/desktops/kde-4/support/qimageblitz.nix @@ -2,12 +2,6 @@ args: with args; stdenv.mkDerivation { name = "qimageblitz-4.0.0svn"; - - src = fetchsvn { - url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qimageblitz; - rev = 732646; - md5 = "c37fa505368071ec501e966225e30c78"; - }; - + src = svnSrc "qimageblitz" "0gi78bald70bc540jqcpa70x23hycywibn4raf5602hv4d5n8mnx"; buildInputs = [cmake qt]; } diff --git a/pkgs/desktops/kde-4/support/soprano.nix b/pkgs/desktops/kde-4/support/soprano.nix index 0f453d726d77..0cb490b9db7e 100644 --- a/pkgs/desktops/kde-4/support/soprano.nix +++ b/pkgs/desktops/kde-4/support/soprano.nix @@ -2,13 +2,7 @@ args: with args; stdenv.mkDerivation { name = "soprano-1.9.0svn"; - - src = fetchsvn { - url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/soprano; - rev = 732646; - md5 = "c3b43544536f0f8061e4afeb9e368072"; - }; - + src = svnSrc "soprano" "02xfp7g41ahxwczkxipyi13rav6akhwgspxdhgk5gm94rg10hq2l"; CLUCENE_HOME=cluceneCore; buildInputs = [ cmake qt cluceneCore redland ]; } diff --git a/pkgs/desktops/kde-4/support/strigi.nix b/pkgs/desktops/kde-4/support/strigi.nix index f0e0fe614be9..d1ec98ea25f9 100644 --- a/pkgs/desktops/kde-4/support/strigi.nix +++ b/pkgs/desktops/kde-4/support/strigi.nix @@ -2,13 +2,7 @@ args: with args; stdenv.mkDerivation { name = "strigi-svn"; - - src = fetchsvn { - url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/strigi; - rev = 732646; - md5 = "15762f5a406ef84bc1cdd776b2ca9a82"; - }; - + src = svnSrc "strigi" "0dp145n93bqp91lvk2n10mghppyhdm3anh1l3a18d20hrvsm42z5"; CLUCENE_HOME=cluceneCore; buildInputs = [ cmake zlib cluceneCore bzip2 libxml2 qt dbus log4cxx stdenv.gcc.libc exiv2 bison cppunit perl ]; diff --git a/pkgs/desktops/kde-4/support/taglib.nix b/pkgs/desktops/kde-4/support/taglib.nix index 6aecb7a91ef2..9a2acc96636b 100644 --- a/pkgs/desktops/kde-4/support/taglib.nix +++ b/pkgs/desktops/kde-4/support/taglib.nix @@ -2,12 +2,6 @@ args: with args; stdenv.mkDerivation { name = "taglib-1.4svn"; - - src = fetchsvn { - url = svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib; - rev = 732646; - md5 = "647d68a76858cf3a667656c486b0a8c2"; - }; - + src = svnSrc "taglib" "1myfgykflbs3l1mrzg4iv8rb1mbd0vpmzl5dnnslfi9b0xg6ydip"; buildInputs = [ cmake zlib ]; }