summary refs log tree commit diff
path: root/lib
Commit message (Collapse)AuthorAge
...
| * | | generators: refactor toPlistMatthew Bauer2018-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Address PR comments Refactors - Rename toPLIST -> toPlist
| * | | generators: refactor toPLISTMatthew Bauer2018-06-28
| | | |
| * | | generators: add PLIST handlingMatthew Bauer2018-06-27
| | | | | | | | | | | | | | | | /cc @LnL7 @3noch
* | | | Merge pull request #42138 from NixOS/yegortimoshenko-patch-6xeji2018-06-27
|\ \ \ \ | | | | | | | | | | lib/modules: decrease mkOptionDefault priority to 1500
| * | | | lib/modules: bump mkOptionDefault priority to 1500Yegor Timoshenko2018-06-17
| | | | |
* | | | | Merge pull request #40418 from oxij/lib/fix-module-aliasesMichael Raskin2018-06-27
|\ \ \ \ \ | |_|/ / / |/| | | | lib, nixos: fix module aliases in presence of defaults
| * | | | lib: fix and simplify `doRename`Jan Malakhovski2018-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change `mkRenamedOptionModule` would override option defaults even when the old option name is left unused. For instance ```nix { optios = { services.name.new = mkOption { default = { one = {}; }; }; }; imports = [ (mkRenamedOptionModule [ "services" "name" "old" ] [ "services" "name" "new" "two" ]) ]; config = {}; } ``` would evaluate to `{ config.services.name.new = { two = {}; }; }` when you'd expect it to evaluate to `{ config.services.name.new = { one = {}; }; }`.
| * | | | lib: simplify `mkAliasAndWrapDefinitions`Jan Malakhovski2018-06-11
| | | | |
* | | | | Merge pull request #42599 from obsidiansystems/xcodever-in-systemMatthew Justin Bauer2018-06-26
|\ \ \ \ \ | | | | | | | | | | | | xcode: add xcodePlatform to system
| * | | | | xcode: add xcodePlatform to systemMatthew Bauer2018-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This give us a little bit more control over what target we are using. Eventually we can target other things like WatchOS or MacOS.
* | | | | | Merge pull request #42399 from obsidiansystems/xcodever-in-systemMatthew Justin Bauer2018-06-25
|\| | | | | | | | | | | | | | | | | xcode: add xcodeVer to system
| * | | | | xcode: add xcodeVer to systemMatthew Bauer2018-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version number controls which xcode version to use when building cross to iOS.
* | | | | | Mark more unfree licenses as unfree. See also #20256.Théo Zimmermann2018-06-24
|/ / / / /
* | | | | android: add ndkVer to resolve ndk ambiguityMatthew Bauer2018-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It wasn’t exactly clear which NDK you were using previously. This adds an attribute to system that handles what version of the NDK we should use when building things. /cc @Ericson2314
* | | | | android: Use NDK 17 for aarch32Matthew Bauer2018-06-22
| |/ / / |/| | |
* | | | platforms/raspberrypi: enable kernelAutoModulesBen Wolsieffer2018-06-12
|/ / /
* | | maxscale: init at 2.1.17 (#33835)Izorkin2018-06-10
| | |
* | | lib: bitAnd, bitOr, bitXor (bitsize-agnostic fallback function) (#41491)volth2018-06-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lib: bitAnd, bitOr, bitXor * lib: test for bitAnd, bitOr, bitXor * lib: bitsize-agnostic zipIntBits * lib: bitNot * lib: bitNot
* | | lib: add groupBy (#38612)volth2018-06-10
| | |
* | | Revert "lib: bitAnd, bitOr, bitXor"Profpatsch2018-06-05
| | |
* | | Merge pull request #41373 from volth/bitwiseJörg Thalheim2018-06-03
|\ \ \ | | | | | | | | lib: bitAnd, bitOr, bitXor
| * | | lib: test for bitAnd, bitOr, bitXorvolth2018-06-02
| | | |
| * | | lib: bitAnd, bitOr, bitXorvolth2018-06-01
| | | |
* | | | Merge branch 'plat-fix-for-merge-2' into masterTuomas Tynkkynen2018-06-01
|\ \ \ \
| * | | | 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.