commit 285ba51661a27645a252e48e7306686b8260ba94 · pyrox.dev/nixpkgs

doc/release-notes/rl-2511.section.md

···

       244
       244
        
       

     

       245
       245
        
       - `fetchgit`: Add `rootDir` argument to limit the resulting source to one subdirectory of the whole Git repository. Corresponding `--root-dir` option added to `nix-prefetch-git`.

     

       246
       246
        
       

     

       247
       247
       +
       - `nix-prefetch-git`: Added a `--no-add-path` argument to disable adding the path to the store; this is useful when working with a [read-only store](https://nix.dev/manual/nix/2.28/command-ref/new-cli/nix3-help-stores#store-experimental-local-overlay-store-read-only).

     

       248
       248
       +
       

     

       247
       249
        
       - `sftpman` has been updated to version 2, a rewrite in Rust which is mostly backward compatible but does include some changes to the CLI.

     

       248
       250
        
         For more information, [check the project's README](https://github.com/spantaleev/sftpman-rs#is-sftpman-v2-compatible-with-sftpman-v1).

     

       249
       251

+10 -1

pkgs/build-support/fetchgit/nix-prefetch-git

···

       59
       59
        
             --fetch-submodules Fetch submodules.

     

       60
       60
        
             --fetch-tags    Fetch all tags (useful for git describe).

     

       61
       61
        
             --builder       Clone as fetchgit does, but url, rev, and out option are mandatory.

     

       62
       62
       +
             --no-add-path   Do not actually add the contents of the git repo to the store.

     

       62
       63
        
             --root-dir dir  Directory in the repository that will be copied to the output instead of the full repository.

     

       63
       64
        
             --quiet         Only print the final json summary.

     

       64
       65
        
       "

     
···

       91
       92
        
                   --fetch-submodules) fetchSubmodules=true;;

     

       92
       93
        
                   --fetch-tags) fetchTags=true;;

     

       93
       94
        
                   --builder) builder=true;;

     

       95
       95
       +
                   --no-add-path) noAddPath=true;;

     

       94
       96
        
                   --root-dir) argfun=set_rootDir;;

     

       95
       97
        
                   -h|--help) usage; exit;;

     

       96
       98
        
                   *)

     
···

       519
       521
        
               hash=$(nix-hash --type $hashType --base32 "$tmpOut")

     

       520
       522
        
       

     

       521
       523
        
               # Add the downloaded file to the Nix store.

     

       522
       522
       -
               finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpOut")

     

       524
       524
       +
       

     

       525
       525
       +
               if test -z "$noAddPath"; then

     

       526
       526
       +
                   finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpOut") \

     

       527
       527
       +
                       || { printf "maybe try again with \`nix-prefetch-git --no-add-path <...>' ?\n" >&2; exit 1; }

     

       528
       528
       +
               else

     

       529
       529
       +
                   printf "the path for \`%s' has NOT been added to the store\n" "$url" >&2

     

       530
       530
       +
                   finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$hash" "$storePathName")

     

       531
       531
       +
               fi

     

       523
       532
        
       

     

       524
       533
        
               if test -n "$expHash" -a "$expHash" != "$hash"; then

     

       525
       534
        
                   echo "hash mismatch for URL \`$url'. Got \`$hash'; expected \`$expHash'." >&2

+90 -1

pkgs/build-support/fetchgit/tests.nix

