Skip to content

Shrink the ZFS closure by making mail support optional #109345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Feb 10, 2021
Merged

Shrink the ZFS closure by making mail support optional #109345

merged 3 commits into from
Feb 10, 2021
+55 −33

Conversation

cole-h
Copy link
Member

@cole-h cole-h commented Jan 14, 2021

Motivation for this change

Fixes #83865.

# in a nixpkgs checkout
$ nix why-depends -f. zfs mariadb-connector-c
'/nix/store/7s4kkijwv4wd3sl6jgn20yjai8zvini6-zfs-user-2.0.0' does not depend on '/nix/store/1h8r94mfhlfqd2wxqqnzff5rhjbrpimf-mariadb-connector-c-3.1.8'

$ nix why-depends -f. zfs openssl.dev
'/nix/store/7s4kkijwv4wd3sl6jgn20yjai8zvini6-zfs-user-2.0.0' does not depend on '/nix/store/vrsxvbphmqnhz8fww6zv0fa5fi8xipy3-openssl-1.1.1i-dev'

$ nix why-depends -f. zfs mailutils
'/nix/store/7s4kkijwv4wd3sl6jgn20yjai8zvini6-zfs-user-2.0.0' does not depend on '/nix/store/yjj734x773ydfkz1qx1z640nni1gd9bm-mailutils-3.10'

# in my system flake
$ nixos-rebuild build --flake .#bootstrap &>/dev/null && nix why-depends ./result nixpkgs#openssl.dev
'/nix/store/y4mjgvnvrpjhkiz4kkla2m4pckmb399x-nixos-system-scadrial-21.03.20210113.dirty-cosmere' does not depend on '/nix/store/vrsxvbphmqnhz8fww6zv0fa5fi8xipy3-openssl-1.1.1i-dev
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

There's probably a better way to do this, but at least this gets the ball rolling / starts the conversation. Pinged all the people who participated in the original issue.

TODO: write docs?

Sorry, something went wrong.

@cole-h cole-h added this to the 21.05 milestone Jan 14, 2021
@cole-h cole-h force-pushed the zfs-closure branch 2 times, most recently from 707c153 to 232527d Compare January 14, 2021 08:04
@cole-h cole-h mentioned this pull request Jan 14, 2021
Closed
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 14, 2021
@cole-h
Copy link
Member Author

cole-h commented Jan 14, 2021 •
edited
Loading

@ofborg test zfs

hmenke
hmenke suggested changes Jan 14, 2021
View reviewed changes
pkgs/tools/system/smartmontools/default.nix
@@ -26,7 +27,7 @@ in stdenv.mkDerivation rec {
postPatch = "cp -v ${driverdb} drivedb.h";

configureFlags = [
"--with-scriptpath=${stdenv.lib.makeBinPath [ mailutils inetutils ]}"
"--with-scriptpath=${lib.makeBinPath ([ inetutils ] ++ lib.optional enableMail mailutils)}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it even need inetutils when not enabling mail support? I can't think of another reason why smartmontools should talk to the network.

Copy link
Member Author

@cole-h cole-h Jan 14, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only inetutils binary it (maybe) uses is in update-smart-drivedb (ftp), which has a comment nearby of # OpenBSD. Say the word and I'll make them both optional; I don't know if that single use of ftp is worth "breaking" or not (considering it also supports curl, wget, svn, etc).

@asdf8dfafjk asdf8dfafjk mentioned this pull request Jan 14, 2021
Closed
@ofborg ofborg bot requested a review from hmenke January 14, 2021 21:57
@Ma27 Ma27 requested a review from lheckemann January 14, 2021 23:14
@SuperSandro2000 SuperSandro2000 added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 18, 2021
@cole-h cole-h marked this pull request as ready for review January 25, 2021 22:10
@cole-h
Copy link
Member Author

cole-h commented Jan 25, 2021

This is ready for review (basically just squashed everything). I'll write docs after the contents are approved to limit the amount of (potential) rewriting.

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 25, 2021
SuperSandro2000
SuperSandro2000 reviewed Jan 26, 2021
View reviewed changes
pkgs/tools/system/smartmontools/default.nix
@@ -1,5 +1,6 @@
{ lib, stdenv, fetchurl, autoreconfHook
, mailutils, inetutils
, mailutils, enableMail ? true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
, mailutils, enableMail ? true
, enableMail ? true, mailutils

pkgs/os-specific/linux/zfs/default.nix
Comment on lines +11 to +12
, smartmontools, enableMail ? false
, sysstat, sudo, pkg-config
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not clear for me which packages belong to enableMail.

Edit:

Maybe like this if we only need smartmontools.

Suggested change
, smartmontools, enableMail ? false
, sysstat, sudo, pkg-config
, sysstat, sudo, pkg-config
, enableMail ? false, smartmontools

cole-h added 3 commits February 6, 2021 22:03
@cole-h
nixos/zfs: make zed mail optional

Verified

This commit was signed with the committer’s verified signature. The key has expired.
cole-h Cole Helbling
GPG key ID: B37E0F2371016A4C
Expired
Verified
Learn about vigilant mode
370df31 
"zed does not need the ability to send email by default" --Eelco
@cole-h
smartmontools: make mail support optional

Verified

This commit was signed with the committer’s verified signature. The key has expired.
cole-h Cole Helbling
GPG key ID: B37E0F2371016A4C
Expired
Verified
Learn about vigilant mode
a206194 
It's enabled by default since that's how it was before this change.
@cole-h
zfs: disable smartmontools mail functionality

Verified

This commit was signed with the committer’s verified signature. The key has expired.
cole-h Cole Helbling
GPG key ID: B37E0F2371016A4C
Expired
Verified
Learn about vigilant mode
1ed5b6a
doronbehar
doronbehar approved these changes Feb 7, 2021
View reviewed changes
Copy link
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM though I haven't tested a thing.

@lheckemann lheckemann merged commit e4cf0e7 into NixOS:master Feb 10, 2021
@cole-h cole-h deleted the zfs-closure branch February 10, 2021 23:54
@cyounkins cyounkins mentioned this pull request Apr 19, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000

@doronbehar doronbehar

@edolstra edolstra

@worldofpeace worldofpeace

@peti peti

@Mic92 Mic92

@jonringer jonringer

@fpletz fpletz

@jcumming jcumming

@Frostman Frostman

@globin globin

@wizeman wizeman

@hmenke hmenke

@lheckemann lheckemann

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500
Projects
None yet
Milestone
21.05
Development

Successfully merging this pull request may close these issues.

zfs pulls in mailutils, mariadb-connector and openssl-dev
6 participants
@cole-h @hmenke @SuperSandro2000 @jonringer @doronbehar @lheckemann