mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 06:31:02 +00:00
152c63c9ff
This does break the API of being able to import any lib file and get its libs, however I'm not sure people did this. I made this while exploring being able to swap out docFn with a stub in #2305, to avoid functor performance problems. I don't know if that is going to move forward (or if it is a problem or not,) but after doing all this work figured I'd put it up anyway :) Two notable advantages to this approach: 1. when a lib inherits another lib's functions, it doesn't automatically get put in to the scope of lib 2. when a lib implements a new obscure functions, it doesn't automatically get put in to the scope of lib Using the test script (later in this commit) I got the following diff on the API: + diff master fixed-lib 11764a11765,11766 > .types.defaultFunctor > .types.defaultTypeMerge 11774a11777,11778 > .types.isOptionType > .types.isType 11781a11786 > .types.mkOptionType 11788a11794 > .types.setType 11795a11802 > .types.types This means that this commit _adds_ to the API, however I can't find a way to fix these last remaining discrepancies. At least none are _removed_. Test script (run with nix-repl in the PATH): #!/bin/sh set -eux repl() { suff=${1:-} echo "(import ./lib)$suff" \ | nix-repl 2>&1 } attrs_to_check() { repl "${1:-}" \ | tr ';' $'\n' \ | grep "\.\.\." \ | cut -d' ' -f2 \ | sed -e "s/^/${1:-}./" \ | sort } summ() { repl "${1:-}" \ | tr ' ' $'\n' \ | sort \ | uniq } deep_summ() { suff="${1:-}" depth="${2:-4}" depth=$((depth - 1)) summ "$suff" for attr in $(attrs_to_check "$suff" | grep -v "types.types"); do if [ $depth -eq 0 ]; then summ "$attr" | sed -e "s/^/$attr./" else deep_summ "$attr" "$depth" | sed -e "s/^/$attr./" fi done } ( cd nixpkgs #git add . #git commit -m "Auto-commit, sorry" || true git checkout fixed-lib deep_summ > ../fixed-lib git checkout master deep_summ > ../master ) if diff master fixed-lib; then echo "SHALLOW MATCH!" fi ( cd nixpkgs git checkout fixed-lib repl .types )
43 lines
1.6 KiB
Nix
43 lines
1.6 KiB
Nix
{ lib }:
|
|
with import ./parse.nix { inherit lib; };
|
|
with lib.attrsets;
|
|
with lib.lists;
|
|
|
|
rec {
|
|
patterns = rec {
|
|
"32bit" = { cpu = { bits = 32; }; };
|
|
"64bit" = { cpu = { bits = 64; }; };
|
|
i686 = { cpu = cpuTypes.i686; };
|
|
x86_64 = { cpu = cpuTypes.x86_64; };
|
|
PowerPC = { cpu = cpuTypes.powerpc; };
|
|
x86 = { cpu = { family = "x86"; }; };
|
|
Arm = { cpu = { family = "arm"; }; };
|
|
Aarch64 = { cpu = { family = "aarch64"; }; };
|
|
Mips = { cpu = { family = "mips"; }; };
|
|
BigEndian = { cpu = { significantByte = significantBytes.bigEndian; }; };
|
|
LittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
|
|
|
|
BSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
|
|
Unix = [ BSD Darwin Linux SunOS Hurd Cygwin ];
|
|
|
|
Darwin = { kernel = kernels.darwin; };
|
|
Linux = { kernel = kernels.linux; };
|
|
SunOS = { kernel = kernels.solaris; };
|
|
FreeBSD = { kernel = kernels.freebsd; };
|
|
Hurd = { kernel = kernels.hurd; };
|
|
NetBSD = { kernel = kernels.netbsd; };
|
|
OpenBSD = { kernel = kernels.openbsd; };
|
|
Windows = { kernel = kernels.windows; };
|
|
Cygwin = { kernel = kernels.windows; abi = abis.cygnus; };
|
|
MinGW = { kernel = kernels.windows; abi = abis.gnu; };
|
|
};
|
|
|
|
matchAnyAttrs = patterns:
|
|
if builtins.isList patterns then attrs: any (pattern: matchAttrs pattern attrs) patterns
|
|
else matchAttrs patterns;
|
|
|
|
predicates = mapAttrs'
|
|
(name: value: nameValuePair ("is" + name) (matchAnyAttrs value))
|
|
patterns;
|
|
}
|