Hi!
I'm going to merge topic/udev-153 branch of git://gitorious.org/+nix-
developers/nixpkgs/nixpkgs.git into svn trunk. I had to upgrade polkit and
consolekit as well. The current patch is attached.
Could you please review the patch and/or test it?
P.S. udev-154 came out while I was working on this upgrade, so actually it
should be named "udev-154".
diff --git a/pkgs/development/libraries/consolekit/default.nix b/pkgs/development/libraries/consolekit/default.nix
index f41e8c6..06b48b3 100644
--- a/pkgs/development/libraries/consolekit/default.nix
+++ b/pkgs/development/libraries/consolekit/default.nix
@@ -1,21 +1,18 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib,
- libX11, policykit, expat, ... }:
+ libX11, polkit, expat }:
stdenv.mkDerivation rec {
- name = "consolekit-0.2.10";
+ name = "consolekit-0.4.1";
src = fetchurl {
- url = http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.2.10.tar.gz;
- sha256 = "1jrv33shrmc1klwpgp02pycmbk9lfaxkd5q7bqxb6v95cl7m3f82";
+ url = http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.1.tar.bz2;
+ sha256 = "0gj0airrgyi14a06w3d4407g62bs5a1cam2h64s50x3d2k3ascph";
};
- buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 policykit expat ];
+ buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit expat ];
configureFlags = "--enable-pam-module --with-pam-module-dir=$(out)/lib/security --localstatedir=/var --sysconfdir=/etc";
- # Needed for pthread_cancel().
- NIX_LDFLAGS = "-lgcc_s";
-
installFlags = "sysconfdir=$(out)/etc DBUS_SYS_DIR=$(out)/etc/dbus-1/system.d"; # keep `make install' happy
meta = {
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index d3b2c67..81d35a6 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,32 +1,45 @@
-{ stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext }:
+{ stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext,
+ gobjectIntrospection }:
+
+let
+ system="/var/run/current-system/sw";
+ foolVars = {
+ LOCALSTATE = "/var";
+ SYSCONF = "/etc";
+ LIBEXEC = "${system}/libexec";
+ LIB = "${system}/lib";
+ DATA = "${system}/share";
+ };
+in
stdenv.mkDerivation rec {
- name = "policy-kit-0.92";
-
+ name = "polkit-0.96";
+
src = fetchurl {
- url = http://hal.freedesktop.org/releases/polkit-0.92.tar.gz;
- sha256 = "18x4xp4m14fm4aayra4njh82g2jzf6ccln40yybmhxqpb5a3nii8";
+ url = "http://hal.freedesktop.org/releases/${name}.tar.gz";;
+ sha256 = "0jh5v0dhf9msvmfmr9d67563m64gq5l96m9jax9abchhfa8wl9il";
};
-
- buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext ];
- configureFlags = "--localstatedir=/var";
+ buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext
+ gobjectIntrospection ];
+
+ # Ugly hack to overwrite hardcoded directories
+ # TODO: investigate a proper patch which will be accepted upstream
+ CFLAGS = stdenv.lib.concatStringsSep " "
+ ( map (var: ''-DPACKAGE_${var}_DIR=\""${builtins.getAttr var foolVars}"\"'')
+ (builtins.attrNames foolVars) );
- installFlags = "localstatedir=$(TMPDIR)/var"; # keep `make install' happy
-
postInstall =
''
# Allow some files with paranoid permissions to be stripped in
# the fixup phase.
chmod a+rX -R $out
-
- # Fix the pathname in the frobnicate example.
- substituteInPlace $out/share/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy \
- --replace /usr/bin/pk-example-frobnicate $out/bin/pk-example-frobnicate
'';
- meta = {
+ meta = with stdenv.lib; {
homepage = http://www.freedesktop.org/wiki/Software/PolicyKit;
description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes";
+ platforms = platforms.linux;
+ maintainers = [ maintainers.urkud ];
};
}
diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix
index 3811d7e..97031a5 100644
--- a/pkgs/development/tools/misc/eggdbus/default.nix
+++ b/pkgs/development/tools/misc/eggdbus/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib }:
stdenv.mkDerivation rec {
- name = "eggdbus-0.5";
+ name = "eggdbus-0.6";
src = fetchurl {
url = "http://hal.freedesktop.org/releases/${name}.tar.gz";;
- sha256 = "0g1s9nzfyjyhnmv4hzll3izayh4c4pjy3i51ihwgkz3wmd1xaq9j";
+ sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4";
};
buildInputs = [ pkgconfig glib dbus.libs dbus_glib ];
diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix
index 988d0a3..d6007c9 100644
--- a/pkgs/os-specific/linux/udev/default.nix
+++ b/pkgs/os-specific/linux/udev/default.nix
@@ -4,29 +4,23 @@
assert stdenv ? glibc;
stdenv.mkDerivation rec {
- name = "udev-145";
+ name = "udev-154";
src = fetchurl {
url = "mirror://kernel/linux/utils/kernel/hotplug/${name}.tar.bz2";
- sha256 = "1zmibp6n7d582fqx8vmg9vb2a1435hghfpz36056bc25ccwf7yiv";
+ sha256 = "1aw5vn96gasvkjh6nfivaf68l6ph33y63zf7gnp3mc7c7zfncm0c";
};
buildInputs = [gperf pkgconfig glib acl libusb usbutils];
- configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids";
-
- preConfigure =
- ''
- substituteInPlace extras/keymap/Makefile.in \
- --replace /usr/include ${stdenv.glibc}/include
- '';
+ configureFlags = "--with-pci-ids-path=${pciutils}/share/pci.ids
+ --disable-introspection
+ --with-firmware-path=/root/test-firmware:/var/run/current-system/firmware";
postInstall =
''
# Install some rules that really should be installed by default.
- for i in 40-alsa.rules 40-infiniband.rules 40-isdn.rules 40-pilot-links.rules 64-device-mapper.rules 64-md-raid.rules; do
- cp rules/packages/$i $out/libexec/rules.d/
- done
+ cp rules/packages/40-pilot-links.rules $out/libexec/rules.d/
# The path to rule_generator.functions in write_cd_rules and
# write_net_rules is broken. Also, don't store the mutable
@@ -39,12 +33,7 @@ stdenv.mkDerivation rec {
done
# Don't set PATH to /bin:/sbin; won't work in NixOS.
- substituteInPlace $out/libexec/rule_generator.functions \
- --replace 'PATH=' '#PATH='
-
- # Don't hardcore the FIRMWARE_DIRS variable; obtain it from the
- # environment of the caller.
- sed '3,4d' -i $out/libexec/firmware.sh
+ sed -e '/PATH=/d' -i $out/libexec/rule_generator.functions
ln -s $out/lib/ConsoleKit $out/etc/ConsoleKit
'';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7eb15b9..4246200 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3601,7 +3601,7 @@ let
};
consolekit = makeOverridable (import ../development/libraries/consolekit) {
- inherit stdenv fetchurl pkgconfig dbus_glib zlib pam policykit expat glib;
+ inherit stdenv fetchurl pkgconfig dbus_glib zlib pam polkit expat glib;
inherit (xlibs) libX11;
};
@@ -5019,7 +5019,8 @@ let
};
polkit = import ../development/libraries/polkit {
- inherit stdenv fetchurl pkgconfig eggdbus expat pam intltool gettext glib;
+ inherit stdenv fetchurl pkgconfig eggdbus expat pam intltool gettext glib
+ gobjectIntrospection;
};
policykit = makeOverridable (import ../development/libraries/policykit) {
_______________________________________________
nix-dev mailing list
nix-dev@cs.uu.nl
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
