aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-05Merge remote-tracking branch 'upstream/master' into path-infoJohn Ericson
2021-04-05Merge commit '9dfb97c987d8b9d6a3d15f016e40f22f91deb764' into path-infoJohn Ericson
2021-04-05Merge branch 'master' into path-infoJohn Ericson
2021-04-05Merge pull request #4594 from obsidiansystems/lots-of-buildableEelco Dolstra
Use `DerivedPath` for `buildPaths` and `ensurePath`
2021-04-05Document the derived path types.John Ericson
2021-04-05buildable.{cc,hh} -> derived-path.{cc,hh}John Ericson
2021-04-05Make `DerivedPathWithHints` a newtypeJohn Ericson
This allows us to namespace its constructors under it.
2021-04-05Rename BuildableJohn Ericson
2021-04-05"newtype" BuildableReqJohn Ericson
This makes for better types errors and allows us to give it methods.
2021-04-05No templates for `Buildable` and `BuildableReq`John Ericson
2021-04-05Use `BuildableReq` for `buildPaths` and `ensurePath`John Ericson
This avoids an ambiguity where the `StorePathWithOutputs { drvPath, {} }` could mean "build `brvPath`" or "substitute `drvPath`" depending on context. It also brings the internals closer in line to the new CLI, by generalizing the `Buildable` type is used there and makes that distinction already. In doing so, relegate `StorePathWithOutputs` to being a type just for backwards compatibility (CLI and RPC).
2021-04-05Move `StorePathWithOutput` utilities out of store classJohn Ericson
These are by no means part of the notion of a store, but rather are things that happen to use stores. (Or put another way, there's no way we'd make them virtual methods any time soon.) It's better to move them out of that too-big class then. Also, this helps us remove StorePathWithOutputs from the Store interface altogether next commit.
2021-04-05Move `StorePathWithOutputs` into its own header/fileJohn Ericson
In the following commits it will become less prevalent.
2021-04-05Pull out Buildable into its own file/header in libnixstoreJohn Ericson
2021-04-04Merge pull request #4685 from NixOS/bump-actionsEelco Dolstra
bump actions
2021-04-03bump actionsDomen Kožar
2021-04-02Merge pull request #4684 from cgohla/patch-1Eelco Dolstra
[prerequisites]: add JSON lib dependency
2021-04-01[prerequisites]: add JSON lib dependencyBjörn Gohla
2021-03-30Merge pull request #4676 from bjornfor/fix-fetchgit-ref-headEelco Dolstra
fetchGit: don't prefix "refs/heads/" on ref = "HEAD"
2021-03-30tests: check that builtins.fetchGit { ..., ref = "HEAD"; } worksBjørn Forsman
2021-03-30fetchGit: don't prefix "refs/heads/" on ref = "HEAD"Bjørn Forsman
This fixes builtins.fetchGit { url = ...; ref = "HEAD"; }, that works in stable nix (v2.3.10), but is broken in nix master: $ ./result/bin/nix repl Welcome to Nix version 2.4pre19700101_dd77f71. Type :? for help. nix-repl> builtins.fetchGit { url = "https://github.com/NixOS/nix"; ref = "HEAD"; } fetching Git repository 'https://github.com/NixOS/nix'fatal: couldn't find remote ref refs/heads/HEAD error: program 'git' failed with exit code 128 The documentation for builtins.fetchGit says ref = "HEAD" is the default, so it should also be supported to explicitly pass it. I came across this issue because poetry2nix can use ref = "HEAD" in some situations. Fixes #4674.
2021-03-29Merge pull request #4239 from tweag/test-against-old-daemonEelco Dolstra
Add a CI check to ensure compatibility with an old daemon
2021-03-29nixpkgs/master compatibilityEelco Dolstra
2021-03-26LocalBinaryCacheStore::upsertFile(): Fix raceEelco Dolstra
When multiple threads try to upsert the same file, this could fail. Fixes #4667.
2021-03-26Fix some typosEelco Dolstra
Fixes #4671.
2021-03-25Merge pull request #4532 from abathur/macos_nixbld_idsDomen Kožar
fix nixbld user name/uid for macOS/darwin
2021-03-24Merge pull request #4650 from samueldr/fix/registry-config-dirEelco Dolstra
Use the appropriate config dir for the registry
2021-03-24Merge pull request #4663 from Stig124/stig124-1Eelco Dolstra
Added Debian-based OS's profiles
2021-03-23Added Debian-based OS's profilesNicolas Stig124 FORMICHELLA
2021-03-23Merge pull request #4603 from DavHau/davhau-improve-nix-conf-help-buildersEelco Dolstra
improve man page for nix.conf (builders)
2021-03-23Merge pull request #4646 from Ma27/support-scoped-v6Eelco Dolstra
Fix Nix to properly work with stores using a scoped IPv6 address
2021-03-23Merge pull request #4657 from ↵Eelco Dolstra
obsidiansystems/build-result-marshalling-cleanup-lighter Fix typos in the last PR #4656
2021-03-23nix.conf builders: refer to manual pageDavHau
2021-03-22Fix typos in the last PR #4656John Ericson
2021-03-22Merge pull request #4656 from ↵Eelco Dolstra
obsidiansystems/build-result-marshalling-cleanup-lighter Clean up serialization for `BuildResult`
2021-03-22Clean up serialization for `BuildResult`John Ericson
A few versioning mistakes were corrected: - In 27b5747ca7b5599768083dde5fa4d36bfbb0f66f, Daemon protocol had some version `>= 0xc` that should have been `>= 0x1c`, or `28` since the other conditions used decimal. - In a2b69660a9b326b95d48bd222993c5225bbd5b5f, legacy SSH gated new CAS info on version 6, but version 5 in the server. It is now 6 everywhere. Additionally, legacy ssh was sending over more metadata than the daemon one was. The daemon now sends that data too. CC @regnat Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2021-03-19Use the appropriate config dir for the registrySamuel Dionne-Riel
2021-03-19tests: Test `.config` stays clean with XDG_CONFIG_HOME setSamuel Dionne-Riel
2021-03-19tests/config: Fix config test configurationSamuel Dionne-Riel
First, "XDG_CONFIG_HOME" shouldn't be named "home", as it may be confusing compared with `$HOME`, which an upcoming test will be using. Then, using a fixed location for the test is problematic. Use `$TEST_ROOT` instead.
2021-03-19ProgressBar: Respect verbosity levelEelco Dolstra
This makes its behaviour consistent with SimpleLogger.
2021-03-19Restore 'nix flake info' as a deprecated aliasEelco Dolstra
2021-03-17Merge pull request #4648 from hercules-ci/remove-unimplemented-hashAlgoOptEelco Dolstra
Remove unimplemented hashAlgoOpt
2021-03-17Remove unimplemented hashAlgoOptRobert Hensing
It was in the header but never implemented.
2021-03-16Fix Nix to properly work with stores using a scoped IPv6 addressMaximilian Bosch
According to RFC4007[1], IPv6 addresses can have a so-called zone_id separated from the actual address with `%` as delimiter. In contrast to Nix 2.3, the version on `master` doesn't recognize it as such: $ nix ping-store --store ssh://root@fe80::1%18 --experimental-features nix-command warning: 'ping-store' is a deprecated alias for 'store ping' error: --- Error ----------------------------------------------------------------- nix don't know how to open Nix store 'ssh://root@fe80::1%18' I modified the IPv6 match-regex accordingly to optionally detect this part of the address. As we don't seem to do anything special with it, I decided to leave it as part of the URL for now. Fixes #4490 [1] https://tools.ietf.org/html/rfc4007
2021-03-16Merge 'nix flake {info,list-inputs}' into 'nix flake metadata'Eelco Dolstra
Fixes #4613.
2021-03-16--override-input: Imply --no-write-lock-fileEelco Dolstra
Fixes #3779.
2021-03-16Shorten the test drv nameregnat
To prevent the OSX build to fail because of a too long socket path
2021-03-16Fix the db-migration testregnat
2021-03-16Remove the `remote-store-old-daemon` testregnat
Doesn't make sense anymore with the new setup
2021-03-16Make the tests (optionnally) run in another derivationregnat
That way we can run them without rebuilding Nix
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 22:43:54 +0000