From de3531c2d502d2a98396b0f1eda2200d731d6ad9 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 11 Aug 2010 16:49:31 +0000 Subject: [PATCH] Let kdePackage use manifest.nix svn path=/nixpkgs/trunk/; revision=23120 --- pkgs/desktops/kde-4.5/base/default.nix | 1 - pkgs/desktops/kde-4.5/bindings/default.nix | 1 - pkgs/desktops/kde-4.5/kde-package/default.nix | 10 +++++++--- pkgs/desktops/kde-4.5/libs/default.nix | 1 - pkgs/desktops/kde-4.5/pimlibs/default.nix | 1 - pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix | 1 - pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix | 1 - 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/kde-4.5/base/default.nix b/pkgs/desktops/kde-4.5/base/default.nix index a6603ae6dbb..02c38bacede 100644 --- a/pkgs/desktops/kde-4.5/base/default.nix +++ b/pkgs/desktops/kde-4.5/base/default.nix @@ -4,7 +4,6 @@ kdePackage { pn = "kdebase"; v = "4.5.0"; - sha256 = "1znmmx84hx3a31lhr55j3h91p9r6fv1c4q9hbgv4xwaijlkxk6dw"; preConfigure = "cd apps"; diff --git a/pkgs/desktops/kde-4.5/bindings/default.nix b/pkgs/desktops/kde-4.5/bindings/default.nix index eae386030d3..2628d115cd4 100644 --- a/pkgs/desktops/kde-4.5/bindings/default.nix +++ b/pkgs/desktops/kde-4.5/bindings/default.nix @@ -8,7 +8,6 @@ kdePackage rec { pn = "kdebindings"; v = "4.5.0"; - sha256 = "0x8c98gbp2rm3dckzw3l0jh2ch5g9sb2prmilwzl8d5psyhx39n6"; patches = [ ./python-site-packages-install-dir.diff ]; diff --git a/pkgs/desktops/kde-4.5/kde-package/default.nix b/pkgs/desktops/kde-4.5/kde-package/default.nix index 6f41ed7daa6..9e1ef5006fd 100644 --- a/pkgs/desktops/kde-4.5/kde-package/default.nix +++ b/pkgs/desktops/kde-4.5/kde-package/default.nix @@ -1,12 +1,16 @@ { stdenv, fetchurl }: -a@{ pn, v, stable ? true, sha256, subdir ? null, ... }: +let + manifest = import ./manifest.nix; +in + +a@{ pn, v, stable ? true, subdir ? null, ... }: stdenv.mkDerivation ({ name = "${pn}-${v}"; src = fetchurl { url = "mirror://kde/" + (if stable then "" else "un") + "stable/" + (if subdir == null then "${v}/src" else subdir) + "/${pn}-${v}.tar.bz2"; - inherit sha256; + sha256 = builtins.getAttr "${pn}-${v}.tar.bz2" manifest; }; meta = { maintainers = with stdenv.lib.maintainers; [ sander urkud ]; @@ -14,4 +18,4 @@ stdenv.mkDerivation ({ inherit stable; homepage = http://www.kde.org; } // ( if a ? meta then a.meta else { } ); -} // (removeAttrs a [ "meta" "pn" "v" "stable" "sha256" "subdir" ])) +} // (removeAttrs a [ "meta" "pn" "v" "stable" "subdir" ])) diff --git a/pkgs/desktops/kde-4.5/libs/default.nix b/pkgs/desktops/kde-4.5/libs/default.nix index 71daed339cd..c749223535b 100644 --- a/pkgs/desktops/kde-4.5/libs/default.nix +++ b/pkgs/desktops/kde-4.5/libs/default.nix @@ -8,7 +8,6 @@ kdePackage { pn = "kdelibs"; v = "4.5.0"; - sha256 = "0d3iml2v1vp1y6i5vpqv77nbdlw6qb8j6c88yi744ba4zvcirzrx"; buildInputs = [ cmake perl qt4 xz flex bison bzip2 pcre fam libxml2 libxslt diff --git a/pkgs/desktops/kde-4.5/pimlibs/default.nix b/pkgs/desktops/kde-4.5/pimlibs/default.nix index 8452161b66c..b548ad66ecd 100644 --- a/pkgs/desktops/kde-4.5/pimlibs/default.nix +++ b/pkgs/desktops/kde-4.5/pimlibs/default.nix @@ -4,7 +4,6 @@ kdePackage { pn = "kdepimlibs"; v = "4.5.0"; - sha256 = "0n3wmc2c4jcxbi81i9jmw23b5ms43gia58qpr835im874641f54m"; buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme libical openldap shared_mime_info kdelibs automoc4 akonadi soprano ]; diff --git a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix b/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix index b701e61ba03..ffd7fb819e8 100644 --- a/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix +++ b/pkgs/desktops/kde-4.5/support/oxygen-icons/default.nix @@ -3,7 +3,6 @@ kdePackage { pn = "oxygen-icons"; v = "4.5.0"; - sha256 = "11wlrxnral4q5wi46p1di1cff4vr5da35a8dv2xx3ag6lnhqvjqi"; outputHashAlgo = "sha256"; outputHashMode = "recursive"; diff --git a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix index 03543a6d7e2..6d0de598313 100644 --- a/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix +++ b/pkgs/desktops/kde-4.5/support/polkit-qt-1/default.nix @@ -4,7 +4,6 @@ kdePackage { pn = "polkit-qt-1"; v = "0.96.1"; subdir = "apps/KDE4.x/admin"; - sha256 = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr"; buildInputs = [ cmake qt4 automoc4 ]; propagatedBuildInputs = [ polkit glib ];