guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,011 Commits 37 Branches 40 Tags
052d04512e6172a2b8a87aef94c909882c083e28
Commit Graph
19011 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]andGitHub 26c80c3a8a Merge pull request #121 from nix-community/update_flake_lock_action 
flake.lock: Update
 2022-10-03 01:59:30 +00:00
github-actions[bot] 8b67134e55 flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/7e52b35fe98481a279d89f9c145f8076d049d2b9' (2022-09-27)
  → 'github:NixOS/nixpkgs/59d2991d4256cdca1c0cda45d876c80a0fe45c31' (2022-10-02)
 2022-10-03 01:50:55 +00:00
Jörg Thalheim d9abce4ad4 libfetchers: avoid api.github.com ratelimit if no github token is set 
If we don't have any github token, we won't be able to fetch private
repos, but we are also more likely to run into API limits since
we don't have a token. To mitigate this only ever use the github api
if we actually have a token.
 2022-10-01 10:38:09 +02:00
Eelco DolstraandGitHub 89ca75c9f9 Merge pull request #7080 from squalus/nar-close-file 
archive: check close errors when extracting nars
 2022-09-30 12:58:28 +02:00
Eelco DolstraandGitHub 16e088c5db Merge pull request #7108 from rapenne-s/wording 
nix-copy-closure: improve wording
 2022-09-30 12:54:25 +02:00
Valentin Gagarin d8bef7358f bring back lost newline 2022-09-30 01:43:57 +02:00
Valentin Gagarin 70eea97742 use more self-explanatory names 2022-09-30 01:43:57 +02:00
Valentin Gagarin 61188cb820 move final template to the top 
this allows readers to enter the code starting with what is visible from
the outside, instead of working themselves up from purely technical details.
 2022-09-30 01:43:57 +02:00
Valentin Gagarin 0e0f1832de remove superfluous let-in pair 2022-09-30 01:43:57 +02:00
Valentin Gagarin a85df04fcb refactor showOptions 
it was quite a pain to manipulate strings just with `builtins`
 2022-09-30 01:43:53 +02:00
Valentin Gagarin 4655563470 refactor rendering command documentation to markdown 
idea:
- make document structure visible, like in a template
- order functions by descending abstraction
- avoid nested let bindings
 2022-09-30 01:42:46 +02:00
Valentin Gagarin 6b56bb4a79 use indented strings where appropriate 2022-09-30 01:42:46 +02:00
Théophane HufschmittandGitHub 82ef3c470b Merge pull request #7114 from rapenne-s/reenable_test 
tests/build-dry: re-enable some test
 2022-09-29 16:33:12 +02:00
mergify[bot]andGitHub 133bc3d48f Merge pull request #120 from nix-community/update_flake_lock_action 
flake.lock: Update
 2022-09-29 02:26:57 +00:00
github-actions[bot] 74abfca301 flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/fde244a8c7655bc28616864e2290ad9c95409c2c' (2022-09-24)
  → 'github:NixOS/nixpkgs/7e52b35fe98481a279d89f9c145f8076d049d2b9' (2022-09-27)
 2022-09-29 02:19:15 +00:00
Solene Rapenne 62d53bc8a4 tests/build-dry: re-enable some test 2022-09-28 15:54:45 +02:00
Solene Rapenne 847cd49909 nix-copy-closure: improve wording 2022-09-28 01:05:46 +02:00
Eelco DolstraandGitHub 050fcd391b Merge pull request #7105 from SquidDev/hotfix/fish-return 
Use exit instead of return in /etc/profile.d/nix-daemon.fish
 2022-09-27 15:02:29 +02:00
Jonathan Coates 0259702219 Use exit instead of return in fish profile 
Older versions of Fish (such as those bundled with Ubuntu LTS 22.04) do
not support return outside of functions. We need to use the equivalent
exit instead.
 2022-09-27 12:59:37 +01:00
