-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix conflicts in lazy trees from master #14
base: lazy-trees
Are you sure you want to change the base?
Fix conflicts in lazy trees from master #14
Commits on Nov 27, 2023
-
Evaluate nix-shell -i args relative to script
When writing a shebang script, you expect your path to be relative to the script, not the cwd. We previously handled this correctly for relative file paths, but not for expressions. This handles both -p & -E args. My understanding is this should be what we want in any cases I can think of - people run scripts from many different working directories. @edolstra is there any reason to handle -p args differently in this case? Fixes NixOS#4232
Configuration menu - View commit details
-
Copy full SHA for 0402336 - Browse repository at this point
Copy the full SHA 0402336View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9a46411 - Browse repository at this point
Copy the full SHA 9a46411View commit details
Commits on Nov 28, 2023
-
Configuration menu - View commit details
-
Copy full SHA for f66f498 - Browse repository at this point
Copy the full SHA f66f498View commit details
Commits on Jun 11, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 35bdb9c - Browse repository at this point
Copy the full SHA 35bdb9cView commit details -
Update tests/functional/tarball.sh
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for bd37a70 - Browse repository at this point
Copy the full SHA bd37a70View commit details
Commits on Jun 12, 2024
-
Update src/libfetchers/git-utils.cc
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for efd4bf6 - Browse repository at this point
Copy the full SHA efd4bf6View commit details
Commits on Jun 17, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 68b8a28 - Browse repository at this point
Copy the full SHA 68b8a28View commit details -
Configuration menu - View commit details
-
Copy full SHA for 316b58d - Browse repository at this point
Copy the full SHA 316b58dView commit details
Commits on Jul 1, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 992912f - Browse repository at this point
Copy the full SHA 992912fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1fac22b - Browse repository at this point
Copy the full SHA 1fac22bView commit details -
Configuration menu - View commit details
-
Copy full SHA for a409c1a - Browse repository at this point
Copy the full SHA a409c1aView commit details -
Configuration menu - View commit details
-
Copy full SHA for f032956 - Browse repository at this point
Copy the full SHA f032956View commit details
Commits on Jul 6, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 1318135 - Browse repository at this point
Copy the full SHA 1318135View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5c367ec - Browse repository at this point
Copy the full SHA 5c367ecView commit details -
Configuration menu - View commit details
-
Copy full SHA for e9479b2 - Browse repository at this point
Copy the full SHA e9479b2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 76245ff - Browse repository at this point
Copy the full SHA 76245ffView commit details -
Configuration menu - View commit details
-
Copy full SHA for 32fb127 - Browse repository at this point
Copy the full SHA 32fb127View commit details -
Configuration menu - View commit details
-
Copy full SHA for a22f8b5 - Browse repository at this point
Copy the full SHA a22f8b5View commit details -
Configuration menu - View commit details
-
Copy full SHA for b865625 - Browse repository at this point
Copy the full SHA b865625View commit details -
Configuration menu - View commit details
-
Copy full SHA for afbe7c3 - Browse repository at this point
Copy the full SHA afbe7c3View commit details -
Merge remote-tracking branch 'matthewbauer/nix-shell-relative-shebang…
…' into more-nix-shell
Configuration menu - View commit details
-
Copy full SHA for 8838f5c - Browse repository at this point
Copy the full SHA 8838f5cView commit details -
Configuration menu - View commit details
-
Copy full SHA for d5854f3 - Browse repository at this point
Copy the full SHA d5854f3View commit details -
Configuration menu - View commit details
-
Copy full SHA for f5b59fb - Browse repository at this point
Copy the full SHA f5b59fbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6c6d526 - Browse repository at this point
Copy the full SHA 6c6d526View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6959ac1 - Browse repository at this point
Copy the full SHA 6959ac1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4c59d6e - Browse repository at this point
Copy the full SHA 4c59d6eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 63262e7 - Browse repository at this point
Copy the full SHA 63262e7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 73602a7 - Browse repository at this point
Copy the full SHA 73602a7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2f1fada - Browse repository at this point
Copy the full SHA 2f1fadaView commit details -
Configuration menu - View commit details
-
Copy full SHA for c4a20a4 - Browse repository at this point
Copy the full SHA c4a20a4View commit details
Commits on Jul 7, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 0f8a655 - Browse repository at this point
Copy the full SHA 0f8a655View commit details -
tests/functional/nix-shell.sh: Fix Polo test for VM test
It is unclear to me why this worked when not in a VM test, but the explanation would be in the part of nix-shell we're getting rid of with the devShell attribute.
Configuration menu - View commit details
-
Copy full SHA for e1106b4 - Browse repository at this point
Copy the full SHA e1106b4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3e424b1 - Browse repository at this point
Copy the full SHA 3e424b1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 193dd5d - Browse repository at this point
Copy the full SHA 193dd5dView commit details
Commits on Jul 8, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 48804cf - Browse repository at this point
Copy the full SHA 48804cfView commit details -
Remove the Hydra status check workflow
I'm sick of receiving an email about this every 30 minutes.
Configuration menu - View commit details
-
Copy full SHA for ab0b54b - Browse repository at this point
Copy the full SHA ab0b54bView commit details -
Configuration menu - View commit details
-
Copy full SHA for c5284a8 - Browse repository at this point
Copy the full SHA c5284a8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6e5cec2 - Browse repository at this point
Copy the full SHA 6e5cec2View commit details -
Merge pull request NixOS#11063 from obsidiansystems/config-expr
Forgot to include `config-expr.hh` in two places
Configuration menu - View commit details
-
Copy full SHA for 1439de8 - Browse repository at this point
Copy the full SHA 1439de8View commit details -
Merge pull request NixOS#11064 from obsidiansystems/header-generater
Use a meson "generator" to deduplicate `.gen.hh` creation
Configuration menu - View commit details
-
Copy full SHA for f1d88e0 - Browse repository at this point
Copy the full SHA f1d88e0View commit details -
Package the Nix CLI with Meson
Co-Authored-By: Qyriad <qyriad@qyriad.me>
Configuration menu - View commit details
-
Copy full SHA for 7a6269b - Browse repository at this point
Copy the full SHA 7a6269bView commit details
Commits on Jul 9, 2024
-
Merge pull request NixOS#11065 from DeterminateSystems/remove-hydra-s…
…tatus-check Remove the Hydra status check workflow
Configuration menu - View commit details
-
Copy full SHA for d69fcbc - Browse repository at this point
Copy the full SHA d69fcbcView commit details -
Merge pull request NixOS#11060 from obsidiansystems/meson-nix
Package the Nix CLI with Meson
Configuration menu - View commit details
-
Copy full SHA for 3755493 - Browse repository at this point
Copy the full SHA 3755493View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4c78850 - Browse repository at this point
Copy the full SHA 4c78850View commit details -
Merge pull request NixOS#11071 from DeterminateSystems/remove-stray-line
Remove reference to check-hydra-status
Configuration menu - View commit details
-
Copy full SHA for 142e566 - Browse repository at this point
Copy the full SHA 142e566View commit details
Commits on Jul 10, 2024
-
Configuration menu - View commit details
-
Copy full SHA for d942d50 - Browse repository at this point
Copy the full SHA d942d50View commit details -
Configuration menu - View commit details
-
Copy full SHA for c4e3e2d - Browse repository at this point
Copy the full SHA c4e3e2dView commit details
Commits on Jul 11, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 8642075 - Browse repository at this point
Copy the full SHA 8642075View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4fd8f19 - Browse repository at this point
Copy the full SHA 4fd8f19View commit details -
Merge pull request NixOS#11077 from hercules-ci/support-hardlinks-in-…
…tarballs Support hardlinks in tarballs
Configuration menu - View commit details
-
Copy full SHA for 426e2af - Browse repository at this point
Copy the full SHA 426e2afView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6f5f741 - Browse repository at this point
Copy the full SHA 6f5f741View commit details -
Configuration menu - View commit details
-
Copy full SHA for bb312a7 - Browse repository at this point
Copy the full SHA bb312a7View commit details -
packaging: Set darwinMinVersion to fix x86_64-darwin build
Ported from NixOS/nixpkgs#326172 Co-authored-by: Emily <vcs@emily.moe>
Configuration menu - View commit details
-
Copy full SHA for 0395ff9 - Browse repository at this point
Copy the full SHA 0395ff9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 87323a5 - Browse repository at this point
Copy the full SHA 87323a5View commit details -
Merge pull request NixOS#11081 from DeterminateSystems/remove-dead-code
Remove unused InstallableFlake::getFlakeOutputs()
Configuration menu - View commit details
-
Copy full SHA for 0363dbf - Browse repository at this point
Copy the full SHA 0363dbfView commit details -
SymbolStr: Remove std::string conversion
This refactoring allows the symbol table to be stored as something other than std::strings.
Configuration menu - View commit details
-
Copy full SHA for 6108055 - Browse repository at this point
Copy the full SHA 6108055View commit details
Commits on Jul 12, 2024
-
Merge pull request NixOS#11082 from DeterminateSystems/symbol-table-s…
…tring-view SymbolStr: Remove std::string conversion
Configuration menu - View commit details
-
Copy full SHA for b57c361 - Browse repository at this point
Copy the full SHA b57c361View commit details -
Add BaseError assignment operators
The move assignment was implicitly generated and used in src/libstore/build/goal.cc:90:22: 90 | this->ex = std::move(*ex); Clang warns about this generated method being deprecated, so making them explicit fixes the warning.
Configuration menu - View commit details
-
Copy full SHA for f070d68 - Browse repository at this point
Copy the full SHA f070d68View commit details -
No global settings in
libnixfetchers
andlibnixflake
Progress on NixOS#5638 There are still a global fetcher and eval settings, but they are pushed down into `libnixcmd`, which is a lot less bad a place for this sort of thing. Continuing process pioneered in 52bfccf.
Configuration menu - View commit details
-
Copy full SHA for 3fc77f2 - Browse repository at this point
Copy the full SHA 3fc77f2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8df041c - Browse repository at this point
Copy the full SHA 8df041cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 27eaeeb - Browse repository at this point
Copy the full SHA 27eaeebView commit details -
Merge pull request NixOS#11007 from obsidiansystems/push-down-fetcher…
…-flake-settings No global settings in `libnixfetchers` and `libnixflake`
Configuration menu - View commit details
-
Copy full SHA for dfb169c - Browse repository at this point
Copy the full SHA dfb169cView commit details -
Merge pull request NixOS#11089 from NixOS/warnings-includes
Fix warnings and optimize includes
Configuration menu - View commit details
-
Copy full SHA for 337a5a2 - Browse repository at this point
Copy the full SHA 337a5a2View commit details -
Fix stackoverflow during doc generation
On some systems, previous usage of `match` may cause a stackoverflow (presumably due to the large size of the match result). Avoid this by (ab)using `replaceStrings` to test for containment without using regexes, thereby avoiding the issue. The causal configuration seems to be the stack size hard limit, which e.g. Amazon Linux sets, whereas most Linux distros leave unlimited. Match the fn name to similar fn in nixpkgs.lib, but different implementation that does not use `match`. This impl gives perhaps unexpected results when the needle is `""`, but the scope of this is narrow and that case is a bit odd anyway. This makes for some duplication-of-work as we do a different `replaceStrings` if this one is true, but this only runs during doc generation at build time so has no runtime impact. See NixOS#11085 for details.
Configuration menu - View commit details
-
Copy full SHA for 51a12b3 - Browse repository at this point
Copy the full SHA 51a12b3View commit details -
Remove unused operator<=>'s that darwin can't generate
It was complaining *a lot*, with dozens of MB of logs.
Configuration menu - View commit details
-
Copy full SHA for 11a6db5 - Browse repository at this point
Copy the full SHA 11a6db5View commit details -
Merge pull request NixOS#11090 from amarshall/fix-stackoverflow-build
Fix stackoverflow during doc generation
Configuration menu - View commit details
-
Copy full SHA for 6c5d2a1 - Browse repository at this point
Copy the full SHA 6c5d2a1View commit details -
Configuration menu - View commit details
-
Copy full SHA for cdc23b6 - Browse repository at this point
Copy the full SHA cdc23b6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 750ba9f - Browse repository at this point
Copy the full SHA 750ba9fView commit details -
Merge pull request NixOS#11091 from NixOS/darwin-no-map-spaceship
Remove unused `operator<=>`'s that darwin can't generate
Configuration menu - View commit details
-
Copy full SHA for 2a95a2d - Browse repository at this point
Copy the full SHA 2a95a2dView commit details -
Eval cache: fix cache regressions
- Fix eval cache not being persisted in `nix develop` (since NixOS#10570) - Don't attempt to commit cache transaction if there is no active transaction, which will spew errors in edge cases - Drive-by: trivial typo fix
Configuration menu - View commit details
-
Copy full SHA for e764ed3 - Browse repository at this point
Copy the full SHA e764ed3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6c4470e - Browse repository at this point
Copy the full SHA 6c4470eView commit details -
Remove
comparator.hh
and switch to<=>
in a bunch of placesKnown behavior changes: - `MemorySourceAccessor`'s comparison operators no longer forget to compare the `SourceAccessor` base class. Progress on NixOS#10832 What remains for that issue is hopefully much easier!
Configuration menu - View commit details
-
Copy full SHA for bc83b9d - Browse repository at this point
Copy the full SHA bc83b9dView commit details -
Merge pull request NixOS#10838 from obsidiansystems/spaceship-no-comp…
…arator Remove `comparator.hh` and switch to `<=>` in a bunch of places
Configuration menu - View commit details
-
Copy full SHA for db3e99d - Browse repository at this point
Copy the full SHA db3e99dView commit details
Commits on Jul 13, 2024
-
Merge pull request NixOS#11080 from NixOS/fix-build-x86_64-darwin-minSDK
packaging: Set darwinMinVersion to fix x86_64-darwin build
Configuration menu - View commit details
-
Copy full SHA for b1effc9 - Browse repository at this point
Copy the full SHA b1effc9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1a8defd - Browse repository at this point
Copy the full SHA 1a8defdView commit details -
dropEmptyInitThenConcatStringSep: Check that we don't drop...
... initial empty strings. The tests pass, which is encouraging.
Configuration menu - View commit details
-
Copy full SHA for 79eb0ad - Browse repository at this point
Copy the full SHA 79eb0adView commit details -
Add fresh concatStringsSep without bug
The buggy version was previously renamed to dropEmptyInitThenConcatStringsSep
Configuration menu - View commit details
-
Copy full SHA for a681d35 - Browse repository at this point
Copy the full SHA a681d35View commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: diagnostics and…
… docs These are non-critical, so their behavior is ok to change. Dropping empty items is not needed and usually not expected.
Configuration menu - View commit details
-
Copy full SHA for ea966a7 - Browse repository at this point
Copy the full SHA ea966a7View commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: preserve empty …
…attr The empty attribute name should not be dropped from attribute paths. Rendering attribute paths with concatStringsSep is lossy and wrong, but this is just a first improvement while dealing with the dropEmptyInitThenConcatStringsSep problem.
Configuration menu - View commit details
-
Copy full SHA for 39878c8 - Browse repository at this point
Copy the full SHA 39878c8View commit details -
NIX_REMOTE_SYSTEMS: actually support multiple :-separated entries
Bug not reported in 6 years, but here you go. Also it is safe to switch to normal concatStringsSep behavior because tokenizeString does not produce empty items.
Configuration menu - View commit details
-
Copy full SHA for 3f37785 - Browse repository at this point
Copy the full SHA 3f37785View commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: sigs are non-empty
The sigs field is produced by tokenizeStrings, which does not return empty strings.
Configuration menu - View commit details
-
Copy full SHA for 75dde71 - Browse repository at this point
Copy the full SHA 75dde71View commit details -
Configuration menu - View commit details
-
Copy full SHA for 608a425 - Browse repository at this point
Copy the full SHA 608a425View commit details -
Configuration menu - View commit details
-
Copy full SHA for d3e49ac - Browse repository at this point
Copy the full SHA d3e49acView commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: output name emp…
…ty not feasible I don't think it's completely impossible, but I can't construct one easily as derivationStrict seems to (re)tokenize the outputs attribute, dropping the empty output. It's not a scenario we have to account for here.
Configuration menu - View commit details
-
Copy full SHA for 49d100b - Browse repository at this point
Copy the full SHA 49d100bView commit details -
Configuration menu - View commit details
-
Copy full SHA for f1966e2 - Browse repository at this point
Copy the full SHA f1966e2View commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: feature should …
…not be empty (System) features are unlikely to be empty strings, but when they come in through structuredAttrs, they probably can. I don't think this means we should drop them, but most likely they will be dropped after this because next time they'll be parsed with tokenizeString. TODO: We should forbid empty features.
Configuration menu - View commit details
-
Copy full SHA for e64643b - Browse repository at this point
Copy the full SHA e64643bView commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: experimental fe…
…atures do not render as empty strings
Configuration menu - View commit details
-
Copy full SHA for 3b77f13 - Browse repository at this point
Copy the full SHA 3b77f13View commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: escaped shell a…
…rgs are never empty
Configuration menu - View commit details
-
Copy full SHA for 837c361 - Browse repository at this point
Copy the full SHA 837c361View commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: system string s…
…hould not be empty
Configuration menu - View commit details
-
Copy full SHA for 4b34feb - Browse repository at this point
Copy the full SHA 4b34febView commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: do not drop att…
…ributes with empty names Empty attributes are probably not well supported, but the least we could do is leave a hint. Attribute path rendering and parsing should be done according to Nix expression syntax in my opinion.
Configuration menu - View commit details
-
Copy full SHA for 0480bfe - Browse repository at this point
Copy the full SHA 0480bfeView commit details -
Configuration menu - View commit details
-
Copy full SHA for 062672b - Browse repository at this point
Copy the full SHA 062672bView commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: break nix help …
…"" "" "" build Garbage in, error out. Experimental CLI. Zero derivations given.
Configuration menu - View commit details
-
Copy full SHA for d904302 - Browse repository at this point
Copy the full SHA d904302View commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: showVersions ve…
…rsion is not empty
Configuration menu - View commit details
-
Copy full SHA for cf3c5cd - Browse repository at this point
Copy the full SHA cf3c5cdView commit details -
illegal configuration line -> syntax error in configuration line
The law has nothing to do with this, although I do feel like a badass when I mess with the config. I'm a conf artist.
Configuration menu - View commit details
-
Copy full SHA for 0fe3525 - Browse repository at this point
Copy the full SHA 0fe3525View commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: tokens from tok…
…enizeString are not empty
Configuration menu - View commit details
-
Copy full SHA for 4029426 - Browse repository at this point
Copy the full SHA 4029426View commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: setting value w…
…as already harmed Considering that `value` was probably parsed with tokenizeString prior, it's unlikely to contain empty strings, and we have no reason to remove them either.
Configuration menu - View commit details
-
Copy full SHA for 9ca42d5 - Browse repository at this point
Copy the full SHA 9ca42d5View commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: PATH handling
It's still wrong, but one step closer to correct. Not that anyone should use "" or "." in their PATH, but that is not for us to intervene.
Configuration menu - View commit details
-
Copy full SHA for 76b2d5e - Browse repository at this point
Copy the full SHA 76b2d5eView commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: sigs are not empty
... but if they are, I'd like to see at least a hint of it so that I'd know to fix it.
Configuration menu - View commit details
-
Copy full SHA for 6b2c277 - Browse repository at this point
Copy the full SHA 6b2c277View commit details -
dropEmptyInitThenConcatStringsSep: Allow it to drop items again
It's usually harmless, if it occurs at all.
Configuration menu - View commit details
-
Copy full SHA for 1c97718 - Browse repository at this point
Copy the full SHA 1c97718View commit details
Commits on Jul 14, 2024
-
Configuration menu - View commit details
-
Copy full SHA for d40fdb5 - Browse repository at this point
Copy the full SHA d40fdb5View commit details -
dropEmptyInitThenConcatStringsSep -> concatStringSep: empty separator
When the separator is empty, no difference is observable. Note that concatStringsSep has centralized definitions. This adds the required definitions. Alternatively, `strings-inline.hh` could be included at call sites.
Configuration menu - View commit details
-
Copy full SHA for 97e0110 - Browse repository at this point
Copy the full SHA 97e0110View commit details -
concatStrings: Give compiler access to definition for inlining
... at call sites that are may be in the hot path. I do not know how clever the compiler gets at these sites. My primary concern is to not regress performance and I am confident that this achieves it the easy way.
Configuration menu - View commit details
-
Copy full SHA for 7e604f7 - Browse repository at this point
Copy the full SHA 7e604f7View commit details -
Merge pull request NixOS#11093 from NixOS/fix-concatStringsSep
Fix C++ `concatStringsSep`
Configuration menu - View commit details
-
Copy full SHA for 9d7397c - Browse repository at this point
Copy the full SHA 9d7397cView commit details
Commits on Jul 15, 2024
-
lint: fix shellcheck for misc/systemv/nix-daemon
Got shellcheck passing for misc/systemv/nix-daemon Not sure how to test this since it's not running on my NixOS machine and I see no references to it in the directory otherwise. See NixOS#10795
Configuration menu - View commit details
-
Copy full SHA for bc801e2 - Browse repository at this point
Copy the full SHA bc801e2View commit details -
Configuration menu - View commit details
-
Copy full SHA for 104aba0 - Browse repository at this point
Copy the full SHA 104aba0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 550b347 - Browse repository at this point
Copy the full SHA 550b347View commit details -
Configuration menu - View commit details
-
Copy full SHA for 63f520f - Browse repository at this point
Copy the full SHA 63f520fView commit details -
Configuration menu - View commit details
-
Copy full SHA for e5af7cb - Browse repository at this point
Copy the full SHA e5af7cbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7fae378 - Browse repository at this point
Copy the full SHA 7fae378View commit details -
Configuration menu - View commit details
-
Copy full SHA for e68234c - Browse repository at this point
Copy the full SHA e68234cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 491b9cf - Browse repository at this point
Copy the full SHA 491b9cfView commit details -
Configuration menu - View commit details
-
Copy full SHA for d4f576b - Browse repository at this point
Copy the full SHA d4f576bView commit details -
Configuration menu - View commit details
-
Copy full SHA for cef11b2 - Browse repository at this point
Copy the full SHA cef11b2View commit details -
Configuration menu - View commit details
-
Copy full SHA for f9243ec - Browse repository at this point
Copy the full SHA f9243ecView commit details -
Configuration menu - View commit details
-
Copy full SHA for 77e9f9e - Browse repository at this point
Copy the full SHA 77e9f9eView commit details -
libexpr: Rename "column" fields to offset
... because that's what they are.
Configuration menu - View commit details
-
Copy full SHA for 71cb8bf - Browse repository at this point
Copy the full SHA 71cb8bfView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8a85529 - Browse repository at this point
Copy the full SHA 8a85529View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6bbd493 - Browse repository at this point
Copy the full SHA 6bbd493View commit details -
Configuration menu - View commit details
-
Copy full SHA for 131b6cc - Browse repository at this point
Copy the full SHA 131b6ccView commit details -
Doc comments: use std::unordered_map
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 2181747 - Browse repository at this point
Copy the full SHA 2181747View commit details -
Configuration menu - View commit details
-
Copy full SHA for ac89df8 - Browse repository at this point
Copy the full SHA ac89df8View commit details -
Revert "Doc comments: use std::unordered_map"
hash<SourcePath> isn't implemented yet, and I can't cherry-pick a bug-free commit yet. This reverts commit 95529f31e3bbda99111c5ce98a33484dc6e7a462.
Configuration menu - View commit details
-
Copy full SHA for 6a125e6 - Browse repository at this point
Copy the full SHA 6a125e6View commit details -
Configuration menu - View commit details
-
Copy full SHA for ce31a04 - Browse repository at this point
Copy the full SHA ce31a04View commit details -
Revert "Use HintFmt for doc comments"
Unfortunately these don't render correctly, because they go into the markdown renderer, instead of the terminal. ``` nix-repl> :doc lib.version Attribute '[35;1mversion[0m' … defined at [35;1m/home/user/h/nixpkgs/lib/default.nix:73:40[0m ``` We could switch that to go direct to the terminal, but then we should do the same for the primops, to get a consistent look. Reverting for now. This reverts commit 3413e0338cbee1c7734d5cb614b5325e51815cde.
Configuration menu - View commit details
-
Copy full SHA for 03d3370 - Browse repository at this point
Copy the full SHA 03d3370View commit details -
getSnippetUpTo: Return optional
This makes it possible to certain discern failures from empty snippets, which I think is an ok review comment. Maybe it should do so for swapped column indexes too, but I'm not sure. I don't think it matters in the grand scheme. We don't even have a real use case for `nullopt` now anyway. Since we don't have a use case, I'm not applying this logic to higher level functions yet.
Configuration menu - View commit details
-
Copy full SHA for 61a4d3d - Browse repository at this point
Copy the full SHA 61a4d3dView commit details -
Configuration menu - View commit details
-
Copy full SHA for c6b5503 - Browse repository at this point
Copy the full SHA c6b5503View commit details -
tests/functional/repl.sh: fail test on wrong stdout
Previous test implementation assumed that grep supports newlines in patterns. It doesn't, so tests spuriously passed, even though some tests outputs were broken. This patches output (and expected output) before grepping, so there're no newlines in pattern.
Configuration menu - View commit details
-
Copy full SHA for 1bec90e - Browse repository at this point
Copy the full SHA 1bec90eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 846869d - Browse repository at this point
Copy the full SHA 846869dView commit details -
Inline
settings.pluginFiles.name
In theory the warning is more noisy now, but in practice this will not happen unless the client is older than 2.14 (highly unlikely).
Configuration menu - View commit details
-
Copy full SHA for 1a273a6 - Browse repository at this point
Copy the full SHA 1a273a6View commit details -
Move plugins infra to
libnixmain
They are not actually part of the store layer, but instead part of the Nix executable infra (libraries don't need plugins, executables do). This is part of a larger project of moving all of our legacy settings infra to libmain, and having the underlying libraries just have plain configuration structs detached from any settings infra / UI layer. Progress on NixOS#5638
Configuration menu - View commit details
-
Copy full SHA for 0feeab7 - Browse repository at this point
Copy the full SHA 0feeab7View commit details -
Ensure we can construct remote store configs in isolation
Progress towards NixOS#10766 I thought that NixOS#10768 achieved, but when I went to use this stuff (in Hydra), turns out it did not. (Those `using FooConfig;` lines were not working --- they are so finicky!) This PR gets the job done, and adds some trivial unit tests to make sure I did what I intended. I had to add add a header to expose `SSHStoreConfig`, after which the preexisting `ssh-store-config.*` were very confusingly named files, so I renamed them to `common-ssh-store-config.hh` to match the type defined therein.
Configuration menu - View commit details
-
Copy full SHA for 808082e - Browse repository at this point
Copy the full SHA 808082eView commit details -
Merge pull request NixOS#11110 from GoldsteinE/fix-repl-tests
tests/functional/repl.sh: fail test on wrong stdout
Configuration menu - View commit details
-
Copy full SHA for 03326d6 - Browse repository at this point
Copy the full SHA 03326d6View commit details
Commits on Jul 16, 2024
-
Merge pull request NixOS#11108 from obsidiansystems/remote-store-cons…
…tructors Ensure we can construct remote store configs in isolation
Configuration menu - View commit details
-
Copy full SHA for 4bbadba - Browse repository at this point
Copy the full SHA 4bbadbaView commit details -
Merge pull request NixOS#11092 from DeterminateSystems/hash-SourcePath
Use std::unordered_map for the EvalState caches
Configuration menu - View commit details
-
Copy full SHA for 9c6678d - Browse repository at this point
Copy the full SHA 9c6678dView commit details -
Doc comments: use std::unordered_map
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 6c9d62d - Browse repository at this point
Copy the full SHA 6c9d62dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3d8fa9f - Browse repository at this point
Copy the full SHA 3d8fa9fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 64b4600 - Browse repository at this point
Copy the full SHA 64b4600View commit details -
Merge pull request NixOS#11114 from DeterminateSystems/fix-warning
Pos::getSnippetUpTo(): Fix warning
Configuration menu - View commit details
-
Copy full SHA for 9300f85 - Browse repository at this point
Copy the full SHA 9300f85View commit details -
Remove unused boost include and split out std-hash.hh
Splitting it out immediately answers questions like [this], without increasing the number of compilation units. I did consider using boost::hash_combine instead, but it doesn't seem to be quite as capable, accepting only two arguments. [this]: NixOS#11113 (comment)
Configuration menu - View commit details
-
Copy full SHA for d0e9878 - Browse repository at this point
Copy the full SHA d0e9878View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0a1a116 - Browse repository at this point
Copy the full SHA 0a1a116View commit details -
Merge pull request NixOS#11119 from philiptaron/attrbute
builtins.genericClosure: fix documentation typo
Configuration menu - View commit details
-
Copy full SHA for 8f22245 - Browse repository at this point
Copy the full SHA 8f22245View commit details -
Avoid casting function pointer in libutil test support
Casting function pointers seems to be almost always UB. See https://stackoverflow.com/questions/559581/casting-a-function-pointer-to-another-type Fixed by doing the casting of `void*` to `std::string*` inside the function instead. Caught by UBSan.
Configuration menu - View commit details
-
Copy full SHA for 5b6a21a - Browse repository at this point
Copy the full SHA 5b6a21aView commit details -
Check if drv is initialized in DerivationGoal::waiteeDone
It might not be set, in which case we shouldn't do anything. Surprisingly, this somehow did not cause segfaults before? Caught by UBSan.
Configuration menu - View commit details
-
Copy full SHA for a1f3f10 - Browse repository at this point
Copy the full SHA a1f3f10View commit details -
Configuration menu - View commit details
-
Copy full SHA for 463256b - Browse repository at this point
Copy the full SHA 463256bView commit details
Commits on Jul 17, 2024
-
Add parser test for indented strings
So that in the next commit we can see what changes about this test
Configuration menu - View commit details
-
Copy full SHA for 9fae50e - Browse repository at this point
Copy the full SHA 9fae50eView commit details -
Merge pull request NixOS#11014 from obsidiansystems/plugins-libmain
Move plugins infra to `libnixmain`
Configuration menu - View commit details
-
Copy full SHA for b230c01 - Browse repository at this point
Copy the full SHA b230c01View commit details -
Configuration menu - View commit details
-
Copy full SHA for f5ebaea - Browse repository at this point
Copy the full SHA f5ebaeaView commit details -
tests/functional/repl: Characterize side effecting print behavior
Configuration menu - View commit details
-
Copy full SHA for ece334b - Browse repository at this point
Copy the full SHA ece334bView commit details -
Configuration menu - View commit details
-
Copy full SHA for a0635a8 - Browse repository at this point
Copy the full SHA a0635a8View commit details -
Configuration menu - View commit details
-
Copy full SHA for da3eff6 - Browse repository at this point
Copy the full SHA da3eff6View commit details -
Avoid accessing uninitialized settings in own init (NixOS#11117)
The default value for the setting was evaluated by calling a method on the object _being currently constructed_, so we were using it before all fields were initialized. This has been fixed by making the called method static, and not using the previously used fields at all. But functionality hasn't changed! The fields were usually always zero (by chance?) anyway, meaning the conditional path was always taken. Thus the current logic has been kept, the code simplified, and UB removed. This was found with the helper of UBSan.
Configuration menu - View commit details
-
Copy full SHA for 464e592 - Browse repository at this point
Copy the full SHA 464e592View commit details -
Merge pull request NixOS#11113 from NixOS/doc-comment-unordered-map
Doc comments: use std::unordered_map
Configuration menu - View commit details
-
Copy full SHA for 621c23b - Browse repository at this point
Copy the full SHA 621c23bView commit details -
BasicClientConnection::handshake(): Don't send our version twice
This was accidentally introduced in f71b4da. We didn't notice this because the version got interpreted by the daemon as the obsolete "CPU affinity will follow" field, and being non-zero, it would then read another integer for the ignored CPU affinity.
Configuration menu - View commit details
-
Copy full SHA for 87f8ff2 - Browse repository at this point
Copy the full SHA 87f8ff2View commit details -
doc: add example usage for Gitea in tarball fetcher (NixOS#11116)
Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
Configuration menu - View commit details
-
Copy full SHA for f0a1c13 - Browse repository at this point
Copy the full SHA f0a1c13View commit details -
Merge pull request NixOS#10931 from hercules-ci/test-run-and-shell-envs
Test the `run` and `shell` envs for stray variables
Configuration menu - View commit details
-
Copy full SHA for 05751de - Browse repository at this point
Copy the full SHA 05751deView commit details -
Merge pull request NixOS#11100 from NixOS/pretty-print-idempotent
Pretty print idempotently
Configuration menu - View commit details
-
Copy full SHA for b23da1c - Browse repository at this point
Copy the full SHA b23da1cView commit details -
Merge pull request NixOS#11103 from fzakaria/issue-10795
lint: fix shellcheck for misc/systemv/nix-daemon
Configuration menu - View commit details
-
Copy full SHA for 6867cb1 - Browse repository at this point
Copy the full SHA 6867cb1View commit details -
Merge pull request NixOS#11126 from DeterminateSystems/dont-send-vers…
…ion-twice BasicClientConnection::handshake(): Don't send our version twice
Configuration menu - View commit details
-
Copy full SHA for a915862 - Browse repository at this point
Copy the full SHA a915862View commit details -
Merge pull request NixOS#11058 from hercules-ci/more-nix-shell
Make `#!nix-shell` arguments and options relative to script
Configuration menu - View commit details
-
Copy full SHA for 1e1a8e8 - Browse repository at this point
Copy the full SHA 1e1a8e8View commit details -
Merge pull request NixOS#11061 from rhendric/rhendric/reference-manual
docs: fill out language/types.md#type-path
Configuration menu - View commit details
-
Copy full SHA for 17051ca - Browse repository at this point
Copy the full SHA 17051caView commit details
Commits on Jul 18, 2024
-
Refactor unix domain socket store config (NixOS#11109)
Following what is outlined in NixOS#10766 refactor the uds-remote-store such that the member variables (state) don't live in the store itself but in the config object. Additionally, the config object includes a new necessary constructor that takes a scheme & authority. Tests are commented out because of linking errors with the current config system. When there is a new config system we can reenable them. Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>
Configuration menu - View commit details
-
Copy full SHA for 57399bf - Browse repository at this point
Copy the full SHA 57399bfView commit details -
Move
uriSchemes
to*StoreConfig
It is a property of the configuration of a store --- how a store URL is parsed into a store config, not a store itself. Progress towards NixOS#10766
Configuration menu - View commit details
-
Copy full SHA for 2aa9cf3 - Browse repository at this point
Copy the full SHA 2aa9cf3View commit details -
Merge pull request NixOS#11112 from obsidiansystems/move-schemes-set
Move `uriSchemes` to `*StoreConfig`
Configuration menu - View commit details
-
Copy full SHA for 606ace4 - Browse repository at this point
Copy the full SHA 606ace4View commit details -
Merge pull request NixOS#11086 from kognise/eval-cache-fixes
Eval cache: fix cache regressions
Configuration menu - View commit details
-
Copy full SHA for 8ce4287 - Browse repository at this point
Copy the full SHA 8ce4287View commit details -
Factor out commonality between WorkerProto::Basic{Client,Server}Conne…
…ction This also renames clientVersion and daemonVersion to the more correct protoVersion (since it's the version agreed to by both sides).
Configuration menu - View commit details
-
Copy full SHA for c1d5cf6 - Browse repository at this point
Copy the full SHA c1d5cf6View commit details -
Configuration menu - View commit details
-
Copy full SHA for d231d80 - Browse repository at this point
Copy the full SHA d231d80View commit details -
This wasn't moving the underlying buffer, so if the buffer was non-empty, it could lose data.
Configuration menu - View commit details
-
Copy full SHA for fa7aa03 - Browse repository at this point
Copy the full SHA fa7aa03View commit details -
Configuration menu - View commit details
-
Copy full SHA for 31e1513 - Browse repository at this point
Copy the full SHA 31e1513View commit details -
Fix non-deterministic parser printing
In _very_ rare cases (I had about 7 cases out of 32200 files!), the order of how inherit-from bindings are printed when using `nix-instantiate --parse` gets messed up. The cause of this seems to be because the std::map the bindings are placed in is keyed on a _pointer_, which then uses an [implementation-defined strict total order](https://en.cppreference.com/w/cpp/language/operator_comparison#Pointer_total_order). The fix here is to key the bindings on their displacement instead, which maintains the same order as they appear in the file. Unfortunately I wasn't able to make a reproducible test for this in the source, there's something about the local environment that makes it unreproducible for me. However I was able to make a reproducible test in a Nix build on a Nix version from a very recent master: nix build github:infinisil/non-det-nix-parsing-repro Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for a6dccae - Browse repository at this point
Copy the full SHA a6dccaeView commit details -
parser: Remove empty multiline string parts earlier
Makes parsing more consistent and is a super minor optimisation Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 0c91bb9 - Browse repository at this point
Copy the full SHA 0c91bb9View commit details
Commits on Jul 19, 2024
-
Merge pull request NixOS#11138 from emilazy/push-znxusvxozllv
libmain: add missing header include
Configuration menu - View commit details
-
Copy full SHA for d629b27 - Browse repository at this point
Copy the full SHA d629b27View commit details -
Configuration menu - View commit details
-
Copy full SHA for 58a79b6 - Browse repository at this point
Copy the full SHA 58a79b6View commit details -
Merge pull request NixOS#11125 from DeterminateSystems/basic-connection
Factor out commonality between WorkerProto::Basic{Client,Server}Connection
Configuration menu - View commit details
-
Copy full SHA for c4213f0 - Browse repository at this point
Copy the full SHA c4213f0View commit details
Commits on Jul 20, 2024
-
Merge pull request NixOS#11120 from tweag/early-string-cutoff
parser: Remove empty multiline string parts earlier
Configuration menu - View commit details
-
Copy full SHA for 584f8cb - Browse repository at this point
Copy the full SHA 584f8cbView commit details -
Merge pull request NixOS#11123 from tweag/fix-non-det-parser-printing
Fix non-deterministic inherit printing
Configuration menu - View commit details
-
Copy full SHA for 56757e1 - Browse repository at this point
Copy the full SHA 56757e1View commit details
Commits on Jul 21, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 3426e54 - Browse repository at this point
Copy the full SHA 3426e54View commit details