puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
15158 commits 19 branches 0 tags 68 MiB
Commit graph

9326 commits

Author SHA1 Message Date
eldritch horrors 2cea973e29 remove ParserFormals 
this is a proper subset of Formals anyway, so let's just use those and
avoid the extra allocations and moves.

(cherry picked from commit f07388bf98)
Change-Id: I4508c9c9c918cbaaed649dc753eb86f5cafc7ab6
 2024-03-09 00:25:54 -07:00
eldritch horrors 609a8e0d94 Merge pull request #9754 from 9999years/print-value-when-coercion-fails 
Print the value in `error: cannot coerce` messages

(cherry picked from commit 5b7bfd2d6b)

===

test taken from 6e8d5983143ae576e3f4b1d2954a5267f2943a49; it was added
previously (and not backported because its pr was a mostly-revert), but
it's useful to have around.

Change-Id: Icbd14b55e3610ce7b774667bf14b82e6dc717982
 2024-03-09 00:05:41 -07:00
eldritch horrors 2f7c3fa251 Merge pull request #9818 from Ma27/print-value-on-function-call-type-error 
libexpr: print value of what is attempted to be called as function
(cherry picked from commit 50e5d7b883)
Change-Id: I7cb6290bd8f244e83bfce3b2eed2a4c8b4f16a83
 2024-03-09 00:05:41 -07:00
eldritch horrors 87e6ac5eb7 Merge pull request #9753 from 9999years/print-value-on-type-error 
Print the value in `value is X while a Y is expected` error

(cherry picked from commit 5f72a97092)
Change-Id: Idb4bc903ae59a0f5b6fb3b1da4d47970fe0a6efe
 2024-03-09 00:05:41 -07:00
