nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-11 21:16:02 +01:00
Code Activity
20987 commits 179 branches 219 tags 168 MiB
Commit graph

20987 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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