aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-04Merge pull request #9919 from 9999years/reduce-debugger-cluttereldritch horrors
Reduce visual clutter in the debugger (cherry picked from commit f388a6148dae0fc999f1a67d0b96d76788f9b97f) Change-Id: I21bfe3e9f75816484b0f46dbe09e0ff40b22c6d9
2024-03-04Merge pull request #9930 from rvl/print-dev-env-unbound-variableseldritch horrors
print-dev-env: Avoid using unbound shellHook variable (cherry picked from commit 25385a408ef7281d966c8732608833e224b32586) Change-Id: Id1aca13942adfa628f7bdcfc0b6fc03bb3bab9ea
2024-03-04Merge pull request #9913 from 9999years/debugger-positionseldritch horrors
Print positions in `--debugger`, instead of pointers (cherry picked from commit 49cf090cb2f51d6935756a6cf94d568cab063f81) Change-Id: Ic27917b2aab3657c28d599898377bf0c14753f8a
2024-03-04Merge pull request #9861 from 9999years/colored-diff-in-lang-testseldritch horrors
Color `diff` output in `tests/functional/lang` tests (cherry picked from commit 1dc55c0f2f034bce6e3de4a5cda96d686b10a7f8) Change-Id: Ie9b3fc3446bd3caa0fd8885de88639516a2ff862
2024-03-04Merge pull request #9848 from obsidiansystems/default-system-features-staticeldritch horrors
Make `StoreConfig::getDefaultSystemFeatures` a static method (cherry picked from commit 5a9513cdbae31ea5e6f6e7afa7b3c2e3a9a26474) Change-Id: Ia9c0ae2b7de419bd60aea8bf905154b96c428276
2024-03-04Merge pull request #9844 from NixOS/pkg-config-gmockeldritch horrors
Link both gmock and gtest, not just gtest (cherry picked from commit 979b00bce9efa9560a58a10661865f4e896d0903) Change-Id: Ic12d596e635057d67de277fbeb1602017e7623d0
2024-03-04Merge pull request #9841 from obsidiansystems/float-speed-factoreldritch horrors
Convert `Machine::speedFactor` from a non-neg int to a non-neg float (cherry picked from commit 69d0ae27e376e7c7c4f237716b0149223b8a805a) Change-Id: I2afb5cf9e4fe1384985c58353946135c3d102b42
2024-03-04Merge pull request #9481 from ↵eldritch horrors
iFreilicht/disallow-nix-search-without-search-terms nix search: Disallow empty regex (cherry picked from commit 1c260fa6d1f47d83954792771d0614db163cc3bc) Change-Id: Iaaf3605c24a342fcb05d0b534a9f305533d3b5fa
2024-03-04Merge pull request #9838 from obsidiansystems/systemTypes-seteldritch horrors
Make `Machine::systemTypes` a set not vector (cherry picked from commit f1b030415376e81c5804647c055d71eaba4aa725) Change-Id: I6d4f5c0bfc226e9bd66c58c360cd99e3fac9a129
2024-03-04Merge pull request #9805 from yshui/prefetch-unpackeldritch horrors
Add --unpack to nix store prefetch-file (cherry picked from commit f51409cf98e9b18f27a6d0240a0aa0c3f37c2fd0) Change-Id: I974b04f3efc8b210a9399a71d3704490cfc2c80c
2024-03-04Merge pull request #9632 from cole-h/nix-daemon-testingeldritch horrors
Use `nix daemon` in the test suite (cherry picked from commit e6e160a0758c0354ed810b0ec9846ed885adcc11) Change-Id: I537a25d3d48f609cd77b2c3a8ad68e87aebabfe8
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 #9785 from hercules-ci/test-substring-negativeeldritch horrors
tests/functional/lang: Test substring with negative length (cherry picked from commit 86156d05dd33f856d8804f89669a7fe9b81f1a0d) Change-Id: I2e2086027a43f8111ba5068ac16590eaa0b798d4
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 #9726 from DavHau/gitignoreeldritch horrors
gitignore: add result-* (cherry picked from commit 47633ceec3b228490a7bcab06c679d9a3de9d9ff) Change-Id: I4480d7dd8146600d1334c75b39ff3b3b2f9496eb
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 #9692 from 9999years/update-clang-stdenveldritch horrors
Remove `clang11Stdenv` (cherry picked from commit cbf99c71c6f58579174c1c7649a5421c1d2ba9b0) Change-Id: I716ce1a54f2006c4a9dc9716e8529fe7858ecebb
2024-03-04Merge pull request #9690 from obsidiansystems/nixos-23.05-small-againeldritch horrors
flake: Go back to regular `nixos-23.05-small` (cherry picked from commit 1ed245a60672c123c1348a63061fb4d64fb95212) Change-Id: I33f5fe20cd6bc658a461f560e458b440b3b7e18e
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 #9637 from 9999years/fix-logging-test-on-macoseldritch horrors
Fix `logging.sh` test on macOS (cherry picked from commit 94a03a810e948f65776c3386d9a5234db551dc9e) Change-Id: I65dde18ee53ccded31790e0cf1f836c3ad6dc492
2024-03-04Merge pull request #9639 from awakesecurity/mz/darwin-UID-overrideeldritch horrors
installer: allow overriding of NIX_FIRST_BUILD_ID on darwin (cherry picked from commit e85fd92816571ea00abafa3929298d0e091bcb9b) Change-Id: Ifffc3fedd740079345c205f54c62c76053e24846
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 #9575 from hercules-ci/shell-on-hydraeldritch horrors
flake.nix: Cache shell inputs through hydra (cherry picked from commit b1842a4f05113967e8c20c9ebfd79edc39da259b) Change-Id: I9e59b3c7dbf441e74cff3e4f24bbf65170ac505b
2024-03-04Merge pull request #9573 from hercules-ci/rl-next-md-frontmattereldritch horrors
rl-next: Fix and support markdown frontmatter syntax (cherry picked from commit 69b7876a0810269ad71807594cfd99b26cd8a5ff) Change-Id: I8bfb8967af0943080fdd70d257c34abaf0a9fedf
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 #9518 from NixOS/fix-static-buildeldritch horrors
Update Nixpkgs to fix static build (cherry picked from commit 9817788f6b25fefa731b838391f859e886ae0d24) Change-Id: Ibe07a263f4d8f3b230775fb993881e5151a53784
2024-03-04Merge pull request #9529 from wh0/patch-1eldritch horrors
tests: avoid a chroot store without sandbox support (cherry picked from commit 5910140f252280f6be429d1cb5e91e69999f5b43) Change-Id: Ic2255261334012f36a465a96073f50669952dc26
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 07:05:37 +0000