wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-02 05:11:47 +02:00
Code Activity

Rename doc/manual{src -> source}

Browse source 
This is needed to avoid this
https://github.com/mesonbuild/meson/issues/13774 when we go back to
making our subproject directory `src`.
This commit is contained in:
John Ericson 2024-10-10 12:04:33 -04:00
parent d5c45952ac
commit eb7d7780b1
221 changed files with 75 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/unix/build/local-derivation-goal.cc
View file

@ -3068,7 +3068,7 @@ bool LocalDerivationGoal::isReadDesc(int fd)
StorePath LocalDerivationGoal::makeFallbackPath(OutputNameView outputName)
{
// This is a bogus path type, constructed this way to ensure that it doesn't collide with any other store path
// See doc/manual/src/protocols/store-path.md for details
// See doc/manual/source/protocols/store-path.md for details
// TODO: We may want to separate the responsibilities of constructing the path fingerprint and of actually doing the hashing
auto pathType = "rewrite:" + std::string(drvPath.to_string()) + ":name:" + std::string(outputName);
return worker.store.makeStorePath(
@ -3081,7 +3081,7 @@ StorePath LocalDerivationGoal::makeFallbackPath(OutputNameView outputName)
StorePath LocalDerivationGoal::makeFallbackPath(const StorePath & path)
{
// This is a bogus path type, constructed this way to ensure that it doesn't collide with any other store path
// See doc/manual/src/protocols/store-path.md for details
// See doc/manual/source/protocols/store-path.md for details
auto pathType = "rewrite:" + std::string(drvPath.to_string()) + ":" + std::string(path.to_string());
return worker.store.makeStorePath(
pathType,

2
src/nix/help-stores.md
View file

@ -1 +1 @@
../../doc/manual/src/store/types/index.md.in
../../doc/manual/source/store/types/index.md.in

4
src/nix/package.nix
View file

@ -66,9 +66,9 @@ mkMesonDerivation (finalAttrs: {
../nix-env/buildenv.nix
./get-env.sh
./help-stores.md
../../doc/manual/src/store/types/index.md.in
../../doc/manual/source/store/types/index.md.in
./profiles.md
../../doc/manual/src/command-ref/files/profiles.md
../../doc/manual/source/command-ref/files/profiles.md
# Files
] ++ lib.concatMap

2
src/nix/profiles.md
View file

@ -1 +1 @@
../../doc/manual/src/command-ref/files/profiles.md
../../doc/manual/source/command-ref/files/profiles.md