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
mergify[bot]
2fce659c7d
Merge pull request #12359 from NixOS/mergify/bp/2.26-maintenance/pr-12356
...
Improve "illegal path references in fixed output derivation" error (backport #12356 )
2025-01-26 20:10:39 +00:00
Ben Millwood
791d6cf433
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.
(cherry picked from commit 4e5d1b281e
2025-01-26 19:39:33 +00: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
3e0d9ff937
Merge pull request #12354 from NixOS/nixfmt-on-2.26
...
Apply nixfmt (backport 2.26)
2025-01-24 22:43:06 +01:00
Robert Hensing
f629d81df0
test: Fix shifted source positions after formatting
2025-01-24 22:21:27 +01:00
Robert Hensing
32aed360b8
Format .nix files
...
This does not include any automation for the release branch, but
is based on the configuration of https://github.com/NixOS/nix/pull/12349
pre-commit run -a nixfmt-rfc-style
2025-01-24 20:40:21 +01: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
6cb17fd836
Bump version
2025-01-24 16:20:43 +01:00
Eelco Dolstra
d48d464c8b
Add a test for #12339
2025-01-24 15:25:10 +01:00
mergify[bot]
36bd92736f
Merge pull request #12350 from NixOS/mergify/bp/2.26-maintenance/pr-12347
...
EvalState::resolveLookupPathPath(): Call resolveSymlinks() before pathExists() (backport #12347 )
2025-01-24 14:02:15 +00:00
Eelco Dolstra
90159cb197
EvalState::resolveLookupPathPath(): Call resolveSymlinks() before pathExists()
...
Fixes #12339 .
(cherry picked from commit 00d9e7e1f4
2025-01-24 13:46:16 +00: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
mergify[bot]
4cfeb8d1bb
Merge pull request #12346 from NixOS/mergify/bp/2.26-maintenance/pr-12336
...
libstore: Fix progress bars (backport #12336 )
2025-01-24 11:46:16 +00: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
Philipp Otterbein
9cf3d3368e
libstore: fix progress bars
...
(cherry picked from commit be97dc1efc
2025-01-24 11:10:50 +00: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
Aiden Fox Ivey
fed3a2ce0b
Add Rosetta 2 install message
2025-01-22 23:29:39 -05:00
Philipp Otterbein
be97dc1efc
libstore: fix progress bars
2025-01-23 02:18:27 +01:00
Philipp Otterbein
4f8f12f79a
sinkToSource: avoid heap allocation
2025-01-23 00:57:32 +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
Eelco Dolstra
aab6419b63
Merge pull request #12334 from NixOS/mergify/bp/2.26-maintenance/pr-12331
...
GitRepo::fetch(): Ignore $GIT_DIR (backport #12331 )
2025-01-22 22:00:16 +01:00
Eelco Dolstra
832221650b
GitRepo::fetch(): Ignore $GIT_DIR
...
Fixes #12325 .
(cherry picked from commit 41983dba8f
2025-01-22 20:30:29 +00:00
Eelco Dolstra
2301d86f32
GitRepo::fetch(): Cleanup
...
(cherry picked from commit bd10b859f7
2025-01-22 20:30:28 +00: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
91e60321f6
Bump version
2025-01-22 13:36:30 +01:00
