f2c32738ad
Print derivation paths
...
Also be more consistent with quotes around attribute paths
(cherry picked from commit 9404ce36e4Iaa80073b4a07a6ffef106a3c12ecd02b4f6f67aa
2024-03-07 01:22:25 -07:00
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 49221493e2Ib1d58fe48cc82f4801a2ee5f91ba0d5a74907c0b
2024-03-07 01:22:25 -07:00
bac3c5ad97
Merge pull request #9787 from obsidiansystems/bind-proc-syserror
...
`bind`: give same treatment as `connect` in #8544 , dedup
(cherry picked from commit 28674247ecI1ac5fc43fa10ec5f37a226730c3d84033fdbfd52
2024-03-07 00:43:51 -07:00
06e92450bd
Merge pull request #8544 from edolstra/handle-missing-gc-socket
...
LocalStore: :addTempRoot(): Handle ENOENT
(cherry picked from commit 7115edc85aIe6b1596049c3fde09b98f2f0727899f98e48e6b1
2024-03-07 00:43:51 -07:00
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
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
0d9a043f43
Merge "fix: bounds check result in getMaxCPU" into main
2024-03-06 22:24:51 -07:00
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
f10e673272
tests/nixos/remote-builds*: Inline module + format
...
(cherry picked from commit 5167351efbI0caba23b589ed428d08895d7b8f0c22532bd259e
2024-03-06 21:32:47 -07:00
097acae35b
tests/nixos: Test remote build against older versions
...
(cherry picked from commit e502d1cf94If6a1758b6457c5dae9305829c4d71d1905cfca22
2024-03-06 21:32:47 -07:00
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 6ec08b85f6Ieeb53fb65d0e334e6017ceb3a48b3b6ae1047843
2024-03-07 03:35:47 +01:00
25cae6d377
Merge pull request #9604 from obsidiansystems/test-substitute-on-destination
...
Test `nix copy --substitute-on-destination`
(cherry picked from commit ed93e51f4bI33f8b591f42acf96fd18f27758dd1141b4bbbb5f
2024-03-07 03:34:00 +01:00
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 b1e7d7cad6I4076669b0ba160412f7c628ca9113f9abbc8c303
2024-03-06 19:11:12 -07:00
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
89e99d94e4
Merge pull request #9634 from 9999years/combine-abstract-pos-and-pos
...
Combine `AbstractPos`, `PosAdapter`, and `Pos`
(cherry picked from commit 113499d16fI05fd340c273f0bcc8ffabfebdc4a88b98083bce5
2024-03-05 23:46:18 -07:00
e9b5929b22
Merge pull request #9860 from 9999years/set-stack-darwin
...
Increase stack size on macOS as well as Linux
(cherry picked from commit efb91d59794a2444b3f3Ieb72283c61bb9e360683f531d6635697b293c313
2024-03-05 23:36:42 -07:00
a499383187
Merge pull request #10085 from ShamrockLee/ignore-obsolete-testdir
...
.gitignore: ignore historical test binaries
(cherry picked from commit cd2d8b6d4c3f8cec1a21a4d0a7d1ea626aa2a78e)
Change-Id: Ieb01910ab7722df78d8570ca6e408f1de5839fb8
2024-03-05 23:36:31 -07:00
c67b392385
Merge pull request #9608 from NixOS/default-lowdown
...
Remove custom lowdown
(cherry picked from commit 790cf13c26Ie01f9a69e81e793fc7ac869de943da370dc75e36
2024-03-05 23:36:11 -07:00
bfe2facede
Merge pull request #9443 from ivan770/reproducibility
...
doc: fix machine-specific capabilities leaking
(cherry picked from commit dda0e34ecfI3d07cc5039ee954b215a7a27caa3bf7359d92c26
2024-03-05 23:35:22 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
