JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5942b67b0c
nixpkgs/pkgs/os-specific/linux/systemd/default.nix

541 lines
19 KiB
Nix
Raw Normal View History

systemd: add note about nixpkgs-fmt
2021-02-03 19:25:52 +00:00
# NOTE: Make sure to (re-)format this file on changes with `nixpkgs-fmt`!
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
{ stdenv
, lib
, fetchFromGitHub
systemd: 246.6 -> 247-rc2
2020-11-01 14:35:11 +00:00
, fetchpatch
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" I'm sorry; I didn't notice it contained staging commits. This reverts commit 17f5305b6c20df795c365368d2d868266519599e, reversing changes made to a8a018ddc0a8b5c3d4fa94c94b672c37356bc075.
2020-10-25 08:38:02 +00:00
, buildPackages
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
, ninja
, meson
, m4
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix continuation of #109595 pkgconfig was aliased in 2018, however, it remained in all-packages.nix due to its wide usage. This cleans up the remaining references to pkgs.pkgsconfig and moves the entry to aliases.nix. python3Packages.pkgconfig remained unchanged because it's the canonical name of the upstream package on pypi.
2021-01-19 06:50:56 +00:00
, pkg-config
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
, coreutils
, gperf
, getent
, patchelf
, glibcLocales
, glib
, substituteAll
, gettext
, python3Packages
# Mandatory dependencies
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
, libcap
utillinux: rename to util-linux
2020-11-24 15:29:28 +00:00
, util-linux
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
, kbd
, kmod
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
# Optional dependencies
, pam
, cryptsetup
, lvm2
, audit
, acl
, lz4
, libgcrypt
, libgpgerror
, libidn2
, curl
, gnutar
, gnupg
, zlib
, xz
, libuuid
, libapparmor
, intltool
, bzip2
, pcre2
, e2fsprogs
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
, linuxHeaders ? stdenv.cc.libc.linuxHeaders
, gnu-efi
, iptables
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
, withSelinux ? false
, libselinux
lib.meta: introduce `availableOn`
2021-02-25 16:21:13 +00:00
, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
, libseccomp
lib.meta: introduce `availableOn`
2021-02-25 16:21:13 +00:00
, withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexectools
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
, kexectools
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
, bashInteractive
systemd: set withRemote true by default This also adds the libmicrohttpd as a `buildInput` when `withRemote` is true.
2020-11-01 17:47:18 +00:00
, libmicrohttpd
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
systemd: add withAnalyze flag
2020-10-27 23:29:07 +00:00
, withAnalyze ? true
systemd: add withApparmor option
2020-10-28 00:26:24 +00:00
, withApparmor ? true
systemd: introduce withCompression flag This will build systemd without some compression utils, useful for systemdMinimal.
2020-10-27 23:02:24 +00:00
, withCompression ? true # adds bzip2, lz4 and xz
systemd: use withPortabled in mesonFlags No matter what withPortabled was being set, we always passed -Dportabled=false in mesonFlags. Fix this. Also, nixpkgs-fmt the file for consistency.
2020-11-24 23:11:56 +00:00
, withCoredump ? true
systemd: add withRemote option (default to false), make curl optional This makes curl optional if both remote and importd are disabled, and makes some assertions more robust by switching from curl.dev != null to lib.getDev curl != null.
2020-10-27 22:48:19 +00:00
, withCryptsetup ? true
systemd: add withDocumentation flag
2020-10-27 23:54:08 +00:00
, withDocumentation ? true
systemd: add withRemote option (default to false), make curl optional This makes curl optional if both remote and importd are disabled, and makes some assertions more robust by switching from curl.dev != null to lib.getDev curl != null.
2020-10-27 22:48:19 +00:00
, withEfi ? stdenv.hostPlatform.isEfi
systemd: use withPortabled in mesonFlags No matter what withPortabled was being set, we always passed -Dportabled=false in mesonFlags. Fix this. Also, nixpkgs-fmt the file for consistency.
2020-11-24 23:11:56 +00:00
, withHomed ? false
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
, withHostnamed ? true
systemd: add withRemote option (default to false), make curl optional This makes curl optional if both remote and importd are disabled, and makes some assertions more robust by switching from curl.dev != null to lib.getDev curl != null.
2020-10-27 22:48:19 +00:00
, withHwdb ? true
, withImportd ? true
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
, withLocaled ? true
systemd: add withRemote option (default to false), make curl optional This makes curl optional if both remote and importd are disabled, and makes some assertions more robust by switching from curl.dev != null to lib.getDev curl != null.
2020-10-27 22:48:19 +00:00
, withLogind ? true
systemd: add withMachined flag
2020-10-28 00:08:29 +00:00
, withMachined ? true
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
, withNetworkd ? true
systemd: add withNss flag
2020-10-28 00:05:14 +00:00
, withNss ? true
systemd: 246.6 -> 247-rc2
2020-11-01 14:35:11 +00:00
, withOomd ? false
systemd: add withPCRE2 option
2020-10-28 00:36:02 +00:00
, withPCRE2 ? true
systemd: add withPolkit option
2020-10-27 23:48:51 +00:00
, withPolkit ? true
systemd: use withPortabled in mesonFlags No matter what withPortabled was being set, we always passed -Dportabled=false in mesonFlags. Fix this. Also, nixpkgs-fmt the file for consistency.
2020-11-24 23:11:56 +00:00
, withPortabled ? false
systemd: set withRemote true by default This also adds the libmicrohttpd as a `buildInput` when `withRemote` is true.
2020-11-01 17:47:18 +00:00
, withRemote ? true
systemd: add withRemote option (default to false), make curl optional This makes curl optional if both remote and importd are disabled, and makes some assertions more robust by switching from curl.dev != null to lib.getDev curl != null.
2020-10-27 22:48:19 +00:00
, withResolved ? true
systemd: add withShellCompletions flag
2020-10-27 23:51:39 +00:00
, withShellCompletions ? true
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
, withTimedated ? true
, withTimesyncd ? true
systemd: add withUserDb flag
2020-10-28 00:00:44 +00:00
, withUserDb ? true
systemd: use withPortabled in mesonFlags No matter what withPortabled was being set, we always passed -Dportabled=false in mesonFlags. Fix this. Also, nixpkgs-fmt the file for consistency.
2020-11-24 23:11:56 +00:00
, libfido2
systemd: 246.6 -> 247-rc2
2020-11-01 14:35:11 +00:00
, p11-kit
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
# name argument
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
, pname ? "systemd"
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
, libxslt
, docbook_xsl
, docbook_xml_dtd_42
, docbook_xml_dtd_45
* Updated systemd to 185 (which I overlooked because of the version jump). This contains the merged udev. svn path=/nixpkgs/trunk/; revision=34371
2012-06-06 17:07:30 +01:00
}:
* Added systemd. svn path=/nixpkgs/trunk/; revision=34200
2012-05-21 21:48:19 +01:00
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
assert withResolved -> (libgcrypt != null && libgpgerror != null);
assert withImportd ->
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
(curl.dev != null && zlib != null && xz != null && libgcrypt != null
systemd: use withPortabled in mesonFlags No matter what withPortabled was being set, we always passed -Dportabled=false in mesonFlags. Fix this. Also, nixpkgs-fmt the file for consistency.
2020-11-24 23:11:56 +00:00
&& gnutar != null && gnupg != null && withCompression);
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
systemd: withEfi: move gnu-efi check into assertion
2020-10-27 23:33:26 +00:00
assert withEfi -> (gnu-efi != null);
systemd: add withRemote option (default to false), make curl optional This makes curl optional if both remote and importd are disabled, and makes some assertions more robust by switching from curl.dev != null to lib.getDev curl != null.
2020-10-27 22:48:19 +00:00
assert withRemote -> lib.getDev curl != null;
systemd: add withCoredump flag … and default it to false for systemdMinimal
2020-10-27 23:12:45 +00:00
assert withCoredump -> withCompression;
systemd: add withRemote option (default to false), make curl optional This makes curl optional if both remote and importd are disabled, and makes some assertions more robust by switching from curl.dev != null to lib.getDev curl != null.
2020-10-27 22:48:19 +00:00
systemd: Add an option for homed This is disabled by default to indicate that is hasn't been adiquately tested with NixOS yet.
2020-10-10 11:05:31 +01:00
assert withHomed -> withCryptsetup;
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
assert withCryptsetup ->
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
(cryptsetup != null);
systemd: use tags as rev, update comment explaining updating workflow.
2020-08-06 11:04:28 +01:00
let
systemd: add withRemote option (default to false), make curl optional This makes curl optional if both remote and importd are disabled, and makes some assertions more robust by switching from curl.dev != null to lib.getDev curl != null.
2020-10-27 22:48:19 +00:00
wantCurl = withRemote || withImportd;
systemd: 247.3 -> 247.6
2021-03-31 17:24:19 +01:00
version = "247.6";
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
in
stdenv.mkDerivation {
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
inherit version pname;
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-02 23:31:30 +00:00
systemd: use tags as rev, update comment explaining updating workflow.
2020-08-06 11:04:28 +01:00
# We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly
# This has proven to be less error-prone than the previous systemd fork.
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-02 23:31:30 +00:00
src = fetchFromGitHub {
systemd: switch from our own fork to upstream repo + local patches After patching, this produces exactly the same source code as in our custom fork, but having the actual patches inlined inside nixpkgs makes it easier to get rid of them. In case more complicated rebasing is necessary, maintainers can - Clone the upstream systemd/systemd[-stable] repo - Checkout the current rev mentioned in src - Apply the patches from this folder via `git am 00*.patch` - Rebase the repo on top of a new version - Export the patch series via `git format-patch $newVersion` - Update the patches = [ … ] attribute (if necessary)
2020-01-26 13:56:41 +00:00
owner = "systemd";
systemd: 247 -> 247.1
2020-12-13 15:35:01 +00:00
repo = "systemd-stable";
systemd: use tags as rev, update comment explaining updating workflow.
2020-08-06 11:04:28 +01:00
rev = "v${version}";
systemd: 247.3 -> 247.6
2021-03-31 17:24:19 +01:00
sha256 = "sha256-7XYEq3Qw25suwjbtPzx9lVPHUu9ZY/1bADXl2wQbkJc=";
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-02 23:31:30 +00:00
};
systemd: use tags as rev, update comment explaining updating workflow.
2020-08-06 11:04:28 +01:00
# If these need to be regenerated, `git am path/to/00*.patch` them into a
# systemd worktree, rebase to the more recent systemd version, and export the
systemd: 247.3 -> 247.6
2021-03-31 17:24:19 +01:00
# patches again via `git -c format.signoff=false format-patch v${version}`.
systemd: 246.6 -> 247-rc2
2020-11-01 14:35:11 +00:00
# Use `find . -name "*.patch" | sort` to get an up-to-date listing of all patches
systemd: switch from our own fork to upstream repo + local patches After patching, this produces exactly the same source code as in our custom fork, but having the actual patches inlined inside nixpkgs makes it easier to get rid of them. In case more complicated rebasing is necessary, maintainers can - Clone the upstream systemd/systemd[-stable] repo - Checkout the current rev mentioned in src - Apply the patches from this folder via `git am 00*.patch` - Rebase the repo on top of a new version - Export the patch series via `git format-patch $newVersion` - Update the patches = [ … ] attribute (if necessary)
2020-01-26 13:56:41 +00:00
patches = [
./0001-Start-device-units-for-uninitialised-encrypted-devic.patch
systemd: regenerate patches It seems nix is much more permissive in applying patches than git am. These patches were regenerated by running `git am path/to/nixpkgs/pkgs/os-specific/linux/systemd/*.patch`, and manually running `patch -p1 < path/to/nixpkgs/pkgs/os-specific/linux/systemd/*N.patch` where necessary.
2020-04-30 00:03:18 +01:00
./0002-Don-t-try-to-unmount-nix-or-nix-store.patch
./0003-Fix-NixOS-containers.patch
./0004-Look-for-fsck-in-the-right-place.patch
./0005-Add-some-NixOS-specific-unit-directories.patch
./0006-Get-rid-of-a-useless-message-in-user-sessions.patch
./0007-hostnamed-localed-timedated-disable-methods-that-cha.patch
./0008-Fix-hwdb-paths.patch
./0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
./0010-localectl-use-etc-X11-xkb-for-list-x11.patch
./0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch
systemd: 246.6 -> 247-rc2
2020-11-01 14:35:11 +00:00
./0012-inherit-systemd-environment-when-calling-generators.patch
./0013-add-rootprefix-to-lookup-dir-paths.patch
./0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
./0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
./0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch
./0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
./0018-logind-seat-debus-show-CanMultiSession-again.patch
systemd: 247.3 -> 247.6
2021-03-31 17:24:19 +01:00
./0019-pkg-config-derive-prefix-from-prefix.patch
systemd: fix build
2021-04-30 13:23:00 +01:00
# Fix -Werror=format.
(fetchpatch {
url = "https://github.com/systemd/systemd/commit/ab1aa6368a883bce88e3162fee2bea14aacedf23.patch";
sha256 = "1b280l5jrjsg8qhsang199mpqjhkpix4c8bm3blknjnq9iv43add";
})
systemd: Patch CVE-2021-33910
2021-07-20 14:27:15 +01:00
# Fix CVE-2021-33910, disclosed 2021-07-20
(fetchpatch {
name = "CVE-2021-33910.patch";
url = "https://github.com/systemd/systemd/commit/441e0115646d54f080e5c3bb0ba477c892861ab9.patch";
sha256 = "1g1lk95igaadg67kah9bpi4zsc01rg398sd1247ghjsvl5hxn4v4";
})
systemd: switch from our own fork to upstream repo + local patches After patching, this produces exactly the same source code as in our custom fork, but having the actual patches inlined inside nixpkgs makes it easier to get rid of them. In case more complicated rebasing is necessary, maintainers can - Clone the upstream systemd/systemd[-stable] repo - Checkout the current rev mentioned in src - Apply the patches from this folder via `git am 00*.patch` - Rebase the repo on top of a new version - Export the patch series via `git format-patch $newVersion` - Update the patches = [ … ] attribute (if necessary)
2020-01-26 13:56:41 +00:00
];
systemd: 243.7 -> 244.3 This required some changes in how we treat DEFAULT_PATH_NORMAL.
2020-03-07 22:47:22 +00:00
postPatch = ''
substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/"
systemd: Fix cross build This was very similar to the Mesa issues fixed in 62e6d73a09870174a891d2a8d29a38e62b05efd5: the user-written code is looking up an unprefixed binutils program. [I think we should have a way in Meson of specifying a program prefix in the cross / native files, as a fallback for any program that isn't explicitly specified. This could both be availible for user written rules, and help with the default rules.] Fixes https://github.com/NixOS/mobile-nixos/issues/161
2020-06-08 01:25:01 +01:00
substituteInPlace src/boot/efi/meson.build \
--replace \
"find_program('ld'" \
"find_program('${stdenv.cc.bintools.targetPrefix}ld'" \
--replace \
"find_program('objcopy'" \
"find_program('${stdenv.cc.bintools.targetPrefix}objcopy'"
systemd: nixpkgs-fmt This was recently introduced, and apparently not nixpkgs-fmt'ed. While there's no global consensus on nixpkgs-fmt'ing everything, indenting this by 2 more spaces won't hurt.
2021-02-03 17:54:07 +00:00
'' + (
let
# The folllowing dlopen patches ensure that all the features that are
# implemented via dlopen(3) are available (or explicitly deactivated) by
# pointing dlopen to the absolute store path instead of relying on the
# linkers runtime lookup code.
#
# All of the dlopen calls have to be handled. When new ones are introduced
# by upstream (or one of our patches) they must be explicitly declared,
# otherwise the build will fail.
#
# As of systemd version 247 we've seen a few errors like `libpcre2.… not
# found` when using e.g. --grep with journalctl. Those errors should
# become less unexpected now.
#
# There are generally two classes of dlopen(3) calls. Those that we want to
# support and those that should be deactivated / unsupported. This change
# enforces that we handle all dlopen calls explicitly. Meaning: There is
# not a single dlopen call in the source code tree that we did not
# explicitly handle.
#
# In order to do this we introduced a list of attributes that maps from
# shared object name to the package that contains them. The package can be
# null meaning the reference should be nuked and the shared object will
# never be loadable during runtime (because it points at an invalid store
# path location).
#
# To get a list of dynamically loaded libraries issue something like
# `grep -ri 'dlopen("lib' $src` and update the below list.
dlopenLibs = [
# We did never provide support for libxkbcommon & qrencode
{ name = "libxkbcommon.so.0"; pkg = null; }
{ name = "libqrencode.so.4"; pkg = null; }
systemd: patch runtime dlopen calls This ensures that all the features that are implemented via dlopen(3) are available (or explicitly deactivated) by pointing dlopen to the absolute store path instead of relying on the linkers runtime lookup code. All of the dlopen calls have to be handled. When new ones are introduced by upstream (or one of our patches) those must be explicitly declared, otherwise the build will fail. As of systemd version 247 we've seen a few errors like `libpcre2.… not found` when using e.g. --grep with journalctl. Those errors should become less unexpected now. There are generally two classes of dlopen calls. Those that we want to support and those that should be deactivated / unsupported. This change enforces that we handle all dlopen calls explicitly. Meaning: There is not a single dlopen call in the code source tree that we did not explicitly handle. In order to do this I introduced a list of attributes that maps from shared object name to the package that contains them. The package can be null meaning the reference should be nuked and the shared object will never be loadable during runtime (because it points at an invalid store path location).
2020-12-26 15:55:33 +00:00
systemd: nixpkgs-fmt This was recently introduced, and apparently not nixpkgs-fmt'ed. While there's no global consensus on nixpkgs-fmt'ing everything, indenting this by 2 more spaces won't hurt.
2021-02-03 17:54:07 +00:00
# We did not provide libpwquality before so it is safe to disable it for
# now.
{ name = "libpwquality.so.1"; pkg = null; }
systemd: patch runtime dlopen calls This ensures that all the features that are implemented via dlopen(3) are available (or explicitly deactivated) by pointing dlopen to the absolute store path instead of relying on the linkers runtime lookup code. All of the dlopen calls have to be handled. When new ones are introduced by upstream (or one of our patches) those must be explicitly declared, otherwise the build will fail. As of systemd version 247 we've seen a few errors like `libpcre2.… not found` when using e.g. --grep with journalctl. Those errors should become less unexpected now. There are generally two classes of dlopen calls. Those that we want to support and those that should be deactivated / unsupported. This change enforces that we handle all dlopen calls explicitly. Meaning: There is not a single dlopen call in the code source tree that we did not explicitly handle. In order to do this I introduced a list of attributes that maps from shared object name to the package that contains them. The package can be null meaning the reference should be nuked and the shared object will never be loadable during runtime (because it points at an invalid store path location).
2020-12-26 15:55:33 +00:00
systemd: nixpkgs-fmt This was recently introduced, and apparently not nixpkgs-fmt'ed. While there's no global consensus on nixpkgs-fmt'ing everything, indenting this by 2 more spaces won't hurt.
2021-02-03 17:54:07 +00:00
# Only include cryptsetup if it is enabled. We might not be able to
# provide it during "bootstrap" in e.g. the minimal systemd build as
# cryptsetup has udev (aka systemd) in it's dependencies.
{ name = "libcryptsetup.so.12"; pkg = if withCryptsetup then cryptsetup else null; }
systemd: patch runtime dlopen calls This ensures that all the features that are implemented via dlopen(3) are available (or explicitly deactivated) by pointing dlopen to the absolute store path instead of relying on the linkers runtime lookup code. All of the dlopen calls have to be handled. When new ones are introduced by upstream (or one of our patches) those must be explicitly declared, otherwise the build will fail. As of systemd version 247 we've seen a few errors like `libpcre2.… not found` when using e.g. --grep with journalctl. Those errors should become less unexpected now. There are generally two classes of dlopen calls. Those that we want to support and those that should be deactivated / unsupported. This change enforces that we handle all dlopen calls explicitly. Meaning: There is not a single dlopen call in the code source tree that we did not explicitly handle. In order to do this I introduced a list of attributes that maps from shared object name to the package that contains them. The package can be null meaning the reference should be nuked and the shared object will never be loadable during runtime (because it points at an invalid store path location).
2020-12-26 15:55:33 +00:00
systemd: nixpkgs-fmt This was recently introduced, and apparently not nixpkgs-fmt'ed. While there's no global consensus on nixpkgs-fmt'ing everything, indenting this by 2 more spaces won't hurt.
2021-02-03 17:54:07 +00:00
# We are using libidn2 so we only provide that and ignore the others.
# Systemd does this decision during configure time and uses ifdef's to
# enable specific branches. We can safely ignore (nuke) the libidn "v1"
# libraries.
{ name = "libidn2.so.0"; pkg = libidn2; }
{ name = "libidn.so.12"; pkg = null; }
{ name = "libidn.so.11"; pkg = null; }
systemd: patch runtime dlopen calls This ensures that all the features that are implemented via dlopen(3) are available (or explicitly deactivated) by pointing dlopen to the absolute store path instead of relying on the linkers runtime lookup code. All of the dlopen calls have to be handled. When new ones are introduced by upstream (or one of our patches) those must be explicitly declared, otherwise the build will fail. As of systemd version 247 we've seen a few errors like `libpcre2.… not found` when using e.g. --grep with journalctl. Those errors should become less unexpected now. There are generally two classes of dlopen calls. Those that we want to support and those that should be deactivated / unsupported. This change enforces that we handle all dlopen calls explicitly. Meaning: There is not a single dlopen call in the code source tree that we did not explicitly handle. In order to do this I introduced a list of attributes that maps from shared object name to the package that contains them. The package can be null meaning the reference should be nuked and the shared object will never be loadable during runtime (because it points at an invalid store path location).
2020-12-26 15:55:33 +00:00
systemd: nixpkgs-fmt This was recently introduced, and apparently not nixpkgs-fmt'ed. While there's no global consensus on nixpkgs-fmt'ing everything, indenting this by 2 more spaces won't hurt.
2021-02-03 17:54:07 +00:00
# journalctl --grep requires libpcre so lets provide it
{ name = "libpcre2-8.so.0"; pkg = pcre2; }
];
systemd: patch runtime dlopen calls This ensures that all the features that are implemented via dlopen(3) are available (or explicitly deactivated) by pointing dlopen to the absolute store path instead of relying on the linkers runtime lookup code. All of the dlopen calls have to be handled. When new ones are introduced by upstream (or one of our patches) those must be explicitly declared, otherwise the build will fail. As of systemd version 247 we've seen a few errors like `libpcre2.… not found` when using e.g. --grep with journalctl. Those errors should become less unexpected now. There are generally two classes of dlopen calls. Those that we want to support and those that should be deactivated / unsupported. This change enforces that we handle all dlopen calls explicitly. Meaning: There is not a single dlopen call in the code source tree that we did not explicitly handle. In order to do this I introduced a list of attributes that maps from shared object name to the package that contains them. The package can be null meaning the reference should be nuked and the shared object will never be loadable during runtime (because it points at an invalid store path location).
2020-12-26 15:55:33 +00:00
systemd: nixpkgs-fmt This was recently introduced, and apparently not nixpkgs-fmt'ed. While there's no global consensus on nixpkgs-fmt'ing everything, indenting this by 2 more spaces won't hurt.
2021-02-03 17:54:07 +00:00
patchDlOpen = dl:
let
library = "${lib.makeLibraryPath [ dl.pkg ]}/${dl.name}";
in
if dl.pkg == null then ''
# remove the dependency on the library by replacing it with an invalid path
for file in $(grep -lr 'dlopen("${dl.name}"' src); do
echo "patching dlopen(\"${dl.name}\", …) in $file to an invalid store path ("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}")…"
substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"'
done
'' else ''
# ensure that the library we provide actually exists
if ! [ -e ${library} ]; then
echo 'The shared library `${library}` does not exist but was given as subtitute for `${dl.name}`'
exit 1
fi
# make the path to the dependency explicit
for file in $(grep -lr 'dlopen("${dl.name}"' src); do
echo "patching dlopen(\"${dl.name}\", …) in $file to ${library}…"
substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("${library}"'
done
'';
in
# patch all the dlopen calls to contain absolute paths to the libraries
lib.concatMapStringsSep "\n" patchDlOpen dlopenLibs
)
systemd: patch runtime dlopen calls This ensures that all the features that are implemented via dlopen(3) are available (or explicitly deactivated) by pointing dlopen to the absolute store path instead of relying on the linkers runtime lookup code. All of the dlopen calls have to be handled. When new ones are introduced by upstream (or one of our patches) those must be explicitly declared, otherwise the build will fail. As of systemd version 247 we've seen a few errors like `libpcre2.… not found` when using e.g. --grep with journalctl. Those errors should become less unexpected now. There are generally two classes of dlopen calls. Those that we want to support and those that should be deactivated / unsupported. This change enforces that we handle all dlopen calls explicitly. Meaning: There is not a single dlopen call in the code source tree that we did not explicitly handle. In order to do this I introduced a list of attributes that maps from shared object name to the package that contains them. The package can be null meaning the reference should be nuked and the shared object will never be loadable during runtime (because it points at an invalid store path location).
2020-12-26 15:55:33 +00:00
# finally ensure that there are no left-over dlopen calls that we didn't handle
+ ''
if grep -qr 'dlopen("[^/]' src; then
echo "Found unhandled dlopen calls: "
grep -r 'dlopen("[^/]' src
exit 1
fi
systemd: 243.7 -> 244.3 This required some changes in how we treat DEFAULT_PATH_NORMAL.
2020-03-07 22:47:22 +00:00
'';
systemd: remove lib output systemd 246 started baking in some strings into $lib/lib/libsystemd.so which points back to $out. It might be desirable to not have these strings in there, but instead have systemd ask the running manager for the really active paths via IPC, or patch in some more mutable paths (like /run/current-system/…) - but as long as it is as it is, we should probably should just stop producing the `lib` output for now. This does increase the runtime closure for installations not pulling in systemd.out, or linking against multiple libsystemd's, but doesn't increase the runtime closure for NixOS itself, as it needs systemd anyways, and doesn't link against multiple variants of it. We can also remove the aarch64-specific $out/lib/systemd/catalog hack, and revive it at a later time if the `lib` output is reintroduced.
2020-08-12 17:34:09 +01:00
outputs = [ "out" "man" "dev" ];
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-02 23:31:30 +00:00
nativeBuildInputs =
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
[
treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix continuation of #109595 pkgconfig was aliased in 2018, however, it remained in all-packages.nix due to its wide usage. This cleans up the remaining references to pkgs.pkgsconfig and moves the entry to aliases.nix. python3Packages.pkgconfig remained unchanged because it's the canonical name of the upstream package on pypi.
2021-01-19 06:50:56 +00:00
pkg-config
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
gperf
ninja
meson
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-02 23:31:30 +00:00
coreutils # meson calls date, stat etc.
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 14:41:34 +00:00
glibcLocales
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
patchelf
getent
m4
systemd: 239.20190219 -> 241.20190221
2019-02-22 08:23:48 +00:00
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
intltool
gettext
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
libxslt
docbook_xsl
docbook_xml_dtd_42
docbook_xml_dtd_45
(buildPackages.python3Packages.python.withPackages (ps: with ps; [ python3Packages.lxml ]))
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-02 23:31:30 +00:00
];
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
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-02 23:31:30 +00:00
buildInputs =
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
[
acl
audit
glib
kmod
libcap
libgcrypt
libidn2
libuuid
linuxHeaders
pam
systemd: build without iptables when networkd is disabled upstreams TODO mentions iptables-dev (libiptc) is also used for nspawn, but it seems like it only makes use of this via networkd anyways (or does these days) - at least systemdMinimal compiles successfully without iptables in the build closure.
2020-10-27 22:37:01 +00:00
]
systemd: add withPCRE2 option
2020-10-28 00:36:02 +00:00
systemd: use withPortabled in mesonFlags No matter what withPortabled was being set, we always passed -Dportabled=false in mesonFlags. Fix this. Also, nixpkgs-fmt the file for consistency.
2020-11-24 23:11:56 +00:00
++ lib.optional withApparmor libapparmor
++ lib.optional wantCurl (lib.getDev curl)
systemd: introduce withCompression flag This will build systemd without some compression utils, useful for systemdMinimal.
2020-10-27 23:02:24 +00:00
++ lib.optionals withCompression [ bzip2 lz4 xz ]
systemd: use withPortabled in mesonFlags No matter what withPortabled was being set, we always passed -Dportabled=false in mesonFlags. Fix this. Also, nixpkgs-fmt the file for consistency.
2020-11-24 23:11:56 +00:00
++ lib.optional withCryptsetup (lib.getDev cryptsetup.dev)
++ lib.optional withEfi gnu-efi
++ lib.optional withKexectools kexectools
++ lib.optional withLibseccomp libseccomp
++ lib.optional withNetworkd iptables
++ lib.optional withPCRE2 pcre2
++ lib.optional withResolved libgpgerror
++ lib.optional withSelinux libselinux
++ lib.optional withRemote libmicrohttpd
systemd: Add an option for homed This is disabled by default to indicate that is hasn't been adiquately tested with NixOS yet.
2020-10-10 11:05:31 +01:00
++ lib.optionals withHomed [ p11-kit libfido2 ]
systemd: use withPortabled in mesonFlags No matter what withPortabled was being set, we always passed -Dportabled=false in mesonFlags. Fix this. Also, nixpkgs-fmt the file for consistency.
2020-11-24 23:11:56 +00:00
;
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-02 23:31:30 +00:00
#dontAddPrefix = true;
mesonFlags = [
systemd: Move D-Bus conf file to share/dbus-1/system.d Since D-Bus 1.9.18 configuration files installed by third-party should go in share/dbus-1/system.d. The old location is for sysadmin overrides.
2019-09-16 03:51:15 +01:00
"-Ddbuspolicydir=${placeholder "out"}/share/dbus-1/system.d"
systemd: 239.20190219 -> 241.20190221
2019-02-22 08:23:48 +00:00
"-Ddbussessionservicedir=${placeholder "out"}/share/dbus-1/services"
"-Ddbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services"
"-Dpamconfdir=${placeholder "out"}/etc/pam.d"
"-Drootprefix=${placeholder "out"}"
"-Dpkgconfiglibdir=${placeholder "dev"}/lib/pkgconfig"
"-Dpkgconfigdatadir=${placeholder "dev"}/share/pkgconfig"
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-02 23:31:30 +00:00
"-Dloadkeys-path=${kbd}/bin/loadkeys"
"-Dsetfont-path=${kbd}/bin/setfont"
"-Dtty-gid=3" # tty in NixOS has gid 3
systemd: use pure debug shell Instead of referencing the impure /bin/sh, use a proper bash from the store.
2017-03-31 06:34:55 +01:00
"-Ddebug-shell=${bashInteractive}/bin/bash"
systemd: stdenv.lib -> lib This is a no-op and makes things a bit smaller.
2020-10-27 22:20:54 +00:00
"-Dglib=${lib.boolToString (glib != null)}"
systemd: disable building tests We are currently not running any tests but building them takes signitifcant amounts of time since they account to about 40% of all the compilation targets.
2019-05-17 19:00:22 +01:00
# while we do not run tests we should also not build them. Removes about 600 targets
"-Dtests=false"
systemd: add withAnalyze flag
2020-10-27 23:29:07 +00:00
"-Danalyze=${lib.boolToString withAnalyze}"
systemd: make gcrypt optional
2020-10-27 23:29:34 +00:00
"-Dgcrypt=${lib.boolToString (libgcrypt != null)}"
systemd: stdenv.lib -> lib This is a no-op and makes things a bit smaller.
2020-10-27 22:20:54 +00:00
"-Dimportd=${lib.boolToString withImportd}"
systemd: introduce withCompression flag This will build systemd without some compression utils, useful for systemdMinimal.
2020-10-27 23:02:24 +00:00
"-Dlz4=${lib.boolToString withCompression}"
pkgs/os-specific: stdenv.lib -> lib
2021-01-15 14:45:37 +00:00
"-Dhomed=${lib.boolToString withHomed}"
systemd: stdenv.lib -> lib This is a no-op and makes things a bit smaller.
2020-10-27 22:20:54 +00:00
"-Dlogind=${lib.boolToString withLogind}"
"-Dlocaled=${lib.boolToString withLocaled}"
"-Dhostnamed=${lib.boolToString withHostnamed}"
systemd: add withMachined flag
2020-10-28 00:08:29 +00:00
"-Dmachined=${lib.boolToString withMachined}"
systemd: stdenv.lib -> lib This is a no-op and makes things a bit smaller.
2020-10-27 22:20:54 +00:00
"-Dnetworkd=${lib.boolToString withNetworkd}"
systemd: 246.6 -> 247-rc2
2020-11-01 14:35:11 +00:00
"-Doomd=${lib.boolToString withOomd}"
systemd: add withPolkit option
2020-10-27 23:48:51 +00:00
"-Dpolkit=${lib.boolToString withPolkit}"
systemd: stdenv.lib -> lib This is a no-op and makes things a bit smaller.
2020-10-27 22:20:54 +00:00
"-Dcryptsetup=${lib.boolToString withCryptsetup}"
systemd: use withPortabled in mesonFlags No matter what withPortabled was being set, we always passed -Dportabled=false in mesonFlags. Fix this. Also, nixpkgs-fmt the file for consistency.
2020-11-24 23:11:56 +00:00
"-Dportabled=${lib.boolToString withPortabled}"
systemd: stdenv.lib -> lib This is a no-op and makes things a bit smaller.
2020-10-27 22:20:54 +00:00
"-Dhwdb=${lib.boolToString withHwdb}"
systemd: add withRemote option (default to false), make curl optional This makes curl optional if both remote and importd are disabled, and makes some assertions more robust by switching from curl.dev != null to lib.getDev curl != null.
2020-10-27 22:48:19 +00:00
"-Dremote=${lib.boolToString withRemote}"
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-02 23:31:30 +00:00
"-Dsysusers=false"
systemd: stdenv.lib -> lib This is a no-op and makes things a bit smaller.
2020-10-27 22:20:54 +00:00
"-Dtimedated=${lib.boolToString withTimedated}"
"-Dtimesyncd=${lib.boolToString withTimesyncd}"
systemd: add withUserDb flag
2020-10-28 00:00:44 +00:00
"-Duserdb=${lib.boolToString withUserDb}"
systemd: add withCoredump flag … and default it to false for systemdMinimal
2020-10-27 23:12:45 +00:00
"-Dcoredump=${lib.boolToString withCoredump}"
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-02 23:31:30 +00:00
"-Dfirstboot=false"
systemd: stdenv.lib -> lib This is a no-op and makes things a bit smaller.
2020-10-27 22:20:54 +00:00
"-Dresolve=${lib.boolToString withResolved}"
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-02 23:31:30 +00:00
"-Dsplit-usr=false"
systemd: add withRemote option (default to false), make curl optional This makes curl optional if both remote and importd are disabled, and makes some assertions more robust by switching from curl.dev != null to lib.getDev curl != null.
2020-10-27 22:48:19 +00:00
"-Dlibcurl=${lib.boolToString wantCurl}"
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-02 23:31:30 +00:00
"-Dlibidn=false"
"-Dlibidn2=true"
"-Dquotacheck=false"
"-Dldconfig=false"
"-Dsmack=true"
systemd: 239.20190219 -> 241.20190221
2019-02-22 08:23:48 +00:00
"-Db_pie=true"
systemd: 246.6 -> 247-rc2
2020-11-01 14:35:11 +00:00
"-Dinstall-sysconfdir=false"
nixos/users: Increase maximum system uid/gid from 499 to 999 This enlarges the system uid/gid range 6-fold, from 100 to 600 ids. This is a preventative measure against running out of dynamically allocated ids for NixOS services with isSystemUser, which should become the preferred way of allocating uids for non-real users.
2019-07-31 22:19:49 +01:00
/*
As of now, systemd doesn't allow runtime configuration of these values. So
the settings in /etc/login.defs have no effect on it. Many people think this
should be supported however, see
- https://github.com/systemd/systemd/issues/3855
- https://github.com/systemd/systemd/issues/4850
- https://github.com/systemd/systemd/issues/9769
- https://github.com/systemd/systemd/issues/9843
- https://github.com/systemd/systemd/issues/10184
*/
"-Dsystem-uid-max=999"
"-Dsystem-gid-max=999"
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-02 23:31:30 +00:00
# "-Dtime-epoch=1"
"-Dsysvinit-path="
"-Dsysvrcnd-path="
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 14:41:34 +00:00
"-Dkill-path=${coreutils}/bin/kill"
"-Dkmod-path=${kmod}/bin/kmod"
utillinux: rename to util-linux
2020-11-24 15:29:28 +00:00
"-Dsulogin-path=${util-linux}/bin/sulogin"
"-Dmount-path=${util-linux}/bin/mount"
"-Dumount-path=${util-linux}/bin/umount"
systemd: 242 -> 243
2019-09-04 00:35:49 +01:00
"-Dcreate-log-dirs=false"
systemd: switch to unified cgroup hierarchy by default See https://www.redhat.com/sysadmin/fedora-31-control-group-v2 for details on why this is desirable, and how it impacts containers. Users that need to keep using the old cgroup hierarchy can re-enable it by setting `systemd.unifiedCgroupHierarchy` to `false`. Well-known candidates not supporting that hierarchy, like docker and hidepid=… will disable it automatically. Fixes #73800
2020-11-17 20:54:26 +00:00
# Use cgroupsv2. This is already the upstream default, but better be explicit.
"-Ddefault-hierarchy=unified"
systemd: 242 -> 243
2019-09-04 00:35:49 +01:00
# Upstream defaulted to disable manpages since they optimize for the much
# more frequent development builds
"-Dman=true"
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
systemd: disable efi if we don't build with withEfi is set to false
2020-10-27 23:35:00 +00:00
"-Defi=${lib.boolToString withEfi}"
systemd: withEfi: move gnu-efi check into assertion
2020-10-27 23:33:26 +00:00
"-Dgnu-efi=${lib.boolToString withEfi}"
] ++ lib.optionals withEfi [
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
"-Defi-libdir=${toString gnu-efi}/lib"
"-Defi-includedir=${toString gnu-efi}/include/efi"
"-Defi-ldsdir=${toString gnu-efi}/lib"
systemd: add withShellCompletions flag
2020-10-27 23:51:39 +00:00
] ++ lib.optionals (withShellCompletions == false) [
"-Dbashcompletiondir=no"
"-Dzshcompletiondir=no"
systemd: add withNss flag
2020-10-28 00:05:14 +00:00
] ++ lib.optionals (!withNss) [
"-Dnss-myhostname=false"
"-Dnss-mymachines=false"
"-Dnss-resolve=false"
"-Dnss-systemd=false"
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-02 23:31:30 +00:00
];
preConfigure = ''
mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
export LC_ALL="en_US.UTF-8";
# FIXME: patch this in systemd properly (and send upstream).
# already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount
systemd: substituteInPlace paths to mkswap and mke2fs (used in new cryptsetup-generator.c)
2019-05-14 00:20:56 +01:00
for i in \
src/core/mount.c \
src/core/swap.c \
src/cryptsetup/cryptsetup-generator.c \
src/journal/cat.c \
src/nspawn/nspawn.c \
src/remount-fs/remount-fs.c \
src/shared/generator.c \
src/shutdown/shutdown.c \
units/emergency.service.in \
systemd: correct path to modprobe@.service The unit hard-codes a path to modprobe which is obviously invalid.
2021-03-09 16:41:02 +00:00
units/modprobe@.service \
systemd: substituteInPlace paths to mkswap and mke2fs (used in new cryptsetup-generator.c)
2019-05-14 00:20:56 +01:00
units/rescue.service.in \
units/systemd-logind.service.in \
units/systemd-nspawn@.service.in; \
do
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-02 23:31:30 +00:00
test -e $i
substituteInPlace $i \
--replace /usr/bin/getent ${getent}/bin/getent \
utillinux: rename to util-linux
2020-11-24 15:29:28 +00:00
--replace /sbin/mkswap ${lib.getBin util-linux}/sbin/mkswap \
--replace /sbin/swapon ${lib.getBin util-linux}/sbin/swapon \
--replace /sbin/swapoff ${lib.getBin util-linux}/sbin/swapoff \
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-02 23:31:30 +00:00
--replace /bin/echo ${coreutils}/bin/echo \
--replace /bin/cat ${coreutils}/bin/cat \
utillinux: rename to util-linux
2020-11-24 15:29:28 +00:00
--replace /sbin/sulogin ${lib.getBin util-linux}/sbin/sulogin \
systemd: fix /sbin/modprobe usage in logind, nspawn@ service files
2019-10-05 18:25:43 +01:00
--replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \
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-02 23:31:30 +00:00
--replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \
--replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency
done
systemd: 246.6 -> 247-rc2
2020-11-01 14:35:11 +00:00
for dir in tools src/resolve test src/test src/shared; do
systemd: 239.20190219 -> 241.20190221
2019-02-22 08:23:48 +00:00
patchShebangs $dir
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-02 23:31:30 +00:00
done
systemd: adding support for systemd-importd Adding `systemd-importd` to the build, so that `machinectl`s `import-.*` may actually do anything. Currently they fail with ``` Failed to transfer image: The name org.freedesktop.import1 was not provided by any .service files ``` as `systemd-importd` is not built. Also registers the regarding dbus api and service in the systemd module.
2019-10-03 21:24:15 +01:00
# absolute paths to gpg & tar
substituteInPlace src/import/pull-common.c \
gnupgMinimal: move to all-packages.nix, use from inside systemd This makes things more consistent with how we pass in utillinuxMinimal. There's already a minimal argument in the gnupg derivation, but this gnupg is even more minimal. Instead of defining a gnupgSuperMinimal, we define it inline inside systemd.
2020-08-06 11:01:45 +01:00
--replace '"gpg"' '"${gnupg}/bin/gpg"'
systemd: adding support for systemd-importd Adding `systemd-importd` to the build, so that `machinectl`s `import-.*` may actually do anything. Currently they fail with ``` Failed to transfer image: The name org.freedesktop.import1 was not provided by any .service files ``` as `systemd-importd` is not built. Also registers the regarding dbus api and service in the systemd module.
2019-10-03 21:24:15 +01:00
for file in src/import/{{export,import,pull}-tar,import-common}.c; do
substituteInPlace $file \
--replace '"tar"' '"${gnutar}/bin/tar"'
done
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-02 23:31:30 +00:00
substituteInPlace src/journal/catalog.c \
--replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
'';
# These defines are overridden by CFLAGS and would trigger annoying
# warning messages
postConfigure = ''
substituteInPlace config.h \
--replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \
--replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \
--replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH"
'';
treewide: NIX_CFLAGS_COMPILE -> string
2019-10-29 23:53:51 +00:00
NIX_CFLAGS_COMPILE = toString [
# Can't say ${polkit.bin}/bin/pkttyagent here because that would
# lead to a cyclic dependency.
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
"-UPOLKIT_AGENT_BINARY_PATH"
"-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
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-02 23:31:30 +00:00
treewide: NIX_CFLAGS_COMPILE -> string
2019-10-29 23:53:51 +00:00
# Set the release_agent on /sys/fs/cgroup/systemd to the
# currently running systemd (/run/current-system/systemd) so
# that we don't use an obsolete/garbage-collected release agent.
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
"-USYSTEMD_CGROUP_AGENT_PATH"
"-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\""
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-02 23:31:30 +00:00
systemd: nixpkgs-fmt
2020-10-27 22:28:29 +00:00
"-USYSTEMD_BINARY_PATH"
"-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
treewide: NIX_CFLAGS_COMPILE -> string
2019-10-29 23:53:51 +00:00
];
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-02 23:31:30 +00:00
tree-wide: disable `doCheck` and `doInstallCheck` where it fails (the trivial part)
2018-04-25 04:20:18 +01:00
doCheck = false; # fails a bunch of tests
systemd: drop 001{4,5}-{catalog,hwdb}-don-t-update-on-install.patch These patches removed logic in the meson install phase invoking `journalctl --update-catalog` and `systemd-hwdb update`, which would mutate the running system, and obviously fails in the sandbox. Upstream also knows this is a bad thing if you're not on the machine you want to deploy to, so there's logic in there to not execute it when DESTDIR isn't empty. In our case, it is - as we set --prefix instead for other reasons, but by just setting DESTIDIR to "/", we can still trigger these things to be skipped. The patches removed some context from 0018-Install-default-configuration-into-out-share-factory.patch, which we need to introduce there to make that patch still apply.
2020-01-26 15:15:19 +00:00
# trigger the test -n "$DESTDIR" || mutate in upstreams build system
preInstall = ''
export DESTDIR=/
'';
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-02 23:31:30 +00:00
postInstall = ''
# sysinit.target: Don't depend on
# systemd-tmpfiles-setup.service. This interferes with NixOps's
# send-keys feature (since sshd.service depends indirectly on
# sysinit.target).
mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/
mkdir -p $out/example/systemd
mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example
mv $out/lib/systemd/{system,user} $out/example/systemd
rm -rf $out/etc/systemd/system
# Fix reference to /bin/false in the D-Bus services.
for i in $out/share/dbus-1/system-services/*.service; do
substituteInPlace $i --replace /bin/false ${coreutils}/bin/false
done
rm -rf $out/etc/rpm
# "kernel-install" shouldn't be used on NixOS.
find $out -name "*kernel-install*" -exec rm {} \;
systemd: add withDocumentation flag
2020-10-27 23:54:08 +00:00
'' + lib.optionalString (!withDocumentation) ''
rm -rf $out/share/doc
'';
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-02 23:31:30 +00:00
# The interface version prevents NixOS from switching to an
# incompatible systemd at runtime. (Switching across reboots is
# fine, of course.) It should be increased whenever systemd changes
# in a backwards-incompatible way. If the interface version of two
# systemd builds is the same, then we can switch between them at
# runtime; otherwise we can't and we need to reboot.
Revert systemd interface version to 2 The new systemd in 19.09 gives an "Access Denied" error when doing "systemctl daemon-reexec" on an 19.03 system. The fix is to use the previous systemctl to signal the daemon to re-exec itself. This ensures that users don't have to reboot when upgrading from NixOS 19.03 to 19.09.
2019-09-16 15:51:19 +01:00
passthru.interfaceVersion = 2;
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-02 23:31:30 +00:00
systemd: stdenv.lib -> lib This is a no-op and makes things a bit smaller.
2020-10-27 22:20:54 +00:00
meta = with lib; {
systemd: 243.4 -> 243.7 This bumps to the latest state of the systemd 242 stable, published at https://github.com/systemd/systemd-stable/tree/v243-stable. Should cover CVE-2020-1712. Git Log: f8dd0f2f15 (tag: v243.7, systemd-stable/v243-stable) Revert "Support Plugable UD-PRO8 dock" 1a5428c2ab hibernate-resume-generator: wait "infinitely" for the resume device eb3148c468 (tag: v243.6) hwdb: update to v245-rc1 f14fa558ae Fix typo in function name fb21e13e8e polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it 2e504c92d1 sd-bus: introduce API for re-enqueuing incoming messages 4d80c8f158 polkit: use structured initialization 54791aff01 polkit: on async pk requests, re-validate action/details 81532beddc polkit: reuse some common bus message appending code 4441844d58 bus-polkit: rename return error parameter to ret_error 31a1d569db shared: split out polkit stuff from bus-util.c → bus-polkit.c 560eb5babf test: adapt to the new capsh format 275b266bde meson: update efi path detection to gnu-efi-3.0.11 9239154545 presets: "disable" all passive targets by default a827c41851 shared/sysctl-util: normalize repeated slashes or dots to a single value fb1bfd6804 dhcp6: do not use T1 and T2 longer than one provided by the lease ca43a515c6 network: fix implicit type conversion warning by GCC-10 421eca7edf bootspec: parse random-seed-mode line in loader.conf 34e21fc6de sd-boot: fix typo df7b3a05c9 test: Synchronize journal before reading from it 9326efee71 sd-bus: fix introspection bug in signal parameter names 7bbdc56aaf efi: fix build. 486f8ca365 generator: order growfs for the root fs after systemd-remount-fs 56d442e29d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument 6ed1152282 Documentation update for x-systemd.{before,after} dba3efa34a man: fix typo in systemd.netdev Xfrm example 6f9a8621d8 timesyncd: log louder when we refuse a server due to root distance 0637255d3b resolved: drop DNSSEC root key that is not valid anymore 9a135baa40 journal: don't use startswith() on something that is not a NUL-terminated string 1ff3972a0f test: add test for https://github.com/systemd/systemd/issues/14560 cac79b606b core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default 906ba9a67d pkgconf: add full generator paths 01b93e2c68 tree-wide: we forgot to destroy some bus errors 5c9455657e mount: make checks on perpetual mount units more lax 28c58beca1 core: never allow perpetual units to be masked d3b044b3e7 typo: "May modify to" -> "May modify" fd378d3d3c sysctl: downgrade message when we have no permission db4fbf5c61 Clarify journald.conf MaxLevelStore documentation c8365f71c0 logind: refuse overriding idle hint on tty sessions cd91f567b6 cgroup: update only siblings that got realized once c672dcd212 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted" a592a40564 journalctl: Correctly handle combination of --reverse and --lines (fixes #1596) 0aa144ab1d journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse 3b803a5e66 core: fix re-realization of cgroup siblings 7549dd40fc core: propagate service state to socket in more load states af6df343b2 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH a3c1ce25a7 core: be more restrictive on the dependency types we allow to be created transiently 2b9ec8384c udev: don't import parent ID_FS_ data on partitions ecd95c507c man: fix option name 0d4f06156b Support Plugable UD-PRO8 dock 7fba869abd gpt-auto: don't assume XBOOTLDR is vfat 494c281b67 man: fix documentation of IBM VIO device naming 7271fb056a man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD 852ae28e68 boot: fix osrel parser 2613200370 udev: do not use exact match of file permission 46477397c1 network: lower the log-level of harmless message 7163b1fe86 hwdb: ignore keys added in kernel 5.5 92f90837dc systemctl: skip non-existent units in the 'cat' verb a67227cc99 systemd.exec: document the file system for EnvironmentFile paths cfb4c0aca5 systemd-analyze: fixed typo in documentation 017fddd998 test-condition: fix group check condition 9d5e3cb774 umount: show correct error message 252f1a5277 Revert "Drop dbus activation stub service" 20bbfac95e man: add section about user manager units c93ef60212 man: add remote-*.targets to the bootup sequence 55e0f99689 time-util: also use 32bit hack on EOVERFLOW 7afe2ecb02 [man] note which UID ranges will get user journals a43b67a4c9 [man] fix URL dedb26a8d6 analyze: badness if neither of RootImage and RootDirectory exists 714c93862a initrd: make udev cleanup service confict trigger and settle too 8932407ae1 man: we support growing xfs too these days 19af11dc07 time-util: deal with systems where userspace has 64bit time_t but kernel does not c90229d81d [import] fix stdin/stdout pipe behavior in import/export tar/raw 39910328da cryptsetup-generator: unconfuse writing of the device timeout fc5e6c87a4 shared/install: log syntax error for invalid DefaultInstance= 409c94a407 shared/install: provide a nicer error message for invalid WantedBy=/Required= values 70e8c1978a seccomp: real syscall numbers are >= 0 a0a1977d9a seccomp: more comprehensive protection against libseccomp's __NR_xyz namespace invasion 7f936c60d5 network: set ipv6 mtu after link-up or device mtu change b59d88cc62 man: fix typo in net-naming-scheme man page c5e5ac0958 man: fix typos (#14304) 9a2f26564d ipv4ll: do not reset conflict counter on restart bc9e1ebfdd Fix typo (duplicate "or") c6cb71b7e7 network: if /sys is rw, then udev should be around 67dcdfd956 nspawn: do not fail if udev is not running a7938a1bc6 Create parent directories when creating systemd-private subdirs 53aa44f873 network: do not return error but return UINT64_MAX if speed meter is disabled 65abf12674 core: swap priority can be negative b1cf452ff5 systemctl: enhance message about kexec missing kernel 07a0e5b425 man: use mkswap@ instead of makeswap@ 57dc017c6b journald: don't ask for the machine ID if we don't need it ac392a57c0 journalctl: pager_close() calls fflush(stdout) anyway as first thing ee7dfadc82 journald: remove unused field 471073f1b5 journalctl: return EOPNOTSUPP if pcre is not enabled 002ededb61 man: drop reference to machined, add one for journald instead fd3bd4be3b pid1: make TimeoutAbortSec settable for transient units eb2ef4d664 pid1: fix setting of DefaultTimeoutAbortSec 1d75e29b23 shared/ask-password-api: modify keyctl break value a16b1ee7e5 cryptsetup: reduce the chance that we will be OOM killed 4836fb010a core: write out correct field name when creating transient service units 3e2c547f6d udevd: don't use monitor after manager_exit() d42f7d45a8 Revert "udevd: fix crash when workers time out after exit is signal caught" c9a287eee8 man/systemd.link: Add missing verb *be* a67a3ae04b man: document all pager variables for systemctl and systemd 3a8fce3f38 core.timer: fix "systemd-analyze dump" and docs syntax inconsistencies wrt OnTimezoneChange= fdffd284b6 core/service: downgrade "scheduling restart" message to debug 733e7f19d3 travis: add missing closing quote sign 0d7b7817fc systemd-tmpfiles: don't install timer when service isn't installed either 0e7f83cd2b pam_systemd: prolong method call timeout when allocating session
2020-02-18 20:46:40 +00:00
homepage = "https://www.freedesktop.org/wiki/Software/systemd/";
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-02 23:31:30 +00:00
description = "A system and service manager for Linux";
systemd: add license
2018-08-17 23:32:36 +01:00
license = licenses.lgpl21Plus;
platforms = platforms.linux;
systemd: lower priority to solve collisions with openresolv
2019-05-08 11:55:25 +01:00
priority = 10;
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" This reverts commit c778945806b44d46ec16bc4302e7e7163e6bab97. I believe this is exactly what brings the staging branch into the right shape after the last merge from master (through staging-next); otherwise part of staging changes would be lost (due to being already reachable from master but reverted).
2020-10-26 07:17:14 +00:00
maintainers = with maintainers; [ andir eelco flokli kloenk ];
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-02 23:31:30 +00:00
};
* Added systemd. svn path=/nixpkgs/trunk/; revision=34200
2012-05-21 21:48:19 +01:00
}
Reference in New Issue Copy Permalink