Eelco DolstraandGitHub ace9f261da Merge pull request #7103 from lheckemann/remove-add-root 
nix-build: remove unused --add-root arg
 2022-09-27 11:37:09 +02:00
Linus Heckemann 19f3ecd830 nix-build: remove unused --add-root arg 
Fixes #1982
 2022-09-27 00:07:42 +02:00
Eelco DolstraandGitHub dfc3a9afc3 Merge pull request #7043 from edolstra/installer-test 
Add an installer test
 2022-09-26 17:34:23 +02:00
Eelco Dolstra 71e364c9c7 Quote URLs 2022-09-26 16:57:06 +02:00
Eelco Dolstra eceaf1997c Remove FIXME 2022-09-26 16:54:31 +02:00
Eelco DolstraandGitHub 6806f20157 Merge pull request #7089 from NixOS/mention-accept-flake-config-in-warning 
Mention `--accept-flake-config` in the related warning
 2022-09-26 11:13:02 +02:00
Eelco DolstraandGitHub e25a36cdac Merge pull request #7093 from amjoseph-nixpkgs/pr/intersectAttrs/values 
src/libexpr/primops.cc: correct definition for intersectAttrs
 2022-09-26 11:11:53 +02:00
mergify[bot]andGitHub 11ff593c68 Merge pull request #119 from nix-community/update_flake_lock_action 
flake.lock: Update
 2022-09-26 02:17:09 +00:00
github-actions[bot] 765cbd89bc flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/f677051b8dc0b5e2a9348941c99eea8c4b0ff28f' (2022-09-18)
  → 'github:NixOS/nixpkgs/fde244a8c7655bc28616864e2290ad9c95409c2c' (2022-09-24)
 2022-09-26 02:10:08 +00:00
Adam Joseph dc205c75a2 src/libexpr/primops.cc: correct definition for intersectAttrs 
The current definition of `intersectAttrs` is incorrect:

> Return a set consisting of the attributes in the set e2 that also exist in the
> set e1.

Recall that (Nix manual, section 5.1):

> An attribute set is a collection of name-value-pairs (called attributes)

According to the existing description of `intersectAttrs`, the following should
evaluate to the empty set, since no key-value *pair* (i.e. attribute) exists in
both sets:

```
builtins.intersectAttrs { x=3; } {x="foo";}
```

And yet:

```
nix-repl> builtins.intersectAttrs { x=3; } {x="foo";}
{ x = "foo"; }
```

Clearly the intent here was for the *names* of the resulting attribute set to be
the intersection of the *names* of the two arguments, and for the values of the
resulting attribute set to be the values from the second argument.

This commit corrects the definition, making it match the implementation and intent.
 2022-09-24 23:51:09 -07:00
Théophane HufschmittandGitHub 371013c08d Merge pull request #7010 from edolstra/ignore-shell 
nix develop: Ignore stdenv's $SHELL
 2022-09-24 12:55:53 +02:00
Théophane HufschmittandGitHub 3eb185d6d1 Merge pull request #7046 from mkenigs/fix-root-SHELL 
dockerImage: fix root shell
 2022-09-24 12:53:46 +02:00
Théophane HufschmittandGitHub db29ddd113 Merge pull request #7078 from obsidiansystems/trustworthy-signature 
"valid signature" -> "signature by a trusted key"
 2022-09-24 12:52:35 +02:00
Théophane HufschmittandGitHub 74276cb354 Merge pull request #7079 from matthewbauer/allow-untrusted-settings 
Allow pass max-silent-time and build-poll-interval to daemon untrusted
 2022-09-24 12:47:49 +02:00
Théophane HufschmittandGitHub 6a64820cb4 Merge pull request #7082 from rapenne-s/ccache 
add ccacheStdenv
 2022-09-24 12:45:27 +02:00
