summary refs log tree commit diff
path: root/lib
Commit message (Collapse)AuthorAge
* systems: fix netbsd triple parsingMatthew Bauer2018-07-28
| | | | | | | | binutils expects x86_64-unknown-netbsd<version> (only 3 parts!). Any other combo seems to fail. Also handle darwin versions similarly. /cc @Ericson2314
* elk: 6.2.4 -> 6.3.2Bas van Dijk2018-07-28
| | | | | | | | | | | | | | | | * The ELK stack is upgraded to 6.3.2. * `elasticsearch6`, `logstash6` and `kibana6` now come with X-Pack which is a suite of additional features. These are however licensed under the unfree "Elastic License". * Fortunately they also provide OSS versions which are now packaged under: `elasticsearch6-oss`, `logstash6-oss` and `kibana6-oss`. Note that the naming of the attributes is consistent with upstream. * The test `nix-build nixos/tests/elk.nix -A ELK-6` will test the OSS version by default. You can also run the test on the unfree ELK using: `NIXPKGS_ALLOW_UNFREE=1 nix-build nixos/tests/elk.nix -A ELK-6 --arg enableUnfree true`
* lib/trivial: move zipIntBits to its own fileProfpatsch2018-07-26
| | | | | The amount of implementation detail really should not be the first thing in a prominent file called `trivial.nix`.
* lib/trivial: unify & improve docstringsProfpatsch2018-07-26
| | | | | | | | | - add section headers - unify comment syntax - add examples Tested with: nix-instantiate --strict --eval ./lib/tests/misc.nix
* systems: Allow detection of powerpc and sparcJohn Q Crosscompiler2018-07-26
|
* treewide: fix build with disallowed aliases (#43872)volth2018-07-21
| | | fixes build with disallowed aliases
* [bot] treewide: remove unused 'inherit' in let blocksvolth2018-07-20
|
* [bot]: remove unreferenced codevolth2018-07-20
|
* licenses: Add CC-BY-NC-4.0André-Patrick Bubel2018-07-16
|
* lib.debug: fix traceValSeqFnMatthieu Coudron2018-07-15
| | | | was calling the wrong parent version.
* Revert "lib: Use lib.fixed-points.extends to avoid repetition"Silvan Mosberger2018-07-12
| | | | This reverts commit 48ccdf322d9e7a68d0caf5833511ee3e53ec7d3a.
* lib: Use lib.fixed-points.extends to avoid repetitionJohn Ericson2018-07-09
|
* lib.concatMap and lib.mapAttrs to be builtinsvolth2018-07-05
|
* lib.generators.toPlist: add floatsMatthew Bauer2018-07-03
| | | | | | | Nix now supports floats & we can pretty easily map them to Plist’s <real></real> type. Note that I am unsure how this affects older version of Nix that may or may not have builtins.isFloat available. Make sure this satisfies minver.nix’s "1.11" requirement.
* lib: add float option typeRichard Marko2018-07-03
|
* linux: translate config to structured configDan Peebles2018-06-30
| | | | | | | | | | | | Instead of using a string to describe kernel config, use a nix attribute set, then converted to a string. - allows to override the config, aka convert 'yes' into 'modules' or vice-versa - while for now merging different configs is still crude (last spec wins), at least there should be only one CONFIG_XYZ value compared to the current string config where the first defined would be used and others ignored. [initial idea by copumpkin in 2016, a major rebase to 2018 by teto]
* Merge pull request #42669 from obsidiansystems/upstream-plistMatthew Bauer2018-06-28
|\ | | | | Upstream PLIST handling
| * 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