2017-08-31 02:04:07 +01:00
|
|
|
{ stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl,
|
|
|
|
|
perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
|
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
|
|
|
libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui, hicolor-icon-theme,
|
2018-10-10 22:20:34 +01:00
|
|
|
gtk-mac-integration-gtk2 }:
|
2007-06-20 13:20:39 +01:00
|
|
|
|
2011-09-20 07:31:37 +01:00
|
|
|
stdenv.mkDerivation rec {
|
2017-08-31 02:04:07 +01:00
|
|
|
name = "dia-${version}";
|
|
|
|
|
version = "0.97.3.20170622";
|
2011-09-20 07:31:37 +01:00
|
|
|
|
2017-08-31 02:04:07 +01:00
|
|
|
src = fetchgit {
|
2018-05-29 09:26:03 +01:00
|
|
|
url = https://gitlab.gnome.org/GNOME/dia.git;
|
2017-08-31 02:04:07 +01:00
|
|
|
rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c";
|
|
|
|
|
sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96";
|
2007-06-20 13:20:39 +01:00
|
|
|
};
|
|
|
|
|
|
2011-09-20 07:31:37 +01:00
|
|
|
buildInputs =
|
2016-09-11 22:24:51 +01:00
|
|
|
[ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5
|
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
|
|
|
libxslt docbook_xsl libart_lgpl hicolor-icon-theme ]
|
2017-08-31 02:04:07 +01:00
|
|
|
++ stdenv.lib.optional withGNOME libgnomeui
|
2018-10-10 22:20:34 +01:00
|
|
|
++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration-gtk2;
|
2011-09-20 07:31:37 +01:00
|
|
|
|
2017-08-31 02:04:07 +01:00
|
|
|
nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool perl ];
|
2011-09-20 07:31:37 +01:00
|
|
|
|
2017-08-31 02:04:07 +01:00
|
|
|
preConfigure = ''
|
|
|
|
|
NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough
|
|
|
|
|
'';
|
2018-08-03 17:52:40 +01:00
|
|
|
configureFlags = stdenv.lib.optional withGNOME "--enable-gnome";
|
2007-06-26 12:49:45 +01:00
|
|
|
|
2017-08-31 02:04:07 +01:00
|
|
|
hardeningDisable = [ "format" ];
|
2012-07-15 16:01:27 +01:00
|
|
|
|
2018-08-22 22:42:05 +01:00
|
|
|
meta = with stdenv.lib; {
|
2011-09-20 07:31:37 +01:00
|
|
|
description = "Gnome Diagram drawing software";
|
2010-01-15 10:51:44 +00:00
|
|
|
homepage = http://live.gnome.org/Dia;
|
2018-08-22 22:42:05 +01:00
|
|
|
maintainers = with maintainers; [ raskin ];
|
|
|
|
|
license = licenses.gpl2;
|
|
|
|
|
platforms = platforms.unix;
|
2007-06-26 12:49:45 +01:00
|
|
|
};
|
2007-06-20 13:20:39 +01:00
|
|
|
}
|
