Keshav Kini a456ccb0c8 lib/types.nix: fix missing inherit ...

I think there was a silent (i.e. semantic) merge conflict between PR #101139 and
PR #100456.  This commit should fix the error, which manifests as follows:

  error: undefined variable 'boolToString' at /home/kkini/src/nixpkgs/lib/types.nix:552:42

2020-10-26 00:50:06 -07:00

..

systems

Merge branch 'staging-next' into staging

2020-09-20 18:41:15 -04:00

tests

lib.splitString: use builtin.split

2020-10-18 13:19:50 +00:00

asserts.nix

…

attrsets.nix

lib/attrsets: add getMan function

2020-06-18 10:16:57 +02:00

cli.nix

lib/cli: mkKey -> mkOptionName, use generators.mkValueStringDefault

2020-01-23 14:47:38 +01:00

customisation.nix

lib.callPackages(With): guard against a repeated mistake

2020-03-12 09:40:15 +01:00

debug.nix

lib: Use Nix's static scope checking, fix error message, optimize

2020-10-22 13:46:47 +02:00

default.nix

lib: Add lib.trace for consistency

2020-10-22 13:46:48 +02:00

deprecated.nix

lib.fake{Sri => Hash}: fix and rename

2020-05-11 23:11:12 +01:00

fetchers.nix

…

filesystem.nix

lib: Add readTree function to filesystem

2020-10-19 16:42:21 -07:00

fixed-points.nix

…

generators.nix

lib/generators.toPretty: functors should print as functions

2020-09-17 18:20:43 +02:00

kernel.nix

Merge pull request #84032 from teto/fix_kernel_merge

2020-05-22 13:32:22 +02:00

licenses.nix

lib.licenses: add Prosperity-3.0.0 license (#97832)

2020-09-12 22:13:27 +02:00

lists.nix

lib: Use Nix's static scope checking, fix error message, optimize

2020-10-22 13:46:47 +02:00

meta.nix

…

minver.nix

Bump minver.nix to 2.2

2020-06-04 13:43:10 +02:00

modules.nix

Merge pull request #101139 from roberth/lib-use-static-scope-checking

2020-10-26 06:59:17 +01:00

options.nix

lib/options.nix: Use merge-friendly inherit syntax

2020-10-22 13:46:48 +02:00

sources.nix

lib/sources.nix: Prefer lib for readFile inherit

2020-10-22 13:57:23 +02:00

strings-with-deps.nix

lib: Use Nix's static scope checking, fix error message, optimize

2020-10-22 13:46:47 +02:00

strings.nix

lib: Use Nix's static scope checking, fix error message, optimize

2020-10-22 13:46:47 +02:00

trivial.nix

lib: add importTOML

2020-09-12 16:37:50 +02:00

types.nix

lib/types.nix: fix missing inherit

2020-10-26 00:50:06 -07:00

versions.nix

lib/versions: expose splitVersion

2019-09-26 17:42:42 +02:00

zip-int-bits.nix

…