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
Eelco Dolstra
c972cbd2bb
Merge pull request #12890 from NixOS/mergify/bp/2.28-maintenance/pr-12888
...
Fix jobset evaluation (backport #12888 )
2025-04-03 09:27:36 +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
Robert Hensing
c066fa671d
Merge pull request #12897 from NixOS/2.28-release-notes
...
release notes: 2.28.0
2025-04-03 00:31:36 +02: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
Robert Hensing
1ca3ee1287
Edit rl-2.28
2025-04-02 23:44:30 +02:00
mergify[bot]
918b6cbfea
Merge pull request #12895 from NixOS/mergify/bp/2.28-maintenance/pr-12863
...
libgit2: use upstream version if possible (backport #12863 )
2025-04-02 21:43:43 +00:00
Robert Hensing
b87b3d79f2
Fix maintainers/release-credits output
2025-04-02 23:05:37 +02:00
Robert Hensing
fea87a94e6
doc/rl-2.28: Add contributors
2025-04-02 23:02:27 +02:00
Robert Hensing
6687ce2a6d
chore: Update contributor handle caches
2025-04-02 22:59:58 +02:00
Eelco Dolstra
0f723769b7
Fix -Wdangling-reference
2025-04-02 20:51:45 +00:00
John Ericson
703f0fbe74
release notes: 2.28.0
2025-04-02 16:46:13 -04:00
Jörg Thalheim
9f48831298
remove obsolete stdenv darwinMinVersion override
...
we are more up-to-date now:
nix-repl> stdenv.hostPlatform.darwinMinVersion
"11.3"
(cherry picked from commit d91310bb32
2025-04-02 20:45:33 +00:00
Jörg Thalheim
9c7f662586
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.
(cherry picked from commit 0b61b758fb
2025-04-02 20:45:33 +00:00
Robert Hensing
33e638dc1d
Merge pull request #12863 from Mic92/libgit2
...
libgit2: use upstream version if possible
2025-04-02 22:44:42 +02: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
Eelco Dolstra
b3b4fc21da
Remove meta.maintainers
...
Some of the maintainer attribute names got changed in nixos-unstable
(e.g. "edolstra" is now "eelco") but we want this flake to work on
nixos-24.11. So just get rid of them.
(cherry picked from commit 93d8f62057
2025-04-02 20:37:23 +00:00
Eelco Dolstra
0b66c18221
Update meta.maintainers field for nixos-unstable
...
(cherry picked from commit 7eb76186ba
2025-04-02 20:37:23 +00:00
Jörg Thalheim
d81b51d84b
Merge pull request #12888 from DeterminateSystems/fix-maintainers
...
Fix jobset evaluation
2025-04-02 22:36:29 +02:00
Eelco Dolstra
93d8f62057
Remove meta.maintainers
...
Some of the maintainer attribute names got changed in nixos-unstable
(e.g. "edolstra" is now "eelco") but we want this flake to work on
nixos-24.11. So just get rid of them.
2025-04-02 22:02:15 +02:00
Graham Christensen
63d41e72f4
Merge pull request #22 from DeterminateSystems/release-v3.2.1/570639c2-2b4c-4741-9fb8-959a7cf48281
...
Release v3.2.1
2025-04-02 19:53:36 +00:00
Eelco Dolstra
9e362f0690
Merge pull request #12884 from NixOS/mergify/bp/2.28-maintenance/pr-12870
...
Git fetcher: Improve error message for untracked files (backport #12870 )
2025-04-02 21:50:03 +02:00
Eelco Dolstra
7eb76186ba
Update meta.maintainers field for nixos-unstable
2025-04-02 21:39:02 +02:00
github-actions[bot]
3ad67d1a03
Set .version-determinate to 3.2.1
2025-04-02 19:26:15 +00:00
github-actions[bot]
086058d17c
Prepare release v3.2.1
2025-04-02 19:26:12 +00: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
Jörg Thalheim
26b33aa1b0
Merge pull request #12869 from DeterminateSystems/empty-git-repo
...
Apply makeNotAllowedError to empty Git repos
2025-04-02 20:32:18 +02:00
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
