fabianhjr/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
12014 commits 2 branches 5 tags 81 MiB
Commit graph

12014 commits

This branch
This branch
All branches
Author SHA1 Message Date
Théophane Hufschmitt 452ffe5464
Hint at the source file on conflict in flake new 
Add a pointer to the source file (from the template) when `nix flake new` (or `init`) encounters an already existing file

Fix #6542
 2022-05-18 16:46:13 +02:00
Théophane Hufschmitt 78dc64ec1e
Merge pull request #6544 from ncfavier/getFlake-no-write-lock-file 
Do not attempt to write a lock file in builtins.getFlake
 2022-05-18 16:41:13 +02:00
Naïm Favier 169384abb2
Do not attempt to write a lock file in builtins.getFlake 
Fixes https://github.com/NixOS/nix/issues/6541
 2022-05-18 15:45:06 +02:00
Eelco Dolstra 51d13c43c1
Merge pull request #6543 from herberteuler/master 
primop_match: fix example letter case in document
 2022-05-18 10:56:11 +02:00
zhujun b8e44dc62b primop_match: fix example letter case in document 2022-05-18 14:05:26 +08:00
Théophane Hufschmitt fdc97fc3f9
Merge pull request #6522 from elikoga/master 
Add priority for nix profile install
 2022-05-16 17:13:43 +02:00
Théophane Hufschmitt 43a2c13672 Make nix::eval_cache::int_t more idiomatic 
Don’t explicitely give it a constructor, but use aggregate
initialization instead (also prevents having an implicit coertion, which
is probably good here)
 2022-05-16 16:36:21 +02:00
Eli Kogan-Wang e53349dd6e change priority conflict message 2022-05-16 16:16:06 +02:00
Eli Kogan-Wang 27d0f6747d resolve redundant priority passing, wrap NixInt in eval-cache variant 2022-05-16 15:17:35 +02:00
Eelco Dolstra 937a106100
Merge pull request #6517 from NixOS/document-the-libexpr-tests 
Expand the testing section of the hacking docs
 2022-05-16 13:19:03 +02:00
Eli Kogan-Wang c81d24f1c7 Add int to eval-cache, bump eval cache schema version 2022-05-16 02:29:29 +02:00
elikoga 0cea59ab4b
Merge branch 'NixOS:master' into master 2022-05-16 01:01:37 +02:00
Eli Kogan-Wang be2b19041e Integrate review changes 2022-05-13 22:02:28 +02:00
Eelco Dolstra bf89cd95a4
Merge pull request #6525 from J-Swift/feature/bash-prefix 
Add `bash-prompt-prefix` option
 2022-05-13 14:06:07 +02:00
Théophane Hufschmitt 65a913d29b Don’t recommend writing unit tests 
As asked in <https://github.com/NixOS/nix/pull/6517#discussion_r869416905>
 2022-05-12 12:02:31 +02:00
Eelco Dolstra d354fc30b9
Merge branch 'fix-unrecognized-archive-format' of https://github.com/NobbZ/nix 2022-05-12 11:24:51 +02:00
Norbert Melzer 831e2743ea fix GitHub URL template 2022-05-12 00:56:39 +02:00
Théophane Hufschmitt b944b588fa
Merge pull request #6523 from ncfavier/stop-logger-legacy 
Stop the logger properly in legacy commands
 2022-05-11 16:53:57 +02:00
Naïm Favier 1461e6cdda
Stop the logger properly in legacy commands 
Ensures the logger is stopped on exit in legacy commands. Without this,
when using `nix-build --log-format bar` and stopping nix with CTRL+C,
the bar is not cleared from the screen.
 2022-05-11 12:58:45 +02:00
Eli Kogan-Wang aefc6c4f41 Add priority for nix profile install 2022-05-11 12:16:35 +02:00
Eelco Dolstra 54457382f9
Fix static build 
https://hydra.nixos.org/build/176211267
 2022-05-11 11:36:56 +02:00
Jimmy Reichley 584475acf9
Add documentation for bash-prompt-prefix 2022-05-10 16:55:25 -04:00
Jimmy Reichley 2998527b18
Allow setting bash-prompt-prefix nix develop configuration 2022-05-10 16:53:22 -04:00
Eelco Dolstra eb957ad6d8
Merge pull request #6497 from danielfullmer/ghe-fetcher-url 
Use correct URL for GitHub Enterprise
 2022-05-10 19:23:22 +02:00
Eelco Dolstra 73b9b008f0
Merge pull request #6518 from edolstra/fix-nix-develop 
nix develop: Find bin/bash in the bashInteractive outputs
 2022-05-10 17:10:13 +02:00
Eelco Dolstra a9cbc2857f nix develop: Find bin/bash in the bashInteractive outputs 2022-05-10 16:43:41 +02:00
Théophane Hufschmitt 7c75f1d52b Expand the testing section of the hacking docs 
- Make it clear what the different kind of tests are, where they live
  and how they can be ran
- Ask people to primarily write unit tests
 2022-05-10 13:35:23 +02:00
Eelco Dolstra 7062ebf5be
Merge pull request #6510 from NixOS/dependabot/github_actions/docker/login-action-2 
Bump docker/login-action from 1 to 2
 2022-05-10 13:06:28 +02:00
