nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-12 05:26:02 +01:00
Code Activity
20917 commits 179 branches 219 tags 169 MiB
Commit graph

20917 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Ericson
30d900b313 Derivation "advanced attrs" test: Ensure fields are set to distinct values 
We had fields set to the same values before in our test data. This is
not a problem per-se, but does mean we wouldn't catch certain mixups.
Now, the fields are set to distinct values (where possible), which makes
the test more robust.

(cherry picked from commit a0b2b75f59)
 2025-04-15 14:25:13 -04:00
Jörg Thalheim
89ba6dff66
Merge pull request #13032 from obsidiansystems/more-outputs-test
Some checks failed
CI / eval (push) Has been cancelled
CI / tests ${{ matrix.scenario }} (darwin, macos-14, on macos) (push) Has been cancelled
CI / tests ${{ matrix.scenario }} (linux, ubuntu-24.04, on ubuntu) (push) Has been cancelled
CI / Check Docker secrets present for installer tests (push) Has been cancelled
CI / vm_tests (push) Has been cancelled
CI / installer test ${{ matrix.scenario }} (darwin, macos-14, on macos) (push) Has been cancelled
CI / installer test ${{ matrix.scenario }} (linux, ubuntu-24.04, on ubuntu) (push) Has been cancelled
CI / docker_push_image (push) Has been cancelled
CI / flake_regressions (push) Has been cancelled
Improve derivation "advanced attrs" test, fix almost-bug
 2025-04-15 19:08:35 +02:00
Jörg Thalheim
009ff8e5a7
Merge pull request #13013 from NaN-git/fix-ceil-floor 
libexpr: fix UB in builtins.ceil and builtins.floor
 2025-04-15 18:56:46 +02:00
Jörg Thalheim
cf6da9234c
Merge pull request #12410 from obsidiansystems/derivation-options-2 
Scrap `ParsedDerivation` for parts
 2025-04-15 18:36:11 +02:00
John Ericson
32409dd7d7 Remove stray assignment side affect in lambda 
This was almost a bug! It wasn't simply because another assignment would
clobber it later.
 2025-04-15 12:29:17 -04:00
John Ericson
a0b2b75f59 Derivation "advanced attrs" test: Ensure fields are set to distinct values 
We had fields set to the same values before in our test data. This is
not a problem per-se, but does mean we wouldn't catch certain mixups.
Now, the fields are set to distinct values (where possible), which makes
the test more robust.
 2025-04-15 12:29:14 -04:00