Théophane HufschmittandGitHub 1a5d094be7 Mention --accept-flake-config in the related warning 
Make sure that people who run Nix in non-interactive mode (and so don't have the possibility to interactively accept the individual flake configuration settings) are aware of this flag.

Fix #7086
 2022-09-24 12:11:26 +02:00
Eelco DolstraandGitHub cacfc32ee2 Merge pull request #7056 from hiroqn/fix-uname 
Fix `uname -m` return value for armv6l/armv7l
 2022-09-24 11:13:18 +02:00
Eelco DolstraandGitHub c13007f012 Merge pull request #7059 from NixOS/remove-useless-ca-file-message 
Remove a useless debug message in filetransfer.cc
 2022-09-24 10:39:23 +02:00
John EricsonGitHubValentin GagarinRune K. Svendsen
 		60e23c8bae Apply suggestions from code review 
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Rune K. Svendsen <runesvend@gmail.com>
 2022-09-23 13:57:57 -04:00
Solène Rapenne e04b38f789 add ccacheStdenv 
when using ccache, rebuild time has been measured
89% faster while not slowing the speed of cold builds
 2022-09-23 11:21:19 +02:00
squalus 223f8dace0 archive: check close errors when extracting nars 2022-09-22 12:50:32 -07:00
Matthew Bauer 6e049ae607 Allow pass max-silent-time and build-poll-interval to daemon untrusted 
These settings seem harmless, they control the same polling
functionality that timeout does, but with different behavior. Should
be safe for untrusted users to pass in.
 2022-09-22 13:59:16 -05:00
John EricsonandJohn Ericson a2a8cb10ac Dodge "trusted" vs "trustworthy" by being explicit 
Hopefully this is best!
 2022-09-22 14:37:52 -04:00
John Ericson 752f967c0f "valid signature" -> "trustworthy signature" 
I just had a colleague get confused by the previous phrase for good
reason. "valid" sounds like an *objective* criterion, e.g. and *invalid
signature* would be one that would be trusted by no one, e.g. because it
misformatted or something.

What is actually going is that there might be a signature which is
perfectly valid to *someone else*, but not to the user, because they
don't trust the corresponding public key. This is a *subjective*
criterion, because it depends on the arbitrary and personal choice of
which public keys to trust.

I therefore think "trustworthy" is a better adjective to use. Whether
something is worthy of trust is clearly subjective, and then "trust"
within that word nicely evokes `trusted-public-keys` and friends.
 2022-09-22 10:49:31 -04:00
mergify[bot]andGitHub 582a94e65c Merge pull request #118 from nix-community/update_flake_lock_action 
flake.lock: Update
 2022-09-22 02:10:00 +00:00
github-actions[bot] 1d170192d3 flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/da6a05816e7fa5226c3f61e285ef8d9dfc868f3c' (2022-09-16)
  → 'github:NixOS/nixpkgs/f677051b8dc0b5e2a9348941c99eea8c4b0ff28f' (2022-09-18)
 2022-09-22 02:04:54 +00:00
Théophane HufschmittandGitHub f704c2720f Merge pull request #7070 from alyssais/repl-history 
nix repl: warn if creating dir for history fails
 2022-09-21 13:50:49 +02:00
Jörg ThalheimandGitHub f812e26737 Merge pull request #117 from nix-community/ci 
Also accept relative gc root directories
 2022-09-20 20:23:31 +02:00
Jörg Thalheim 47a74fed83 also accept relative gc root directories 2022-09-20 20:12:55 +02:00
Alyssa Ross d234d01f01 nix repl: warn if creating dir for history fails 
The history is not critical to the functionality of nix repl, so it's
enough to warn here, rather than refuse to start if the directory Nix
thinks the history should live in can't be created.
 2022-09-20 11:01:40 +00:00
Jörg ThalheimandGitHub 884eb9c7a0 Merge pull request #116 from nix-community/dependabot/github_actions/DeterminateSystems/update-flake-lock-14 
Bump DeterminateSystems/update-flake-lock from 13 to 14
 2022-09-20 11:21:59 +02:00