Commit Graph

378 Commits

Author SHA1 Message Date
Matthew Bauer
6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
xeji
e450d9fb90
Merge pull request #38961 from bachp/cryptsetup-generator
cryptsetup-generator: add postFixup
2018-05-05 17:41:40 +02:00
John Ericson
cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Matthew Bauer
143978a477 treewide: remove platform assertions
linux: readd assertion
2018-05-03 13:09:20 -05:00
Matthew Justin Bauer
eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Will Dietz
919dda7aba
Merge pull request #37814 from dtzWill/update/util-linux-2.32
util-linux: 2.31.1 -> 2.32
2018-04-30 13:21:59 -05:00
Will Dietz
dadf222934 systemd: add pcre2 as build dep for searching in journalctl 2018-04-29 20:24:04 -05:00
Will Dietz
b341529a35 systemd: use upstream patch to fix building with util-linux 2.32
See linked PR.
2018-04-29 16:54:24 -05:00
Pascal Bach
caed1877eb cryptsetup-generator: add postFixup
This makes cryptsetup-generator link correctly
to the shared systemd library.
2018-04-29 22:16:27 +02:00
John Ericson
ba52ae5048 treewide: isArm -> isAarch32
Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.

The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:

```
ISA:             ARMv8   {-A, -R, -M}
                 /    \
Mode:     Aarch32     Aarch64
             |         /   \
Encoding:   A64      A32   T32
```

At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.

The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.

[1]: https://developer.arm.com/products/architecture/a-profile
2018-04-25 15:28:55 -04:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
xeji
0de00d5799 systemd 238: bump revision for upstream bugfixes
fixes #37744, #38341
2018-04-05 17:45:41 +02:00
Shea Levy
05e375d710
Merge remote-tracking branch 'origin/master' into staging 2018-03-28 09:36:47 -04:00
Nikolay Amiantov
0402877344 systemd: disable EFI support on AArch64
It seemingly isn't used by NixOS and currently breaks AArch64 build.
2018-03-28 15:40:50 +03:00
Shea Levy
26e8d58cb5
libseccomp: Disable only on RISC-V if Linux.
The isSeccomputable flag treated Linux without seccomp as just a
normal variant, when it really should be treated as a special case
incurring complexity debt to support.
2018-03-27 08:16:24 -04:00
Shea Levy
cdf9a78a3e
kexectools: Disable only on RISC-V if Linux.
The isKexecable flag treated Linux without kexec as just a normal
variant, when it really should be treated as a special case incurring
complexity debt to support.
2018-03-27 08:15:07 -04:00
xeji
eb828c6831 systemd: add withSelinux option
false by default, so no rebuild
2018-03-27 01:24:46 +02:00
Nikolay Amiantov
6b9771e4a7
systemd: use stable tree
This fixes a bug with changed qemu network interface names and also generally
should be preferred to using a release tag.
2018-03-23 14:43:31 +01:00
Nikolay Amiantov
0ccab4946d systemd: 237 -> 238 2018-03-22 22:37:26 +03:00
Jan Tojnar
1c6f15083b
systemd: remove unneeded rpath fixup 2018-03-22 07:30:59 +01:00
Jan Malakhovski
7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
aszlig
88530e02b6
systemd: Update to latest NixOS branch
Updated to the latest version of the nixos-v237 branch, which fixes two
things:

  * Make sure that systemd looks in /etc for configuration files.
    https://github.com/NixOS/systemd/pull/15
  * Fix handling of the x-initrd.mount option.
    https://github.com/NixOS/systemd/pull/16

I've added NixOS VM tests for both to ensure we won't run into
regressions. The newly added systemd test only tests for that and is by
no means exhaustive, but it's a start.

