Eelco Dolstra
8ffb09a08a
Fix macOS build
2022-02-21 17:14:22 +01:00
Matthew Bauer
3cd958849b
Apply suggestions from code review
...
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
2022-02-21 10:04:04 -06:00
Eelco Dolstra
b98ce19544
Merge pull request #6138 from nmattia/nm-clarify-manpath
...
Document usage of MANPATH in nix-profile.sh
2022-02-21 16:54:01 +01:00
Eelco Dolstra
36c7b12f33
Remove std::string alias
2022-02-21 16:37:25 +01:00
Eelco Dolstra
1ac2664472
Remove std::vector alias
2022-02-21 16:32:34 +01:00
Eelco Dolstra
fe9afb65bb
Remove std::set alias
2022-02-21 16:28:23 +01:00
Eelco Dolstra
afcdc7606c
Remove std::list alias
2022-02-21 16:25:12 +01:00
Eelco Dolstra
e2422c4582
Merge pull request #6052 from hercules-ci/issue-3294-fix-interruptCallback-deadlock
...
Fix deadlocked nix-daemon zombies on darwin #3294
2022-02-21 16:21:45 +01:00
Robert Hensing
ddb6740e7d
triggerInterrupt: Refactor to use break
2022-02-21 15:43:43 +01:00
Nicolas Mattia
44b7d104b4
Document usage of MANPATH in nix-profile.sh
...
While trying to figure out how `nix-env`/`nix profile` work I had a hard
time understand how man pages were being installed.
Took me quite some time to figure this out, thought it might be useful
to others too!
2022-02-21 13:35:55 +01:00
Eelco Dolstra
f22b9e72f5
Merge pull request #6120 from mayflower/print-full-names
...
path-info: use full store paths when we have them
2022-02-21 11:03:20 +01:00
Matthew Bauer
61295b910f
Add verbosity to nix profile upgrade
...
Followup of https://github.com/NixOS/nix/pull/6086 . This time adding a
warning if no packages are upgraded.
2022-02-20 23:46:11 -06:00
Martin Schwaighofer
53523c0ab8
git fetcher: set locale for rev-parse
2022-02-19 22:58:23 +01:00
Martin Schwaighofer
9504445cab
git fetcher: distinguish errors more precisely
2022-02-19 22:58:23 +01:00
Martin Schwaighofer
c7e527b82b
git fetcher: invoke diff instead of diff-index
...
diff-index operates on the view that git has of the working tree,
which might be outdated. The higher-level diff command does this
automatically. This change also adds handling for submodules.
fixes #4140
Alternative fixes would be invoking update-index before diff-index or
matching more closely what require_clean_work_tree from git-sh-setup.sh
does, but both those options make it more difficult to reason about
correctness.
2022-02-19 22:58:23 +01:00
Martin Schwaighofer
0bfa0cdea1
git fetcher: improve check for valid repository
...
The .git/refs/heads directory might be empty for a valid
usable git repository. This often happens in CI environments,
which might only fetch commits, not branches.
Therefore instead we let git itself check if HEAD points to
something that looks like a commit.
fixes #5302
2022-02-19 22:58:22 +01:00
Travis A. Everett
1fd127a068
install-darwin: fix mount permission edge-case
...
Fixes #6122 , which reports a problem with trying to run the installer
under another user (probably: user is not the disk "owner" and thus
can't mount the volume).
2022-02-18 23:15:37 -06:00
Linus Heckemann
dbdc63bc41
path-info: use full store paths when we have them
...
Fixes #5645
2022-02-19 00:32:05 +01:00
Eelco Dolstra
9bc03adbba
Integrate push-docker.sh into the release script
...
This also makes sure that we get the Docker images from the same Hydra
eval, rather than the latest build from job/nix/.../dockerImage, which
may not be the same.
2022-02-18 13:58:01 +01:00
Eelco Dolstra
50e3840f14
Merge remote-tracking branch 'origin/script-to-make-docker-release'
2022-02-18 10:55:07 +01:00
Eelco Dolstra
26e99c817c
Merge pull request #6114 from Radvendii/welcomeText
...
add release notes for welcomeText
2022-02-18 10:52:03 +01:00
Rok Garbas
f0de5fb8e7
remove the manifest before creating them
2022-02-18 00:32:38 +01:00
Rok Garbas
bf435664d7
Merge remote-tracking branch 'origin/master' into script-to-make-docker-release
2022-02-18 00:15:23 +01:00
Taeer Bar-Yam
219fa2e43d
add release notes for welcomeText
2022-02-17 15:17:20 -05:00
Eelco Dolstra
a768e85e2f
Merge pull request #6103 from Radvendii/welcomeText
...
add descriptive output when creating templates
2022-02-17 21:06:10 +01:00
Taeer Bar-Yam
f56dd3a36b
make flake template welcomeText markdown
2022-02-17 13:59:32 -05:00
Eelco Dolstra
b24d541c34
Merge pull request #6110 from layus/patch-2
...
Create daemon-socket folder during install
2022-02-17 13:00:20 +01:00
Guillaume Maudoux
1bec333788
Create to daemon-socket folder during install
2022-02-17 09:32:15 +01:00
Eelco Dolstra
aa5b83d93c
InputScheme::fetch(): Return a StorePath instead of a Tree
2022-02-16 11:14:01 +01:00
Eelco Dolstra
2d6d9a28eb
addToStoreFromDump(): Take std::string_view
2022-02-16 11:02:35 +01:00
Eelco Dolstra
f450edc78b
Merge pull request #6104 from rrbutani/master
...
Fix formatting for options with "machine-specific" defaults
2022-02-16 10:47:51 +01:00
Ben Burdette
3d94d3ba91
Expr refs instead of pointers
2022-02-15 15:46:45 -07:00
Rahul Butani
d82cf4a016
manual: fix formatting for options with "machine-specific" defaults
2022-02-15 15:44:05 -06:00
Taeer Bar-Yam
f3a2940e70
add descriptive output when creating templates
...
this includes a `welcomeText` attribute which can be set in the
template, as well as outputing which files were created.
2022-02-15 11:50:14 -05:00
Ben Burdette
c9bc3735f6
quit repl from step mode
2022-02-15 09:49:25 -07:00
Gabriel Fontes
72e8f94081
add sourcehut input scheme
2022-02-14 23:53:01 -03:00
Eelco Dolstra
94992a9196
Merge pull request #6100 from edolstra/installables-cleanup
...
InstallableFlake: Default attr paths cleanup
2022-02-14 22:06:11 +01:00
Ben Burdette
e761bf0601
make an 'info' level error on break
2022-02-14 14:04:34 -07:00
Eelco Dolstra
023e459777
InstallableFlake: Default attr paths cleanup
...
This removes some duplicated logic, and fixes "nix bundle" parsing its
installable twice.
2022-02-14 21:06:11 +01:00
Eelco Dolstra
744a101a36
Merge pull request #6092 from Kha/sandbox-wo-userns
...
Fix using sandbox without user namespaces
2022-02-14 11:40:08 +01:00
Sebastian Ullrich
c437e1326d
Fix using sandbox without user namespaces
2022-02-12 16:28:36 +01:00
Ben Burdette
4cffb130e3
for primops, enter the debugger at the last DebugTrace in the stack
2022-02-11 14:14:25 -07:00
Eelco Dolstra
4d67ecbbb2
Merge pull request #6085 from edolstra/fix-flake-defaults
...
parseInstallables(): Don't try the flake attr path prefixes when no fragment is specified
2022-02-11 18:00:00 +01:00
Eelco Dolstra
36845dc9a3
Merge pull request #6086 from tomberek/profile_remove
...
profile: add verbosity
2022-02-11 16:47:11 +01:00
Tom Bereknyei
270fb5f192
profile: add verbosity
...
warn if there are no matches and give notice of removing packages as
they are found
2022-02-11 10:44:33 -05:00
Eelco Dolstra
cdc90c2776
parseInstallables(): Don't try the flake attr path prefixes when no fragment is specified
...
Fixes #5880 .
2022-02-11 15:50:12 +01:00
Eelco Dolstra
d2f9a081b8
flake.nix: Fix indent
2022-02-11 14:45:46 +01:00
Ben Burdette
3ff5ac3586
update the eval-inline throw fns
2022-02-10 16:01:49 -07:00
Ben Burdette
bc67cb5ad1
remove fakeEnv stuff and instead use last context from the stack
2022-02-10 15:05:38 -07:00
Eelco Dolstra
5b809f9e0e
check-hydra-status.sh: Ignore unfinished builds
2022-02-10 21:15:07 +01:00
Robert Hensing
Linus Heckemann