3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

18274 commits

Author SHA1 Message Date
Vladimír Čunát f48c1fda6b
Merge branch 'master' into staging-next
Conflict in pkgs/development/libraries/libvirt/default.nix
required manual adjustments.  The fetched patch is already in src.
I checked that libvirt builds.
2022-03-15 09:52:04 +01:00
Felix Buehler c3857b318e rt5677-firmware: switch to fetchFromGitHub 2022-03-14 19:32:50 +01:00
Felix Buehler 2cfd9d2593 lightum: switch to fetchFromGitHub 2022-03-14 19:32:50 +01:00
Felix Buehler 8af8ab0f0e usermount: switch to fetchFromGitHub 2022-03-14 19:32:49 +01:00
davidak d2c95bb666
Merge pull request #163433 from JJJollyjim/bcachefs
bcachefs: unstable-2022-01-12 -> unstable-2022-03-09
2022-03-14 15:34:43 +01:00
Alyssa Ross d7e181ff83
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/compilers/ocaml/4.12.nix
	pkgs/development/python-modules/oci/default.nix
	pkgs/tools/admin/bubblewrap/default.nix
2022-03-14 12:33:16 +00:00
Alyssa Ross b8734c50e2 pkgsMusl.systemdMinimal: fix build
Use latest patches from OpenEmbedded.  pkgsMusl.systemd doesn't build
yet because pkgsMusl.libnetfilter_conntrack is currently broken.
2022-03-14 12:21:51 +00:00
github-actions[bot] 0ed928e4ab
Merge master into staging-next 2022-03-14 12:01:26 +00:00
Anderson Torres 8590804259
Merge pull request #164046 from AndersonTorres/metalab-mirrors
Change metalab mirrors to ibiblioPubLinux ones
2022-03-14 08:26:42 -03:00
Jamie McClymont 3b01bd6249 bcachefs: update maintainers
As requested in https://github.com/NixOS/nixpkgs/pull/163433#issuecomment-1066169644
2022-03-14 21:52:18 +13:00
Jamie McClymont 4f64621056 linux_testing_bcachefs: unstable-2022-01-12 -> unstable-2022-03-09 2022-03-14 21:49:00 +13:00
AndersonTorres 197cb04778 forktty: ibiblioPubLinux mirror 2022-03-13 21:20:49 -03:00
github-actions[bot] ea64a128d1
Merge master into staging-next 2022-03-14 00:02:12 +00:00
Guillaume Girol 446dda6d81
Merge pull request #159925 from NickCao/kmods
linuxPackages.*: various fixes related to cross compilation
2022-03-13 20:15:31 +00:00
Jan Tojnar c0bd9a8b46 udisks2: Add freedesktop team to maintainers 2022-03-13 01:13:27 +01:00
Jan Tojnar 39f7bd4d69 udisks2: correct patch
This was forgotten during https://github.com/NixOS/nixpkgs/pull/147606
2022-03-13 01:09:56 +01:00
github-actions[bot] 295cda2612
Merge master into staging-next 2022-03-12 18:00:58 +00:00
Jörg Thalheim a0429ebd51
Merge pull request #163631 from adisbladis/zfs-top-level-with
zfs: Remove top-level `with` from expression
2022-03-12 14:45:50 +00:00
github-actions[bot] 80180c339e
Merge master into staging-next 2022-03-12 12:01:10 +00:00
TredwellGit 75db629894 linux_latest-libre: 18613 -> 18627 2022-03-12 07:21:25 +00:00
TredwellGit 4bf71faa06 linux-rt_5_4: 5.4.182-rt70 -> 5.4.182-rt71 2022-03-12 07:21:06 +00:00
TredwellGit 3d1e0b2e17 linux-rt_5_10: 5.10.100-rt62 -> 5.10.104-rt63 2022-03-12 07:20:35 +00:00
TredwellGit c01eed31ba linux: 5.4.183 -> 5.4.184 2022-03-12 07:19:57 +00:00
TredwellGit 51d907345a linux: 5.16.13 -> 5.16.14 2022-03-12 07:19:50 +00:00
TredwellGit eafbf22558 linux: 5.15.27 -> 5.15.28 2022-03-12 07:19:41 +00:00
TredwellGit a9e63526e2 linux: 5.10.104 -> 5.10.105 2022-03-12 07:19:31 +00:00
TredwellGit 5de1f9ac31 linux: 4.9.305 -> 4.9.306 2022-03-12 07:19:22 +00:00
TredwellGit 3d434fc0d9 linux: 4.19.233 -> 4.19.234 2022-03-12 07:19:15 +00:00
TredwellGit ceafc68dce linux: 4.14.270 -> 4.14.271 2022-03-12 07:19:08 +00:00
github-actions[bot] a9a2d9475d
Merge staging-next into staging 2022-03-11 18:01:59 +00:00
github-actions[bot] 7573d7fe79
Merge master into staging-next 2022-03-11 18:01:20 +00:00
Bernardo Meurer f9335711ad
Merge pull request #163650 from TredwellGit/linux-firmware
linux-firmware: 20220209 -> 20220310
2022-03-11 09:41:30 -08:00
André Silva 3ee99c82c4
Merge pull request #161868 from fortuneteller2k/xanmod-tt
linux_xanmod: 5.15.24 -> 5.15.27
2022-03-11 16:58:58 +00:00
fortuneteller2k c0ca1422e7 linux_xanmod: 5.15.24 -> 5.15.27 2022-03-11 20:04:12 +08:00
github-actions[bot] 7a0501594d
Merge staging-next into staging 2022-03-11 06:02:02 +00:00
github-actions[bot] cb2a59dda7
Merge master into staging-next 2022-03-11 06:01:28 +00:00
TredwellGit 92dce804e3 linux-firmware: 20220209 -> 20220310 2022-03-11 05:56:40 +00:00
Franz Pletz b77a575dc8
Merge pull request #163513 from ReplayCoding/fix/iwd-doc-output 2022-03-11 05:20:31 +01:00
adisbladis ac74ab0236 zfs: Remove top-level with from expression
Using `with` in such a high up scope makes it very easy to
accidentally forget to update function arguments and introduce typos
because of the lack of any editor support and static analysis.

