wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-10 04:43:53 +02:00
Code Activity
19304 commits 246 branches 206 tags 166 MiB
Commit graph

121 commits

Author SHA1 Message Date
Eelco Dolstra
43a3f55cda 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:37 +00:00
Shahar "Dawn" Or
162081618f stack overflow is EvalBaseError 
(cherry picked from commit 23c7a45a05)
 2025-03-21 14:12:36 +00:00
Eelco Dolstra
827f760ad7
Fix test 
We didn't backport `nix flake prefetch --out-link`.
 2025-02-24 23:00:07 +01:00
Eelco Dolstra
91508de315 nix flake archive: Recurse into relative path inputs 
We can't ignore them entirely, since we do want to archive their
transitive inputs.

Fixes #12438.

(cherry picked from commit 14c9755462)
 2025-02-24 21:30:45 +00:00
Eelco Dolstra
d670380bd9 nix flake archive: Skip relative path inputs 
Fixes #12438.

(cherry picked from commit b4dfeafed5)
 2025-02-24 14:49:11 +00:00
Eelco Dolstra
521667eb89 Fix follow-paths test 
Since ff8e2fe84e, 'path:' URLs on the
CLI are interpreted as relative to the current directory of the user,
not the path of the flake we're overriding.
 2025-01-16 11:19:20 +01:00
Eelco Dolstra
550fe889ee Merge remote-tracking branch 'origin/master' into relative-flakes 2025-01-16 11:05:10 +01:00
John Ericson
e02026adae
Merge pull request #12254 from DeterminateSystems/fix-relative-path-on-cli 
Fix relative 'path:' flakerefs in the CLI
 2025-01-15 15:19:56 -05:00
mergify[bot]
c45dfeeef3
Merge pull request #12220 from DeterminateSystems/allow-dirty-locks 
Add setting 'allow-dirty-locks'
 2025-01-15 20:18:28 +00:00
Eelco Dolstra
ff8e2fe84e Fix relative 'path:' flakerefs in the CLI 
And handle relative 'git+file:' flakerefs while we're at it (these
crashed with an assertion failure).

Fixes #12248.
 2025-01-14 17:30:13 +01:00
Eelco Dolstra
cd0127f957 Merge remote-tracking branch 'origin/master' into relative-flakes 2025-01-13 14:13:56 +01:00
Eelco Dolstra
e161393299 Add setting 'allow-dirty-locks' 
This allows writing lock files with dirty inputs, so long as they have
a NAR hash. (Currently they always have a NAR hash, but with lazy
trees that may not always be the case.)

Generally dirty locks are bad for reproducibility (we can detect if
the dirty input has changed, but we have no way to fetch it except
substitution). Hence we don't allow them by default.

Fixes #11181.
 2025-01-10 17:55:30 +01:00
