guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,027 Commits 37 Branches 40 Tags
faefaac87568fe3ff04f4c2624f293763de2ae1e
Commit Graph
2329 Commits
Author SHA1 Message Date
Eelco Dolstra ff28fffce2 Don't cache realiseContext() errors 
Errors that depend on the configuration (such as whether
allow-import-from-derivation is set) should not be cached.
 2021-09-22 14:00:56 +02:00
Eelco Dolstra 60cc975d22 Set input parent at construction time 2021-09-21 14:07:16 +02:00
Geoff Reedy cbe9ddfd1a Include subpath in flake fingerprint 
Without this, flakes within the same tree and same lock data will have
the same fingerprint and the eval cache for one flake will be
incorrectly used for another.
 2021-09-16 15:58:21 -06:00
Ben Burdette cd8c232b55 add cout debugging 2021-09-15 16:16:53 -06:00
Eelco DolstraandGitHub 1ec4efa6c8 Merge pull request #5257 from edolstra/dirty-lock-file 
If we can't write a lock file, pretend the top-level flake is dirty
 2021-09-15 20:18:23 +02:00
Eelco Dolstra c17f3c5e69 Merge branch 'mh/fix-chroot-eval' of https://github.com/obsidiansystems/nix 2021-09-15 18:37:58 +02:00
Eelco Dolstra 027344ce7e If we can't write a lock file, pretend the top-level flake is dirty 
Alternative to #4639. You can still read flake.lock, but at least in
reproducible workflows like NixOS configurations where you require a
non-dirty tree, evaluation will fail because there is no rev.
 2021-09-15 18:31:42 +02:00
Eelco Dolstra 991cc53386 Revert "Disallow reading flake.lock" 
This reverts commit e5596113f7.
 2021-09-15 18:30:37 +02:00
Eelco Dolstra e5596113f7 Disallow reading flake.lock 
With --no-write-lock-file, it's possible that flake.lock is out of
sync with the actual inputs used by the evaluation. So doing fromJSON
(readFile ./flake.lock) will give wrong results.

Fixes #4639.
 2021-09-14 21:09:11 +02:00
Ben Burdette 21071bfdeb shared_ptr for StaticEnv 2021-09-14 10:49:22 -06:00
Eelco DolstraandGitHub 16d4922dd2 Merge pull request #5240 from edolstra/builtin-help 
nix --help: Display help using lowdown instead of man
 2021-09-14 11:31:23 +02:00
kvtbandEelco Dolstra c6fa7775de hashFile, hashString: realize context before calculation, and discard afterwards 2021-09-13 22:34:58 +02:00
Ben Burdette 176911102c printEnvPosChain 2021-09-13 11:57:25 -06:00
Eelco Dolstra 49a932fb18 nix --help: Display help using lowdown instead of man 
Fixes #4476.
Fixes #5231.
 2021-09-13 14:45:21 +02:00
Eelco DolstraandGitHub 9180239081 Merge pull request #5215 from ncfavier/patch-1 
Fix use-registries logic in builtins.getFlake
 2021-09-08 11:19:39 +02:00
Shea LevyandGitHub 6678e98411 Merge pull request #4922 from nrdxp/default-submodules 
libfetchers/git: fetch submodules by default
 2021-09-07 05:48:23 -04:00
Naïm FavierandGitHub b0d4190f19 Fix use-registries logic in builtins.getFlake 2021-09-05 15:28:44 +02:00
Eelco DolstraandGitHub 7ee639f9db Merge pull request #5066 from Radvendii/master 
add antiquotations to paths
 2021-09-01 12:55:04 +02:00
Taeer Bar-Yam 1ffb9f1970 fix parse of /${foo}. was // + foo 
I don't think this changes the way any program would behave, but it's a
cleaner internal representation.
 2021-08-31 15:55:55 -04:00
Taeer Bar-Yam 9da8f5e25d path antiquotations: canonizePath -> canonicalizePath 2021-08-31 08:02:04 -04:00
Eelco DolstraandGitHub eda0fee160 Merge pull request #5175 from Pamplemousse/make 
Don't overwrite user provided `lib*_LDFLAGS`
 2021-08-30 12:44:29 +02:00
Eelco DolstraandGitHub 323cafcb4e Merge pull request #5191 from hercules-ci/evalstate-lifetime-hygiene 
EvalState lifetime hygiene
 2021-08-30 12:23:09 +02:00
Robert Hensing 8656b130ea Fix use after free with vImportedDrvToDerivation 2021-08-29 20:42:57 +02:00
Robert Hensing 8bc76acc7c Move vCallFlake into EvalState 
This fixes a use-after-free bug:

