John Ericson
|
5e59b25a23
|
Merge remote-tracking branch 'upstream/master' into make-narHash-not-optional
|
2020-08-06 15:34:15 +00:00 |
|
Eelco Dolstra
|
6146447842
|
Merge pull request #3856 from obsidiansystems/buildable-variant
Make `Buildable` a `std::variant`
|
2020-08-06 14:14:06 +02:00 |
|
Eelco Dolstra
|
59067f0f58
|
repl.cc: Check for HAVE_BOEHMGC
Fixes #3906.
|
2020-08-06 11:40:41 +02:00 |
|
Eelco Dolstra
|
3321b2bc65
|
Merge pull request #3897 from bburdette/error-2238
error messages for issue 2238
|
2020-08-06 11:31:36 +02:00 |
|
Carlo Nucera
|
8b175f58d1
|
Simplify the namespace
|
2020-08-05 17:57:07 -04:00 |
|
Carlo Nucera
|
0739d428e0
|
Solve template deduction problem
We had to predeclare our template functions
|
2020-08-05 17:49:45 -04:00 |
|
John Ericson
|
6c66331d5c
|
WIP: Put the worker protocol read and write in a namespace to disambig
|
2020-08-05 20:37:48 +00:00 |
|
Carlo Nucera
|
d5d9907a9e
|
Fix perl integration
|
2020-08-05 15:57:42 -04:00 |
|
Carlo Nucera
|
1d2e80ddd6
|
Merge branch 'master' of github.com:NixOS/nix into new-interface-for-path-pathOpt
|
2020-08-05 15:45:33 -04:00 |
|
John Ericson
|
ed96e603e1
|
Proxy -> Phantom to match Rust
Sorry, Haskell.
|
2020-08-05 19:44:08 +00:00 |
|
Carlo Nucera
|
8241e660ba
|
Remove Hash::operator bool ()
Since the hash is not optional anymore
|
2020-08-05 15:30:38 -04:00 |
|
Carlo Nucera
|
be6e1c6457
|
Merge branch 'master' of github.com:NixOS/nix into make-narHash-not-optional
|
2020-08-05 15:14:47 -04:00 |
|
Carlo Nucera
|
1ad6394b33
|
Add Hash::dummy to signal default value
We did this in the same spirit of the dummy value that's present in
libstore/path.hh
|
2020-08-05 15:11:49 -04:00 |
|
Carlo Nucera
|
1d71028f4d
|
Remove optionality in ValidPathInfo::narInfo
|
2020-08-05 14:42:48 -04:00 |
|
John Ericson
|
7302761f64
|
Merge remote-tracking branch 'obsidian/drv-outputs-map-allow-missing' into templated-daemon-protocol
|
2020-08-05 17:53:24 +00:00 |
|
Ben Burdette
|
31f1af0cab
|
don't crash if there's no drvPath
|
2020-08-05 11:26:06 -06:00 |
|
Ben Burdette
|
e4eae078a5
|
add derivation path to hint
|
2020-08-05 11:21:36 -06:00 |
|
Ben Burdette
|
f1a47a96b6
|
error messages for issue 2238
|
2020-08-05 10:58:00 -06:00 |
|
John Ericson
|
cf939055c8
|
Merge remote-tracking branch 'upstream/master' into drv-outputs-map-allow-missing
|
2020-08-05 16:43:30 +00:00 |
|
John Ericson
|
a9bbfaa851
|
Fix --profile with multiple opaque paths
|
2020-08-05 16:27:15 +00:00 |
|
John Ericson
|
d89472a912
|
Merge remote-tracking branch 'upstream/master' into buildable-variant
|
2020-08-05 15:41:57 +00:00 |
|
John Ericson
|
b3e73547a0
|
Update src/libexpr/primops.cc
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
|
2020-08-05 11:05:46 -04:00 |
|
John Ericson
|
0559ff3d8b
|
Merge branch 'master' of github.com:NixOS/nix into derivation-primop-floating-output
|
2020-08-05 14:56:40 +00:00 |
|
John Ericson
|
92ad550e96
|
Merge remote-tracking branch 'obsidian/misc-ca' into derivation-primop-floating-output
|
2020-08-05 14:51:41 +00:00 |
|
Eelco Dolstra
|
790b694be7
|
Style fix
|
2020-08-05 16:51:06 +02:00 |
|
Eelco Dolstra
|
e48f944e9d
|
Merge branch 'misc-ca' of https://github.com/obsidiansystems/nix
|
2020-08-05 16:50:05 +02:00 |
|
John Ericson
|
b9ebe373bb
|
Sed some names to perhaps avoid conflicts
|
2020-08-05 14:49:25 +00:00 |
|
Eelco Dolstra
|
25f7912156
|
Style fix
|
2020-08-05 16:47:48 +02:00 |
|
John Ericson
|
e561a13a58
|
Reanme DerivationType::Regular defintion too
This is the one non-prefixed occurence
|
2020-08-05 14:45:56 +00:00 |
|
John Ericson
|
e7b0847f2d
|
Make names more consistent
|
2020-08-05 14:44:39 +00:00 |
|
John Ericson
|
839f0fe095
|
Merge remote-tracking branch 'upstream/master' into misc-ca
|
2020-08-05 14:40:01 +00:00 |
|
John Ericson
|
03f4fafc27
|
Merge remote-tracking branch 'upstream/master' into misc-ca
|
2020-08-05 14:36:25 +00:00 |
|
Eelco Dolstra
|
b91dc7ebad
|
Merge pull request #3730 from obsidiansystems/better-ca-parse-errors
Improve hash parsing and errors
|
2020-08-05 16:33:07 +02:00 |
|
Eelco Dolstra
|
75f220a595
|
Merge pull request #3864 from obsidiansystems/more-topo-sort
Abstract out topo sorting logic
|
2020-08-05 16:07:29 +02:00 |
|
Eelco Dolstra
|
088dcea0e8
|
Typo
|
2020-08-05 15:41:51 +02:00 |
|
John Ericson
|
6d003d87b6
|
Merge branch 'drv-outputs-map-allow-missing' into templated-daemon-protocol
|
2020-08-04 22:39:49 +00:00 |
|
John Ericson
|
16c98bf57c
|
Get rid of some unneeded temporaries
|
2020-08-04 22:36:31 +00:00 |
|
John Ericson
|
89bda7f2f8
|
Merge branch 'drv-outputs-map-allow-missing' into templated-daemon-protocol
|
2020-08-04 22:33:11 +00:00 |
|
John Ericson
|
1dfcbebc95
|
Organize and format code a bit
|
2020-08-04 22:28:10 +00:00 |
|
John Ericson
|
46cafb13fa
|
Merge branch 'drv-outputs-map-allow-missing' into templated-daemon-protocol
|
2020-08-04 22:19:13 +00:00 |
|
John Ericson
|
45b6fdb22b
|
Remove unused functions
|
2020-08-04 22:10:13 +00:00 |
|
John Ericson
|
1bab8a321f
|
Remove unneeded definition
Template instantiations will cover this case fine.
|
2020-08-04 21:56:42 +00:00 |
|
John Ericson
|
2f2ae993dc
|
WIP systematize more of the worker protocol
This refactor should *not* change the wire protocol.
|
2020-08-04 19:02:05 +00:00 |
|
John Ericson
|
fbeb8695fb
|
Merge remote-tracking branch 'upstream/master' into drv-outputs-map-allow-missing
|
2020-08-04 18:35:33 +00:00 |
|
John Ericson
|
d3452a5ed6
|
Merge remote-tracking branch 'upstream/master' into better-ca-parse-errors
|
2020-08-04 16:13:20 +00:00 |
|
Eelco Dolstra
|
5b22a2c0d4
|
Merge pull request #3894 from obsidiansystems/json-test-order-agnostic
Make JSON equality tests agnostic to ordering
|
2020-08-04 17:24:46 +02:00 |
|
John Ericson
|
6d9ccde20d
|
Make JSON equality tests agnostic to ordering
It is in fact more sorted than before, but I don't think we want to
guarantee anything about the ordering.
|
2020-08-04 14:20:13 +00:00 |
|
Eelco Dolstra
|
4e7f1c7f11
|
S3BinaryCacheStore: Fix size determination
|
2020-08-04 16:01:13 +02:00 |
|
Eelco Dolstra
|
dfe66420e7
|
Revert "Remove putBytes"
This reverts commit b8eea7e81a.
|
2020-08-04 15:56:10 +02:00 |
|
Eelco Dolstra
|
327b1bf378
|
BinaryCacheStore: Explicitly flush file sink
The file sink is also flushed in its destructor, but we ignore any
exceptions in the destructor.
Issue #3886.
|
2020-08-04 14:54:07 +02:00 |
|