aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2024-03-04Merge pull request #9804 from edolstra/missing-nar-crasheldritch horrors
Fix crash when NAR is missing from binary cache (cherry picked from commit 3b20cca9625a1701a10a883735e7315185629563) Change-Id: I50ff18f4a6de69c323473b4a8e3e098d1f365145
2024-03-04Merge pull request #9798 from edolstra/remote-store-eofeldritch horrors
Print a more helpful message if the daemon crashes (cherry picked from commit 32706b14a7531c2c21b9f96da083a540a0031ec4) Change-Id: Ief7c465bca7666e2b7e7c9d1dd0c01c5f9014146
2024-03-04Merge pull request #9797 from edolstra/fix-error-messageeldritch horrors
Store: :buildPaths(): Fix display of store paths (cherry picked from commit b5ed36e6633cac844fe4388dcc0cc8055a18ef9e) Change-Id: Ic6008491088dc6febd4a1e44dc2dbb96c47661f4
2024-03-04Merge pull request #9747 from awakesecurity/mz/fix-quadratic-splitStringeldritch horrors
Fix performance of builtins.substring for empty substrings (cherry picked from commit b2deff1947c2fe57fdbf1a472eb9003eb407f8d3) Change-Id: I4ddfc8d26a4781c9520fff9807849a073ee7bed8
2024-03-04Merge pull request #9763 from L-as/avoid-unnecessary-copyeldritch horrors
Avoid unnecessary copy of goal log (cherry picked from commit 268c49264ae2657c602f84f9bff3eb31306253ea) Change-Id: I5d9de9e43a7ddcb09d25bbc7367c9d83f58c7a75
2024-03-04Merge pull request #8043 from bobvanderlinden/pr-shell-enveldritch horrors
nix: develop: use SHELL from rc script (cherry picked from commit 0d55d660d5ea081630aa9606b047eb755cff1528) Change-Id: I83be6c63b282d7f01a0defa78d9e787c77f1f02d
2024-03-04Merge pull request #9648 from cole-h/nix-shell-orderingeldritch horrors
nix shell: reflect command line order in PATH order (cherry picked from commit b91c935c2faf08ced2c763dcd2a831f26d84fa86) Change-Id: If16c120bb74857c2817366e74e5b0877eb997260
2024-03-04Merge pull request #9662 from shlevy/flat-fixed-references-asserteldritch horrors
Improve error message for fixed-outputs with references. (cherry picked from commit ff6de4a9ee6c3862db9ee5f09ff9c3f43ae7a088) Change-Id: I733c49760b9a3f1b76a6bece3b250b8579cd6cac
2024-03-04Merge pull request #9670 from DavHau/log-lineseldritch horrors
saner default for log-lines: change to 25 (cherry picked from commit dedbbbb451bb8f2bd0925e59a8b3d127157015f8) Change-Id: I8847df4aeb6e5c2d2be0e04f2a0a1aa595cb3b2f
2024-03-04Merge pull request #9687 from edolstra/withFramedSink-ctrl-c-hangeldritch horrors
withFramedSink(): Receive interrupts on the stderr thread (cherry picked from commit 965cfe96886c988c3aa94bfc7fefdd37325f4536) Change-Id: I8320a96957c01ec0e3450d1b3ae38a3baff78d49
2024-03-04Merge pull request #9681 from edolstra/eval-optimisationseldritch horrors
Optimize empty list constants (cherry picked from commit 315aade89d00c692715e5953c36a1b7d6528b703) Change-Id: I0f28ef8a27ccedc45acf44243eec9dc35b733300
2024-03-04Merge pull request #9658 from pennae/env-dieteldritch horrors
reduce the size of Env by one pointer (cherry picked from commit 83f5622545a2fc31eb7e7d5105f64ed6dd3058b3) Change-Id: I5636290526d0165cfc61aee1e7a5b94db4a26cef
2024-03-04Merge pull request #9673 from pennae/drv-parse-optseldritch horrors
optimize derivation parsing (cherry picked from commit 3511430902941f0f26dc71313a54bb5096f57305) Change-Id: I00f76dcd464a5811944613731501af504b6e8c29
2024-03-04Merge pull request #9617 from 9999years/stack-overflow-segfaulteldritch horrors
Fix segfault on infinite recursion in some cases (cherry picked from commit bf1b294bd81ca76c5ec9fe3ecd52196bf52a8300) Change-Id: Id137541426ec8536567835953fccf986a3aebf16
2024-03-04Merge pull request #9666 from unblevable/dervation-typoeldritch horrors
Fix "dervation" typo (cherry picked from commit a21c762dab365049b77af95355ee4236d173e216) Change-Id: Ib6c0521758eb23115cfa243b9f3a34bb6e249e5f
2024-03-04Merge pull request #9582 from pennae/misc-optseldritch horrors
a packet of small optimizations (cherry picked from commit ee439734e924eb337a869ff2e48aff8b989198bc) Change-Id: I125d870710750a32a0dece48f39a3e9132b0d023
2024-03-04Merge pull request #9621 from blaggacao/fix/too-restrictive-branch-regex-mastereldritch horrors
fix: valid branch name (cherry picked from commit d2016c6b59f4a5223a18c92c817d61c448ce39ab) Change-Id: Ic346739b91bf1b10515c9ff3b3e180a64afe6343
2024-03-04Merge pull request #9645 from tweag/undeprecate-isNulleldritch horrors
Undeprecate isNull (cherry picked from commit 8e64cd59b0fe1a4e1d3ba8d359ea0f9af2936f94) Change-Id: If36b85a3fc01ee700bcaf4d5d83a5884a4b5de92
2024-03-04Merge pull request #9641 from amarshall/darwin-sandbox-stderreldritch horrors
Allow access to /dev/stderr in Darwin sandbox (cherry picked from commit c6d7013583c568590aff285fb7414d1675a745f4) Change-Id: I5657f6f4ee9dad8c978bad0d71f5cac51584e4f2
2024-03-04Merge pull request #9619 from 9999years/remove-blank-lines-in-errorseldritch horrors
Remove some blank lines from stack traces (cherry picked from commit cea83544362bd6426e9bc0b7dd0d611c19b0e3fd) Change-Id: Ic1af8b09e9994d3c69fd3b37ae47a4bb786a15a1
2024-03-04Merge pull request #4093 from matthewbauer/eval-systemeldritch horrors
Add eval-system option (cherry picked from commit 071dbbee33af9f27338c3e53e4ea067dbfa14010) Change-Id: Ia81358c8cfb60241da07a4d0e84b9ee62a18a53f
2024-03-04Merge pull request #9600 from SharzyL/fix_nix_copyeldritch horrors
fix: nix copy ssh-ng:// not respecting --substitute-on-destination (cherry picked from commit b1c633c6bb2e2dbc8a2891edf0d0c6f9d31d890b) Change-Id: I77356d14a9011d6dc4cf64776995f7590d918874
2024-03-04Merge pull request #9589 from ↵eldritch horrors
obsidiansystems/floating-content-addressing-derivations-eval-store Fix building CA derivations with and eval store (cherry picked from commit dfc0cee7024a082d90a4f68296f55a82dfd52126) Change-Id: I28feb5a36d4fe75f0ed3e3e2db6eb56b67d0f371
2024-03-04Merge pull request #9588 from obsidiansystems/queryDerivationOutputMap-evalStoreeldritch horrors
Give `Store::queryDerivationOutputMap` and `evalStore` argument (cherry picked from commit 8cddda4f892cb42be43e9bd87aa0111572617e78) Change-Id: I394e7e11c3f2e0cd3dbe0f48d757c14c09835e44
2024-03-04Merge pull request #9587 from amjoseph-nixpkgs/pr/wopBuildDerivation/explaineldritch horrors
libstore/daemon.cc: note trust model difference in readDerivation()s (cherry picked from commit 5c917c32048ef185ea0eec352c3505485aa3212c) Change-Id: I9945bc84e9529b005eafdc5c08b5bf1553335340
2024-03-04Merge pull request #9555 from 9999years/positions-in-errorseldritch horrors
Pass positions when evaluating (cherry picked from commit c8458bd731eb1c74159bebe459ea00165e056b65) Change-Id: I1b4a5d58973be6264ffdb23b4492da200fdb71be
2024-03-04Merge pull request #9563 from obsidiansystems/tryResolve-evalStoreeldritch horrors
Give `Derivation::tryResolve` an `evalStore` argument (cherry picked from commit 36ca6adc60511dc822870f2df43c0a578e481925) Change-Id: If76b185a01ffa982e4c49cf333a9b5fbf9edebfe
2024-03-04Merge pull request #9557 from bryanhonof/bryanhonof.fix-apple-double-shenaniganseldritch horrors
Add option to libarchive so it behaves correctly (cherry picked from commit c3827ff6348a4d5199eaddf8dbc2ca2e2ef46ec5) Change-Id: Ib0f928851093f4c644bac071d1c8f8aeec803198
2024-03-04Merge pull request #9494 from sellout/nix-run-execveldritch horrors
Don’t use `execvp` when we know the path (cherry picked from commit dfa219d03b2277e61dde1c1ddddddff7411ef112) Change-Id: I2226340cebbe935e1f2fe10207daba69683c8cb3
2024-03-04Merge pull request #9233 from bouk/bouk/apply-config-innereldritch horrors
config: add included files into parsedContents before applying (cherry picked from commit 82359eba6b692691ef08a71196ef25a61bc4d3d3) Change-Id: Idde3177010fec7b8bafe6088c3c23d5caf491845
2024-03-04Merge pull request #9476 from alois31/restore-progress-bareldritch horrors
nix repl: Only hide the progress bar while waiting for user input (cherry picked from commit 3bebaefcd0c5d650f7edcd39f397bb45c4382f41) Change-Id: Ie7c0db46f7c2cf5f938e66bdd3c31f0b62bdb104
2024-03-04Merge pull request #9430 from hercules-ci/remove-vlaseldritch horrors
Fix stack overflow in `filter` (cherry picked from commit cb7f25869daa2491eeac5fee49ad8f31b2218c15) Change-Id: Ib90f97a9805bbb4d0e2741551d490f054fc0a675
2024-03-04Merge pull request #9465 from obsidiansystems/build-direldritch horrors
Use `buildprefix` in a few more places (cherry picked from commit b6a3fde6b7a416929553e6be36fc991680ddf9ef) Change-Id: I2790663fa9f8242ac2db6582b7e421d2fdf42942
2024-03-04fix: `nlohmann::adl_serializer` for `std::optional` (#9147)eldritch horrors
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 02bd821f2e71372d31bbe6700bd68086cc2ee70a) Change-Id: I8b0ebcf2af4226610dadd565962f2d2327415a03
2024-03-04Merge pull request #9462 from trofi/eval.o-dependencyeldritch horrors
libexpr: add missing dependency on 'flake/call-flake.nix.gen.hh' (cherry picked from commit f0180487a0e4c0091b46cb1469c44144f5400240) Change-Id: I27211872ad75034ae3f04e18b2987f9968073d00
2024-03-04Merge pull request #9398 from Qyriad/fixes/flake-not-foundeldritch horrors
flakes: bare minimum fix the error message for untracked flake.nix (cherry picked from commit 7f626dba332f320fafb9f9c749986ea523d20f42) Change-Id: I470ac56a670a8c11e4164c6b059184a02344d491
2024-03-04Merge pull request #9445 from NixOS/allow-input-in-git-commiteldritch horrors
Allow user input in `git commit` (cherry picked from commit 43fb39ca29a0b054a4c18623520c496d27c57192) Change-Id: I13bd4c007234ee2133289c68ef8ab2eae4def78a
2024-03-04Merge pull request #9257 from Artturin/nixenvjsondrvpatheldritch horrors
`nix-env --query`: fix `--json` ignoring `--drv-path` (cherry picked from commit 516e7ddc41f39ff939b5d5b5dc71e590f24890d4) Change-Id: I84b5bccea9d0383e2e74544743b703942e7be547
2024-03-04Merge pull request #9400 from hercules-ci/refactors-from-5e3986f59cbeldritch horrors
Refactors from 5e3986f59cb (cherry picked from commit e540d48c4fb460e5e577d8b8b33e8eca9959c49b) Change-Id: I5b21b770a0c20ec2ec9845d3a97a524f1b0135ee
2024-03-04Merge pull request #9399 from edolstra/revert-vlaseldritch horrors
Revert use of boost::container::small_vector in the evaluator (cherry picked from commit 6832d18ac734f4b855f97c07b158491dd01cefcd) Change-Id: I7f10af0c8b8a8beb4b1e36424120995f4ed82738
2024-03-04Merge pull request #9395 from nbraud/buitlinseldritch horrors
builtins.concatMap: Fix typo in error message (cherry picked from commit 4292d997568eb30503e287f98e24821ff0bc2816) Change-Id: Ia33d1b02e41f699ef0c8c2d6487c9f70b2cc8cf4
2024-03-04Merge pull request #9374 from hercules-ci/fix-nogceldritch horrors
Fix buildNoGc (cherry picked from commit 7762335a9c4d56f7501825345728c3f94e88bc31) Change-Id: I3ad53c9c1dd9180a2abc3528e9437c28ac95b303
2024-03-04Merge pull request #6469 from gbpdt/fix/skipped_build_lockingeldritch horrors
Unlock output paths when a derivation is already built (cherry picked from commit 7ba4e073e8622ca86b52e03d68476e80250ab62f) Change-Id: I9de077679290d5141a610ac43d99d3a43acff87c
2024-03-04Merge pull request #7348 from thufschmitt/dont-use-vlaseldritch horrors
Remove the usage of VLAs in the code (cherry picked from commit ac4431e9d016e62fb5dc9ae36833bd0c6cdadeec) Change-Id: Ifbf5fbfc2e27122362a2aaea4b62c7cf3ca46b1a
2024-03-04Merge pull request #9364 from edolstra/fix-coverageeldritch horrors
Fix a broken generated header file dependency (cherry picked from commit 57de482e00221d781f916d49c315a8fa0816e956) Change-Id: I0580274bf51132fbeb34e8c0a91a7017071d2bb3
2024-03-04Fix `boost::bad_format_string` exception in `builtins.addErrorContext` (#9291)eldritch horrors
* 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 61d6fe059e959455e156c1d57bb91155d363e983) Change-Id: Idd671127a9c1ccc8b94e58e727632fcc064f3cbe
2024-03-04Merge pull request #9293 from ThinkChaos/ssh-misc-improvmentseldritch horrors
SSH small improvments (cherry picked from commit dcc49744ed0c3b91f905b0f3304d3ca700f9f717) Change-Id: Ie87910df3ab739d0ff983c085190da1d108e96e2
2024-03-04Merge pull request #9299 from tfc/config-improvementseldritch horrors
Improvements in src/libutil/config.* (cherry picked from commit dea63bb81078d7290410544285c6df1a8e002952) Change-Id: I8090eb2ad393dd9964cf2d5254ec8c796b1bd367
2024-03-04Merge pull request #9289 from edolstra/fix-warningseldritch horrors
Fix gcc warnings (cherry picked from commit 66cb364f581486e0c426b35149ac13d19f7842bc) Change-Id: I1474dbc18a4beaaf1bce16d4abbcc99806b79ff1
2024-03-04Merge pull request #9277 from keszybz/file-permissionseldritch horrors
Remove stray executable permissions on source files (cherry picked from commit a80fb9fa398cf39472be800b42020d2ff4a0df42) Change-Id: I603b18ddda76041991101ef0597ec804c2b55dc0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 10:34:06 +0000