public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Move cleanSource to lib.

Browse Source 
svn path=/nixpkgs/trunk/; revision=7668
This commit is contained in:
Eelco Dolstra 2007-01-15 09:20:18 +00:00
parent a6338f1f34
commit e18bd5af62
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/lib/default.nix
View File

@ -82,4 +82,13 @@ rec {
else head xs == head ys && eqLists (tail xs) (tail ys); else head xs == head ys && eqLists (tail xs) (tail ys);
# Bring in a path as a source, filtering out all hidden Subversion
# directories. TODO: filter out backup files (*~) etc.
cleanSource =
let filter = name: type:
type != "directory"
|| baseNameOf (toString name) != ".svn";
in src: builtins.filterSource filter src;
} }

7
pkgs/top-level/all-packages.nix
View File

@ -121,6 +121,8 @@ rec {
useFromStdenv = hasIt: it: alternative: if hasIt then it else alternative; useFromStdenv = hasIt: it: alternative: if hasIt then it else alternative;
lib = library;
library = import ../lib; library = import ../lib;
# Return an attribute from the Nixpkgs configuration file, or # Return an attribute from the Nixpkgs configuration file, or
@ -204,11 +206,6 @@ rec {
# derivations, e.g., "... ${somePkg}/bin/foo ...". # derivations, e.g., "... ${somePkg}/bin/foo ...".
writeText = name: text: runCommand name {inherit text;} "echo \"$text\" > $out"; writeText = name: text: runCommand name {inherit text;} "echo \"$text\" > $out";
# Bring in a path as a source, filtering out all hidden Subversion
# directories. TODO: filter out backup files (*~) etc.
cleanSource = src: builtins.filterSource
(name: baseNameOf (toString name) != ".svn") src;
substituteAll = import ../build-support/substitute/substitute-all.nix { substituteAll = import ../build-support/substitute/substitute-all.nix {
inherit stdenv; inherit stdenv;
}; };