Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into staging | Jan Malakhovski | 2018-05-26 |
|\ | | | | | | | | | | | Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master | ||
| * | lib: Fix `nix-env -qaP -f . --xml --meta` | John Ericson | 2018-05-24 |
| | | | | | | | | | | 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`. | ||
* | | Merge remote-tracking branch 'upstream/master' into staging | Tuomas Tynkkynen | 2018-05-18 |
|\| | | | | | | | | | Conflicts: pkgs/top-level/all-packages.nix | ||
| * | Merge pull request #40659 from bkchr/androidndk | John Ericson | 2018-05-17 |
| |\ | | | | | | | Androidndk | ||
| | * | androidndk: Fix usage as crossSystem | Bastian Köcher | 2018-05-17 |
| | | | |||
* | | | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-16 |
|\| | | | | | | | | | | | | | | Keep the dontCheck because the test suite fails, get rid of the LDFLAGS hack because we don't need it! | ||
| * | | doc: Fixes documented default option for `<name>` for submodules. (#40464) | Samuel Dionne-Riel | 2018-05-16 |
| |/ | | | | | | | | | Fixes #40463 This is related to change 1d56d0c8a79334cd7149fd580512046558eaac78 | ||
* | | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-14 |
|\| | |||
| * | Merge pull request #34805 from rycee/fix/dorename | Matthew Justin Bauer | 2018-05-14 |
| |\ | | | | | | | lib: make use of visible variable in doRename | ||
| | * | lib: make use of visible variable in doRename | Robert Helgesson | 2018-02-10 |
| | | | | | | | | | | | | | | | | | | The `visible` variable was not hooked up previously. It is used to determine whether the renamed option should be shown in the documentation. | ||
* | | | Merge master into staging | Frederik Rietdijk | 2018-05-13 |
|\| | | |||
| * | | Merge pull request #39447 from oxij/nixos/warn-missing-stateversion | Matthew Justin Bauer | 2018-05-12 |
| |\ \ | | | | | | | | | nixos: warn on missing `stateVersion` | ||
| | * | | lib: modules: propagate `highestPrio` | Jan Malakhovski | 2018-05-12 |
| | | | | | | | | | | | | | | | | | | | | Yeah, it's ugly. But it's the minimal change that doesn't break anything else. | ||
* | | | | Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging | John Ericson | 2018-05-13 |
|\| | | | |||
| * | | | Merge branch 'fix-gcc-with-float' | John Ericson | 2018-05-12 |
| |\ \ \ | | |/ / | |/| | | |||
| | * | | lib: Fix float handling for Aarch32 | John Ericson | 2018-05-12 |
| | | | | | | | | | | | | | | | | Forgot to adjust default so abi with explicit float attr would be used. | ||
| | * | | prebuilt android cc: Edit wrapper to pass the right -m flags for armv7a | John Ericson | 2018-05-12 |
| | | | | | | | | | | | | | | | | (cherry picked from commit 827ef0914089e1a2bba140b49e1311eff28cc156) | ||
| * | | | lib/system: Remove float from androideabi | John Ericson | 2018-05-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 827ef0914089e1a2bba140b49e1311eff28cc156. | ||
| * | | | prebuilt android cc: Edit wrapper to pass the right -m flags for armv7a | John Ericson | 2018-05-11 |
| | | | | |||
| * | | | lib/systems: Add assertion to "android" ABI | John Ericson | 2018-05-11 |
| | | | | | | | | | | | | | | | | This is analogous to the GNU assertion. | ||
| * | | | lib/systems/inspect: Fix after assertions | John Ericson | 2018-05-11 |
| | | | | | | | | | | | | | | | | | | | | Function are never equal in Nix, so we need to filter out this attribute in ABIs. | ||
| * | | | Merge pull request #40385 from obsidiansystems/lib-android-platforms | John Ericson | 2018-05-11 |
| |\| | | | | | | | | | | lib: Add 32-bit Android platforms | ||
| | * | | lib: Add 32-bit Android platforms | John Ericson | 2018-05-11 |
| | | | | |||
* | | | | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-11 |
|\| | | | |||
| * | | | Merge pull request #40378 from obsidiansystems/lib-platform-sort | John Ericson | 2018-05-11 |
| |\| | | | | | | | | | | lib/systems: Sort platforms, and space CPUs | ||
| | * | | lib/systems: Sort platforms, and space CPUs | John Ericson | 2018-05-11 |
| | | | | |||
* | | | | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-11 |
|\| | | | |||
| * | | | lib: Add more configure flag helpers | John Ericson | 2018-05-11 |
| | | | | | | | | | | | | | | | | | | | | Add with/without to match enable/disable, and add `--{enable,with}-key=value` versions of both. | ||
| * | | | Merge remote-tracking branch 'upstream/master' into lib-float | John Ericson | 2018-05-10 |
| |\ \ \ | | |/ / | |/| | | |||
| | * | | Merge pull request #40255 from matthewbauer/remove-enableIfAvailable | Matthew Justin Bauer | 2018-05-10 |
| | |\ \ | | | | | | | | | | | treewide: remove lib.meta.enableIfAvailable | ||
| | | * | | treewide: remove lib.meta.enableIfAvailable | Matthew Bauer | 2018-05-09 |
| | | | | | |||
| * | | | | lib: Clean up float/fpu options | John Ericson | 2018-05-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||
* | | | | | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2018-05-10 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| * | | | | lib/systems: Prohibit "gnu" ABI (*-gnu) with 32-bit ARM | John Ericson | 2018-05-10 |
| | | | | | | | | | | | | | | | | | | | | It is ambiguous, and therefore banned within GCC. | ||
* | | | | | Merge master into staging | Frederik Rietdijk | 2018-05-10 |
|\| | | | | |||
| * | | | | Merge remote-tracking branch 'upstream/master' into lib-platform-simplify | John Ericson | 2018-05-10 |
| |\ \ \ \ | |||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' into uclibc | John Ericson | 2018-05-10 |
| | |\ \ \ \ | |||
| | | * \ \ \ | Merge pull request #40261 from obsidiansystems/more-arm | John Ericson | 2018-05-09 |
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | | | lib/systems: Parse more arm cpu types | ||
| | | * | | | | lib.makeSearchPath: allow null in search path | Matthew Bauer | 2018-05-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes things match ‘buildInputs’ where inputs are allowed to be null. | ||
| | * | | | | | Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into uclibc | John Ericson | 2018-05-10 |
| | |\| | | | | |||
* | | | | | | | Merge commit 'feb648ce59ffbed94c58133eb7aa2761992a35e1' into staging | John Ericson | 2018-05-10 |
|\| | | | | | | |||
| * | | | | | | Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into ↵ | John Ericson | 2018-05-10 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | / / | | |_|_|/ / | |/| | | | | lib-platform-simplify | ||
| * | | | | | treewide: Get rid of `*Platform.arch` | John Ericson | 2018-05-10 |
| | |/ / / | |/| | | | | | | | | | | | | | Use `parsed.cpu.name` or `platform.gcc.arch` instead. | ||
| * | | | | xbursttools: Cleanup slightly | John Ericson | 2018-05-09 |
| | | | | | |||
| * | | | | lib/systems: Add uClibc just like MUSL | John Ericson | 2018-05-09 |
| | |/ / | |/| | | |||
| * | | | lib/systems: Parse more arm cpu types | John Ericson | 2018-05-09 |
| | | | | |||
* | | | | Merge remote-tracking branch 'upstream/master' into staging | Matthew Bauer | 2018-05-08 |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | lib.types: fix loaOf behavior for long lists | Robert Helgesson | 2018-05-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||
| * | | | lib/types: remove unnecessary coerceFunc assertion | Silvan Mosberger | 2018-05-06 |
| | | | | |||
| * | | | lib/types: clear up coercedTo description | Silvan Mosberger | 2018-05-06 |
| | | | |