about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-19 18:31:02 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-19 18:31:02 +0000
commit0d90c06ba1bf1b7ca8f700ffc908a9718164acaf (patch)
tree4674b18eab3f9435dc4911cb8a12d5f7f007eddd /pkgs
parent512357f875cfa2a6ed9356290ab0b8acb91e0e65 (diff)
downloadnixlib-0d90c06ba1bf1b7ca8f700ffc908a9718164acaf.tar
nixlib-0d90c06ba1bf1b7ca8f700ffc908a9718164acaf.tar.gz
nixlib-0d90c06ba1bf1b7ca8f700ffc908a9718164acaf.tar.bz2
nixlib-0d90c06ba1bf1b7ca8f700ffc908a9718164acaf.tar.lz
nixlib-0d90c06ba1bf1b7ca8f700ffc908a9718164acaf.tar.xz
nixlib-0d90c06ba1bf1b7ca8f700ffc908a9718164acaf.tar.zst
nixlib-0d90c06ba1bf1b7ca8f700ffc908a9718164acaf.zip
Remove some packages with Qt3 dependency
kde3.k3b: use kde4.k3b instead
kde3.kphone: there are many other SIP phones
valknut: last version from 2009, doesn't support new ADC protocol
qdu: latest release in 2004, use kde4.filelight

REVIEWBOARD:5

svn path=/nixpkgs/trunk/; revision=33273
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/k3b/1.0.nix20
-rw-r--r--pkgs/applications/networking/instant-messengers/kphone/default.nix27
-rw-r--r--pkgs/applications/networking/p2p/valknut/builder.sh12
-rw-r--r--pkgs/applications/networking/p2p/valknut/default.nix14
-rw-r--r--pkgs/tools/misc/qdu/default.nix27
-rw-r--r--pkgs/top-level/all-packages.nix12
6 files changed, 0 insertions, 112 deletions
diff --git a/pkgs/applications/misc/k3b/1.0.nix b/pkgs/applications/misc/k3b/1.0.nix
deleted file mode 100644
index bd01174ae599..000000000000
--- a/pkgs/applications/misc/k3b/1.0.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl, kdelibs, x11, zlib, libpng, libjpeg, perl, qt3}:
-
-stdenv.mkDerivation {
-  name = "k3b-1.0.5";
-
-  src = fetchurl {
-    url = mirror://sourceforge/k3b/k3b-1.0.5.tar.bz2;
-    sha256 = "1pshv8na1sr9xcmkr0byjgyl8jmxwcylkl8pwjvripja4fgpkyfl";
-  };
-
-  buildInputs = [kdelibs x11 zlib libpng libjpeg perl qt3];
-
-  configureFlags = "--without-arts";
-
-  meta = {
-    description = "A CD and DVD authoring application for KDE";
-    homepage = http://www.k3b.org/;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/kphone/default.nix b/pkgs/applications/networking/instant-messengers/kphone/default.nix
deleted file mode 100644
index dceb24a48b89..000000000000
--- a/pkgs/applications/networking/instant-messengers/kphone/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, qt3, pkgconfig
-, openssl, libpng, alsaLib, libX11, libXext, libXt, libICE
-, libSM }:
-
-stdenv.mkDerivation {
-  name = "kphone-1.2";
-
-  src = fetchurl {
-    url = mirror://sourceforge/kphone/kphoneSI_1.2.tar.gz;
-    sha256 = "1q309n2gsdsa8d7ff2zwnyc69ngpnnj143dys90dnlmzr9ckhhg3";
-  };
-
-  buildInputs =
-    [ autoconf automake libtool qt3 pkgconfig openssl libpng alsaLib
-      libX11 libXext libXt libICE libSM
-    ];
-    
-  preConfigure = "autoconf";
-
-  meta = {
-    description = "KPhone is a SIP UA for Linux";
-    homepage = http://sourceforge.net/projects/kphone/;
-    license = "GPL";
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/p2p/valknut/builder.sh b/pkgs/applications/networking/p2p/valknut/builder.sh
deleted file mode 100644
index 56f5dd870057..000000000000
--- a/pkgs/applications/networking/p2p/valknut/builder.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-addInputsHook=addBzip2
-addBzip2() {
-    bzip2=$(type -tP bzip2)
-    test -n $bzip2
-    buildInputs="$(dirname $(dirname $bzip2)) $buildInputs"
-}
-
-source $stdenv/setup
-
-export configureFlags="--with-ssl-dir=$openssl --x-libraries=/no-such-dir"
-
-genericBuild
diff --git a/pkgs/applications/networking/p2p/valknut/default.nix b/pkgs/applications/networking/p2p/valknut/default.nix
deleted file mode 100644
index 2290cf523147..000000000000
--- a/pkgs/applications/networking/p2p/valknut/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{stdenv, fetchurl, perl, x11, libxml2, libjpeg, libpng, openssl, qt3, dclib}:
-
-stdenv.mkDerivation {
-  name = "valknut-0.3.7";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://download.berlios.de/dcgui/valknut-0.3.7.tar.bz2;
-    md5 = "848f9b3f25af15c3f1837133ac4b9415";
-  };
-
-  buildInputs = [perl x11 libxml2 libjpeg libpng openssl qt3 dclib];
-  inherit openssl;
-}
diff --git a/pkgs/tools/misc/qdu/default.nix b/pkgs/tools/misc/qdu/default.nix
deleted file mode 100644
index cd9c296a758b..000000000000
--- a/pkgs/tools/misc/qdu/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{stdenv, fetchurl, qt3, libXext, libX11}:
-
-stdenv.mkDerivation {
-  name = "qdu-2.2";
-  src = fetchurl {
-    url = http://artis.imag.fr/~Gilles.Debunne/Code/QDU/qdu-2.2.tar.gz;
-    sha256 = "0nn13lcw7bpasdn5xd0ydkyzirz9zamgl8lizi3ncqdzv8bjm7xl";
-  };
-
-  buildInputs = [ qt3 libXext libX11 ];
-
-  patchPhase = ''
-    sed -i "s@/usr/bin@$out/bin@" qdu.pro
-    sed -i "s@hint>directoryview@hint>directoryView@g" qduInterface.ui
-  '';
-  buildPhase = ''
-    qmake
-    make
-    make install
-  '';
-
-  meta = {
-    homepage = "http://artis.imag.fr/~Gilles.Debunne/Code/QDU";
-    description = "A graphical disk usage tool based on Qt";
-    license="GPL";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 363f85834fe7..83cb9c7eea3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1262,8 +1262,6 @@ let
 
   openmpi = callPackage ../development/libraries/openmpi { };
 
-  qdu = callPackage ../tools/misc/qdu { };
-
   qhull = callPackage ../development/libraries/qhull { };
 
   qjoypad = callPackage ../tools/misc/qjoypad { };
@@ -7415,8 +7413,6 @@ let
     inherit (gnome) libsoup;
   };
 
-  valknut = callPackage ../applications/networking/p2p/valknut { };
-
   vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
 
   veracity = callPackage ../applications/version-management/veracity {};
@@ -7918,14 +7914,6 @@ let
       inherit (pkgs.kde3) kdelibs;
     };
 
-    k3b = callPackage ../applications/misc/k3b/1.0.nix {
-      inherit (kde3) kdelibs;
-    };
-
-    kphone = callPackage ../applications/networking/instant-messengers/kphone {
-      stdenv = overrideGCC stdenv gcc42; # I'm to lazy to clean up header files
-    };
-
   };
 
   kde4 = recurseIntoAttrs pkgs.kde47;