Brian McKenna
f62a287163
Only enable big-obj on Windows
2025-02-01 21:36:50 +11:00
Brian McKenna
26539a087f
Add mbig-obj flag to allow cross-compiling libexpr to mingw32
2025-01-31 22:53:42 +11:00
Eelco Dolstra
177a067d66
Merge pull request #12372 from roberth/test-characterisation-log-to-stderr
...
tests/functional/characterisation/framework: Log to stderr
2025-01-30 11:34:39 +01:00
Eelco Dolstra
cfe93299b1
Merge pull request #12378 from DeterminateSystems/fix-shellcheck
...
Fix shellcheck warnings
2025-01-29 15:49:00 +01:00
Eelco Dolstra
fa87ad6a7c
Fix shellcheck warnings
2025-01-29 15:34:49 +01:00
Robert Hensing
a5de2dd274
tests/functional/characterisation/framework: Log to stderr
...
It seems that `meson test --print-errorlogs` only captures stderr,
so this makes it forward the logs as intended.
We might want to redirect stdout in our common setup script instead.
2025-01-28 09:26:33 +01:00
Robert Hensing
fbe2940a08
Merge pull request #12363 from roberth/issue-12161
...
Issue #12161 , add `meta.mainProgram`
2025-01-28 09:15:14 +01:00
Eelco Dolstra
8d744957a6
Merge pull request #12362 from roberth/refactor-realiseString
...
refactor: Extract EvalState::realiseString
2025-01-27 16:49:58 +01:00
Eelco Dolstra
6a2198dfad
Merge pull request #12251 from nix-windows/local-store/fix-infinite-loop
...
local-store: fix infinite loop on Windows
2025-01-27 14:38:57 +01:00
Robert Hensing
850329dea5
packages.nix-cli: Add meta.mainProgram
2025-01-27 14:27:14 +01:00
Robert Hensing
0d7418b4fe
packages.default: Add meta.mainProgram
2025-01-27 14:26:15 +01:00
Robert Hensing
7465fbe926
refactor: Extract EvalState::realiseString
2025-01-27 12:32:46 +01:00
John Ericson
06de255f5c
Merge pull request #12356 from Artturin/illegalpathrefprint
...
Improve "illegal path references in fixed output derivation" error
2025-01-26 14:37:51 -05:00
Ben Millwood
4e5d1b281e
Improve "illegal path references in fixed output derivation" error
...
The main improvement is that the new message gives an example of a path
that is referenced, which should make it easier to track down. While
there, I also clarified the wording, saying exactly why the paths in
question were illegal.
2025-01-25 20:10:43 +02:00
Robert Hensing
85a3071fc9
Merge pull request #12349 from NixOS/nixfmt
...
Apply nixfmt
2025-01-24 20:22:33 +01:00
Robert Hensing
b04077c0ec
fix: Update shifted source positions after formatting
...
Carefully reviewed...
2025-01-24 18:53:42 +01:00
Robert Hensing
96e550efc5
Format .nix files
...
... with nixfmt (rfc style)
2025-01-24 17:04:02 +01:00
Robert Hensing
ba6425a7d0
dev: Configure nixfmt (rfc style)
2025-01-24 17:02:50 +01:00
Eelco Dolstra
99dbcca5f1
Merge pull request #12351 from DeterminateSystems/test-12339
...
Add a test for #12339
2025-01-24 16:24:14 +01:00
Eelco Dolstra
d48d464c8b
Add a test for #12339
2025-01-24 15:25:10 +01:00
Robert Hensing
c527fe0f96
Merge pull request #12347 from DeterminateSystems/fix-12339
...
EvalState::resolveLookupPathPath(): Call resolveSymlinks() before pathExists()
2025-01-24 14:45:16 +01:00
Robert Hensing
4166f59a7b
Merge pull request #12348 from NixOS/doc-building-11799
...
doc/building: Update for #11799
2025-01-24 13:02:10 +01:00
Robert Hensing
ace52b10c9
doc/building: Update for #11799
...
Reflect the shorter attribute name, changed in
f168a6e739https://github.com/NixOS/nix/pull/11799
2025-01-24 12:41:26 +01:00
Eelco Dolstra
00d9e7e1f4
EvalState::resolveLookupPathPath(): Call resolveSymlinks() before pathExists()
...
Fixes #12339 .
2025-01-24 12:15:07 +01:00
Robert Hensing
10c8d7988d
Merge pull request #12336 from NaN-git/fix-progress
...
libstore: Fix progress bars
2025-01-24 12:08:50 +01:00
Robert Hensing
9837affddc
Merge pull request #12338 from DeterminateSystems/input-attr-path
...
Rename InputPath -> InputAttrPath
2025-01-24 12:06:37 +01:00
Eelco Dolstra
7dfff58292
Rename InputPath -> InputAttrPath
...
Fixes #12098 .
2025-01-23 16:34:35 +01:00
Eelco Dolstra
9060d0fe46
Fix missing format argument
2025-01-23 16:21:30 +01:00
Eelco Dolstra
261b213272
Merge pull request #11900 from DeterminateSystems/fix-help-test
...
Fix help test in dev shell
2025-01-23 15:20:34 +01:00
Eelco Dolstra
5b43163c6d
Disable 'man' tests
2025-01-23 14:54:05 +01:00
Eelco Dolstra
2dae5acf86
Run the 'nix --help' tests early
...
These don't depend on 'man' so we don't need to skip them.
2025-01-23 14:28:48 +01:00
Philipp Otterbein
be97dc1efc
libstore: fix progress bars
2025-01-23 02:18:27 +01:00
Robert Hensing
06123f6284
Merge pull request #12335 from obsidiansystems/fix-12295
...
Fix #12295
2025-01-22 23:13:02 +01:00
John Ericson
7f7ca3810b
Fix #12295
...
We were simply passing in the wrong path. This went uncaught because the
TODO about deduplication hasn't happened yet.
2025-01-22 16:53:05 -05:00
Robert Hensing
f168a6e739
Merge pull request #11799 from obsidiansystems/flake-nixpkgs-cleanup
...
Clean up packaging a bit
2025-01-22 22:40:24 +01:00
Jörg Thalheim
64a38992da
Merge pull request #12331 from DeterminateSystems/git-dir
...
GitRepo::fetch(): Ignore $GIT_DIR
2025-01-22 21:29:34 +01:00
Eelco Dolstra
e0c6ed1c83
Fix help test in dev shell
...
Not sure what the intent was expecting help.sh to fail in the main suite, but it caused `meson test` to fail inside a `nix develop` shell:
$ meson test help --print-errorlogs
ninja: Entering directory `/home/eelco/Dev/nix-master/build'
1/1 nix-functional-tests:main / help UNEXPECTEDPASS 4.02s
2025-01-22 21:07:50 +01:00
Eelco Dolstra
41983dba8f
GitRepo::fetch(): Ignore $GIT_DIR
...
Fixes #12325 .
2025-01-22 17:54:19 +01:00
Eelco Dolstra
bd10b859f7
GitRepo::fetch(): Cleanup
2025-01-22 17:42:52 +01:00
Eelco Dolstra
2975c2c1d1
Merge pull request #12329 from NixOS/backport
...
Add mergify backport rule for 2.26
2025-01-22 14:33:45 +01:00
Eelco Dolstra
c5dc749bb3
Add mergify backport rule for 2.26
2025-01-22 14:13:24 +01:00
Eelco Dolstra
a28195df7a
Merge pull request #12328 from NixOS/bump-2.27.0
...
Bump version
2025-01-22 13:58:21 +01:00
Eelco Dolstra
2d507ff191
Merge pull request #12327 from NixOS/update-release-script
...
Update the release script
2025-01-22 13:39:23 +01:00
Eelco Dolstra
65f95c5f68
Bump version
2025-01-22 13:37:05 +01:00
Eelco Dolstra
f472be29ab
Update the release script
2025-01-22 13:28:30 +01:00
Eelco Dolstra
7af6329005
Merge pull request #12326 from NixOS/release-notes
...
Nix 2.26 release notes
2025-01-22 12:12:04 +01:00
Eelco Dolstra
21f2e29176
Add release credits
2025-01-22 12:01:00 +01:00
Eelco Dolstra
617bf84518
Add a few more release notes
2025-01-22 11:55:20 +01:00
Eelco Dolstra
d8dbb71c92
release notes: 2.26.0
2025-01-22 11:45:04 +01:00
Eelco Dolstra
069ca2a21a
Merge pull request #12324 from NixOS/disable-lto
...
x86_64-darwin: Disable LTO
2025-01-21 18:29:35 +01:00
