Commit Graph

15492 Commits

Author SHA1 Message Date
Jan Tojnar
e3dfa79441
Merge branch 'staging-next' into staging
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-16 19:59:05 +02:00
github-actions[bot]
b08ae54dd9
Merge master into staging-next 2021-06-16 12:04:47 +00:00
Alyssa Ross
593f8bde3c mdevd: 0.1.3.0 -> 0.1.4.0
• skalibs dependency bumped to 2.10.0.3.
• New +, - and & command directives supported in mdev.conf. These
  directives spawn a command interpreted by the execlineb program
  launcher instead of /bin/sh.
2021-06-16 07:59:51 +00:00
Alyssa Ross
8740194041 s6-linux-init: 1.0.6.2 -> 1.0.6.3
• utmps optional dependency bumped to 0.1.0.2.
2021-06-16 07:59:51 +00:00
Alyssa Ross
96a8d92994 s6-linux-utils: 2.5.1.4 -> 2.5.1.5
• skalibs dependency bumped to 2.10.0.3.
2021-06-16 07:59:51 +00:00
Jonathan Ringer
d1d37feb6d
Merge branch 'master' into staging-next
Conflicts:
  pkgs/servers/x11/xorg/default.nix
2021-06-15 19:32:36 -07:00
Sandro
7a7c7de4e3
Merge pull request #126697 from arezvov/iotop-c 2021-06-16 03:20:23 +02:00
Sandro
15fd4a48fa
Merge pull request #126978 from dotkrnl/patch-reattach-to-user-namespace
reattach-to-user-namespace: support apple silicon
2021-06-16 02:54:20 +02:00
Alexander Rezvov
34ee46760f maintainers: add arezvov 2021-06-16 03:16:16 +03:00
Alexander Rezvov
74f03b7e7c iotop-c: add new package 2021-06-16 03:15:08 +03:00
Martin Weinelt
40ad3ba672
Merge pull request #126291 from mweinelt/microcode-intel
microcodeIntel: 20210216 -> 20210608
2021-06-16 00:40:26 +02:00
Jason Lau
8a2d578017
reattach-to-user-namespace: support apple silicon 2021-06-15 11:30:21 -07:00
Samuel Gräfenstein
ff3b3e696a nixos-rebuild: fix creating ./result symlink for flakes 2021-06-15 08:15:31 -07:00
Sandro
b7000df7ed
Merge pull request #125082 from ikervagyok/master 2021-06-15 13:49:48 +02:00
Jan Tojnar
91171e2955
Merge branch 'master' into staging-next
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
2021-06-15 11:19:41 +02:00
Sandro
80819f182e
Merge pull request #125553 from fortuneteller2k/xanmod
linux_xanmod: 5.12.8 -> 5.12.10
2021-06-14 19:40:09 +02:00
Sandro
dc1dceeb93
Merge pull request #126835 from SuperSandro2000/SuperSandro2000-patch-1
darwin.mas: Fix dontBuild
2021-06-14 17:38:12 +02:00
Sandro
260e88ac24
alsa-utils: remove sh file extension from alsa-info
other distros also ship the file without the extension and files in $PATH should normally not contain an extension
2021-06-14 16:51:30 +02:00
Sandro
b083c7e9eb
darwin.mas: Fix dontBuild 2021-06-14 14:59:21 +02:00
Lengyel Balázs
6d33412d6d linux-testing: 5.12-rc6 -> 5.13-rc6 2021-06-14 14:26:52 +02:00
Lengyel Balázs
2ac508d578 linux-kernel: update config for 5.13 2021-06-14 14:26:52 +02:00
github-actions[bot]
dbed958bf2
Merge staging-next into staging 2021-06-14 12:04:44 +00:00
github-actions[bot]
f2ba460019
Merge master into staging-next 2021-06-14 12:04:41 +00:00
Maximilian Bosch
96c89ab82a
linuxPackages_5_4.wireguard: 1.0.20210424 -> 1.0.20210606
ChangeLog: https://lists.zx2c4.com/pipermail/wireguard/2021-June/006781.html
2021-06-13 23:07:33 +02:00
github-actions[bot]
e0285f7892
Merge staging-next into staging 2021-06-13 12:06:12 +00:00
github-actions[bot]
5ac3d4e7b0
Merge master into staging-next 2021-06-13 12:06:09 +00:00
Jörg Thalheim
1b299f5785
Merge pull request #126060 from Mic92/dpdk-kmod
dpdk-kmods: init at 2021-04-21
2021-06-13 11:37:03 +02:00
Jörg Thalheim
0d2276ec34
dpdk-kmods: init at 2021-04-21
In the last release dpdk moved the uio_igb driver to a different package
Without it dpdk is not very useful.
2021-06-12 20:25:28 +02:00
github-actions[bot]
9309a23dd3
Merge staging-next into staging 2021-06-12 18:04:58 +00:00
github-actions[bot]
65a7d168af
Merge master into staging-next 2021-06-12 18:04:56 +00:00
Sandro
f0acff31d3
Merge pull request #126634 from zachcoyle/mas-1.8.2
mas: 1.8.1 -> 1.8.2
2021-06-12 18:19:27 +02:00
github-actions[bot]
b9b43d5872
Merge staging-next into staging 2021-06-12 12:07:06 +00:00
github-actions[bot]
45799b7162
Merge master into staging-next 2021-06-12 12:07:03 +00:00
fortuneteller2k
c63d4270fe linuxPackages.rtl8188eus-aircrack: init at unstable-2021-05-04 2021-06-11 23:24:43 -07:00
github-actions[bot]
c0e1982cfc
Merge staging-next into staging 2021-06-12 06:08:20 +00:00
github-actions[bot]
19b5e1f139
Merge master into staging-next 2021-06-12 06:08:17 +00:00
fortuneteller2k
b06a0d409e linuxPackages.lttng-modules: 2.10.5 -> 2.12.6 2021-06-11 20:04:44 -07:00
github-actions[bot]
b5a68e6d43
Merge staging-next into staging 2021-06-12 00:10:25 +00:00
github-actions[bot]
8d3108832e
Merge master into staging-next 2021-06-12 00:10:23 +00:00
Zach Coyle
88fc8922a4 mas: 1.8.1 -> 1.8.2 2021-06-11 19:22:35 -04:00
TredwellGit
eeb255207d zfsUnstable: 2.1.0-rc6 -> 2.1.0-rc7
https://github.com/openzfs/zfs/releases/tag/zfs-2.1.0-rc7
2021-06-11 15:31:30 -07:00
github-actions[bot]
8f3ead7190
Merge staging-next into staging 2021-06-11 18:05:09 +00:00
github-actions[bot]
69f9534853
Merge master into staging-next 2021-06-11 18:05:07 +00:00
Jonathan Ringer
971eb04341 nixos-rebuild: fix extraBuildFlags usage with flakes 2021-06-11 10:35:14 -07:00
Jonathan Ringer
d6a829e7b7 nixos-rebuild: remove unused variable: remotePATH 2021-06-11 10:35:14 -07:00
Jonathan Ringer
07da819bcf nixos-rebuild: prevent wordsplitting 2021-06-11 10:35:14 -07:00
Jonathan Ringer
0e8e7968d1 nixos-rebuild: prevent masking return value with declaration 2021-06-11 10:35:14 -07:00
Jonathan Ringer
ea5956a2ed nixos-rebuild: remove repair, never used 2021-06-11 10:35:14 -07:00
github-actions[bot]
8e50248719
Merge staging-next into staging 2021-06-11 12:04:41 +00:00
github-actions[bot]
212846c302
Merge master into staging-next 2021-06-11 12:04:38 +00:00