aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-08-05Merge remote-tracking branch 'obsidian/misc-ca' into derivation-primop-floati...John Ericson
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
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
2020-08-05Merge pull request #3864 from obsidiansystems/more-topo-sortEelco Dolstra
2020-08-05TypoEelco Dolstra
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
2020-08-04Make JSON equality tests agnostic to orderingJohn Ericson
2020-08-04S3BinaryCacheStore: Fix size determinationEelco Dolstra
2020-08-04Revert "Remove putBytes"Eelco Dolstra
2020-08-04BinaryCacheStore: Explicitly flush file sinkEelco Dolstra
2020-08-04Merge pull request #3892 from obsidiansystems/path-info-headerEelco Dolstra
2020-08-04tab -> spaceJohn Ericson
2020-08-03Merge remote-tracking branch 'upstream/master' into path-info-headerJohn Ericson
2020-08-03Delete compressed NARsEelco Dolstra
2020-08-03Merge pull request #3885 from obsidiansystems/generalize-addToStore-adapterEelco Dolstra
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-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
2020-07-31Merge pull request #3788 from crinklywrappr/masterEelco Dolstra
2020-07-31Merge remote-tracking branch 'origin/master' into markdownEelco Dolstra
2020-07-31console -> shellEelco Dolstra
2020-07-31Enable syntax highlightingEelco Dolstra
2020-07-31Merge pull request #3880 from matthewbauer/nix-bundleEelco Dolstra
2020-07-31Merge pull request #3881 from matthewbauer/fix-builtins-pathEelco Dolstra
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
2020-07-30Add test for builtins.pathMatthew Bauer
2020-07-30Pass system to bundlerMatthew Bauer
2020-07-30Address misc reviewMatthew Bauer
2020-07-30Remove single file restriction for bundlerMatthew Bauer
2020-07-30exporter -> bundlerMatthew Bauer
2020-07-30Merge pull request #3689 from matthewbauer/substitute-other-storedirEelco Dolstra
2020-07-30Merge remote-tracking branch 'origin/master' into substitute-other-storedirMatthew Bauer
2020-07-30Handle exporters checking correctlyMatthew Bauer
2020-07-30Add "export" to NixMatthew Bauer
2020-07-30Fix buildEelco Dolstra