Luke Granger-Brown
5d261cb596
Merge pull request #123755 from fortuneteller2k/xf86_input_wacom
...
xf86_input_wacom: 0.36.0 -> 0.40.0, cleanup
2021-05-23 14:44:49 +01:00
Jonathan Ringer
11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
Sandro
e5c6f35030
Merge pull request #120850 from fortuneteller2k/update-xanmod-512
...
linux_xanmod: 5.11.16 -> 5.12.5
2021-05-22 17:26:16 +02:00
Kira Bruneau
cd4780fab4
maintainers: rename metadark -> kira-bruneau ( #124035 )
2021-05-22 16:47:40 +02:00
Thomas Gerbet
32fdb916a1
libcgroup: 0.41 -> 0.42.2
2021-05-22 15:21:31 +02:00
github-actions[bot]
901fb5e64e
Merge master into staging-next
2021-05-22 00:56:03 +00:00
Martin Weinelt
b49bd8db30
batman-adv: 2021.0 -> 2021.1
2021-05-22 00:31:57 +02:00
Jonathan Ringer
6b15fdce86
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/shells/ion/default.nix
pkgs/tools/misc/cicero-tui/default.nix
2021-05-20 22:11:42 -07:00
Robert Helgesson
507133e9d3
sd-switch: 0.2.1 -> 0.2.2
2021-05-20 17:19:22 -07:00
fortuneteller2k
8cb96583e2
linuxPackages_5_12.rtl88xxau-aircrack: fix build
2021-05-20 17:09:53 -07:00
fortuneteller2k
c50b59f7f1
linuxPackages.rtl88x2bu: switch to more maintained fork
2021-05-20 11:50:55 -07:00
fortuneteller2k
f49504d95f
linuxPackages.rtl8821au: switch to a more maintained fork
2021-05-20 11:46:46 -07:00
fortuneteller2k
eb46753560
linux_xanmod: 5.11.16 -> 5.12.5
2021-05-21 01:41:58 +08:00
Jonathan Ringer
14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/terminal-emulators/alacritty/default.nix
pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
fortuneteller2k
8aac6d8daf
linuxPackages.rtl8812au: add myself as maintainer, cleanup
2021-05-20 09:06:36 -07:00
Lassulus
213cde9203
Merge pull request #108348 from rencire/add-hid-nintendo
...
linuxPackages.hid-nintendo: init at 3.1
2021-05-20 07:41:44 +02:00
fortuneteller2k
6794bb216f
xf86_input_wacom: 0.36.0 -> 0.40.0, cleanup
2021-05-20 10:14:52 +08:00
Martin Weinelt
259e3fc46f
Merge pull request #123636 from fortuneteller2k/rtl8821cu
...
linuxPackages.rtl8821cu: switch to a more maintained fork
2021-05-20 03:14:32 +02:00
github-actions[bot]
8a5e4be6b6
Merge master into staging-next
2021-05-19 18:34:10 +00:00
R. RyanTM
4751744636
hdparm: 9.60 -> 9.61
2021-05-19 10:54:07 -07:00
Jonathan Ringer
c1f8a15dac
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
nixos/doc/manual/release-notes/rl-2105.xml
pkgs/tools/security/sequoia/default.nix
2021-05-19 10:39:54 -07:00
fortuneteller2k
5e52c3706c
linuxPackages.rtl8821ce: mark broken for aarch64
...
Co-authored-by: Jonathan Ringer <jonringer@users.noreply.github.com>
2021-05-19 10:11:38 -07:00
fortuneteller2k
d7692cd0d1
linuxPackages.rtl8821cu: switch to a more maintained fork
2021-05-19 16:46:32 +08:00
Jörg Thalheim
1341338ad4
Merge pull request #123627 from fortuneteller2k/bump-ena
...
linuxPackages.ena: 2.4.1 -> 2.5.0
2021-05-19 08:46:03 +01:00
fortuneteller2k
4e045f313b
linuxPackages.rtl8814au: move to a more maintained fork
2021-05-19 13:34:25 +08:00
fortuneteller2k
9d57d41c17
linuxPackages.ena: 2.4.1 -> 2.5.0
2021-05-19 12:48:30 +08:00
Jonathan Ringer
7117588d26
linuxPackages.ati_drivers_x11: remove
...
Driver is no longer supported for kernels >= 4.1.
2021-05-18 17:55:44 -07:00
Jonathan Ringer
f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/graphics/emulsion/default.nix
pkgs/development/tools/misc/texlab/default.nix
pkgs/development/tools/rust/bindgen/default.nix
pkgs/development/tools/rust/cargo-udeps/default.nix
pkgs/misc/emulators/ruffle/default.nix
pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
Michael Raskin
02ba3238d2
Merge pull request #123053 from pschyska/master
...
atop, netatop, nixos/atop: improve packaging and options
2021-05-18 10:54:13 +00:00
ren
1c1e51ce31
linuxPackages.hid-nintendo: init at 3.1
2021-05-17 21:23:47 -07:00
R. RyanTM
546e892ebc
android-udev-rules: 20210425 -> 20210501
2021-05-17 14:02:36 -07:00
R. RyanTM
1c563249ea
linuxPackages.bpftrace: 0.12.0 -> 0.12.1
2021-05-17 13:44:33 -07:00
R. RyanTM
9409e275c8
lsscsi: 0.31 -> 0.32
2021-05-17 10:57:40 -07:00
Sandro
8a019950ce
Merge pull request #123075 from vulpes2/vulpes2/mmc-utils
...
mmc-utils: 2019-10-04 -> 2021-05-11
2021-05-17 19:22:26 +02:00
Sandro
10b6dce7bd
Merge pull request #117722 from rmcgibbo/gradm
2021-05-17 18:52:43 +02:00
Paul Schyska
033cdffa9b
atop: use substituteInPlace instead of sed
2021-05-17 13:58:50 +02:00
github-actions[bot]
3ff6965554
Merge master into staging-next
2021-05-17 06:22:23 +00:00
Jonathan Ringer
d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next
...
Fix cargo-flash build
2021-05-16 18:27:14 -07:00
Sandro
067281faf5
Merge pull request #123234 from Atemu/update/linux_lqx
...
linux_lqx: 5.11.20 -> 5.11.21
2021-05-17 02:08:20 +02:00
Paul Schyska
3b0bc54131
atop:, nixos/atop: Apply style suggestions
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-05-17 01:26:22 +02:00
Paul Schyska
76554beed8
atop: Merge all path-fixing to a single patch, comment the remaining patches
2021-05-16 22:08:05 +02:00
Paul Schyska
27d323d281
netatop: Split out path fixing and PIDFile changes to separate patches and comment
2021-05-16 22:07:24 +02:00
Robert Hensing
3c6fcc9073
Merge pull request #122987 from alyssais/nixos-rebuild-aarch64
...
nixos-rebuild: support prebuilt Nix on aarch64
2021-05-16 22:00:39 +02:00
github-actions[bot]
6cdac75d25
Merge staging-next into staging
2021-05-16 18:32:44 +00:00
github-actions[bot]
8c6d819143
Merge master into staging-next
2021-05-16 18:32:41 +00:00
Paul Schyska
327dcea4cc
atop: fix packaging .service files, add option to build with atopgpu
2021-05-16 18:22:03 +02:00
Paul Schyska
2703a7999a
netatop: package netatop.service
2021-05-16 18:22:03 +02:00
Jan Tojnar
21541fc97c
Revert "Revert "hwdata: 0.344 -> 0.347""
...
This reverts commit f070de253c
.
2021-05-16 16:37:13 +02:00
Théophane Hufschmitt
601ceec28d
nixos-rebuild: Don’t reset the experimental features
...
Make sure that the Nix `experimental-features` set by a user aren’t overwritten when running `nixos-rebuild --flake` by using `--extra-experimental-features` rather than `--experimental-features`.
Fix https://github.com/NixOS/nix/issues/4784
2021-05-16 16:17:42 +02:00
Jan Tojnar
684991c696
Merge branch 'master' into staging-next
...
- Thunderbird 68 has been dropped on master.
- gccCrossLibcStdenv has been factored out on staging-next in all-packages.nix, while the file has been re-formatted on master.
2021-05-16 15:34:51 +02:00