1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 09:02:46 +00:00
Commit graph

13276 commits

Author SHA1 Message Date
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
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
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
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
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 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 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
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
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
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
Andreas Rammhold 0a55c5dada
iputils: apply proposed upstream patch to get rid of systemd dependency
This allows us to get rid of the hack and the systemd dependency and
thus reduces the rebuild closure whenever systemd changes.
2020-10-19 22:04:52 +02:00
Andreas Rammhold 54e6cfc1ef
iptuils: Remove systemd from dependencies
In our case systemd is only used to figure out if the unit files should
be generated.
2020-10-19 21:41:53 +02:00
Henri Menke 3cf85bc8a2
zfsUnstable: 2.0.0-rc3 -> 2.0.0-rc4 2020-10-19 21:37:42 +02:00
Henri Menke cabb90e212 zfs: 0.8.4 -> 0.8.5 2020-10-19 11:18:01 -07:00
Jan Tojnar 5c766c5c24
Merge branch 'staging-next' into staging 2020-10-18 21:21:03 +02:00
Jon ff6efa6f16 Revert "linuxPackages.nvidia_x11.persistenced: fix build"
This reverts commit f98219c519.
2020-10-18 11:47:34 -07:00
Jonathan Ringer f98219c519 linuxPackages.nvidia_x11.persistenced: fix build 2020-10-18 11:12:23 -07:00
Michael Weiss 01ec8c0999
iproute: 5.8.0 -> 5.9.0 (#100761)
File changes (additions/removals):
None
2020-10-18 13:31:27 +02:00
Vladimír Čunát 90fd589286
Merge #98191: nvidia_x11: 2020.09 - 2020.10 2020-10-18 11:08:20 +02:00
Tim Steinbach 138b419901
linux/hardened/patches/5.9: init at 5.9.1.a 2020-10-17 15:25:50 -04:00
Tim Steinbach 80a57fd78b
linux/hardened/patches/5.8: 5.8.15.a -> 5.8.16.a 2020-10-17 15:25:49 -04:00
Tim Steinbach d68fed6697
linux/hardened/patches/5.4: 5.4.71.a -> 5.4.72.a 2020-10-17 15:25:49 -04:00
Tim Steinbach 43fe838e08
linux/hardened/patches/4.19: 4.19.151.a -> 4.19.152.a 2020-10-17 15:25:49 -04:00
Tim Steinbach 6716902e19
linux/hardened/patches/4.14: 4.14.201.a -> 4.14.202.a 2020-10-17 15:25:48 -04:00
Tim Steinbach 2a82889f8e
linux: 5.9 -> 5.9.1 2020-10-17 15:25:48 -04:00
Tim Steinbach bc4b7ed7e1
linux: 5.8.15 -> 5.8.16 2020-10-17 15:25:48 -04:00
Tim Steinbach 0b06892484
linux: 5.4.71 -> 5.4.72 2020-10-17 15:25:47 -04:00
Tim Steinbach e0218ca69c
linux: 4.9.239 -> 4.9.240 2020-10-17 15:25:47 -04:00
Tim Steinbach 982d966290
linux: 4.4.239 -> 4.4.240 2020-10-17 15:25:47 -04:00
Tim Steinbach de5c66b9ef
linux: 4.19.151 -> 4.19.152 2020-10-17 15:25:46 -04:00
Tim Steinbach 5f236c3875
linux: 4.14.201 -> 4.14.202 2020-10-17 15:25:42 -04:00
Ben Siraphob 683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
Dmitry Bogatov 78d9b5fb1a psftools: init at 1.0.13 2020-10-17 00:00:00 -04:00
Tim Steinbach 3b6ba05d3d
Merge pull request #100769 from andersk/linux-hardened
linux/hardened/patches: Update
2020-10-16 19:08:58 -04:00
Anders Kaseorg d7674bc336 linux/hardened/patches/5.8: 5.8.14.a -> 5.8.15.a 2020-10-16 15:40:30 -07:00
Anders Kaseorg 99f9bedbde linux/hardened/patches/5.4: 5.4.70.a -> 5.4.71.a 2020-10-16 15:40:30 -07:00
Anders Kaseorg a1a49092a4 linux/hardened/patches/4.19: 4.19.150.a -> 4.19.151.a 2020-10-16 15:40:30 -07:00
Anders Kaseorg 4425eab960 linux/hardened/patches/4.14: 4.14.200.a -> 4.14.201.a 2020-10-16 15:40:30 -07:00
Tim Steinbach 617b980961
linux_latest-libre: 17718 -> 17724 2020-10-15 12:49:47 -04:00
Tim Steinbach 7c4c5e75f8
linux-rt_5_4: 5.4.69-rt39 -> 5.4.70-rt40 2020-10-15 09:32:56 -04:00
Frederik Rietdijk b3aed163d5
Merge pull request #99709 from NixOS/staging-next
Staging next
2020-10-14 21:10:31 +02:00
Tim Steinbach bf540edc5d
linux: 5.8.14 -> 5.8.15 2020-10-14 08:48:54 -04:00
Tim Steinbach 46e2758200
linux: 5.4.70 -> 5.4.71 2020-10-14 08:48:46 -04:00
Tim Steinbach 3406c09374
linux: 4.9.238 -> 4.9.239 2020-10-14 08:48:36 -04:00
Tim Steinbach 3b4fa12966
linux: 4.4.238 -> 4.4.239 2020-10-14 08:48:30 -04:00
Tim Steinbach 6f4ad8b16c
linux: 4.19.150 -> 4.19.151 2020-10-14 08:48:24 -04:00
Tim Steinbach cd85afd0eb
linux: 4.14.200 -> 4.14.201 2020-10-14 08:48:17 -04:00
Tim Steinbach deae249afd
linux/hardened/patches/5.7: remove 2020-10-14 08:47:58 -04:00
Tim Steinbach 1de9229825
linux: Remove 5.7
I forgot to remove a file in 6d174dd5e0
2020-10-14 08:46:41 -04:00
Malte Brandy cebf9198f3
treewide: De-inline uses of lib.boolToString
This commit should not change eval results
2020-10-14 01:46:17 +02:00
zowoq b67a367f7c libcap: 2.27 -> 2.44 2020-10-14 08:45:22 +10:00
Frederik Rietdijk dc0aeee5db Merge staging-next into staging 2020-10-13 19:35:37 +02:00
Frederik Rietdijk 9e1943edc0 Merge master into staging-next 2020-10-13 19:34:34 +02:00
Tim Steinbach 388f785927
linux_latest-libre: 17688 -> 17718 2020-10-13 09:54:44 -04:00
Austin Seipp 0a614d2fb5
linux: init 5.9
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2020-10-12 20:10:29 -05:00
Benjamin Staffin aba04eb8af
pam_u2f: 1.0.8 -> 1.1.0 (#100046)
This release switches to libfido2 and libcrypto instead of libu2f-host
and libu2f-server.
2020-10-11 15:15:54 -04:00
Tim Steinbach 184e3824eb rtl88x2bu: 2020-05-19 -> 2020-08-20 2020-10-10 18:30:19 -07:00
Yorick van Pelt f491c18c67 nvidiabl: 2017-09-26 -> 2020-10-01
Fixes build on linux >= 5.7
2020-10-10 18:29:02 -07:00
Jan Tojnar 1882368e8a
Merge branch 'staging-next' into staging 2020-10-11 00:27:42 +02:00
Jan Tojnar aabcf2d8f5
Merge branch 'master' into staging-next 2020-10-11 00:27:21 +02:00
John Ericson db3b1c12cb
Merge pull request #98998 from Kloenk/systemd-module
systemd: create options for smaller derivation
2020-10-10 10:26:11 -04:00
Michael Weiss 33473c422c
fuse3: 3.9.4 -> 3.10.0 (#100075) 2020-10-10 12:51:49 +02:00
Finn Behrens 2e52fca7c8
systemd: create options for smaller derivation
Co-Authored-By: Kirill Elagin <kirelagin@gmail.com>
2020-10-10 11:55:50 +02:00
Vladimír Čunát 338b25697c
Merge branch 'master' into staging-next
Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
>    3926 x86_64-darwin
>    4645 x86_64-linux
2020-10-10 11:32:10 +02:00
Tim Steinbach 8293f9509e
linux/hardened/patches/5.8: 5.8.12.a -> 5.8.14.a 2020-10-09 08:32:01 -04:00
Tim Steinbach edf17457ed
linux/hardened/patches/5.4: 5.4.68.a -> 5.4.70.a 2020-10-09 08:31:58 -04:00
Tim Steinbach 6f4d132a08
linux/hardened/patches/4.19: 4.19.148.a -> 4.19.150.a 2020-10-09 08:31:56 -04:00
Tim Steinbach 84c56e0dbb
linux/hardened/patches/4.14: 4.14.199.a -> 4.14.200.a 2020-10-09 08:31:50 -04:00
Frederik Rietdijk ec28e32c9e Merge master into staging-next 2020-10-08 21:47:26 +02:00
Emery Hemingway dd8423f865 solo5: init 0.6.7 2020-10-08 16:21:09 +02:00
markuskowa c83e442b77
Merge pull request #100052 from markuskowa/upd-linuxptp
linuxptp: 3.0 -> 3.1
2020-10-08 23:20:37 +02:00
Markus Kowalewski 173ebca876
linuxptp: 3.0 -> 3.1 2020-10-08 22:18:19 +02:00