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
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
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
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
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
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
Robert Hensing
3bb46b73a8
Fix undefined macro errors
...
(cherry picked from commit 77b4bb74d5
2025-04-06 16:25:51 +00:00
Robert Hensing
77b4bb74d5
Fix undefined macro errors
2025-04-06 17:43:17 +02: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
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
994c8b6a7a
Set path display for substituted inputs
...
(cherry picked from commit 4a397cfb80
2025-04-03 12:50:25 +00: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
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
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
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
Eelco Dolstra
0f723769b7
Fix -Wdangling-reference
2025-04-02 20:51:45 +00: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
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
Eelco Dolstra
67e957b636
Apply makeNotAllowedError to empty repos
2025-04-02 19:57:49 +02: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
