Author: urkud
Date: Fri Dec 16 10:39:22 2011
New Revision: 30928
URL: https://nixos.org/websvn/nix/?rev=30928&sc=1
Log:
Reintegrate branches/drop-kde4.5
Deleted:
nixpkgs/trunk/pkgs/applications/misc/filelight/
nixpkgs/trunk/pkgs/desktops/kde-4.5/
Modified:
nixpkgs/trunk/ (props changed)
nixpkgs/trunk/pkgs/applications/audio/amarok/default.nix
nixpkgs/trunk/pkgs/applications/graphics/xscreensaver/default.nix (props
changed)
nixpkgs/trunk/pkgs/applications/misc/xneur/0.8.nix (props changed)
nixpkgs/trunk/pkgs/applications/networking/browsers/icecat-4/ (props
changed)
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/trunk/pkgs/applications/networking/sync/akunambol/default.nix
nixpkgs/trunk/pkgs/build-support/clang-wrapper/ (props changed)
nixpkgs/trunk/pkgs/build-support/gcc-wrapper/ (props changed)
nixpkgs/trunk/pkgs/build-support/release/debian-build.nix (props changed)
nixpkgs/trunk/pkgs/build-support/release/nix-build.nix (props changed)
nixpkgs/trunk/pkgs/build-support/release/rpm-build.nix (props changed)
nixpkgs/trunk/pkgs/build-support/release/source-tarball.nix (props changed)
nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1.nix (props changed)
nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.2.nix (props changed)
nixpkgs/trunk/pkgs/development/compilers/ghc/6.8.2.nix (props changed)
nixpkgs/trunk/pkgs/development/compilers/ghc/6.8.3.nix (props changed)
nixpkgs/trunk/pkgs/development/libraries/aterm/2.8.nix (props changed)
nixpkgs/trunk/pkgs/development/libraries/fltk/fltk11.nix (props changed)
nixpkgs/trunk/pkgs/development/libraries/glibc-2.9/ (props changed)
nixpkgs/trunk/pkgs/development/libraries/goocanvas/ (props changed)
nixpkgs/trunk/pkgs/development/libraries/pcre/default.nix (props changed)
nixpkgs/trunk/pkgs/development/libraries/readline/readline6.nix (props
changed)
nixpkgs/trunk/pkgs/development/tools/misc/autoconf/2.13.nix (props changed)
nixpkgs/trunk/pkgs/development/tools/misc/gnum4/default.nix (props changed)
nixpkgs/trunk/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/trunk/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/trunk/pkgs/os-specific/linux/atheros/r3867.nix (props changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.28.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.32.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix (props changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.25.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.27.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.28.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.29.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.32.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.33.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix (props changed)
nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm/default.nix (props changed)
nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng/ (props changed)
nixpkgs/trunk/pkgs/servers/mail/dovecot/1.1.1.nix (props changed)
nixpkgs/trunk/pkgs/shells/bash/4.1.nix (props changed)
nixpkgs/trunk/pkgs/shells/bash/4.2.nix (props changed)
nixpkgs/trunk/pkgs/stdenv/generic/setup.sh (props changed)
nixpkgs/trunk/pkgs/stdenv/linux/make-bootstrap-tools.nix (props changed)
nixpkgs/trunk/pkgs/tools/networking/wget/default.nix (props changed)
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/audio/amarok/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/audio/amarok/default.nix Fri Dec 16
10:12:05 2011 (r30927)
+++ nixpkgs/trunk/pkgs/applications/audio/amarok/default.nix Fri Dec 16
10:39:22 2011 (r30928)
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, lib, cmake, qt4, qtscriptgenerator, perl, gettext, curl
-, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs, automoc4, phonon
-, strigi, soprano, qca2, libmtp, liblastfm, libgpod, pkgconfig }:
+{ stdenv, fetchurl, lib, qtscriptgenerator, perl, gettext, curl
+, libxml2, mysql, taglib, taglib_extras, loudmouth , kdelibs
+, qca2, libmtp, liblastfm, libgpod, pkgconfig }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@@ -14,7 +14,7 @@
};
QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
- buildInputs = [ cmake qt4 qtscriptgenerator perl stdenv.gcc.libc gettext curl
+ buildInputs = [ qtscriptgenerator stdenv.gcc.libc gettext curl
libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
soprano qca2 libmtp liblastfm libgpod pkgconfig ];
Modified: nixpkgs/trunk/pkgs/applications/networking/sync/akunambol/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/sync/akunambol/default.nix
Fri Dec 16 10:12:05 2011 (r30927)
+++ nixpkgs/trunk/pkgs/applications/networking/sync/akunambol/default.nix
Fri Dec 16 10:39:22 2011 (r30928)
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, kdelibs, kdepimlibs, automoc4, funambol,liblikeback
}:
+{ stdenv, fetchgit, kdepimlibs, funambol, liblikeback }:
stdenv.mkDerivation rec {
name = "akunambol-20110304";
@@ -9,7 +9,7 @@
sha256 = "1d2x42lbw32qyawri7z0mrbafz36r035w5bxjpq51awyqjwkbb2d";
};
- buildInputs = [ cmake automoc4 kdelibs kdepimlibs funambol liblikeback ];
+ buildInputs = [ kdepimlibs funambol liblikeback ];
KDEDIRS = liblikeback;
patches = [ ./non-latin.diff ];
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Dec 16 10:12:05
2011 (r30927)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Dec 16 10:39:22
2011 (r30928)
@@ -8010,9 +8010,6 @@
kde4 = recurseIntoAttrs pkgs.kde47;
- # TODO: merge with branches/drop-kde4.5 if you want to remove KDE SC 4.5
- # This branch removes kde45 and quite a few compatibility hacks
- kde45 = kdePackagesFor pkgs.kde45 "4.5";
kde47 = kdePackagesFor pkgs.kde47 "4.7";
kdePackagesFor = self: version:
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
