Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
Eelco Dolstra
fb589faa08
systemd: 228 -> 229
2016-02-12 14:35:41 +01:00
Vladimír Čunát
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Eelco Dolstra
20b54bd989
Merge pull request #12724 from abbradar/udev-hwdb
...
udev service: generate hwdb database from all udev packages
2016-02-03 14:24:11 +01:00
Nikolay Amiantov
5404714997
systemd: add a notice to remove makeFlags on update
2016-02-01 20:15:29 +03:00
Austin Seipp
d787c2258b
nixpkgs: systemd - add some more dependencies
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-01-23 17:48:41 +00:00
Vladimír Čunát
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Rok Garbas
38a6b5fb43
Merge pull request #11683 from rvl/fail2ban
...
Make fail2ban work again
2015-12-22 01:46:18 +01:00
Eelco Dolstra
b60f0fdcd4
systemd: Apply upstream fix: networkd: link - do not drop config for loopback device
2015-12-18 18:02:16 +01:00
Rodney Lorrimar
2eb8c3e491
systemd: python module split out since v223
2015-12-18 09:44:22 +00:00
aszlig
fb37fc631a
systemd: Apply VirtualBox fix for detect-virt.
...
The update is basically just one additional commit, which was an
upstream cherry-pick pushed at NixOS/systemd#3 and it fixes
systemd-detect-virt with VirtualBox so that services with
ConditionVirtualization set to "oracle" will work properly.
I've tested this with the "virtualbox" NixOS VM test, which was failing
since the update to version 228.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-13 05:36:10 +01:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Eelco Dolstra
1da87d4062
systemd: Update to 228
2015-12-07 20:25:53 +01:00
Gabriel Ebner
f4c01fc004
systemd: enable timedated, hostnamed, localed.
2015-12-07 20:25:53 +01:00
Luca Bruno
e289717414
rename moveToOutput and propagatedBuildInputs
2015-12-02 10:05:36 +01:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III
6602f49495
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
...
This reverts commit 741bf840da
.
This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
Domen Kožar
505117f3fb
Merge branch 'master' into staging
2015-11-11 12:53:36 +01:00
Eelco Dolstra
3e44182487
Merge remote-tracking branch 'origin/systemd-219' into staging
2015-11-04 15:37:28 +01:00
William A. Kennington III
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
Eelco Dolstra
81f6c62004
Merge remote-tracking branch 'origin/master' into systemd-219
2015-10-30 15:47:37 +01:00
Shea Levy
a7157fa2f0
Remove firmware loader fallback.
...
Systemd dropped support in 207 (would be nice if configure failed with a bad flag),
so all this does is add an annoying delay if firmware can't be found by the kernel
2015-10-30 10:29:56 -04:00
Vladimír Čunát
2490848627
polkit: split dev and bin outputs
2015-10-14 14:32:26 +02:00
Vladimír Čunát
783c40eb68
dbus: split into multiple outputs and fix referrers
2015-10-13 20:19:01 +02:00
Eelco Dolstra
73f0d83858
systemd: Update to 227
2015-10-07 22:01:21 +02:00
Eelco Dolstra
741bf840da
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
...
This reverts commit f61176c539
, reversing
changes made to a27ca029ee
.
Conflicts:
pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Vladimír Čunát
b44d846990
udev: complete rework
...
- systemd puts all into one output now (except for man),
because I wasn't able to fix all systemd/udev refernces
for NixOS to work well
- libudev is now by default *copied* into another path,
which is what most packages will use as build input :-)
- pkgs.udev = [ libudev.out libudev.dev ]; because there are too many
references that just put `udev` into build inputs (to rewrite them all),
also this made "${udev}/foo" fail at *evaluation* time
so it's easier to catch and change to something more specific
2015-10-04 10:03:53 +02:00
Vladimír Čunát
f361938b21
Merge staging into closure-size
...
This makes gcc5 the default builder, etc.
2015-10-03 15:23:13 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Thomas Strobel
26150153ba
systemd: add option to build with "--enable-kdbus"
2015-10-02 12:16:27 +02:00
aszlig
389e654e03
systemd: Backport fix for detecting VirtualBox.
...
This is a backport of systemd/systemd@e32886e .
As noted by @ts468 in #9876 , systemd-detect-virt will report KVM if
we're running inside VirtualBox 5.x. Instead of just disabling the
check, this essentially fixes systemd to be able to detect VirtualBox
again.
Tested this against nixos/tests/simple.nix (just to make sure systemd is
still working) and nixos/tests/virtualbox.nix (all tests succeed).
Thanks a lot to @ts468 for catching this and also to @domenkozar for
testing various things concerning that bug.
Fixes #9876 .
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-17 16:02:43 +02:00
Eelco Dolstra
a6de3feb97
systemd: Update to 226
2015-09-08 18:18:52 +02:00
Eelco Dolstra
c34953ed24
systemd: Backport some journalctl performance improvements
...
Before:
$ time journalctl > /dev/null
real 6m12.470s
user 5m51.439s
sys 0m19.265s
After:
real 0m40.067s
user 0m37.717s
sys 0m2.383s
Before:
$ time journalctl --since '2015-08-01' _TRANSPORT=kernel
real 1m9.817s
user 0m13.318s
sys 0m56.626s
After:
real 0m0.689s
user 0m0.521s
sys 0m0.221s
2015-09-08 14:25:55 +02:00
Eelco Dolstra
d242e59fc4
systemd: Apply sbin patch
2015-09-08 14:07:05 +02:00
Eelco Dolstra
3609007b7c
systemd: Use our systemd repo directly
...
Since upstream no longer provides an autoconfed tarball, we may as
well use our own repo and drop the patch.
2015-09-08 13:08:41 +02:00
Eelco Dolstra
ecbe04b4c6
systemd: Update to 225
2015-09-08 00:02:26 +02:00
Eelco Dolstra
916793cf13
Merge branch 'master' into systemd-219
...
Conflicts:
nixos/modules/system/boot/systemd.nix
pkgs/applications/networking/p2p/transmission/default.nix
pkgs/development/libraries/libseccomp/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/top-level/all-packages.nix
2015-09-07 21:28:33 +02:00
Eelco Dolstra
3c114b827e
systemd: Update URL to the NixOS fork
2015-08-24 14:16:59 +02:00
Eelco Dolstra
9a75bafcda
systemd-timesyncd: Use NTP servers from our own ntp.org pool
...
(cherry picked from commit 01dc343c2c
)
Conflicts:
pkgs/os-specific/linux/systemd/default.nix
2015-07-22 12:27:50 +02:00
Eelco Dolstra
01dc343c2c
systemd-timesyncd: Use NTP servers from our own ntp.org pool
2015-07-01 11:19:03 +02:00
Eelco Dolstra
f678a1ae4d
systemd: Apply some upstream bug fixes
2015-06-02 00:49:42 +02:00
Eelco Dolstra
2c156472b3
systemd: Don't install kernel-install
2015-05-22 16:39:42 +02:00
Eelco Dolstra
f106125f77
systemd: Enable support for seccomp syscall filtering
2015-05-22 15:55:55 +02:00
Eelco Dolstra
67721119f0
Remove obsolete comment
2015-05-22 15:36:05 +02:00
Eelco Dolstra
588b92a7d2
systemd: Update to 220
2015-05-22 15:34:08 +02:00
Eelco Dolstra
e7feb89158
systemd: Fix another build failure hidden by #7524
2015-05-13 18:17:25 +02:00
Eelco Dolstra
11ce1cab97
systemd: Don't propagate libcap
...
Instead delete the *.la files. The propagation of libcap was
apparently only necessary because there was a gratuitous -lcap in the
*.la files.
http://hydra.nixos.org/build/22182620
2015-05-13 17:14:28 +02:00
Eelco Dolstra
fe952a42a7
systemd: Update to 219
2015-05-11 18:18:35 +02:00
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
William A. Kennington III
ff21171921
Fix references to current-system/sw/sbin
2015-04-01 13:57:36 -07: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
Aristid Breitkreuz
b216e2b8e6
systemd-nspawn: Ignore existing directories when trying to create mount-points ( #4989 )
2014-11-24 22:43:54 +01: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
Eelco Dolstra
97d6afafaa
systemd: Fix uninitialised memory issue in veth setup
...
This caused containers to randomly fail, in particular if the machine
name was 8 characters.
2014-08-15 04:07:45 +02:00
Eelco Dolstra
ab402dc1a4
systemd: Apply a patch that improves systemd-nspawn startup notification
...
Systemd-nspawn now sends startup notification *after* it has forked
the container init process and performed initialisation (such as
creating veth network interfaces).
2014-08-13 00:47:24 +02:00
Eelco Dolstra
38567ddc80
systemd: Apply backport fixes
...
In particular, added a few patches that improve systemd-nspawn
container behaviour.
2014-08-12 03:08:22 +02:00
Jaka Hudoklin
71b923fa74
systemd: fix python support
2014-05-17 12:13:29 +02:00
Eelco Dolstra
24cbe874d6
systemd-journal-flush: Require /var/log/journal rather than all filesystems
...
Backport: 14.04
2014-05-05 16:47:43 +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
fb3629df49
systemd: Re-allow Restart=yes with Type=oneshot
2014-04-22 23:53:21 +02:00
Eelco Dolstra
7ea51b1c6c
Enable kmod-static-nodes.service
...
This creates static device nodes such as /dev/fuse or
/dev/snd/seq. The kernel modules for these devices will be loaded on
demand when the device node is opened.
2014-04-17 14:35:05 +02:00
Eelco Dolstra
2503e7e0c8
systemd: Apply patch to make container logins work again
2014-04-16 18:15:48 +02:00
Eelco Dolstra
c81565f6cf
Remove hack for using upstream getty units
...
Also, enable the container-getty@ unit so that "machinectl login"
works.
2014-04-16 16:11:17 +02:00
Eelco Dolstra
19d4e40dfc
systemd: Build on i686-linux
2014-04-16 15:25:37 +02:00
Eelco Dolstra
0ac322c7a0
systemd-nspawn: Fix starting NixOS containers
2014-04-16 11:34:34 +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 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