yshui/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
6941 commits 30 branches 5 tags 81 MiB
Commit graph

6941 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Bauer d4e51aac08 Make preexisting Nix install a warning, not a failure 
In the multi-user install script, we originally made sure no previous
references to Nix existed. This prevented any previous installs from
contaminating the new install. However, some users need the ability to
repair their existing Nix installation without uninstalling all
references to Nix. This change allows users with existing Nix
installations to use the installer, while still outputing a warning
message on the dangers of this. As a result, the multi-user install
script work much more like the single-user install script has worked
in the past.

This is a requirement for macOS Catalina users now that
/Library/LaunchDaemons/org.nixos.nix-daemon.plisg is not managed by
the Nix store. If there is ever a change to the .plist, all users will
need to rerun this install script to get the new changes. Otherwise,
changes to the launch daemon will require manual interventions.
 2019-10-08 21:53:06 -04:00
Matthew Bauer 0847f2f1b3 Copy instead of linking launch agent 
On Catalina, the /nix filesystem might not be mounted at start time.
To avoid this service not starting, we need to keep the launch agent
outside of the Nix store. A wait4pid will hold for our /nix dir to be
mounted.

Fixes #3125.
 2019-10-08 21:52:17 -04:00
Eelco Dolstra a7e9286359
Merge pull request #3126 from PyroLagus/fix-typos 
Fix typos in the Nix Manual.
 2019-10-08 20:40:24 +02:00
Danny Bautista 00a567588e Fix typos in the Nix Manual. 2019-10-08 14:02:40 -04:00
Eelco Dolstra 8ccae55dab
Merge pull request #3120 from samdoshi/remove-search-verbose 
nix search: remove verbose example
 2019-10-07 14:36:44 +02:00
Sam Doshi 6f6cb5e388 nix search: remove verbose example 2019-10-07 11:40:42 +01:00
Eelco Dolstra 93b1ce1ac5
Revert "std::uncaught_exception() -> std::uncaught_exceptions()" 
This reverts commit 6b83174fff because
it doesn't work on macOS yet.

https://hydra.nixos.org/build/102617587
 2019-10-04 16:34:59 +02:00
Eelco Dolstra 15e70c662e
Fix indentation 2019-10-02 16:26:15 +02:00
Eelco Dolstra 4e60c5ec65
Merge pull request #3112 from zimbatm/fetchTarball-with-chroot 
Fix fetchTarball with chroot stores
 2019-10-01 11:33:57 +02:00
Eelco Dolstra 168a887916
Fix fetchTarball with chroot stores 
Fixes #2405.
 2019-10-01 07:51:06 +00:00
Domen Kožar 2d2769f68c
Merge pull request #2338 from bobvanderlinden/pr-cannot-delete-alive-why 
mention `nix-store --query --roots` when a path cannot be deleted
 2019-09-30 14:06:52 +02:00
Domen Kožar 043365c2fb
Merge pull request #3080 from Infinisil/tryEval-docs 
docs: Note that tryEval doesn't do deep evaluation
 2019-09-30 14:03:16 +02:00
Domen Kožar a3bb929798
Merge pull request #3106 from JosephLucas/patch-1 
Update garbage-collection.xml readability
 2019-09-30 14:02:26 +02:00
Joseph Lucas 10bfc5c0d0
Update garbage-collection.xml readability 
1. remove a typo space
2. Simplify negative style by using affirmative style
 2019-09-23 13:18:59 +00:00
Eelco Dolstra 5038e1bec4
Merge pull request #3103 from bhipple/fix/spelling 
Fix spelling in comment
 2019-09-23 10:46:40 +02:00
Eelco Dolstra 02b4632e77
Merge pull request #3104 from zimbatm/no-show-trace-forwarding 
libstore: don't forward --show-trace
 2019-09-23 10:44:42 +02:00
Eelco Dolstra 3a022d4599 Shut up some warnings 
(cherry picked from commit 99e8e58f2d)
 2019-09-22 21:57:05 +02:00
Eelco Dolstra bd79c1f6f6 Don't catch exceptions by value 
(cherry picked from commit 893be6f5e3)
 2019-09-22 21:56:56 +02:00
Jonas Chevalier e63c9e73e3
libstore: don't forward --show-trace 2019-09-22 10:57:20 +00:00
Benjamin Hipple c6a542f22a Fix spelling in comment 2019-09-21 18:53:15 -04:00
Eelco Dolstra 7f9a0033c7
Merge pull request #3097 from zimbatm/show-traces 
function-trace: always show the trace
 2019-09-19 00:16:55 +02:00
Jonas Chevalier 619cc4af85
function-trace: always show the trace 
If the user invokes nix with --trace-function-calls it means that they
want to see the trace.
 2019-09-18 23:23:21 +02:00
Eelco Dolstra c6a0f4c393
Merge pull request #3094 from alexfmpe/fix-builtins-order 
Move 'builtins.splitVersion' to position respecting alphabetical order
 2019-09-18 09:47:39 +02:00
Alexandre Esteves 9533d85ce0 Move 'builtins.splitVersion' to position respecting alphabetical order 2019-09-17 23:40:49 +01:00
Eelco Dolstra 6b83174fff std::uncaught_exception() -> std::uncaught_exceptions() 
The former is deprecated in C++17. Fixes a clang warning.
 2019-09-13 20:05:44 +02:00
