nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-12 13:36:02 +01:00
Code Activity
20917 commits 179 branches 219 tags 169 MiB
Commit graph

20917 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
mergify[bot]
07204ff6e5
Merge pull request #12940 from NixOS/header-cleanup 
Header cleanup
 2025-04-07 00:09:49 +00:00
Robert Hensing
da36c34db7 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.
 2025-04-07 01:46:43 +02: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]
1dc7e6c4dc
Merge pull request #12936 from ajlekcahdp4/master 
libflake: add lock file path to invalid json error
 2025-04-06 23:32:50 +00:00
John Ericson
7a7fe350d5 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.
 2025-04-06 18:53:42 -04:00
John Ericson
3294b22a68 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.
 2025-04-06 18:53:38 -04:00
mergify[bot]
3fcdccb8ce
Merge pull request #12939 from NixOS/2.28-release-notes 
2.28 release notes for master
 2025-04-06 21:41:00 +00:00
Robert Hensing
78e2832d7d Edit rl-2.28 
(cherry picked from commit 1ca3ee1287)
 2025-04-06 17:03:38 -04:00
Robert Hensing
4ac9bc08ea Fix maintainers/release-credits output 
(cherry picked from commit b87b3d79f2)
 2025-04-06 17:03:36 -04:00
Robert Hensing
93248bd92c doc/rl-2.28: Add contributors 
(cherry picked from commit fea87a94e6)
 2025-04-06 17:03:36 -04:00
Robert Hensing
f261c03686 chore: Update contributor handle caches 
(cherry picked from commit 6687ce2a6d)
 2025-04-06 17:03:35 -04:00
John Ericson
682a28a76b release notes: 2.28.0 
(cherry picked from commit 703f0fbe74)
 2025-04-06 17:03:34 -04:00
Alexander Romanov
e3873aa1a0 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.
 2025-04-06 22:52:46 +03: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]
a56aaf26c2
Merge pull request #12937 from roberth/undefined-macros 
Fix undefined macro errors
 2025-04-06 16:25:22 +00:00
Robert Hensing
77b4bb74d5 Fix undefined macro errors 2025-04-06 17:43:17 +02: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
Jörg Thalheim
cf5e59911b
Merge pull request #12931 from roberth/add-Wundef-and-fix-public-headers 
Add `-Wundef` and fix public headers
 2025-04-05 08:43:43 +02:00
Robert Hensing
ba89da8fa2 Fix more -Wundef, in darwin context 2025-04-05 01:04:58 +02:00
Robert Hensing
2b51250534 Hack together a fix for the public headers 
Please fix this.
 2025-04-05 00:59:58 +02:00
Robert Hensing
59ced3da96 Add -Wundef to make #if FOO an error if not defined 
This commit has all the straightforward stuff.
 2025-04-05 00:45:19 +02:00
Eelco Dolstra
d81cd04d23 Bump version 2025-04-04 18:03:19 +02:00
Eelco Dolstra
852075ec9d Tagging release 2.28.0 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmfv9fITHGVkb2xzdHJh
 QGdtYWlsLmNvbQAKCRCBcLRybXGY3ohrCAC1Uw/JJr3yEPlJ/jLc9t9HqEKMY08W
 W6SEjpYJHYixMXmoonexkqojncNWBaiytRa+vBY7JQq0xTOOBwj42TM2ZzMF4GXi
 vO4Ox0hEsRa/v7tSmK6GFz1sNEKEUOHDNbilg4kzkkBHPEGPUGMwdWkT0akO576Q
 SQ6ERwPPLsHDI2YtAeAD8R4p07CraiyA34ljDPz3rChTAXRPVKWxJUt1enwEWYTr
 cKk45RcR4S8rP1BVwf3wsNsrHjqjbaY45kPAo8GD79hFH0zkyJarS3Kgv8qsWLra
 9ph0DVVG0wiArlET7Y3uchqtAC0Z5LOnutAmOFYFw6DKfWp9yGfl/SVW
 =XRda
 -----END PGP SIGNATURE-----

Merge tag '2.28.0' into sync-2.28.0

Tagging release 2.28.0
 2025-04-04 17:49:15 +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
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
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
Jörg Thalheim
6c3476784b
Merge pull request #12919 from roberth/darwin-minversion 
Reinstate Darwin minversion
 2025-04-04 08:38:22 +02:00
Robert Hensing
4be92e7b82 packaging/dependency: Clarify darwinMinVersion 2025-04-03 23:22:33 +02:00
Robert Hensing
5c4a4aeed7 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
 2025-04-03 23:22:19 +02: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
Jörg Thalheim
cb972c789a
Merge pull request #12912 from DeterminateSystems/substituted-path-display 
Set path display for substituted inputs
 2025-04-03 14:49:51 +02: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
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