diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 23:25:18 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 23:25:18 +0200 |
| commit | e68505e7355b0a76caac43783f59fae6474073dc (patch) | |
| tree | 4b59b8084e24e6ffe538c5f2f9697fb7c80b2ad0 /pkgs/os-specific/linux/systemd | |
| parent | 9894a70299497ee1d2bb746374d986e8d0f771e3 (diff) | |
| parent | 8a999d15ebfb929a5f5fc5b08be6a23848f29710 (diff) | |
| download | nixpkgs-e68505e7355b0a76caac43783f59fae6474073dc.tar nixpkgs-e68505e7355b0a76caac43783f59fae6474073dc.tar.gz nixpkgs-e68505e7355b0a76caac43783f59fae6474073dc.tar.bz2 nixpkgs-e68505e7355b0a76caac43783f59fae6474073dc.tar.lz nixpkgs-e68505e7355b0a76caac43783f59fae6474073dc.tar.xz nixpkgs-e68505e7355b0a76caac43783f59fae6474073dc.tar.zst nixpkgs-e68505e7355b0a76caac43783f59fae6474073dc.zip | |
Merge remote-tracking branch 'upstream/gcc8' into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/systemd')
| -rw-r--r-- | pkgs/os-specific/linux/systemd/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 4117df8cf13..48f91521418 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -15,9 +15,13 @@ , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools }: -stdenv.mkDerivation { - version = "242"; +let + pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); + +in stdenv.mkDerivation rec { pname = "systemd"; + # To whoever updates this to 239: check the todo on line 173. + version = "242"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! # Also fresh patches should be cherry-picked from that tree to our current one. |