7951 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
John Ericson	64cffb804a	Merge remote-tracking branch 'upstream/master' into no-hash-type-unknown	2020-06-02 16:07:25 +00:00
John Ericson	450dcf2c1b	Remove HashType::Unknown ... Instead, `Hash` uses `std::optional<HashType>`. In the future, we may also make `Hash` itself require a known hash type, encoraging people to use `std::optional<Hash>` instead.	2020-06-02 15:52:13 +00:00
Carlo Nucera	a5d820a0a3	Change parseCa(Opt) to parseContentAddress(Opt)	2020-06-02 11:00:10 -04:00
Ben Burdette	156d4f8bc8	remove extra space in SysErrors	2020-06-02 08:45:37 -06:00
John Ericson	1b6461f671	Merge remote-tracking branch 'upstream/master' into validPathInfo-ca-proper-datatype	2020-06-02 14:31:18 +00:00
Ben Burdette	d82d230b40	elide the 'ErrorInfo' in logError and logWarning calls	2020-06-02 08:22:24 -06:00
Eelco Dolstra	bfa1acd85c	Merge pull request #3639 from obsidiansystems/do-fixme-store-removes ... Remove `addToStore` variant as requested by `FIXME`	2020-06-02 15:39:07 +02:00
Eelco Dolstra	c16fdda3a6	Merge branch 'lru-tests' of https://github.com/gilligan/nix	2020-06-02 12:07:48 +02:00
Eelco Dolstra	e9fee8e6a7	src/libutil/tests/lru-cache.cc: Check erase() ... Co-authored-by: James Lee <jbit@jbit.net>	2020-06-02 12:06:59 +02:00
Eelco Dolstra	0748a72a20	Merge pull request #3642 from knl/improve-ref-validity-checking-in-fetchgit ... Improve ref validity checking in fetchgit	2020-06-02 12:00:24 +02:00
John Ericson	efcd30da89	WIP	2020-06-02 00:37:43 +00:00
John Ericson	754c910953	WIP more progress	2020-06-01 19:26:40 -04:00
Carlo Nucera	da39092a39	WIP	2020-06-01 18:53:31 -04:00
Carlo Nucera	0e9438b6d3	Create new file-hash files	2020-06-01 17:32:40 -04:00
Carlo Nucera	0cb67ecbd3	Merge branch 'derivation-header-include-order' of github.com:Ericson2314/nix into validPathInfo-ca-proper-datatype	2020-06-01 17:13:11 -04:00
Carlo Nucera	f4b89e11a4	Merge branch 'no-stringly-typed-derivation-output' of github.com:Ericson2314/nix into validPathInfo-ca-proper-datatype	2020-06-01 17:12:50 -04:00
Tobias Pflug	eca1ff7a9f	Add tests for lru-cache.hh	2020-05-31 01:05:05 +02:00
Nikola Knezevic	fb38459d6e	Ensure we restrict refspec interpretation while fetching ... As `git fetch` may chose to interpret refspec to it's liking, ensure that we only pass refs that begin with `refs/` as is, otherwise, prepend them with `refs/heads`. Otherwise, branches named `heads/foo` (I know it's bad, but it's allowed), would be fetched as `foo`, instead of `heads/foo`.	2020-05-30 12:33:38 +02:00
Nikola Knezevic	77007d4eab	Improve ref validity checking in fetchGit ... The previous regex was too strict and did not match what git was allowing. It could lead to `fetchGit` not accepting valid branch names, even though they exist in a repository (for example, branch names containing `/`, which are pretty standard, like `release/1.0` branches). The new regex defines what a branch name should **NOT** contain. It takes the definitions from `refs.c` in https://github.com/git/git and `git help check-ref-format` pages. This change also introduces a test for ref name validity checking, which compares the result from Nix with the result of `git check-ref-format --branch`.	2020-05-30 12:29:35 +02:00
John Ericson	fac0c2d54a	Remove addToStore variant as requested by FIXME ... The idea is it's always more flexible to consumer a `Source` than a plain string, and it might even reduce memory consumption. I also looked at `addToStoreFromDump` with its `// FIXME: remove?`, but the worked needed for that is far more up for interpretation, so I punted for now.	2020-05-29 17:02:32 -04:00
Ben Burdette	734283d636	Merge remote-tracking branch 'upstream/master' into errors-phase-2	2020-05-29 09:51:37 -06:00
Carlo Nucera	6dd471ebf6	Fixing the result of merge	2020-05-28 12:14:36 -04:00
Carlo Nucera	4f597fb901	Merge branch 'master' of github.com:NixOS/nix into enum-class	2020-05-28 10:58:22 -04:00
John Ericson	5b4cd84bc2	Merge remote-tracking branch 'me/more-rust-ffi' into no-stringly-typed-derivation-output	2020-05-28 10:35:53 -04:00
John Ericson	ef71caba29	Merge remote-tracking branch 'upstream/master' into more-rust-ffi	2020-05-28 10:31:46 -04:00
Eelco Dolstra	f60ce4fa20	Merge pull request #3631 from andir/libutil-config-tests ... Add unit tests for config.cc	2020-05-28 13:51:37 +02:00
Eelco Dolstra	de141fcb79	Merge pull request #3455 from Ericson2314/enum-FileIngestionMethod ... Replace some `bool recursive` with a new `FileIngestionMethod` enum	2020-05-28 13:50:06 +02:00
Eelco Dolstra	d2a537568a	Merge pull request #3632 from LnL7/darwin-xz ... installer: don't require xz on darwin	2020-05-28 11:19:17 +02:00
John Ericson	0f96f45061	Use FileIngestionMethod for nix hash ... There was an enum there that matched in perfectly.	2020-05-27 23:50:11 -04:00
Daiderd Jordan	4e6d7cb55a	installer: don't require xz on darwin ... On macOS the system tar has builtin support for lzma while xz isn't available as a separate binary. There's no builtin package manager there available either so having to install lzma (without nix) would be rather painful.	2020-05-27 20:58:42 +02:00
Matthew Bauer	c66441a646	Rename some variables named “recursive” to “method” ... This is much less confusing since recursive is no longer a boolean.	2020-05-27 13:21:26 -05:00
Matthew Bauer	7873fd175d	Don’t use FileIngestionMethod for StorePathsCommand ... This is a different recursive than used in makeFixedOutputPath.	2020-05-27 13:21:11 -05:00
Andreas Rammhold	fc137d2f00	config.hh: Add documentation ... Provides some general overview on the mechanics of Config/Setting and comments for the public methods of Config.	2020-05-27 17:47:18 +02:00
Andreas Rammhold	9df3d8ccd7	tests/config.cc: add tests for Config::applyConfig	2020-05-27 17:47:18 +02:00
Andreas Rammhold	e1b8c64c04	config.cc: extract parts of applyConfigFile into applyConfig ... This moves the actual parsing of configuration contents into applyConfig which applyConfigFile is then going to call. By changing this we can now test the configuration file parsing without actually create a file on disk.	2020-05-27 17:47:18 +02:00
Andreas Rammhold	93129cf1dd	Add unit tests for config.cc	2020-05-27 17:47:17 +02:00
Eelco Dolstra	228857efc6	Merge pull request #3608 from surajbarkale/patch-1 ... Use /etc/zshenv instead of /etc/zshrc for profile	2020-05-27 11:10:08 +02:00
Eelco Dolstra	66d3ac94c9	Merge pull request #3621 from gilligan/add-json-tests ... Add unit tests for "json.hh"	2020-05-27 11:08:12 +02:00
Eelco Dolstra	dae6a267a8	Merge pull request #3625 from gilligan/xml-writer-tests ... Add unit tests for xml-writer	2020-05-27 11:07:53 +02:00
Eelco Dolstra	a4701e2b9e	Merge pull request #3620 from gilligan/hash-tests ... Add unit tests for hashing functions	2020-05-27 11:07:20 +02:00
Carlo Nucera	f3f520c14c	Change syntax for CI	2020-05-26 12:51:28 -04:00
Carlo Nucera	89a5ac9d3b	Merge remote-tracking branch 'john-ericson/more-rust-ffi' into no-stringly-typed-derivation-output	2020-05-26 12:31:26 -04:00
Carlo Nucera	d49e65ba9d	Merge remote-tracking branch 'john-ericson/enum-FileIngestionMethod' into no-stringly-typed-derivation-output	2020-05-26 12:30:48 -04:00
Carlo Nucera	0f3f901071	Merge remote-tracking branch 'origin/master' into more-rust-ffi	2020-05-26 11:46:42 -04:00
Carlo Nucera	c2f33edd1f	Update src/libutil/rust-ffi.hh ... Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>	2020-05-26 11:43:18 -04:00
Carlo Nucera	b90241ceb1	Change remaining bools with FileIngestionMethod	2020-05-26 11:32:41 -04:00
Carlo Nucera	6d73c10041	Merge remote-tracking branch 'origin/master' into enum-FileIngestionMethod	2020-05-26 11:14:08 -04:00
Domen Kožar	3d3c219d91	installer: fix unused variable	2020-05-26 16:23:03 +02:00
Domen Kožar	1a5ac894e9	Fix installer script bugs ... - --no-channel-add didn't have effect on multi-user installation - some new flags didn't work at all - document all installer flags	2020-05-26 15:49:26 +02:00
Tobias Pflug	4b388e8431	Add unit tests for xml-writer	2020-05-25 18:34:55 +02:00