Robert Hensing
d9a50c0af2
Clarify cd call in tests/functional/flakes/flakes.sh 2025-01-10 09:57:54 +01:00
Bryan Lai
37ac18d1d9 tests/flake-in-submodule: git+file:./* input 2025-01-10 11:44:55 +08:00
Bryan Lai
9d088fa502 tests/flakes: check git+file:./${submodule} protocol 
Relative, local git repo used to work (for submodules), but it
fails after 3e0129ce3b.

This commit adds a test to prevent such failure in the future.
 2025-01-10 11:37:29 +08:00
Eelco Dolstra
28caa35a97 parsePathFlakeRefWithFragment(): Handle 'path?query' without a fragment 
Commands like `nix flake metadata '.?submodules=1'` ignored the query
part of the URL, while `nix build '.?submodules=1#foo'` did work
correctly because of the presence of the fragment part.
 2025-01-08 18:38:53 +01:00
Eelco Dolstra
8534c4222c Merge remote-tracking branch 'origin/master' into relative-flakes 2024-12-18 21:09:27 +01:00
Eelco Dolstra
757ea70644 Add a test 2024-12-17 13:13:39 +01:00
Eelco Dolstra
8b9e0f86e4 nix flake lock: Fail if there is an unlocked input 
Since the only purpose of `nix flake lock` is to write a new lock
file, it should be a fatal error if we can't write the lock file.
 2024-12-09 14:03:12 +01:00
Eelco Dolstra
0b00bf7c09 Merge remote-tracking branch 'origin/master' into relative-flakes 2024-11-22 14:44:32 +01:00
Eelco Dolstra
e122acef97 Fix VM test 2024-11-20 23:03:31 +01:00
Eelco Dolstra
671df02bf7 shellcheck 2024-11-20 23:03:31 +01:00
Eelco Dolstra
6832ee5d6f Move non-flake input tests into a separate file 2024-11-20 19:51:04 +01:00
Eelco Dolstra
4cafea7c7b Add a utility function for creating/registering a simple flake 2024-11-20 18:51:23 +01:00
Eelco Dolstra
e1cb905aca Move --commit-lock-file-summary tests into a separate file 2024-11-20 18:42:33 +01:00
Eelco Dolstra
fd2df5f02f Rename nonFlakeDir -> scriptDir 2024-11-20 18:23:20 +01:00
Eelco Dolstra
5533b0c735 Move shebang flake tests into a separate test 2024-11-20 18:08:31 +01:00
Eelco Dolstra
428af8c66f tests/functional/flakes/develop.sh: Don't hang 
The bash shell started by `nix develop` waited forever for stdin
input.

Fixes #11827.
 2024-11-18 16:28:12 +01:00
Eelco Dolstra
f29e7867a9 Revert "Merge pull request #11826 from DeterminateSystems/revert-11804" 
This reverts commit aeffdeffc8, reversing
changes made to 723fdeb4f1.
 2024-11-11 15:21:34 +01:00
Jörg Thalheim
aeffdeffc8
Merge pull request #11826 from DeterminateSystems/revert-11804 
Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"
 2024-11-08 12:04:55 +01:00
Eelco Dolstra
47bffe20e4 Revert "Merge pull request #10980 from kjeremy/flake-show-description" 
This reverts commit 1c5ad159d6, reversing
changes made to 67de193277.

This reverts commit ce4e4a158e, reversing
changes made to 43e82c9446.
 2024-11-07 18:12:04 +01:00
Eelco Dolstra
67d231c046 Revert "Merge pull request #11804 from obsidiansystems/remove-old-make" 
This reverts commit 619eeb658a, reversing
changes made to 1af94bf471.
 2024-11-07 13:46:37 +01:00
John Ericson
f7591bc6ed Make config.nix shims 
As requested in https://github.com/NixOS/nix/pull/11792#discussion_r1827034428
 2024-11-06 16:09:18 -05:00
John Ericson
e70c9bb06a Remove old build system 2024-11-06 16:09:18 -05:00
Robert Hensing
3112e59734 ProgressBar::ask: Accept EOF as a no 
This may occur when stderr is a tty but stdin is empty.
E.g.

    $ nix build </dev/null
    error: unexpected EOF reading a line

These stdio handles are how some non-interactive sandboxes behave,
including the Nix build sandbox and Hercules CI Effects.
 2024-11-06 19:45:19 +01:00
Bryan Honof
affd2dbc6c
test(functional): add tests for new environment operation flags 2024-11-04 14:41:33 +01:00
Bryan Honof
0b790b4849
feat: add flag set-env-var to MixEnvironment 2024-11-04 14:02:29 +01:00
John Ericson
9d2ed0a7d3 No longer copy functional tests to the build dir 
This should make `_NIX_TEST_ACCEPT=1` work again, fixing #11369.

Progress on #2503
 2024-11-03 16:42:38 -05:00
Tim Van Baak
39fe52a126 Replace shebang with shellcheck directive 2024-10-31 06:46:58 -07:00
Tim Van Baak
a75b082a28 Expand shellcheck coverage in functional tests 
Ref NixOS/nix#10795
 2024-10-30 08:27:06 -07:00
tomberek
14f029dbe8
Merge pull request #11489 from bryanhonof/bryanhonof.warn-on-malformed-uri-query 
fix: warn on malformed URI query parameter
 2024-09-30 12:14:40 -04:00
Bryan Honof
5150a962f5
test(functional/flakes): add dubious-query 
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
 2024-09-30 14:44:06 +02:00
Robert Hensing
4e31360637
Reference issue in tests/functional/flakes/run.sh 2024-09-30 13:02:51 +02:00
Jörg Thalheim
3b0c5ab835 tests/functional/flakes/run: fix tests in macOS devshell 
same fix as in 04a47e93f6
 2024-09-27 11:07:50 +02:00
Eelco Dolstra
f2063255a4 tests/functional/flakes/relative-paths.sh: Fix build failure in hydraJobs.tests.functional_user 2024-09-25 16:29:43 +02:00
Eelco Dolstra
09d71974ef shellcheck 2024-09-16 14:11:08 +02:00
Eelco Dolstra
21fc07c1a4 Merge remote-tracking branch 'origin/master' into relative-flakes 2024-09-16 13:45:58 +02:00
Eelco Dolstra
12fd65d179 Disable subflakes test 
Relative path flakes ("subflakes") are basically fundamentally
broken, since they produce lock file entries like

  "locked": {
    "lastModified": 1,
    "narHash": "sha256-/2tW9SKjQbRLzfcJs5SHijli6l3+iPr1235zylGynK8=",
    "path": "./flakeC",
    "type": "path"
  },

that don't specify what "./flakeC" is relative to. They *sometimes*
worked by accident because the `narHash` field allowed
`fetchToStore()` to get the store path of the subflake *if* it
happened to exist in the local store or in a substituter.

Subflakes are properly fixed in #10089 (which adds a "parent" field to
the lock file). Rather than come up with some crazy hack to make them
work in the interim, let's just disable the only test that depends on
the broken behaviour for now.
 2024-09-11 21:58:32 +02:00
Eelco Dolstra
c5a4dfa660 nix flake {metadata,archive}: Fix chroot stores 
Fixes

  $ nix flake metadata --store /tmp/nix nixpkgs
  error: path '/tmp/nix/nix/store/65xpqkz92d9j7k5ric4z8lzhiigxsfbg-source/flake.nix' is not in the Nix store

This has been broken since 598deb2b23.
 2024-09-09 15:41:38 +02:00
tomberek
1c5ad159d6
Merge pull request #10980 from kjeremy/flake-show-description 
nix flake show: add the description if it exists
 2024-08-18 16:31:44 -04:00