dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/systemd-219' into staging

Browse Source
This commit is contained in:
Eelco Dolstra 2015-11-04 15:37:28 +01:00
commit 3e44182487
24 changed files with 118 additions and 2731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/system/boot/systemd.nix
View File

@ -69,6 +69,7 @@ let
"systemd-journal-flush.service"
"systemd-journal-gatewayd.socket"
"systemd-journal-gatewayd.service"
"systemd-journald-audit.socket"
"systemd-journald-dev-log.socket"
"syslog.socket"
@ -99,7 +100,7 @@ let
# Maintaining state across reboots.
"systemd-random-seed.service"
"systemd-backlight@.service"
"systemd-rfkill@.service"
"systemd-rfkill.service"
# Hibernate / suspend.
"hibernate.target"
@ -109,8 +110,6 @@ let
"systemd-hibernate.service"
"systemd-suspend.service"
"systemd-hybrid-sleep.service"
"systemd-shutdownd.socket"
"systemd-shutdownd.service"
# Reboot stuff.
"reboot.target"
@ -758,7 +757,6 @@ in
systemd.services."systemd-rfkill@".restartIfChanged = false;
systemd.services."user@".restartIfChanged = false;
systemd.services.systemd-journal-flush.restartIfChanged = false;
systemd.services.systemd-journald.restartIfChanged = false; # FIXME: shouldn't be necessary with systemd 219
systemd.services.systemd-random-seed.restartIfChanged = false;
systemd.services.systemd-remount-fs.restartIfChanged = false;
systemd.services.systemd-update-utmp.restartIfChanged = false;

4
pkgs/applications/networking/p2p/transmission/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper
, openssl, curl, libevent, inotify-tools, systemd
, openssl, curl, libevent, inotify-tools, systemd, zlib
, enableGTK3 ? false, gtk3
}:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "1sxr1magqb5s26yvr5yhs1f7bmir8gl09niafg64lhgfnhv1kz59";
};
buildInputs = [ pkgconfig intltool file openssl curl libevent inotify-tools ]
buildInputs = [ pkgconfig intltool file openssl curl libevent inotify-tools zlib ]
++ optionals enableGTK3 [ gtk3 makeWrapper ]
++ optional stdenv.isLinux systemd;

4
pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
View File

@ -3,7 +3,7 @@
, gdk_pixbuf, librsvg, libxkbfile, libnotify
, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
, cracklib, python, libkrb5, networkmanagerapplet, networkmanager
, libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev
, libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev, libgudev
, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk
, fontconfig, sound-theme-freedesktop }:
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
gnome3.vino udev libcanberra_gtk3
gnome3.vino udev libgudev libcanberra_gtk3
networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth ];
preBuild = ''

