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
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
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
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
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
Vladimír Čunát
17f5305b6c
Merge #101508 : libraw: 0.20.0 -> 0.20.2
2020-10-25 09:28:53 +01:00
Jan Tojnar
6aa670046b
Merge pull request #101387 from r-ryantm/auto-update/bluez
...
bluez: 5.54 -> 5.55
2020-10-25 07:52:27 +01:00
Luflosi
b8e5d13878
hdparm: name -> pname
2020-10-24 23:06:34 -07:00
Andreas Rammhold
250fb4611f
Merge pull request #100456 from maralorn/boolToString
...
treewide: De-inline uses of lib.boolToString
2020-10-25 00:45:11 +02:00
R. RyanTM
b4fd542f7f
cpuid: 20200427 -> 20201006
2020-10-24 15:16:12 +00:00
Jan Tojnar
c252654584
Merge branch 'master' into staging-next
2020-10-24 01:10:07 +02:00
Anderson Torres
28c30cca98
Merge pull request #101304 from r-ryantm/auto-update/alsa-utils
...
alsaUtils: 1.2.3 -> 1.2.4
2020-10-22 20:42:33 -03:00
Jan Tojnar
d13fc932cd
Merge branch 'master' into staging-next
2020-10-22 21:20:14 +02:00
R. RyanTM
ef13bb7089
bluez: 5.54 -> 5.55
2020-10-22 14:31:26 +00:00
Michael Weiss
002750572a
nvme-cli: 1.12 -> 1.13
2020-10-22 13:36:47 +02:00
R. RyanTM
2aa8f39267
alsaUtils: 1.2.3 -> 1.2.4
2020-10-22 00:31:37 +00:00
Vladimír Čunát
90094b0468
Merge branch 'master' into staging-next
...
minor conflict: rust update vs. darwin fixes for it
(not tested but seems quite OK)
2020-10-21 13:34:06 +02:00
Andreas Rammhold
f6cd17269e
Merge pull request #49403 from andir/qemu_test_reduce_closure
...
qemu_test: disable features that are not needed for tests (closure 641 -> 335.3M)
2020-10-21 00:41:01 +02:00
ajs124
b2602d1a39
apparmor: 2.13.4 -> 2.13.5
2020-10-20 21:03:28 +02:00
Frederik Rietdijk
23890fc236
Merge staging-next into staging
2020-10-20 20:55:46 +02:00
Janne Heß
cdabe1007c
raspberrypi-eeprom: Init at 2020-10-05
2020-10-20 15:45:58 +02:00