John Ericson
72fa40f72d
lib: Fix nix-env -qaP -f . --xml --meta
...
A merge undid my fix in d437f2c365
2018-05-29 13:06:17 -04:00
Tuomas Tynkkynen
2760b24462
Merge remote-tracking branch 'upstream/master' into staging
2018-05-26 19:01:18 +03:00
Graham Christensen
951e9099c0
Merge pull request #36344 from grahamc/fancy-option-names
...
lib/options: teach showOptions about funny option names
2018-05-25 20:55:17 -04:00
Jan Malakhovski
ad35019501
Merge branch 'master' into staging
...
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
2018-05-26 00:20:17 +00:00
John Ericson
d437f2c365
lib: Fix nix-env -qaP -f . --xml --meta
...
The function value cannot be serialized so nix-env was mad. Turns out we can
just remove it like we do in `lib/systems/inspect.nix`.
2018-05-24 10:43:14 -04:00
Tuomas Tynkkynen
003473613a
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/top-level/all-packages.nix
2018-05-18 03:54:38 +03:00
John Ericson
c5b13f97ff
Merge pull request #40659 from bkchr/androidndk
...
Androidndk
2018-05-17 12:04:14 -04:00
Bastian Köcher
832a8ca087
androidndk: Fix usage as crossSystem
2018-05-17 17:22:27 +02:00
John Ericson
ddbe9191ef
Merge remote-tracking branch 'upstream/master' into staging
...
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS
hack because we don't need it!
2018-05-16 15:16:08 -04:00
Samuel Dionne-Riel
136f1c4706
doc: Fixes documented default option for <name> for submodules. ( #40464 )
...
Fixes #40463
This is related to change 1d56d0c8a7
2018-05-16 18:11:36 +02:00
John Ericson
f2017c40ae
Merge remote-tracking branch 'upstream/master' into staging
2018-05-14 22:53:10 -04:00
Matthew Justin Bauer
165c151f7a
Merge pull request #34805 from rycee/fix/dorename
...
lib: make use of visible variable in doRename
2018-05-14 18:08:26 -05:00
Frederik Rietdijk
658b7c3f2e
Merge master into staging
2018-05-13 12:13:25 +02:00
John Ericson
2c5d915200
Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging
2018-05-13 01:02:09 -04:00
Matthew Justin Bauer
f799042d41
Merge pull request #39447 from oxij/nixos/warn-missing-stateversion
...
nixos: warn on missing `stateVersion`
2018-05-12 14:45:06 -05:00
Jan Malakhovski
4017fdcafd
lib: modules: propagate highestPrio
...
Yeah, it's ugly. But it's the minimal change that doesn't break anything
else.
2018-05-12 19:27:09 +00:00
John Ericson
92b7a814f2
Merge branch 'fix-gcc-with-float'
2018-05-12 15:21:30 -04:00
John Ericson
f2004e6287
lib: Fix float handling for Aarch32
...
Forgot to adjust default so abi with explicit float attr would be used.
2018-05-12 15:18:31 -04:00
John Ericson
6f40d18d44
prebuilt android cc: Edit wrapper to pass the right -m flags for armv7a
...
(cherry picked from commit 827ef09140
2018-05-12 15:16:16 -04:00
John Ericson
6a96dc0417
lib/system: Remove float from androideabi
...
There are two different official variations which differ in their float
support, so such a blanket statement is invalid.
`lib.systems.platforms.*android` already handles each case correctly.
Correcting an error in 827ef09140
2018-05-11 20:16:28 -04:00
John Ericson
827ef09140
prebuilt android cc: Edit wrapper to pass the right -m flags for armv7a
2018-05-11 19:17:35 -04:00
John Ericson
28bacc2093
lib/systems: Add assertion to "android" ABI
...
This is analogous to the GNU assertion.
2018-05-11 19:03:07 -04:00
John Ericson
f4de669777
lib/systems/inspect: Fix after assertions
...
Function are never equal in Nix, so we need to filter out this attribute
in ABIs.
2018-05-11 19:02:50 -04:00
John Ericson
98a1b89945
Merge pull request #40385 from obsidiansystems/lib-android-platforms
...
lib: Add 32-bit Android platforms
2018-05-11 19:01:22 -04:00
John Ericson
e3f6c6d18d
lib: Add 32-bit Android platforms
2018-05-11 18:41:55 -04:00
John Ericson
81387c2e78
Merge remote-tracking branch 'upstream/master' into staging
2018-05-11 17:12:04 -04:00
John Ericson
0a77a72895
Merge pull request #40378 from obsidiansystems/lib-platform-sort
...
lib/systems: Sort platforms, and space CPUs
2018-05-11 17:10:49 -04:00
John Ericson
341794a4b9
lib/systems: Sort platforms, and space CPUs
2018-05-11 15:02:18 -04:00
John Ericson
ee4b56edd3
Merge remote-tracking branch 'upstream/master' into staging
2018-05-11 14:36:08 -04:00
John Ericson
9e9cdd7027
lib: Add more configure flag helpers
...
Add with/without to match enable/disable, and add
`--{enable,with}-key=value` versions of both.
2018-05-11 17:43:35 +02:00
John Ericson
f18ddabee7
Merge remote-tracking branch 'upstream/master' into lib-float
2018-05-10 18:13:00 -04:00
John Ericson
1fe81a4bcd
lib: Clean up float/fpu options
...
ARM ABIs now have a float field. This is used as a fallback to lessen
our use of `platform.gcc.float`. I didn't know what the MIPs convention
is so I kept using `platform.gcc.float` in that case.
2018-05-10 18:02:00 -04:00
Matthew Justin Bauer
4ec9c4b377
Merge pull request #40255 from matthewbauer/remove-enableIfAvailable
...
treewide: remove lib.meta.enableIfAvailable
2018-05-10 16:00:16 -05:00
John Ericson
67db915a43
Merge remote-tracking branch 'upstream/master' into staging
2018-05-10 16:35:04 -04:00
John Ericson
58b2e875c2
lib/systems: Prohibit "gnu" ABI (*-gnu) with 32-bit ARM
...
It is ambiguous, and therefore banned within GCC.
2018-05-10 15:05:23 -04:00
Frederik Rietdijk
64c8c6dcb3
Merge master into staging
2018-05-10 09:30:56 +02:00
John Ericson
006422d08d
Merge commit 'feb648ce59ffbed94c58133eb7aa2761992a35e1' into staging
2018-05-10 01:55:26 -04:00
John Ericson
c17f79ea3b
Merge remote-tracking branch 'upstream/master' into lib-platform-simplify
2018-05-10 01:40:44 -04:00
John Ericson
feb648ce59
Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into lib-platform-simplify
2018-05-10 01:40:38 -04:00
John Ericson
a02be2bd85
treewide: Get rid of *Platform.arch
...
Use `parsed.cpu.name` or `platform.gcc.arch` instead.
2018-05-10 01:37:31 -04:00
John Ericson
3bc923bf5f
Merge remote-tracking branch 'upstream/master' into uclibc
2018-05-10 00:23:12 -04:00
John Ericson
b3ef322770
Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into uclibc
2018-05-10 00:18:51 -04:00
John Ericson
f063a860d6
xbursttools: Cleanup slightly
2018-05-09 23:40:13 -04:00
John Ericson
e42a7a5c0b
lib/systems: Add uClibc just like MUSL
2018-05-09 23:39:23 -04:00
John Ericson
0b45f0ebf9
Merge pull request #40261 from obsidiansystems/more-arm
...
lib/systems: Parse more arm cpu types
2018-05-09 20:05:10 -04:00
John Ericson
3fa0ba9177
lib/systems: Parse more arm cpu types
2018-05-09 18:57:39 -04:00
Matthew Bauer
c37b93bd52
treewide: remove lib.meta.enableIfAvailable
2018-05-09 16:21:22 -05:00
Matthew Bauer
8a98cf97e9
lib.makeSearchPath: allow null in search path
...
This makes things match ‘buildInputs’ where inputs are allowed to be
null.
2018-05-09 15:44:06 -05:00
Matthew Bauer
6748534d83
Merge remote-tracking branch 'upstream/master' into staging
2018-05-08 09:36:00 -05:00
Robert Helgesson
08e8701673
lib.types: fix loaOf behavior for long lists
...
Assigning a list of 10 or more elements to an option having the type
`loaOf a` produces a configuration value that is not honoring the
order of the original list. This commit fixes this and a related issue
arising when 10 or more lists are merged into this type of option.
2018-05-07 20:23:52 +02:00
