Merge pull request #242312 from NixOS/doc-lib-render-fixedPoints
doc: Render lib.fixedPoints
This commit is contained in:
commit
e809af74eb
|
@ -11,6 +11,7 @@ let
|
||||||
{ name = "strings"; description = "string manipulation functions"; }
|
{ name = "strings"; description = "string manipulation functions"; }
|
||||||
{ name = "versions"; description = "version string functions"; }
|
{ name = "versions"; description = "version string functions"; }
|
||||||
{ name = "trivial"; description = "miscellaneous functions"; }
|
{ name = "trivial"; description = "miscellaneous functions"; }
|
||||||
|
{ name = "fixedPoints"; baseName = "fixed-points"; description = "explicit recursion functions"; }
|
||||||
{ name = "lists"; description = "list manipulation functions"; }
|
{ name = "lists"; description = "list manipulation functions"; }
|
||||||
{ name = "debug"; description = "debugging functions"; }
|
{ name = "debug"; description = "debugging functions"; }
|
||||||
{ name = "options"; description = "NixOS / nixpkgs option handling"; }
|
{ name = "options"; description = "NixOS / nixpkgs option handling"; }
|
||||||
|
|
|
@ -14,13 +14,16 @@ stdenv.mkDerivation {
|
||||||
buildInputs = [ nixdoc ];
|
buildInputs = [ nixdoc ];
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
function docgen {
|
function docgen {
|
||||||
# TODO: wrap lib.$1 in <literal>, make nixdoc not escape it
|
name=$1
|
||||||
if [[ -e "../lib/$1.nix" ]]; then
|
baseName=$2
|
||||||
nixdoc -c "$1" -d "lib.$1: $2" -l ${locationsJSON} -f "$1.nix" > "$out/$1.md"
|
description=$3
|
||||||
|
# TODO: wrap lib.$name in <literal>, make nixdoc not escape it
|
||||||
|
if [[ -e "../lib/$baseName.nix" ]]; then
|
||||||
|
nixdoc -c "$name" -d "lib.$name: $description" -l ${locationsJSON} -f "$baseName.nix" > "$out/$name.md"
|
||||||
else
|
else
|
||||||
nixdoc -c "$1" -d "lib.$1: $2" -l ${locationsJSON} -f "$1/default.nix" > "$out/$1.md"
|
nixdoc -c "$name" -d "lib.$name: $description" -l ${locationsJSON} -f "$baseName/default.nix" > "$out/$name.md"
|
||||||
fi
|
fi
|
||||||
echo "$out/$1.md" >> "$out/index.md"
|
echo "$out/$name.md" >> "$out/index.md"
|
||||||
}
|
}
|
||||||
|
|
||||||
mkdir -p "$out"
|
mkdir -p "$out"
|
||||||
|
@ -29,8 +32,8 @@ stdenv.mkDerivation {
|
||||||
```{=include=} sections
|
```{=include=} sections
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
${lib.concatMapStrings ({ name, description }: ''
|
${lib.concatMapStrings ({ name, baseName ? name, description }: ''
|
||||||
docgen ${name} ${lib.escapeShellArg description}
|
docgen ${name} ${baseName} ${lib.escapeShellArg description}
|
||||||
'') libsets}
|
'') libsets}
|
||||||
|
|
||||||
echo '```' >> "$out/index.md"
|
echo '```' >> "$out/index.md"
|
||||||
|
|
|
@ -1,34 +1,49 @@
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
rec {
|
rec {
|
||||||
# Compute the fixed point of the given function `f`, which is usually an
|
/*
|
||||||
# attribute set that expects its final, non-recursive representation as an
|
Compute the fixed point of the given function `f`, which is usually an
|
||||||
# argument:
|
attribute set that expects its final, non-recursive representation as an
|
||||||
#
|
argument:
|
||||||
# f = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }
|
|
||||||
#
|
```
|
||||||
# Nix evaluates this recursion until all references to `self` have been
|
f = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }
|
||||||
# resolved. At that point, the final result is returned and `f x = x` holds:
|
```
|
||||||
#
|
|
||||||
# nix-repl> fix f
|
Nix evaluates this recursion until all references to `self` have been
|
||||||
# { bar = "bar"; foo = "foo"; foobar = "foobar"; }
|
resolved. At that point, the final result is returned and `f x = x` holds:
|
||||||
#
|
|
||||||
# Type: fix :: (a -> a) -> a
|
```
|
||||||
#
|
nix-repl> fix f
|
||||||
# See https://en.wikipedia.org/wiki/Fixed-point_combinator for further
|
{ bar = "bar"; foo = "foo"; foobar = "foobar"; }
|
||||||
# details.
|
```
|
||||||
|
|
||||||
|
Type: fix :: (a -> a) -> a
|
||||||
|
|
||||||
|
See https://en.wikipedia.org/wiki/Fixed-point_combinator for further
|
||||||
|
details.
|
||||||
|
*/
|
||||||
fix = f: let x = f x; in x;
|
fix = f: let x = f x; in x;
|
||||||
|
|
||||||
# A variant of `fix` that records the original recursive attribute set in the
|
/*
|
||||||
# result. This is useful in combination with the `extends` function to
|
A variant of `fix` that records the original recursive attribute set in the
|
||||||
# implement deep overriding. See pkgs/development/haskell-modules/default.nix
|
result, in an attribute named `__unfix__`.
|
||||||
# for a concrete example.
|
|
||||||
|
This is useful in combination with the `extends` function to
|
||||||
|
implement deep overriding.
|
||||||
|
*/
|
||||||
fix' = f: let x = f x // { __unfix__ = f; }; in x;
|
fix' = f: let x = f x // { __unfix__ = f; }; in x;
|
||||||
|
|
||||||
# Return the fixpoint that `f` converges to when called recursively, starting
|
/*
|
||||||
# with the input `x`.
|
Return the fixpoint that `f` converges to when called iteratively, starting
|
||||||
#
|
with the input `x`.
|
||||||
# nix-repl> converge (x: x / 2) 16
|
|
||||||
# 0
|
```
|
||||||
|
nix-repl> converge (x: x / 2) 16
|
||||||
|
0
|
||||||
|
```
|
||||||
|
|
||||||
|
Type: (a -> a) -> a -> a
|
||||||
|
*/
|
||||||
converge = f: x:
|
converge = f: x:
|
||||||
let
|
let
|
||||||
x' = f x;
|
x' = f x;
|
||||||
|
@ -37,75 +52,94 @@ rec {
|
||||||
then x
|
then x
|
||||||
else converge f x';
|
else converge f x';
|
||||||
|
|
||||||
# Modify the contents of an explicitly recursive attribute set in a way that
|
/*
|
||||||
# honors `self`-references. This is accomplished with a function
|
Modify the contents of an explicitly recursive attribute set in a way that
|
||||||
#
|
honors `self`-references. This is accomplished with a function
|
||||||
# g = self: super: { foo = super.foo + " + "; }
|
|
||||||
#
|
```nix
|
||||||
# that has access to the unmodified input (`super`) as well as the final
|
g = self: super: { foo = super.foo + " + "; }
|
||||||
# non-recursive representation of the attribute set (`self`). `extends`
|
```
|
||||||
# differs from the native `//` operator insofar as that it's applied *before*
|
|
||||||
# references to `self` are resolved:
|
that has access to the unmodified input (`super`) as well as the final
|
||||||
#
|
non-recursive representation of the attribute set (`self`). `extends`
|
||||||
# nix-repl> fix (extends g f)
|
differs from the native `//` operator insofar as that it's applied *before*
|
||||||
# { bar = "bar"; foo = "foo + "; foobar = "foo + bar"; }
|
references to `self` are resolved:
|
||||||
#
|
|
||||||
# The name of the function is inspired by object-oriented inheritance, i.e.
|
```
|
||||||
# think of it as an infix operator `g extends f` that mimics the syntax from
|
nix-repl> fix (extends g f)
|
||||||
# Java. It may seem counter-intuitive to have the "base class" as the second
|
{ bar = "bar"; foo = "foo + "; foobar = "foo + bar"; }
|
||||||
# argument, but it's nice this way if several uses of `extends` are cascaded.
|
```
|
||||||
#
|
|
||||||
# To get a better understanding how `extends` turns a function with a fix
|
The name of the function is inspired by object-oriented inheritance, i.e.
|
||||||
# point (the package set we start with) into a new function with a different fix
|
think of it as an infix operator `g extends f` that mimics the syntax from
|
||||||
# point (the desired packages set) lets just see, how `extends g f`
|
Java. It may seem counter-intuitive to have the "base class" as the second
|
||||||
# unfolds with `g` and `f` defined above:
|
argument, but it's nice this way if several uses of `extends` are cascaded.
|
||||||
#
|
|
||||||
# extends g f = self: let super = f self; in super // g self super;
|
To get a better understanding how `extends` turns a function with a fix
|
||||||
# = self: let super = { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }; in super // g self super
|
point (the package set we start with) into a new function with a different fix
|
||||||
# = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } // g self { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }
|
point (the desired packages set) lets just see, how `extends g f`
|
||||||
# = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } // { foo = "foo" + " + "; }
|
unfolds with `g` and `f` defined above:
|
||||||
# = self: { foo = "foo + "; bar = "bar"; foobar = self.foo + self.bar; }
|
|
||||||
#
|
```
|
||||||
|
extends g f = self: let super = f self; in super // g self super;
|
||||||
|
= self: let super = { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }; in super // g self super
|
||||||
|
= self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } // g self { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }
|
||||||
|
= self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; } // { foo = "foo" + " + "; }
|
||||||
|
= self: { foo = "foo + "; bar = "bar"; foobar = self.foo + self.bar; }
|
||||||
|
```
|
||||||
|
*/
|
||||||
extends = f: rattrs: self: let super = rattrs self; in super // f self super;
|
extends = f: rattrs: self: let super = rattrs self; in super // f self super;
|
||||||
|
|
||||||
# Compose two extending functions of the type expected by 'extends'
|
/*
|
||||||
# into one where changes made in the first are available in the
|
Compose two extending functions of the type expected by 'extends'
|
||||||
# 'super' of the second
|
into one where changes made in the first are available in the
|
||||||
|
'super' of the second
|
||||||
|
*/
|
||||||
composeExtensions =
|
composeExtensions =
|
||||||
f: g: final: prev:
|
f: g: final: prev:
|
||||||
let fApplied = f final prev;
|
let fApplied = f final prev;
|
||||||
prev' = prev // fApplied;
|
prev' = prev // fApplied;
|
||||||
in fApplied // g final prev';
|
in fApplied // g final prev';
|
||||||
|
|
||||||
# Compose several extending functions of the type expected by 'extends' into
|
/*
|
||||||
# one where changes made in preceding functions are made available to
|
Compose several extending functions of the type expected by 'extends' into
|
||||||
# subsequent ones.
|
one where changes made in preceding functions are made available to
|
||||||
#
|
subsequent ones.
|
||||||
# composeManyExtensions : [packageSet -> packageSet -> packageSet] -> packageSet -> packageSet -> packageSet
|
|
||||||
# ^final ^prev ^overrides ^final ^prev ^overrides
|
```
|
||||||
|
composeManyExtensions : [packageSet -> packageSet -> packageSet] -> packageSet -> packageSet -> packageSet
|
||||||
|
^final ^prev ^overrides ^final ^prev ^overrides
|
||||||
|
```
|
||||||
|
*/
|
||||||
composeManyExtensions =
|
composeManyExtensions =
|
||||||
lib.foldr (x: y: composeExtensions x y) (final: prev: {});
|
lib.foldr (x: y: composeExtensions x y) (final: prev: {});
|
||||||
|
|
||||||
# Create an overridable, recursive attribute set. For example:
|
/*
|
||||||
#
|
Create an overridable, recursive attribute set. For example:
|
||||||
# nix-repl> obj = makeExtensible (self: { })
|
|
||||||
#
|
```
|
||||||
# nix-repl> obj
|
nix-repl> obj = makeExtensible (self: { })
|
||||||
# { __unfix__ = «lambda»; extend = «lambda»; }
|
|
||||||
#
|
nix-repl> obj
|
||||||
# nix-repl> obj = obj.extend (self: super: { foo = "foo"; })
|
{ __unfix__ = «lambda»; extend = «lambda»; }
|
||||||
#
|
|
||||||
# nix-repl> obj
|
nix-repl> obj = obj.extend (self: super: { foo = "foo"; })
|
||||||
# { __unfix__ = «lambda»; extend = «lambda»; foo = "foo"; }
|
|
||||||
#
|
nix-repl> obj
|
||||||
# nix-repl> obj = obj.extend (self: super: { foo = super.foo + " + "; bar = "bar"; foobar = self.foo + self.bar; })
|
{ __unfix__ = «lambda»; extend = «lambda»; foo = "foo"; }
|
||||||
#
|
|
||||||
# nix-repl> obj
|
nix-repl> obj = obj.extend (self: super: { foo = super.foo + " + "; bar = "bar"; foobar = self.foo + self.bar; })
|
||||||
# { __unfix__ = «lambda»; bar = "bar"; extend = «lambda»; foo = "foo + "; foobar = "foo + bar"; }
|
|
||||||
|
nix-repl> obj
|
||||||
|
{ __unfix__ = «lambda»; bar = "bar"; extend = «lambda»; foo = "foo + "; foobar = "foo + bar"; }
|
||||||
|
```
|
||||||
|
*/
|
||||||
makeExtensible = makeExtensibleWithCustomName "extend";
|
makeExtensible = makeExtensibleWithCustomName "extend";
|
||||||
|
|
||||||
# Same as `makeExtensible` but the name of the extending attribute is
|
/*
|
||||||
# customized.
|
Same as `makeExtensible` but the name of the extending attribute is
|
||||||
|
customized.
|
||||||
|
*/
|
||||||
makeExtensibleWithCustomName = extenderName: rattrs:
|
makeExtensibleWithCustomName = extenderName: rattrs:
|
||||||
fix' (self: (rattrs self) // {
|
fix' (self: (rattrs self) // {
|
||||||
${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs);
|
${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs);
|
||||||
|
|
Loading…
Reference in a new issue