Commit Graph

87 Commits

Author SHA1 Message Date
Vladimír Čunát
647f0ab366 systemd: give up on "dev" output for now
There are too many references to ${systemd}/foo,
and the savings would be on the order of 100 kB.

Also:
 - fix udev install paths (again), hopefully OK now;
 - fix one RPATH
 - clean libudev propagation
 - pick examples/ changes from staging (probably lost by some auto-merge)
2015-05-05 11:52:07 +02:00
Vladimír Čunát
375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Vladimír Čunát
9a0485f0b0 systemd: fixup bad paths from e3ac73af11
I was being really careless. TODO: "${udev}/*" references.
2015-04-21 08:03:34 +02:00
Eelco Dolstra
e229dbdb4e systemd: Drop dependency on sysvtools 2015-04-20 11:34:00 +02:00
Vladimír Čunát
e3ac73af11 systemd.libudev: don't depend on the main output
Also fix some references, and drop unused makeFlags:
https://github.com/NixOS/nixpkgs/commit/3300479c#commitcomment-10790021
2015-04-19 15:23:36 +02:00
Vladimír Čunát
4b1392fb07 systemd: fix cycles by adding gudev to libudev
Also some related fixups.
2015-04-18 19:53:59 +02:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Eric Seidel
f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Eelco Dolstra
e47ed98f9b systemd: Apply upstream fixes
In particular, upstream commit 3072eecf3c714e3ed88c882623c40aca15445f64
fixes 15-character network interface names (as generated by ID_NET_NAME_MAC).
2014-12-19 15:07:37 +01:00
Shea Levy
e3825b47ec systemd: read units from /etc/systemd-mutable
This allows for persistent units managed outside of configuration.nix
2014-12-18 17:08:04 -05:00
William A. Kennington III
745c2e9d73 systemd: Enable networking features 2014-11-19 13:26:25 -08:00
William A. Kennington III
1d30b4aabd systemd: Patch systemd-journald.service to be Type=notify
https://bugs.freedesktop.org/show_bug.cgi?id=85871
https://bugzilla.redhat.com/show_bug.cgi?id=1159641
2014-11-16 02:01:43 -08:00
Eelco Dolstra
884ff252fd systemd: Update to 217 2014-11-04 15:43:12 +01:00
Vladimír Čunát
381dcb1d98 various packages fixed 2014-08-30 23:30:31 +02:00
Vladimír Čunát
abbc93f783 WIP: getting better 2014-08-30 19:11:52 +02:00
Eelco Dolstra
891657b634 systemd: Drop unnecessary dependency 2014-08-24 10:04:55 +02:00
Eelco Dolstra
84fa62b4f3 systemd: Build manpages 2014-08-24 09:59:26 +02:00
Eelco Dolstra
c23bf4ec74 systemd: Update to 216 2014-08-23 23:28:03 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Jaka Hudoklin
71b923fa74 systemd: fix python support 2014-05-17 12:13:29 +02:00
Eelco Dolstra
014fe1a3c3 sysinit.target: Don't depend on systemd-tmpfiles-setup.service
systemd-tmpfiles-setup.service pulls in local-fs.target, which
interferes with NixOps' send-keys feature (since sshd.service depends
indirectly on sysinit.target). Since in NixOS we don't use
systemd-tmpfiles for creating files (that's done by activation scripts
and preStart scripts), it's not a problem to start it a bit later.

Backport: 14.04
2014-05-05 16:47:02 +02:00
Eelco Dolstra
cb45ecad34 systemd: Look for fsck.* in the right place
Fixes #2464.
2014-05-01 14:32:58 +02:00
Eelco Dolstra
19d4e40dfc systemd: Build on i686-linux 2014-04-16 15:25:37 +02:00
Eelco Dolstra
ee9c068b0c systemd: Update to 212
Note that systemd no longer depends on dbus, so we're rid of the
cyclic dependency problem between systemd and dbus.

