commit ec75a30b66748c1a411151b3c5ee477364ee4d14 · pyrox.dev/nixpkgs

+2

lib/sources.nix

···

       17
       17
        
           (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) ||

     

       18
       18
        
           # Filter out backup files.

     

       19
       19
        
           lib.hasSuffix "~" baseName ||

     

       20
       20
       +
           builtins.match "^.*\.sw[a-z]$" baseName != null ||

     

       21
       21
       +
       

     

       20
       22
        
           # Filter out generates files.

     

       21
       23
        
           lib.hasSuffix ".o" baseName ||

     

       22
       24
        
           lib.hasSuffix ".so" baseName ||

+1 -13

nixos/lib/make-disk-image.nix

···

       45
       45
        
           raw   = "img";

     

       46
       46
        
         };

     

       47
       47
        
       

     

       48
       48
       -
         # Copied from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/cd-dvd/channel.nix

     

       49
       49
       -
         # TODO: factor out more cleanly

     

       50
       50
       -
       

     

       51
       51
       -
         # Do not include these things:

     

       52
       52
       -
         #   - The '.git' directory

     

       53
       53
       -
         #   - Result symlinks from nix-build ('result', 'result-2', 'result-bin', ...)

     

       54
       54
       -
         #   - VIM/Emacs swap/backup files ('.swp', '.swo', '.foo.swp', 'foo~', ...)

     

       55
       55
       -
         filterFn = path: type: let basename = baseNameOf (toString path); in

     

       56
       56
       -
           if type == "directory" then basename != ".git"

     

       57
       57
       -
           else if type == "symlink" then builtins.match "^result(|-.*)$" basename == null

     

       58
       58
       -
           else builtins.match "^((|\..*)\.sw[a-z]|.*~)$" basename == null;

     

       59
       59
       -
       

     

       60
       60
       -
         nixpkgs = builtins.filterSource filterFn pkgs.path;

     

       48
       48
       +
         nixpkgs = lib.cleanSource pkgs.path;

     

       61
       49
        
       

     

       62
       50
        
         channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" {} ''

     

       63
       51
        
           mkdir -p $out

+1 -10

nixos/modules/installer/cd-dvd/channel.nix

···

       6
       6
        
       with lib;

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
       -
         # Do not include these things:

     

       10
       10
       -
         #   - The '.git' directory

     

       11
       11
       -
         #   - Result symlinks from nix-build ('result', 'result-2', 'result-bin', ...)

     

       12
       12
       -
         #   - VIM/Emacs swap/backup files ('.swp', '.swo', '.foo.swp', 'foo~', ...)

     

       13
       13
       -
         filterFn = path: type: let basename = baseNameOf (toString path); in

     

       14
       14
       -
           if type == "directory" then basename != ".git"

     

       15
       15
       -
           else if type == "symlink" then builtins.match "^result(|-.*)$" basename == null

     

       16
       16
       -
           else builtins.match "^((|\..*)\.sw[a-z]|.*~)$" basename == null;

     

       17
       17
       -
       

     

       18
       18
       -
         nixpkgs = builtins.filterSource filterFn pkgs.path;

     

       9
       9
       +
         nixpkgs = lib.cleanSource pkgs.path;

     

       19
       10
        
       

     

       20
       11
        
         # We need a copy of the Nix expressions for Nixpkgs and NixOS on the

     

       21
       12
        
         # CD.  These are installed into the "nixos" channel of the root