alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
248917 commits 217 branches 121 tags 4.5 GiB
Commit graph

13202 commits

Author SHA1 Message Date
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 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