wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 06:31:14 +02:00
Code Activity
19728 commits 244 branches 205 tags 158 MiB
Commit graph

19728 commits

This branch
This branch
All branches
Author SHA1 Message Date
mergify[bot]
6dde30bacf
Merge pull request #12960 from NixOS/mergify/bp/2.28-maintenance/pr-12956 
Fix meson warnings on minimum version (backport #12956)
 2025-04-07 18:26:02 +00:00
Sandro
5b21c94fab Fix meson warnings on minimum version 
nix> meson.build:216: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:222: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:235: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:236: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:242: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.

(cherry picked from commit 14a829acbb)
 2025-04-07 17:51:44 +00:00
mergify[bot]
a4962f73b5
Merge pull request #12955 from NixOS/mergify/bp/2.28-maintenance/pr-12951 
tests/functional/repl: fix race condition (backport #12951)
 2025-04-07 12:52:09 +00:00
Jörg Thalheim
288fee2d14 tests/functional/repl: fix race condition 
the sleep 1 is not enough in some circumstances. Switching to a fifo
helps.

(cherry picked from commit 1de951d31d)
 2025-04-07 12:20:05 +00:00
mergify[bot]
42ba32f1ff
Merge pull request #12949 from NixOS/mergify/bp/2.28-maintenance/pr-12944 
maintainers/release-notes: Let it fail (backport #12944)
 2025-04-07 09:58:20 +00:00
Eelco Dolstra
e0778c2796 Bump version 2025-04-07 10:55:37 +02:00
Robert Hensing
e7dbf0fc0a maintainers/release-notes: Let it fail 
Fail when a command fails.

Basic error handling was missing, which would lead to errors getting
obscured a bit by subsequent successful logging.

(cherry picked from commit da36c34db7)
 2025-04-07 08:53:33 +00:00
Eelco Dolstra
e3a8e43600
Merge pull request #12942 from NixOS/mergify/bp/2.28-maintenance/pr-12936 
libflake: add lock file path to invalid json error (backport #12936)
 2025-04-07 09:57:33 +02:00
John Ericson
9cdf72beaa
Merge pull request #12945 from NixOS/mergify/bp/2.28-maintenance/pr-12940 
Header cleanup (backport #12940)
 2025-04-06 21:06:58 -04:00
John Ericson
efb0feb22b Get rid of raw -D defines, always use private config files 
Now that we have the private vs public distinction, we can do this
without leaking information downstream.

(cherry picked from commit 7a7fe350d5)
 2025-04-07 00:10:38 +00:00
John Ericson
7e96f31753 Clean some header related things. 
Revert most of "Hack together a fix for the public headers"

- The `libmain` change is kept, and one more libmain change is made.
  (Need to update Meson and Nix per the package alike).

- The S3 situation is fixed in a different way: the variable is public
  now, used in the header, and fixed accordingly.

- Fix TODO for `HAVE_EMBEDDED_SANDBOX_SHELL`

This reverts commit 2b51250534.

(cherry picked from commit 3294b22a68)
 2025-04-07 00:10:37 +00:00
Alexander Romanov
49b6766332 libflake: add lock file path to invalid json error 
Previously, when lock file contained invalid JSON nix reported a parser
error without specifying the file it came from.

This change adds flake.lock file path to the error message to avoid
confusion.

(cherry picked from commit e3873aa1a0)
 2025-04-06 23:33:35 +00:00
mergify[bot]
63b9b932f4
Merge pull request #12938 from NixOS/mergify/bp/2.28-maintenance/pr-12937 
Fix undefined macro errors (backport #12937)
 2025-04-06 17:04:42 +00:00
Robert Hensing
3bb46b73a8 Fix undefined macro errors 
(cherry picked from commit 77b4bb74d5)
 2025-04-06 16:25:51 +00:00
mergify[bot]
1b119ded3a
Merge pull request #12932 from NixOS/mergify/bp/2.28-maintenance/pr-12931 
Add `-Wundef` and fix public headers (backport #12931)
 2025-04-05 12:24:43 +00:00
Robert Hensing
615344fdf0 Fix more -Wundef, in darwin context 2025-04-05 13:46:04 +02:00
Robert Hensing
bd2d5b7335 Hack together a fix for the public headers 
Please fix this.
 2025-04-05 13:44:58 +02:00
Robert Hensing
5c90b41715 Add -Wundef to make #if FOO an error if not defined 
This commit has all the straightforward stuff.
 2025-04-05 13:44:58 +02:00
Eelco Dolstra
d81cd04d23 Bump version 2025-04-04 18:03:19 +02:00
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
Eelco Dolstra
6d53506ae3
Merge pull request #12921 from NixOS/mergify/bp/2.28-maintenance/pr-12919 
Reinstate Darwin minversion (backport #12919)
 2025-04-04 10:44:53 +02:00
Robert Hensing
b9fc326a9a packaging/dependency: Clarify darwinMinVersion 
(cherry picked from commit 4be92e7b82)
 2025-04-04 06:39:10 +00:00
Robert Hensing
36ce86dfb6 Revert "remove obsolete stdenv darwinMinVersion override" 
This reverts commit d91310bb32.

> Some packages require setting a non-default deployment target
> (or minimum version) to gain access to certain APIs. You do
> that using the darwinMinVersionHook, which takes the deployment
> target version as a parameter.

-- 60b54c7aee/doc/stdenv/platform-notes.chapter.md (what-is-a-deployment-target-or-minimum-version-sec-darwin-troubleshooting-using-deployment-targets)

This will again solve error:

    ../nix_api_expr.cc:38:18: error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer

-- https://hydra.nixos.org/build/294088946

(cherry picked from commit 5c4a4aeed7)
 2025-04-04 06:39:10 +00:00
Eelco Dolstra
cd31a8ca84
Merge pull request #12914 from NixOS/mergify/bp/2.28-maintenance/pr-12912 
Set path display for substituted inputs (backport #12912)
 2025-04-03 16:55:43 +02:00
Eelco Dolstra
994c8b6a7a Set path display for substituted inputs 
(cherry picked from commit 4a397cfb80)
 2025-04-03 12:50:25 +00: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
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
3a5bbca252
Merge pull request #12882 from NixOS/mergify/bp/2.28-maintenance/pr-12869 
Apply makeNotAllowedError to empty Git repos (backport #12869)
 2025-04-03 10:07:07 +02:00
Eelco Dolstra
f48a72afc5 Revert "Merge pull request #12862 from NixOS/mergify/bp/2.28-maintenance/pr-12853" 
This reverts commit aff0058b82, reversing
changes made to cb50eb0370.
 2025-04-03 10:05:58 +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
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
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
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
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
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
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
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