JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
250,430 Commits 2 Branches 0 Tags 12 GiB
a5675f2034
Commit Graph

13253 Commits

Author SHA1 Message Date
Frederik Rietdijk
9e6d7d3c74 Merge master into staging-next 2020-11-04 09:27:42 +01: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
237966224d Merge master into staging-next 2020-11-03 12:06:06 +01: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
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
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
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
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
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