summary refs log tree commit diff
path: root/lib/types.nix
Commit message (Collapse)AuthorAge
* Add type port as an alias to u16Daniel Rutz2018-10-18
|
* lib/types: enhances separatedString's descriptionSamuel Dionne-Riel2018-10-12
| | | | | | | | | The previous description "string" is misleading in the full options manual pages; they are actually concatenated strings, with a specific character. The empty string version ("types.string") has been special-cased to provide a better message.
* lib: move assertMsg and assertOneOf to their own library fileProfpatsch2018-09-06
| | | | | Since the `assertOneOf` uses `lib.generators`, they are not really trivial anymore and should go into their own library file.
* lib/trivial: add a few examples of usage of assertMsg/assertOneOfProfpatsch2018-09-06
|
* [bot] treewide: remove unused 'inherit' in let blocksvolth2018-07-20
|
* [bot]: remove unreferenced codevolth2018-07-20
|
* lib: add float option typeRichard Marko2018-07-03
|
* doc: Fixes documented default option for `<name>` for submodules. (#40464)Samuel Dionne-Riel2018-05-16
| | | | | Fixes #40463 This is related to change 1d56d0c8a79334cd7149fd580512046558eaac78
* lib.types: fix loaOf behavior for long listsRobert Helgesson2018-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 assertionSilvan Mosberger2018-05-06
|
* lib/types: clear up coercedTo descriptionSilvan Mosberger2018-05-06
|
* lib/types: Fix coercedTo checkSilvan Mosberger2018-05-06
| | | | | | | | | | | | Without this change (coercedTo str toInt int).check "foo" would evaluate to true, even though (coercedTo str toInt int).merge {} [{ value = "foo"; }] will throw an error because "foo" can't be coerced to an int.
* lib/types: add types.nonEmptyListOfRobert Schütz2018-02-08
|
* nixpkgs.lib: Add types.strMatchingRyan Trinkle2017-12-02
|
* lib/types.nix: Disable 32-bit integer types for nowTuomas Tynkkynen2017-11-05
| | | | | | | | | This file doesn't evaluate in 32-bit versions of Nix because the integer type is a signed 32-bit integer there, so 4294967296 causes an 'invalid integer' error. I see no other way around than commenting this out :( (s32 could be made to work by tweaking the expressions a bit, but didn't do that for now since it'd be asymmetric to have s32 but no u32).
* lib/types: fix up documentation formatting a bitProfpatsch2017-11-05
|
* lib/types: add `ints.positive`.Profpatsch2017-11-05
| | | | For values that are positive, but cannot be 0.
* lib/types: match lowercase descriptions of other typesProfpatsch2017-11-05
|
* lib/types: signed -> s, unsigned -> u, remove signed aliasProfpatsch2017-11-05
| | | | | | Mirrors the way it’s done in modern low-level languages like Rust (by input of @nbp). Removes the signed alias for int.
* lib/types: remove port type againProfpatsch2017-11-05
| | | | Will be introduced as a taggedUnion, once that type is in nixpkgs.
* lib/types: add port typeProfpatsch2017-11-05
|
* lib/types: add various signed/unsigned int typesProfpatsch2017-11-05
| | | | | It is sometimes necessary to restrict the domain of integers for configurations, as well as restricting them to unsigned/positive values.
* lib/types: add intBetweenProfpatsch2017-11-05
| | | | An int type that checks the value range.
* types.submodule: Fix the NixOS Manual, by escaping the <> symbols.Nicolas B. Pierron2017-10-30
|
* types.submodule: Replace a friendly comment by a more gentle one.Nicolas B. Pierron2017-10-30
|
* types: remove loeOftv2017-10-05
|
* Convert libs to a fixed-pointGraham Christensen2017-09-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does break the API of being able to import any lib file and get its libs, however I'm not sure people did this. I made this while exploring being able to swap out docFn with a stub in #2305, to avoid functor performance problems. I don't know if that is going to move forward (or if it is a problem or not,) but after doing all this work figured I'd put it up anyway :) Two notable advantages to this approach: 1. when a lib inherits another lib's functions, it doesn't automatically get put in to the scope of lib 2. when a lib implements a new obscure functions, it doesn't automatically get put in to the scope of lib Using the test script (later in this commit) I got the following diff on the API: + diff master fixed-lib 11764a11765,11766 > .types.defaultFunctor > .types.defaultTypeMerge 11774a11777,11778 > .types.isOptionType > .types.isType 11781a11786 > .types.mkOptionType 11788a11794 > .types.setType 11795a11802 > .types.types This means that this commit _adds_ to the API, however I can't find a way to fix these last remaining discrepancies. At least none are _removed_. Test script (run with nix-repl in the PATH): #!/bin/sh set -eux repl() { suff=${1:-} echo "(import ./lib)$suff" \ | nix-repl 2>&1 } attrs_to_check() { repl "${1:-}" \ | tr ';' $'\n' \ | grep "\.\.\." \ | cut -d' ' -f2 \ | sed -e "s/^/${1:-}./" \ | sort } summ() { repl "${1:-}" \ | tr ' ' $'\n' \ | sort \ | uniq } deep_summ() { suff="${1:-}" depth="${2:-4}" depth=$((depth - 1)) summ "$suff" for attr in $(attrs_to_check "$suff" | grep -v "types.types"); do if [ $depth -eq 0 ]; then summ "$attr" | sed -e "s/^/$attr./" else deep_summ "$attr" "$depth" | sed -e "s/^/$attr./" fi done } ( cd nixpkgs #git add . #git commit -m "Auto-commit, sorry" || true git checkout fixed-lib deep_summ > ../fixed-lib git checkout master deep_summ > ../master ) if diff master fixed-lib; then echo "SHALLOW MATCH!" fi ( cd nixpkgs git checkout fixed-lib repl .types )
* lib: introduce imap0, imap1 (#25543)zimbatm2017-07-04
| | | | | | | | | | | | | | | | * lib: introduce imap0, imap1 For historical reasons, imap starts counting at 1 and it's not consistent with the rest of the lib. So for now we split imap into imap0 that starts counting at zero and imap1 that starts counting at 1. And imap is marked as deprecated. See https://github.com/NixOS/nixpkgs/commit/c71e2d42359f9900ea2c290d141c0d606471da16#commitcomment-21873221 * replace uses of lib.imap * lib: move imap to deprecated.nix
* types: add short docstringsNikolay Amiantov2017-05-25
| | | | Fixes #26055
* nixos doc: document coercedTo typeNikolay Amiantov2017-05-24
| | | | | | | Also mention about docs in types.nix and fix a small error in related documentation. Fixes #26055.
* lib: trivial spelling fixesTom Saeger2017-04-19
|
* Get rid of all `with { inherit... }` and just used `let inherit...`John Ericson2017-03-30
| | | | | | The old forms presumably predates, or were made in ignorance of, `let inherit`. This way is better style as the scoping as more lexical, something which Nix can (or might already!) take advantage of.
* lib: fix mixed tab/space indents, trailing whitespace, etcBenjamin Staffin2017-03-11
| | | | | | Nix style seems to have settled on not using spaces between bound variable names and the lambda : so I also tried to make those somewhat more consistent throughout.
* types library: add coercedToNikolay Amiantov2017-02-02
|
* either type: improve merge functionEric Sagnes2016-11-08
|
* module system: extensible option typesEric Sagnes2016-11-06
|
* optionSet type: enable deprecation messageEric Sagnes2016-09-13
|
* Use shell packages to select the user's shellzimbatm2016-06-12
| | | | The string type is still available for backward-compatiblity.
* Improve types.listOf error messageEelco Dolstra2016-05-25
| | | | | | | | | | If an option value is not a list, you now get The option value `bla' in `file.nix' is not a list. rather than value is a string while a list was expected, at .../nixpkgs/lib/lists.nix:49:56
* lib/types: Revert handling submodules for "either"aszlig2016-03-19
| | | | | | | | | | | | | This reverts commit 0f0805b, because @nbp had concerns about whether this would be a good idea and pointed out problems with this. We currently do not have a case where "either" is used in conjunction with submodules, but I'm reverting it anyway to prevent people from adding options using that type in that way. This is now being reviewed in #14053. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* lib/types: Handle submodules for type "either"aszlig2016-03-19
| | | | | | | | | | | | | | | | | So far the "either" type only handled "flat" types, so you couldn't do something like: type = either int (submodule { options = ...; }); Not only caused this the submodule's options not being checked but also not show up in the documentation. This was something we stumbled on with #13916. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @edolstra
* Revert "Add the tool "nixos-typecheck" that can check an option declaration to:"Eelco Dolstra2016-03-01
| | | | | | This reverts commit cad8957eabcbf73062226d28366fd446c15c8737. It breaks NixOps, but more importantly, such major changes to the module system really need to be reviewed.
* Add the tool "nixos-typecheck" that can check an option declaration to:Thomas Strobel2016-02-29
| | | | | | | | | | | | | | - Enforce that an option declaration has a "defaultText" if and only if the type of the option derives from "package", "packageSet" or "nixpkgsConfig" and if a "default" attribute is defined. - Enforce that the value of the "example" attribute is wrapped with "literalExample" if the type of the option derives from "package", "packageSet" or "nixpkgsConfig". - Warn if a "defaultText" is defined in an option declaration if the type of the option does not derive from "package", "packageSet" or "nixpkgsConfig". - Warn if no "type" is defined in an option declaration.
* lib/types: Set name of types.package to "package"aszlig2016-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nobody seems to have noticed this (except @Profpatsch) that options with a "package" type do not get included in the manual. So debugging this was a bit more involving because while generating the manual there is an optionList' attribute built from the collected attributes of all the option declarations. Up to that point everything is fine except if it comes to builtins.toXML, where attributes with { type = "derivation" } won't get included, for example see here: nix-repl> builtins.toXML { type = "derivation"; foo = "bar"; } "<?xml version='1.0' encoding='utf-8'?>\n<expr>\n <derivation> <repeated />\n </derivation>\n</expr>\n" nix-repl> builtins.toXML { type = "somethingelse"; foo = "bar"; } "<?xml version='1.0' encoding='utf-8'?>\n<expr>\n <attrs> <attr name=\"foo\">\n <string value=\"bar\" />\n </attr> <attr name=\"type\">\n <string value=\"somethingelse\" /> </attr>\n </attrs>\n</expr>\n" The following function in libexpr/eval.cc (Nix) is responsible for toXML dropping the attributes: bool EvalState::isDerivation(Value & v) { if (v.type != tAttrs) return false; Bindings::iterator i = v.attrs->find(sType); if (i == v.attrs->end()) return false; forceValue(*i->value); if (i->value->type != tString) return false; return strcmp(i->value->string.s, "derivation") == 0; } So I've renamed this now to "package" which is not only more consistent with the option type but also shouldn't cause similar issues anymore. Tested this on base of b60ceea, because building the dependencies on recent libc/staging changes on master took too long. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Reported-by: Profpatsch <mail@profpatsch.de>
* Use x == null instead of builtins.isNull xIgor Pashev2015-12-04
|
* Allow enum of integers (and any other type)Igor Pashev2015-12-04
| | | | Closes #9826.
* nixos,lib: move environment generation related copy-paste to libJan Malakhovski2015-09-18
|
* Revert change of path typeBenno Fünfstück2015-08-15
| | | | The change caused lots of evaluation errors, since it caused derivations to no longer be valid paths as well.
* types.nix: better error message for non-pathsBenno Fünfstück2015-08-15
| | | | | | | | | | | | | | | | This improves error messages when a set or a list is used where a path was expected. For an example, if you used a package set (as opposed to a single package) in systemPackages before this commit, the error was: ``` cannot coerce a list to a string, at "/home/nixpkgs/lib/types.nix":103:37 ``` Now, the error message reads: ``` The option value `environment.systemPackages' in `/etc/nixos/configuration.nix' is not a list of paths. ```
* Allow options with type "package" to be store pathsEelco Dolstra2015-08-07
| | | | | | | | For example, this allows writing nix.package = /nix/store/786mlvhd17xvcp2r4jmmay6jj4wj6b7f-nix-1.10pre4206_896428c; Also, document types.package in the manual.