commit 80d9975bd4496412085208ecc7adf9e7d4f023d3 · pyrox.dev/nixpkgs

+2 -1

pkgs/build-support/fetchgit/default.nix

···

       1
       1
        
       {

     

       2
       2
       +
         config,

     

       2
       3
        
         lib,

     

       3
       4
        
         stdenvNoCC,

     

       4
       5
        
         writeText,

     
···

       66
       67
        
             # make this subdirectory the root of the result

     

       67
       68
        
             rootDir ? "",

     

       68
       69
        
             # GIT_CONFIG_GLOBAL (as a file)

     

       69
       69
       -
             gitConfigFile ? null,

     

       70
       70
       +
             gitConfigFile ? config.gitConfigFile,

     

       70
       71
        
           }:

     

       71
       72
        
       

     

       72
       73
        
           /*

+14 -10

pkgs/build-support/fetchgit/tests.nix

···

       7
       7
        
         cacert,

     

       8
       8
        
         nix,

     

       9
       9
        
         closureInfo,

     

       10
       10
       -
         lib,

     

       11
       10
        
         ...

     

       12
       11
        
       }:

     

       13
       12
        
       {

     
···

       196
       195
        
               hash = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY=";

     

       197
       196
        
             };

     

       198
       197
        
       

     

       199
       199
       -
         withGitConfig = testers.invalidateFetcherByDrvHash fetchgit {

     

       200
       200
       -
           name = "fetchgit-with-config";

     

       201
       201
       -
           url = "https://doesntexist.forsure/NixOS/nix";

     

       202
       202
       -
           rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";

     

       203
       203
       -
           sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY=";

     

       204
       204
       -
           gitConfigFile = builtins.toFile "gitconfig" (lib.generators.toGitINI {

     

       205
       205
       -
             url."https://github.com".insteadOf = "https://doesntexist.forsure";

     

       206
       206
       -
           });

     

       207
       207
       -
         };

     

       198
       198
       +
         withGitConfig =

     

       199
       199
       +
           let

     

       200
       200
       +
             pkgs = import ../../.. {

     

       201
       201
       +
               config.gitConfig = {

     

       202
       202
       +
                 url."https://github.com".insteadOf = "https://doesntexist.forsure";

     

       203
       203
       +
               };

     

       204
       204
       +
             };

     

       205
       205
       +
           in

     

       206
       206
       +
           pkgs.testers.invalidateFetcherByDrvHash pkgs.fetchgit {

     

       207
       207
       +
             name = "fetchgit-with-config";

     

       208
       208
       +
             url = "https://doesntexist.forsure/NixOS/nix";

     

       209
       209
       +
             rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";

     

       210
       210
       +
             sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY=";

     

       211
       211
       +
           };

     

       208
       212
        
       }

+34

pkgs/top-level/config.nix

···

       105
       105
        
             '';

     

       106
       106
        
           };

     

       107
       107
        
       

     

       108
       108
       +
           gitConfig = mkOption {

     

       109
       109
       +
             type = types.attrsOf (types.attrsOf types.anything);

     

       110
       110
       +
             description = ''

     

       111
       111
       +
               The default [git configuration](https://git-scm.com/docs/git-config#_variables) for all [`pkgs.fetchgit`](#fetchgit) calls.

     

       112
       112
       +
       

     

       113
       113
       +
               Among many other potential uses, this can be used to override URLs to point to local mirrors.

     

       114
       114
       +
       

     

       115
       115
       +
               Changing this will not cause any rebuilds because `pkgs.fetchgit` produces a [fixed-output derivation](https://nix.dev/manual/nix/stable/glossary.html?highlight=fixed-output%20derivation#gloss-fixed-output-derivation).

     

       116
       116
       +
       

     

       117
       117
       +
               To set the configuration file directly, use the [`gitConfigFile`](#opt-gitConfigFile) option instead.

     

       118
       118
       +
       

     

       119
       119
       +
               To set the configuration file for individual calls, use `fetchurl { gitConfigFile = "..."; }`.

     

       120
       120
       +
             '';

     

       121
       121
       +
             default = { };

     

       122
       122
       +
             example = {

     

       123
       123
       +
               url."https://my-github-mirror.local".insteadOf = [ "https://github.com" ];

     

       124
       124
       +
             };

     

       125
       125
       +
           };

     

       126
       126
       +
       

     

       127
       127
       +
           # A rendered version of gitConfig that can be reused by all pkgs.fetchgit calls

     

       128
       128
       +
           gitConfigFile = mkOption {

     

       129
       129
       +
             type = types.nullOr types.path;

     

       130
       130
       +
             description = ''

     

       131
       131
       +
               A path to a [git configuration](https://git-scm.com/docs/git-config#_variables) file, to be used for all [`pkgs.fetchgit`](#fetchgit) calls.

     

       132
       132
       +
       

     

       133
       133
       +
               This overrides the [`gitConfig`](#opt-gitConfig) option, see its documentation for more details.

     

       134
       134
       +
             '';

     

       135
       135
       +
             default =

     

       136
       136
       +
               if config.gitConfig != { } then

     

       137
       137
       +
                 builtins.toFile "gitconfig" (lib.generators.toGitINI config.gitConfig)

     

       138
       138
       +
               else

     

       139
       139
       +
                 null;

     

       140
       140
       +
           };

     

       141
       141
       +
       

     

       108
       142
        
           doCheckByDefault = mkMassRebuild {

     

       109
       143
        
             feature = "run `checkPhase` by default";

     

       110
       144
        
           };