mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 15:11:35 +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 )
76 lines
3.2 KiB
Nix
76 lines
3.2 KiB
Nix
# Functions for copying sources to the Nix store.
|
|
{ lib }:
|
|
|
|
rec {
|
|
|
|
# Returns the type of a path: regular (for file), symlink, or directory
|
|
pathType = p: with builtins; getAttr (baseNameOf p) (readDir (dirOf p));
|
|
|
|
# Returns true if the path exists and is a directory, false otherwise
|
|
pathIsDirectory = p: if builtins.pathExists p then (pathType p) == "directory" else false;
|
|
|
|
# Bring in a path as a source, filtering out all Subversion and CVS
|
|
# directories, as well as backup files (*~).
|
|
cleanSourceFilter = name: type: let baseName = baseNameOf (toString name); in ! (
|
|
# Filter out Subversion and CVS directories.
|
|
(type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) ||
|
|
# Filter out editor backup / swap files.
|
|
lib.hasSuffix "~" baseName ||
|
|
builtins.match "^\\.sw[a-z]$" baseName != null ||
|
|
builtins.match "^\\..*\\.sw[a-z]$" baseName != null ||
|
|
|
|
# Filter out generates files.
|
|
lib.hasSuffix ".o" baseName ||
|
|
lib.hasSuffix ".so" baseName ||
|
|
# Filter out nix-build result symlinks
|
|
(type == "symlink" && lib.hasPrefix "result" baseName)
|
|
);
|
|
|
|
cleanSource = builtins.filterSource cleanSourceFilter;
|
|
|
|
# Filter sources by a list of regular expressions.
|
|
#
|
|
# E.g. `src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"]`
|
|
sourceByRegex = src: regexes: builtins.filterSource (path: type:
|
|
let relPath = lib.removePrefix (toString src + "/") (toString path);
|
|
in lib.any (re: builtins.match re relPath != null) regexes) src;
|
|
|
|
# Get all files ending with the specified suffices from the given
|
|
# directory or its descendants. E.g. `sourceFilesBySuffices ./dir
|
|
# [".xml" ".c"]'.
|
|
sourceFilesBySuffices = path: exts:
|
|
let filter = name: type:
|
|
let base = baseNameOf (toString name);
|
|
in type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts;
|
|
in builtins.filterSource filter path;
|
|
|
|
|
|
# Get the commit id of a git repo
|
|
# Example: commitIdFromGitRepo <nixpkgs/.git>
|
|
commitIdFromGitRepo =
|
|
let readCommitFromFile = path: file:
|
|
with builtins;
|
|
let fileName = toString path + "/" + file;
|
|
packedRefsName = toString path + "/packed-refs";
|
|
in if lib.pathExists fileName
|
|
then
|
|
let fileContent = lib.fileContents fileName;
|
|
# Sometimes git stores the commitId directly in the file but
|
|
# sometimes it stores something like: «ref: refs/heads/branch-name»
|
|
matchRef = match "^ref: (.*)$" fileContent;
|
|
in if isNull matchRef
|
|
then fileContent
|
|
else readCommitFromFile path (lib.head matchRef)
|
|
# Sometimes, the file isn't there at all and has been packed away in the
|
|
# packed-refs file, so we have to grep through it:
|
|
else if lib.pathExists packedRefsName
|
|
then
|
|
let fileContent = readFile packedRefsName;
|
|
matchRef = match (".*\n([^\n ]*) " + file + "\n.*") fileContent;
|
|
in if isNull matchRef
|
|
then throw ("Could not find " + file + " in " + packedRefsName)
|
|
else lib.head matchRef
|
|
else throw ("Not a .git directory: " + path);
|
|
in lib.flip readCommitFromFile "HEAD";
|
|
}
|