eldritch horrors 512c1f05c3 Unify and refactor value printing 
Previously, there were two mostly-identical value printers -- one in
`libexpr/eval.cc` (which didn't force values) and one in
`libcmd/repl.cc` (which did force values and also printed ANSI color
codes).

This PR unifies both of these printers into `print.cc` and provides a
`PrintOptions` struct for controlling the output, which allows for
toggling whether values are forced, whether repeated values are tracked,
and whether ANSI color codes are displayed.

Additionally, `PrintOptions` allows tuning the maximum number of
attributes, list items, and bytes in a string that will be displayed;
this makes it ideal for contexts where printing too much output (e.g.
all of Nixpkgs) is distracting. (As requested by @roberth in
https://github.com/NixOS/nix/pull/9554#issuecomment-1845095735)

Please read the tests for example output.

Future work:
- It would be nice to provide this function as a builtin, perhaps
  `builtins.toStringDebug` -- a printing function that never fails would
  be useful when debugging Nix code.
- It would be nice to support customizing `PrintOptions` members on the
  command line, e.g. `--option to-string-max-attrs 1000`.

(cherry picked from commit 0fa08b4516, )

===

Restore ambiguous value printer for `nix-instantiate`

The Nix team has requested that this output format remain unchanged.
I've added a warning to the man page explaining that `nix-instantiate
--eval` output will not parse correctly in many situations.

(cherry picked from commit df84dd4d8d)

Change-Id: I7cca6b4b53cd0642f2d49af657d5676a8554c9f8
 2024-03-09 03:50:06 +01:00
eldritch horrors 0e8f505f66 Unindent print.hh declarations 
(cherry picked from commit c9125603a5)
Change-Id: I137a272feee7eb42a017f373cbe4705b0e79b7c1
 2024-03-08 18:54:10 -07:00
eldritch horrors d76125747f Merge changes I03bbff94,I778edad1,Iaa80073b,Ib1d58fe4 into main 
* changes:
  Add release notes
  Print how many checks are run
  Print derivation paths
  Log what `nix flake check` does
 2024-03-07 18:48:17 -07:00
eldritch horrors 232f4feace Merge pull request #9324 from 9999years/fix-8854-take-2 
Don't attempt to `git add` ignored files

(cherry picked from commit 359990dfdc)

===

also added a regression test that isn't upstream to be sure we're
actually fixing the bug.

Change-Id: I8267a3d0ece9909d8008b7435b90e7b3eee366f6
 2024-03-07 14:50:43 +01:00
eldritch horrors 852bc55c87 Merge pull request #9890 from obsidiansystems/remove-unneeded-toRealPath 
Change an `allowPath` call to take a store path again

(cherry picked from commit 7c9ed1b1a3)
Change-Id: Ia5ec924315a1f2640a0438cfb4b1ee0689cd3558
 2024-03-07 13:04:25 +01:00
eldritch horrors 8a268359b0 Merge pull request #9560 from obsidiansystems/serve-proto-unkeyed-valid-path-info-serializer 
Factor out `ServeProto::Serialiser<UnkeyedValidPathInfo>` and test

(cherry picked from commit 139982997e)
Change-Id: I28e4ba5a681a90d81915a56e6dbaa5456d64f96d
 2024-03-07 12:37:33 +01:00
eldritch horrors 9eb58f5209 Merge pull request #9032 from Ma27/structured-attrs-env-vars 
structured attrs: improve support / usage of NIX_ATTRS_{SH,JSON}_FILE

(cherry picked from commit 3c042f3b0b)
Change-Id: I7e41838338ee1edf31fff6f9e354c3db2bba6c0e
 2024-03-07 10:46:47 +01:00
eldritch horrors 689a5f22f1 Print how many checks are run 
(cherry picked from commit d75a5f427a)
Change-Id: I778edad1928adf90a69d0bbe8dd36623181b20d4
 2024-03-07 01:22:25 -07:00
eldritch horrors f2c32738ad Print derivation paths 
Also be more consistent with quotes around attribute paths

(cherry picked from commit 9404ce36e4)
Change-Id: Iaa80073b4a07a6ffef106a3c12ecd02b4f6f67aa
 2024-03-07 01:22:25 -07:00
eldritch horrors 2020998cfd Log what nix flake check does 
There's still room for improvement, but this produces much more
informative output with `-v`:

```
$ nix flake check -v
evaluating flake...
checking flake output 'checks'...
checking derivation checks.aarch64-darwin.ghcid-ng-tests...
checking derivation checks.aarch64-darwin.ghcid-ng-clippy...
checking derivation checks.aarch64-darwin.ghcid-ng-doc...
checking derivation checks.aarch64-darwin.ghcid-ng-fmt...
checking derivation checks.aarch64-darwin.ghcid-ng-audit...
checking flake output 'packages'...
checking derivation packages.aarch64-darwin.ghcid-ng...
checking derivation packages.aarch64-darwin.ghcid-ng-tests...
checking derivation packages.aarch64-darwin.default...
checking flake output 'apps'...
checking flake output 'devShells'...
checking derivation devShells.aarch64-darwin.default...
running flake checks...
warning: The check omitted these incompatible systems: aarch64-linux, x86_64-darwin, x86_64-linux
Use '--all-systems' to check all.
```

(cherry picked from commit 49221493e2)
Change-Id: Ib1d58fe48cc82f4801a2ee5f91ba0d5a74907c0b
 2024-03-07 01:22:25 -07:00
eldritch horrors bac3c5ad97 Merge pull request #9787 from obsidiansystems/bind-proc-syserror 
`bind`: give same treatment as `connect` in #8544, dedup

(cherry picked from commit 28674247ec)
Change-Id: I1ac5fc43fa10ec5f37a226730c3d84033fdbfd52
 2024-03-07 00:43:51 -07:00
eldritch horrors 06e92450bd Merge pull request #8544 from edolstra/handle-missing-gc-socket 
LocalStore: :addTempRoot(): Handle ENOENT
(cherry picked from commit 7115edc85a)
Change-Id: Ie6b1596049c3fde09b98f2f0727899f98e48e6b1
 2024-03-07 00:43:51 -07:00
eldritch horrors b14f88e0d4 Merge pull request #9985 from alois31/symlink-resolution 
Restore `builtins.pathExists` behavior on broken symlinks

(cherry picked from commit d53c8901ef7f2033855dd99063522e3d56a19dab)

===

note that this variant differs markedly from the source commit because
we haven't endured quite as much lazy trees.

Change-Id: I0facf282f21fe0db4134be5c65a8368c1b3a06fc
 2024-03-07 00:43:51 -07:00
eldritch horrors 1342c8f18e Merge pull request #10074 from lf-/jade/ban-implicit-fallthrough 
Warn on implicit switch case fallthrough

(cherry picked from commit 21282c3c204597641402c6bcff8fc9ee7bc31fa1)
Change-Id: I5ebbdfb6c037d2c55254f37dd391c07c2ce7443e
 2024-03-07 00:11:12 -07:00
jade 0d9a043f43 Merge "fix: bounds check result in getMaxCPU" into main 2024-03-06 22:24:51 -07:00
jade 6122bed3af fix: bounds check result in getMaxCPU 
Upstream-Bug: https://github.com/NixOS/nix/issues/9725
Upstream-PR: https://github.com/NixOS/nix/pull/10172
Change-Id: I2b8e8b15ee28951be98e5cbe3ccea5b9c8de5994
 2024-03-06 21:00:33 -08:00
eldritch horrors 65f1b15c95 Merge pull request #9934 from nmeum/absPath-out-of-bounds 
absPath: Explicitly check if path is empty before accessing it
(cherry picked from commit 6ec08b85f6)
Change-Id: Ieeb53fb65d0e334e6017ceb3a48b3b6ae1047843
 2024-03-07 03:35:47 +01:00
eldritch horrors 706f0df55b Merge pull request #9280 from R-VdP/rvdp/fix_remote_logging_phase_reporting 
Include phase reporting in log file for ssh-ng builds

(cherry picked from commit b1e7d7cad6)
Change-Id: I4076669b0ba160412f7c628ca9113f9abbc8c303
 2024-03-06 19:11:12 -07:00
puck 6f36a8834c Copy the output of fixed-output derivations before registering them 
It is possible to exfiltrate a file descriptor out of the build sandbox
of FODs, and use it to modify the store path after it has been
registered. To avoid that issue, don't register the output of the build,
but a copy of it (that will be free of any leaked file descriptor).

Test that we can't leverage abstract unix domain sockets to leak file
descriptors out of the sandbox and modify the path after it has been
registered.

(cherry picked from commit 2dadfeb690e7f4b8f97298e29791d202fdba5ca6)
(tests cherry picked from commit c854ae5b3078ac5d99fa75fe148005044809e18c)

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Theophane Hufschmitt <theophane.hufschmitt@tweag.io>
Co-authored-by: Tom Bereknyei <tomberek@gmail.com>

Change-Id: I87cd58f1c0a4f7b7a610d354206b33301e47b1a4
 2024-03-07 01:44:58 +00:00
eldritch horrors 89e99d94e4 Merge pull request #9634 from 9999years/combine-abstract-pos-and-pos 
Combine `AbstractPos`, `PosAdapter`, and `Pos`

(cherry picked from commit 113499d16f)

===

this is a bit cursed because originally it was based on InputAccessor
code that we don't have and moved/patched features we likewise don't
have (fetchToStore caching, all the individual accessors,
ContentAddressMethod). the commit is adjusted accordingly to
match (remove caching, ignore accessors, use FileIngestionMethod).

note that `state.rootPath . CanonPath == abs` and
computeStorePathForPath works relative to cwd, so the slight rewrite in
the moved fetchToStore is legal.

Change-Id: I05fd340c273f0bcc8ffabfebdc4a88b98083bce5
 2024-03-05 23:46:18 -07:00
eldritch horrors e9b5929b22 Merge pull request #9860 from 9999years/set-stack-darwin 
Increase stack size on macOS as well as Linux

(cherry picked from commit efb91d5979,
4a2444b3f3)
Change-Id: Ieb72283c61bb9e360683f531d6635697b293c313
 2024-03-05 23:36:42 -07:00
eldritch horrors bfe2facede Merge pull request #9443 from ivan770/reproducibility 
doc: fix machine-specific capabilities leaking
(cherry picked from commit dda0e34ecf)
Change-Id: I3d07cc5039ee954b215a7a27caa3bf7359d92c26
 2024-03-05 23:35:22 -07:00
eldritch horrors 5bda6d9dc8 Merge pull request #9915 from 9999years/evaluating-attribute-position 
Add position information to `while evaluating the attribute` errors in the debugger

(cherry picked from commit ffe67c86a8ef3695e5c8b9c9800c192ac633dded)
Change-Id: I177ea5ec60898abe09fb9d80d9602b2a32ff8f44
 2024-03-04 09:25:17 +01:00
eldritch horrors 4551dd0f2c Merge pull request #10010 from 9999years/fix-9941 
Fix "Failed tcsetattr(TCSADRAIN)" when `nix repl` is not a TTY

(cherry picked from commit 864fc85fc88ff092725ba99907611b2b8d2205fb)
Change-Id: I8198674b935fabd741a349cc74544e61c53ea7b3
 2024-03-04 09:25:17 +01:00
eldritch horrors 41b7876b32 Merge pull request #10067 from ramboman/fix-proxy-nix 
`nix`: Fix `haveInternet` to check for proxy

(cherry picked from commit accae60e7710a18f6f2bd7d2f4cd836bcd76b684)
Change-Id: I996dafdcd266f4bc5806386c86b19040120842bf
 2024-03-04 09:25:17 +01:00
eldritch horrors 82075c8ebd Merge pull request #10054 from syvb/channel-unpack-count 
Say how many channels were unpacked in nix-channel

(cherry picked from commit 9ae665b9e1dc64c507ab6002fc5d7824208f3777)
Change-Id: Ie0950cf32123b550c5b83981a020e513f72a9b7c
 2024-03-04 09:25:17 +01:00
eldritch horrors 523250d18b Merge pull request #10055 from GrahamDennis/gdennis/faster-flake-lock-parsing 
Faster flake.lock parsing

(cherry picked from commit ff4fa4dbd307fb155155421a7ec0625383dcedeb)
Change-Id: I34325834770db66fa56f0d8d02d3d2322dea3c65
 2024-03-04 09:25:17 +01:00
eldritch horrors 96a3683308 Ban building Nix with NDEBUG 
When reviewing old PRs, I found that #9997 adds some code to ensure one
particular assert is always present. But, removing asserts isn't
something we do in our own release builds either in the flake here or in
nixpkgs, and is plainly a bad idea that increases support burden,
especially if other distros make bad choices of build flags in their Nix
packaging.

For context, the assert macro in the C standard is defined to do nothing
if NDEBUG is set.

There is no way in our build system to set -DNDEBUG without manually
adding it to CFLAGS, so this is simply a configuration we do not use.
Let's ban it at compile time.

I put this preprocessor directive in src/libutil.cc because it is not
obvious where else to put it, and it seems like the most logical file
since you are not getting a usable nix without it.

Upstream-PR: https://github.com/NixOS/nix/pull/10126
Original-Change-Id: I513cceaac1371decb3d96231e6ef9181c910c218
Change-Id: I531a51f6348a746e8e41d88203b08f614898356c
 2024-03-04 09:24:58 +01:00
eldritch horrors c6064390e8 Merge pull request #9992 from edolstra/fix-warning 
Fix "may be used uninitialized" warning

(cherry picked from commit c4ebb82da4eade975e874da600dc50e9dec610cb)
Change-Id: I0ce99bf102ad12902f7055c29a56e665b8320ca8
 2024-03-04 08:59:58 +01:00
eldritch horrors bbf69a4898 Merge pull request #9974 from edolstra/less-chatty-post-build-hook 
runPostBuildHook(): Be less chatty

(cherry picked from commit 28a988bdde)
Change-Id: Ibb49b71bf631d04d08970d719f091221b15c5036
 2024-03-04 08:59:18 +01:00
eldritch horrors 647d762ab5 Merge pull request #9933 from pennae/debugger-fix 
fix debugger crashing while printing envs

(cherry picked from commit 9b8b486091)
Change-Id: Ica6a17e4b3e3b8b8093719f442c28be7f13be09d
 2024-03-04 08:57:44 +01:00
eldritch horrors 542a19104e Merge pull request #9918 from 9999years/debugger-locals-for-let-expressions 
Expose locals from `let` expressions to the debugger

(cherry picked from commit acef4f17a2)
Change-Id: Ib3623254f67ac762f4e7230d625e9f87dff38a84
 2024-03-04 08:54:52 +01:00
eldritch horrors cd654451c9 Merge pull request #9924 from 9999years/rename-yellowtxt 
Rename `yellowtxt` -> `magentatxt`

(cherry picked from commit fb78a99e04)
Change-Id: I9ade553d9f499e6713aeff3463c9a653a880a051
 2024-03-04 08:53:10 +01:00
eldritch horrors 43cedec6c5 Merge pull request #9919 from 9999years/reduce-debugger-clutter 
Reduce visual clutter in the debugger

(cherry picked from commit f388a6148d)
Change-Id: I21bfe3e9f75816484b0f46dbe09e0ff40b22c6d9
 2024-03-04 08:52:57 +01:00
eldritch horrors 9ef32cf3b8 Merge pull request #9930 from rvl/print-dev-env-unbound-variables 
print-dev-env: Avoid using unbound shellHook variable
(cherry picked from commit 25385a408e)
Change-Id: Id1aca13942adfa628f7bdcfc0b6fc03bb3bab9ea
 2024-03-04 08:51:49 +01:00
eldritch horrors 625df32afc Merge pull request #9913 from 9999years/debugger-positions 
Print positions in `--debugger`, instead of pointers

(cherry picked from commit 49cf090cb2)
Change-Id: Ic27917b2aab3657c28d599898377bf0c14753f8a
 2024-03-04 08:51:02 +01:00
eldritch horrors 78422bdbab Merge pull request #9848 from obsidiansystems/default-system-features-static 
Make `StoreConfig::getDefaultSystemFeatures` a static method

(cherry picked from commit 5a9513cdba)
Change-Id: Ia9c0ae2b7de419bd60aea8bf905154b96c428276
 2024-03-04 08:47:55 +01:00
eldritch horrors 2bb0a06346 Merge pull request #9841 from obsidiansystems/float-speed-factor 
Convert `Machine::speedFactor` from a non-neg int to a non-neg float

(cherry picked from commit 69d0ae27e3)
Change-Id: I2afb5cf9e4fe1384985c58353946135c3d102b42
 2024-03-04 08:40:38 +01:00
eldritch horrors 044c117a9f Merge pull request #9481 from iFreilicht/disallow-nix-search-without-search-terms 
nix search: Disallow empty regex

(cherry picked from commit 1c260fa6d1)
Change-Id: Iaaf3605c24a342fcb05d0b534a9f305533d3b5fa
 2024-03-04 08:40:12 +01:00
eldritch horrors 20d7b93b0c Merge pull request #9838 from obsidiansystems/systemTypes-set 
Make `Machine::systemTypes` a set not vector

(cherry picked from commit f1b0304153)
Change-Id: I6d4f5c0bfc226e9bd66c58c360cd99e3fac9a129
 2024-03-04 08:39:24 +01:00
eldritch horrors fad1a25e17 Merge pull request #9805 from yshui/prefetch-unpack 
Add --unpack to nix store prefetch-file

(cherry picked from commit f51409cf98)
Change-Id: I974b04f3efc8b210a9399a71d3704490cfc2c80c
 2024-03-04 08:24:18 +01:00
eldritch horrors 298db5d1cd Merge pull request #9804 from edolstra/missing-nar-crash 
Fix crash when NAR is missing from binary cache

(cherry picked from commit 3b20cca962)
Change-Id: I50ff18f4a6de69c323473b4a8e3e098d1f365145
 2024-03-04 08:16:28 +01:00
eldritch horrors 68f148ed45 Merge pull request #9798 from edolstra/remote-store-eof 
Print a more helpful message if the daemon crashes

(cherry picked from commit 32706b14a7)
Change-Id: Ief7c465bca7666e2b7e7c9d1dd0c01c5f9014146
 2024-03-04 08:12:15 +01:00
eldritch horrors 5dd872363a Merge pull request #9797 from edolstra/fix-error-message 
Store: :buildPaths(): Fix display of store paths
(cherry picked from commit b5ed36e663)
Change-Id: Ic6008491088dc6febd4a1e44dc2dbb96c47661f4
 2024-03-04 08:11:46 +01:00
eldritch horrors 2c85fcce87 Merge pull request #9747 from awakesecurity/mz/fix-quadratic-splitString 
Fix performance of builtins.substring for empty substrings

(cherry picked from commit b2deff1947)
Change-Id: I4ddfc8d26a4781c9520fff9807849a073ee7bed8
 2024-03-04 08:06:36 +01:00
eldritch horrors 64b077cdaa Merge pull request #9763 from L-as/avoid-unnecessary-copy 
Avoid unnecessary copy of goal log

(cherry picked from commit 268c49264a)
Change-Id: I5d9de9e43a7ddcb09d25bbc7367c9d83f58c7a75
 2024-03-04 08:01:03 +01:00
eldritch horrors e310bbf913 Merge pull request #8043 from bobvanderlinden/pr-shell-env 
nix: develop: use SHELL from rc script
(cherry picked from commit 0d55d660d5)
Change-Id: I83be6c63b282d7f01a0defa78d9e787c77f1f02d
 2024-03-04 07:59:32 +01:00
eldritch horrors 180984178d Merge pull request #9648 from cole-h/nix-shell-ordering 
nix shell: reflect command line order in PATH order

(cherry picked from commit b91c935c2f)
Change-Id: If16c120bb74857c2817366e74e5b0877eb997260
 2024-03-04 07:50:55 +01:00
eldritch horrors 5f2eaa1b35 Merge pull request #9662 from shlevy/flat-fixed-references-assert 
Improve error message for fixed-outputs with references.

(cherry picked from commit ff6de4a9ee)
Change-Id: I733c49760b9a3f1b76a6bece3b250b8579cd6cac
 2024-03-04 07:50:02 +01:00
eldritch horrors aac8416eac Merge pull request #9670 from DavHau/log-lines 
saner default for log-lines: change to 25

(cherry picked from commit dedbbbb451)
Change-Id: I8847df4aeb6e5c2d2be0e04f2a0a1aa595cb3b2f
 2024-03-04 07:48:57 +01:00
eldritch horrors 8f5d0d4c05 Merge pull request #9687 from edolstra/withFramedSink-ctrl-c-hang 
withFramedSink(): Receive interrupts on the stderr thread

(cherry picked from commit 965cfe9688)
Change-Id: I8320a96957c01ec0e3450d1b3ae38a3baff78d49
 2024-03-04 07:40:17 +01:00
eldritch horrors 137673de56 Merge pull request #9681 from edolstra/eval-optimisations 
Optimize empty list constants

(cherry picked from commit 315aade89d)
Change-Id: I0f28ef8a27ccedc45acf44243eec9dc35b733300
 2024-03-04 07:39:12 +01:00
eldritch horrors 6b279cd10e Merge pull request #9658 from pennae/env-diet 
reduce the size of Env by one pointer

(cherry picked from commit 83f5622545)
Change-Id: I5636290526d0165cfc61aee1e7a5b94db4a26cef
 2024-03-04 07:37:45 +01:00
eldritch horrors cd326a2aa4 Merge pull request #9673 from pennae/drv-parse-opts 
optimize derivation parsing

(cherry picked from commit 3511430902)
Change-Id: I00f76dcd464a5811944613731501af504b6e8c29
 2024-03-04 07:36:51 +01:00
eldritch horrors 96f1a404d0 Merge pull request #9617 from 9999years/stack-overflow-segfault 
Fix segfault on infinite recursion in some cases

(cherry picked from commit bf1b294bd8)
Change-Id: Id137541426ec8536567835953fccf986a3aebf16
 2024-03-04 07:35:20 +01:00
eldritch horrors e1b1e6f7ab Merge pull request #9666 from unblevable/dervation-typo 
Fix "dervation" typo

(cherry picked from commit a21c762dab)
Change-Id: Ib6c0521758eb23115cfa243b9f3a34bb6e249e5f
 2024-03-04 07:33:32 +01:00
eldritch horrors dd180911d8 Merge pull request #9582 from pennae/misc-opts 
a packet of small optimizations

(cherry picked from commit ee439734e9)
Change-Id: I125d870710750a32a0dece48f39a3e9132b0d023
 2024-03-04 07:32:31 +01:00
eldritch horrors 076844e386 Merge pull request #9621 from blaggacao/fix/too-restrictive-branch-regex-master 
fix: valid branch name
(cherry picked from commit d2016c6b59)
Change-Id: Ic346739b91bf1b10515c9ff3b3e180a64afe6343
 2024-03-04 07:27:52 +01:00
eldritch horrors 67de43b1d7 Merge pull request #9645 from tweag/undeprecate-isNull 
Undeprecate isNull

(cherry picked from commit 8e64cd59b0)
Change-Id: If36b85a3fc01ee700bcaf4d5d83a5884a4b5de92
 2024-03-04 07:27:37 +01:00
eldritch horrors 6622abb463 Merge pull request #9641 from amarshall/darwin-sandbox-stderr 
Allow access to /dev/stderr in Darwin sandbox

(cherry picked from commit c6d7013583)
Change-Id: I5657f6f4ee9dad8c978bad0d71f5cac51584e4f2
 2024-03-04 07:26:03 +01:00
eldritch horrors 2ddf453e0d Merge pull request #9619 from 9999years/remove-blank-lines-in-errors 
Remove some blank lines from stack traces

(cherry picked from commit cea8354436)
Change-Id: Ic1af8b09e9994d3c69fd3b37ae47a4bb786a15a1
 2024-03-04 07:23:44 +01:00
eldritch horrors 7614aa9797 Merge pull request #4093 from matthewbauer/eval-system 
Add eval-system option

(cherry picked from commit 071dbbee33)
Change-Id: Ia81358c8cfb60241da07a4d0e84b9ee62a18a53f
 2024-03-04 07:21:01 +01:00
eldritch horrors 64a269ef73 Merge pull request #9600 from SharzyL/fix_nix_copy 
fix: nix copy ssh-ng:// not respecting --substitute-on-destination
(cherry picked from commit b1c633c6bb)
Change-Id: I77356d14a9011d6dc4cf64776995f7590d918874
 2024-03-04 07:16:31 +01:00
eldritch horrors 13f78c557b Merge pull request #9589 from obsidiansystems/floating-content-addressing-derivations-eval-store 
Fix building CA derivations with and eval store

(cherry picked from commit dfc0cee702)
Change-Id: I28feb5a36d4fe75f0ed3e3e2db6eb56b67d0f371
 2024-03-04 07:15:08 +01:00
eldritch horrors bc34274aae Merge pull request #9588 from obsidiansystems/queryDerivationOutputMap-evalStore 
Give `Store::queryDerivationOutputMap` and `evalStore` argument

(cherry picked from commit 8cddda4f89)
Change-Id: I394e7e11c3f2e0cd3dbe0f48d757c14c09835e44
 2024-03-04 07:13:33 +01:00
eldritch horrors fa03f23923 Merge pull request #9587 from amjoseph-nixpkgs/pr/wopBuildDerivation/explain 
libstore/daemon.cc: note trust model difference in readDerivation()s

(cherry picked from commit 5c917c3204)
Change-Id: I9945bc84e9529b005eafdc5c08b5bf1553335340
 2024-03-04 07:13:00 +01:00
eldritch horrors 2ba9788003 Merge pull request #9555 from 9999years/positions-in-errors 
Pass positions when evaluating

(cherry picked from commit c8458bd731)
Change-Id: I1b4a5d58973be6264ffdb23b4492da200fdb71be
 2024-03-04 07:11:25 +01:00
eldritch horrors d42cd24afe Merge pull request #9563 from obsidiansystems/tryResolve-evalStore 
Give `Derivation::tryResolve` an `evalStore` argument

(cherry picked from commit 36ca6adc60)
Change-Id: If76b185a01ffa982e4c49cf333a9b5fbf9edebfe
 2024-03-04 07:11:25 +01:00
eldritch horrors dd2926f7ea Merge pull request #9557 from bryanhonof/bryanhonof.fix-apple-double-shenanigans 
Add option to libarchive so it behaves correctly

(cherry picked from commit c3827ff634)
Change-Id: Ib0f928851093f4c644bac071d1c8f8aeec803198
 2024-03-04 07:11:25 +01:00
eldritch horrors 94bf5a8018 Merge pull request #9494 from sellout/nix-run-execv 
Don’t use `execvp` when we know the path

(cherry picked from commit dfa219d03b)
Change-Id: I2226340cebbe935e1f2fe10207daba69683c8cb3
 2024-03-04 07:11:25 +01:00
eldritch horrors 4018fcb9b8 Merge pull request #9233 from bouk/bouk/apply-config-inner 
config: add included files into parsedContents before applying
(cherry picked from commit 82359eba6b)
Change-Id: Idde3177010fec7b8bafe6088c3c23d5caf491845
 2024-03-04 07:11:25 +01:00
eldritch horrors a2d5e803cf Merge pull request #9476 from alois31/restore-progress-bar 
nix repl: Only hide the progress bar while waiting for user input

(cherry picked from commit 3bebaefcd0)
Change-Id: Ie7c0db46f7c2cf5f938e66bdd3c31f0b62bdb104
 2024-03-04 07:11:25 +01:00
eldritch horrors 001be52794 Merge pull request #9430 from hercules-ci/remove-vlas 
Fix stack overflow in `filter`

(cherry picked from commit cb7f25869d)
Change-Id: Ib90f97a9805bbb4d0e2741551d490f054fc0a675
 2024-03-04 07:11:25 +01:00
eldritch horrors a089d8f5f6 Merge pull request #9465 from obsidiansystems/build-dir 
Use `buildprefix` in a few more places

(cherry picked from commit b6a3fde6b7)
Change-Id: I2790663fa9f8242ac2db6582b7e421d2fdf42942
 2024-03-04 07:11:25 +01:00
eldritch horrors c208e918e5 fix: nlohmann::adl_serializer for std::optional (#9147) 
This allows templates such as `NLOHMANN_DEFINE_TYPE_*` templates and other generators with things like `std::vector<std::optional<T>>`.

Co-authored-by: John Ericson <John.Ericson@Obsidian.Systems>
(cherry picked from commit 02bd821f2e)
Change-Id: I8b0ebcf2af4226610dadd565962f2d2327415a03
 2024-03-04 07:11:25 +01:00
eldritch horrors b7c61d337b Merge pull request #9462 from trofi/eval.o-dependency 
libexpr: add missing dependency on 'flake/call-flake.nix.gen.hh'
(cherry picked from commit f0180487a0)
Change-Id: I27211872ad75034ae3f04e18b2987f9968073d00
 2024-03-04 07:11:25 +01:00
eldritch horrors cad1683048 Merge pull request #9398 from Qyriad/fixes/flake-not-found 
flakes: bare minimum fix the error message for untracked flake.nix
(cherry picked from commit 7f626dba33)
Change-Id: I470ac56a670a8c11e4164c6b059184a02344d491
 2024-03-04 06:03:33 +01:00
eldritch horrors cba87025f8 Merge pull request #9445 from NixOS/allow-input-in-git-commit 
Allow user input in `git commit`

(cherry picked from commit 43fb39ca29)
Change-Id: I13bd4c007234ee2133289c68ef8ab2eae4def78a
 2024-03-04 06:01:09 +01:00
eldritch horrors 340a6cf977 Merge pull request #9257 from Artturin/nixenvjsondrvpath 
`nix-env --query`: fix `--json` ignoring `--drv-path`

(cherry picked from commit 516e7ddc41)
Change-Id: I84b5bccea9d0383e2e74544743b703942e7be547
 2024-03-04 05:59:15 +01:00
eldritch horrors 01069d8c46 Merge pull request #9400 from hercules-ci/refactors-from-5e3986f59cb 
Refactors from 5e3986f59c

(cherry picked from commit e540d48c4f)
Change-Id: I5b21b770a0c20ec2ec9845d3a97a524f1b0135ee
 2024-03-04 05:58:02 +01:00
eldritch horrors 439f88b7d7 Merge pull request #9399 from edolstra/revert-vlas 
Revert use of boost::container::small_vector in the evaluator

(cherry picked from commit 6832d18ac7)
Change-Id: I7f10af0c8b8a8beb4b1e36424120995f4ed82738
 2024-03-04 05:57:04 +01:00
eldritch horrors 3f3badffc9 Merge pull request #9395 from nbraud/buitlins 
builtins.concatMap: Fix typo in error message

(cherry picked from commit 4292d99756)
Change-Id: Ia33d1b02e41f699ef0c8c2d6487c9f70b2cc8cf4
 2024-03-04 05:56:04 +01:00
eldritch horrors 2df9c2c00f Merge pull request #9374 from hercules-ci/fix-nogc 
Fix buildNoGc

(cherry picked from commit 7762335a9c)
Change-Id: I3ad53c9c1dd9180a2abc3528e9437c28ac95b303
 2024-03-04 05:54:10 +01:00
eldritch horrors 5d77afe0a4 Merge pull request #6469 from gbpdt/fix/skipped_build_locking 
Unlock output paths when a derivation is already built

(cherry picked from commit 7ba4e073e8)
Change-Id: I9de077679290d5141a610ac43d99d3a43acff87c
 2024-03-04 05:53:17 +01:00
eldritch horrors 5e182235cb Merge pull request #7348 from thufschmitt/dont-use-vlas 
Remove the usage of VLAs in the code

(cherry picked from commit ac4431e9d0)
Change-Id: Ifbf5fbfc2e27122362a2aaea4b62c7cf3ca46b1a
 2024-03-04 05:51:23 +01:00
eldritch horrors 30f3298e9d Merge pull request #9364 from edolstra/fix-coverage 
Fix a broken generated header file dependency

(cherry picked from commit 57de482e00)
Change-Id: I0580274bf51132fbeb34e8c0a91a7017071d2bb3
 2024-03-04 05:48:04 +01:00
eldritch horrors 1b135e6e7b Fix boost::bad_format_string exception in builtins.addErrorContext (#9291) 
* Fix boost::bad_format_string exception in builtins.addErrorContext

The message passed to addTrace was incorrectly being used as a format
string and this this would cause an exception when the string contained
a '%', which can be hit in places where arbitrary file paths are
interpolated.

* add test

(cherry picked from commit 61d6fe059e)
Change-Id: Idd671127a9c1ccc8b94e58e727632fcc064f3cbe
 2024-03-04 05:39:12 +01:00
eldritch horrors 6cb215f63b Merge pull request #9293 from ThinkChaos/ssh-misc-improvments 
SSH small improvments

(cherry picked from commit dcc49744ed)
Change-Id: Ie87910df3ab739d0ff983c085190da1d108e96e2
 2024-03-04 05:38:09 +01:00
eldritch horrors b7e7949035 Merge pull request #9299 from tfc/config-improvements 
Improvements in src/libutil/config.*

(cherry picked from commit dea63bb810)
Change-Id: I8090eb2ad393dd9964cf2d5254ec8c796b1bd367
 2024-03-04 05:36:42 +01:00
eldritch horrors 6e0dd9f673 Merge pull request #9289 from edolstra/fix-warnings 
Fix gcc warnings

(cherry picked from commit 66cb364f58)
Change-Id: I1474dbc18a4beaaf1bce16d4abbcc99806b79ff1
 2024-03-04 05:27:35 +01:00
eldritch horrors 26e17eedef Merge pull request #9277 from keszybz/file-permissions 
Remove stray executable permissions on source files

(cherry picked from commit a80fb9fa39)
Change-Id: I603b18ddda76041991101ef0597ec804c2b55dc0
 2024-03-04 05:26:17 +01:00
eldritch horrors 6211e5e284 Merge pull request #9271 from keszybz/if-fix 
fix: gcc complains about if which doesn't guard the indented statement
(cherry picked from commit 8d66346293)
Change-Id: Ifa2e65502de4000935549dde82ab1b5867e2f0ed
 2024-03-04 05:26:02 +01:00
eldritch horrors 559a8c44c3 Merge pull request #6258 from obsidiansystems/gcc-bug-ergonomics 
Remove bug-avoiding `StoreConfig *` casts for settings

(cherry picked from commit e3febfcd53)
Change-Id: Ifeae276582fdbc781a38581df9de3da67a7e7bf9
 2024-03-04 05:24:33 +01:00
eldritch horrors 4206441a12 Merge pull request #9246 from trofi/clarify-builder-uid-exhaustion 
local-derivation-goal.cc: slightly clarify waiting message

(cherry picked from commit 232e236672)
Change-Id: Idd271d6921caba203db9971f27e156e533664935
 2024-03-04 05:19:38 +01:00
eldritch horrors 89e03988ec Merge pull request #9238 from tfc/small-improvements2 
Small improvements 2

(cherry picked from commit 1dc6a65d36)
Change-Id: I8ed573c496068c4a92f53c1caafa49da59d75967
 2024-03-04 05:18:05 +01:00
eldritch horrors 622b0e9428 Merge pull request #8965 from Artturin/bindfilesinchroot 
Bindmount files instead of hardlinking or copying to chroot

(cherry picked from commit 622191c2b5)
Change-Id: I278ec1baacdfa9044992b58fdec8f14d6d7d09ce
 2024-03-04 05:17:31 +01:00