nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-12 21:46:01 +01:00
Code Activity
20979 commits 181 branches 219 tags 169 MiB
Commit graph

20979 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra
67e957b636 Apply makeNotAllowedError to empty repos 2025-04-02 19:57:49 +02:00
mergify[bot]
b9ad90d447
Merge pull request #12874 from NixOS/mergify/bp/2.28-maintenance/pr-12677 
Improve the documentation of store path (backport #12677)
 2025-04-02 17:40:53 +00:00
mergify[bot]
8e94856239
Merge pull request #12875 from NixOS/mergify/bp/2.28-maintenance/pr-11672 
doc: note that @-pattern is accessible in default values (backport #11672)
 2025-04-02 17:02:05 +00: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
mergify[bot]
ef8b5d5d06
Merge pull request #12873 from NixOS/mergify/bp/2.28-maintenance/pr-12836 
Expose the nix component in header include paths (backport #12836)
 2025-04-02 16:16:33 +00: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
Valentin Gagarin
9fd8f5ef04 doc: note that function bindings are accessible in default values 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
(cherry picked from commit 9c3dd34cfe)
 2025-04-02 15:45:31 +00:00
oldshensheep
ce8b1eb2c4 Improve the documentation of store path 
# Conflicts:
#	doc/manual/source/protocols/store-path.md

(cherry picked from commit 355a923e81)
 2025-04-02 15:44:26 +00: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
Graham Christensen
665281f00e
Merge pull request #21 from DeterminateSystems/release-v3.2.0/0d651cdb-3d17-411d-8a11-3a3f0c72c3ec 
Release v3.2.0
 2025-04-01 23:06:46 +00:00
github-actions[bot]
1d65af83fd
Set .version-determinate to 3.2.0 2025-04-01 22:41:44 +00:00
github-actions[bot]
2bb85049db
Prepare release v3.2.0 2025-04-01 22:41:41 +00:00
Robert Hensing
cf409fd250
Merge pull request #12868 from NixOS/bump-2.29.0 
Bump version
 2025-04-02 00:23:30 +02:00
Eelco Dolstra
1b92e875f4
Merge pull request #20 from DeterminateSystems/map-to-original-accessors-2 
Source path error improvements
 2025-04-01 21:48:40 +00:00
Eelco Dolstra
fb7bcdd554 Make Git error messages more consistent 2025-04-01 22:56:14 +02:00
Eelco Dolstra
2526293171 shellcheck 2025-04-01 20:52:27 +02:00
Eelco Dolstra
4e0346dcc1 Restore 'forbidden in restricted mode' errors 2025-04-01 20:46:26 +02:00
mergify[bot]
00b1d9f0a0
Merge pull request #12866 from NixOS/mergify/bp/2.28-maintenance/pr-12810 
Packaging improvements from Nixpkgs (backport #12810)
 2025-04-01 18:43:18 +00:00
John Ericson
fc1de4a610 Bump version 2025-04-01 14:26:00 -04: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
abd5909fb6 packaging: Various improvements 
Co-authored-by: Mic92 <Mic92@users.noreply.github.com>
(cherry picked from commit 1172e49a3a)
 2025-04-01 17:50:33 +00:00
mergify[bot]
9ed5482545
Merge pull request #12810 from roberth/packaging-sync 
Packaging improvements from Nixpkgs
 2025-04-01 17:49:35 +00:00
mergify[bot]
aff0058b82
Merge pull request #12862 from NixOS/mergify/bp/2.28-maintenance/pr-12853 
flake: nixpkgs: 24.11 -> nixos-unstable (backport #12853)
 2025-04-01 17:46:16 +00:00
Jörg Thalheim
d91310bb32 remove obsolete stdenv darwinMinVersion override 
we are more up-to-date now:

nix-repl> stdenv.hostPlatform.darwinMinVersion
"11.3"
 2025-04-01 19:20:43 +02:00
Jörg Thalheim
0b61b758fb libgit2: use upstream version if possible 
we don't seem to use libgit2 for fetching via ssh, hence it shouldn't
matter if it's using libssh or the ssh binary.
 2025-04-01 19:09:21 +02: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
Robert Hensing
1172e49a3a packaging: Various improvements 
Co-authored-by: Mic92 <Mic92@users.noreply.github.com>
 2025-04-01 18:51:09 +02:00
Robert Hensing
f5731aa9a2 tests/nixos: Work around network-online.target inactivity 
(cherry picked from commit 58b657b976)
 2025-04-01 16:50:37 +00:00
Robert Hensing
36f23279bf Format 
clang-format: 18.1.8 -> 19.1.7
(cherry picked from commit 55297f865c)
 2025-04-01 16:50:36 +00:00
Robert Hensing
ec4c581adc flake: nixpkgs: 24.11 -> nixos-unstable 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/48d12d5e70ee91fe8481378e540433a7303dbf6a?narHash=sha256-1Noao/H%2BN8nFB4Beoy8fgwrcOQLVm9o4zKW1ODaqK9E%3D' (2024-12-16)
  → 'github:NixOS/nixpkgs/52faf482a3889b7619003c0daec593a1912fddc1?narHash=sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om%2BD4UnDhlDW9BE%3D' (2025-03-30)

(cherry picked from commit c212035d94)
 2025-04-01 16:50:36 +00:00
Jörg Thalheim
c57e2486df
Merge pull request #12853 from roberth/flake-nixos-unstable 
flake: nixpkgs: 24.11 -> nixos-unstable
 2025-04-01 18:49:10 +02:00
Eelco Dolstra
1564c8f9d9 Fix missing file error messages from 'import' 2025-04-01 18:37:21 +02:00
Eelco Dolstra
5b079073c1 Add FIXME 2025-04-01 18:34:08 +02:00
John Ericson
cb50eb0370 Bump version 2025-04-01 11:53:20 -04:00
Eelco Dolstra
73b1754816 Mount flake input source accessors on top of storeFS 
This way, we don't need the PathDisplaySourceAccessor source accessor
hack, since error messages are produced directly by the original
source accessor.

In fact, we don't even need to copy the inputs to the store at all, so
this gets us very close to lazy trees. We just need to know the store
path so that requires hashing the entire input, which isn't lazy. But
the next step will be to use a virtual store path that gets rewritten
to the actual store path only when needed.
 2025-04-01 17:49:28 +02:00