Personally I only wanted to fix the former issue, because that's the one
I've been debugging. After sending in a pull request for our systemd
fork (https://github.com/NixOS/systemd/pull/17) I got a notice from
@Mic92, that he already fixed this and his fix was even better as it's
even suitable for upstream (so we hopefully can drop that patch
someday).

The reason why the second one came in was simply because it has been
merged before the former, but I thought it would be a good idea to have
tests for that as well.

In addition I've removed the sysconfdir=$out/etc entry to make sure the
default (/etc) is used. Installing is still done to $out, because those
directories that were previously into sysconfdir now get into
factoryconfdir.

Quote from commit NixOS/systemd@98067cc806:

  By default systemd should read all its configuration from /etc.
  Therefore we rely on -Dsysconfdir=/etc in meson as default value.
  Unfortunately this would also lead to installation of systemd's own
  configuration files to `/etc` whereas we are limited to /nix/store. To
  counter that this commit introduces two new configuration variables
  `factoryconfdir` and `factorypkgconfdir` to install systemd's own
  configuration into nix store again, while having executables looking
  up files in /etc.

Tested this change against all of the NixOS VM tests we have in
nixos/release.nix. Between this change and its parent no new tests were
failing (although a lot of them were flaky).

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Mic92, @tk-ecotelecom, @edolstra, @fpletz
Fixes: #35415
Fixes: #35268
2018-03-03 10:39:38 +01:00
aszlig
ae7efee4fa
systemd: Reident the expression file
The indenting is a bit weird to follow, especially at the end of the
file (right brace without indent, but the opening brace is indented by
two spaces).

No functional change and I've verified this by building it with this
change and without and both lead to the same store paths.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @fpletz, @edolstra
2018-03-03 01:53:16 +01:00
Shea Levy
a486cb1af6
systemd: Fix references to /usr/bin in cross-compilation 2018-03-01 14:54:41 -05:00
Shea Levy
9d2af8d61c
systemd: Fix cross-compiling 2018-02-26 06:38:42 -05:00
Shea Levy
42c8776571
systemd: Take python3 from buildPackages. 2018-02-25 09:07:14 -05:00
Shea Levy
87270fb306
gnu-efi: Only build on efi-enabled systems 2018-02-24 21:49:31 -05:00
Pascal Bach
d351cd9f69 systemd-cryptsetup-generator: fix compilation with systemd 237
Closes #35097
2018-02-20 16:34:30 +02:00
Will Dietz
d3b59f864a define top-level attrs for getent, getconf
Note that currently getent is explicitly taken from "glibc.bin",
regardless of build configuration which this preserves for now.
(on non-musl anyway)
2018-02-13 11:47:16 -06:00
Will Dietz
82dfab87fa systemd: add getent-bin to nativeBuildInputs, meson searches for getent 2018-02-13 09:45:05 -06:00
Will Dietz
8323123e95 systemd: use musl-getent on musl instead of glibc.bin's getent 2018-02-13 09:45:05 -06:00
Franz Pletz
eb862c48dd
systemd: 234 -> 237
Co-Authored-By: Florian Klink <flokli@flokli.de>
Co-Authored-By: Andreas Rammhold <andreas@rammhold.de>
2018-02-13 01:24:24 +01:00
Vladimír Čunát
94cba39aa2
systemd resolved: patch CVE-2017-15908
fix loop on packets with pseudo dns types
https://github.com/NixOS/systemd/pull/14
2017-11-28 20:11:40 +01:00
John Ericson
bac21681a1 systemd: Use some nativeBuildInputs
I erred on the side of caution when changing these.
2017-09-21 15:49:54 -04:00
Robin Gloster
61733ed6cc systemd: use fetchpatch for patch with the correct hash
the fetchurl failed on hydra sometimes
2017-09-03 10:33:27 -04:00
Frederik Rietdijk
91ede67a5a systemd: use fetchurl for patch
because a hash corresponding to fetchurl was provided.
2017-09-02 13:09:58 +02:00
teh
3e50f0ae0e systemd: add patch to fix suspend.target 2017-08-30 21:22:58 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Thomas Tuegel
631f6b3e11
systemd: unset RANLIB
Commit 093cc00cdd sets the RANLIB environment
variable by default, causing `make' to invoke the wrong program.
2017-07-21 15:46:40 -05:00
Thomas Tuegel
aa11af8bbe
systemd: fix broken source hash 2017-07-21 15:46:33 -05:00
Robin Gloster
ae26f291bc
systemd: 233 -> 234 2017-07-16 17:22:45 +02:00
Eelco Dolstra
32e492251b
systemd: Apply fix for CVE-2017-9445 2017-06-28 14:08:05 +02:00
Jörg Thalheim
dfebb66f65
systemd: v232 -> v233
Changelog: https://github.com/systemd/systemd/blob/v233/NEWS

Upgrade was pretty smooth. One notably change is the new hybrid cgroup
mode: https://github.com/systemd/systemd/blob/v233/NEWS#L5 It should
provide better compatibility with docker.
2017-05-30 08:47:09 +01:00
Eelco Dolstra
6ef630a125
systemd: Include https://github.com/NixOS/systemd/pull/8 2017-03-27 15:37:49 +02:00
Robin Gloster
31ff2ac057
systemd: add patch to fix docker
843d5baf6a

"don't use the unified hierarchy for the systemd cgroup yet"

fixes #22472
2017-02-16 23:56:27 +01:00
Robin Gloster
8a0d1bcf8b
systemd: add patches to fix i686 booting 2017-02-02 01:12:55 +01:00
Robin Gloster
972749f1d4
systemd: fix repository url
Left-over from testing, sorry..
2017-01-26 17:57:10 +01:00
Robin Gloster
a38f1911d3
systemd: 231 -> 232
Includes adding some more upstream units and removing obsolete (-.slice) ones.
2017-01-26 17:52:52 +01:00
Eelco Dolstra
8b09ba32d3 systemd: Apply various upstream bug fixes
This includes the fix for the assertion failure in
https://github.com/systemd/systemd/issues/4234.
2016-09-30 11:23:51 +02:00
Eelco Dolstra
78178d5854 systemd: Separate lib output
This moves libsystemd.so and libudev.so into systemd.lib, and gets rid
of libudev (which just contained a copy of libudev.so and the udev
headers). It thus reduces the closure size of all packages that
(indirectly) depend on libsystemd, of which there are quite a few (for
instance, PulseAudio and dbus). For example, it reduces the closure of
Blender from 430.8 to 400.8 MiB.
2016-09-05 19:17:14 +02:00
Franz Pletz
a1c24ab976
systemd: apply patch to fix #18158
See:
 - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=834367
 - https://github.com/systemd/systemd/issues/3842
2016-09-02 23:39:19 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster
33e1c78ae3 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-16 07:54:01 +00:00
Moritz Ulrich
21df40f85f systemd-cryptsetup-generator: Fix bug.
The annoying wrapper script also wraps `systemd-cryptsetup`. We need to
copy the original binary to $out too.
2016-08-15 12:42:44 +02:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Moritz Ulrich
9626707e2b systemd-cryptsetup-generator: Add note to revert 3efadce. 2016-08-09 19:21:58 +02:00
Moritz Ulrich
3efadce03b systemd-cryptsetup-generator: Fix installPhase. 2016-08-09 19:21:25 +02:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen
59ce911810 treewide: Some EOF-whitespace fixes 2016-08-02 21:17:44 +03:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Eelco Dolstra
51871dfb37 systemd: 230 -> 231 2016-07-28 17:03:55 +02:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Nikolay Amiantov
00e67f0df0 systemd: use plymouth from system path 2016-07-08 15:23:47 +03:00
Nikolay Amiantov
8bbfba48c4 systemd: move hwdb patch to the fork itself 2016-07-08 15:23:47 +03:00
Nikolay Amiantov
1ac6f1fe25 systemd: update fork revision 2016-07-08 15:23:07 +03:00
Franz Pletz
99cc3fa6ca systemd: Disable stackprotector hardening flag 2016-06-14 10:19:05 +00:00
Tuomas Tynkkynen
06c0209d53 systemd: Disable systemd-boot on ARM
Temporary workaround for the EFI stuff not working.
2016-06-02 14:54:44 +03:00
Eelco Dolstra
66d5ca6f42 systemd: Build EFI image 2016-05-31 17:02:33 +02:00
Luca Bruno
663beaa79f Revert "Revert "systemd: 229 -> 230""
This reverts commit 11894782ed.

cc @edolstra, re-reverting. Looks like it's an intended systemd change.
2016-05-27 11:07:29 +02:00
Luca Bruno
11894782ed Revert "systemd: 229 -> 230"
This reverts commit a2f21a54a1.

cc @edolstra the new version does not install many .pc files
like login, journal, daemon, ...
2016-05-27 11:06:21 +02:00
Eelco Dolstra
a2f21a54a1 systemd: 229 -> 230
See https://github.com/systemd/systemd/blob/v230/NEWS for details.

The main incompatible change is that processes are now killed by
default when you exit a session. Thus, for example, using nohup in an
SSH session no longer works. You have to use "loginctl enable-linger"
and "systemd-run --user" to create a process that survives logout.
2016-05-26 16:20:00 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Joachim Fasting
ec2ddf284d
systemd: get linuxHeaders from stdenv
Building against anything other than the headers used to build libc
doesn't really make any sense.
2016-05-13 19:35:09 +02:00
Dan Peebles
8ca190c496 systemd: add iptables dependency
This allows nspawn to do interesting firewall things when setting
up a private network.
2016-05-10 13:57:24 +00:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Moritz Ulrich
5c770c4c0b systemd-cryptsetup-generator: Cleaner install phase. 2016-04-08 14:50:20 +02:00
Moritz Ulrich
7503ee71fc Revert "systemd: Try adding cryptsetup to buildInputs."
This reverts commit eda8d21d8b0a69e4b7a3bc215e2215ffc6526495.
2016-04-08 14:50:20 +02:00
Moritz Ulrich
faa79e60cc systemd-cryptsetup-generator: Also build systemd-cryptsetup 2016-04-08 14:50:20 +02:00
Moritz Ulrich
47e5fd9f57 systemd-cryptsetup-generator: Init 2016-04-08 14:50:20 +02:00
Moritz Ulrich
215b5f6282 systemd: Try adding cryptsetup to buildInputs. 2016-04-08 14:50:20 +02:00
Kevin Cox
eead3bc536 util-linux: create -Minimal and utillinux (full)
Close #12952. Now the full version is used by default,
supporting systemd and curses.
2016-02-25 08:52:05 +01:00
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
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