commit 3a05360e53aa08b29360e5cd094a88c0208076f9 · pyrox.dev/nixpkgs

+4 -4

doc/builders/fetchers.chapter.md

···

       100
       100
        
         name = "hello";

     

       101
       101
        
         src = fetchgit {

     

       102
       102
        
           url = "https://...";

     

       103
       103
       -
           sparseCheckout = ''

     

       104
       104
       -
             directory/to/be/included

     

       105
       105
       -
             another/directory

     

       106
       106
       -
           '';

     

       103
       103
       +
           sparseCheckout = [

     

       104
       104
       +
             "directory/to/be/included"

     

       105
       105
       +
             "another/directory"

     

       106
       106
       +
           ];

     

       107
       107
        
           sha256 = "0000000000000000000000000000000000000000000000000000";

     

       108
       108
        
         };

     

       109
       109
        
       }

+9

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

···

       582
       582
        
             </listitem>

     

       583
       583
        
             <listitem>

     

       584
       584
        
               <para>

     

       585
       585
       +
                 The <literal>fetchgit</literal> fetcher supports sparse

     

       586
       586
       +
                 checkouts via the <literal>sparseCheckout</literal> option.

     

       587
       587
       +
                 This used to accept a multi-line string with

     

       588
       588
       +
                 directories/patterns to check out, but now requires a list of

     

       589
       589
       +
                 strings.

     

       590
       590
       +
               </para>

     

       591
       591
       +
             </listitem>

     

       592
       592
       +
             <listitem>

     

       593
       593
       +
               <para>

     

       585
       594
        
                 <literal>openssh</literal> was updated to version 9.1,

     

       586
       595
        
                 disabling the generation of DSA keys when using

     

       587
       596
        
                 <literal>ssh-keygen -A</literal> as they are insecure. Also,

+2

nixos/doc/manual/release-notes/rl-2211.section.md

···

       191
       191
        
       

     

       192
       192
        
       - The `fetchgit` fetcher now uses [cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalscone_mode_handling) by default for sparse checkouts. [Non-cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalsnon_cone_problems) can be enabled by passing `nonConeMode = true`, but note that non-cone mode is deprecated and this option may be removed alongside a future Git update without notice.

     

       193
       193
        
       

     

       194
       194
       +
       - The `fetchgit` fetcher supports sparse checkouts via the `sparseCheckout` option. This used to accept a multi-line string with directories/patterns to check out, but now requires a list of strings.

     

       195
       195
       +
       

     

       194
       196
        
       - `openssh` was updated to version 9.1, disabling the generation of DSA keys when using `ssh-keygen -A` as they are insecure. Also, `SetEnv` directives in `ssh_config` and `sshd_config` are now first-match-wins

     

       195
       197
        
       

     

       196
       198
        
       - `bsp-layout` no longer uses the command `cycle` to switch to other window layouts, as it got replaced by the commands `previous` and `next`.

+4 -4

pkgs/applications/misc/nerd-font-patcher/default.nix

···

       9
       9
        
           owner = "ryanoasis";

     

       10
       10
        
           repo = "nerd-fonts";

     

       11
       11
        
           rev = "v${version}";

     

       12
       12
       -
           sparseCheckout = ''

     

       13
       13
       -
             font-patcher

     

       14
       14
       -
             /src/glyphs

     

       15
       15
       -
           '';

     

       12
       12
       +
           sparseCheckout = [

     

       13
       13
       +
             "font-patcher"

     

       14
       14
       +
             "/src/glyphs"

     

       15
       15
       +
           ];

     

       16
       16
        
           sha256 = "sha256-boZUd1PM8puc9BTgOwCJpkfk6VMdXLsIyp+fQmW/ZqI=";

     

       17
       17
        
         };

     

       18
       18

+11 -3

pkgs/build-support/fetchgit/default.nix

