Rename misc.nix -> deprecated.nix

+1 -2
lib/attrsets.nix
···
inherit (import ./default.nix) fold;
inherit (import ./strings.nix) concatStringsSep;
inherit (import ./lists.nix) concatMap concatLists all deepSeqList;
-
inherit (import ./misc.nix) maybeAttr;
};
rec {
···
foldAttrs = op: nul: list_of_attrs:
fold (n: a:
fold (name: o:
-
o // (listToAttrs [{inherit name; value = op n.${name} (maybeAttr name nul a); }])
+
o // (listToAttrs [{inherit name; value = op n.${name} (a.${name} or nul); }])
) a (attrNames n)
) {} list_of_attrs;
+1 -1
lib/default.nix
···
types = import ./types.nix;
meta = import ./meta.nix;
debug = import ./debug.nix;
-
misc = import ./misc.nix;
+
misc = import ./deprecated.nix;
maintainers = import ./maintainers.nix;
platforms = import ./platforms.nix;
systems = import ./systems.nix;
-2
lib/misc.nix lib/deprecated.nix
···
in
work startSet [] [];
-
genericClosure = builtins.genericClosure or lazyGenericClosure;
-
innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else
innerModifySumArgs f x (a // b);
modifySumArgs = f: x: innerModifySumArgs f x {};
-1
lib/options.nix
···
with import ./trivial.nix;
with import ./lists.nix;
-
with import ./misc.nix;
with import ./attrsets.nix;
with import ./strings.nix;
+2
lib/strings.nix
···
# standard GNU Autoconf scripts.
enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}";
+
# Create a fixed width string with additional prefix to match required width
fixedWidthString = width: filler: str:
let
···
in
assert strw <= width;
if strw == width then str else filler + fixedWidthString reqWidth filler str;
+
# Format a number adding leading zeroes up to fixed width
fixedWidthNumber = width: n: fixedWidthString width "0" (toString n);
+1 -1
lib/trivial.nix
···
inherit (builtins)
pathExists readFile isBool isFunction
isInt add sub lessThan
-
seq deepSeq;
+
seq deepSeq genericClosure;
# Return the Nixpkgs version number.
nixpkgsVersion =