max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 05:56:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12950 commits 7 branches 0 tags 64 MiB
Commit graph

12950 commits

This branch
This branch
All branches
Author SHA1 Message Date
Max
ad8422ed3f Merge remote-tracking branch 'nixos/master' 2022-10-19 17:41:09 +02:00
Eelco Dolstra
95331cb9c9
Merge pull request #7183 from n8henrie/patch-1 
Fix typo -- dashes not underscores
 2022-10-19 11:21:52 +02:00
Eelco Dolstra
ef77897f1d
Merge pull request #7184 from NixOS/dependabot/github_actions/cachix/install-nix-action-18 
Bump cachix/install-nix-action from 17 to 18
 2022-10-19 10:49:45 +02:00
Eelco Dolstra
4bc70b8216
Merge pull request #7187 from NixOS/path-from-hash-part 
Add command 'nix store path-from-hash-part'
 2022-10-19 10:48:26 +02:00
Eelco Dolstra
e136d57f26
Implement BinaryCacheStore::queryPathFromHashPart() 2022-10-18 17:48:09 +02:00
Eelco Dolstra
61f89e954a
Add command 'nix store path-from-hash-part' 
This exposes the Store::queryPathFromHashPart() interface in the CLI.
 2022-10-18 16:51:12 +02:00
Théophane Hufschmitt
a324e9a5c8
Merge pull request #7132 from stelcodes/fix-fish-manpath 
Fix fish shell MANPATH creation
 2022-10-18 09:50:05 +02:00
dependabot[bot]
dc20395de4
Bump cachix/install-nix-action from 17 to 18 
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 17 to 18.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v17...v18)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-17 22:01:48 +00:00
Nathan Henrie
af9c9504ca
Fix typo -- dashes not underscores 2022-10-17 14:15:32 -06:00
Max
9080d4c520 Merge remote-tracking branch 'nixos/master' 2022-10-16 22:34:18 +02:00
Eelco Dolstra
3093bd3a85
Merge pull request #7168 from NixOS/rosetta-test 
Improve Rosetta detection
 2022-10-14 17:35:57 +02:00
Eelco Dolstra
9f7877abac
Merge pull request #7172 from hercules-ci/libmain-extraStackOverflowHandler 
libmain: Make stack overflow handler configurable
 2022-10-14 17:12:45 +02:00
Robert Hensing
ab4eb39386 libmain: Make the entire stack overflow handler pluggable 2022-10-14 12:53:46 +02:00
Robert Hensing
0d75675787 libmain: Add extraStackOverflowHandler 2022-10-14 12:53:07 +02:00
Eelco Dolstra
285277a61a Remove useless debug statements 
We haven't parsed the '-v' command line flags yet when this code executes,
so we can't actually get debug output here.
 2022-10-14 00:35:33 -07:00
Eelco Dolstra
ddd5503950 Use /usr/bin/true 2022-10-14 00:34:31 -07:00
Eelco Dolstra
8196d4f4e9
Merge pull request #7169 from edolstra/fix-execve-error-msg 
Fix error display if execve() in the builder fails
 2022-10-14 09:29:31 +02:00
Eelco Dolstra
0359d6d123 Fix error display if execve() in the builder fails 
After we've send "\2\n" to the parent, we can't send a serialized
exception anymore. It will show up garbled like

  $ nix-build --store /tmp/nix --expr 'derivation { name = "foo"; system = "x86_64-linux"; builder = "/foo/bar"; }'
  this derivation will be built:
    /nix/store/xmdip0z5x1zqpp6gnxld3vqng7zbpapp-foo.drv
  building '/nix/store/xmdip0z5x1zqpp6gnxld3vqng7zbpapp-foo.drv'...

  ErrorErrorEexecuting '/foo/bar': No such file or directory
  error: builder for '/nix/store/xmdip0z5x1zqpp6gnxld3vqng7zbpapp-foo.drv' failed with exit code 1
 2022-10-13 21:35:16 +02:00
