1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-29 21:50:58 +01:00
Commit graph

33 commits

Author SHA1 Message Date
Eelco Dolstra
5c29abc5bd GitArchiveInputScheme: Revert to downloading tarballs
Tarballs are now unpacked into a content-addressed cache, specifically
a Git repository in ~/.cache/nix/tarball-cache so that we can use
GitAccessor to provide random access.
2023-02-01 00:06:46 +01:00
Eelco Dolstra
31bb87519f Use libgit2 to provide direct access to Git repositories 2023-01-31 13:03:17 +01:00
Eelco Dolstra
81a4516397 InstallableFlake::toDerivedPaths(): Support paths and store paths
This makes 'nix build' work on paths (which will be copied to the
store) and store paths (returned as is). E.g. the following flake
output attributes can be built using 'nix build .#foo':

  foo = ./src;
  foo = self.outPath;
  foo = builtins.fetchTarball { ... };
  foo = (builtins.fetchTree { .. }).outPath;
  foo = builtins.fetchTree { .. } + "/README.md";
  foo = builtins.storePath /nix/store/...;

Note that this is potentially risky, e.g.

  foo = /.;

will cause Nix to try to copy the entire file system to the store.

What doesn't work yet:

  foo = self;
  foo = builtins.fetchTree { .. };

because we don't handle attrsets with an outPath attribute in it yet,
and

  foo = builtins.storePath /nix/store/.../README.md;

since result symlinks have to point to a store path currently (rather
than a file inside a store path).

Fixes #7417.
2022-12-15 23:09:16 +01:00
Eelco Dolstra
4072024d79 GitArchiveInputScheme: Bring back the narHash attribute
This is needed to verify that the source tree served by GitHub hasn't
changed compared to the lock file. Computing the narHash for a nixpkgs
source tree only takes ~0.6s and it's cached. So the cost is fairly
negligible compared to the download time.
2022-11-03 14:23:24 +01:00
Eelco Dolstra
a115c4f4b2 GitHub fetcher: Restore the lastModified field 2022-08-22 12:33:11 +02:00
Eelco Dolstra
bb962381e9 Fix clang build 2022-08-12 11:58:48 +02:00
Eelco Dolstra
beac2e67cd Persistently cache InputAccessor::fetchToStore()
This especially speeds up repeated evaluations that copy a large
source tree (e.g. 'nix.nixPath = [ "nixpkgs=${nixpkgs}" ];').
2022-08-11 20:34:27 +02:00
Eelco Dolstra
2e0d63caf6 Add InputAccessor::fetchToStore() 2022-08-11 20:03:22 +02:00
Eelco Dolstra
48012603b3 Move FSInputAccessor into a separate file 2022-08-01 16:00:12 +02:00
Eelco Dolstra
55c63c9b89 Remove InputScheme::fetchToStore()
InputSchemes now only have a getAccessor(). They could be implemented
internally by fetching the input to the store, but in that case they
will just return a FSInputAccessor.
2022-08-01 15:44:40 +02:00
Eelco Dolstra
bb4d35dcca Make 'nix edit' etc. work again 2022-07-26 17:06:45 +02:00
Eelco Dolstra
e17a619106 Improve display of GitHub input filenames in error messages
E.g.

  … while evaluating the attribute 'buildCommand' of the derivation 'vm-test-run-github-flakes'

  at «github:NixOS/nixpkgs/2fa57ed190fd6c7c746319444f34b5917666e5c1»/pkgs/stdenv/generic/make-derivation.nix:278:7:
2022-07-14 16:53:41 +02:00
Eelco Dolstra
78232889c0 Use corepkgsFS for derivation.nix 2022-07-07 14:29:58 +02:00
Eelco Dolstra
a18b3c665a Store a ref to InputAccessor in SourcePath 2022-07-06 17:25:15 +02:00
Eelco Dolstra
5f1340219b
Add builtins.patch
This replaces the 'patches' argument to builtins.fetchTree with
something more generic. So instead of 'builtins.fetchTree { patches =
... }' you can do 'builtins.patch { src = builtins.fetchTree { ... };
patchFiles = ... }'.
2022-06-10 13:10:22 +02:00
Eelco Dolstra
b01ee2a93d
nix flake init: Fix 2022-06-01 13:54:34 +02:00
Eelco Dolstra
1970d6db12
Fix showing an appropriate RestrictedPathError 2022-05-18 14:20:24 +02:00
Eelco Dolstra
df2aa29690
Improve symlink handling 2022-05-17 13:56:26 +02:00
Eelco Dolstra
a71f209330
Add CanonPath wrapper to represent canonicalized paths 2022-05-16 23:27:04 +02:00
Eelco Dolstra
1ee5dd6d96
Fix relative path handling in the parser 2022-05-12 18:38:30 +02:00
Eelco Dolstra
cd893a22f5
Make the file cache keyed on SourcePath 2022-05-12 16:48:22 +02:00
Eelco Dolstra
feac6d8651
Fix addPath() 2022-05-11 16:29:17 +02:00
Eelco Dolstra
e7f8aa8bdd Fix copyPathToStore() 2022-05-09 15:29:42 +02:00
Eelco Dolstra
e89d3e0edf Fix resolveExprPath() 2022-05-09 14:28:47 +02:00
Eelco Dolstra
06c1edf889 Checkpoint 2022-03-29 11:01:14 +02:00
Eelco Dolstra
bacf83e953 Fix path access control 2022-03-29 11:01:14 +02:00
Eelco Dolstra
1d36d16086 Fix flakes 2022-03-29 11:01:14 +02:00
Eelco Dolstra
4b313ceb9e fetchTree: Support applying patches
You can now write

  fetchTree {
    type = "github";
    owner = "NixOS";
    repo = "nixpkgs";
    rev = "0f316e4d72daed659233817ffe52bf08e081b5de";
    patches = [ ./thunderbird-1.patch ./thunderbird-2.patch ];
  };

to apply a list of patches to a tree. These are applied lazily - the
patched tree is not materialized unless you do something that causes
the entire tree to be copied to the store (like 'src = fetchTree {
... }'). The equivalent of '-p1' is implied.

File additions/deletions/renames are not yet handled.

Issue #3920.
2022-03-29 11:01:14 +02:00
Eelco Dolstra
006d862d30 GitArchiveInputScheme: Use zip files to avoid unpacking to disk 2022-03-29 11:01:14 +02:00
Eelco Dolstra
38c665847a FSInputAccessor: Implement filtering 2022-03-29 11:01:14 +02:00
Eelco Dolstra
3ec83565b1 Checkpoint 2022-03-29 11:01:14 +02:00
Eelco Dolstra
ffe0dc9a8c Add MemoryInputAccessor for corepkgs 2022-03-29 11:01:14 +02:00
Eelco Dolstra
c56e17b718 Checkpoint 2022-03-29 11:01:14 +02:00