scriptis/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
14076 commits 30 branches 6 tags 84 MiB
Commit graph

14076 commits

This branch
This branch
All branches
Author SHA1 Message Date
Taeer Bar-Yam 8c7661da09 check the store for input before failing (hopefully fix #6383) 2022-12-05 23:22:38 -05:00
Théophane Hufschmitt bfcf30f0ab
Merge pull request #7390 from Radvendii/fix-6383 
check the store for input before failing (hopefully fix #6700)
 2022-12-05 18:04:41 +01:00
Eelco Dolstra a21d9523b9
Merge pull request #7401 from Mic92/cgroup-typo 
getMaxCPU: fix cgroup path
 2022-12-05 17:53:05 +01:00
Eelco Dolstra a4642ca73e
Merge pull request #7392 from edolstra/revert-7251 
Revert "docs: drop shell prompt character for consistency"
 2022-12-05 17:51:13 +01:00
Taeer Bar-Yam e4f9f3bf24 check the store for input before failing (hopefully fix #6700) 2022-12-05 11:27:47 -05:00
Eelco Dolstra 14c3d76048
Merge pull request #7329 from fricklerhandwerk/maintainers 
add maintainers' handbook
 2022-12-05 17:21:36 +01:00
Eelco Dolstra e0ab2069c9
Consistent capitalisation 2022-12-05 16:55:55 +01:00
Eelco Dolstra 647e60b356
maintainers/README.md: Use CET 2022-12-05 16:35:25 +01:00
Eelco Dolstra 67d76cb8df
Fix typo 2022-12-05 16:34:39 +01:00
Théophane Hufschmitt 3b05124682
Merge pull request #7277 from fricklerhandwerk/codeowners 
add CODEOWNERS
 2022-12-05 14:58:50 +01:00
Valentin Gagarin 180538672a disallow selecting shell prompt in code samples 
this is a quick half-fix for command line examples, as discussed
discussed in [1].

[1]: https://github.com/NixOS/nix/pull/7389

examples which look like this

    $ foo bar
    baz

are confusing for Unix shell beginners, because it's hard to discern
what is supposed to be entered into the actual command line when the
convention of prefixing `$` is not known, as barely any real-world shell
looks that way any more.

this change prevents selecting the prompt part with the mouse in the
HTML representation of the Nix manual.

it does not prevent selecting the output part of the shell example.
it also does not address that the copy button provided by mdBook takes
the entire sample, including the prompts, into the clipboard.
 2022-12-05 11:01:46 +01:00
Jörg Thalheim cccd57c022 getMaxCPU: fix cgroup path 
Given this typo I am not sure if it has been tested.
 2022-12-04 18:22:12 +01:00
Linus Heckemann ff62f6a84b tests/fetchGitSubmodules: fix for newer Git 2022-12-02 20:24:34 +01:00
Eelco Dolstra b4b13382f4
Merge pull request #7387 from fricklerhandwerk/upvote-convention 
encourage adding 👍 to express interest
 2022-12-02 20:13:24 +01:00
Eelco Dolstra c582150360
Merge pull request #7394 from edolstra/fix-7268 
Lower verbosity of exceptions in getMaxCPU()
 2022-12-02 17:02:32 +01:00
Eelco Dolstra 3a8341f57e
Merge pull request #7395 from obsidiansystems/evaluating-to-calling 
Change "while evaluating <fun>" to "while *calling*" in trace
 2022-12-02 15:53:57 +01:00
John Ericson 19c5394971 Change "while evaluating <fun>" to "while *calling*" in trace 
The old way was not correct.

Here is an example:
```
 $ nix-instantiate --eval --expr 'let x = a: throw "asdf"; in x 1' --show-trace
error: asdf

       … while evaluating 'x'

       at «string»:1:9:

            1| let x = a: throw "asdf"; in x 1
             |         ^

       … from call site

       at «string»:1:29:

            1| let x = a: throw "asdf"; in x 1
             |                             ^
```
and yet also:
```
 $ nix-instantiate --eval --expr 'let x = a: throw "asdf"; in x' --show-trace
<LAMBDA>
```

Here is the thing: in both cases we are evaluating `x`!

Nix is a higher-order languages, and functions are a sort of value. When
we write `x = a: ...`, `a: ...` is the expression that `x` is being
defined to be, and that is already a value. Therefore, we should *never*
get an trace that says "while evaluating `x`", because evaluating `a:
...` is *trival* and nothing happens during it!

What is actually happening here is we are applying `x` and evaluating
its *body* with arguments substituted for parameters. I think the
simplest way to say is just "while *calling* `x`", and so that is what I
changed it to.
 2022-12-02 09:14:12 -05:00
Eelco Dolstra fa99ef6a87 getMaxCPU(): Lower verbosity level for ignored exceptions 
Fixes #7268.
 2022-12-02 15:03:40 +01:00
Valentin Gagarin 0ce5742bec
Merge pull request #7381 from aakropotkin/doc-ltoa-conflicts 
doc: listToAttrs: document repeated keys
 2022-12-02 14:19:34 +01:00
Eelco Dolstra 1e6a5d1ff6 Clean up cgroup handling in getMaxCPU() 
Also, don't assume in LocalDerivationGoal that cgroups are mounted on
/sys/fs/cgroup.
 2022-12-02 12:59:13 +01:00
Eelco Dolstra 1211e59a03 Move cgroup.{cc,hh} to libutil 2022-12-02 12:38:03 +01:00
Eelco Dolstra ac06c8d248 Revert "docs: drop shell prompt character for consistency" 
This reverts commit c068cce107 because
it makes the docs *less* consistent.
 2022-12-02 11:56:12 +01:00
Valentin Gagarin ca42068bdc
Merge pull request #7251 from RelationalAI-oss/sp-docs-uninstall-prompt 
docs: drop shell prompt character for consistency
 2022-12-01 19:24:09 +01:00
Valentin Gagarin 5b95412328 encourage adding 👍 to express interest 
decided on the @NixOS/documentation-team, see NixOS/nix.dev#359 for more information
 2022-12-01 19:04:04 +01:00
Alex Ameen ef524013aa doc: listToAttrs: add extra whitespace 2022-12-01 10:32:45 -06:00
Eelco Dolstra 7bba4b343b
Merge pull request #7386 from edolstra/fix-json 
Really fix 'nix store make-content-addressed --json'
 2022-12-01 17:05:18 +01:00
Eelco Dolstra f1e1ba9fe0 Really fix 'nix store make-content-addressed --json' 
https://hydra.nixos.org/log/mcgypcf9vj4n8vdmw7lj3l05c899v73w-nix-2.12.0pre20221201_16b03f0-x86_64-unknown-linux-musl.drv
 2022-12-01 16:29:09 +01:00
Alex Ameen ec18b7d09b doc: listToAttrs: fix line wrapping 2022-11-30 23:21:09 -06:00
Valentin Gagarin dfa27e6b2f refactor rendering documentation of options 
this makes more obvious what the code produces, and the structure of the
output easier to change
 2022-12-01 06:08:08 +01:00
Alex Ameen ad46726546 doc: listToAttrs: document repeated keys 2022-11-30 22:53:41 -06:00
Valentin Gagarin 0ea62670ed move documentation on auto-allocate-uids to options docs 
this is where it belongs and can be found together with the other
options.
 2022-12-01 04:40:02 +01:00
Valentin Gagarin 16b03f03af
Merge pull request #7375 from NixOS/formatting-nitpick 
add missing newline, for consistent formatting
 2022-12-01 01:58:49 +01:00
Valentin Gagarin 3f881e3378
add missing newline, for consistent formatting 2022-11-30 23:40:53 +01:00
Eelco Dolstra f91dc023f2
Merge pull request #7372 from edolstra/fix-json 
nix store make-content-addressed: Fix JSON construction
 2022-11-30 14:25:15 +01:00
Eelco Dolstra 0b092bd87f nix store make-content-addressed: Fix JSON construction 
Fixes

  error: [json.exception.type_error.301] cannot create object from initializer list

in tests/fetchClosure.sh.
 2022-11-30 13:46:33 +01:00
Eelco Dolstra e4a2a08b04 Merge remote-tracking branch 'origin/master' into nixpkgs-22.11 2022-11-30 13:09:45 +01:00
Théophane Hufschmitt 0596bdf3a9
Merge pull request #7342 from fricklerhandwerk/refactor-generate-builtins 
refactor rendering documentation of builtins
 2022-11-29 15:55:43 +01:00
Eelco Dolstra fbc53e97ed
Merge pull request #3600 from NixOS/auto-uid-allocation 
Automatic UID allocation
 2022-11-29 14:01:42 +01:00
Eelco Dolstra 4f762e2b02 Restore ownership of / for non-uid-range builds 2022-11-29 13:10:53 +01:00
Linus Heckemann 9c90452f9d bump nixpkgs to 22.11 beta 2022-11-29 12:06:57 +01:00
Eelco Dolstra f904f6a66f
Merge pull request #7365 from NixOS/fix-6979-nobody-user-in-docker 
Add nobody user/group to Nix docker image
 2022-11-29 11:43:31 +01:00
Eelco Dolstra af8a32143b
Merge pull request #7358 from ncfavier/repl-exit-newline 
repl: print a newline on ctrl-D
 2022-11-29 11:31:43 +01:00
Eelco Dolstra 4dda67260a
Merge pull request #7363 from NixOS/dependabot/github_actions/zeebe-io/backport-action-0.0.9 
Bump zeebe-io/backport-action from 0.0.8 to 0.0.9
 2022-11-29 11:30:17 +01:00
Rok Garbas 46a6be28be Add nobody user/group to Nix docker image 2022-11-29 10:01:46 +00:00
dependabot[bot] dc61e1028d
Bump zeebe-io/backport-action from 0.0.8 to 0.0.9 
Bumps [zeebe-io/backport-action](https://github.com/zeebe-io/backport-action) from 0.0.8 to 0.0.9.
- [Release notes](https://github.com/zeebe-io/backport-action/releases)
- [Commits](https://github.com/zeebe-io/backport-action/compare/v0.0.8...v0.0.9)

---
updated-dependencies:
- dependency-name: zeebe-io/backport-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-28 22:00:44 +00:00
Eelco Dolstra 7dd3e1fec4 Add example 2022-11-28 22:04:51 +01:00
Eelco Dolstra 67bcb99700 Add a setting for enabling cgroups 2022-11-28 21:54:02 +01:00
Eelco Dolstra ff12d1c1a1 Check that auto-allocated UIDs don't clash with existing accounts 2022-11-28 20:49:17 +01:00
Eelco Dolstra dbf78a7ada
Merge pull request #7313 from yorickvP/nlohmann-everywhere 
Replace src/libutil/json.cc with nlohmann
 2022-11-28 15:03:48 +01:00
Naïm Favier 9b35cc716b
use logger->cout 
in order to avoid potential problems with the progress bar

Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
 2022-11-28 14:59:06 +01:00