It's better to explicitly inherit the small number of things we need
from `lib` into scope so that editors can know of scoped variables.
2022-03-11 11:25:19 +12:00
adisbladis f445a7668c zfs: 2.1.2 -> 2.1.3 2022-03-11 10:32:14 +12:00
github-actions[bot] 03c9842a65
Merge staging-next into staging 2022-03-10 18:02:01 +00:00
github-actions[bot] 76c5dacba7
Merge master into staging-next 2022-03-10 18:01:25 +00:00
Alyssa Ross f8be98b2cb cryptsetup: separate binaries from libraries
This reduces closure sizes by making the libraries not depend on the
binaries, which is good for dynamic builds, and (when statically
linked) making the binaries not depend on the libraries, which is good
for static builds.

When static building, we additionally have to disable loading LUKS
plugins from $lib to avoid a reference, which probably wouldn't have
worked anyway.
2022-03-10 11:13:15 +00:00
Alyssa Ross fb079c3110 linux.configfile: fix alts containing "/m"
generate-config.pl's auto modules feature answers "m" to any Kconfig
question it thinks supports being a module.  It detected this by
seeing if the help shown by make config (called "alts" by the script)
contained the string "/m", which it would in the case of e.g a
tristate option, where alts would be "N/m/y/?".

But then along came CONFIG_MODPROBE_PATH in Linux 5.13, with a default
value, shown in the make config help, of "/sbin/modprobe".
generate-config.pl would see the "/m" substring, and answer "m" to the
question, meaning (I think) that the built kernel would expect the
modprobe binary to be at /m.  This broke the (non-NixOS) VM images I
build with Nix.  NixOS was unaffected because it uses a different
mechanism to set the modprobe path.

