Commit graph

15243 commits

Author SHA1 Message Date
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
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
Jonathan Ringer 20acd4c4f1
Merge pull request #105026 from thefloweringash/apple-silicon
Native support for Apple Silicon
2021-05-16 11:38:18 -07: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
Andrew Childs e592d342da darwin.ICU: avoid platform.darwinMinVersion references on non-darwin
This package isn't expected to work outside of darwin, but must still
evaluate cleanly.
2021-05-17 00:28:05 +09:00
Andrew Childs 3706fe567b darwin.DarwinTools: remove reference to CFPriv.h
Fixes build on aarch64-darwin.
2021-05-17 00:28:05 +09:00
Ivan Babrou 68733c16f5 darwin.apple_sdk.frameworks: add missing dependencies
```
/nix/store/5mgn511gbldf7xl5kjm27z9lj10xcycl-apple-framework-CoreData-11.0.0/Library/Frameworks/CoreData.framework/Headers/NSPersistentCloudKitContainerOptions.h:10:9: fatal error: 'CloudKit/CKDatabase.h' file not found
        ^~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
```

```
/nix/store/a7k7kqj08602785vsrss0xa85b08hik4-apple-framework-CloudKit-11.0.0/Library/Frameworks/CloudKit.framework/Headers/CKRecord.h:9:9: fatal error: 'CoreLocation/CLLocation.h' file not found
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
```
2021-05-17 00:27:04 +09:00
Ivan Babrou d0eff87f68 darwin.file_cmds: add missing Libinfo dependency
Fixing:

```
/private/tmp/nix-build-file_cmds-264.1.1-osx-10.11.6.drv-0/file_cmds-264.1.1/ls/print.c:56:10: fatal error: 'membershipPriv.h' file not found
         ^~~~~~~~~~~~~~~~~~
1 error generated.
```
2021-05-17 00:27:03 +09:00
Ivan Babrou 577bcf38f8 darwin.shell_cmds: add missing dependency on launchd 2021-05-17 00:27:03 +09:00
Ivan Babrou da3ae0231a apple-source-releases: make it compile on aarch64 2021-05-17 00:27:03 +09:00
Ivan Babrou 2eb97f2ddd darwin.developer_cmds: wrap clang -E from clang-wrapped as clang-cpp 2021-05-17 00:27:03 +09:00
Andrew Childs d2c9670339 darwin: add CoreFoundation to the build when explicitly required 2021-05-17 00:27:02 +09:00
Matthew Bauer 3e7034abb9 darwin/xcode: provide libc++ from XCode toolchain
We could use our own libc++ here, but it is probably best to use the
provided one to ensure consistency. This fixes some C++ programs when
running aarch64-apple-ios-clang++.
2021-05-17 00:27:02 +09:00
Andrew Childs 7eb1e3695d darwin.signingUtils: init
Helper scripts for code signing on darwin.
2021-05-17 00:27:02 +09:00
Andrew Childs 4c890ce9aa darwin.sigtool: init 2021-05-17 00:27:02 +09:00
Andrew Childs fe0d5a54c1 darwin/apple-sdk-11.0: inject an sdk for macOS 11 2021-05-17 00:27:01 +09:00
Andrew Childs 0ba7a04743 darwin/binutils: include codesign_allocate 2021-05-17 00:27:01 +09:00
Andrew Childs eb8f8afac7 libtapi: cross compilation 2021-05-17 00:27:01 +09:00
Andrew Childs b7abec31d4 rewrite-tbd: init 2021-05-17 00:27:01 +09:00
Andrew Childs 257cb1c8e8 print-reexports: rehome, tbd4 support, cross compilation 2021-05-17 00:27:01 +09:00
Andrew Childs bd4a45f5d4 cctools: drop suspicious dependency 2021-05-17 00:27:00 +09:00
Andrew Childs cbe172fa67 darwin.ICU: cross compilation 2021-05-17 00:27:00 +09:00
Andrew Childs aa3361326b darwin.adv_cmds: fix cross compilation 2021-05-17 00:27:00 +09: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
Atemu 1e6a687fd0 linux_lqx: 5.11.20 -> 5.11.21 2021-05-16 10:11:39 +02:00
R. RyanTM 0a099aa6c5 fatrace: 0.16.2 -> 0.16.3 2021-05-16 02:47:06 -04:00
github-actions[bot] 5c18268a6b
Merge staging-next into staging 2021-05-16 06:22:08 +00:00
github-actions[bot] d6fe7f78a8
Merge master into staging-next 2021-05-16 06:22:05 +00:00
sterni bc6da68650
bionic: use fetchzip for everything (#123010)
Since the hashes of the remaining two archives that used fetchurl broke,
now as good a time as any to switch the remaining fetchurls to fetchzip.
2021-05-16 01:24:27 -04:00
Peter Hoeg 33a2d3a817 logitech-udev-rules: truly minor permission fix 2021-05-16 11:04:34 +08:00
Jan Tojnar f070de253c Revert "hwdata: 0.344 -> 0.347" 2021-05-15 20:23:53 +02:00
ajs124 d151b2fb41 lvm2: 2.03.11 -> 2.03.12 2021-05-15 08:55:27 -07:00