Merge pull request #28722 from copumpkin/filterSource-cleanup

Deduplicate some filterSource invocations

Changed files
+4 -23
lib
nixos
lib
modules
installer
cd-dvd
+2
lib/sources.nix
···
(type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) ||
# Filter out backup files.
lib.hasSuffix "~" baseName ||
# Filter out generates files.
lib.hasSuffix ".o" baseName ||
lib.hasSuffix ".so" baseName ||
···
(type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) ||
# Filter out backup files.
lib.hasSuffix "~" baseName ||
+
builtins.match "^.*\.sw[a-z]$" baseName != null ||
+
# Filter out generates files.
lib.hasSuffix ".o" baseName ||
lib.hasSuffix ".so" baseName ||
+1 -13
nixos/lib/make-disk-image.nix
···
raw = "img";
};
-
# Copied from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/cd-dvd/channel.nix
-
# TODO: factor out more cleanly
-
-
# Do not include these things:
-
# - The '.git' directory
-
# - Result symlinks from nix-build ('result', 'result-2', 'result-bin', ...)
-
# - VIM/Emacs swap/backup files ('.swp', '.swo', '.foo.swp', 'foo~', ...)
-
filterFn = path: type: let basename = baseNameOf (toString path); in
-
if type == "directory" then basename != ".git"
-
else if type == "symlink" then builtins.match "^result(|-.*)$" basename == null
-
else builtins.match "^((|\..*)\.sw[a-z]|.*~)$" basename == null;
-
-
nixpkgs = builtins.filterSource filterFn pkgs.path;
channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" {} ''
mkdir -p $out
···
raw = "img";
};
+
nixpkgs = lib.cleanSource pkgs.path;
channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" {} ''
mkdir -p $out
+1 -10
nixos/modules/installer/cd-dvd/channel.nix
···
with lib;
let
-
# Do not include these things:
-
# - The '.git' directory
-
# - Result symlinks from nix-build ('result', 'result-2', 'result-bin', ...)
-
# - VIM/Emacs swap/backup files ('.swp', '.swo', '.foo.swp', 'foo~', ...)
-
filterFn = path: type: let basename = baseNameOf (toString path); in
-
if type == "directory" then basename != ".git"
-
else if type == "symlink" then builtins.match "^result(|-.*)$" basename == null
-
else builtins.match "^((|\..*)\.sw[a-z]|.*~)$" basename == null;
-
-
nixpkgs = builtins.filterSource filterFn pkgs.path;
# We need a copy of the Nix expressions for Nixpkgs and NixOS on the
# CD. These are installed into the "nixos" channel of the root
···
with lib;
let
+
nixpkgs = lib.cleanSource pkgs.path;
# We need a copy of the Nix expressions for Nixpkgs and NixOS on the
# CD. These are installed into the "nixos" channel of the root