With the current architecture, we can't 100% determine whether a
Kconfig option is a string or a tristate, but we can get a lot closer
by using a better regex.  My new regex only accepts single word
characters, separated by slashes, with a "/?" at the end.  This is
much less likely to ever end up as the default value of a string
option.

Tested by building linux_latest.configfile before and after my
changes, and checking the only difference is the correct default for
CONFIG_MODPROBE_PATH.
2022-03-10 11:13:11 +00:00
ReplayCoding 12d29578c8 iwd: move documentation to seperate output 2022-03-09 14:04:53 -08:00
Zhong Jianxin 1cb1b5312d sketchybar: 2.4.3 -> 2.5.0 2022-03-10 01:07:06 +08:00
github-actions[bot] f6b4a4048a
Merge staging-next into staging 2022-03-09 12:01:59 +00:00
github-actions[bot] 201cc2f89b
Merge master into staging-next 2022-03-09 00:02:05 +00:00
TredwellGit c8b5c95264 Merge pull request #163367 from TredwellGit/linux
Linux kernels 2022-03-08
2022-03-08 21:52:10 +00:00
Jan Tojnar 8b250c5d7f
Merge pull request #161935 from tomfitzhenry/fwupd-1.7.6
fwupd: 1.7.2 -> 1.7.6
2022-03-08 21:33:33 +01:00
Ryan Mulligan 2b78cfdb09 pacemaker: init at 2.1.2 2022-03-08 20:26:52 +01:00
TredwellGit 109f094395 linux-rt_5_4: 5.4.177-rt69 -> 5.4.182-rt70 2022-03-08 19:23:59 +00:00
TredwellGit eff61b45d0 linux: 5.4.182 -> 5.4.183 2022-03-08 19:23:28 +00:00
TredwellGit d7d0cf60f9 linux: 5.16.12 -> 5.16.13 2022-03-08 19:23:19 +00:00
TredwellGit 639fd7c52a linux: 5.15.26 -> 5.15.27 2022-03-08 19:23:11 +00:00
TredwellGit d095019a82 linux: 5.10.103 -> 5.10.104 2022-03-08 19:23:03 +00:00
TredwellGit f22e8f94cf linux: 4.9.304 -> 4.9.305 2022-03-08 19:22:55 +00:00
TredwellGit ba5cca9c79 linux: 4.19.232 -> 4.19.233 2022-03-08 19:22:48 +00:00
TredwellGit e2aab2e9fd linux: 4.14.269 -> 4.14.270 2022-03-08 19:22:38 +00:00
Jan Tojnar 3d59b0a50d fwupd: use upstream install detection patch
5bc5462213
attempts to fix the need to patch the redfish test ourselves.
But it is actually not sufficient since we install the installed tests
into a separate prefix, so we need to adjust the installed tests patch.
2022-03-08 17:39:30 +01:00
Tom Fitzhenry b3c966ce07 fwupd: enable modemmanager plugin 2022-03-08 13:29:25 +01:00
Tom Fitzhenry 413a50ede6 fwupd: 1.7.2 -> 1.7.6
https://github.com/fwupd/fwupd/releases/tag/1.7.3
https://github.com/fwupd/fwupd/releases/tag/1.7.4
https://github.com/fwupd/fwupd/releases/tag/1.7.5
https://github.com/fwupd/fwupd/releases/tag/1.7.6
2022-03-08 13:29:25 +01:00
Alyssa Ross dc1303185f kmod: add dev and lib outputs
Reduces the closure size of pkgsStatic.kmod from 51.0M to 541.6K.
2022-03-07 11:02:29 +00:00
Nick Cao cdfe6962e9
can-isotp: make use of buildFlags and installTargets 2022-03-07 12:34:45 +08:00
Nick Cao 364b75a862
rtl8189es: 2020-10-03 -> 2021-10-01, move moduleBuildDependencies to nativeBuildInputs 2022-03-07 12:23:49 +08:00
Nick Cao 977b3b12ac
rtl8192eu: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:49 +08:00
Nick Cao c0ed14933f
r8168: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:49 +08:00
Nick Cao a0f82198c7
rtl8814au: pass makeFlags from kernel, move moduleBuildDependencies to nativeBuildInputs 2022-03-07 12:23:49 +08:00
Nick Cao e61b83cb60
rtl8821ce: pass makeFlags from kernel, move moduleBuildDependencies to nativeBuildInputs 2022-03-07 12:23:49 +08:00
Nick Cao 3f6359ac26
rtl8821cu: pass makeFlags from kernel, move moduleBuildDependencies to nativeBuildInputs 2022-03-07 12:23:48 +08:00
Nick Cao b046f22da2
rtw89: prepend kernel.makeFlags to makeFlags, pass moduleBuildDependencies 2022-03-07 12:23:48 +08:00
Nick Cao 123882b6aa
rtw88: prepend kernel.makeFlags to makeFlags, pass moduleBuildDependencies 2022-03-07 12:23:48 +08:00
Nick Cao 0b302ffa47
v4l2loopback: prepend kernel.makeFlags to makeFlags and some cleanup 2022-03-07 12:23:48 +08:00
Nick Cao d3943a84af
veikk-linux-driver: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:48 +08:00
Nick Cao f45eebdb7e
xmm7360-pci: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:47 +08:00
Nick Cao 271699dcc5
rtl88x2bu: pass makeFlags from kernel 2022-03-07 12:23:47 +08:00
Nick Cao 86ec7c438c
xpadneo: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:47 +08:00
Nick Cao 03d4ac4e5b
openrazer: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:47 +08:00
Nick Cao 45e662bd95
netatop: pass makeFlags and moduleBuildDependencies from kernel 2022-03-07 12:23:46 +08:00
Nick Cao 4315bccd6a
mbp2018-bridge-drv: pass makeFlags and moduleBuildDependencies from kernel 2022-03-07 12:23:46 +08:00
Nick Cao e1f487741f
mba6x_bl: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:46 +08:00
Nick Cao c35ec1c031
lttng-modules: prepend kernel.makeFlags to makeFlags, move moduleBuildDependencies to nativeBuildInputs 2022-03-07 12:23:46 +08:00
Nick Cao fd5ead0eed
jool: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:45 +08:00
Nick Cao 0341ed782c
hid-nintendo: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:45 +08:00
Nick Cao 697e54e3e2
gcadapter-oc-kmod: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:45 +08:00
Nick Cao 77e2c0324c
fwts-efi-runtime: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:45 +08:00
Nick Cao 490bf9cae5
evdi: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:45 +08:00
Nick Cao 07d1ce68d4
ena: pass makeFlags from kernel 2022-03-07 12:23:44 +08:00
Nick Cao 694eef94d7
dpdk-kmods: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:44 +08:00
Nick Cao 98bd4307a6
digimend: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:44 +08:00
Nick Cao fba1f47f00
can-isotop: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:44 +08:00
Nick Cao 8d715c1f78
batman_adv: prepend kernel.makeFlags to makeFLags 2022-03-07 12:23:44 +08:00
Nick Cao 07b06a7274
apfs: prepend kernel.makeFlags to makeFlags 2022-03-07 12:23:43 +08:00
Nick Cao 2bd89d95c6
akvcam: pass makeFlags and moduleBuildDependencies from kernel 2022-03-07 12:23:43 +08:00
Nick Cao bd8917e7ea
cryptodev: pass moduleBuildDependencies from kernel 2022-03-07 12:23:43 +08:00
Nick Cao 72db02ec9e
kernel: add perl to moduleBuildDependencies 2022-03-07 12:23:43 +08:00
github-actions[bot] 137a689db1
Merge staging-next into staging 2022-03-07 00:02:59 +00:00
github-actions[bot] b4b1ce4d4f
Merge master into staging-next 2022-03-07 00:02:12 +00:00
Florian Klink 57230883fb
Merge pull request #162949 from alyssais/systemd-typos
systemd: fix a whole bunch of typos
2022-03-06 19:59:42 +01:00
Vladimír Čunát 7075835950
Merge #159237: linuxKernel.packages.linux_4_4: drop 2022-03-06 19:38:07 +01:00