commit f6b07f0e2f5834b1fd6432a0f4c2bc11096e53ed · 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

···

       545
       545
        
             </listitem>

     

       546
       546
        
             <listitem>

     

       547
       547
        
               <para>

     

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

     

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

     

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

     

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

     

       552
       552
       +
                 strings.

     

       553
       553
       +
               </para>

     

       554
       554
       +
             </listitem>

     

       555
       555
       +
             <listitem>

     

       556
       556
       +
               <para>

     

       548
       557
        
                 <literal>openssh</literal> was updated to version 9.1,

     

       549
       558
        
                 disabling the generation of DSA keys when using

     

       550
       559
        
                 <literal>ssh-keygen -A</literal> as they are insecure. Also,

+2

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

···

       179
       179
        
       

     

       180
       180
        
       - 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.

     

       181
       181
        
       

     

       182
       182
       +
       - 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.

     

       183
       183
       +
       

     

       182
       184
        
       - `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

     

       183
       185
        
       

     

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

+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
        
         };