Eelco Dolstra cf4c31c872
Merge pull request #3089 from jtanguy/docs-fetchgit 
Improve the fetchGit documentation examples
 2019-09-11 16:01:09 +02:00
Julien Tanguy ae244af242 docs: Use the explicit ref for fetchGit with a tag 
With the merge of #2582, the syntax "tags/1.9" for refs does not work
anymore.
However, the new syntax "refs/tags/1.9" seems to support annotated tags,
such as "refs/tags/2.0".

Closes #2385.
 2019-09-11 14:18:47 +02:00
Julien Tanguy 92ede15dd9 docs: Fix a typo in github in an example 2019-09-11 14:11:37 +02:00
Eelco Dolstra a56b51a0ba
Disable OpenSSL lock callback on OpenSSL >= 1.1.1 2019-09-04 21:45:01 +02:00
Eelco Dolstra b9d6c6f000
upload-release.pl: Fix sshfs call 2019-09-04 21:44:40 +02:00
Eelco Dolstra 5dafde28db
BinaryCacheStore: Add index-debug-info option 
This integrates the functionality of the index-debuginfo program in
nixos-channel-scripts to maintain an index of DWARF debuginfo files in
a format usable by dwarffs. Thus the debug info index is updated by
Hydra rather than by the channel mirroring script.

Example usage:

  $ nix copy --to 'file:///tmp/binary-cache?index-debug-info=true' /nix/store/vr9mhcch3fljzzkjld3kvkggvpq38cva-nix-2.2.2-debug

  $ cat /tmp/binary-cache/debuginfo/036b210b03bad75ab2d8fc80b7a146f98e7f1ecf.debug
  {"archive":"../nar/0313h2kdhk4v73xna9ysiksp2v8xrsk5xsw79mmwr3rg7byb4ka8.nar.xz","member":"lib/debug/.build-id/03/6b210b03bad75ab2d8fc80b7a146f98e7f1ecf.debug"}

Fixes #3083.
 2019-09-04 19:28:26 +02:00
Eelco Dolstra d20f814cde
Bump version 2019-09-04 15:59:33 +02:00
Eelco Dolstra 252c78b288
Tweak release notes 2019-09-04 15:59:07 +02:00
Eelco Dolstra b774845af7
Set release date 2019-09-04 12:53:22 +02:00
Eelco Dolstra 5fad9d01c2
gc-auto.sh: Increase sleep time 2019-09-04 12:52:54 +02:00
Eelco Dolstra 08ee364950
gc-auto.sh: More test fixes 2019-09-03 18:11:43 +02:00
Eelco Dolstra e07ec8d27e
Support allowSubstitutes attribute in structured attribute derivations 
Hopefully fixes #3081 (didn't test).
 2019-09-03 16:03:49 +02:00
Eelco Dolstra cec50290bf
gc-auto.sh: Add some more instrumentation 2019-09-03 15:45:32 +02:00
Eelco Dolstra f186000367
Add some noexcepts 
This is to assert that callback functions should never throw (since
the context in which they're called may not be able to handle the
exception).
 2019-09-03 13:45:35 +02:00
Eelco Dolstra 7348653ff4
Ensure that Callback is called only once 
Also, make Callback movable but uncopyable.
 2019-09-03 13:45:35 +02:00
Eelco Dolstra 8c4ea7a451
Downloader: Remove a possible double call to Callback 2019-09-03 13:45:32 +02:00
Eelco Dolstra 918717f3b5
Merge pull request #3066 from matthewbauer/wait4path 
Use wait4path on org.nixos.nix-daemon.plist
 2019-09-03 12:10:32 +02:00
Silvan Mosberger e4ea3e0306
docs: Note that tryEval doesn't do deep evaluation 2019-09-03 07:32:44 +02:00
Matthew Bauer 87c604c1f0 Fix launchd program args 
launchd has some weird syntx. Apparently the program needs to be in
the ProgramArguments, as Program appears to be ignored.
 2019-09-02 18:35:10 -04:00
Eelco Dolstra 84de821004
Merge pull request #3069 from matthewbauer/max-name 
Set maximum name length in Nix
 2019-08-29 15:22:36 +02:00
Eelco Dolstra 8478c99d09
Merge pull request #3048 from toonn/nix-env_doc 
Fix nix-env documentation for --delete-generations
 2019-08-29 15:22:01 +02:00
Eelco Dolstra a2c4fcd5e9 Don't rely on st_blocks 
It doesn't seem very reliable on ZFS.
 2019-08-29 14:49:58 +02:00
toonn 5bdac86be2 Reword to clarify newer generations are left alone 
My attempt at clarifying the docs resulted in a false explanation. This
is now fixed and I added an example to eliminate all possible confusion.
 2019-08-29 13:56:21 +02:00
Eelco Dolstra 31f5ecfaa5 Maybe fix #3058 2019-08-29 12:35:15 +02:00
Eelco Dolstra ecb0a23d51 Add some more instrumentation 2019-08-29 12:10:01 +02:00