lunaphied/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
12239 commits 2 branches 3 tags 72 MiB
Commit graph

12239 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ben Burdette 7cd7c7c91a
Merge branch 'master' into debug-exploratory-PR 2022-05-09 09:30:44 -06: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
Ben Burdette fc66f48812 debugError() 2022-05-06 09:09:49 -06:00
Ben Burdette 2c9fafdc9e trying debugThrow 2022-05-06 08:47:21 -06: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
Ben Burdette 99d69ac23f fix repl bug 2022-05-05 21:23:03 -06:00
Ben Burdette dea998b2f2 traceable_allocator 2022-05-05 20:26:10 -06:00
Ben Burdette f400c5466d rename valmap 2022-05-05 15:43:23 -06:00
Ben Burdette 09fcfee925 don't print the 'break' argument 2022-05-05 15:34:59 -06:00
Ben Burdette ce304d0154 rename debug commands to be more gdb-like; hide them except in debug mode 2022-05-05 15:24:57 -06:00
Ben Burdette 0ac121a094
Merge branch 'NixOS:master' into debug-exploratory-PR 2022-05-05 13:54:20 -06:00
Eelco Dolstra 58645a78ab builtins.break: Return argument when debugging is not enabled 2022-05-05 17:17:03 +02:00
Eelco Dolstra dd8b91eebc Style fixes 
In particular, use std::make_shared and enumerate(). Also renamed some
fields to fit naming conventions.
 2022-05-05 17:17:03 +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
Travis A. Everett 240124f7b1 darwin-install: fix break from bad vimrc 
It looks like the `--noplugin` flag added in #5489 wasn't enough to
skirt this class of vim-init error, so this is swing 2 at a full fix.
Fixes #6462.
 2022-05-04 19:26:03 -05: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 c98648bef0 Merge remote-tracking branch 'origin/master' into debug-exploratory-PR 2022-05-04 14:10:21 +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
Guillaume Maudoux 275f8561eb tests/lang: Distinguish crashes from expected failures 2022-05-02 15:12:50 +02:00
Guillaume Maudoux 4845886bed Revert "tests: Distinguish crashes from expected failures" 
This reverts commit 143b73f52d.
 2022-05-02 14:22:00 +02:00
Eelco Dolstra 61289ceee3 Style fixes 2022-05-02 13:37:53 +02:00
Eelco Dolstra 564faa6b4e
Merge pull request #6470 from Ma27/git-followup 
libfetchers/git: fix every occasion of a permission error
 2022-05-02 13:33:08 +02:00
Eelco Dolstra a26be9f3b8
Merge pull request #4638 from orbekk/read_head 
Resolve reference for remote git repositories (makes fetchGit work with non-'master' branch)
 2022-05-02 13:31:30 +02:00
Eelco Dolstra dde71899dd tests: Don't create tests/result 
https://hydra.nixos.org/log/lns780srkka4dv7r69mn4zfy6fdij4yr-nix-2.9.0pre20220428_4bb111c.drv
 2022-05-02 09:38:51 +02:00
Maximilian Bosch 1849e6a1f6
libfetchers/git: fix every occasion of a permission error 
I'm afraid I missed a few problematic `git(1)`-calls while implementing
PR #6440, sorry for that! Upon investigating what went wrong, I realized
that I only tested against the "cached"-case by accident because my
git-checkout with my system's flake was apparently cached during my
debugging.

I managed to trigger the original issue again by running:

    $ git commit --allow-empty -m "tmp"
    $ sudo nixos-rebuild switch --flake .# -L --builders ''

Since `repoDir` points to the checkout that's potentially owned by
another user, I decided to add `--git-dir` to each call affecting
`repoDir`.

Since the `tmpDir` for the temporary submodule-checkout is created by
Nix itself, it doesn't seem to be an issue.

Sorry for that, it should be fine now.
 2022-04-30 15:56:12 +02:00
Kjetil Orbekk 9bf296c970 Extract git reference parsing to a shared library 
These utility functions can be shared between the git and github fetchers.
 2022-04-29 18:46:21 -04:00
Kjetil Orbekk c21afd684c Update nix flake documentation of ref handling 
Update the documentation about how `ref` is resolved if it is not
specified.

Add a note about special handling of local workdirs with `git+file`.
 2022-04-29 18:46:21 -04:00