`kmod` is a linux-only package. Previous versions worked on `darwin`
by chance and might break in the future. Remove `kmod` import from
there.
Co-authored-by: Artturi <Artturin@artturin.com>
The upstream configure.ac invokes `openssl version -d` in order to find the
system path for certificates. This is problematic for us since that resolves to
the nix store and lots of other mechanisms (including the glusterfs module)
expect /etc/ssl to be the place for certificates, so this addition patches the
file to set the value manually.
Since the setting DCMAKE_SKIP_BUILD_RPATH was disabled, we can now run
the checkPhase of cmake derivations without having to tweak the
LD_LIBRARY_PATH anymore.
https://github.com/libfuse/sshfs/releases/tag/sshfs-3.7.3:
> This is the last release from the current maintainer. SSHFS is now no
> longer maintained or developed. Github issue tracking and pull
> requests have therefore been disabled. The mailing list (see below) is
> still available for use.
>
> If you would like to take over this project, you are welcome to do so.
> Please fork it and develop the fork for a while. Once there has been 6
> months of reasonable activity, please contact Nikolaus@rath.org and
> I'll be happy to give you ownership of this repository or replace with
> a pointer to the fork.
These test are written in a way that they don't skip themselves if they
cannot find an Android device attached over USB to the running host.
Bug fixed by #173702 runs the previously skipped tests for this
package.
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: svnclient.o:/build/svnfs-0.4/src/svnfs.h:40: multiple definition of
`dirbuf'; svnfs.o:/build/svnfs-0.4/src/svnfs.h:40: first defined here
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: unsquashfs_xattr.o:/build/squashfs4.4/squashfs-tools/error.h:34: multiple definition of
`verbose'; unsquashfs.o:/build/squashfs4.4/squashfs-tools/error.h:34: first defined here
This is unfortunately more complex than a simple version bump because
upstream has not released a dist tarball for this release. This commit
switches to using the github source and running autoreconf ourselves.
Along the way, stop randomly patching sources and Makefiles and instead
switch to upstreamable alternatives. The two (small) build system
patches have been sent upstream, see tuxera/ntfs-3g#39.
Commit 49d0a5afd mistakenly inverted when to apply the patch.
Maybe it's not needed anymore, as pkgsMusl.e2fsprogs succeeded for me
even without it, but it looks harmless and better not have it inversed.
This way we also don't cause a mass rebuild :-)
Without the change upstream gcc-10 fails to build as:
ld: src/common/mgmt/pint-worker-external.po:(.data.rel.local+0x0): multiple definition of
`PINT_worker_external_impl'; src/common/mgmt/pint-mgmt.po:(.bss+0x20): first defined here
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: libupnp/upnp/.libs/libupnp.a(libupnp_la-gena_ctrlpt.o):libupnp/upnp/src/inc/upnpapi.h:163:
multiple definition of `pVirtualDirList'; libupnp/upnp/.libs/libupnp.a(libupnp_la-upnpapi.o):libupnp/upnp/src/inc/upnpapi.h:163: first defined here
btrfs-progs currently builds the Python bindings for libbtrfsutil but doesn't
actually install them. With this patch, the bindings are installed and exposed
as python3Packages.btrfsutil.
Without the change build fails on upstream gcc-10 as:
ld: /build/ccadKet8.o:/build/source/cloudfsapi.h:73: multiple definition of
`public_container'; /build/ccoYHN4x.o:/build/source/cloudfsapi.h:73: first defined here
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: extract.o:/build/jfsutils-1.1.15/fscklog/extract.c:67: multiple definition of
`xchklog_buffer'; display.o:/build/jfsutils-1.1.15/fscklog/display.c:57: first defined here
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: lib/auth_rpc.o:/build/source/lib/../9pfs.h:35: multiple definition of
`logfile'; 9pfs.o:/build/source/9pfs.h:35: first defined here
Without the change -fno-common toolchains like upstream gcc-10
fail to build as:
ld: afpcmd-cmdline_main.o:/build/source/cmdline/cmdline_afp.h:4: multiple definition of
`full_url'; afpcmd-cmdline_afp.o:/build/source/cmdline/cmdline_afp.c:27: first defined here
Without the update build fails on -fno-common toolchains as:
$ nix build --impure --expr 'with import ./. {}; netatalk.override { stdenv = clang13Stdenv; }' -L
...
ld: afpd-volume.o:/build/netatalk-3.1.12/etc/afpd/./directory.h:94:
multiple definition of `invalid_dircache_entries'; afpd-afp_dsi.o:/build/netatalk-3.1.12/etc/afpd/./directory.h:94: first defined here
ld: afpd-acls.o:/build/netatalk-3.1.12/etc/afpd/./directory.h:94:
multiple definition of `invalid_dircache_entries'; afpd-afp_dsi.o:/build/netatalk-3.1.12/etc/afpd/./directory.h:94: first defined here
Changes: https://netatalk.sourceforge.io/3.1/ReleaseNotes3.1.13.html
At some point, I'd like to make another attempt at
71f1f4884b ("openssl: stop static binaries referencing libs"), which
was reverted in 195c7da07d. One problem with my previous attempt is
that I moved OpenSSL's libraries to a lib output, but many dependent
packages were hardcoding the out output as the location of the
libraries. This patch fixes every such case I could find in the tree.
It won't have any effect immediately, but will mean these packages
will automatically use an OpenSSL lib output if it is reintroduced in
future.
This patch should cause very few rebuilds, because it shouldn't make
any change at all to most packages I'm touching. The few rebuilds
that are introduced come from when I've changed a package builder not
to use variable names like openssl.out in scripts / substitution
patterns, which would be confusing since they don't hardcode the
output any more.
I started by making the following global replacements:
${pkgs.openssl.out}/lib -> ${lib.getLib pkgs.openssl}/lib
${openssl.out}/lib -> ${lib.getLib openssl}/lib
Then I removed the ".out" suffix when part of the argument to
lib.makeLibraryPath, since that function uses lib.getLib internally.
Then I fixed up cases where openssl was part of the -L flag to the
compiler/linker, since that unambigously is referring to libraries.
Then I manually investigated and fixed the following packages:
- pycurl
- citrix-workspace
- ppp
- wraith
- unbound
- gambit
- acl2
I'm reasonably confindent in my fixes for all of them.
For acl2, since the openssl library paths are manually provided above
anyway, I don't think openssl is required separately as a build input
at all. Removing it doesn't make a difference to the output size, the
file list, or the closure.
I've tested evaluation with the OfBorg meta checks, to protect against
introducing evaluation failures.
it adds 14mb of dependencies
which can be significant for initrd
without a separate output
$ du -sch $(nix-store -qR ./result-bin) | sort -h
before fuse dep
618K /nix/store/w2id1hwv4vv7hvp4slgsyrydrjbfqdxc-libidn2-2.3.2
698K /nix/store/ki0x4wywp5b7rixwk1miq222wybdl3si-e2fsprogs-1.46.5-bin
732K /nix/store/4nmqxajzaf60yjribkgvj5j54x9yvr1r-bash-5.1-p12
747K /nix/store/8ckxc8biqqfdwyhr0w70jgrcb4h7a4y5-libunistring-0.9.10
853K /nix/store/kx41yd3yyr9bwrsk85fhhx6qhavfwql6-util-linux-2.37.3-lib
2,3M /nix/store/7nkr1kzrj5j6vzq952p35g0vzk747xjz-e2fsprogs-1.46.5
16M /nix/store/4s21k8k7p1mfik0b33r2spq5hq7774k1-glibc-2.33-108
22M total
after fuse dep
38K /nix/store/k15b817jqz4ckp8rp1mgpkvvx78xxp2n-shadow-4.8.1-su
112K /nix/store/bqjh8dc6m5plswxrmmn9x4cpxrrw94lv-zlib-1.2.11
277K /nix/store/nzw0c7ag22mbyc4xrqyy1q1azq9r8kis-audit-2.8.5
285K /nix/store/ka1xx3ldpliww27wmskc1yxlgcfisdyf-libcap-ng-0.8.2
371K /nix/store/mvgg2fk5wwrcmm3wbrjhjn034aivrik2-fuse-2.9.9
618K /nix/store/w2id1hwv4vv7hvp4slgsyrydrjbfqdxc-libidn2-2.3.2
732K /nix/store/4nmqxajzaf60yjribkgvj5j54x9yvr1r-bash-5.1-p12
738K /nix/store/7wi0dn50wgimvfi30i3d4mxz40vcal10-e2fsprogs-1.46.5-bin
747K /nix/store/8ckxc8biqqfdwyhr0w70jgrcb4h7a4y5-libunistring-0.9.10
853K /nix/store/kx41yd3yyr9bwrsk85fhhx6qhavfwql6-util-linux-2.37.3-lib
1,3M /nix/store/043lz8mvyx5vxl058c1i586yqc8ax4ig-glibc-2.33-108-bin
1,7M /nix/store/fpzbv79ak68sh2sh6mag6jym553wfxws-db-4.8.30
2,3M /nix/store/9w5l1zrdd21hjxgjp5jnxxr6jibpjxd4-shadow-4.8.1
2,3M /nix/store/hjmxalhkvvajs2n26b0ry7ns56bh9k9s-e2fsprogs-1.46.5
2,5M /nix/store/ndnqiz3nnifj1blhg9q626xlmkqq1nmh-gcc-10.3.0-lib
2,8M /nix/store/pnp5qkmj8m07jl8pghhglfdczz2840r9-linux-pam-1.5.2
2,9M /nix/store/h25q7c560bchn326363ms2001jjgf338-util-linux-2.37.3-bin
16M /nix/store/4s21k8k7p1mfik0b33r2spq5hq7774k1-glibc-2.33-108
36M total
e2fsprogs: build fuse2fs on linux only
the fuse for macos might be broken
The patch that was previously fetched from GitHub is now part of the
4.5.1 release, and is no longer needed. Furthermore, 4.5.1 introduces
some new scripts to build manpages, and some new build inputs are
required to make that work.
This also rebases the Darwin patch. I don't have a Mac so I can't test
this personally. There was one conflict:
diff --cc squashfs-tools/read_xattrs.c
index 2067f80,b28c3a0..0000000
--- a/squashfs-tools/read_xattrs.c
+++ b/squashfs-tools/read_xattrs.c
@@@ -36,9 -38,7 +38,7 @@@
#include "xattr.h"
#include "error.h"
- #include <stdlib.h>
-
-extern int read_fs_bytes(int, long long, int, void *);
+extern int read_fs_bytes(int, long long, long long, void *);
extern int read_block(int, long long, long long *, int, void *);
static struct hash_entry {
Resolved by updating the signature from int to long long.
Conflict in pkgs/development/libraries/libvirt/default.nix
required manual adjustments. The fetched patch is already in src.
I checked that libvirt builds.
The btrfs-progs source code does not depend on systemd. It does,
however, optionally depend on a udev implementation such as eudev or
systemd-udevd. Let's express this dependency correctly, so that
nixpkgs users who choose eudev instead of systemd-udevd don't get a
build failure.