···

       15
       15
        
       { url, rev ? "HEAD", md5 ? "", sha256 ? "", hash ? "", leaveDotGit ? deepClone

     

       16
       16
        
       , fetchSubmodules ? true, deepClone ? false

     

       17
       17
        
       , branchName ? null

     

       18
       18
       -
       , sparseCheckout ? ""

     

       18
       18
       +
       , sparseCheckout ? []

     

       19
       19
        
       , nonConeMode ? false

     

       20
       20
        
       , name ? urlToName url rev

     

       21
       21
        
       , # Shell code executed after the file has been fetched

     
···

       55
       55
        
       */

     

       56
       56
        
       

     

       57
       57
        
       assert deepClone -> leaveDotGit;

     

       58
       58
       -
       assert nonConeMode -> (sparseCheckout != "");

     

       58
       58
       +
       assert nonConeMode -> !(sparseCheckout == "" || sparseCheckout == []);

     

       59
       59
        
       

     

       60
       60
        
       if md5 != "" then

     

       61
       61
        
         throw "fetchgit does not support md5 anymore, please use sha256"

     

       62
       62
        
       else if hash != "" && sha256 != "" then

     

       63
       63
        
         throw "Only one of sha256 or hash can be set"

     

       64
       64
        
       else

     

       65
       65
       +
       # Added 2022-11-12

     

       66
       66
       +
       lib.warnIf (builtins.isString sparseCheckout)

     

       67
       67
       +
         "Please provide directories/patterns for sparse checkout as a list of strings. Support for passing a (multi-line) string is deprecated and will be removed in the next release."

     

       65
       68
        
       stdenvNoCC.mkDerivation {

     

       66
       69
        
         inherit name;

     

       67
       70
        
         builder = ./builder.sh;

     
···

       79
       82
        
         else

     

       80
       83
        
           lib.fakeSha256;

     

       81
       84
        
       

     

       82
       82
       -
         inherit url rev leaveDotGit fetchLFS fetchSubmodules deepClone branchName sparseCheckout nonConeMode postFetch;

     

       85
       85
       +
         # git-sparse-checkout(1) says:

     

       86
       86
       +
         # > When the --stdin option is provided, the directories or patterns are read

     

       87
       87
       +
         # > from standard in as a newline-delimited list instead of from the arguments.

     

       88
       88
       +
         sparseCheckout = if builtins.isString sparseCheckout then sparseCheckout else builtins.concatStringsSep "\n" sparseCheckout;

     

       89
       89
       +
       

     

       90
       90
       +
         inherit url rev leaveDotGit fetchLFS fetchSubmodules deepClone branchName nonConeMode postFetch;

     

       83
       91
        
       

     

       84
       92
        
         postHook = if netrcPhase == null then null else ''

     

       85
       93
        
           ${netrcPhase}

+8 -8

pkgs/build-support/fetchgit/tests.nix

···

       12
       12
        
           name = "nix-source";

     

       13
       13
        
           url = "https://github.com/NixOS/nix";

     

       14
       14
        
           rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";

     

       15
       15
       -
           sparseCheckout = ''

     

       16
       16
       -
             src

     

       17
       17
       -
             tests

     

       18
       18
       -
           '';

     

       15
       15
       +
           sparseCheckout = [

     

       16
       16
       +
             "src"

     

       17
       17
       +
             "tests"

     

       18
       18
       +
           ];

     

       19
       19
        
           sha256 = "sha256-g1PHGTWgAcd/+sXHo1o6AjVWCvC6HiocOfMbMh873LQ=";

     

       20
       20
        
         };

     

       21
       21
        
       

     
···

       23
       23
        
           name = "nix-source";

     

       24
       24
        
           url = "https://github.com/NixOS/nix";

     

       25
       25
        
           rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";

     

       26
       26
       -
           sparseCheckout = ''

     

       27
       27
       -
             src

     

       28
       28
       -
             tests

     

       29
       29
       -
           '';

     

       26
       26
       +
           sparseCheckout = [

     

       27
       27
       +
             "src"

     

       28
       28
       +
             "tests"

     

       29
       29
       +
           ];

     

       30
       30
        
           nonConeMode = true;

     

       31
       31
        
           sha256 = "sha256-FknO6C/PSnMPfhUqObD4vsW4PhkwdmPa9blNzcNvJQ4=";

     

       32
       32
        
         };

