diff options
| -rw-r--r-- | doc/manual/change-authors.yml | 130 | ||||
| -rw-r--r-- | misc/pre-commit.nix | 12 | ||||
| -rw-r--r-- | src/libcmd/repl.cc | 8 | ||||
| -rw-r--r-- | src/libutil/archive.cc | 9 | ||||
| -rw-r--r-- | src/libutil/archive.hh | 2 |
5 files changed, 84 insertions, 77 deletions
diff --git a/doc/manual/change-authors.yml b/doc/manual/change-authors.yml index 6f0008eea..98a135397 100644 --- a/doc/manual/change-authors.yml +++ b/doc/manual/change-authors.yml @@ -3,109 +3,109 @@ # # It's used for crediting people accurately in release notes. The release notes # script will link to forgejo, then to GitHub if forgejo is not present. -horrors: - display_name: eldritch horrors - forgejo: pennae - github: pennae - -Qyriad: - forgejo: Qyriad - github: Qyriad +9999years: + display_name: wiggles + forgejo: rbt + github: 9999years -jade: - forgejo: jade - github: lf- +Artturin: + github: Artturin -iFreilicht: - github: iFreilicht +DavHau: + github: DavHau -ma27: - forgejo: ma27 - github: ma27 +Kha: + github: Kha Lunaphied: forgejo: Lunaphied github: Lunaphied -9999years: - display_name: wiggles - github: 9999years - forgejo: rbt - -matthewbauer: - github: matthewbauer - -raito: - display_name: Raito Bezarius - github: RaitoBezarius - forgejo: raito - -winter: - github: winterqt - forgejo: winter +Qyriad: + forgejo: Qyriad + github: Qyriad -Kha: - github: Kha +SharzyL: + github: SharzyL -Artturin: - github: Artturin +alois31: + forgejo: alois31 + github: alois31 -thufschmitt: - display_name: Théophane Hufschmitt - github: thufschmitt +artemist: + display_name: Artemis Tosini + forgejo: artemist edolstra: display_name: Eelco Dolstra github: edolstra -roberth: - display_name: Robert Hensing - github: roberth - ericson: display_name: John Ericson github: ericson2314 -tomberek: - display_name: Tom Bereknyei - github: tomberek +horrors: + display_name: eldritch horrors + forgejo: pennae + github: pennae -valentin: - display_name: Valentin Gagarin - github: fricklerhandwerk +iFreilicht: + github: iFreilicht + +jade: + forgejo: jade + github: lf- lovesegfault: github: lovesegfault -yshui: - github: yshui +ma27: + forgejo: ma27 + github: ma27 -ncfavier: - github: ncfavier +matthewbauer: + github: matthewbauer midnightveil: display_name: julia forgejo: midnightveil github: midnightveil +ncfavier: + github: ncfavier + puck: display_name: puck forgejo: puck github: puckipedia -alois31: - forgejo: alois31 - github: alois31 +r-vdp: + github: r-vdp -DavHau: - github: DavHau +raito: + display_name: Raito Bezarius + forgejo: raito + github: RaitoBezarius -SharzyL: - github: SharzyL +roberth: + display_name: Robert Hensing + github: roberth -r-vdp: - github: r-vdp +thufschmitt: + display_name: Théophane Hufschmitt + github: thufschmitt -artemist: - display_name: Artemis Tosini - forgejo: artemist +tomberek: + display_name: Tom Bereknyei + github: tomberek + +valentin: + display_name: Valentin Gagarin + github: fricklerhandwerk + +winter: + forgejo: winter + github: winterqt + +yshui: + github: yshui diff --git a/misc/pre-commit.nix b/misc/pre-commit.nix index ea39bc21d..ed2b152a3 100644 --- a/misc/pre-commit.nix +++ b/misc/pre-commit.nix @@ -66,6 +66,18 @@ pre-commit-run { ${lib.getExe pkgs.build-release-notes} --change-authors doc/manual/change-authors.yml doc/manual/rl-next doc/manual/rl-next-dev ''; }; + change-authors-sorted = { + enable = true; + package = pkgs.yq; + files = ''^doc/manual/change-authors\.yml''; + entry = "${pkgs.writeShellScript "change-authors-sorted" '' + set -euo pipefail + shopt -s inherit_errexit + + echo "changes necessary to sort $1:" + diff -U3 <(${lib.getExe pkgs.yq} -y . "$1") <(${lib.getExe pkgs.yq} -Sy . "$1") + ''}"; + }; check-headers = { enable = true; package = pkgs.check-headers; diff --git a/src/libcmd/repl.cc b/src/libcmd/repl.cc index a74ea8e5f..46b6d57ed 100644 --- a/src/libcmd/repl.cc +++ b/src/libcmd/repl.cc @@ -90,7 +90,8 @@ struct NixRepl Strings loadedFiles; std::function<AnnotatedValues()> getValues; - const static int envSize = 32768; + // Uses 8MiB of memory. It's fine. + const static int envSize = 1 << 20; std::shared_ptr<StaticEnv> staticEnv; Env * env; int displ; @@ -857,6 +858,11 @@ void NixRepl::loadReplOverlays() replInitFilesFunction->determinePos(noPos) ); + // n.b. this does in fact load the stuff into the environment twice (once + // from the superset of the environment returned by repl-overlays and once + // from the thing itself), but it's not fixable because clearEnv here could + // lead to dangling references to the old environment in thunks. + // https://git.lix.systems/lix-project/lix/issues/337#issuecomment-3745 addAttrsToScope(newAttrs); } diff --git a/src/libutil/archive.cc b/src/libutil/archive.cc index 00536c1e1..a18c54ebf 100644 --- a/src/libutil/archive.cc +++ b/src/libutil/archive.cc @@ -389,13 +389,4 @@ void copyNAR(Source & source, Sink & sink) } -void copyPath(const Path & from, const Path & to) -{ - auto source = sinkToSource([&](Sink & sink) { - dumpPath(from, sink); - }); - restorePath(to, *source); -} - - } diff --git a/src/libutil/archive.hh b/src/libutil/archive.hh index 2cf164a41..017b6633c 100644 --- a/src/libutil/archive.hh +++ b/src/libutil/archive.hh @@ -124,8 +124,6 @@ void restorePath(const Path & path, Source & source); */ void copyNAR(Source & source, Sink & sink); -void copyPath(const Path & from, const Path & to); - inline constexpr std::string_view narVersionMagic1 = "nix-archive-1"; |