mergify[bot]
0a66906e55
Merge pull request #12924 from NixOS/mergify/bp/2.28-maintenance/pr-12911
...
create cache entry for paths already in the nix store (backport #12911 )
2025-04-04 12:50:55 +00:00
John Ericson
0b4fea7872
Fix windows build
...
(cherry picked from commit 652a628d1c
2025-04-04 13:45:38 +02:00
Jörg Thalheim
651df50996
create cache entry for paths already in the nix store
...
This allows path:/nix/store/* paths to not be copied twice to the nix
store.
(cherry picked from commit 61c6210dbf
2025-04-04 11:43:08 +00:00
Robert Hensing
8bd342c660
Merge pull request #12911 from Mic92/no-copy-twice
...
create cache entry for paths already in the nix store
2025-04-04 13:41:36 +02:00
Jörg Thalheim
61c6210dbf
create cache entry for paths already in the nix store
...
This allows path:/nix/store/* paths to not be copied twice to the nix
store.
2025-04-04 12:45:22 +02:00
Eelco Dolstra
994c8b6a7a
Set path display for substituted inputs
...
(cherry picked from commit 4a397cfb80
2025-04-03 12:50:25 +00:00
Eelco Dolstra
4a397cfb80
Set path display for substituted inputs
2025-04-03 14:14:22 +02:00
mergify[bot]
4edd560269
Merge pull request #12907 from NixOS/revert-nixpkgs-unstable
...
Revert to Nixpkgs 24.11 [2.28]
2025-04-03 09:29:26 +00:00
Jörg Thalheim
5e19252de9
Merge pull request #12902 from Mic92/signed-comparison
...
Fix -Wsign-compare errors
2025-04-03 10:30:18 +02:00
Jörg Thalheim
ddfb268ff5
Merge pull request #12906 from NixOS/mergify/bp/2.28-maintenance/pr-12886
...
symlink_exists: wrap exceptions into nix exception (backport #12886 )
2025-04-03 10:28:22 +02:00
Eelco Dolstra
f48a72afc5
Revert "Merge pull request #12862 from NixOS/mergify/bp/2.28-maintenance/pr-12853"
...
This reverts commit aff0058b82cb50eb0370
2025-04-03 10:05:58 +02:00
Jörg Thalheim
c0912a12bf
Merge pull request #12846 from allrealmsoflife/clearer-continuation-prompt
...
repl: improve continuation prompt for incomplete expressions
2025-04-03 09:52:16 +02:00
Jörg Thalheim
bbc4977fed
local-derivation-goal: fix sized comparison when checking sandbox profile length
2025-04-03 09:50:53 +02:00
Jörg Thalheim
d73ed6f310
symlink_exists: wrap exceptions into nix exception
...
(cherry picked from commit 779687854f
2025-04-03 09:49:40 +02:00
Jörg Thalheim
681d7f7e57
Fix -Wsign-compare errors
2025-04-03 09:48:53 +02:00
Eelco Dolstra
a47ea7ed04
Merge remote-tracking branch 'origin/2.28-maintenance' into mergify/bp/2.28-maintenance/pr-12869
2025-04-03 09:31:09 +02:00
mergify[bot]
c4b81184e4
Merge pull request #12886 from Mic92/symlink-exists
...
symlink_exists: wrap exceptions into nix exception
2025-04-02 23:13:24 +00:00
mergify[bot]
1831948c20
Merge pull request #12885 from NixOS/fix-windows-build
...
Fix windows build
2025-04-02 22:34:41 +00:00
Jörg Thalheim
779687854f
symlink_exists: wrap exceptions into nix exception
2025-04-02 23:48:16 +02:00
Jörg Thalheim
2ace512a70
Merge pull request #12896 from Mic92/no-dangling-reference
...
Fix -Wdangling-reference
2025-04-02 23:45:55 +02:00
Eelco Dolstra
0f723769b7
Fix -Wdangling-reference
2025-04-02 20:51:45 +00:00
Robert Hensing
ff328e1dad
Merge pull request #12876 from Mic92/connect-timeout
...
decrease connect-timeout to 5s
2025-04-02 22:42:36 +02:00
John Ericson
652a628d1c
Fix windows build
2025-04-02 15:17:26 -04:00
Eelco Dolstra
c45f97b9f4
Make Git error messages more consistent
...
(cherry picked from commit f15681df26
2025-04-02 19:15:16 +00:00
Eelco Dolstra
b4813a1b55
Tweak error message
...
(cherry picked from commit 277c29a64b
2025-04-02 19:15:16 +00:00
Graham Christensen
8703e9d89e
Improve and fix the error message when a file is not tracked by Git
...
(cherry picked from commit 62e2304891
2025-04-02 19:15:16 +00:00
Eelco Dolstra
5f74cf9b7a
Apply makeNotAllowedError to empty repos
...
(cherry picked from commit 67e957b636
2025-04-02 18:33:03 +00:00
Eelco Dolstra
67e957b636
Apply makeNotAllowedError to empty repos
2025-04-02 19:57:49 +02:00
Robert Hensing
8c903e0402
nix-flake-c: Add lock flags
...
Going with a slightly more limited, high level API supporting the
three main use cases.
This should allow the underlying code to evolve more freely.
2025-04-02 18:29:42 +02:00
Robert Hensing
1a3789e222
fix: nix_clear_err in nix_flake_* functions
2025-04-02 18:29:42 +02:00
Robert Hensing
a0a1d00370
nix-flake-c: Add basic flakeref parsing and locking
2025-04-02 18:29:42 +02:00
Robert Hensing
60bffbd41b
nix-fetchers-c: Init with settings object
...
Also make it a dependency of nix-flake-c; we'll need that.
2025-04-02 18:29:42 +02:00
Robert Hensing
1061a0965a
nix-flake-c: Add missing bits
2025-04-02 18:02:32 +02:00
Robert Hensing
05e5bd2140
Docs
2025-04-02 18:02:32 +02:00
Robert Hensing
02360dd65c
nix-expr: Expose nix_api_expr_internal.h intentionally
...
This is required for other bindings like nix-flake-c to hook into
nix-expr-c appropriately.
The `_internal` part should be a sufficient deterrent normally,
and it may also be useful for bindings that migrate from the C++
interface.
2025-04-02 18:02:32 +02:00
Robert Hensing
60b4b220d8
test: Fixup test name
2025-04-02 18:02:32 +02:00
Robert Hensing
0dc9b6b7c7
libutil-tests-support: Add file/line to ctx errors
2025-04-02 18:02:32 +02:00
Jörg Thalheim
bef91a618a
decrease connect-timeout to 5s
...
For people self-hosting caches that can be occasionally down, the
default timeout is very long. This is annoying if you are trying to
update your binary cache at the same time you are trying to update
another machine. Same if cachix has one of its rare hiccups.
We tested this value of 5s in srvos now for years and we like to travel
around the world with shitty internet, so it should be still reasonable
high.
2025-04-02 18:01:19 +02:00
mergify[bot]
70dcd738ef
Merge pull request #12870 from DeterminateSystems/improve-git-error
...
Git fetcher: Improve error message for untracked files
2025-04-02 15:39:35 +00:00
John Ericson
0c67777396
Expose the nix component in header include paths
...
For example, instead of doing
#include "nix/store-config.hh"
#include "nix/derived-path.hh"
Now do
#include "nix/store/config.hh"
#include "nix/store/derived-path.hh"
This was originally planned in the issue, and also recent requested by
Eelco.
Most of the change is purely mechanical. There is just one small
additional issue. See how, in the example above, we took this
opportunity to also turn `<comp>-config.hh` into `<comp>/config.hh`.
Well, there was already a `nix/util/config.{cc,hh}`. Even though there
is not a public configuration header for libutil (which also would be
called `nix/util/config.{cc,hh}`) that's still confusing, To avoid any
such confusion, we renamed that to `nix/util/configuration.{cc,hh}`.
Finally, note that the libflake headers already did this, so we didn't
need to do anything to them. We wouldn't want to mistakenly get
`nix/flake/flake/flake.hh`!
Progress on #7876
(cherry picked from commit cc24766fa6
2025-04-02 11:37:17 -04:00
Jörg Thalheim
7a6570a11c
Merge pull request #12836 from NixOS/component-in-header-path
...
Expose the nix component in header include paths
2025-04-02 15:29:22 +02:00
Eelco Dolstra
64fb6ab435
AttrCursor::Parent: shared_ptr -> ref
...
(cherry picked from commit 5a35745949
2025-04-02 13:23:39 +02:00
Eelco Dolstra
8b448c841e
Throw CachedEvalError if a cached value exists but has type "failed"
...
Otherwise you get unhelpful errors like
error: 'apps' is not an attribute set
Fixes #12762 .
(cherry picked from commit 8b438fccb4
2025-04-02 13:23:29 +02:00
Eelco Dolstra
f15681df26
Make Git error messages more consistent
2025-04-02 12:58:53 +02:00
Eelco Dolstra
277c29a64b
Tweak error message
2025-04-02 12:58:11 +02:00
Graham Christensen
62e2304891
Improve and fix the error message when a file is not tracked by Git
2025-04-02 12:58:06 +02:00
Eelco Dolstra
fb7bcdd554
Make Git error messages more consistent
2025-04-01 22:56:14 +02:00
Eelco Dolstra
4e0346dcc1
Restore 'forbidden in restricted mode' errors
2025-04-01 20:46:26 +02:00
Robert Hensing
c908eef782
packaging: finalAttrs.doCheck -> finalAttrs.finalPackage.doCheck
...
This includes the logic that disables checks on cross appropriately.
Co-authored-by: Peder Bergebakken Sundt <pbsds@hotmail.com>
(cherry picked from commit 27d71b21fc
2025-04-01 17:50:34 +00:00
Robert Hensing
27d71b21fc
packaging: finalAttrs.doCheck -> finalAttrs.finalPackage.doCheck
...
This includes the logic that disables checks on cross appropriately.
Co-authored-by: Peder Bergebakken Sundt <pbsds@hotmail.com>
2025-04-01 18:51:09 +02:00
