2018-07-21 01:44:44 +01:00
|
|
|
{ stdenv, fetchurl, pkgconfig, gettext, gnome3
|
2018-03-14 20:48:56 +00:00
|
|
|
, glib, libgudev, udisks2, libgcrypt, libcap, polkit
|
|
|
|
, libgphoto2, avahi, libarchive, fuse, libcdio
|
2017-11-08 00:11:54 +00:00
|
|
|
, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp
|
2018-03-14 20:48:56 +00:00
|
|
|
, gnomeSupport ? false, gnome, makeWrapper
|
|
|
|
, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh
|
Merge staging-next into master (#44009)
* 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 commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7.
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 commit 305ac4dade5758c58e8ab1666ad0197fd305828d.
(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
|
|
|
, libsecret, libgdata, python3
|
2018-04-02 10:10:40 +01:00
|
|
|
# Remove when switching back to meson
|
|
|
|
, autoreconfHook, lzma, bzip2
|
2018-03-14 20:48:56 +00:00
|
|
|
}:
|
2013-04-01 17:09:51 +01:00
|
|
|
|
2018-04-02 10:10:40 +01:00
|
|
|
# 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.
|
|
|
|
|
2013-11-17 19:20:13 +00:00
|
|
|
let
|
2018-03-03 03:09:19 +00:00
|
|
|
pname = "gvfs";
|
2018-05-08 01:39:09 +01:00
|
|
|
version = "1.36.2";
|
2013-11-17 19:20:13 +00:00
|
|
|
in
|
2013-04-01 17:09:51 +01:00
|
|
|
stdenv.mkDerivation rec {
|
2018-03-03 03:09:19 +00:00
|
|
|
name = "${pname}-${version}";
|
2013-04-01 17:09:51 +01:00
|
|
|
|
|
|
|
src = fetchurl {
|
2018-03-03 03:09:19 +00:00
|
|
|
url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
|
2018-05-08 01:39:09 +01:00
|
|
|
sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4";
|
2013-04-01 17:09:51 +01:00
|
|
|
};
|
|
|
|
|
Merge staging-next into master (#44009)
* 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 commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7.
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 commit 305ac4dade5758c58e8ab1666ad0197fd305828d.
(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
|
|
|
postPatch = ''
|
|
|
|
patchShebangs test test-driver
|
|
|
|
'';
|
|
|
|
|
2018-04-02 10:10:40 +01:00
|
|
|
# Uncomment when switching back to meson
|
|
|
|
# postPatch = ''
|
|
|
|
# chmod +x meson_post_install.py # patchShebangs requires executable file
|
|
|
|
# patchShebangs meson_post_install.py
|
|
|
|
# '';
|
2018-03-14 20:48:56 +00:00
|
|
|
|
2017-09-19 18:20:57 +01:00
|
|
|
nativeBuildInputs = [
|
2018-04-02 10:10:40 +01:00
|
|
|
autoreconfHook # Remove when switching to meson
|
|
|
|
# meson ninja
|
2018-03-14 20:48:56 +00:00
|
|
|
pkgconfig gettext makeWrapper
|
2017-11-08 00:11:54 +00:00
|
|
|
libxml2 libxslt docbook_xsl docbook_xml_dtd_42
|
2017-09-19 18:20:57 +01:00
|
|
|
];
|
2013-04-01 17:09:51 +01:00
|
|
|
|
|
|
|
buildInputs =
|
2018-03-14 20:48:56 +00:00
|
|
|
[ glib libgudev udisks2 libgcrypt
|
|
|
|
libgphoto2 avahi libarchive fuse libcdio
|
|
|
|
samba libmtp libcap polkit libimobiledevice libbluray
|
|
|
|
libcdio-paranoia libnfs openssh
|
2018-04-02 10:10:40 +01:00
|
|
|
# Remove when switching back to meson
|
|
|
|
lzma bzip2
|
2013-04-01 17:09:51 +01:00
|
|
|
# ToDo: a ligther version of libsoup to have FTP/HTTP support?
|
2014-10-25 15:17:39 +01:00
|
|
|
] ++ stdenv.lib.optionals gnomeSupport (with gnome; [
|
2018-03-14 20:48:56 +00:00
|
|
|
libsoup gcr
|
2018-03-15 11:44:34 +00:00
|
|
|
gnome-online-accounts libsecret libgdata
|
2013-04-01 17:09:51 +01:00
|
|
|
]);
|
|
|
|
|
2018-04-02 10:10:40 +01:00
|
|
|
# Remove when switching back to meson
|
|
|
|
configureFlags = stdenv.lib.optional (!gnomeSupport) "--disable-gcr";
|
|
|
|
|
|
|
|
# Uncomment when switching back to meson
|
|
|
|
# mesonFlags = [
|
2018-04-26 21:59:34 +01:00
|
|
|
# "-Dgio_module_dir=${placeholder "out"}/lib/gio/modules"
|
|
|
|
# "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user"
|
|
|
|
# "-Ddbus_service_dir=${placeholder "out"}/share/dbus-1/services"
|
2018-04-02 10:10:40 +01:00
|
|
|
# "-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"
|
|
|
|
# ];
|
2016-10-13 18:29:16 +01:00
|
|
|
|
2013-04-01 17:09:51 +01:00
|
|
|
enableParallelBuilding = true;
|
|
|
|
|
Merge staging-next into master (#44009)
* 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 commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7.
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 commit 305ac4dade5758c58e8ab1666ad0197fd305828d.
(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
|
|
|
checkInputs = [ python3 ];
|
|
|
|
doCheck = false; # fails with "ModuleNotFoundError: No module named 'gi'"
|
|
|
|
doInstallCheck = doCheck;
|
|
|
|
|
2014-04-05 14:51:42 +01:00
|
|
|
preFixup = ''
|
2017-07-24 05:24:11 +01:00
|
|
|
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
|
2013-04-05 12:26:27 +01:00
|
|
|
'';
|
|
|
|
|
2018-03-03 03:09:19 +00:00
|
|
|
passthru = {
|
|
|
|
updateScript = gnome3.updateScript {
|
|
|
|
packageName = pname;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
2015-04-10 16:02:57 +01:00
|
|
|
meta = with stdenv.lib; {
|
|
|
|
description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)";
|
2018-03-03 03:09:19 +00:00
|
|
|
license = licenses.lgpl2Plus;
|
2015-04-10 16:02:57 +01:00
|
|
|
platforms = platforms.linux;
|
2018-03-03 03:09:19 +00:00
|
|
|
maintainers = [ maintainers.lethalman ] ++ gnome3.maintainers;
|
2013-04-01 17:09:51 +01:00
|
|
|
};
|
|
|
|
}
|