mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-11 15:26:03 +03:00
lib/trivial: drop rec
in favor of lib
fixpoint
That way each expression uses the final version of other lib.trivial declarations. For instance, when replacing `versionSuffix` with the string `"fnord"` in a lib overlay, `trivial.version` uses `"fnord"` as suffix now rather than `pre-git`.
This commit is contained in:
parent
bb7921d1d6
commit
78f5ed053a
@ -1,6 +1,18 @@
|
||||
{ lib }:
|
||||
|
||||
rec {
|
||||
let
|
||||
inherit (lib.trivial)
|
||||
isFunction
|
||||
isInt
|
||||
functionArgs
|
||||
pathExists
|
||||
release
|
||||
setFunctionArgs
|
||||
toBaseDigits
|
||||
version
|
||||
versionSuffix
|
||||
warn;
|
||||
in {
|
||||
|
||||
## Simple (higher order) functions
|
||||
|
||||
@ -439,7 +451,7 @@ rec {
|
||||
*/
|
||||
functionArgs = f:
|
||||
if f ? __functor
|
||||
then f.__functionArgs or (lib.functionArgs (f.__functor f))
|
||||
then f.__functionArgs or (functionArgs (f.__functor f))
|
||||
else builtins.functionArgs f;
|
||||
|
||||
/* Check whether something is a function or something
|
||||
|
Loading…
Reference in New Issue
Block a user