3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

15062 commits

Author SHA1 Message Date
github-actions[bot] b4416b52c5
Merge master into staging-next 2021-05-08 00:46:50 +00:00
Domen Kožar 8ecb0344a0
Merge pull request #121720 from samueldr/feature/arm-stage-1-modules
installer images: Add available modules to stage-1 on ARM platforms
2021-05-07 22:01:09 +02:00
John Ericson a3e54cb582 Merge remote-tracking branch 'upstream/staging-next' into staging 2021-05-06 15:48:25 -04:00
John Ericson 470640e7fe treewide: Do a number of no-op cleanups for cross and darwin
I am taking the non-invasive parts of #110914 to hopefully help out with #111988.

In particular:

 - Use `lib.makeScopeWithSplicing` to make the `darwin` package set have
   a proper `callPackage`.

 - Adjust Darwin `stdenv`'s overlays keeping things from the previous
   stage to not stick around too much.

 - Expose `binutilsNoLibc` / `darwin.binutilsNoLibc` to hopefully get us
   closer to a unified LLVM and GCC bootstrap.
2021-05-06 11:17:26 -04:00
github-actions[bot] c63e69cd89
Merge staging-next into staging 2021-05-06 12:23:32 +00:00
Maximilian Bosch a50b9e6c23
Merge pull request #113716 from Ma27/wpa_multiple
wpa_supplicant: allow both imperative and declarative networks
2021-05-06 11:01:35 +02:00
Jan Tojnar d9f177eb4d
Merge branch 'staging-next' into staging
The transmission conflict was non-trivial:
- libbrotli added to apparmor rules <1bdda029cd>
- apparmor rules rewritten <b280e64078>

