mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-17 03:03:37 +00:00
099c13da1b
* substitute(): --subst-var was silently coercing to "" if the variable does not exist. * libffi: simplify using `checkInputs` * pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix * utillinux: 2.32 -> 2.32.1 https://lkml.org/lkml/2018/7/16/532 * busybox: 1.29.0 -> 1.29.1 * bind: 9.12.1-P2 -> 9.12.2 https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html * curl: 7.60.0 -> 7.61.0 * gvfs: make tests run, but disable * ilmbase: disable tests on i686. Spooky! * mdds: fix tests * git: disable checks as tests are run in installcheck * ruby: disable tests * libcommuni: disable checks as tests are run in installcheck * librdf: make tests run, but disable * neon, neon_0_29: make tests run, but disable * pciutils: 3.6.0 -> 3.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions. * mesa: more include fixes mostly from void-linux (thanks!) * npth: 1.5 -> 1.6 minor bump * boost167: Add lockfree next_prior patch * stdenv: cleanup darwin bootstrapping Also gets rid of the full python and some of it's dependencies in the stdenv build closure. * Revert "pciutils: use standardized equivalent for canonicalize_file_name" This reverts commitf8db20fb3a. Patching should no longer be needed with 3.6.1. * binutils-wrapper: Try to avoid adding unnecessary -L flags (cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9) Signed-off-by: Domen Kožar <domen@dev.si> * libffi: don't check on darwin libffi usages in stdenv broken darwin. We need to disable doCheck for that case. * "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook * python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273 When `py.test` was run with a folder as argument, it would not only search for tests in that folder, but also create a .pytest-cache folder. Not only is this state we don't want, but it was also causing collisions. * parity-ui: fix after merge * python.pkgs.pytest-flake8: disable test, fix build * Revert "meson: 0.46.1 -> 0.47.0" With meson 0.47.0 (or 0.47.1, or git) things are very wrong re:rpath handling resulting in at best missing libs but even corrupt binaries :(. When we run patchelf it masks the problem by removing obviously busted paths. Which is probably why this wasn't noticed immediately. Unfortunately the binary already has a long series of paths scribbled in a space intended for a much smaller string; in my testing it was something like lengths were 67 with 300+ written to it. I think we've reported the relevant issues upstream, but unfortunately it appears our patches are what introduces the overwrite/corruption (by no longer being correct in what they assume) This doesn't look so bad to fix but it's not something I can spend more time on at the moment. -- Interestingly the overwritten string data (because it is scribbled past the bounds) remains in the binary and is why we're suddenly seeing unexpected references in various builds -- notably this is is the reason we're seeing the "extra-utils" breakage that entirely crippled NixOS on master (and probably on staging before?). Fixes #43650. This reverts commit305ac4dade. (cherry picked from commit273d68eff8) Signed-off-by: Domen Kožar <domen@dev.si>
105 lines
3.2 KiB
Nix
105 lines
3.2 KiB
Nix
{ stdenv, fetchurl, pkgconfig, gettext, gnome3
|
|
, glib, libgudev, udisks2, libgcrypt, libcap, polkit
|
|
, libgphoto2, avahi, libarchive, fuse, libcdio
|
|
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
|
|
, gnomeSupport ? false, gnome, makeWrapper
|
|
, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
|
|
, libsecret, libgdata, python3
|
|
# Remove when switching back to meson
|
|
, autoreconfHook, lzma, bzip2
|
|
}:
|
|
|
|
# TODO: switch to meson when upstream fixes a non-deterministic build failure
|
|
# See https://bugzilla.gnome.org/show_bug.cgi?id=794549
|
|
|
|
# Meson specific things are commented out and annotated, so switching back
|
|
# should simply require deleting autotools specific things and adding back meson
|
|
# flags etc.
|
|
|
|
let
|
|
pname = "gvfs";
|
|
version = "1.36.2";
|
|
in
|
|
stdenv.mkDerivation rec {
|
|
name = "${pname}-${version}";
|
|
|
|
src = fetchurl {
|
|
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
|
|
sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4";
|
|
};
|
|
|
|
postPatch = ''
|
|
patchShebangs test test-driver
|
|
'';
|
|
|
|
# Uncomment when switching back to meson
|
|
# postPatch = ''
|
|
# chmod +x meson_post_install.py # patchShebangs requires executable file
|
|
# patchShebangs meson_post_install.py
|
|
# '';
|
|
|
|
nativeBuildInputs = [
|
|
autoreconfHook # Remove when switching to meson
|
|
# meson ninja
|
|
pkgconfig gettext makeWrapper
|
|
libxml2 libxslt docbook_xsl docbook_xml_dtd_42
|
|
];
|
|
|
|
buildInputs =
|
|
[ glib libgudev udisks2 libgcrypt
|
|
libgphoto2 avahi libarchive fuse libcdio
|
|
samba libmtp libcap polkit libimobiledevice libbluray
|
|
libcdio-paranoia libnfs openssh
|
|
# Remove when switching back to meson
|
|
lzma bzip2
|
|
# ToDo: a ligther version of libsoup to have FTP/HTTP support?
|
|
] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
|
|
libsoup gcr
|
|
gnome-online-accounts libsecret libgdata
|
|
]);
|
|
|
|
# Remove when switching back to meson
|
|
configureFlags = stdenv.lib.optional (!gnomeSupport) "--disable-gcr";
|
|
|
|
# Uncomment when switching back to meson
|
|
# mesonFlags = [
|
|
# "-Dgio_module_dir=lib/gio/modules"
|
|
# "-Dsystemduserunitdir=lib/systemd/user"
|
|
# "-Ddbus_service_dir=share/dbus-1/services"
|
|
# "-Dtmpfilesdir=no"
|
|
# ] ++ stdenv.lib.optionals (!gnomeSupport) [
|
|
# "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false"
|
|
# "-Dgoogle=false"
|
|
# ] ++ stdenv.lib.optionals (samba == null) [
|
|
# # Xfce don't want samba
|
|
# "-Dsmb=false"
|
|
# ];
|
|
|
|
enableParallelBuilding = true;
|
|
|
|
checkInputs = [ python3 ];
|
|
doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'"
|
|
doInstallCheck = doCheck;
|
|
|
|
preFixup = ''
|
|
for f in $out/libexec/*; do
|
|
wrapProgram $f \
|
|
${stdenv.lib.optionalString gnomeSupport "--prefix GIO_EXTRA_MODULES : \"${stdenv.lib.getLib gnome.dconf}/lib/gio/modules\""} \
|
|
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
|
done
|
|
'';
|
|
|
|
passthru = {
|
|
updateScript = gnome3.updateScript {
|
|
packageName = pname;
|
|
};
|
|
};
|
|
|
|
meta = with stdenv.lib; {
|
|
description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)";
|
|
license = licenses.lgpl2Plus;
|
|
platforms = platforms.linux;
|
|
maintainers = [ maintainers.lethalman ] ++ gnome3.maintainers;
|
|
};
|
|
}
|