4
pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool, networkmanager
, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager
, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }:
stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
[ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio
libcanberra_gtk3 upower colord libgweather xkeyboard_config
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
preFixup = ''

4
pkgs/desktops/xfce/core/thunar-volman.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
, xfconf, udev, libnotify }:
, xfconf, udev, libgudev, libnotify }:
stdenv.mkDerivation rec {
p_name = "thunar-volman";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig intltool exo gtk udev libxfce4ui libxfce4util
[ pkgconfig intltool exo gtk udev libgudev libxfce4ui libxfce4util
xfconf libnotify
];
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";

8
pkgs/development/libraries/gvfs/default.nix
View File

@ -1,25 +1,25 @@
{ stdenv, fetchurl, pkgconfig, intltool, libtool
, glib, dbus, udev, udisks2, libgcrypt
, glib, dbus, udev, libgudev, udisks2, libgcrypt
, libgphoto2, avahi, libarchive, fuse, libcdio
, libxml2, libxslt, docbook_xsl, samba, libmtp
, gnomeSupport ? false, gnome,libgnome_keyring, gconf, makeWrapper }:
let
ver_maj = "1.22";
version = "${ver_maj}.2";
version = "${ver_maj}.4";
in
stdenv.mkDerivation rec {
name = "gvfs-${version}";
src = fetchurl {
url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz";
sha256 = "8d08c4927b6c20d990498c23280017e7033b31a386f09b4c3ce5bedd20316250";
sha256 = "57e33faad35aba72be3822099856aca847f391626cf3ec734b42e64ba31f6484";
};
nativeBuildInputs = [ pkgconfig intltool libtool ];
buildInputs =
[ makeWrapper glib dbus.libs udev udisks2 libgcrypt
[ makeWrapper glib dbus.libs udev libgudev udisks2 libgcrypt
libgphoto2 avahi libarchive fuse libcdio
libxml2 libxslt docbook_xsl samba libmtp
# ToDo: a ligther version of libsoup to have FTP/HTTP support?

21
pkgs/development/libraries/libgudev/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ lib, stdenv, fetchurl, pkgconfig, udev, glib }:
let version = "230"; in
stdenv.mkDerivation rec {
name = "libgudev-${version}";
src = fetchurl {
url = "https://download.gnome.org/sources/libgudev/${version}/${name}.tar.xz";
sha256 = "a2e77faced0c66d7498403adefcc0707105e03db71a2b2abd620025b86347c18";
};
buildInputs = [ pkgconfig udev glib ];
meta = {
homepage = https://wiki.gnome.org/Projects/libgudev;
maintainers = [ lib.maintainers.eelco ];
platforms = lib.platforms.linux;
license = lib.licenses.lgpl2Plus;
};
}

6
pkgs/development/libraries/libmbim/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, python, udev }:
{ stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }:
stdenv.mkDerivation rec {
name = "libmbim-1.12.2";
@ -12,11 +12,11 @@ stdenv.mkDerivation rec {
patchShebangs .
'';
buildInputs = [ pkgconfig glib udev python ];
buildInputs = [ pkgconfig glib udev libgudev python ];
meta = with stdenv.lib; {
homepage = http://www.freedesktop.org/software/libmbim/;
description = "talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol";
description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol";
platforms = platforms.linux;
license = licenses.gpl2;
maintainers = with maintainers; [ wkennington ];

17
pkgs/development/libraries/libseccomp/default.nix
View File

@ -1,17 +1,16 @@
{ stdenv, fetchFromGitHub, autoreconfHook, getopt }:
{ stdenv, fetchurl, getopt }:
let version = "2.2.3"; in
stdenv.mkDerivation rec {
name = "libseccomp-${version}";
version = "2.2.3";
name = "libseccomp-${version}";
src = fetchFromGitHub {
owner = "seccomp";
repo = "libseccomp";
rev = "v${version}";
sha256 = "0pl827qjls5b6kjj8qxxdwcn6rviqbm5xjqf0hgx6b04c836mswx";
src = fetchurl {
url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
sha256 = "d9b400b703cab7bb04b84b9b6e52076a630b673819d7541757bcc16467b6d49e";
};
buildInputs = [ autoreconfHook getopt ];
buildInputs = [ getopt ];
patchPhase = ''
patchShebangs .

4
pkgs/development/libraries/libwacom/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, glib, pkgconfig, udev }:
{ fetchurl, stdenv, glib, pkgconfig, udev, libgudev }:
stdenv.mkDerivation rec {
name = "libwacom-0.15";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "04vppdj99cc0ya44n8p7zjk9yyw03v6fksw0a9n1gpnnsn4wardb";
};
buildInputs = [ glib pkgconfig udev ];
buildInputs = [ glib pkgconfig udev libgudev ];
meta = with stdenv.lib; {
platforms = platforms.linux;

2
pkgs/development/tools/misc/texinfo/6.0.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
installTargets="install install-tex";
'';
doCheck = !stdenv.isDarwin;
doCheck = !stdenv.isDarwin && !interactive;
meta = {
homepage = "http://www.gnu.org/software/texinfo/";

71
pkgs/os-specific/linux/kernel-headers/3.14.nix
View File

@ -1,71 +0,0 @@
{ stdenv, fetchurl, perl, cross ? null }:
assert cross == null -> stdenv.isLinux;
let
version = "3.14.1";
kernelHeadersBaseConfig =
if cross == null
then stdenv.platform.kernelHeadersBaseConfig
else cross.platform.kernelHeadersBaseConfig;
in
stdenv.mkDerivation {
name = "linux-headers-${version}";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1njm8gvlj7cq0m1051yxszl4f63383a7sv1na13hkqkv36kipgqx";
};
targetConfig = if cross != null then cross.config else null;
platform =
if cross != null then cross.platform.kernelArch else
if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "powerpc-linux" then "powerpc" else
if stdenv.isArm then "arm" else
if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
abort "don't know what the kernel include directory is called for this platform";
buildInputs = [perl];
extraIncludeDirs =
if cross != null then
(if cross.arch == "powerpc" then ["ppc"] else [])
else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
buildPhase = ''
if test -n "$targetConfig"; then
export ARCH=$platform
fi
make ${kernelHeadersBaseConfig} SHELL=bash
make mrproper headers_check SHELL=bash
'';
installPhase = ''
make INSTALL_HDR_PATH=$out headers_install
# Some builds (e.g. KVM) want a kernel.release.
mkdir -p $out/include/config
echo "${version}-default" > $out/include/config/kernel.release
'';
# !!! hacky
fixupPhase = ''
ln -s asm $out/include/asm-$platform
if test "$platform" = "i386" -o "$platform" = "x86_64"; then
ln -s asm $out/include/asm-x86
fi
'';
meta = with stdenv.lib; {
description = "Header files and scripts for Linux kernel";
license = licenses.gpl2;
platforms = platforms.linux;
};
}

4
pkgs/os-specific/linux/kernel-headers/3.12.nix → pkgs/os-specific/linux/kernel-headers/3.18.nix
View File

@ -4,7 +4,7 @@ assert cross == null -> stdenv.isLinux;
let
version = "3.12.32";
version = "3.18.14";
kernelHeadersBaseConfig =
if cross == null
@ -18,7 +18,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
sha256 = "1hzws2bf267hfk81ywqcxspkyi1lg56x63izdc0pv1338xcfas53";
sha256 = "1xh0vvn1l2g1kkg54f0mg0inbpsiqs24ybgsakksmcpcadjgqk1i";
};
targetConfig = if cross != null then cross.config else null;

52
pkgs/os-specific/linux/systemd/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, dbus, kmod
, xz, pam, acl, cryptsetup, libuuid, m4, utillinux
, glib, kbd, libxslt, coreutils, libgcrypt
, kexectools, libmicrohttpd, linuxHeaders
, kexectools, libmicrohttpd, linuxHeaders, libseccomp
, autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
, pythonPackages ? null, pythonSupport ? false
}:
@ -10,24 +11,26 @@ assert stdenv.isLinux;
assert pythonSupport -> pythonPackages != null;
stdenv.mkDerivation rec {
version = "217";
version = "227";
name = "systemd-${version}";
src = fetchurl {
url = "http://www.freedesktop.org/software/systemd/${name}.tar.xz";
sha256 = "163l1y4p2a564d4ynfq3k3xf53j2v5s81blb6cvpn1y7rpxyccd0";
src = fetchFromGitHub {
owner = "NixOS";
repo = "systemd";
rev = "7d94d27801d20278103d8c146633fe81e06697d6";
sha256 = "0cvzsrazqgbia3zajb0z4ik8myfil4bdy2c29qs6w93d6yvrjfkj";
};
patches =
[ # These are all changes between upstream and
# https://github.com/NixOS/systemd/tree/nixos-v217.
./fixes.patch
];
outputs = [ "out" "man" "doc" ];
buildInputs =
[ pkgconfig intltool gperf libcap kmod xz pam acl
[ linuxHeaders pkgconfig intltool gperf libcap kmod xz pam acl
/* cryptsetup */ libuuid m4 glib libxslt libgcrypt
libmicrohttpd linuxHeaders
libmicrohttpd kexectools libseccomp
/* FIXME: we may be able to prevent the following dependencies
by generating an autoconf'd tarball, but that's probably not
worth it. */
autoreconfHook gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45
] ++ stdenv.lib.optionals pythonSupport [pythonPackages.python pythonPackages.lxml];
configureFlags =
@ -37,7 +40,6 @@ stdenv.mkDerivation rec {
"--with-kbd-loadkeys=${kbd}/bin/loadkeys"
"--with-kbd-setfont=${kbd}/bin/setfont"
"--with-rootprefix=$(out)"
"--with-dbusinterfacedir=$(out)/share/dbus-1/interfaces"
"--with-dbuspolicydir=$(out)/etc/dbus-1/system.d"
"--with-dbussystemservicedir=$(out)/share/dbus-1/system-services"
"--with-dbussessionservicedir=$(out)/share/dbus-1/services"
@ -50,11 +52,15 @@ stdenv.mkDerivation rec {
"--disable-sysusers"
"--disable-timedated"
"--enable-timesyncd"
"--disable-readahead"
"--disable-firstboot"
"--disable-localed"
"--enable-resolved"
"--disable-split-usr"
"--disable-libcurl"
"--disable-libidn"
"--disable-quotacheck"
"--disable-ldconfig"
"--disable-smack"
"--with-sysvinit-path="
"--with-sysvrcnd-path="
@ -63,9 +69,10 @@ stdenv.mkDerivation rec {
preConfigure =
''
./autogen.sh
# FIXME: patch this in systemd properly (and send upstream).
# FIXME: use sulogin from util-linux once updated.
for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c; do
for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do
test -e $i
substituteInPlace $i \
--replace /usr/bin/getent ${stdenv.glibc}/bin/getent \
@ -76,7 +83,7 @@ stdenv.mkDerivation rec {
--replace /bin/echo ${coreutils}/bin/echo \
--replace /bin/cat ${coreutils}/bin/cat \
--replace /sbin/sulogin ${utillinux}/sbin/sulogin \
--replace /sbin/kexec ${kexectools}/sbin/kexec
--replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck
done
substituteInPlace src/journal/catalog.c \
@ -85,10 +92,6 @@ stdenv.mkDerivation rec {
configureFlagsArray+=("--with-ntp-servers=0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
'';
# This is needed because systemd uses the gold linker, which doesn't
# yet have the wrapper script to add rpath flags automatically.
NIX_LDFLAGS = "-rpath ${pam}/lib -rpath ${libcap}/lib -rpath ${acl}/lib -rpath ${stdenv.cc.cc}/lib";
PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
NIX_CFLAGS_COMPILE =
@ -146,6 +149,11 @@ stdenv.mkDerivation rec {
done
rm -rf $out/etc/rpm
rm $out/lib/*.la
# "kernel-install" shouldn't be used on NixOS.
find $out -name "*kernel-install*" -exec rm {} \;
''; # */
enableParallelBuilding = true;

2569
pkgs/os-specific/linux/systemd/fixes.patch
View File

File diff suppressed because it is too large Load Diff

6
pkgs/os-specific/linux/udisks/2-default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, intltool
, expat, acl, systemd, glib, libatasmart, polkit
, libxslt, docbook_xsl, utillinux, mdadm
, libxslt, docbook_xsl, utillinux, mdadm, libgudev
}:
stdenv.mkDerivation rec {
@ -26,9 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ];
propagatedBuildInputs = [ expat acl systemd glib libatasmart polkit ]; # in closure anyway
buildInputs = [ libxslt docbook_xsl ];
buildInputs = [ libxslt docbook_xsl libgudev expat acl systemd glib libatasmart polkit ];
configureFlags = [
"--localstatedir=/var"

4
pkgs/os-specific/linux/upower/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus_glib
, intltool, libxslt, docbook_xsl, udev, libusb1
, intltool, libxslt, docbook_xsl, udev, libgudev, libusb1
, useSystemd ? true, systemd, gobjectIntrospection
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ dbus_glib intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ]
[ dbus_glib intltool libxslt docbook_xsl udev libgudev libusb1 gobjectIntrospection ]
++ stdenv.lib.optional useSystemd systemd;
nativeBuildInputs = [ pkgconfig ];

8
pkgs/os-specific/linux/util-linux/default.nix
View File

@ -1,13 +1,15 @@
{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
stdenv.mkDerivation rec {
name = "util-linux-2.26.2";
name = "util-linux-2.27";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v2.26/${name}.tar.xz";
sha256 = "0rlnzmiqdannzf81fbh41541lrck63v9zhskm6h4i2jj8ahvsa8f";
url = "mirror://kernel/linux/utils/util-linux/v2.27/${name}.tar.xz";
sha256 = "1ivdx1bhjbakf77agm9dn3wyxia1wgz9lzxgd61zqxw3xzih9gzw";
};
outputs = [ "out" "man" ];
patches = [
./rtcwake-search-PATH-for-shutdown.patch
];

22
pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
View File

@ -4,10 +4,10 @@ distros anyway).
-- nckx <tobias.geerinckx.rice@gmail.com>
diff -Naur a/include/pathnames.h b/include/pathnames.h
--- a/include/pathnames.h 2014-09-16 14:37:06.138551680 +0200
+++ b/include/pathnames.h 2015-01-01 20:41:02.510948314 +0100
@@ -43,7 +43,7 @@
diff -ru util-linux-2.27-orig/include/pathnames.h util-linux-2.27/include/pathnames.h
--- util-linux-2.27-orig/include/pathnames.h 2015-06-29 13:13:14.669847478 +0200
+++ util-linux-2.27/include/pathnames.h 2015-10-07 20:09:17.401022602 +0200
@@ -54,7 +54,7 @@
#define _PATH_INITTAB "/etc/inittab"
#define _PATH_RC "/etc/rc"
#define _PATH_REBOOT "/sbin/reboot"
@ -16,15 +16,15 @@ diff -Naur a/include/pathnames.h b/include/pathnames.h
#define _PATH_SINGLE "/etc/singleboot"
#define _PATH_SHUTDOWN_CONF "/etc/shutdown.conf"
diff -Naur a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
--- a/sys-utils/rtcwake.c 2014-10-24 11:21:20.447389309 +0200
+++ b/sys-utils/rtcwake.c 2015-01-01 20:57:59.398911209 +0100
@@ -582,7 +582,7 @@
diff -ru util-linux-2.27-orig/sys-utils/rtcwake.c util-linux-2.27/sys-utils/rtcwake.c
--- util-linux-2.27-orig/sys-utils/rtcwake.c 2015-08-05 11:32:44.453821232 +0200
+++ util-linux-2.27/sys-utils/rtcwake.c 2015-10-07 20:09:37.834032536 +0200
@@ -576,7 +576,7 @@
arg[i++] = "now";
arg[i] = NULL;
if (!dryrun) {
if (!ctl.dryrun) {
- execv(arg[0], arg);
+ execvp(arg[0], arg);
warn(_("failed to execute %s"), _PATH_SHUTDOWN);
rc = EXIT_FAILURE;
}

7
pkgs/tools/misc/colord/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchzip, fetchgit, bashCompletion
, glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus
, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection, argyllcms }:
, automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection, argyllcms
, libgudev }:
stdenv.mkDerivation rec {
name = "colord-1.2.12";
@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
bashCompletion argyllcms automake autoconf ];
bashCompletion argyllcms automake autoconf libgudev ];
postInstall = ''
rm -fr $out/var/lib/colord
@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "system service that makes it easy to manage, install and generate color profiles to accurately color manage input and output devices";
description = "System service to manage, install and generate color profiles to accurately color manage input and output devices";
homepage = http://www.freedesktop.org/software/colord/intro.html;
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [stdenv.lib.maintainers.marcweber];

4
pkgs/tools/networking/modemmanager/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, udev, polkit, dbus_glib, ppp, intltool, pkgconfig, libmbim, libqmi }:
{ stdenv, fetchurl, udev, libgudev, polkit, dbus_glib, ppp, intltool, pkgconfig, libmbim, libqmi }:
stdenv.mkDerivation rec {
name = "ModemManager-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkgconfig ];
buildInputs = [ udev polkit dbus_glib ppp libmbim libqmi ];
buildInputs = [ udev libgudev polkit dbus_glib ppp libmbim libqmi ];
configureFlags = [
"--with-polkit"

4
pkgs/tools/networking/network-manager-applet/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
, libnotify, libsecret, dbus_glib, polkit, isocodes
, mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
, makeWrapper, udev, hicolor_icon_theme }:
, makeWrapper, udev, libgudev, hicolor_icon_theme }:
let
pn = "network-manager-applet";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gnome3.gtk libglade networkmanager libnotify libsecret dbus_glib gsettings_desktop_schemas
polkit isocodes makeWrapper udev gnome3.gconf gnome3.libgnome_keyring
polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring
];
nativeBuildInputs = [ intltool pkgconfig ];

4
pkgs/tools/networking/network-manager/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz
, udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
, udev, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline
, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup }:
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
"--with-libsoup=yes"
];
buildInputs = [ wirelesstools udev libnl libuuid polkit ppp libndp
buildInputs = [ wirelesstools udev libgudev libnl libuuid polkit ppp libndp
xz bluez5 gobjectIntrospection modemmanager readline newt libsoup ];
propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];

14
pkgs/top-level/all-packages.nix
View File

@ -819,7 +819,7 @@ let
dtrx = callPackage ../tools/compression/dtrx { };
duperemove = callPackage ../tools/filesystems/duperemove {
linuxHeaders = linuxHeaders_3_14;
linuxHeaders = linuxHeaders_3_18;
};
edac-utils = callPackage ../os-specific/linux/edac-utils { };
@ -7065,6 +7065,8 @@ let
libgsystem = callPackage ../development/libraries/libgsystem { };
libgudev = callPackage ../development/libraries/libgudev { };
libguestfs = callPackage ../development/libraries/libguestfs {
inherit (perlPackages) libintlperl GetoptLong SysVirt;
};
@ -9765,19 +9767,17 @@ let
# -- Linux kernel expressions ------------------------------------------------
linuxHeaders = linuxHeaders_3_12;
linuxHeaders = linuxHeaders_3_18;
linuxHeaders24Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/2.4.nix {
cross = assert crossSystem != null; crossSystem;
});
linuxHeaders26Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/3.12.nix {
linuxHeaders26Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/3.18.nix {
cross = assert crossSystem != null; crossSystem;
});
linuxHeaders_3_12 = callPackage ../os-specific/linux/kernel-headers/3.12.nix { };
linuxHeaders_3_14 = callPackage ../os-specific/linux/kernel-headers/3.14.nix { };
linuxHeaders_3_18 = callPackage ../os-specific/linux/kernel-headers/3.18.nix { };
# We can choose:
linuxHeadersCrossChooser = ver : if ver == "2.4" then linuxHeaders24Cross
@ -10278,7 +10278,7 @@ let
sysstat = callPackage ../os-specific/linux/sysstat { };
systemd = callPackage ../os-specific/linux/systemd {
linuxHeaders = linuxHeaders_3_14;
linuxHeaders = linuxHeaders_3_18;
};
systemtap = callPackage ../development/tools/profiling/systemtap {