+2 -2

pkgs/build-support/fetchgithub/default.nix

···

       3
       3
        
       { owner, repo, rev, name ? "source"

     

       4
       4
        
       , fetchSubmodules ? false, leaveDotGit ? null

     

       5
       5
        
       , deepClone ? false, private ? false, forceFetchGit ? false

     

       6
       6
       -
       , sparseCheckout ? ""

     

       6
       6
       +
       , sparseCheckout ? []

     

       7
       7
        
       , githubBase ? "github.com", varPrefix ? null

     

       8
       8
        
       , meta ? { }

     

       9
       9
        
       , ... # For hash agility

     
···

       24
       24
        
         };

     

       25
       25
        
         passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "forceFetchGit" "private" "githubBase" "varPrefix" ];

     

       26
       26
        
         varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_";

     

       27
       27
       -
         useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || (sparseCheckout != "");

     

       27
       27
       +
         useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || !(sparseCheckout == "" || sparseCheckout == []);

     

       28
       28
        
         # We prefer fetchzip in cases we don't need submodules as the hash

     

       29
       29
        
         # is more stable in that case.

     

       30
       30
        
         fetcher = if useFetchGit then fetchgit else fetchzip;

+1 -1

pkgs/data/fonts/noto-fonts/default.nix

···

       71
       71
        
               owner = "googlefonts";

     

       72
       72
        
               repo = "noto-cjk";

     

       73
       73
        
               inherit rev sha256;

     

       74
       74
       -
               sparseCheckout = "${typeface}/Variable/OTC";

     

       74
       74
       +
               sparseCheckout = [ "${typeface}/Variable/OTC" ];

     

       75
       75
        
             };

     

       76
       76
        
       

     

       77
       77
        
             installPhase = ''

+3 -3

pkgs/data/icons/beauty-line-icon-theme/default.nix

···

       18
       18
        
           owner = "gvolpe";

     

       19
       19
        
           repo = pname;

     

       20
       20
        
           rev = version;

     

       21
       21
       -
           sparseCheckout = ''

     

       22
       22
       -
             BeautyLine-V3

     

       23
       23
       -
           '';

     

       21
       21
       +
           sparseCheckout = [

     

       22
       22
       +
             "BeautyLine-V3"

     

       23
       23
       +
           ];

     

       24
       24
        
           sha256 = "sha256-IkkypAj250+OXbf19TampCnqYsSbJVIjeYlxJoyhpzk=";

     

       25
       25
        
         };

     

       26
       26

+1 -1

pkgs/data/misc/colemak-dh/default.nix

···

       12
       12
        
           repo  = "mod-dh";

     

       13
       13
        
           rev = "e846a5bd24d59ed15ba70b3a9d5363a38ca51d09";

     

       14
       14
        
           sha256  = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks=";

     

       15
       15
       -
           sparseCheckout = "console";

     

       15
       15
       +
           sparseCheckout = [ "console" ];

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         phases = [ "unpackPhase" "installPhase" ];

+1 -1

pkgs/games/itch/default.nix

···

       41
       41
        
               repo = pname;

     

       42
       42
        
               rev = "v${version}";

     

       43
       43
        
               hash = "sha256-DZBmf8fe0zw5uiQjNKXw8g/vU2hjNDa87z/7XuhyXog=";

     

       44
       44
       -
               inherit sparseCheckout;

     

       44
       44
       +
               sparseCheckout = [ sparseCheckout ];

     

       45
       45
        
             } + sparseCheckout;

     

       46
       46
        
       

     

       47
       47
        
         nativeBuildInputs = [ copyDesktopItems makeWrapper ];