···

       1
       1
       -
       { testers, fetchgit, ... }:

     

       1
       1
       +
       {

     

       2
       2
       +
         runCommand,

     

       3
       3
       +
         testers,

     

       4
       4
       +
         fetchgit,

     

       5
       5
       +
         nix-prefetch-git,

     

       6
       6
       +
         jq,

     

       7
       7
       +
         cacert,

     

       8
       8
       +
         nix,

     

       9
       9
       +
         closureInfo,

     

       10
       10
       +
         ...

     

       11
       11
       +
       }:

     

       2
       12
        
       {

     

       3
       13
        
         simple = testers.invalidateFetcherByDrvHash fetchgit {

     

       4
       14
        
           name = "simple-nix-source";

     
···

       105
       115
        
           rootDir = "misc/systemd";

     

       106
       116
        
           sha256 = "sha256-UhxHk4SrXYq7ZDMtXLig5SigpbITrVgkpFTmryuvpcM=";

     

       107
       117
        
         };

     

       118
       118
       +
       

     

       119
       119
       +
         # Make sure that if an expected hash is given and the corresponding store path exists already, no fetch is done

     

       120
       120
       +
         cached-prefetch-avoids-fetch =

     

       121
       121
       +
           let

     

       122
       122
       +
             name = "cached-prefetch-avoids-fetch";

     

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

     

       124
       124
       +
             rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";

     

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

     

       126
       126
       +
             fetched = fetchgit {

     

       127
       127
       +
               inherit

     

       128
       128
       +
                 name

     

       129
       129
       +
                 url

     

       130
       130
       +
                 rev

     

       131
       131
       +
                 sha256

     

       132
       132
       +
                 ;

     

       133
       133
       +
             };

     

       134
       134
       +
           in

     

       135
       135
       +
           runCommand "cached-prefetch-avoids-fetch"

     

       136
       136
       +
             {

     

       137
       137
       +
               nativeBuildInputs = [

     

       138
       138
       +
                 nix-prefetch-git

     

       139
       139
       +
                 nix

     

       140
       140
       +
               ];

     

       141
       141
       +
             }

     

       142
       142
       +
             ''

     

       143
       143
       +
               export NIX_REMOTE=local?root=$(mktemp -d)

     

       144
       144
       +
               nix-store --load-db < ${closureInfo { rootPaths = fetched; }}/registration

     

       145
       145
       +
               nix-prefetch-git --name "${name}" "${url}" "${rev}" "${sha256}" > $out

     

       146
       146
       +
             '';

     

       147
       147
       +
       

     

       148
       148
       +
         prefetch-git-no-add-path =

     

       149
       149
       +
           testers.invalidateFetcherByDrvHash

     

       150
       150
       +
             (

     

       151
       151
       +
               {

     

       152
       152
       +
                 name,

     

       153
       153
       +
                 url,

     

       154
       154
       +
                 rev,

     

       155
       155
       +
                 hash,

     

       156
       156
       +
                 ...

     

       157
       157
       +
               }:

     

       158
       158
       +
               runCommand name

     

       159
       159
       +
                 {

     

       160
       160
       +
                   buildInputs = [

     

       161
       161
       +
                     nix-prefetch-git

     

       162
       162
       +
                     nix

     

       163
       163
       +
                     cacert

     

       164
       164
       +
                     jq

     

       165
       165
       +
                   ];

     

       166
       166
       +
                   outputHashMode = "recursive";

     

       167
       167
       +
                   outputHashAlgo = null;

     

       168
       168
       +
                   outputHash = hash;

     

       169
       169
       +
                   inherit url rev;

     

       170
       170
       +
                 }

     

       171
       171
       +
                 ''

     

       172
       172
       +
                   store_root="$(mktemp -d)"

     

       173
       173
       +
                   prefetch() { NIX_REMOTE="local?root=$store_root" nix-prefetch-git $@ "$url" --rev "$rev" | jq -r .path; }

     

       174
       174
       +
                   path="$(prefetch --no-add-path)"

     

       175
       175
       +
                   if test -e "$store_root/$path"; then

     

       176
       176
       +
                     echo "$path exists in $NIX_REMOTE when it shouldn't" >&2

     

       177
       177
       +
                     exit 1

     

       178
       178
       +
                   fi

     

       179
       179
       +
                   path_added="$(prefetch)"

     

       180
       180
       +
                   if ! test -e "$store_root/$path"; then

     

       181
       181
       +
                     echo "$path_added doesn't exist in NIX_REMOTE when it should" >&2

     

       182
       182
       +
                     exit 1

     

       183
       183
       +
                   fi

     

       184
       184
       +
                   if test "$path" != "$path_added"; then

     

       185
       185
       +
                     echo "Paths are different with and without --no-add-path: $path != $path_added" >&2

     

       186
       186
       +
                     exit 1

     

       187
       187
       +
                   fi

     

       188
       188
       +
                   cp -r "$store_root/$path_added" "$out"

     

       189
       189
       +
                 ''

     

       190
       190
       +
             )

     

       191
       191
       +
             {

     

       192
       192
       +
               name = "nix-prefetch-git-no-add-path";

     

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

     

       194
       194
       +
               rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";

     

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

     

       196
       196
       +
             };

     

       108
       197
        
       }