Carlo Nucera
|
c318d398f3
|
Merge branch 'misc-ca' of github.com:obsidiansystems/nix into new-interface-for-path-pathOpt
|
2020-07-28 14:22:24 -04:00 |
|
Carlo Nucera
|
7ef1e3cd14
|
Use the new interface
|
2020-07-28 13:59:24 -04:00 |
|
John Ericson
|
7cf978440c
|
Merge branch 'ca-derivation-data-types' of github.com:obsidiansystems/nix into misc-ca
|
2020-07-27 17:47:40 +00:00 |
|
John Ericson
|
43f2bd8dc5
|
Merge remote-tracking branch 'upstream/master' into hash-always-has-type
|
2020-07-27 16:13:57 +00:00 |
|
John Ericson
|
d5bb67cfa4
|
Merge remote-tracking branch 'upstream/master' into optional-derivation-output-storepath
|
2020-07-27 14:29:32 +00:00 |
|
John Ericson
|
699fc89b39
|
Merge remote-tracking branch 'upstream/master' into hash-always-has-type
|
2020-07-27 14:22:45 +00:00 |
|
Carlo Nucera
|
a395c12830
|
Merge branch 'master' of github.com:NixOS/nix into misc-ca
|
2020-07-17 11:06:54 -04:00 |
|
Carlo Nucera
|
5cb840541b
|
Merge branch 'multi-output-hashDerivationModulo' of github.com:Ericson2314/nix into misc-ca
|
2020-07-17 10:28:33 -04:00 |
|
Eelco Dolstra
|
17f75f9cc4
|
parseFlakeRef(): Only search for the top-level directory for CLI flakerefs
|
2020-07-17 14:54:21 +02:00 |
|
Carlo Nucera
|
048e916f64
|
Merge branch 'master' of github.com:NixOS/nix into optional-derivation-output-storepath
|
2020-07-16 13:32:28 -04:00 |
|
John Ericson
|
5ea817dace
|
Merge remote-tracking branch 'upstream/master' into hash-always-has-type
|
2020-07-16 14:58:53 +00:00 |
|
Carlo Nucera
|
d090562348
|
Merge branch 'master' of github.com:NixOS/nix into hash-always-has-type
|
2020-07-15 17:21:01 -04:00 |
|
Eelco Dolstra
|
da3aea291d
|
EvalCache: Ignore SQLite errors
Fixes #3794.
|
2020-07-14 15:17:38 +02:00 |
|
Eelco Dolstra
|
832e111494
|
Merge remote-tracking branch 'origin/master' into flakes
|
2020-07-14 13:56:18 +02:00 |
|
Eelco Dolstra
|
c0dd05131e
|
toStorePath(): Return a StorePath and the suffix
|
2020-07-13 16:25:48 +02:00 |
|
John Ericson
|
4415765385
|
Merge remote-tracking branch 'upstream/master' into hash-always-has-type
|
2020-07-13 03:01:44 +00:00 |
|
John Ericson
|
503b425690
|
DerivationOutputExtensional -> DerivationOutputInputAddressed
Thanks @regnat for the great name.
|
2020-07-12 15:56:20 +00:00 |
|
John Ericson
|
18152406ce
|
String .drv suffix to create derivation name
|
2020-07-12 15:40:14 +00:00 |
|
John Ericson
|
13ec627e0a
|
Set derivation name in dervationStrict
|
2020-07-12 03:03:12 +00:00 |
|
John Ericson
|
1c9bec226f
|
Don't improperly assume path is store path
|
2020-07-12 02:38:03 +00:00 |
|
Matthew Bauer
|
a7884970c5
|
Fix DerivationOutputExtensional name
|
2020-07-09 11:37:18 -04:00 |
|
Matthew Bauer
|
8e0d0689be
|
Only store hash of fixed derivation output
we don’t need a full storepath for a fixedoutput derivation. So just
putting the ingestion method + the hash is sufficient.
|
2020-07-08 19:11:39 -04:00 |
|
Matthew Bauer
|
af95a7c16b
|
Add name to BasicDerivation
We always have a name for BasicDerivation, since we have a derivation
store path that has a name.
|
2020-07-08 15:38:01 -04:00 |
|
Eelco Dolstra
|
54712aaf8a
|
Merge remote-tracking branch 'origin/master' into flakes
|
2020-07-06 16:40:10 +02:00 |
|
Ben Burdette
|
bf2788e4c1
|
move showTrace to new loggerSettings
|
2020-07-02 09:04:31 -06:00 |
|
Ben Burdette
|
5ae498872a
|
assert for invalid fileorigin
|
2020-07-02 07:14:40 -06:00 |
|
Ben Burdette
|
3629b0585a
|
don't include errpos for addErrorContext
|
2020-07-01 11:49:01 -06:00 |
|
Eelco Dolstra
|
7d554f295c
|
Support building flakes from a shallow Git repo
Fixes #3756.
|
2020-07-01 14:57:59 +02:00 |
|
Ben Burdette
|
9159dfe3d8
|
comments and cleanup
|
2020-06-30 16:31:55 -06:00 |
|
Ben Burdette
|
70bcb39d3f
|
double addtrace for 'called from'
|
2020-06-30 15:44:19 -06:00 |
|
Eelco Dolstra
|
50f13b06fb
|
EvalCache: Store string contexts
|
2020-06-29 19:08:37 +02:00 |
|
Eelco Dolstra
|
b681408879
|
Factor out EvalCache::forceDerivation()
|
2020-06-29 16:39:41 +02:00 |
|
Eelco Dolstra
|
adf2fbbdc2
|
Merge remote-tracking branch 'origin/master' into flakes
|
2020-06-26 08:46:46 +02:00 |
|
Ben Burdette
|
023912def3
|
convenience form of addTrace
|
2020-06-24 13:46:25 -06:00 |
|
Ben Burdette
|
1d43a6e123
|
use plain errPos instead of nixCode; fix tests
|
2020-06-23 15:30:13 -06:00 |
|
John Ericson
|
98e5d1af03
|
Merge remote-tracking branch 'upstream/master' into hash-always-has-type
|
2020-06-23 17:03:37 +00:00 |
|
Ben Burdette
|
abe0552504
|
Merge remote-tracking branch 'upstream/master' into add-trace
|
2020-06-23 09:40:28 -06:00 |
|
John Ericson
|
fdeabf7160
|
Merge remote-tracking branch 'upstream/master' into multi-output-hashDerivationModulo
|
2020-06-21 16:43:17 +00:00 |
|
John Ericson
|
507aa48739
|
WIP: Make Hash always store a valid hash type
|
2020-06-19 21:48:57 +00:00 |
|
Ben Burdette
|
54e8f550c9
|
addErrorTrace
|
2020-06-19 13:44:08 -06:00 |
|
John Ericson
|
68294746ae
|
Merge remote-tracking branch 'upstream/master' into no-hash-type-unknown
|
2020-06-19 17:53:34 +00:00 |
|
John Ericson
|
2f0e395c99
|
Merge remote-tracking branch 'me/no-stringly-typed-derivation-output' into validPathInfo-ca-proper-datatype
|
2020-06-19 15:26:59 +00:00 |
|
John Ericson
|
01dc8b0bab
|
Merge remote-tracking branch 'upstream/master' into no-stringly-typed-derivation-output
|
2020-06-19 14:59:05 +00:00 |
|
John Ericson
|
145d88cb2a
|
Use designated initializers for DerivationOutputHash
|
2020-06-19 14:58:30 +00:00 |
|
John Ericson
|
237d88c97e
|
FileSystemHash -> DerivationOutputHash
|
2020-06-19 14:47:10 +00:00 |
|
John Ericson
|
3f8dcfe3fd
|
Merge branch 'validPathInfo-temp' into validPathInfo-ca-proper-datatype
|
2020-06-18 23:01:58 +00:00 |
|
John Ericson
|
669c3992e8
|
Merge branch 'no-hash-type-unknown' into validPathInfo-temp
|
2020-06-18 22:33:07 +00:00 |
|
John Ericson
|
15abb2aa2b
|
Revert the enum struct change
Not a regular git revert as there have been many merges and things.
|
2020-06-18 22:11:26 +00:00 |
|
John Ericson
|
bbbf3602a3
|
Merge branch 'enum-class' into no-hash-type-unknown
|
2020-06-18 22:11:19 +00:00 |
|
John Ericson
|
40526fbea5
|
Merge remote-tracking branch 'upstream/master' into enum-class
|
2020-06-18 21:38:15 +00:00 |
|