Eelco Dolstra
611fd806cb
Remove unused tracing-file-system-object-sink.{hh,cc}
2025-04-07 17:10:28 +02:00
Eelco Dolstra
340fa00d52
Fix/run monitorfdhup test
2025-04-07 17:09:42 +02:00
Graham Christensen
8443f01536
Rename nix profile install to nix profile add.
2025-04-07 09:22:57 -04:00
Sandro
14a829acbb
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.
2025-04-07 15:06:10 +02: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
Graham Christensen
bc02da2a69
Merge pull request #23 from DeterminateSystems/sync-2.28.0
...
Sync with upstream 2.28.1
2025-04-07 12:40:40 +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
Jörg Thalheim
2960d7adf5
Merge pull request #12951 from Mic92/fix-race-condition
...
tests/functional/repl: fix race condition
2025-04-07 14:18:05 +02:00
Jörg Thalheim
1de951d31d
tests/functional/repl: fix race condition
...
the sleep 1 is not enough in some circumstances. Switching to a fifo
helps.
2025-04-07 14:00:19 +02: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
59d1634aab
Tagging release 2.28.1
...
-----BEGIN PGP SIGNATURE-----
iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmfzku8THGVkb2xzdHJh
QGdtYWlsLmNvbQAKCRCBcLRybXGY3ngWB/0e5vMSgZtARQXjuyexyJyy2m8JIQzJ
Stw7dP0/oAvWYWuytez3jX4KC9xztMELblgZzXQhO72wIfzpa/CmxWQXVSaHm6Kq
zYAWhxXz2HKGEPd8bS6eCFCZcrmChso7UN2WjrROYwB+1HO5S1rtOJtv2K1zvy5C
xRMoOpSfKVfn63FoODhenW3UWbfeck5Dmb6eirPxvIMUIcDi2FeX5MVlklgNhxum
351/Ymo5dxyK1pGmm8NrvB/3RSk7rVRUR+R4257lCmrN0g4gvM0G4MvxGm+XHMmC
d/tmeU+JKPiXKFDSWmuTCmwCenu/q95QRadKST+Wls+qc4gHQLCaXfgn
=hcKx
-----END PGP SIGNATURE-----
Merge tag '2.28.1' into sync-2.28.0
Tagging release 2.28.1
2025-04-07 11:21:07 +02: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
Jörg Thalheim
3ff19be1f7
Merge pull request #12944 from roberth/maintainers-release-notes-fail
...
maintainers/release-notes: Let it fail
2025-04-07 10:51:08 +02: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 2b512505343294b22a68
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