Chosen the rewrite and verified that brotli is part of the rule set generated by `apparmorRulesFromClosure`.
2021-05-06 08:42:50 +02:00
github-actions[bot] 202eb5ddf5
Merge staging-next into staging 2021-05-05 18:24:02 +00:00
Maximilian Bosch 8e72457f86
Merge pull request #121266 from blanky0230/tuxedo-keyboard-update
tuxedo-keyboard: 2019-08-26 -> v3.0.5
2021-05-05 19:48:49 +02:00
Mario Rodas 4901ca4ff5 lxc: 4.0.8 -> 4.0.9 2021-05-05 04:20:00 +00:00
Sandro 562dac79e1
Merge pull request #121498 from Atemu/update/linux_lqx
linux_lqx: 5.11.16 -> 5.11.18
2021-05-05 23:22:43 +02:00
Samuel Dionne-Riel 7264c049c7 linux/common-config.nix: Configure for armv7l-linux too 2021-05-04 19:42:12 -04:00
Samuel Dionne-Riel 595a50fd07 linux/common-config.nix: Enable FB_SIMPLE on AArch64 2021-05-04 19:42:12 -04:00
Atemu cfb29088b4 linux_lqx: 5.11.16 -> 5.11.18 2021-05-04 15:13:54 +02:00
github-actions[bot] 5e177b16b1
Merge staging-next into staging 2021-05-03 18:25:49 +00:00
Tethys Svensson a376d4944c
busybox: Add a fix for CVE-2021-28831 (#121578) 2021-05-03 19:01:09 +02:00
Sandro c94b0cdc51
Merge pull request #120966 from r-ryantm/auto-update/cifs-utils
cifs-utils: 6.12 -> 6.13
2021-05-03 16:55:17 +02:00
github-actions[bot] b7e3cd0993
Merge staging-next into staging 2021-05-03 06:22:31 +00:00
Austin Seipp b3676834ca
Merge pull request #121544 from petabyteboy/feature/bpftools
bpftools: build bpf_asm, bpf_dbg
2021-05-03 00:46:37 -05:00
Milan Pässler c4bd0719e3
bpftools: build bpf_asm, bpf_dbg
I needed some other bpf-related tools located in the kernel source tree,
so I hijacked the bpftool package, renamed it to bpftools and added
those programs.
2021-05-03 00:59:50 +02:00
github-actions[bot] 0e4580d4d0
Merge staging-next into staging 2021-05-02 18:24:58 +00:00
Mario Rodas fb5a9e4095
Merge pull request #121466 from marsam/update-lxc
lxc: 4.0.7 -> 4.0.8
2021-05-02 12:55:16 -05:00
Atemu 1b10b0d579 kernel: clarify license 2021-05-02 14:44:54 +00:00
github-actions[bot] e6037ce5fe
Merge staging-next into staging 2021-05-02 00:58:46 +00:00
R. RyanTM 7326c917e4 lxcfs: 4.0.7 -> 4.0.8 2021-05-01 22:46:06 +00:00
thomas.blank 52365fe35a
tuxedo-keyboard: 2019-08-26 -> v3.0.5 2021-05-02 00:05:31 +02:00
github-actions[bot] 49721bed32
Merge staging-next into staging 2021-05-01 18:26:21 +00:00
Luke Granger-Brown 1e9f225a7a
Merge pull request #120633 from r-ryantm/auto-update/android-udev-rules
android-udev-rules: 20210302 -> 20210425
2021-05-01 13:57:27 +01:00
Luke Granger-Brown 55b33802be
Merge pull request #120647 from r-ryantm/auto-update/conky
conky: 1.12.1 -> 1.12.2
2021-05-01 13:53:50 +01:00
Alyssa Ross 29271ef915 netbsd.libedit: fix build 2021-05-01 12:46:18 +00:00
github-actions[bot] 5c9b6baa63
Merge staging-next into staging 2021-05-01 06:21:43 +00:00
Mario Rodas aad3e1bf6f lxc: 4.0.7 -> 4.0.8 2021-05-01 04:20:00 +00:00
Mario Rodas b6ee21af06
Merge pull request #121295 from marsam/update-lxc
lxc: 4.0.6 -> 4.0.7
2021-04-30 22:29:22 -05:00
John Ericson 5de0e93838
Merge pull request #121277 from alyssais/netbsd-libcurses
netbsd.libcurses: fix build
2021-04-30 22:31:34 -04:00
github-actions[bot] ef6416a6ba
Merge staging-next into staging 2021-05-01 00:54:32 +00:00
Glowpelt 9465ce4e10 rtl88xxau-aircrack: fc0194 -> c0ce81
Linux Kernel 5.8 or about there broke the previous version of this
driver.
2021-04-30 19:45:26 +00:00
github-actions[bot] 20ebbe6b59
Merge staging-next into staging 2021-04-30 18:26:34 +00:00
John Ericson 17305d2df0
Merge pull request #111487 from Ericson2314/llvm-outputs-and-cross-compile-tools
llvmPackages: Clean up outputs
2021-04-30 11:28:08 -04:00
Guillaume Girol 0c9ed22e64
Merge pull request #119562 from symphorien/fusermountsetuid
fuse: fix mount.fuse -o setuid=...
2021-04-30 14:26:39 +00:00
Alyssa Ross a7dd5ca90f systemd: fix build 2021-04-30 14:06:53 +00:00
Alyssa Ross f27de651fd
netbsd.libcurses: fix build 2021-04-30 13:56:27 +00:00
Sandro c9c351c5ef
Merge pull request #121166 from timothyklim/master
nvidia-x11: 460.27.04 -> 465.27
2021-04-30 15:08:53 +02:00
Henri Menke c9f1544978
sof-firmware: 1.6 -> 1.7 (#121181) 2021-04-30 15:02:09 +02:00
Timothy Klim ebb59d3b11 nvidia-x11: 460.27.04 -> 465.27 2021-04-30 19:45:48 +07:00
github-actions[bot] d7882499f8
Merge staging-next into staging 2021-04-30 12:26:14 +00:00
Michael Weiss 6cba9af2c9
Merge pull request #121065 from r-ryantm/auto-update/iproute2
iproute2: 5.11.0 -> 5.12.0
2021-04-30 14:19:18 +02:00
Sandro 4577d77155
Merge pull request #120861 from saschagrunert/oci-seccomp-bpf-hook
linuxPackages.oci-seccomp-bpf-hook: 1.2.2 -> 1.2.3
2021-04-30 13:58:45 +02:00
github-actions[bot] c6548b2832
Merge staging-next into staging 2021-04-30 06:21:40 +00:00
Andrew Childs 7869d16545 llvmPackages: Multuple outputs for everythting
Also begin to start work on cross compilation, though that will have to
be finished later.

The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.

Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.

----

Other misc notes, highly incomplete

- lvm-config-native and llvm-config are put in `dev` because they are
  tools just for build time.

- Clang no longer has an lld dep. That was introduced in
  db29857eb3, but if clang needs help
  finding lld when it is used we should just pass it flags / put in the
  resource dir. Providing it at build time increases critical path
  length for no good reason.

----

A note on `nativeCC`:

`stdenv` takes tools from the previous stage, so:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`

while:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
2021-04-30 05:41:00 +00:00
Mario Rodas 147b101a63 lxc: 4.0.6 -> 4.0.7 2021-04-30 04:20:00 +00:00