Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc: migrate trivial files to doc-comment format #299986

Merged
merged 4 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions lib/deprecated.nix
Original file line number Diff line number Diff line change
Expand Up @@ -314,12 +314,13 @@ let
else if isInt x then "int"
else "string";

/* deprecated:
/**
# Deprecated

For historical reasons, imap has an index starting at 1.
For historical reasons, imap has an index starting at 1.

But for consistency with the rest of the library we want an index
starting at zero.
But for consistency with the rest of the library we want an index
starting at zero.
*/
imap = imap1;

Expand Down
5 changes: 2 additions & 3 deletions lib/kernel.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ in
unset = { tristate = null; optional = false; };
freeform = x: { freeform = x; optional = false; };

/*
Common patterns/legacy used in common-config/hardened/config.nix
*/

# Common patterns/legacy used in common-config/hardened/config.nix
whenHelpers = version: {
whenAtLeast = ver: mkIf (versionAtLeast version ver);
whenOlder = ver: mkIf (versionOlder version ver);
Expand Down
11 changes: 7 additions & 4 deletions lib/systems/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ let
examples = import ./examples.nix { inherit lib; };
architectures = import ./architectures.nix { inherit lib; };

/*
/**
Elaborated systems contain functions, which means that they don't satisfy
`==` for a lack of reflexivity.

Expand All @@ -45,10 +45,13 @@ let
let removeFunctions = a: filterAttrs (_: v: !isFunction v) a;
in a: b: removeFunctions a == removeFunctions b;

/* List of all Nix system doubles the nixpkgs flake will expose the package set
for. All systems listed here must be supported by nixpkgs as `localSystem`.
/**
List of all Nix system doubles the nixpkgs flake will expose the package set
for. All systems listed here must be supported by nixpkgs as `localSystem`.

**Warning**: This attribute is considered experimental and is subject to change.
:::{.warning}
This attribute is considered experimental and is subject to change.
:::
*/
flakeExposed = import ./flake-systems.nix { };

Expand Down
34 changes: 19 additions & 15 deletions lib/tests/misc.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
/*
Nix evaluation tests for various lib functions.
/**
Nix evaluation tests for various lib functions.

Since these tests are implemented with Nix evaluation, error checking is limited to what `builtins.tryEval` can detect, which is `throw`'s and `abort`'s, without error messages.
If you need to test error messages or more complex evaluations, see ./modules.sh, ./sources.sh or ./filesystem.sh as examples.
Since these tests are implemented with Nix evaluation,
error checking is limited to what `builtins.tryEval` can detect,
which is `throw`'s and `abort`'s, without error messages.

To run these tests:
If you need to test error messages or more complex evaluations, see
`lib/tests/modules.sh`, `lib/tests/sources.sh` or `lib/tests/filesystem.sh` as examples.

[nixpkgs]$ nix-instantiate --eval --strict lib/tests/misc.nix
To run these tests:

If the resulting list is empty, all tests passed.
Alternatively, to run all `lib` tests:
[nixpkgs]$ nix-instantiate --eval --strict lib/tests/misc.nix

[nixpkgs]$ nix-build lib/tests/release.nix
If the resulting list is empty, all tests passed.
Alternatively, to run all `lib` tests:

[nixpkgs]$ nix-build lib/tests/release.nix
*/

let
Expand Down Expand Up @@ -198,10 +202,10 @@ runTests {
};

/*
testOr = {
expr = or true false;
expected = true;
};
testOr = {
expr = or true false;
expected = true;
};
*/

testAnd = {
Expand Down Expand Up @@ -1267,7 +1271,7 @@ runTests {
'';
};

/* right now only invocation check */
# right now only invocation check
testToJSONSimple =
let val = {
foobar = [ "baz" 1 2 3 ];
Expand All @@ -1278,7 +1282,7 @@ runTests {
expected = builtins.toJSON val;
};

/* right now only invocation check */
# right now only invocation check
testToYAMLSimple =
let val = {
list = [ { one = 1; } { two = 2; } ];
Expand Down
4 changes: 2 additions & 2 deletions lib/tests/modules/doRename-condition.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/**
Simulate a migration from a single-instance `services.foo` to a multi instance
`services.foos.<name>` module, where `name = ""` serves as the legacy /
compatibility instance.
Expand All @@ -10,7 +10,7 @@
The relevant scenarios are tested in separate files:
- ./doRename-condition-enable.nix
- ./doRename-condition-no-enable.nix
*/
*/
{ config, lib, ... }:
let
inherit (lib) mkOption mkEnableOption types doRename;
Expand Down
27 changes: 18 additions & 9 deletions lib/types.nix
Original file line number Diff line number Diff line change
Expand Up @@ -328,15 +328,24 @@ rec {
"signedInt${toString bit}" "${toString bit} bit signed integer";

in {
/* An int with a fixed range.
*
* Example:
* (ints.between 0 100).check (-1)
* => false
* (ints.between 0 100).check (101)
* => false
* (ints.between 0 0).check 0
* => true
# TODO: Deduplicate with docs in nixos/doc/manual/development/option-types.section.md
/**
infinisil marked this conversation as resolved.
Show resolved Hide resolved
An int with a fixed range.

# Example
:::{.example}
## `lib.types.ints.between` usage example

```nix
(ints.between 0 100).check (-1)
=> false
(ints.between 0 100).check (101)
=> false
(ints.between 0 0).check 0
=> true
```

:::
*/
inherit between;

Expand Down