zfs: Fix samba freeform settings and 2.1 build #340165
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
6.topic: nixos
|
@ofborg test zfs |
ElvishJerricco
force-pushed
the
zfs-test-samba-settings
branch
from
a1ff301 to
5c7c22f
Compare
13 tasks
ElvishJerricco
changed the title
|
@ofborg test zfs |
amarshall
approved these changes
Sep 6, 2024
| # Add Bash completions. | ||
| install -v -m444 -D -t $out/share/bash-completion/completions contrib/bash_completion.d/zfs | ||
| (cd $out/share/bash-completion/completions; ln -s zfs zpool) | ||
| ''} |
There was a problem hiding this comment.
Indeed it seems the completions get installed in current 2.2 without needing to manually install.
| installerBoot = (import ./installer.nix { }).separateBootZfs; | ||
| installer = (import ./installer.nix { }).zfsroot; | ||
| installerBoot = (import ./installer.nix { inherit system; }).separateBootZfs; | ||
| installer = (import ./installer.nix { inherit system; }).zfsroot; |
There was a problem hiding this comment.
It has always been needed when building with nixpkgs as a flake. It just failed to eval :P I should separate this into another commit. Will do.
ElvishJerricco
force-pushed
the
zfs-test-samba-settings
branch
from
f6fc71b to
cf572e0
Compare
|
@ofborg test zfs |
|
FYI, you can add simple edits to an existing ofborg comment and it'll be reprocessed. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Fix zfs tests after #302681, and 2.1 after #339696
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.