John Ericson
5f0ddd7467
Merge pull request #13028 from NixOS/mergify/bp/2.28-maintenance/pr-13022 
Test derivation options with content-addressing too (backport #13022)
 2025-04-15 12:11:55 -04:00
Eelco Dolstra
0c0dda3b29 Devirtualize double-copied paths 
Borrowed from the original lazy-trees branch.
 2025-04-15 17:44:56 +02:00
John Ericson
f19184191e Test derivation options with content-addressing too 
Now, both the unit and functional tests relating to derivation options
are tested both ways -- with input addressing and content-addressing
derivations.

(cherry picked from commit 307dbe9914)
 2025-04-15 11:25:07 -04:00
John Ericson
37bcd29e5f Use the same variable for content addressing in functional tests 
`CONTENT_ADDRESSED` -> `NIX_TESTS_CA_BY_DEFAULT`

(cherry picked from commit 7acc229c8f)
 2025-04-15 11:19:45 -04:00
Eelco Dolstra
5ecbf6b9dc
Merge pull request #13029 from NixOS/mergify/bp/2.28-maintenance/pr-13026 
Fix issue #13018, `sourceInfo` strict in `outputs` (backport #13026)
 2025-04-15 14:24:59 +02:00
Jörg Thalheim
f233a99cc8
Merge pull request #13027 from NixOS/mergify/bp/2.28-maintenance/pr-12603 
libstore: curl retry: reset content-encoding and don't use string after move (backport #12603)
 2025-04-15 14:00:13 +02:00
Robert Hensing
818fc68db6 fix: Evaluate flake parent source without evaluating its outputs 
This requires that we refer to the `sourceInfo` instead of the
`result`. However, `sourceInfo` does not create a chain of basedir
resolution, so we add that back with `flakeDir`.

(cherry picked from commit 2109a5a206)
 2025-04-15 11:52:46 +00:00
Robert Hensing
671364748c call-flake.nix: allNodes.${key} -> allNodes.${key}.result 
(cherry picked from commit 9de9410f29)
 2025-04-15 11:52:45 +00:00
Robert Hensing
9a969e29cf call-flake.nix: refactor: Bring mapAttrs into scope 
(cherry picked from commit 674375b021)
 2025-04-15 11:52:45 +00:00
Jörg Thalheim
99a16c5203
Merge pull request #13026 from roberth/issue-13018
Some checks are pending
CI / eval (push) Waiting to run
CI / tests ${{ matrix.scenario }} (darwin, macos-14, on macos) (push) Waiting to run
CI / tests ${{ matrix.scenario }} (linux, ubuntu-24.04, on ubuntu) (push) Waiting to run
CI / installer test ${{ matrix.scenario }} (darwin, macos-14, on macos) (push) Blocked by required conditions
CI / installer test ${{ matrix.scenario }} (linux, ubuntu-24.04, on ubuntu) (push) Blocked by required conditions
CI / Check Docker secrets present for installer tests (push) Waiting to run
CI / docker_push_image (push) Blocked by required conditions
CI / vm_tests (push) Waiting to run
CI / flake_regressions (push) Blocked by required conditions
Fix issue #13018, `sourceInfo` strict in `outputs`
 2025-04-15 13:51:02 +02:00
Jörg Thalheim
22c928f9c0
Merge pull request #12992 from DeterminateSystems/input-cache 
Rename FlakeCache to InputCache and move it to libfetchers
 2025-04-15 13:32:39 +02:00
Jörg Thalheim
13a0853f04
Merge pull request #13024 from obsidiansystems/derivation-options-exportReferencesGraph 
Move `exportReferencesGraph` to `DerivationOptions`
 2025-04-15 13:28:00 +02:00
Jörg Thalheim
995d4f4aa7
Merge pull request #13022 from obsidiansystems/derivation-options 
Test derivation options with content-addressing too
 2025-04-15 13:27:09 +02:00
Robert Hensing
2109a5a206 fix: Evaluate flake parent source without evaluating its outputs 
This requires that we refer to the `sourceInfo` instead of the
`result`. However, `sourceInfo` does not create a chain of basedir
resolution, so we add that back with `flakeDir`.
 2025-04-15 13:22:53 +02:00
Robert Hensing
9de9410f29 call-flake.nix: allNodes.${key} -> allNodes.${key}.result 2025-04-15 13:22:53 +02:00
Robert Hensing
674375b021 call-flake.nix: refactor: Bring mapAttrs into scope 2025-04-15 13:22:53 +02:00
Philipp Otterbein
a603401cdd libstore: curl retry: reset content-encoding and don't use string after move 
(cherry picked from commit b129fc8237)
 2025-04-15 11:22:25 +00:00
John Ericson
d8be4f618f Scrap ParsedDerivation for parts 
Only a much smaller `StructuredAttrs` remains, the rest is is now moved
to `DerivationOptions`.

This gets us quite close to `std::optional<StructuredAttrs>` and
`DerivationOptions` being included in `Derivation` as fields.
 2025-04-14 16:14:41 -04:00
John Ericson
1e31b60043 Limit ParsedDerivation just to the derivation's environment 
This moves us towards getting rid of `ParsedDerivation` and just having
`DerivationOptions`.

Co-Authored-By: HaeNoe <git@haenoe.party>
 2025-04-14 15:46:55 -04:00
John Ericson
d285b80033 Move exportReferencesGraph to DerivationOptions 
Tests are updated accordingly.
 2025-04-14 14:24:36 -04:00
John Ericson
307dbe9914 Test derivation options with content-addressing too 
Now, both the unit and functional tests relating to derivation options
are tested both ways -- with input addressing and content-addressing
derivations.
 2025-04-14 13:43:46 -04:00
John Ericson
7acc229c8f Use the same variable for content addressing in functional tests 
`CONTENT_ADDRESSED` -> `NIX_TESTS_CA_BY_DEFAULT`
 2025-04-14 11:20:07 -04:00
Eelco Dolstra
3e895be4e4
Merge pull request #13021 from NixOS/mergify/bp/2.28-maintenance/pr-13019
Some checks are pending
CI / eval (push) Waiting to run
CI / tests ${{ matrix.scenario }} (darwin, macos-14, on macos) (push) Waiting to run
CI / tests ${{ matrix.scenario }} (linux, ubuntu-24.04, on ubuntu) (push) Waiting to run
CI / installer test ${{ matrix.scenario }} (darwin, macos-14, on macos) (push) Blocked by required conditions
CI / installer test ${{ matrix.scenario }} (linux, ubuntu-24.04, on ubuntu) (push) Blocked by required conditions
CI / Check Docker secrets present for installer tests (push) Waiting to run
CI / docker_push_image (push) Blocked by required conditions
CI / vm_tests (push) Waiting to run
CI / flake_regressions (push) Blocked by required conditions
Mention BLAKE3 in the Nix 2.27 release notes (backport #13019)
 2025-04-14 16:13:07 +02:00
Eelco Dolstra
b1a1f4bd2f Mention BLAKE3 in the Nix 2.27 release notes 
(cherry picked from commit c0ed07755a)
 2025-04-14 13:47:57 +00:00
Eelco Dolstra
b3aa07009d
Merge pull request #13019 from NixOS/mention-blake3
Some checks are pending
CI / eval (push) Waiting to run
CI / tests ${{ matrix.scenario }} (darwin, macos-14, on macos) (push) Waiting to run
CI / tests ${{ matrix.scenario }} (linux, ubuntu-24.04, on ubuntu) (push) Waiting to run
CI / installer test ${{ matrix.scenario }} (darwin, macos-14, on macos) (push) Blocked by required conditions
CI / installer test ${{ matrix.scenario }} (linux, ubuntu-24.04, on ubuntu) (push) Blocked by required conditions
CI / Check Docker secrets present for installer tests (push) Waiting to run
CI / docker_push_image (push) Blocked by required conditions
CI / vm_tests (push) Waiting to run
CI / flake_regressions (push) Blocked by required conditions
Mention BLAKE3 in the Nix 2.27 release notes
 2025-04-14 15:47:38 +02:00
Eelco Dolstra
c0ed07755a Mention BLAKE3 in the Nix 2.27 release notes 2025-04-14 15:18:29 +02:00
Eelco Dolstra
e099a5bc67 Move the InputCache to EvalState 2025-04-14 15:02:24 +02:00
Eelco Dolstra
4966217b6a Move the InputCache to EvalState 2025-04-14 14:29:14 +02:00
mergify[bot]
b1fe93fab7
Merge pull request #13015 from obsidiansystems/derivation-options 
`ParsedDerivation`: don't take `drvPath`
 2025-04-14 11:14:34 +00:00
Jörg Thalheim
f18180a045
Merge pull request #13011 from NixOS/mergify/bp/2.28-maintenance/pr-13009 
Fix typo in string context docs (backport #13009)
 2025-04-14 12:41:39 +02:00
Jörg Thalheim
3f3fd2c94b
Merge pull request #12976 from picnoir/pic/multisign 
store URI: introduce multiple signatures support
 2025-04-14 11:20:41 +02:00
Picnoir
7ea536fe84 Narinfo sign: multiple signatures variant 
This is a small optimization used when we're signing a narinfo for
multiple keys in one go. Using this sign variant, we only compute the
NAR fingerprint once, then sign it with all the keys.
 2025-04-14 10:30:47 +02:00
John Ericson
0123640009 ParsedDerivation: don't take drvPath 
It is just use for adding context to errors, but we have `addTrace` to
do that. Let the callers do that instead.

The callers doing so is a bit duplicated, yes, but this will get better
once `DerivationOptions` is included in `Derivation`.
 2025-04-13 18:21:13 -04:00
Philipp Otterbein
56d37656ac libexpr: fix UB in builtins.ceil and builtins.floor 
tighten and fix specification of both builtins
 2025-04-13 04:36:09 +02:00
Anthony Wang
9156550493 Fix typo in string context docs 
(cherry picked from commit f64b8957c7)
 2025-04-12 23:58:45 +00:00
mergify[bot]
0e1323c041
Merge pull request #13009 from anthowan/patch-1 
Fix typo in string context docs
 2025-04-12 23:57:57 +00:00
John Ericson
f6df573a91 flake.lock: Update Nixpkgs 
This fixes evaluation for Windows. There are unfortunately deps that
still don't build, but this can be fixed next.

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/52faf482a3889b7619003c0daec593a1912fddc1?narHash=sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om%2BD4UnDhlDW9BE%3D' (2025-03-30)
  → 'github:NixOS/nixpkgs/f675531bc7e6657c10a18b565cfebd8aa9e24c14?narHash=sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U%3D' (2025-04-09)
 2025-04-12 19:37:20 -04:00
Anthony Wang
f64b8957c7
Fix typo in string context docs 2025-04-12 19:17:27 -04:00
Jörg Thalheim
71567373b6
Merge pull request #13008 from Mic92/aliases 
Move alias support from NixArgs to MultiCommand + test
 2025-04-12 11:06:09 +02:00
Jörg Thalheim
b1b75e1d7a tests/functional: add test for alias commands 2025-04-12 10:20:30 +02:00
Jörg Thalheim
837f349a99
Merge pull request #12999 from fricklerhandwerk/language 
Nix language reference: highlight characteristic features
 2025-04-12 10:13:47 +02:00
Graham Christensen
a706827799
Merge pull request #30 from DeterminateSystems/release-v3.3.1/20866552-faca-451d-8b79-7a950f146b77 
Release v3.3.1
 2025-04-12 03:07:44 +00:00
github-actions[bot]
398104dcbf
Set .version-determinate to 3.3.1 2025-04-12 02:34:37 +00:00
github-actions[bot]
c1c0e20f2e
Prepare release v3.3.1 2025-04-12 02:34:34 +00:00