Author: eelco
Date: Thu Jul 21 17:31:57 2011
New Revision: 27882
URL: https://svn.nixos.org/websvn/nix/?rev=27882&sc=1
Log:
* dbus-python updated to 0.84.0.
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/python-modules/dbus/default.nix
nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/python-modules/dbus/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/python-modules/dbus/default.nix
Thu Jul 21 17:01:31 2011 (r27881)
+++ nixpkgs/branches/kde-4.7/pkgs/development/python-modules/dbus/default.nix
Thu Jul 21 17:31:57 2011 (r27882)
@@ -1,28 +1,15 @@
-a :
-let
- fetchurl = a.fetchurl;
+{ stdenv, fetchurl, python, pkgconfig, dbus, dbus_glib }:
+
+stdenv.mkDerivation rec {
+ name = "dbus-python-0.84.0";
- version = a.lib.attrByPath ["version"] "0.83.1" a;
- buildInputs = with a; [
- pkgconfig
- ];
- propagatedBuildInputs = with a; [
- dbus python dbus_glib
- ];
-in
-rec {
src = fetchurl {
- url =
"http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${version}.tar.gz";;
- sha256 = "168vrizxnszh16yk4acpfhy502w8i997d8l3w4i26kxgy433ha6f";
+ url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz";;
+ sha256 = "01jrmj7ps79dkd6f8bzm17vxzpad1ixwmcb1liy64xm9y6mcfnxq";
};
- inherit buildInputs propagatedBuildInputs;
- configureFlags = [];
+ buildInputs = [ python pkgconfig dbus dbus_glib ];
- /* doConfigure should be removed if not needed */
- phaseNames = ["doConfigure" "doMakeInstall"];
-
- name = "python-dbus-" + version;
meta = {
description = "Python DBus bindings";
};
Modified: nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Thu Jul 21
17:01:31 2011 (r27881)
+++ nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Thu Jul 21
17:31:57 2011 (r27882)
@@ -1178,10 +1178,7 @@
pystringtemplate = callPackage ../development/python-modules/stringtemplate
{ };
- pythonDBus = builderDefsPackage (import ../development/python-modules/dbus) {
- inherit python pkgconfig dbus_glib;
- dbus = dbus.libs;
- };
+ pythonDBus = callPackage ../development/python-modules/dbus { };
pythonIRClib = builderDefsPackage (import
../development/python-modules/irclib) {
inherit python;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