Eelco Dolstra
96eb5ef156 Improve Rosetta detection 
Turns out that one of those *.plist files can exist even if Rosetta is
not installed. So let's just try to run an x86_64-darwin binary
directly.
 2022-10-13 11:46:16 -07:00
Eelco Dolstra
59a304a9a8 Fix clang warnings 2022-10-13 11:25:49 -07:00
Eelco Dolstra
27ed3d0458
Merge pull request #7140 from crawford/chroot-store 
Make warning about chroot store location more accurate
 2022-10-13 16:35:31 +02:00
Steam Deck User
a86916eb72 Make warning about chroot store location more accurate 
While trying to use an alternate directory for my Nix installation, I
noticed that nix's output didn't reflect the updated state
directory. This patch corrects that and now prints the warning before
attempting to create the directory (if the directory creation fails,
it wouldn't have been obvious why nix was attempting to create the
directory in the first place).

With this patch, I now get the following warning:

    warning: '/home/deck/.var/app/org.nixos.nix/var/nix' does not
    exist, so Nix will use '/home/deck/.local/share/nix/root' as a
    chroot store
 2022-10-12 12:12:12 -07:00
Eelco Dolstra
a6239eb570
Merge pull request #7163 from edolstra/misc-category 
Move some options into a misc category
 2022-10-12 16:10:30 +02:00
Eelco Dolstra
eba610956b Move some options into a misc category 
This unclutters the per-command options a bit by moving out some
global options.
 2022-10-12 15:09:17 +02:00
Eelco Dolstra
ae2d330455 Merge branch 'print-common-flags' of github.com:Hoverbear/nix 2022-10-12 13:43:11 +02:00
Eelco Dolstra
f3193edd87
Merge pull request #7149 from amjoseph-nixpkgs/pr/intersectAttrs/values 
parseDrvName: remove doc/impl discrepancy, add test covering the gap
 2022-10-12 10:00:39 +02:00
Adam Joseph
5e24863d5a tests/lang/eval-okay-versions.nix: add test for previous commit 
This commit adds a test covering the discrepancy between parseDrvName's
implementation and documentation (the discrepancy was eliminated in the previous
commit).
 2022-10-08 17:23:03 -07:00
Adam Joseph
7ef71cd21f src/libexpr/primops.cc: parseDrvName: make documentation follow implementation 
The documentation for `parseDrvName` does not agree with the implementation when
the derivation name contains a dash which is followed by something that is
neither a letter nor a digit.  This commit corrects the documentation to agree
with the implementation.
 2022-10-08 17:21:34 -07:00
Ana Hobden
069409d167 Print common flags in --help 2022-10-07 09:07:22 -07:00
Valentin Gagarin
ac0fb38e8a
Merge pull request #6652 from abathur/doc_install_tests 2022-10-05 17:45:42 +02:00
Travis A. Everett
e1418430ac
Apply suggestions from code review 
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
 2022-10-05 09:52:53 -05:00
Valentin Gagarin
927234cfb2
Merge pull request #6870 from amjoseph-nixpkgs/pr/doc/explain-local-remote-binary-substituter 2022-10-05 09:01:42 +02:00
Stel Abrego
34e3fa3a4a Fix fish shell MANPATH creation 
Previously the MANPATH was set even if MANPATH was empty beforehand
which resulted in a MANPATH of only ~/.nix-profile/share/man which
omitted the default man page directory (commonly /opt/local/share/man)
from man page results.
 2022-10-03 14:37:28 -07:00
Théophane Hufschmitt
3ae9467d57
Merge pull request #6969 from fricklerhandwerk/refactor-generate-manpage 
refactor rendering command documentation to markdown
 2022-10-03 15:50:17 +02:00
Eelco Dolstra
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 Dolstra
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 Hufschmitt
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
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 Dolstra
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 Dolstra
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