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 1278859d31
, reversing
changes made to 0c020c98f9
.
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
Eelco Dolstra
1c23150eb0
Port my nss_myhostname patches to systemd
2013-02-04 15:49:20 +01:00
Marc Weber
5784fa5f79
for whatever reason -DKBD* was ignored. systmed has --with-kbd-* options which work
2013-02-04 12:07:37 +01:00
Lluis Batlle
b8b7268029
systemd: porting patches for arm for udev.
...
Related to our glibc version, probably fixed in newer glibcs like
in stdenv-updates.
2013-01-22 23:17:31 +01:00
Eelco Dolstra
5a79974c81
systemd: Remove some plymouth calls
2013-01-08 18:41:21 +01:00
Eelco Dolstra
cdb2f64a35
systemd: Get rescue.service and emergency.service to work
2013-01-08 18:11:56 +01:00
Eelco Dolstra
30201193ea
systemd: Generate patches from my systemd Git repo
2013-01-08 17:06:08 +01:00
Eelco Dolstra
d906239fe3
systemd: Update to 197
2013-01-08 17:06:08 +01:00
Eelco Dolstra
2122adcdd1
systemd: Update to 196
...
Main change is that systemd now has its own PCI/USB IDs database, so
it no longer depends on pciutils/usbutils.
2012-11-29 18:50:07 +01:00
Eelco Dolstra
094c1fd108
systemd: Fix a systemd crash when doing "systemctl list-unit-files"
2012-10-31 13:46:51 +01:00
Eelco Dolstra
8b9f3e9de4
systemd: Update to 195
2012-10-23 13:51:13 +02:00
Eelco Dolstra
dee64b4c2c
Work around timeouts after creating a LUKS device
2012-10-15 15:36:52 -04:00
Eelco Dolstra
bf5967e77e
systemd: Add libgcrypt dependency
...
This is required for forward secure sealing of the journal.
2012-10-11 12:33:47 -04:00
Eelco Dolstra
2fa1b38853
systemd: Properly handle device aliases used as dependencies
...
http://lists.freedesktop.org/archives/systemd-devel/2012-October/006872.html
2012-10-11 12:33:28 -04:00
Eelco Dolstra
a4cd5afd03
Fix "Failed to add path to set" error during nixos-rebuild
2012-10-05 16:58:36 -04:00
Eelco Dolstra
3240b48f74
systemd: Update to 194
2012-10-04 11:24:07 -04:00
Eelco Dolstra
c958552828
systemd: Update to 193
2012-09-28 11:48:30 -04:00
Peter Simons
bed0328879
systemd: add myself as a maintainer
2012-09-27 10:54:44 +02:00
Peter Simons
0a2f397ce0
systemd: fix build on Linux/i686
2012-09-27 10:53:25 +02:00
Eelco Dolstra
e710915ffc
systemd: Update to 192
2012-09-26 10:04:19 -04:00
Peter Simons
1fd867426d
systemd: fix build on 32 bit machines
2012-09-24 12:01:39 +02:00
Eelco Dolstra
fae03557fb
systemd: Update to 191
2012-09-21 22:46:35 -04:00
Eelco Dolstra
beb5b65e9c
systemd: Make "systemctl daemon-reexec" do the right thing on NixOS
2012-09-21 14:57:12 -04:00
Eelco Dolstra
7057acb322
systemd: Update to 190
2012-09-21 13:30:00 -04:00
Eelco Dolstra
fcd30ecfc1
systemd: Add to channel
2012-09-11 13:47:34 -04:00
Eelco Dolstra
6121046a1c
systemd: Set the path to pkttyagent
...
This allows commands like "systemctl reboot" to ask for authentication
when run by mere mortals.
2012-08-21 08:42:44 -04:00
Eelco Dolstra
b06cb3578d
systemd: Drop dependency on cryptsetup for now
...
This is necessary to prevent a cyclic dependency.
2012-08-16 15:46:20 -04:00
Eelco Dolstra
b4aa7cd475
systemd: Drop bogus dependency on udev
2012-08-10 18:54:10 -04:00
Eelco Dolstra
1966010ec7
systemd: Update to 188
2012-08-10 18:54:09 -04:00
Eelco Dolstra
2547e0e96a
systemd: Use an interface version, just like we have for Upstart
2012-07-22 01:18:01 -04:00
Eelco Dolstra
44cf3d5808
systemd: Update to 187
2012-07-20 10:44:19 -04:00
Eelco Dolstra
1afb3b58e1
systemd: Update to 186
2012-07-05 17:31:38 -04:00
Eelco Dolstra
1c5f4b8b45
* Fix the gid for /dev/pts/ ttys.
...
svn path=/nixpkgs/trunk/; revision=34566
2012-06-19 19:58:49 +00:00
Eelco Dolstra
d9df48bd36
* Copy some things from the udev package.
...
svn path=/nixpkgs/trunk/; revision=34519
2012-06-15 17:06:06 +00:00
Eelco Dolstra
44210695c8
* systemd: fix path to loadkeys/setfont, and add SysV compatibility
...
links (reboot/shutdown/etc.).
svn path=/nixpkgs/trunk/; revision=34515
2012-06-14 22:10:52 +00:00