eldritch horrors
e8f1acfb18
Merge pull request #5145 from fedepell/local_doc_build_5140
...
Docs build: depend on locally built nix executable and not installed one
(cherry picked from commit ca72e3e7e8#9976 from alois31/restore-manual-pages
Restore manual pages
(cherry picked from commit d3c1997127e0fc08576e842b2bfe046d8a28d2f4)
Change-Id: I685ff16163ac552a1754570c03c992c63a461d50
2024-03-05 23:01:05 +01:00
eldritch horrors
13d2f96257
Merge pull request #9541 from obsidiansystems/config-buildprefix-fix
...
Including `config.h` also needs `$(buildprefix)`
(cherry picked from commit 96fdea3394I8b5c0b1826aa007aa681c8b199f9b1489cac6784
2024-03-05 21:16:55 +01:00
eldritch horrors
2e1f5e2666
Merge pull request #9105 from Ericson2314/split-out-nixos-tests
...
Define NixOS tests in `tests/nixos/default.nix` rather than `flake.nix`
(cherry picked from commit c29b8ba142Ieae1b6476d95024485df7067e008013bc5542039
2024-03-05 21:11:59 +01: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
edb8e24ee0
Merge pull request #10001 from abathur/fix_macos_daemon_perms
...
install-darwin: fix symbolic perms for install cmd
(cherry picked from commit ee9f6d022f33663501503cf7d2b3d0cf605ac268)
Change-Id: I83240e1e93aa9a2ba34d5ac3abd8ef4f7ec54ac3
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: I513cceaac1371decb3d96231e6ef9181c910c218I531a51f6348a746e8e41d88203b08f614898356c
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 28a988bddeIbb49b71bf631d04d08970d719f091221b15c5036
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 9b8b486091Ica6a17e4b3e3b8b8093719f442c28be7f13be09d
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 acef4f17a2Ib3623254f67ac762f4e7230d625e9f87dff38a84
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 fb78a99e04I9ade553d9f499e6713aeff3463c9a653a880a051
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 f388a6148dI21bfe3e9f75816484b0f46dbe09e0ff40b22c6d9
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 25385a408eId1aca13942adfa628f7bdcfc0b6fc03bb3bab9ea
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 49cf090cb2Ic27917b2aab3657c28d599898377bf0c14753f8a
2024-03-04 08:51:02 +01:00
eldritch horrors
74272a9bc4
Merge pull request #9861 from 9999years/colored-diff-in-lang-tests
...
Color `diff` output in `tests/functional/lang` tests
(cherry picked from commit 1dc55c0f2fIe9b3fc3446bd3caa0fd8885de88639516a2ff862
2024-03-04 08:50:00 +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 5a9513cdbaIa9c0ae2b7de419bd60aea8bf905154b96c428276
2024-03-04 08:47:55 +01:00
eldritch horrors
50ef364dbe
Merge pull request #9844 from NixOS/pkg-config-gmock
...
Link both gmock and gtest, not just gtest
(cherry picked from commit 979b00bce9Ic12d596e635057d67de277fbeb1602017e7623d0
2024-03-04 08:47:39 +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 69d0ae27e3I2afb5cf9e4fe1384985c58353946135c3d102b42
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 1c260fa6d1Iaaf3605c24a342fcb05d0b534a9f305533d3b5fa
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 f1b0304153I6d4f5c0bfc226e9bd66c58c360cd99e3fac9a129
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 f51409cf98I974b04f3efc8b210a9399a71d3704490cfc2c80c
2024-03-04 08:24:18 +01:00
eldritch horrors
b6bb869e52
Merge pull request #9632 from cole-h/nix-daemon-testing
...
Use `nix daemon` in the test suite
(cherry picked from commit e6e160a075I537a25d3d48f609cd77b2c3a8ad68e87aebabfe8
2024-03-04 08:17:32 +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 3b20cca962I50ff18f4a6de69c323473b4a8e3e098d1f365145
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 32706b14a7Ief7c465bca7666e2b7e7c9d1dd0c01c5f9014146
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 b5ed36e663Ic6008491088dc6febd4a1e44dc2dbb96c47661f4
2024-03-04 08:11:46 +01:00
eldritch horrors
e81ee8b337
Merge pull request #9785 from hercules-ci/test-substring-negative
...
tests/functional/lang: Test substring with negative length
(cherry picked from commit 86156d05ddI2e2086027a43f8111ba5068ac16590eaa0b798d4
2024-03-04 08:07:16 +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 b2deff1947I4ddfc8d26a4781c9520fff9807849a073ee7bed8
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 268c49264aI5d9de9e43a7ddcb09d25bbc7367c9d83f58c7a75
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 0d55d660d5I83be6c63b282d7f01a0defa78d9e787c77f1f02d
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 b91c935c2fIf16c120bb74857c2817366e74e5b0877eb997260
2024-03-04 07:50:55 +01:00
eldritch horrors
aaf1ed1a4c
Merge pull request #9726 from DavHau/gitignore
...
gitignore: add result-*
(cherry picked from commit 47633ceec3I4480d7dd8146600d1334c75b39ff3b3b2f9496eb
2024-03-04 07:50:42 +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 ff6de4a9eeI733c49760b9a3f1b76a6bece3b250b8579cd6cac
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 dedbbbb451I8847df4aeb6e5c2d2be0e04f2a0a1aa595cb3b2f
2024-03-04 07:48:57 +01:00
eldritch horrors
4c56629a52
Merge pull request #9692 from 9999years/update-clang-stdenv
...
Remove `clang11Stdenv`
(cherry picked from commit cbf99c71c6I716ce1a54f2006c4a9dc9716e8529fe7858ecebb
2024-03-04 07:48:42 +01:00
eldritch horrors
298be50d7d
Merge pull request #9690 from obsidiansystems/nixos-23.05-small-again
...
flake: Go back to regular `nixos-23.05-small`
(cherry picked from commit 1ed245a606I33f5fe20cd6bc658a461f560e458b440b3b7e18e
2024-03-04 07:47:58 +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 965cfe9688I8320a96957c01ec0e3450d1b3ae38a3baff78d49
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 315aade89dI0f28ef8a27ccedc45acf44243eec9dc35b733300
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 83f5622545I5636290526d0165cfc61aee1e7a5b94db4a26cef
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 3511430902I00f76dcd464a5811944613731501af504b6e8c29
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 bf1b294bd8Id137541426ec8536567835953fccf986a3aebf16
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 a21c762dabIb6c0521758eb23115cfa243b9f3a34bb6e249e5f
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 ee439734e9I125d870710750a32a0dece48f39a3e9132b0d023
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 d2016c6b59Ic346739b91bf1b10515c9ff3b3e180a64afe6343
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 8e64cd59b0If36b85a3fc01ee700bcaf4d5d83a5884a4b5de92
2024-03-04 07:27:37 +01:00
eldritch horrors
859da103ae
Merge pull request #9637 from 9999years/fix-logging-test-on-macos
...
Fix `logging.sh` test on macOS
(cherry picked from commit 94a03a810eI65dde18ee53ccded31790e0cf1f836c3ad6dc492
2024-03-04 07:26:34 +01:00
eldritch horrors
1d6ae6f9ff
Merge pull request #9639 from awakesecurity/mz/darwin-UID-override
...
installer: allow overriding of NIX_FIRST_BUILD_ID on darwin
(cherry picked from commit e85fd92816Ifffc3fedd740079345c205f54c62c76053e24846
2024-03-04 07:26:19 +01:00
eldritch horrors