aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-05Solve template deduction problemCarlo Nucera
We had to predeclare our template functions
2020-08-05WIP: Put the worker protocol `read` and `write` in a namespace to disambigJohn Ericson
2020-08-05Proxy -> Phantom to match RustJohn Ericson
Sorry, Haskell.
2020-08-05Merge remote-tracking branch 'upstream/master' into ↵John Ericson
drv-outputs-map-allow-missing
2020-08-05Update src/libexpr/primops.ccJohn Ericson
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2020-08-05Merge branch 'master' of github.com:NixOS/nix into ↵John Ericson
derivation-primop-floating-output
2020-08-05Merge remote-tracking branch 'obsidian/misc-ca' into ↵John Ericson
derivation-primop-floating-output
2020-08-05Style fixEelco Dolstra
2020-08-05Merge branch 'misc-ca' of https://github.com/obsidiansystems/nixEelco Dolstra
2020-08-05Sed some names to perhaps avoid conflictsJohn Ericson
2020-08-05Style fixEelco Dolstra
2020-08-05Reanme `DerivationType::Regular` defintion tooJohn Ericson
This is the one non-prefixed occurence
2020-08-05Make names more consistentJohn Ericson
2020-08-05Merge remote-tracking branch 'upstream/master' into misc-caJohn Ericson
2020-08-05Merge remote-tracking branch 'upstream/master' into misc-caJohn Ericson
2020-08-05Merge pull request #3730 from obsidiansystems/better-ca-parse-errorsEelco Dolstra
Improve hash parsing and errors
2020-08-05Merge pull request #3864 from obsidiansystems/more-topo-sortEelco Dolstra
Abstract out topo sorting logic
2020-08-05TypoEelco Dolstra
2020-08-04Get rid of some unneeded temporariesJohn Ericson
2020-08-04Organize and format code a bitJohn Ericson
2020-08-04Remove unused functionsJohn Ericson
2020-08-04Merge remote-tracking branch 'upstream/master' into ↵John Ericson
drv-outputs-map-allow-missing
2020-08-04Merge remote-tracking branch 'upstream/master' into better-ca-parse-errorsJohn Ericson
2020-08-04Merge pull request #3894 from obsidiansystems/json-test-order-agnosticEelco Dolstra
Make JSON equality tests agnostic to ordering
2020-08-04Make JSON equality tests agnostic to orderingJohn Ericson
It is in fact more sorted than before, but I don't think we want to guarantee anything about the ordering.
2020-08-04S3BinaryCacheStore: Fix size determinationEelco Dolstra
2020-08-04Revert "Remove putBytes"Eelco Dolstra
This reverts commit b8eea7e81af53905be7845dffc6d0a83ea8edc97.
2020-08-04BinaryCacheStore: Explicitly flush file sinkEelco Dolstra
The file sink is also flushed in its destructor, but we ignore any exceptions in the destructor. Issue #3886.
2020-08-04Merge pull request #3892 from obsidiansystems/path-info-headerEelco Dolstra
Move ValidPathInfo to its own header
2020-08-04tab -> spaceJohn Ericson
2020-08-03Merge remote-tracking branch 'upstream/master' into path-info-headerJohn Ericson
2020-08-03Delete compressed NARsEelco Dolstra
Fixes #3891.
2020-08-03Merge pull request #3885 from obsidiansystems/generalize-addToStore-adapterEelco Dolstra
`addToStore` in terms of `addToStoreFromDump` is not local-store-specific
2020-08-03`addToStore` in terms of `addToStoreFromDump` is not local-store-specificJohn Ericson
2020-08-01Fix error message and avoid recalculationJohn Ericson
2020-08-01Embelish documentation of new Hash functionsJohn Ericson
2020-08-01Convert to C-style commentsJohn Ericson
2020-07-31Merge branch 'master' of github.com:NixOS/nix into drv-outputs-map-allow-missingCarlo Nucera
2020-07-31Tweak descriptionEelco Dolstra
2020-07-31Merge branch 'nix-command-build-check' of https://github.com/Ma27/nixEelco Dolstra
2020-07-31nix bundle: Set categoryEelco Dolstra
2020-07-31nix/build: add `--rebuild` optionMaximilian Bosch
Occasionally, `nix-build --check` is fairly helpful and I'd like to be able to use this feature for flakes that need to be built with `nix build` as well.
2020-07-31Merge pull request #3788 from crinklywrappr/masterEelco Dolstra
Add a script to install nix on non-systemd systems.
2020-07-31Merge pull request #3880 from matthewbauer/nix-bundleEelco Dolstra
Add "bundle" command to Nix
2020-07-31Merge pull request #3881 from matthewbauer/fix-builtins-pathEelco Dolstra
Fix builtins.path
2020-07-31Fix indentationJohn Ericson
2020-07-30Merge branch 'master' of github.com:NixOS/nix into better-ca-parse-errorsCarlo Nucera
2020-07-30Make expectedHash optional in prim_pathMatthew Bauer
This fixes an error found in builtins.path that looks like: store path mismatch in (possibly filtered) path added from '/private/tmp/nix-shell.CyXViH/nix-test/filter-source/filterin' when no hash is specified
2020-07-30Add test for builtins.pathMatthew Bauer
2020-07-30Pass system to bundlerMatthew Bauer