Author: urkud
Date: Wed Dec 14 18:22:34 2011
New Revision: 30893
URL: https://nixos.org/websvn/nix/?rev=30893&sc=1
Log:
Update dbus and dbus-glib to the latest stable versions
Drop unstable versions
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus-glib/0.94.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus/1.5.6.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus-glib/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus-glib/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus-glib/default.nix
Wed Dec 14 14:43:43 2011 (r30892)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus-glib/default.nix
Wed Dec 14 18:22:34 2011 (r30893)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }:
stdenv.mkDerivation rec {
- name = "dbus-glib-0.86";
+ name = "dbus-glib-0.98";
src = fetchurl {
url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
- sha256 = "1p0bm5p8g8h0mimhj0d58dqdrhfipvcwv95l6hf69z4gygksclak";
+ sha256 = "04fiwld5yaxyggxlvdmbaqkngh4fn8gfkkqckcp3274bpgb82z19";
};
buildInputs = [ pkgconfig expat gettext ]
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus/default.nix
Wed Dec 14 14:43:43 2011 (r30892)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/dbus/default.nix
Wed Dec 14 18:22:34 2011 (r30893)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, expat, libX11, libICE, libSM, useX11 ? true }:
let
- version = "1.4.14";
+ version = "1.4.16";
src = fetchurl {
url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";;
- sha256 = "0xsqkq2q2hb09dcdsw0y359zvml480h79qvl9g31r7da57y7xwj7";
+ sha256 = "1ii93d0lzj5xm564dcq6ca4s0nvm5i9fx3jp0s7i9hlc5wkfd3hx";
};
patches = [ ./ignore-missing-includedirs.patch ];
@@ -49,7 +49,7 @@
preConfigure =
''
- sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
+ sed -i 's@$(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
substituteInPlace tools/Makefile.in --replace
'install-localstatelibDATA:' 'disabled:'
'';
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Wed Dec
14 14:43:43 2011 (r30892)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Wed Dec
14 18:22:34 2011 (r30893)
@@ -3265,14 +3265,6 @@
useX11 = true;
};
- dbus_all_1_5_6 = callPackage ../development/libraries/dbus/1.5.6.nix {
- useX11 = true;
- };
-
- dbus_glib_0_94 = callPackage ../development/libraries/dbus-glib/0.94.nix {
- dbus = pkgs.dbus_all_1_5_6.libs;
- };
-
dbus_glib = callPackage ../development/libraries/dbus-glib { };
dbus_java = callPackage ../development/libraries/java/dbus-java { };
@@ -6063,9 +6055,7 @@
untie = callPackage ../os-specific/linux/untie { };
- upower = callPackage ../os-specific/linux/upower {
- dbus_glib = pkgs.dbus_glib_0_94;
- };
+ upower = callPackage ../os-specific/linux/upower { };
upstart = callPackage ../os-specific/linux/upstart { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