1. s = new EvalState();
2. callFlake()
3. static vCallFlake now references s
4. delete s;
5. s2 = new EvalState();
6. callFlake()
7. static vCallFlake still references s
8. crash

Nix 2.3 did not have a problem with recreating EvalState.
 2021-08-29 20:42:49 +02:00
Robert Hensing f10465774f Force all Pos* to be non-null 
This fixes a class of crashes and introduces ptr<T> to make the
code robust against this failure mode going forward.

Thanks regnat for the idea of a ref<T> without overhead!

Closes #4895
Closes #4893
Closes #5127
Closes #5113
 2021-08-29 18:11:58 +02:00
Ben Burdette 310c689d31 remove more explicit valmap code 2021-08-25 13:18:27 -06:00
Ben Burdette d8a977a22e adding all the value names from env.values[0] 2021-08-25 11:19:09 -06:00
Pamplemousse a4c6d319a8 Don't overwrite user provided lib*_LDFLAGS 
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
 2021-08-25 08:59:19 -07:00
Ben Burdette bd3b5329f9 print env bindings 2021-08-24 16:32:54 -06:00
Eelco Dolstra af94b54db3 Coding style 2021-08-23 13:05:42 +02:00
Tom Bereknyei d90582be33 Allow use of path and filterSource in flakes 
As filterSource and path perform work, add paths to allowedPaths.
 2021-08-22 18:45:42 -04:00
Ben Burdette 4b5f9b35f0 env to bindings 2021-08-18 21:25:26 -06:00
Ben Burdette 2272021536 more error fixes 2021-08-18 20:02:23 -06:00
Ben Burdette e82cf13b1e switch to fakeenvs 2021-08-18 17:53:10 -06:00
Ben Burdette b6eb38016b moving towards env in exceptions 2021-08-17 14:39:50 -06:00
Alex Zero b3c424f5a6 Fix follows paths in subordinate lockfiles 2021-08-17 15:25:42 +01:00
Piotr Szubiakowski 9f13cb31e8 Install pkg-config files in the correct location 
Use `$(libdir)` while installing .pc files looks like a more generic
solution. For example, it will work for distributions like RHEL or
Fedora where .pc files are installed in `/usr/lib64/pkgconfig`.
 2021-08-13 21:08:58 +00:00
Eelco Dolstra 6b8069b823 In flake lock file diffs, show the last-modified date of inputs if available 
This is a bit more informative than just the hash.

Also, format the diffs a bit nicer.
 2021-08-11 19:35:28 +02:00
Ben Burdette 030271184f trying env args; but unecessary? 2021-08-09 14:30:47 -06:00
Eelco DolstraandGitHub 8943e3176d Merge pull request #5111 from Pamplemousse/clean 
Minor maintenance cleaning
 2021-08-09 20:05:03 +02:00
Pamplemousse 2de7a1fe67 libexpr: Squash similar conditions 
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
 2021-08-09 10:10:11 -07:00
Alexander Bantyev 54c580b71f Whitelist nixConfig.flake-registry 
flake-registry should be safe to set to an aribtrary value, since it
is identical to just setting `inputs`.
 2021-08-07 14:42:59 +03:00
Ben Burdette 89264d20e6 move valmap to hh; add to env 2021-08-06 11:09:27 -06:00
Taeer Bar-Yam 8f9429dcab add antiquotations to paths 2021-08-06 06:46:05 -04:00
Madeline Haraj cb1ffb7789 Use the store path as the context of the result of fetchTree, not the real path 2021-08-05 22:08:39 -04:00
Viktor Kronvall 7cdaae6b9c Support SCP-like URLs in builtins.fetchGit attrs 
This extends https://github.com/NixOS/nix/pull/4978 with
supporting the SCP-like urls in expressions like

```nix
builtins.fetchGit {
  url = "git@github.com:NixOS/nix.git";
  ref = "master";
}
```
 2021-07-30 08:17:46 +09:00
Eelco DolstraandGitHub 7816ef6c51 Merge pull request #5042 from alyssais/pthread 
Enable pthreads for new libraries
 2021-07-28 12:31:01 +02:00
Eelco DolstraandGitHub c000cec27f Merge pull request #5048 from tweag/flox-eval-store 
--eval-store and faster closure copying
 2021-07-27 12:20:32 +02:00
Pamplemousse c2d7c0cdb9 libexpr: Remove unused code 
Signed-off-by: Pamplemousse <xav.maso@gmail.com>
 2021-07-26 09:14:34 -07:00
Alyssa Ross ae0c026fe9 Enable pthreads for new libraries 
Otherwise the lack of pthread causes linking to fail for NetBSD.
 2021-07-24 09:15:01 +00:00