dependabot[bot] c060e93b3c
Bump docker/login-action from 1 to 2 
Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-09 22:01:15 +00:00
Théophane Hufschmitt 3ec979fa90
Merge pull request #6505 from jtojnar/patch-3 
libexpr: Fix manual link in error message
 2022-05-09 11:09:32 +02:00
Jan Tojnar 59d9551c25
libexpr: Fix manual link in error message 
It was changed to the old manual in 8895fa70a4
 2022-05-08 18:59:00 +02:00
Daniel Fullmer 7a3d5b2ff0 Use correct URL for GitHub Enterprise 
For GitHub Enterprise, the API is accessed through a slightly different
URL. See [1], where it says:

> Use http(s)://[hostname]/api/v3 to access the API for GitHub
> Enterprise Server.

Also tested working on a GHE instance.

[1] https://docs.github.com/en/enterprise-server@3.3/rest/guides/getting-started-with-the-rest-api
 2022-05-06 13:13:11 -07:00
Andreas Rammhold 059ae7f6c4
Add unit tests for libexpr (#5377) 
* libexpr: fix builtins.split example

The example was previously indicating that multiple whitespaces would be
collapsed into a single captured whitespace. That isn't true and was
likely a mistake when being documented initially.

* Fix segfault on unitilized list when printing value

Since lists are just chunks of memory the individual elements in the
list might be unitilized when a programming error happens within Nix.

In this case the values are null-initialized (at least with Boehm GC)
and we can avoid a nullptr deref when printing them.

I ran into this issue while ensuring that new expression tests would
show the actual value on an assertion failure.

This is unlikely to cause any runtime performance regressions as
printing values is not really in the hot path (unless the repl is the
primary use case).

* Add operator<< for ValueTypes

* Add libexpr tests

This introduces tests for libexpr that evalulate various trivial Nix
language expressions and primop invocations that should be good smoke
tests wheter or not the implementation is behaving as expected.
 2022-05-06 18:05:27 +02:00
Eelco Dolstra b470218d9a renderMarkdownToTerminal(): Avoid line overflow 
Lowdown doesn't respect '.cols' exactly (maybe because of the
whitespace in front of each line), so adjust .cols a bit.
 2022-05-06 13:14:49 +02:00
Eelco Dolstra 33affa0a02
Merge pull request #6483 from NixOS/fix-sourcehut-ref-parsing 
Fix the parsing of the sourcehut refs file
 2022-05-06 12:24:55 +02:00
Eelco Dolstra f4102de84b
Merge pull request #6489 from alexshpilkin/fix-6488 
nix: Add forgotten null check in AttrCursor::getListOfStrings()
 2022-05-05 16:16:56 +02:00
Théophane Hufschmitt 4c5aa8520c Make sure that nix build works in --impure mode 
Regression test for <https://github.com/NixOS/nix/issues/6488>
 2022-05-05 14:53:59 +02:00
Eelco Dolstra f2a15091c2
Merge pull request #6492 from thkoch2001/patch-2 
Change json example to be original
 2022-05-05 12:58:11 +02:00
thkoch2001 7388cd55bf Change json example to be original 
Closes: #3391
 2022-05-05 12:39:23 +03:00
Alexander Shpilkin b3ed32d0fd Add forgotten null check 2022-05-04 22:13:49 +03:00
Théophane Hufschmitt e68676e6c8 Fix the parsing of the sourcehut refs file 
Since a26be9f3b8, the same parser is used
to parse the result of sourcehut’s `HEAD` endpoint (coming from [git
dumb protocol]) and the output of `git ls-remote`. However, they are very
slightly different (the former doesn’t specify the current reference
since it’s implied to be `HEAD`).

Unify both, and make the parser a bit more robust and understandable (by
making it more typed and adding tests for it)

[git dumb protocol]: https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols#_the_dumb_protocol
 2022-05-04 14:38:59 +02:00
Eelco Dolstra 470e27ce80
Merge pull request #6482 from edolstra/json-utils 
Move json stuff out of util.cc
 2022-05-04 11:58:20 +02:00
Eelco Dolstra 107613ad2b Fix compiler warning 2022-05-04 11:31:39 +02:00
Eelco Dolstra 3e87c8e62b Move json stuff out of util.cc 2022-05-04 11:22:06 +02:00
Alain Zscheile 1385b20078
Get rid of most .at calls (#6393) 
Use one of `get` or `getOr` instead which will either return a null-pointer (with a nicer error message) or a default value when the key is missing.
 2022-05-04 07:44:32 +02:00
Eelco Dolstra 9489b4b7ef
Merge pull request #6449 from edolstra/outputs-spec 
Allow selecting derivation outputs
 2022-05-03 15:38:47 +02:00
Eelco Dolstra a3c6c5b1c7 nix profile: Support overriding outputs 2022-05-03 15:00:34 +02:00
Eelco Dolstra 4a79cba511 Allow selecting derivation outputs using 'installable!outputs' 
E.g. 'nixpkgs#glibc^dev,static' or 'nixpkgs#glibc^*'.
 2022-05-03 13:43:52 +02:00
Eelco Dolstra 404c222444
Merge pull request #6426 from edolstra/respect-outputs-to-install 
nix: Respect meta.outputsToInstall, and use all outputs by default
 2022-05-03 13:43:22 +02:00
Théophane Hufschmitt cae7473884
Merge pull request #6465 from layus/fix-test-crashes 
tests: Distinguish crashes from expected failures
 2022-05-03 11:11:37 +02:00