wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Code Activity
19567 commits 245 branches 205 tags 163 MiB
Commit graph

19567 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra
064c141fc8 Mention BLAKE3 in the Nix 2.27 release notes 
(cherry picked from commit c0ed07755a)
 2025-04-14 13:47:54 +00:00
mergify[bot]
af298ee53f
Merge pull request #12981 from NixOS/mergify/bp/2.27-maintenance/pr-12979 
Actually ignore system/user registries during locking (backport #12979)
 2025-04-09 16:53:03 +00:00
Eelco Dolstra
4dfe5eb587 Actually ignore system/user registries during locking 
Something went wrong in #12068 so this didn't work. Also added a test.

(cherry picked from commit 77d4316353)
 2025-04-09 16:33:40 +00:00
mergify[bot]
b23189061e
Merge pull request #12971 from NixOS/mergify/bp/2.27-maintenance/pr-12967 
Add trailing commas on addFlag incantations (backport #12967)
 2025-04-07 23:37:16 +00:00
Graham Christensen
025c935ba2 format as required 
(cherry picked from commit 9b47b2b217)
 2025-04-07 23:16:22 +00:00
Graham Christensen
29d37eb2db Add trailing commas on addFlag incantations 
(cherry picked from commit 06acbd37bd)
 2025-04-07 23:16:22 +00:00
mergify[bot]
d0f98c76f9
Merge pull request #12954 from NixOS/mergify/bp/2.27-maintenance/pr-12951 
tests/functional/repl: fix race condition (backport #12951)
 2025-04-07 12:39:59 +00:00
Jörg Thalheim
eb97d69f0d 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:19:27 +00:00
mergify[bot]
92b4578a65
Merge pull request #12948 from NixOS/mergify/bp/2.27-maintenance/pr-12944 
maintainers/release-notes: Let it fail (backport #12944)
 2025-04-07 09:11:32 +00:00
Robert Hensing
6733f72ea4 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:52:36 +00:00
Jörg Thalheim
ad814e7b93
Merge pull request #12923 from NixOS/mergify/bp/2.27-maintenance/pr-12911 
create cache entry for paths already in the nix store (backport #12911)
 2025-04-04 16:23:54 +02:00
Jörg Thalheim
82a47978db 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 16:04:14 +02:00
mergify[bot]
f02ce07682
Merge pull request #12920 from NixOS/mergify/bp/2.27-maintenance/pr-12919 
Reinstate Darwin minversion (backport #12919)
 2025-04-04 06:46:44 +00:00
Robert Hensing
f0bf94fe29 packaging/dependency: Clarify darwinMinVersion 
(cherry picked from commit 4be92e7b82)
 2025-04-04 06:39:08 +00:00
Robert Hensing
22168ff57d 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:08 +00:00
mergify[bot]
bfa581fcff
Merge pull request #12913 from NixOS/mergify/bp/2.27-maintenance/pr-12912 
Set path display for substituted inputs (backport #12912)
 2025-04-03 13:07:34 +00:00
Eelco Dolstra
8d1c97a55a Set path display for substituted inputs 
(cherry picked from commit 4a397cfb80)
 2025-04-03 12:50:23 +00:00
mergify[bot]
71aad3ad44
Merge pull request #12865 from NixOS/mergify/bp/2.27-maintenance/pr-12810 
Packaging improvements from Nixpkgs (backport #12810)
 2025-04-03 08:19:38 +00:00
Robert Hensing
aa5ffba310 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-03 09:52:57 +02:00
Robert Hensing
bb104e9b28 packaging: Various improvements 
Co-authored-by: Mic92 <Mic92@users.noreply.github.com>
(cherry picked from commit 1172e49a3a)
 2025-04-03 09:52:57 +02:00
Eelco Dolstra
c73c503d5f
Merge pull request #12881 from NixOS/mergify/bp/2.27-maintenance/pr-12869 
Apply makeNotAllowedError to empty Git repos (backport #12869)
 2025-04-03 09:52:46 +02:00
Eelco Dolstra
95cd6c1e48 Merge remote-tracking branch 'origin/2.27-maintenance' into mergify/bp/2.27-maintenance/pr-12869 2025-04-03 09:32:40 +02:00
Eelco Dolstra
635a9975fd
Merge pull request #12900 from NixOS/revert-12892-mergify/bp/2.27-maintenance/pr-12876 
Revert "decrease connect-timeout to 5s (backport #12876)"
 2025-04-03 09:26:45 +02:00
mergify[bot]
45aba8d640
Merge pull request #12905 from NixOS/mergify/bp/2.27-maintenance/pr-12886 
symlink_exists: wrap exceptions into nix exception (backport #12886)
 2025-04-02 23:37:30 +00:00
Jörg Thalheim
fa140349b8 symlink_exists: wrap exceptions into nix exception 
(cherry picked from commit 779687854f)
 2025-04-02 23:14:01 +00:00
mergify[bot]
2c02b58617
Merge pull request #12894 from NixOS/mergify/bp/2.27-maintenance/pr-12863 
libgit2: use upstream version if possible (backport #12863)
 2025-04-02 22:28:06 +00:00
Robert Hensing
cb3c8bba70
Revert "decrease connect-timeout to 5s (backport #12876)" 2025-04-02 23:53:21 +02:00
mergify[bot]
5ecb8a12ee
Merge pull request #12892 from NixOS/mergify/bp/2.27-maintenance/pr-12876 
decrease connect-timeout to 5s (backport #12876)
 2025-04-02 21:39:44 +00:00
Jörg Thalheim
a6a621c8ff 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:31 +00:00
Jörg Thalheim
f1cb0e6ddb 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:30 +00:00
Jörg Thalheim
7ef0eddfdc decrease connect-timeout to 5s 
For people self-hosting caches that can be occasionally down, the
default timeout is very long. This is annoying if you are trying to
update your binary cache at the same time you are trying to update
another machine. Same if cachix has one of its rare hiccups.

We tested this value of 5s in srvos now for years and we like to travel
around the world with shitty internet, so it should be still reasonable
high.

(cherry picked from commit bef91a618a)
 2025-04-02 20:43:28 +00:00
Eelco Dolstra
c0b4fb0de8
Merge pull request #12883 from NixOS/mergify/bp/2.27-maintenance/pr-12870 
Git fetcher: Improve error message for untracked files (backport #12870)
 2025-04-02 21:30:50 +02:00
Eelco Dolstra
2b4ddbbf47 Make Git error messages more consistent 
(cherry picked from commit f15681df26)
 2025-04-02 19:15:12 +00:00
Eelco Dolstra
d653225a24 Tweak error message 
(cherry picked from commit 277c29a64b)
 2025-04-02 19:15:12 +00:00
Graham Christensen
398c4136c2 Improve and fix the error message when a file is not tracked by Git 
(cherry picked from commit 62e2304891)
 2025-04-02 19:15:11 +00:00
Eelco Dolstra
084e75ed2f Apply makeNotAllowedError to empty repos 
(cherry picked from commit 67e957b636)
 2025-04-02 18:33:01 +00:00
mergify[bot]
ae2bd40d06
Merge pull request #12861 from NixOS/mergify/bp/2.27-maintenance/pr-12853 
flake: nixpkgs: 24.11 -> nixos-unstable (backport #12853)
 2025-04-01 17:18:43 +00:00
Robert Hensing
9b87c4f806 tests/nixos: Work around network-online.target inactivity 
(cherry picked from commit 58b657b976)
 2025-04-01 16:50:27 +00:00
Robert Hensing
5671175a5e Format 
clang-format: 18.1.8 -> 19.1.7
(cherry picked from commit 55297f865c)

# Conflicts:
#	src/libstore-test-support/outputs-spec.cc
 2025-04-01 16:50:27 +00:00
Robert Hensing
f33a435329 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:26 +00:00
mergify[bot]
07309b497a
Merge pull request #12856 from NixOS/mergify/bp/2.27-maintenance/pr-12765 
Add various clang tidy fixes (backport #12765)
 2025-04-01 14:27:32 +00:00
Jörg Thalheim
a42345a1ff libstore/daemon: make sure monitor is not considered "unused" 
(cherry picked from commit 5c3682d7a1)
 2025-04-01 13:37:46 +00:00
Jörg Thalheim
9ee7318a23 test/ca-fd-leak: fix clang-tidy lints 
(cherry picked from commit b050db951b)
 2025-04-01 13:37:45 +00:00
Jörg Thalheim
b1826f720c git/getStringUntil: fix uninitialized stack variable 
at least clang-tidy is not convinced that this initialized.
If this is not the case, the impact should be small and hopefully also
more robust if changed.

(cherry picked from commit 7e540059a3)
 2025-04-01 13:37:45 +00:00
Jörg Thalheim
da1b5599b7 libstore/local-store: fix linting warning about unused variable 
(cherry picked from commit 05082ea1c5)
 2025-04-01 13:37:45 +00:00
mergify[bot]
8c5107a640
Merge pull request #12843 from NixOS/mergify/bp/2.27-maintenance/pr-12805 
nix-daemon: source nix-profile-daemon.sh only once (backport #12805)
 2025-04-01 07:49:39 +00:00
Thomas Miedema
a5f003555e nix-daemon: source nix-profile-daemon.sh only once 
On my system (Ubuntu 24.04 with nix installed using
https://zero-to-nix.com/), I noticed that my PATH
contained multiple times the following entries:

  /home/thomas/.nix-profile/bin
  /nix/var/nix/profiles/default/bin

Fix it by inserting a missing `export`, to make
sure `nix-daemon.sh` is really only executed once.

(cherry picked from commit 2b4e3fa144)
 2025-04-01 06:48:29 +00:00
mergify[bot]
668e09f74a
Merge pull request #12816 from NixOS/mergify/bp/2.27-maintenance/pr-12812 
Disable packaging-overriding test (backport #12812)
 2025-03-31 16:48:51 +00:00
Eelco Dolstra
67aa608856 Disable packaging-overriding 
Fixes #12690.

(cherry picked from commit a4be66828a)
 2025-03-31 16:31:11 +00:00
John Ericson
4688590733
Merge pull request #12797 from NixOS/mergify/bp/2.27-maintenance/pr-12794 
Fix windows build (backport #12794)
 2025-03-28 21:50:47 -04:00