This commit incorporates from wkennington's systemd branch
(203dcff45002a63f6be75c65f1017021318cc839,
1f842558a95947261ece66f707bfa24faf5a9d88).
2014-04-16 00:59:26 +02:00
Jaka Hudoklin
70a4c7b1df nixos: fix linux containers (systemd-nspawn, lxc, lxc-libvirt)
- Make dhcp work, use dhcpcd without udev in container
- Make login shell work, patch getty to not wait for /dev/tty0
- Make ssh work, sshd/pam do not start session
2014-03-24 23:59:50 +01:00
Jaka Hudoklin
ae9c22df3f systemd: enable journal http gateway by adding libmicrohttp 2014-02-06 16:18:25 +01:00
Jaka Hudoklin
09dd6a64fc systemd: add optional python support 2014-02-06 16:18:24 +01:00
Mathijs Kwik
db83d9a35b Merge branch 'master' into multiple-outputs 2013-11-01 08:29:09 +01:00
Eelco Dolstra
d55b8a10ee systemd: Apply a bunch of upstream fixes
For all changes relative to v203, see
https://github.com/edolstra/systemd/tree/nixos-v203.

Fixes #1072.
2013-10-14 12:47:05 +02:00
Eelco Dolstra
e65ff3b72a systemd: Prevent privilege escalation via polkit
Cherry-picked from upstream.  Also applied a fix for the CPUShares
configuration option while I'm at it.

CVE-2013-4327
2013-09-30 13:30:15 +02:00
Eelco Dolstra
7216b3c844 systemd: Add kexec support 2013-09-16 17:51:18 +02:00
Eelco Dolstra
7c8518c194 Cleanup 2013-08-23 10:02:07 +02:00
Eelco Dolstra
15bd0f4beb systemd: Put libudev in a separate output
This way, packages that need libudev (like Mesa) don't pull in all of
systemd as a runtime dependency.
2013-06-26 13:34:55 +02:00
Eelco Dolstra
552fd3d599 Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/gmime/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
2013-06-25 18:42:56 +02:00
Vladimír Čunát
afdc7fdfb6 fix evaluation on non-Linux, should fix tarball 2013-06-17 22:06:36 +02:00
Eelco Dolstra
a4a2b88f29 systemd: Use the right path to util-linux binaries 2013-06-12 17:12:44 +02:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing
changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Eelco Dolstra
2e77679b0b systemd: Start ctrl-alt-del.target irreversibly
This fixes hangs during EC2 reboots (which are implemented by sending
a ctrl-alt-del to the instance).
2013-05-07 14:34:48 +02:00
Eelco Dolstra
0dfb9ecc35 systemd: Update to 203 2013-05-07 14:34:48 +02:00
Vladimír Čunát
8fc5fb6ecc Merge branch 'master' into x-updates 2013-05-01 08:14:15 +02:00
Bjørn Forsman
7894a6fa27 systemd: patch hardcoded "/bin/cat" in systemd-cat
Without this patch, systemd-cat doesn't work here:

$ echo "hello world" | systemd-cat
Failed to execute process: No such file or directory
2013-04-24 23:46:09 +02:00
Vladimír Čunát
fe1bd1a73c tarball: move assertion in systemd
Now the assertion doesn't trigger on systemd.headers
which is needed for dbus.libs.

This should fix the tarball job (I don't have enough RAM to test it).
2013-04-24 09:03:30 +00:00
Vladimír Čunát
17ae1617dc Merge branch 'master' into x-updates
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
2013-04-13 12:21:31 +02:00
Eelco Dolstra
4a429f5276 systemd: Update to 201
Fixes NixOS/nixos#135 and NixOS/nixos#126.
2013-04-12 14:33:41 +02:00
Vladimír Čunát
dec718acb6 systemd: minor update, changes for dbus split
New version with upstreamed changes from @edolstra :-)
2013-04-04 22:00:58 +02:00
Eelco Dolstra
e657e1b57e systemd: Update to 200 2013-03-31 16:16:07 +02:00
Eelco Dolstra
2ef559c513 systemd: Enable the firmware loader in udev
It's needed in kernels < 3.8.
2013-03-27 23:00:03 +01:00
Eelco Dolstra
3300479c74 systemd: Update to 199
This incorporates some changes from
eb64a2f562.
2013-03-27 23:00:02 +01:00