Commit Graph

8983 Commits

Author SHA1 Message Date
github-actions[bot] b88b52998b
Merge master into staging-next 2021-01-24 01:18:51 +00:00
Gabor Greif 5105bf4b2e
llvm_{5,6,8..11}: fix missing lib from stdenv.lib -> lib (#110643)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-24 01:31:45 +01:00
Jan Tojnar 01ee4ea574
Merge branch 'master' into staging-next 2021-01-24 00:09:45 +01:00
John Ericson 12881a7aa7
Merge pull request #110544 from Ericson2314/no-platform
top-level, lib: Remove platform attribute of platforms
2021-01-23 16:32:36 -05:00
Sandro 10bb072072
Merge pull request #110610 from ck3d/fix-llvm11-cross
llvmPackages_11: Fix cross compilation
2021-01-23 22:23:39 +01:00
Christian Kögler 266f20d886 llvmPackages_11: Fix cross compilation 2021-01-23 18:03:24 +01:00
John Ericson 9c213398b3 lib: Clean up how linux and gcc config is specified
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that
commit for details.

This reverts commit 0bc275e634.
2021-01-23 10:01:28 -05:00
Marek Fajkus 07a6732bf5
Fix elm-json build on Darwin 2021-01-23 14:28:08 +01:00
github-actions[bot] 58752914f4
Merge master into staging-next 2021-01-23 12:40:13 +00:00
Jörg Thalheim f6a583eeec
Merge pull request #110465 from siraben/development-compilers-stdenv-lib
pkgs/development/compilers: stdenv.lib -> lib
2021-01-23 10:07:31 +00:00
Ben Siraphob acc5f7b18a pkgs/development/compilers: stdenv.lib -> lib 2021-01-23 08:57:37 +07:00
github-actions[bot] 8103cb9089
Merge staging-next into staging 2021-01-23 01:18:03 +00:00
Jonathan Ringer 0bc275e634
Revert "lib: Clean up how linux and gcc config is specified"
This is a stdenv-rebuild, and should not be merged
into master

This reverts commit 8929989614.
2021-01-22 14:07:06 -08:00
Ryan Mulligan 406a590802
Merge pull request #110503 from r-ryantm/auto-update/mlkit
mlkit: 4.5.2 -> 4.5.6
2021-01-22 12:34:56 -08:00
John Ericson d95aebbe0e
Merge pull request #107214 from Ericson2314/linux-config-cleanup
lib: Clean up how linux and gcc config is specified
2021-01-22 15:15:58 -05:00
R. RyanTM adf23ffca7 mlkit: 4.5.2 -> 4.5.6 2021-01-22 15:54:29 +00:00
github-actions[bot] a5bbeb4fb1
Merge staging-next into staging 2021-01-22 12:43:02 +00:00
Sandro 9a92886922
Merge pull request #110395 from zowoq/gemset 2021-01-22 09:31:07 +01:00
John Ericson 8929989614 lib: Clean up how linux and gcc config is specified
The `platform` field is pointless nesting: it's just stuff that happens
to be defined together, and that should be an implementation detail.

This instead makes `linux-kernel` and `gcc` top level fields in platform
configs. They join `rustc` there [all are optional], which was put there
and not in `platform` in anticipation of a change like this.

`linux-kernel.arch` in particular also becomes `linuxArch`, to match the
other `*Arch`es.

The next step after is this to combine the *specific* machines from
`lib.systems.platforms` with `lib.systems.examples`, keeping just the
"multiplatform" ones for defaulting.
2021-01-21 22:44:09 -05:00
Matthew Bauer afc2edc3ee
Merge pull request #108060 from matthewbauer/strip-musl-gcc
gcc: allow stripping gcc libraries
2021-01-21 19:31:26 -06:00
github-actions[bot] e48c1f8e8c
Merge staging-next into staging 2021-01-22 01:17:58 +00:00
Matthew Bauer 4bdcddf9aa gcc: allow stripping gcc libraries
When cross compiling to the same kernel / arch combination, it is safe
to use strip of libraries. This happens when cross-compiling musl
programs. dontStrip is now set in each gcc compiler instead of in
gcc/builder.sh.

Fixes #75476
2021-01-21 16:25:48 -06:00
zowoq 59b83c43e0 treewide: add final newline 2021-01-22 07:18:04 +10:00
Antonio Nuno Monteiro 29954335b7 ocamlPackages_4_12.ocaml: alpha3 -> beta1 2021-01-21 21:59:09 +01:00
github-actions[bot] 27c8ef972c
Merge staging-next into staging 2021-01-21 18:51:36 +00:00
Jörg Thalheim 5e0f8f6762
Merge pull request #109919 from pjjw/musl-rust-bootstrap-fix
rust: add musl-libc targets to bootstrapping
2021-01-21 15:24:35 +00:00
github-actions[bot] df8b20163b
Merge staging-next into staging 2021-01-21 06:45:45 +00:00
zowoq 932941b79c treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-21 13:29:54 +10:00
github-actions[bot] e5fef074d6
Merge staging-next into staging 2021-01-21 01:19:31 +00:00
zowoq 8adc564f28 treewide: editorconfig fixes
- add final newline
- use spaces for indentation
2021-01-21 09:30:52 +10:00
Sandro e201b1233d
Merge pull request #109836 from r-ryantm/auto-update/gleam
gleam: 0.12.1 -> 0.13.2
2021-01-20 23:45:45 +01:00
zowoq 5313326b7f go_1_15: 1.15.6 -> 1.15.7 2021-01-21 06:56:22 +10:00
zowoq 3bcd19086c go_1_14: 1.14.13 -> 1.14.14 2021-01-21 06:56:22 +10:00
github-actions[bot] b27f238893
Merge staging-next into staging 2021-01-20 01:20:12 +00:00
zowoq 31f5dd3f36 treewide: editorconfig fixes
- remove trailing whitespace
- use spaces for indentation
2021-01-20 09:11:11 +10:00
Jan Tojnar fc7bd322df
Merge branch 'staging-next' into staging 2021-01-19 13:50:04 +01:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Peter Woodman 0b8620e9b6
rust: add musl-libc targets to bootstrapping 2021-01-19 02:27:41 -05:00
github-actions[bot] e8a1f18e58
Merge staging-next into staging 2021-01-19 01:18:25 +00:00
Sandro 82feb02e8d
Merge pull request #98011 from OPNA2608/update-acme-unstable-2020-08-26
acme: 120 -> unstable-2020-12-27
2021-01-19 00:32:28 +01:00
R. RyanTM fd9714bb64 gleam: 0.12.1 -> 0.13.2 2021-01-18 22:11:33 +00:00
Jörg Thalheim 1881e81e3c
Merge pull request #103846 from kampka/llvm_11_musl
llvm_11: Disable checks on musl libc hosts
2021-01-18 20:11:55 +00:00
Christoph Neidahl e0b02ce141 acme: 120 -> unstable-2020-12-27 2021-01-18 14:38:01 +01:00
zowoq d93966200c Merge staging-next into staging 2021-01-18 13:03:13 +10:00
github-actions[bot] b7f20dcd02
Merge master into staging-next 2021-01-18 01:16:03 +00:00
Austin Seipp 6ec4a219ce
yosys-bluespec: 2021.01.14 -> 2021.01.17
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2021-01-17 17:15:01 -06:00
Jan Tojnar 643a72b4f1
Merge branch 'staging-next' into staging 2021-01-17 05:52:43 +01:00
Jan Tojnar e6f926d910
Merge branch 'master' into staging-next 2021-01-17 05:52:23 +01:00
Marek Fajkus ccdf2b2be6
elmPackages.*: add meta
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-01-16 19:48:00 +01:00
github-actions[bot] 00577aef99
Merge staging-next into staging 2021-01-16 12:40:08 +00:00