summary refs log tree commit diff
path: root/lib
Commit message (Collapse)AuthorAge
...
| * | platforms.nix: More rpi2 cleanupTuomas Tynkkynen2018-05-31
| | |
| * | platforms.nix: Clean up obsolete cruft from raspberrypi2Tuomas Tynkkynen2018-05-31
| | |
| * | platforms.nix: Clean up obsolete cruft from raspberrypiTuomas Tynkkynen2018-05-31
| | | | | | | | | | | | | | | Works fine without, and the 'DRM n' is actually preventing the mainline VC4 driver from building.
| * | linux_rpi: Specify defconfig in kernel expressionTuomas Tynkkynen2018-05-31
| | | | | | | | | | | | | | | | | | | | | In particular, now the mainline kernel can be built on the RPi 1 as well (so kernelBaseConfig should always be a mainline defconfig from now on). And RPi 2 users can now use linux_rpi without doing the `nixpkgs.config.platform = lib.systems.platforms.raspberrypi2;` dance.
* | | lib: Fix `nix-env -qaP -f . --xml --meta`John Ericson2018-05-29
| | | | | | | | | | | | A merge undid my fix in d437f2c365a12fb3894eb87f52decf53c745f475.
* | | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-05-26
|\ \ \
| * \ \ Merge pull request #36344 from grahamc/fancy-option-namesGraham Christensen2018-05-25
| |\ \ \ | | | | | | | | | | lib/options: teach showOptions about funny option names
| | * | | lib/options: teach showOptions about funny option namesGraham Christensen2018-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle the case where options have funny symbols inside of them. Example: If I reference the following attribute without it being defined: security.acme.certs."example.com".webroot I now get the error: The option `security.acme.certs."example.com".webroot' is used but not defined. where before I got: The option `security.acme.certs.example.com.webroot' is used but not defined. which is not true.
* | | | | Merge branch 'master' into stagingJan Malakhovski2018-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 Ericson2018-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 stagingTuomas Tynkkynen2018-05-18
|\| | | | | | | | | | | | | | | | | | | Conflicts: pkgs/top-level/all-packages.nix
| * | | Merge pull request #40659 from bkchr/androidndkJohn Ericson2018-05-17
| |\ \ \ | | | | | | | | | | Androidndk
| | * | | androidndk: Fix usage as crossSystemBastian Köcher2018-05-17
| | | | |
* | | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-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-Riel2018-05-16
| |/ / / | | | | | | | | | | | | | | | | Fixes #40463 This is related to change 1d56d0c8a79334cd7149fd580512046558eaac78
* | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-14
|\| | |
| * | | Merge pull request #34805 from rycee/fix/dorenameMatthew Justin Bauer2018-05-14
| |\ \ \ | | | | | | | | | | lib: make use of visible variable in doRename
| | * | | lib: make use of visible variable in doRenameRobert Helgesson2018-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 stagingFrederik Rietdijk2018-05-13
|\| | | |
| * | | | Merge pull request #39447 from oxij/nixos/warn-missing-stateversionMatthew Justin Bauer2018-05-12
| |\ \ \ \ | | | | | | | | | | | | nixos: warn on missing `stateVersion`
| | * | | | lib: modules: propagate `highestPrio`Jan Malakhovski2018-05-12
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Yeah, it's ugly. But it's the minimal change that doesn't break anything else.
* | | | | Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into stagingJohn Ericson2018-05-13
|\| | | |
| * | | | Merge branch 'fix-gcc-with-float'John Ericson2018-05-12
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | lib: Fix float handling for Aarch32John Ericson2018-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 armv7aJohn Ericson2018-05-12
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 827ef0914089e1a2bba140b49e1311eff28cc156)
| * | | | lib/system: Remove float from androideabiJohn Ericson2018-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 armv7aJohn Ericson2018-05-11
| | | | |
| * | | | lib/systems: Add assertion to "android" ABIJohn Ericson2018-05-11
| | | | | | | | | | | | | | | | | | | | This is analogous to the GNU assertion.
| * | | | lib/systems/inspect: Fix after assertionsJohn Ericson2018-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-platformsJohn Ericson2018-05-11
| |\| | | | | | | | | | | | | lib: Add 32-bit Android platforms
| | * | | lib: Add 32-bit Android platformsJohn Ericson2018-05-11
| | | | |
* | | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-11
|\| | | |
| * | | | Merge pull request #40378 from obsidiansystems/lib-platform-sortJohn Ericson2018-05-11
| |\| | | | | | | | | | | | | lib/systems: Sort platforms, and space CPUs
| | * | | lib/systems: Sort platforms, and space CPUsJohn Ericson2018-05-11
| | | | |
* | | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-11
|\| | | |
| * | | | lib: Add more configure flag helpersJohn Ericson2018-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-floatJohn Ericson2018-05-10
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge pull request #40255 from matthewbauer/remove-enableIfAvailableMatthew Justin Bauer2018-05-10
| | |\ \ \ | | | | | | | | | | | | treewide: remove lib.meta.enableIfAvailable
| | | * | | treewide: remove lib.meta.enableIfAvailableMatthew Bauer2018-05-09
| | | | | |
| * | | | | lib: Clean up float/fpu optionsJohn Ericson2018-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 stagingJohn Ericson2018-05-10
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | lib/systems: Prohibit "gnu" ABI (*-gnu) with 32-bit ARMJohn Ericson2018-05-10
| | | | | | | | | | | | | | | | | | | | | | | | It is ambiguous, and therefore banned within GCC.
* | | | | | Merge master into stagingFrederik Rietdijk2018-05-10
|\| | | | |
| * | | | | Merge remote-tracking branch 'upstream/master' into lib-platform-simplifyJohn Ericson2018-05-10
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into uclibcJohn Ericson2018-05-10
| | |\ \ \ \ \
| | | * \ \ \ \ Merge pull request #40261 from obsidiansystems/more-armJohn Ericson2018-05-09
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | | lib/systems: Parse more arm cpu types
| | | * | | | | lib.makeSearchPath: allow null in search pathMatthew Bauer2018-05-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes things match ‘buildInputs’ where inputs are allowed to be null.
| | * | | | | | Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into uclibcJohn Ericson2018-05-10
| | |\| | | | |
* | | | | | | | Merge commit 'feb648ce59ffbed94c58133eb7aa2761992a35e1' into stagingJohn Ericson2018-05-10
|\| | | | | | |
| * | | | | | | Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into ↵John Ericson2018-05-10
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | |_|_|/ / / | |/| | | | | lib-platform-simplify