-
-
Notifications
You must be signed in to change notification settings - Fork 15.3k
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.
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
udisks slimming #42324
udisks slimming #42324
Conversation
Success on x86_64-darwin (full log) Attempted: pcsclite The following builds were skipped because they don't evaluate on x86_64-darwin: libselinux, libsepol, volume_key Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: libselinux, libsepol, pcsclite, volume_key Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: libselinux, libsepol, pcsclite, volume_key Partial log (click to expand)
|
# This URL changes in unpredictable ways, so it is not sensible | ||
# to put a version variable in there. | ||
url = "https://pcsclite.apdu.fr/files/pcsc-lite-1.8.23.tar.bz2"; | ||
url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was done in 4d5565e. Could you rebase?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does it matter? It should still merge cleanly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not much; it only makes history and blame view a bit confusing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will rebase it before merging, do not have enough free space for another build.
ExecStart = "${pkgs.pcsclite}/sbin/pcscd -f -x -c ${cfgFile}"; | ||
ExecReload = "${pkgs.pcsclite}/sbin/pcscd -H"; | ||
ExecStart = "${stdenv.lib.getBin pkgs.pcsclite}/sbin/pcscd -f -x -c ${cfgFile}"; | ||
ExecReload = "${stdenv.lib.getBin pkgs.pcsclite}/sbin/pcscd -H"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here and elsewhere lib
is already available. Could you use lib
instead of stdenv.lib
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will do. By the way, do you, by any chance, know why are packages encouraged to use stdenv.lib
instead of lib
but the converse is used for modules?
@@ -6,25 +6,31 @@ stdenv.mkDerivation rec { | |||
se_release = "20170804"; | |||
se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; | |||
|
|||
outputs = [ "bin" "out" "dev" "man" ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be nice to split the static
library (1.5M) out but I am not sure how to do it without breaking the pkgconfig use.
Success on x86_64-linux (full log) Attempted: libselinux, libsepol, pcsclite, volume_key Partial log (click to expand)
|
Success on aarch64-linux (full log) Attempted: libselinux, libsepol, pcsclite, volume_key Partial log (click to expand)
|
Success on x86_64-darwin (full log) Attempted: pcsclite The following builds were skipped because they don't evaluate on x86_64-darwin: libselinux, libsepol, volume_key Partial log (click to expand)
|
Even 297M sounds like a serious regression, since udisks' closure size in 18.03 was just 76 MiB. |
|
Success on x86_64-darwin (full log) Attempted: pcsclite The following builds were skipped because they don't evaluate on x86_64-darwin: libselinux, libsepol, udisksMinimal, volume_key Partial log (click to expand)
|
Failure on aarch64-linux (full log) Attempted: libselinux, libsepol, pcsclite, udisksMinimal, volume_key Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: libselinux, libsepol, pcsclite, udisksMinimal, volume_key Partial log (click to expand)
|
It does not seem to be possible to remove systemd, devicemapper is required by cryptsetup which is required by libblockdev-crypto, which is mandatory dependency of udisks. Well, we could replace systemd with eudev in lvm2. It gets us from 198M total
down to 163M total
|
Changing 126M
I do not think I can get it down anymore. @edolstra Using udev instead of eudev adds 47M the closure size but I guess it will already be in the closure, so it might not be that bad. 173M
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: libblockdev, libselinux, libsepol, lvm2, ntfs3g, parted, pcsclite, udisksMinimal, volume_key Partial log (click to expand)
|
Failure on x86_64-linux (full log) Attempted: libblockdev, libselinux, libsepol, lvm2, ntfs3g, parted, pcsclite, udisksMinimal, volume_key Partial log (click to expand)
|
Failure on aarch64-linux (full log) Attempted: libblockdev, libselinux, libsepol, lvm2, ntfs3g, parted, pcsclite, udisksMinimal, volume_key Partial log (click to expand)
|
We don't ATM; I understand that as a suggestion to reduce this closure. |
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: libblockdev, libselinux, libsepol, lvm2, ntfs3g, parted, pcsclite, udisksMinimal, volume_key Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: libblockdev, libselinux, libsepol, lvm2, ntfs3g, parted, pcsclite, udisksMinimal, volume_key Partial log (click to expand)
|
Oops, I didn't remember "resolve" to be among the magic words. |
Success on aarch64-linux (full log) Attempted: libblockdev, libselinux, libsepol, lvm2, ntfs3g, parted, pcsclite, udisksMinimal, volume_key Partial log (click to expand)
|
It results in much smaller closure size.
Results in much smaller closure size.
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: lvm2, ntfs3g, udisksMinimal Partial log (click to expand)
|
Success on x86_64-linux (full log) Attempted: lvm2, ntfs3g, udisksMinimal Partial log (click to expand)
|
Failure on aarch64-linux (full log) Attempted: lvm2, ntfs3g, udisksMinimal Partial log (click to expand)
|
@jtojnar I tried bumping to that version, however, some of the Can you take a look? (Btw, while you're at it, we might also want to |
Haha okay, so you were monitoring that pagure PR as well :-) |
Motivation for this change
Removed
python2
from the closure, reducing its size from 353M to 297M.Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)