Commit graph

13356 commits

Author SHA1 Message Date
Frederik Rietdijk 49cd7307d0
Merge pull request #101207 from NixOS/staging-next
Staging next
2020-11-04 10:48:08 +01:00
ajs124 c30745e053
open-iscsi: install systemd files (#97793) 2020-11-04 09:30:03 +01:00
Frederik Rietdijk 10c57af49c Merge staging-next into staging 2020-11-04 09:28:07 +01:00
Frederik Rietdijk 9e6d7d3c74 Merge master into staging-next 2020-11-04 09:27:42 +01:00
R. RyanTM 0e3c2cd8c0 pam_gnupg: 0.1 -> 0.2 2020-11-04 02:49:33 +00:00
R. RyanTM 4e1db3daf0 pcm: 202008 -> 202009 2020-11-04 00:18:43 +00:00
Finn Behrens 7787fd2413 systemd: Add an option for homed
This is disabled by default to indicate that is hasn't been adiquately
tested with NixOS yet.
2020-11-03 17:35:26 -05:00
R. RyanTM bc8715adbb lxcfs: 4.0.5 -> 4.0.6 2020-11-03 09:18:52 -08:00
R. RyanTM a765199f1e i2c-tools: 4.1 -> 4.2 2020-11-03 08:56:06 -08:00
R. RyanTM f3096f3400 ipset: 7.6 -> 7.7 2020-11-03 08:52:51 -08:00
Tim Steinbach b7880ce6ec
linux-rt_5_4: 5.4.70-rt40 -> 5.4.74-rt41 2020-11-03 10:54:25 -05:00
Tim Steinbach f652a024bb
linux: 5.9.2 -> 5.9.3 2020-11-03 10:54:25 -05:00
Tim Steinbach 7e9c6235f1
linux: 5.8.17 -> 5.8.18 2020-11-03 10:54:24 -05:00
Tim Steinbach f249558f95
linux: 5.4.73 -> 5.4.74 2020-11-03 10:54:21 -05:00
Tim Steinbach 5030e5cdc7
linux: 5.10-rc1 -> 5.10-rc2 2020-11-03 08:47:16 -05:00
Tim Steinbach 86542cc097
Merge pull request #100645 from andresilva/linux-zen-5.9
linux_zen: 5.8.13 -> 5.9.3
2020-11-03 08:44:35 -05:00
Frederik Rietdijk 470f05cb5d Merge staging-next into staging 2020-11-03 12:06:41 +01:00
Frederik Rietdijk 237966224d Merge master into staging-next 2020-11-03 12:06:06 +01:00
Kira Bruneau ef16b3f77c linuxPackages.xpadneo: 0.8.3 -> 0.8.4 2020-11-02 21:33:16 -05:00
Mario Rodas 5fa1a7f27f
Merge pull request #101280 from r-ryantm/auto-update/alsa-topology-conf
alsa-topology-conf: 1.2.3 -> 1.2.4
2020-11-02 18:24:09 -05:00
Mario Rodas 3901f6ecd4
Merge pull request #101302 from r-ryantm/auto-update/alsa-ucm-conf
alsa-ucm-conf: 1.2.3 -> 1.2.4
2020-11-02 18:20:03 -05:00
Mario Rodas 5459a313cd
Merge pull request #102309 from marsam/update-lxc
lxc: 4.0.4 -> 4.0.5
2020-11-02 17:53:13 -05:00
Ryan Mulligan f723ed8d69
Merge pull request #102523 from r-ryantm/auto-update/libratbag
libratbag: 0.14 -> 0.15
2020-11-02 12:26:38 -08:00
R. RyanTM 5e4b485d86 libratbag: 0.14 -> 0.15 2020-11-02 19:42:21 +00:00
R. RyanTM 7c1ff55c77 libfabric: 1.11.0 -> 1.11.1 2020-11-02 09:48:56 -08:00
Antoine Eiche 859a44ebc0 systemd: set withRemote true by default
This also adds the libmicrohttpd as a `buildInput` when `withRemote`
is true.
2020-11-02 09:07:52 +01:00
Jonathan Ringer c6afa8820b anbox: kernel.features can be null 2020-11-01 19:59:06 -08:00
Jonathan Ringer 613adb0e88 kernel/linuxManualConfig: add variant metadata 2020-11-01 19:59:06 -08:00
R. RyanTM a27100c77b fwts: 20.08.00 -> 20.09.00 2020-11-01 15:14:53 -08:00
Benjamin Hipple c3ff9045d4
Merge pull request #102336 from bb2020/ds
discrete-scroll: added myself as maintainer
2020-11-01 10:01:50 -05:00
André Silva c633a2e8fb
linux_zen: add maintainer 2020-11-01 14:49:55 +00:00
André Silva 495f9976b4
linux_zen: 5.8.13 -> 5.9.3 2020-11-01 14:49:49 +00:00
Florian Klink d64f4d03d5
Merge pull request #101886 from flokli/systemd-more-optional
systemd: introduce more options for a more minimal build
2020-11-01 14:29:45 +01:00
Mario Rodas db1c6f9ce9
Merge pull request #102289 from r-ryantm/auto-update/fnotifystat
fnotifystat: 0.02.06 -> 0.02.07
2020-11-01 07:17:41 -05:00
Frederik Rietdijk 409ca6f1f9 Merge staging-next into staging 2020-11-01 11:06:35 +01:00
Frederik Rietdijk fe9f55907e Merge master into staging-next 2020-11-01 11:06:08 +01:00
Michele Guerini Rocco 93e0a06de4
Merge pull request #102102 from rnhmjoj/cshatag
cshatag: init at 2019-12-03
2020-11-01 10:12:59 +01:00
Frederik Rietdijk 83dde6c52c Merge staging-next into staging 2020-11-01 10:11:12 +01:00
Frederik Rietdijk 7a8d5dc8a6 Merge master into staging-next 2020-11-01 10:10:47 +01:00
Austin Seipp c1a8104f11
Merge pull request #102026 from r-ryantm/auto-update/checksec
checksec: 2.2.3 -> 2.4.0
2020-10-31 19:22:14 -05:00
R. RyanTM a70df2c2cc fnotifystat: 0.02.06 -> 0.02.07 2020-10-31 23:18:01 +00:00
rnhmjoj 2aaf963019
cshatag: init at 2019-12-03 2020-10-31 18:43:15 +01:00
Vladimír Čunát dfd3ede68d
Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
Masanori Ogino a32ede5635
kmscon: add omasanori as a maintainer (#102206)
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
2020-10-31 01:02:35 -04:00
Mario Rodas 661f6bf2c9 lxc: 4.0.4 -> 4.0.5 2020-10-31 04:20:00 +00:00
Jonathan Ringer f24fa1e6f5 linuxPackages.usbip: disable < 4.10 2020-10-30 09:40:12 -07:00
Jonathan Ringer e6db435973 linux: add flavor metadata 2020-10-30 09:40:12 -07:00
Tim Steinbach 8ed2e118b1
linux_latest-libre: 17724 -> 17744 2020-10-30 09:33:44 -04:00
Tim Steinbach 7882c1ae5a
linux: 4.19.153 -> 4.19.154 2020-10-30 09:33:25 -04:00
Jonathan Ringer 16357a697f libtapi: add homepage and description, use pname 2020-10-29 14:05:46 -07:00
Tim Steinbach 1ab68981ef
linux: 5.9.1 -> 5.9.2 2020-10-29 17:05:08 -04:00
Tim Steinbach 844f488498
linux: 5.8.16 -> 5.8.17 2020-10-29 17:05:08 -04:00
Tim Steinbach 6a4d9c16ba
linux: 5.4.72 -> 5.4.73 2020-10-29 17:05:07 -04:00
Tim Steinbach bc6185c207
linux: 4.9.240 -> 4.9.241 2020-10-29 17:05:07 -04:00
Tim Steinbach 822c60b2fb
linux: 4.4.240 -> 4.4.241 2020-10-29 17:05:07 -04:00
Tim Steinbach 65b969b076
linux: 4.19.152 -> 4.19.153 2020-10-29 17:05:07 -04:00
Tim Steinbach 218809ef12
linux: 4.14.202 -> 4.14.203 2020-10-29 17:05:06 -04:00
ajs124 4903ef48f9
Merge pull request #101748 from helsinki-systems/upd/raspberrypifw20201022
raspberrypifw: 1.20200902 -> 1.20201022
2020-10-29 19:24:23 +01:00
R. RyanTM cb28da0a0c checksec: 2.2.3 -> 2.4.0 2020-10-29 11:12:50 +00:00
R. RyanTM bf62d8f629 android-udev-rules: 20200613 -> 20201003 2020-10-29 08:31:05 +00:00
Florian Klink 6dbc23e75d systemd: stop substituting inside fsck.c, stop substituting mke2fs
fsck.c doesn't refer to any of these binaries anymore, and the whole
systmed codebase not to /sbin/mke2fs.
2020-10-28 23:24:18 +01:00
Florian Klink 959cea2e80 systemd: add withPCRE2 option 2020-10-28 23:24:18 +01:00
Florian Klink 93dcbbf69d systemd: add withApparmor option 2020-10-28 23:24:18 +01:00
Florian Klink 065f057d0c systemd: add libgpgerror only to buildInputs if we build with resolved support 2020-10-28 23:24:18 +01:00
Florian Klink e6dff1d666 systemd: drop libffi from buildInputs
This isn't used anywhere.
2020-10-28 23:24:18 +01:00
Florian Klink e10a9a8506 systemd: add withMachined flag 2020-10-28 23:24:18 +01:00
Florian Klink 8526662a33 systemd: add withNss flag 2020-10-28 23:24:18 +01:00
Florian Klink a079a6f026 systemd: add withUserDb flag 2020-10-28 23:24:18 +01:00
Florian Klink e77326208e systemd: add withDocumentation flag 2020-10-28 23:24:18 +01:00
Florian Klink f142493a6a systemd: add withShellCompletions flag 2020-10-28 23:24:18 +01:00
Florian Klink 1f9347431c systemd: add withPolkit option 2020-10-28 23:24:18 +01:00
Florian Klink 0b762c02ee systemd: disable efi if we don't build with withEfi is set to false 2020-10-28 23:24:17 +01:00
Florian Klink 54c35f0940 systemd: withEfi: move gnu-efi check into assertion 2020-10-28 23:24:17 +01:00
Florian Klink 13a910e3f6 systemd: make gcrypt optional 2020-10-28 23:24:17 +01:00
Florian Klink 585f4a140b systemd: add withAnalyze flag 2020-10-28 23:24:17 +01:00
Florian Klink 987906aa58 systemd: add withCoredump flag
… and default it to false for systemdMinimal
2020-10-28 23:24:17 +01:00
Florian Klink c6aada2835 systemd: drop duplicate -Dlocaled=…
This is already configurable above.
2020-10-28 23:24:17 +01:00
Florian Klink ff07c6b47d systemd: introduce withCompression flag
This will build systemd without some compression utils, useful for
systemdMinimal.
2020-10-28 23:24:17 +01:00
Florian Klink 5f257d7d2c systemd: cleanup cryptsetup input
use lib.getDev to retrieve the dev output. Don't pass it to buildInputs
if we don't build with withCryptsetup set to true.
2020-10-28 23:24:17 +01:00
Florian Klink e1e01fa85e 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-28 23:24:17 +01:00
Florian Klink 39e733336c 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-28 23:24:17 +01:00
Florian Klink 8434da5715 systemd: remove perl from nativeBuildInputs
This was only used to patch a circular output reference from lib to out
on aarch64, but was removed in b68bddfbda,

This commit forgot to remove perl, so remove it now.
2020-10-28 23:24:17 +01:00
Florian Klink 6456e24d57 systemd: nixpkgs-fmt 2020-10-28 23:24:16 +01:00
Florian Klink 229184f6b5 systemd: reorder buildInputs
These are all unconditianally anyways.
2020-10-28 23:24:16 +01:00
Florian Klink c6bbc945b4 systemd: stdenv.lib -> lib
This is a no-op and makes things a bit smaller.
2020-10-28 23:24:16 +01:00
Andreas Rammhold db0fe5c3eb
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
2020-10-28 03:03:27 +01:00
Andreas Rammhold 5d03fe6ac4
Merge pull request #101792 from flokli/systemdminimal-without-glib
systemdMinimal: build without glib
2020-10-27 20:00:18 +01:00
Tim Steinbach 3088dcb148
linux: 5.9-rc8 -> 5.10-rc1 2020-10-27 14:29:21 -04:00
Ben Siraphob db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
Florian Klink 5f8a741abf systemdMinimal: build without glib
This takes glib (and by this, gtk-doc) out of systemdMinimal's build
closure.
2020-10-26 21:58:49 +01:00
Florian Klink 00c68337f5 systemd: fix 0019-*.patch
This was introduced in https://github.com/NixOS/nixpkgs/pull/99621, but
didn't follow the process documented in
pkgs/os-specific/linux/systemd/default.nix, namely, the `git am` and
`git format-patch` workflow, which caused
`0019-revert-get-rid-of-seat_can_multi_session.patch` to not apply with
`git am` due to missing authorship information.

I did apply this patch manually, and copied authorship information from
4e384ddc11.
2020-10-26 21:30:42 +01:00
bb2020 5ef5d96c08 discrete-scroll: added myself as maintainer 2020-10-26 18:38:52 +03:00
Janne Heß 1829a89f84
raspberrypifw: 1.20200902 -> 1.20201022 2020-10-26 11:30:36 +01:00
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát 336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

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 08:19:17 +01:00
Benjamin Hipple d53dd036d2
Merge pull request #80151 from ju1m/dstat_fix_pluginpath
dstat: fix pluginpath
2020-10-25 10:48:54 -04:00
Vladimír Čunát 2f6b00b15e
Merge branch 'staging-next' into staging 2020-10-25 09:47:04 +01:00
Vladimír Čunát c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
R. RyanTM 8d6bd565a1 libcap_ng: 0.7.10 -> 0.7.11 2020-10-25 09:39:15 +01:00
R. RyanTM a2f3c2521c android-udev-rules: 20200410 -> 20200613 2020-10-25 09:37:31 +01:00