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

19609 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
mergify[bot]
b9ad90d447
Merge pull request #12874 from NixOS/mergify/bp/2.28-maintenance/pr-12677 
Improve the documentation of store path (backport #12677)
 2025-04-02 17:40:53 +00:00
mergify[bot]
8e94856239
Merge pull request #12875 from NixOS/mergify/bp/2.28-maintenance/pr-11672 
doc: note that @-pattern is accessible in default values (backport #11672)
 2025-04-02 17:02:05 +00:00
mergify[bot]
ef8b5d5d06
Merge pull request #12873 from NixOS/mergify/bp/2.28-maintenance/pr-12836 
Expose the nix component in header include paths (backport #12836)
 2025-04-02 16:16:33 +00:00
Valentin Gagarin
9fd8f5ef04 doc: note that function bindings are accessible in default values 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
(cherry picked from commit 9c3dd34cfe)
 2025-04-02 15:45:31 +00:00
oldshensheep
ce8b1eb2c4 Improve the documentation of store path 
# Conflicts:
#	doc/manual/source/protocols/store-path.md

(cherry picked from commit 355a923e81)
 2025-04-02 15:44:26 +00:00
John Ericson
0c67777396 Expose the nix component in header include paths 
For example, instead of doing

    #include "nix/store-config.hh"
    #include "nix/derived-path.hh"

Now do

    #include "nix/store/config.hh"
    #include "nix/store/derived-path.hh"

This was originally planned in the issue, and also recent requested by
Eelco.

Most of the change is purely mechanical. There is just one small
additional issue. See how, in the example above, we took this
opportunity to also turn `<comp>-config.hh` into `<comp>/config.hh`.
Well, there was already a `nix/util/config.{cc,hh}`. Even though there
is not a public configuration header for libutil (which also would be
called `nix/util/config.{cc,hh}`) that's still confusing, To avoid any
such confusion, we renamed that to `nix/util/configuration.{cc,hh}`.

Finally, note that the libflake headers already did this, so we didn't
need to do anything to them. We wouldn't want to mistakenly get
`nix/flake/flake/flake.hh`!

Progress on #7876

(cherry picked from commit cc24766fa6)
 2025-04-02 11:37:17 -04:00
Eelco Dolstra
64fb6ab435 AttrCursor::Parent: shared_ptr -> ref 
(cherry picked from commit 5a35745949)
 2025-04-02 13:23:39 +02:00
Eelco Dolstra
8b448c841e Throw CachedEvalError if a cached value exists but has type "failed" 
Otherwise you get unhelpful errors like

  error: 'apps' is not an attribute set

Fixes #12762.

(cherry picked from commit 8b438fccb4)
 2025-04-02 13:23:29 +02:00
mergify[bot]
00b1d9f0a0
Merge pull request #12866 from NixOS/mergify/bp/2.28-maintenance/pr-12810 
Packaging improvements from Nixpkgs (backport #12810)
 2025-04-01 18:43:18 +00:00
Robert Hensing
c908eef782 packaging: finalAttrs.doCheck -> finalAttrs.finalPackage.doCheck 
This includes the logic that disables checks on cross appropriately.

Co-authored-by: Peder Bergebakken Sundt <pbsds@hotmail.com>
(cherry picked from commit 27d71b21fc)
 2025-04-01 17:50:34 +00:00
Robert Hensing
abd5909fb6 packaging: Various improvements 
Co-authored-by: Mic92 <Mic92@users.noreply.github.com>
(cherry picked from commit 1172e49a3a)
 2025-04-01 17:50:33 +00:00
mergify[bot]
aff0058b82
Merge pull request #12862 from NixOS/mergify/bp/2.28-maintenance/pr-12853 
flake: nixpkgs: 24.11 -> nixos-unstable (backport #12853)
 2025-04-01 17:46:16 +00:00
Robert Hensing
f5731aa9a2 tests/nixos: Work around network-online.target inactivity 
(cherry picked from commit 58b657b976)
 2025-04-01 16:50:37 +00:00
Robert Hensing
36f23279bf Format 
clang-format: 18.1.8 -> 19.1.7
(cherry picked from commit 55297f865c)
 2025-04-01 16:50:36 +00:00
Robert Hensing
ec4c581adc flake: nixpkgs: 24.11 -> nixos-unstable 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/48d12d5e70ee91fe8481378e540433a7303dbf6a?narHash=sha256-1Noao/H%2BN8nFB4Beoy8fgwrcOQLVm9o4zKW1ODaqK9E%3D' (2024-12-16)
  → 'github:NixOS/nixpkgs/52faf482a3889b7619003c0daec593a1912fddc1?narHash=sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om%2BD4UnDhlDW9BE%3D' (2025-03-30)

(cherry picked from commit c212035d94)
 2025-04-01 16:50:36 +00:00
John Ericson
cb50eb0370 Bump version 2025-04-01 11:53:20 -04:00
mergify[bot]
b38fee24d7
Merge pull request #12857 from NixOS/mergify/bp/2.28-maintenance/pr-12765 
Add various clang tidy fixes (backport #12765)
 2025-04-01 15:31:30 +00:00
mergify[bot]
9987967e82
Merge pull request #12845 from NixOS/mergify/bp/2.28-maintenance/pr-12798 
Cleanup config headers (backport #12798)
 2025-04-01 14:53:44 +00:00
Jörg Thalheim
92978dc59c libstore/daemon: make sure monitor is not considered "unused" 
(cherry picked from commit 5c3682d7a1)
 2025-04-01 13:38:43 +00:00