Merge branch 'staging-next'
It's not completely without regressions, but ATM it seems to bring more upsides than downsides and the iteration is too long already.
This commit is contained in:
Vladimír Čunát
commit
c40f211499
@ -1664,6 +1664,18 @@ installTargets = "install-bin install-doc";</programlisting>
|
|||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
<varlistentry>
|
||||||
|
<term>
|
||||||
|
<varname>dontPruneLibtoolFiles</varname>
|
||||||
|
</term>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
If set, libtool <literal>.la</literal> files associated with shared
|
||||||
|
libraries won't have their <literal>dependency_libs</literal> field
|
||||||
|
cleared.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term>
|
<term>
|
||||||
<varname>forceShare</varname>
|
<varname>forceShare</varname>
|
||||||
@ -1800,7 +1812,7 @@ set debug-file-directory ~/.nix-profile/lib/debug
|
|||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
A list of dependencies used by the phase. This gets included in
|
A list of dependencies used by the phase. This gets included in
|
||||||
<varname>buildInputs</varname> when <varname>doInstallCheck</varname> is
|
<varname>nativeBuildInputs</varname> when <varname>doInstallCheck</varname> is
|
||||||
set.
|
set.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
|||||||
@ -9,7 +9,8 @@ let abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) abis
|
|||||||
rec {
|
rec {
|
||||||
patterns = rec {
|
patterns = rec {
|
||||||
isi686 = { cpu = cpuTypes.i686; };
|
isi686 = { cpu = cpuTypes.i686; };
|
||||||
isx86_64 = { cpu = cpuTypes.x86_64; };
|
isx86_32 = { cpu = { family = "x86"; bits = 32; }; };
|
||||||
|
isx86_64 = { cpu = { family = "x86"; bits = 64; }; };
|
||||||
isPowerPC = { cpu = cpuTypes.powerpc; };
|
isPowerPC = { cpu = cpuTypes.powerpc; };
|
||||||
isPower = { cpu = { family = "power"; }; };
|
isPower = { cpu = { family = "power"; }; };
|
||||||
isx86 = { cpu = { family = "x86"; }; };
|
isx86 = { cpu = { family = "x86"; }; };
|
||||||
|
|||||||
@ -467,6 +467,8 @@ rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
selectBySystem = system: {
|
selectBySystem = system: {
|
||||||
|
"i486-linux" = pc32;
|
||||||
|
"i586-linux" = pc32;
|
||||||
"i686-linux" = pc32;
|
"i686-linux" = pc32;
|
||||||
"x86_64-linux" = pc64;
|
"x86_64-linux" = pc64;
|
||||||
"armv5tel-linux" = sheevaplug;
|
"armv5tel-linux" = sheevaplug;
|
||||||
|
|||||||
@ -14,6 +14,8 @@ stdenv.mkDerivation {
|
|||||||
buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ]
|
buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 makeWrapper ]
|
||||||
++ (with perlPackages; [ perl XMLParser ]);
|
++ (with perlPackages; [ perl XMLParser ]);
|
||||||
|
|
||||||
|
NIX_LDFLAGS = [ "-ldl" ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa
|
wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa
|
||||||
'';
|
'';
|
||||||
|
|||||||
@ -141,6 +141,7 @@ let
|
|||||||
kruler = callPackage ./kruler.nix {};
|
kruler = callPackage ./kruler.nix {};
|
||||||
ksystemlog = callPackage ./ksystemlog.nix {};
|
ksystemlog = callPackage ./ksystemlog.nix {};
|
||||||
ktnef = callPackage ./ktnef.nix {};
|
ktnef = callPackage ./ktnef.nix {};
|
||||||
|
ktouch = callPackage ./ktouch.nix {};
|
||||||
kwalletmanager = callPackage ./kwalletmanager.nix {};
|
kwalletmanager = callPackage ./kwalletmanager.nix {};
|
||||||
libgravatar = callPackage ./libgravatar.nix {};
|
libgravatar = callPackage ./libgravatar.nix {};
|
||||||
libkcddb = callPackage ./libkcddb.nix {};
|
libkcddb = callPackage ./libkcddb.nix {};
|
||||||
|
|||||||
26
pkgs/applications/kde/ktouch.nix
Normal file
26
pkgs/applications/kde/ktouch.nix
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
{ mkDerivation, lib
|
||||||
|
, extra-cmake-modules, kdoctools
|
||||||
|
, kconfig, kconfigwidgets, kcoreaddons, kdeclarative, ki18n
|
||||||
|
, kitemviews, kcmutils, kio, knewstuff, ktexteditor, kwidgetsaddons
|
||||||
|
, kwindowsystem, kxmlgui, qtscript, qtdeclarative, kqtquickcharts
|
||||||
|
, qtx11extras, qtgraphicaleffects, xorg
|
||||||
|
}:
|
||||||
|
|
||||||
|
|
||||||
|
mkDerivation {
|
||||||
|
name = "ktouch";
|
||||||
|
meta = {
|
||||||
|
license = lib.licenses.gpl2;
|
||||||
|
maintainers = [ lib.maintainers.schmittlauch ];
|
||||||
|
description = "A touch typing tutor from the KDE software collection";
|
||||||
|
};
|
||||||
|
nativeBuildInputs = [ extra-cmake-modules kdoctools qtdeclarative ];
|
||||||
|
buildInputs = [
|
||||||
|
kconfig kconfigwidgets kcoreaddons kdeclarative ki18n
|
||||||
|
kitemviews kcmutils kio knewstuff ktexteditor kwidgetsaddons
|
||||||
|
kwindowsystem kxmlgui qtscript qtdeclarative kqtquickcharts
|
||||||
|
qtx11extras qtgraphicaleffects xorg.libxkbfile xorg.libxcb
|
||||||
|
];
|
||||||
|
|
||||||
|
enableParallelBuilding = true;
|
||||||
|
}
|
||||||
@ -68,8 +68,6 @@ in stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
# TODO: remove libcap when pruneLibtoolFiles applies to pulseaudio.
|
|
||||||
libcap
|
|
||||||
libevent
|
libevent
|
||||||
libtool
|
libtool
|
||||||
udev
|
udev
|
||||||
|
|||||||
@ -7,16 +7,14 @@
|
|||||||
, speechd, brltty, setproctitle, gst_all_1, gst-python
|
, speechd, brltty, setproctitle, gst_all_1, gst-python
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
buildPythonApplication rec {
|
||||||
pname = "orca";
|
pname = "orca";
|
||||||
version = "3.30.2";
|
version = "3.30.2";
|
||||||
in buildPythonApplication rec {
|
|
||||||
name = "${pname}-${version}";
|
|
||||||
|
|
||||||
format = "other";
|
format = "other";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
|
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||||
sha256 = "17asibc46i5gr2fw04jvvdi85zzmxwlnhyq7r6cr3m5prrdr8a53";
|
sha256 = "17asibc46i5gr2fw04jvvdi85zzmxwlnhyq7r6cr3m5prrdr8a53";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -10,11 +10,11 @@ let
|
|||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "msmtp";
|
pname = "msmtp";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
version = "1.8.1";
|
version = "1.8.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://marlam.de/msmtp/releases/${name}.tar.xz";
|
url = "https://marlam.de/msmtp/releases/${name}.tar.xz";
|
||||||
sha256 = "1nm4vizrnrrnknc4mc8nr7grz9q76m1vraa0hsl5rfm34gnsg8ph";
|
sha256 = "14w7lmw1jxlganfk089b0ib23y5917mxbg3xqpid007dd4cmq66i";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|||||||
@ -35,6 +35,7 @@ let
|
|||||||
inherit flint ecl arb;
|
inherit flint ecl arb;
|
||||||
inherit sage-src pynac singular;
|
inherit sage-src pynac singular;
|
||||||
linbox = pkgs.linbox.override { withSage = true; };
|
linbox = pkgs.linbox.override { withSage = true; };
|
||||||
|
pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@ -30,6 +30,7 @@
|
|||||||
, numpy
|
, numpy
|
||||||
, pari
|
, pari
|
||||||
, pkgconfig
|
, pkgconfig
|
||||||
|
, pkg-config
|
||||||
, planarity
|
, planarity
|
||||||
, ppl
|
, ppl
|
||||||
, pynac
|
, pynac
|
||||||
@ -63,6 +64,7 @@ buildPythonPackage rec {
|
|||||||
iml
|
iml
|
||||||
perl
|
perl
|
||||||
jupyter_core
|
jupyter_core
|
||||||
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|||||||
@ -177,7 +177,7 @@ stdenv.mkDerivation {
|
|||||||
/**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64"
|
/**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64"
|
||||||
else if targetPlatform.isAarch32 then endianPrefix + "arm"
|
else if targetPlatform.isAarch32 then endianPrefix + "arm"
|
||||||
else if targetPlatform.isx86_64 then "x86-64"
|
else if targetPlatform.isx86_64 then "x86-64"
|
||||||
else if targetPlatform.isx86 then "i386"
|
else if targetPlatform.isx86_32 then "i386"
|
||||||
else if targetPlatform.isMips then {
|
else if targetPlatform.isMips then {
|
||||||
"mips" = "btsmipn32"; # n32 variant
|
"mips" = "btsmipn32"; # n32 variant
|
||||||
"mipsel" = "ltsmipn32"; # n32 variant
|
"mipsel" = "ltsmipn32"; # n32 variant
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
fixupOutputHooks+=(_pruneLibtoolFiles)
|
fixupOutputHooks+=(_pruneLibtoolFiles)
|
||||||
|
|
||||||
_pruneLibtoolFiles() {
|
_pruneLibtoolFiles() {
|
||||||
if [ "$dontPruneLibtoolFiles" ]; then
|
if [ "$dontPruneLibtoolFiles" ] || [ ! -e "$prefix" ]; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -16,7 +16,7 @@ _pruneLibtoolFiles() {
|
|||||||
# the "old_library" field for static libraries. We are processing only
|
# the "old_library" field for static libraries. We are processing only
|
||||||
# those .la files that do not describe static libraries.
|
# those .la files that do not describe static libraries.
|
||||||
find "$prefix" -type f -name '*.la' \
|
find "$prefix" -type f -name '*.la' \
|
||||||
-exec grep -q '^# Generated by libtool' {} \; \
|
-exec grep -q '^# Generated by .*libtool' {} \; \
|
||||||
-exec grep -q "^old_library=''" {} \; \
|
-exec grep -q "^old_library=''" {} \; \
|
||||||
-exec sed -i {} -e "/^dependency_libs='[^']/ c dependency_libs='' #pruned" \;
|
-exec sed -i {} -e "/^dependency_libs='[^']/ c dependency_libs='' #pruned" \;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,7 +19,7 @@ let
|
|||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "dns-root-data-2017-10-24";
|
name = "dns-root-data-2019-01-11";
|
||||||
|
|
||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
mkdir $out
|
mkdir $out
|
||||||
|
|||||||
@ -1,2 +1 @@
|
|||||||
. IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5
|
|
||||||
. IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D
|
. IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D
|
||||||
|
|||||||
@ -1,2 +1 @@
|
|||||||
. 172800 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0= ;{id = 19036 (ksk), size = 2048b}
|
|
||||||
. 172800 IN DNSKEY 257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ;{id = 20326 (ksk), size = 2048b}
|
. 172800 IN DNSKEY 257 3 8 AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+eoZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU= ;{id = 20326 (ksk), size = 2048b}
|
||||||
|
|||||||
@ -15,4 +15,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ gtk intltool GConf enchant isocodes gnome_icon_theme ];
|
buildInputs = [ gtk intltool GConf enchant isocodes gnome_icon_theme ];
|
||||||
|
|
||||||
|
NIX_LDFLAGS = [ "-lgthread-2.0" ];
|
||||||
}
|
}
|
||||||
|
|||||||
@ -312,7 +312,7 @@ stdenv.mkDerivation ({
|
|||||||
optional (!bootstrap) "--disable-bootstrap" ++
|
optional (!bootstrap) "--disable-bootstrap" ++
|
||||||
|
|
||||||
# Platform-specific flags
|
# Platform-specific flags
|
||||||
optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++
|
optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
|
||||||
optionals hostPlatform.isSunOS [
|
optionals hostPlatform.isSunOS [
|
||||||
"--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
|
"--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
|
||||||
# On Illumos/Solaris GNU as is preferred
|
# On Illumos/Solaris GNU as is preferred
|
||||||
|
|||||||
@ -325,7 +325,7 @@ stdenv.mkDerivation ({
|
|||||||
optional (!bootstrap) "--disable-bootstrap" ++
|
optional (!bootstrap) "--disable-bootstrap" ++
|
||||||
|
|
||||||
# Platform-specific flags
|
# Platform-specific flags
|
||||||
optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++
|
optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
|
||||||
optionals hostPlatform.isSunOS [
|
optionals hostPlatform.isSunOS [
|
||||||
"--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
|
"--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
|
||||||
# On Illumos/Solaris GNU as is preferred
|
# On Illumos/Solaris GNU as is preferred
|
||||||
|
|||||||
@ -324,7 +324,7 @@ stdenv.mkDerivation ({
|
|||||||
optional (!bootstrap) "--disable-bootstrap" ++
|
optional (!bootstrap) "--disable-bootstrap" ++
|
||||||
|
|
||||||
# Platform-specific flags
|
# Platform-specific flags
|
||||||
optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++
|
optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
|
||||||
optionals hostPlatform.isSunOS [
|
optionals hostPlatform.isSunOS [
|
||||||
"--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
|
"--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
|
||||||
# On Illumos/Solaris GNU as is preferred
|
# On Illumos/Solaris GNU as is preferred
|
||||||
|
|||||||
@ -326,7 +326,7 @@ stdenv.mkDerivation ({
|
|||||||
optional (!bootstrap) "--disable-bootstrap" ++
|
optional (!bootstrap) "--disable-bootstrap" ++
|
||||||
|
|
||||||
# Platform-specific flags
|
# Platform-specific flags
|
||||||
optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++
|
optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
|
||||||
optionals hostPlatform.isSunOS [
|
optionals hostPlatform.isSunOS [
|
||||||
"--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
|
"--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
|
||||||
# On Illumos/Solaris GNU as is preferred
|
# On Illumos/Solaris GNU as is preferred
|
||||||
|
|||||||
@ -289,7 +289,7 @@ stdenv.mkDerivation ({
|
|||||||
optional (!bootstrap) "--disable-bootstrap" ++
|
optional (!bootstrap) "--disable-bootstrap" ++
|
||||||
|
|
||||||
# Platform-specific flags
|
# Platform-specific flags
|
||||||
optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++
|
optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
|
||||||
optionals hostPlatform.isSunOS [
|
optionals hostPlatform.isSunOS [
|
||||||
"--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
|
"--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
|
||||||
# On Illumos/Solaris GNU as is preferred
|
# On Illumos/Solaris GNU as is preferred
|
||||||
|
|||||||
@ -277,7 +277,7 @@ stdenv.mkDerivation ({
|
|||||||
optional (!bootstrap) "--disable-bootstrap" ++
|
optional (!bootstrap) "--disable-bootstrap" ++
|
||||||
|
|
||||||
# Platform-specific flags
|
# Platform-specific flags
|
||||||
optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++
|
optional (targetPlatform == hostPlatform && targetPlatform.isx86_32) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++
|
||||||
optionals hostPlatform.isSunOS [
|
optionals hostPlatform.isSunOS [
|
||||||
"--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
|
"--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
|
||||||
# On Illumos/Solaris GNU as is preferred
|
# On Illumos/Solaris GNU as is preferred
|
||||||
|
|||||||
@ -13,9 +13,10 @@
|
|||||||
, fetchpatch
|
, fetchpatch
|
||||||
, debugVersion ? false
|
, debugVersion ? false
|
||||||
, enableManpages ? false
|
, enableManpages ? false
|
||||||
# Mesa requires AMDGPU target
|
|
||||||
, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" ]
|
|
||||||
, enableSharedLibraries ? true
|
, enableSharedLibraries ? true
|
||||||
|
# Mesa requires AMDGPU target
|
||||||
|
# BPF is used by bcc
|
||||||
|
, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" "BPF" ]
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -27,10 +28,6 @@ let
|
|||||||
shortVersion = with stdenv.lib;
|
shortVersion = with stdenv.lib;
|
||||||
concatStringsSep "." (take 2 (splitString "." release_version));
|
concatStringsSep "." (take 2 (splitString "." release_version));
|
||||||
|
|
||||||
inherit
|
|
||||||
(import ../common.nix { inherit (stdenv) lib; })
|
|
||||||
llvmBackendList;
|
|
||||||
|
|
||||||
in stdenv.mkDerivation (rec {
|
in stdenv.mkDerivation (rec {
|
||||||
name = "llvm-${version}";
|
name = "llvm-${version}";
|
||||||
|
|
||||||
@ -51,11 +48,16 @@ in stdenv.mkDerivation (rec {
|
|||||||
propagatedBuildInputs = [ ncurses zlib ];
|
propagatedBuildInputs = [ ncurses zlib ];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# fixes tests, included in llvm_7
|
# Patches to fix tests, included in llvm_7
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
url = "https://github.com/llvm-mirror/llvm/commit/737553be0c9c25c497b45a241689994f177d5a5d.patch";
|
url = "https://github.com/llvm-mirror/llvm/commit/737553be0c9c25c497b45a241689994f177d5a5d.patch";
|
||||||
sha256 = "0hnaxnkx7zy5yg98f1ggv8a9l0r6g19n6ygqsv26masrnlcbccli";
|
sha256 = "0hnaxnkx7zy5yg98f1ggv8a9l0r6g19n6ygqsv26masrnlcbccli";
|
||||||
})
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/llvm-mirror/llvm/commit/1c0dd31a7837c3e2f1c4ac14e4d5ac640688bd1f.patch";
|
||||||
|
includes = [ "test/tools/gold/X86/common.ll" ];
|
||||||
|
sha256 = "0fxgrxmfnjx17w3lcq19rk68b2xksh1bynz3ina784kma7hp4wdb";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = optionalString stdenv.isDarwin ''
|
postPatch = optionalString stdenv.isDarwin ''
|
||||||
@ -93,7 +95,6 @@ in stdenv.mkDerivation (rec {
|
|||||||
"-DLLVM_ENABLE_RTTI=ON"
|
"-DLLVM_ENABLE_RTTI=ON"
|
||||||
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
|
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
|
||||||
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||||
"-DLLVM_TARGETS_TO_BUILD=${llvmBackendList enableTargets}"
|
|
||||||
"-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
|
"-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
|
||||||
"-DLLVM_ENABLE_DUMP=ON"
|
"-DLLVM_ENABLE_DUMP=ON"
|
||||||
] ++ optionals enableSharedLibraries [
|
] ++ optionals enableSharedLibraries [
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
{ stdenv
|
{ stdenv
|
||||||
, fetch
|
, fetch
|
||||||
|
, fetchpatch
|
||||||
, cmake
|
, cmake
|
||||||
, python
|
, python
|
||||||
, libffi
|
, libffi
|
||||||
@ -14,8 +15,6 @@
|
|||||||
, debugVersion ? false
|
, debugVersion ? false
|
||||||
, enableManpages ? false
|
, enableManpages ? false
|
||||||
, enableSharedLibraries ? true
|
, enableSharedLibraries ? true
|
||||||
# Mesa requires AMDGPU target
|
|
||||||
, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" ]
|
|
||||||
, enablePFM ? !stdenv.isDarwin
|
, enablePFM ? !stdenv.isDarwin
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -28,9 +27,6 @@ let
|
|||||||
shortVersion = with stdenv.lib;
|
shortVersion = with stdenv.lib;
|
||||||
concatStringsSep "." (take 1 (splitString "." release_version));
|
concatStringsSep "." (take 1 (splitString "." release_version));
|
||||||
|
|
||||||
inherit
|
|
||||||
(import ../common.nix { inherit (stdenv) lib; })
|
|
||||||
llvmBackendList;
|
|
||||||
in stdenv.mkDerivation (rec {
|
in stdenv.mkDerivation (rec {
|
||||||
name = "llvm-${version}";
|
name = "llvm-${version}";
|
||||||
|
|
||||||
@ -51,6 +47,24 @@ in stdenv.mkDerivation (rec {
|
|||||||
|
|
||||||
propagatedBuildInputs = [ ncurses zlib ];
|
propagatedBuildInputs = [ ncurses zlib ];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# https://bugs.llvm.org/show_bug.cgi?id=39427
|
||||||
|
# https://github.com/NixOS/nixpkgs/issues/54370
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/llvm-mirror/llvm/commit/57567def148f387153a8149fb590bd39b1b006a1.patch";
|
||||||
|
sha256 = "1w1xg5pxpc6cals1nf5j5k4p6qi8lcrpvn0paxc86m415i79xmcg";
|
||||||
|
})
|
||||||
|
# backport, fix building rust crates with lto
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/llvm-mirror/llvm/commit/da1fb72bb305d6bc1f3899d541414146934bf80f.patch";
|
||||||
|
sha256 = "0p81gkhc1xhcx0hmnkwyhrn8x8l8fd24xgaj1whni29yga466dwc";
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/llvm-mirror/llvm/commit/cc1f2a595ead516812a6c50398f0f3480ebe031f.patch";
|
||||||
|
sha256 = "0k6k1p5yisgwx417a67s7sr9930rqh1n0zv5jvply8vjjy4b3kf8";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = optionalString stdenv.isDarwin ''
|
postPatch = optionalString stdenv.isDarwin ''
|
||||||
substituteInPlace cmake/modules/AddLLVM.cmake \
|
substituteInPlace cmake/modules/AddLLVM.cmake \
|
||||||
--replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
|
--replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
|
||||||
@ -88,7 +102,6 @@ in stdenv.mkDerivation (rec {
|
|||||||
"-DLLVM_ENABLE_RTTI=ON"
|
"-DLLVM_ENABLE_RTTI=ON"
|
||||||
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
|
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
|
||||||
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
|
||||||
"-DLLVM_TARGETS_TO_BUILD=${llvmBackendList enableTargets}"
|
|
||||||
"-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
|
"-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly"
|
||||||
"-DLLVM_ENABLE_DUMP=ON"
|
"-DLLVM_ENABLE_DUMP=ON"
|
||||||
] ++ optionals enableSharedLibraries [
|
] ++ optionals enableSharedLibraries [
|
||||||
@ -134,7 +147,7 @@ in stdenv.mkDerivation (rec {
|
|||||||
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
|
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = stdenv.isLinux && (!stdenv.isi686);
|
doCheck = stdenv.isLinux && (!stdenv.isx86_32);
|
||||||
|
|
||||||
checkTarget = "check-all";
|
checkTarget = "check-all";
|
||||||
|
|
||||||
|
|||||||
@ -1,22 +0,0 @@
|
|||||||
{ lib }:
|
|
||||||
|
|
||||||
rec {
|
|
||||||
llvmBackend = platform:
|
|
||||||
if builtins.typeOf platform == "string" then
|
|
||||||
platform
|
|
||||||
else if platform.parsed.cpu.family == "x86" then
|
|
||||||
"X86"
|
|
||||||
else if platform.parsed.cpu.name == "aarch64" then
|
|
||||||
"AArch64"
|
|
||||||
else if platform.parsed.cpu.family == "arm" then
|
|
||||||
"ARM"
|
|
||||||
else if platform.parsed.cpu.family == "mips" then
|
|
||||||
"Mips"
|
|
||||||
else if platform.parsed.cpu.family == "power" then
|
|
||||||
"PowerPC"
|
|
||||||
else
|
|
||||||
throw "Unsupported system";
|
|
||||||
|
|
||||||
llvmBackendList = platforms:
|
|
||||||
lib.concatStringsSep ";" (map llvmBackend platforms);
|
|
||||||
}
|
|
||||||
@ -1,11 +1,46 @@
|
|||||||
{ stdenv, lib, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, automake, graphviz
|
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, automake, autoreconfHook
|
||||||
, glib, libiconv, libintl, libtool, expat
|
, graphviz, glib, libiconv, libintl, libtool, expat
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
generic = { major, minor, sha256, extraNativeBuildInputs ? [], extraBuildInputs ? [] }:
|
generic = lib.makeOverridable ({
|
||||||
|
major, minor, sha256,
|
||||||
|
extraNativeBuildInputs ? [],
|
||||||
|
extraBuildInputs ? [],
|
||||||
|
withGraphviz ? false
|
||||||
|
}:
|
||||||
let
|
let
|
||||||
atLeast = lib.versionAtLeast "${major}.${minor}";
|
atLeast = lib.versionAtLeast "${major}.${minor}";
|
||||||
|
|
||||||
|
# Patches from the openembedded-core project to build vala without graphviz
|
||||||
|
# support. We need to apply an additional patch to allow building when the
|
||||||
|
# header file isn't available at all, but that patch (./gvc-compat.patch)
|
||||||
|
# can be shared between all versions of Vala so far.
|
||||||
|
graphvizPatch =
|
||||||
|
let
|
||||||
|
fp = { commit, sha256 }: fetchpatch {
|
||||||
|
url = "https://github.com/openembedded/openembedded-core/raw/${commit}/meta/recipes-devtools/vala/vala/disable-graphviz.patch";
|
||||||
|
inherit sha256;
|
||||||
|
};
|
||||||
|
|
||||||
|
in {
|
||||||
|
"0.38" = fp {
|
||||||
|
commit = "2c290f7253bba5ceb0d32e7d0b0ec0d0e81cc263";
|
||||||
|
sha256 = "056ybapfx18d7xw1k8k85nsjrc26qk2q2d9v9nz2zrcwbq5brhkp";
|
||||||
|
};
|
||||||
|
|
||||||
|
# NOTE: the openembedded-core project doesn't have a patch for 0.40.12
|
||||||
|
# or 0.42.4 just yet; we've fixed the single merge conflict in the
|
||||||
|
# patches below and checked them in here.
|
||||||
|
# 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch
|
||||||
|
# 0.42.4: https://github.com/openembedded/openembedded-core/raw/dfbbff39cfd413510abbd60930232a9c6b35d765/meta/recipes-devtools/vala/vala/disable-graphviz.patch
|
||||||
|
"0.40" = ./disable-graphviz-0.40.12.patch;
|
||||||
|
"0.42" = ./disable-graphviz-0.42.4.patch;
|
||||||
|
|
||||||
|
}.${major} or (throw "no graphviz patch for this version of vala");
|
||||||
|
|
||||||
|
disableGraphviz = atLeast "0.38" && !withGraphviz;
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
name = "vala-${version}";
|
name = "vala-${version}";
|
||||||
version = "${major}.${minor}";
|
version = "${major}.${minor}";
|
||||||
@ -19,16 +54,24 @@ let
|
|||||||
patchShebangs tests
|
patchShebangs tests
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# If we're disabling graphviz, apply the patches and corresponding
|
||||||
|
# configure flag. We also need to override the path to the valac compiler
|
||||||
|
# so that it can be used to regenerate documentation.
|
||||||
|
patches = lib.optionals disableGraphviz [ graphvizPatch ./gvc-compat.patch ];
|
||||||
|
configureFlags = lib.optional disableGraphviz "--disable-graphviz";
|
||||||
|
preBuild = lib.optional disableGraphviz "buildFlagsArray+=(\"VALAC=$(pwd)/compiler/valac\")";
|
||||||
|
|
||||||
outputs = [ "out" "devdoc" ];
|
outputs = [ "out" "devdoc" ];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkgconfig flex bison libxslt
|
pkgconfig flex bison libxslt
|
||||||
] ++ lib.optional (stdenv.isDarwin && (atLeast "0.38")) expat
|
] ++ lib.optional (stdenv.isDarwin && (atLeast "0.38")) expat
|
||||||
|
++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure
|
||||||
++ extraNativeBuildInputs;
|
++ extraNativeBuildInputs;
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glib libiconv libintl
|
glib libiconv libintl
|
||||||
] ++ lib.optional (atLeast "0.38") graphviz
|
] ++ lib.optional (atLeast "0.38" && withGraphviz) graphviz
|
||||||
++ extraBuildInputs;
|
++ extraBuildInputs;
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
@ -42,7 +85,7 @@ let
|
|||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg ];
|
maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg ];
|
||||||
};
|
};
|
||||||
};
|
});
|
||||||
|
|
||||||
in rec {
|
in rec {
|
||||||
vala_0_36 = generic {
|
vala_0_36 = generic {
|
||||||
|
|||||||
208
pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch
Normal file
208
pkgs/development/compilers/vala/disable-graphviz-0.40.12.patch
Normal file
@ -0,0 +1,208 @@
|
|||||||
|
diff --git i/configure.ac w/configure.ac
|
||||||
|
index 694ffd200..915062053 100644
|
||||||
|
--- i/configure.ac
|
||||||
|
+++ w/configure.ac
|
||||||
|
@@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
|
||||||
|
AC_SUBST(GMODULE_CFLAGS)
|
||||||
|
AC_SUBST(GMODULE_LIBS)
|
||||||
|
|
||||||
|
-PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
|
||||||
|
-AC_MSG_CHECKING([for CGRAPH])
|
||||||
|
-cgraph_tmp_LIBADD="$LIBADD"
|
||||||
|
-cgraph_tmp_CFLAGS="$CFLAGS"
|
||||||
|
-LIBADD="$LIBADD $LIBGVC_LIBS"
|
||||||
|
-CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
|
||||||
|
-AC_RUN_IFELSE(
|
||||||
|
- [AC_LANG_SOURCE([
|
||||||
|
- #include <gvc.h>
|
||||||
|
-
|
||||||
|
- int main(void) {
|
||||||
|
- #ifdef WITH_CGRAPH
|
||||||
|
- return 0;
|
||||||
|
- #else
|
||||||
|
- return -1;
|
||||||
|
- #endif
|
||||||
|
- }
|
||||||
|
- ])], [
|
||||||
|
- AC_MSG_RESULT([yes])
|
||||||
|
- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
|
||||||
|
- have_cgraph=yes
|
||||||
|
- ], [
|
||||||
|
- AC_MSG_RESULT([no])
|
||||||
|
- have_cgraph=no
|
||||||
|
- ]
|
||||||
|
-)
|
||||||
|
-LIBADD="$cgraph_tmp_LIBADD"
|
||||||
|
-CFLAGS="$cgraph_tmp_CFLAGS"
|
||||||
|
+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)
|
||||||
|
+if test x$enable_graphviz = xyes; then
|
||||||
|
+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
|
||||||
|
+ AC_MSG_CHECKING([for CGRAPH])
|
||||||
|
+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"
|
||||||
|
+ cgraph_tmp_LIBADD="$LIBADD"
|
||||||
|
+ cgraph_tmp_CFLAGS="$CFLAGS"
|
||||||
|
+ LIBADD="$LIBADD $LIBGVC_LIBS"
|
||||||
|
+ CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
|
||||||
|
+ AC_RUN_IFELSE(
|
||||||
|
+ [AC_LANG_SOURCE([
|
||||||
|
+ #include <gvc.h>
|
||||||
|
+ int main(void) {
|
||||||
|
+ #ifdef WITH_CGRAPH
|
||||||
|
+ return 0;
|
||||||
|
+ #else
|
||||||
|
+ return -1;
|
||||||
|
+ #endif
|
||||||
|
+ }
|
||||||
|
+ ])], [
|
||||||
|
+ AC_MSG_RESULT([yes])
|
||||||
|
+ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
|
||||||
|
+ have_cgraph=yes
|
||||||
|
+ ], [
|
||||||
|
+ AC_MSG_RESULT([no])
|
||||||
|
+ have_cgraph=no
|
||||||
|
+ ]
|
||||||
|
+ )
|
||||||
|
+ LIBADD="$cgraph_tmp_LIBADD"
|
||||||
|
+ CFLAGS="$cgraph_tmp_CFLAGS"
|
||||||
|
+fi
|
||||||
|
+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
|
||||||
|
AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
|
||||||
|
|
||||||
|
AC_PATH_PROG([XSLTPROC], [xsltproc], :)
|
||||||
|
diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am
|
||||||
|
index f3f790e76..3c5dc4c80 100644
|
||||||
|
--- i/libvaladoc/Makefile.am
|
||||||
|
+++ w/libvaladoc/Makefile.am
|
||||||
|
@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \
|
||||||
|
content/tablerow.vala \
|
||||||
|
content/taglet.vala \
|
||||||
|
content/text.vala \
|
||||||
|
- charts/chart.vala \
|
||||||
|
- charts/chartfactory.vala \
|
||||||
|
- charts/hierarchychart.vala \
|
||||||
|
- charts/simplechartfactory.vala \
|
||||||
|
parser/manyrule.vala \
|
||||||
|
parser/oneofrule.vala \
|
||||||
|
parser/optionalrule.vala \
|
||||||
|
@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \
|
||||||
|
highlighter/codetoken.vala \
|
||||||
|
highlighter/highlighter.vala \
|
||||||
|
html/basicdoclet.vala \
|
||||||
|
- html/htmlchartfactory.vala \
|
||||||
|
html/linkhelper.vala \
|
||||||
|
html/cssclassresolver.vala \
|
||||||
|
html/htmlmarkupwriter.vala \
|
||||||
|
html/htmlrenderer.vala \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
+if ENABLE_GRAPHVIZ
|
||||||
|
+libvaladoc_la_VALASOURCES += \
|
||||||
|
+ charts/chart.vala \
|
||||||
|
+ charts/chartfactory.vala \
|
||||||
|
+ charts/hierarchychart.vala \
|
||||||
|
+ charts/simplechartfactory.vala \
|
||||||
|
+ html/htmlchartfactory.vala \
|
||||||
|
+ $(NULL)
|
||||||
|
+
|
||||||
|
+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
|
||||||
|
libvaladoc.vala.stamp \
|
||||||
|
$(libvaladoc_la_VALASOURCES:.vala=.c) \
|
||||||
|
@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
|
||||||
|
--library valadoc \
|
||||||
|
--vapi valadoc@PACKAGE_SUFFIX@.vapi \
|
||||||
|
--vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
|
||||||
|
- --vapidir $(top_srcdir)/vapi --pkg libgvc \
|
||||||
|
--vapidir $(top_srcdir)/gee --pkg gee \
|
||||||
|
--vapidir $(top_srcdir)/vala --pkg vala \
|
||||||
|
--vapidir $(top_srcdir)/ccode --pkg ccode \
|
||||||
|
--vapidir $(top_srcdir)/codegen --pkg codegen \
|
||||||
|
+ $(LIBGVC_PKG) \
|
||||||
|
--pkg config \
|
||||||
|
$(filter %.vala %.c,$^)
|
||||||
|
touch $@
|
||||||
|
@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
|
||||||
|
|
||||||
|
valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
|
||||||
|
cp $< $@
|
||||||
|
+if !ENABLE_GRAPHVIZ
|
||||||
|
+ sed -i "s/libgvc //g" $@
|
||||||
|
+endif
|
||||||
|
|
||||||
|
vapidir = $(datadir)/vala/vapi
|
||||||
|
dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
|
||||||
|
@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
|
||||||
|
|
||||||
|
valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
|
||||||
|
cp $< $@
|
||||||
|
+if !ENABLE_GRAPHVIZ
|
||||||
|
+ sed -i "s/libgvc//g" $@
|
||||||
|
+endif
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
$(libvaladoc_la_VALASOURCES) \
|
||||||
|
diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala
|
||||||
|
index 192e488cd..ec0960222 100644
|
||||||
|
--- i/libvaladoc/html/basicdoclet.vala
|
||||||
|
+++ w/libvaladoc/html/basicdoclet.vala
|
||||||
|
@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
|
||||||
|
protected HtmlRenderer _renderer;
|
||||||
|
protected Html.MarkupWriter writer;
|
||||||
|
protected Html.CssClassResolver cssresolver;
|
||||||
|
+#if HAVE_GRAPHVIZ
|
||||||
|
protected Charts.Factory image_factory;
|
||||||
|
+#else
|
||||||
|
+ protected void* image_factory;
|
||||||
|
+#endif
|
||||||
|
protected ErrorReporter reporter;
|
||||||
|
protected string package_list_link = "../index.html";
|
||||||
|
|
||||||
|
@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
|
||||||
|
this.linker = new LinkHelper ();
|
||||||
|
|
||||||
|
_renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
|
||||||
|
+#if HAVE_GRAPHVIZ
|
||||||
|
this.image_factory = new SimpleChartFactory (settings, linker);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void write_image_block (Api.Node element) {
|
||||||
|
+#if HAVE_GRAPHVIZ
|
||||||
|
if (element is Class || element is Interface || element is Struct) {
|
||||||
|
unowned string format = (settings.use_svg_images ? "svg" : "png");
|
||||||
|
var chart = new Charts.Hierarchy (image_factory, element);
|
||||||
|
@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
|
||||||
|
this.get_img_path_html (element, format)});
|
||||||
|
writer.add_usemap (chart);
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
public void write_namespace_content (Namespace node, Api.Node? parent) {
|
||||||
|
diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala
|
||||||
|
index dcc4dad76..cf9c860b8 100644
|
||||||
|
--- i/libvaladoc/html/htmlmarkupwriter.vala
|
||||||
|
+++ w/libvaladoc/html/htmlmarkupwriter.vala
|
||||||
|
@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if HAVE_GRAPHVIZ
|
||||||
|
public MarkupWriter add_usemap (Charts.Chart chart) {
|
||||||
|
string? buf = (string?) chart.write_buffer ("cmapx");
|
||||||
|
if (buf != null) {
|
||||||
|
raw_text ("\n");
|
||||||
|
raw_text ((!) buf);
|
||||||
|
}
|
||||||
|
+#else
|
||||||
|
+ public MarkupWriter add_usemap (void* chart) {
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
208
pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch
Normal file
208
pkgs/development/compilers/vala/disable-graphviz-0.42.4.patch
Normal file
@ -0,0 +1,208 @@
|
|||||||
|
diff --git i/configure.ac w/configure.ac
|
||||||
|
index 730c72d7b..af8198637 100644
|
||||||
|
--- i/configure.ac
|
||||||
|
+++ w/configure.ac
|
||||||
|
@@ -119,34 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
|
||||||
|
AC_SUBST(GMODULE_CFLAGS)
|
||||||
|
AC_SUBST(GMODULE_LIBS)
|
||||||
|
|
||||||
|
-PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
|
||||||
|
-AC_MSG_CHECKING([for CGRAPH])
|
||||||
|
-cgraph_tmp_LIBADD="$LIBADD"
|
||||||
|
-cgraph_tmp_CFLAGS="$CFLAGS"
|
||||||
|
-LIBADD="$LIBADD $LIBGVC_LIBS"
|
||||||
|
-CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
|
||||||
|
-AC_RUN_IFELSE(
|
||||||
|
- [AC_LANG_SOURCE([
|
||||||
|
- #include <gvc.h>
|
||||||
|
-
|
||||||
|
- int main(void) {
|
||||||
|
- #ifdef WITH_CGRAPH
|
||||||
|
- return 0;
|
||||||
|
- #else
|
||||||
|
- return -1;
|
||||||
|
- #endif
|
||||||
|
- }
|
||||||
|
- ])], [
|
||||||
|
- AC_MSG_RESULT([yes])
|
||||||
|
- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
|
||||||
|
- have_cgraph=yes
|
||||||
|
- ], [
|
||||||
|
- AC_MSG_RESULT([no])
|
||||||
|
- have_cgraph=no
|
||||||
|
- ]
|
||||||
|
-)
|
||||||
|
-LIBADD="$cgraph_tmp_LIBADD"
|
||||||
|
-CFLAGS="$cgraph_tmp_CFLAGS"
|
||||||
|
+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)
|
||||||
|
+if test x$enable_graphviz = xyes; then
|
||||||
|
+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
|
||||||
|
+ AC_MSG_CHECKING([for CGRAPH])
|
||||||
|
+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"
|
||||||
|
+ cgraph_tmp_LIBADD="$LIBADD"
|
||||||
|
+ cgraph_tmp_CFLAGS="$CFLAGS"
|
||||||
|
+ LIBADD="$LIBADD $LIBGVC_LIBS"
|
||||||
|
+ CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
|
||||||
|
+ AC_RUN_IFELSE(
|
||||||
|
+ [AC_LANG_SOURCE([
|
||||||
|
+ #include <gvc.h>
|
||||||
|
+ int main(void) {
|
||||||
|
+ #ifdef WITH_CGRAPH
|
||||||
|
+ return 0;
|
||||||
|
+ #else
|
||||||
|
+ return -1;
|
||||||
|
+ #endif
|
||||||
|
+ }
|
||||||
|
+ ])], [
|
||||||
|
+ AC_MSG_RESULT([yes])
|
||||||
|
+ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
|
||||||
|
+ have_cgraph=yes
|
||||||
|
+ ], [
|
||||||
|
+ AC_MSG_RESULT([no])
|
||||||
|
+ have_cgraph=no
|
||||||
|
+ ]
|
||||||
|
+ )
|
||||||
|
+ LIBADD="$cgraph_tmp_LIBADD"
|
||||||
|
+ CFLAGS="$cgraph_tmp_CFLAGS"
|
||||||
|
+fi
|
||||||
|
+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)
|
||||||
|
AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
|
||||||
|
|
||||||
|
AC_PATH_PROG([XSLTPROC], [xsltproc], :)
|
||||||
|
diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am
|
||||||
|
index f3f790e76..3c5dc4c80 100644
|
||||||
|
--- i/libvaladoc/Makefile.am
|
||||||
|
+++ w/libvaladoc/Makefile.am
|
||||||
|
@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \
|
||||||
|
content/tablerow.vala \
|
||||||
|
content/taglet.vala \
|
||||||
|
content/text.vala \
|
||||||
|
- charts/chart.vala \
|
||||||
|
- charts/chartfactory.vala \
|
||||||
|
- charts/hierarchychart.vala \
|
||||||
|
- charts/simplechartfactory.vala \
|
||||||
|
parser/manyrule.vala \
|
||||||
|
parser/oneofrule.vala \
|
||||||
|
parser/optionalrule.vala \
|
||||||
|
@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \
|
||||||
|
highlighter/codetoken.vala \
|
||||||
|
highlighter/highlighter.vala \
|
||||||
|
html/basicdoclet.vala \
|
||||||
|
- html/htmlchartfactory.vala \
|
||||||
|
html/linkhelper.vala \
|
||||||
|
html/cssclassresolver.vala \
|
||||||
|
html/htmlmarkupwriter.vala \
|
||||||
|
html/htmlrenderer.vala \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
+if ENABLE_GRAPHVIZ
|
||||||
|
+libvaladoc_la_VALASOURCES += \
|
||||||
|
+ charts/chart.vala \
|
||||||
|
+ charts/chartfactory.vala \
|
||||||
|
+ charts/hierarchychart.vala \
|
||||||
|
+ charts/simplechartfactory.vala \
|
||||||
|
+ html/htmlchartfactory.vala \
|
||||||
|
+ $(NULL)
|
||||||
|
+
|
||||||
|
+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
|
||||||
|
libvaladoc.vala.stamp \
|
||||||
|
$(libvaladoc_la_VALASOURCES:.vala=.c) \
|
||||||
|
@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
|
||||||
|
--library valadoc \
|
||||||
|
--vapi valadoc@PACKAGE_SUFFIX@.vapi \
|
||||||
|
--vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \
|
||||||
|
- --vapidir $(top_srcdir)/vapi --pkg libgvc \
|
||||||
|
--vapidir $(top_srcdir)/gee --pkg gee \
|
||||||
|
--vapidir $(top_srcdir)/vala --pkg vala \
|
||||||
|
--vapidir $(top_srcdir)/ccode --pkg ccode \
|
||||||
|
--vapidir $(top_srcdir)/codegen --pkg codegen \
|
||||||
|
+ $(LIBGVC_PKG) \
|
||||||
|
--pkg config \
|
||||||
|
$(filter %.vala %.c,$^)
|
||||||
|
touch $@
|
||||||
|
@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc
|
||||||
|
|
||||||
|
valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc
|
||||||
|
cp $< $@
|
||||||
|
+if !ENABLE_GRAPHVIZ
|
||||||
|
+ sed -i "s/libgvc //g" $@
|
||||||
|
+endif
|
||||||
|
|
||||||
|
vapidir = $(datadir)/vala/vapi
|
||||||
|
dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi
|
||||||
|
@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps
|
||||||
|
|
||||||
|
valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps
|
||||||
|
cp $< $@
|
||||||
|
+if !ENABLE_GRAPHVIZ
|
||||||
|
+ sed -i "s/libgvc//g" $@
|
||||||
|
+endif
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
$(libvaladoc_la_VALASOURCES) \
|
||||||
|
diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala
|
||||||
|
index 192e488cd..ec0960222 100644
|
||||||
|
--- i/libvaladoc/html/basicdoclet.vala
|
||||||
|
+++ w/libvaladoc/html/basicdoclet.vala
|
||||||
|
@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
|
||||||
|
protected HtmlRenderer _renderer;
|
||||||
|
protected Html.MarkupWriter writer;
|
||||||
|
protected Html.CssClassResolver cssresolver;
|
||||||
|
+#if HAVE_GRAPHVIZ
|
||||||
|
protected Charts.Factory image_factory;
|
||||||
|
+#else
|
||||||
|
+ protected void* image_factory;
|
||||||
|
+#endif
|
||||||
|
protected ErrorReporter reporter;
|
||||||
|
protected string package_list_link = "../index.html";
|
||||||
|
|
||||||
|
@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
|
||||||
|
this.linker = new LinkHelper ();
|
||||||
|
|
||||||
|
_renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);
|
||||||
|
+#if HAVE_GRAPHVIZ
|
||||||
|
this.image_factory = new SimpleChartFactory (settings, linker);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void write_image_block (Api.Node element) {
|
||||||
|
+#if HAVE_GRAPHVIZ
|
||||||
|
if (element is Class || element is Interface || element is Struct) {
|
||||||
|
unowned string format = (settings.use_svg_images ? "svg" : "png");
|
||||||
|
var chart = new Charts.Hierarchy (image_factory, element);
|
||||||
|
@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {
|
||||||
|
this.get_img_path_html (element, format)});
|
||||||
|
writer.add_usemap (chart);
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
public void write_namespace_content (Namespace node, Api.Node? parent) {
|
||||||
|
diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala
|
||||||
|
index 5aa4afdea..e79b0b8f5 100644
|
||||||
|
--- i/libvaladoc/html/htmlmarkupwriter.vala
|
||||||
|
+++ w/libvaladoc/html/htmlmarkupwriter.vala
|
||||||
|
@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if HAVE_GRAPHVIZ
|
||||||
|
public unowned MarkupWriter add_usemap (Charts.Chart chart) {
|
||||||
|
string? buf = (string?) chart.write_buffer ("cmapx");
|
||||||
|
if (buf != null) {
|
||||||
|
raw_text ("\n");
|
||||||
|
raw_text ((!) buf);
|
||||||
|
}
|
||||||
|
+#else
|
||||||
|
+ public unowned MarkupWriter add_usemap (void* chart) {
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
19
pkgs/development/compilers/vala/gvc-compat.patch
Normal file
19
pkgs/development/compilers/vala/gvc-compat.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am
|
||||||
|
index 8dc398cf1..a5d8a45b4 100644
|
||||||
|
--- i/libvaladoc/Makefile.am
|
||||||
|
+++ w/libvaladoc/Makefile.am
|
||||||
|
@@ -176,9 +176,13 @@ endif
|
||||||
|
libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \
|
||||||
|
libvaladoc.vala.stamp \
|
||||||
|
$(libvaladoc_la_VALASOURCES:.vala=.c) \
|
||||||
|
- gvc-compat.c \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
+if ENABLE_GRAPHVIZ
|
||||||
|
+libvaladoc@PACKAGE_SUFFIX@_la_SOURCES += \
|
||||||
|
+ gvc-compat.c
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
valadoc@PACKAGE_SUFFIX@.vapi valadoc.h: libvaladoc.vala.stamp
|
||||||
|
libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
|
||||||
|
$(VALA_V)$(VALAC) \
|
||||||
@ -747,6 +747,10 @@ self: super: {
|
|||||||
rev = "v${ver}";
|
rev = "v${ver}";
|
||||||
sha256 = "0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l";
|
sha256 = "0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l";
|
||||||
}}/doc";
|
}}/doc";
|
||||||
|
# Needed after sphinx 1.7.9 -> 1.8.3
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace conf.py --replace "'.md': CommonMarkParser," ""
|
||||||
|
'';
|
||||||
nativeBuildInputs = with pkgs.buildPackages.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ];
|
nativeBuildInputs = with pkgs.buildPackages.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ];
|
||||||
makeFlags = "html";
|
makeFlags = "html";
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|||||||
@ -72,14 +72,17 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr
|
|||||||
|
|
||||||
name = namePrefix + name;
|
name = namePrefix + name;
|
||||||
|
|
||||||
nativeBuildInputs = [ ensureNewerSourcesForZipFilesHook ]
|
nativeBuildInputs = [
|
||||||
++ nativeBuildInputs;
|
python
|
||||||
|
wrapPython
|
||||||
buildInputs = [ wrapPython ]
|
ensureNewerSourcesForZipFilesHook
|
||||||
++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip
|
setuptools
|
||||||
# ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools
|
# ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools
|
||||||
++ buildInputs
|
] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [
|
||||||
++ pythonPath;
|
unzip
|
||||||
|
] ++ nativeBuildInputs;
|
||||||
|
|
||||||
|
buildInputs = buildInputs ++ pythonPath;
|
||||||
|
|
||||||
# Propagate python and setuptools. We should stop propagating setuptools.
|
# Propagate python and setuptools. We should stop propagating setuptools.
|
||||||
propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ];
|
propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ];
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, config, libGLSupported, fetchurl, pkgconfig, pruneLibtoolFiles
|
{ stdenv, config, libGLSupported, fetchurl, pkgconfig
|
||||||
, openglSupport ? libGLSupported, libGL
|
, openglSupport ? libGLSupported, libGL
|
||||||
, alsaSupport ? stdenv.isLinux, alsaLib
|
, alsaSupport ? stdenv.isLinux, alsaLib
|
||||||
, x11Support ? !stdenv.isCygwin, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr
|
, x11Support ? !stdenv.isCygwin, libX11, xorgproto, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr
|
||||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
patches = [ ./find-headers.patch ];
|
patches = [ ./find-headers.patch ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig pruneLibtoolFiles ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
|
||||||
propagatedBuildInputs = dlopenPropagatedBuildInputs;
|
propagatedBuildInputs = dlopenPropagatedBuildInputs;
|
||||||
|
|
||||||
|
|||||||
@ -14,7 +14,7 @@ let
|
|||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
name = "freetype-${version}";
|
name = "freetype-${version}";
|
||||||
version = "2.9";
|
version = "2.9.1";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "A font rendering engine";
|
description = "A font rendering engine";
|
||||||
@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://savannah/freetype/${name}.tar.bz2";
|
url = "mirror://savannah/freetype/${name}.tar.bz2";
|
||||||
sha256 = "12jcdz1in20yaa55izxalg3hm1pf7nydfrzps5bzb4zgihybmzz6";
|
sha256 = "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
|
propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
|
||||||
@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ];
|
configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" "--enable-freetype-config" ];
|
||||||
|
|
||||||
# native compiler to generate building tool
|
# native compiler to generate building tool
|
||||||
CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc";
|
CC_BUILD = "${buildPackages.stdenv.cc}/bin/cc";
|
||||||
@ -68,4 +68,5 @@ in stdenv.mkDerivation rec {
|
|||||||
wrapProgram "$dev/bin/freetype-config" \
|
wrapProgram "$dev/bin/freetype-config" \
|
||||||
--set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
|
--set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -72,6 +72,11 @@ stdenv.mkDerivation rec {
|
|||||||
url = https://gitlab.gnome.org/GNOME/glib/commit/85c4031696add9797e2334ced20678edcd96c869.patch;
|
url = https://gitlab.gnome.org/GNOME/glib/commit/85c4031696add9797e2334ced20678edcd96c869.patch;
|
||||||
sha256 = "1hmyvhx89wip2a26gk1rvd87k0pjfia51s0ysybjyzf5f1pzw877";
|
sha256 = "1hmyvhx89wip2a26gk1rvd87k0pjfia51s0ysybjyzf5f1pzw877";
|
||||||
})
|
})
|
||||||
|
# https://gitlab.gnome.org/GNOME/glib/issues/1645
|
||||||
|
(fetchpatch {
|
||||||
|
url = https://gitlab.gnome.org/GNOME/glib/commit/e695ca9f310c393d8f39694f77471dbcb06daa9e.diff;
|
||||||
|
sha256 = "1jkb2bdnni0xdyn86xrx9z0fdwxrm7y08lagz8x5x01wglkwa26w";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
outputs = [ "bin" "out" "dev" "devdoc" ];
|
outputs = [ "bin" "out" "dev" "devdoc" ];
|
||||||
|
|||||||
@ -15,9 +15,9 @@ preInstallPhases+=" glibPreInstallPhase"
|
|||||||
|
|
||||||
glibPreFixupPhase() {
|
glibPreFixupPhase() {
|
||||||
# Move gschemas in case the install flag didn't help
|
# Move gschemas in case the install flag didn't help
|
||||||
if [ -d "${!outputLib}/share/glib-2.0/schemas" ]; then
|
if [ -d "$prefix/share/glib-2.0/schemas" ]; then
|
||||||
mkdir -p "${!outputLib}/share/gsettings-schemas/$name/glib-2.0"
|
mkdir -p "${!outputLib}/share/gsettings-schemas/$name/glib-2.0"
|
||||||
mv "${!outputLib}/share/glib-2.0/schemas" "${!outputLib}/share/gsettings-schemas/$name/glib-2.0/"
|
mv "$prefix/share/glib-2.0/schemas" "${!outputLib}/share/gsettings-schemas/$name/glib-2.0/"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name"
|
addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name"
|
||||||
|
|||||||
@ -29,17 +29,14 @@ let self = stdenv.mkDerivation rec {
|
|||||||
#
|
#
|
||||||
# no darwin because gmp uses ASM that clang doesn't like
|
# no darwin because gmp uses ASM that clang doesn't like
|
||||||
(stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
|
(stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
|
||||||
|
# The config.guess in GMP tries to runtime-detect various
|
||||||
|
# ARM optimization flags via /proc/cpuinfo (and is also
|
||||||
|
# broken on multicore CPUs). Avoid this impurity.
|
||||||
|
"--build=${stdenv.buildPlatform.config}"
|
||||||
] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
|
] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
|
||||||
++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64"
|
++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64"
|
||||||
;
|
;
|
||||||
|
|
||||||
# The config.guess in GMP tries to runtime-detect various
|
|
||||||
# ARM optimization flags via /proc/cpuinfo (and is also
|
|
||||||
# broken on multicore CPUs). Avoid this impurity.
|
|
||||||
preConfigure = optionalString stdenv.isAarch32 ''
|
|
||||||
configureFlagsArray+=("--build=$(./configfsf.guess)")
|
|
||||||
'';
|
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
dontDisableStatic = withStatic;
|
dontDisableStatic = withStatic;
|
||||||
|
|||||||
@ -30,18 +30,15 @@ let self = stdenv.mkDerivation rec {
|
|||||||
#
|
#
|
||||||
# no darwin because gmp uses ASM that clang doesn't like
|
# no darwin because gmp uses ASM that clang doesn't like
|
||||||
(stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
|
(stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat")
|
||||||
|
# The config.guess in GMP tries to runtime-detect various
|
||||||
|
# ARM optimization flags via /proc/cpuinfo (and is also
|
||||||
|
# broken on multicore CPUs). Avoid this impurity.
|
||||||
|
"--build=${stdenv.buildPlatform.config}"
|
||||||
] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
|
] ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
|
||||||
++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64"
|
++ optional (stdenv.isDarwin && stdenv.is64bit) "ABI=64"
|
||||||
++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly"
|
++ optional (with stdenv.hostPlatform; useAndroidPrebuilt || useiOSPrebuilt) "--disable-assembly"
|
||||||
;
|
;
|
||||||
|
|
||||||
# The config.guess in GMP tries to runtime-detect various
|
|
||||||
# ARM optimization flags via /proc/cpuinfo (and is also
|
|
||||||
# broken on multicore CPUs). Avoid this impurity.
|
|
||||||
preConfigure = optionalString stdenv.isAarch32 ''
|
|
||||||
configureFlagsArray+=("--build=$(./configfsf.guess)")
|
|
||||||
'';
|
|
||||||
|
|
||||||
doCheck = true; # not cross;
|
doCheck = true; # not cross;
|
||||||
|
|
||||||
dontDisableStatic = withStatic;
|
dontDisableStatic = withStatic;
|
||||||
|
|||||||
@ -13,14 +13,14 @@ assert cupsSupport -> cups != null;
|
|||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "3.24.2";
|
version = "3.24.3";
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gtk+3-${version}";
|
name = "gtk+3-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
|
url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
|
||||||
sha256 = "14l8mimdm44r3h5pn5hzigl1z25jna8jxvb16l88v4nc4zj0afsv";
|
sha256 = "1g839289bxakq4nn3m3ihi1rl6ym563pa5cxlswiyjwn9m9zl22p";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
@ -35,16 +35,6 @@ stdenv.mkDerivation rec {
|
|||||||
url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
|
url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
|
||||||
sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
|
sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
|
||||||
})
|
})
|
||||||
# 3.24.2: https://gitlab.gnome.org/GNOME/gtk/issues/1521
|
|
||||||
(fetchpatch {
|
|
||||||
url = https://gitlab.gnome.org/GNOME/gtk/commit/2905fc861acda3d134a198e56ef2f6c962ad3061.patch;
|
|
||||||
sha256 = "0y8ljny59kgdhrcfpimi2r082bax60d5kflw1qj9k1mnzjcvjjwl";
|
|
||||||
})
|
|
||||||
# 3.24.2: https://gitlab.gnome.org/GNOME/gtk/issues/1523
|
|
||||||
(fetchpatch {
|
|
||||||
url = https://gitlab.gnome.org/GNOME/gtk/commit/e3a1593a0984cc0156ec1892a46af8f256a64878.patch;
|
|
||||||
sha256 = "0akvp1r8xlzf5amk9gmk7b5sabr1wbmg3ak15rppsid7nf9f5dqf";
|
|
||||||
})
|
|
||||||
] ++ optionals stdenv.isDarwin [
|
] ++ optionals stdenv.isDarwin [
|
||||||
# X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
|
# X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
|
||||||
# let’s drop that dependency in similar way to how other parts of the library do it
|
# let’s drop that dependency in similar way to how other parts of the library do it
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pruneLibtoolFiles, libde265, x265, libpng, libjpeg }:
|
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.3.2";
|
version = "1.3.2";
|
||||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w";
|
sha256 = "0hk8mzig2kp5f94j4jwqxzjrm7ffk16ffvxl92rf0afsh6vgnz7w";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook pkgconfig pruneLibtoolFiles ];
|
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||||
buildInputs = [ libde265 x265 libpng libjpeg ];
|
buildInputs = [ libde265 x265 libpng libjpeg ];
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|||||||
@ -27,11 +27,11 @@ in
|
|||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libinput-${version}";
|
name = "libinput-${version}";
|
||||||
version = "1.12.4";
|
version = "1.12.5";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
|
url = "https://www.freedesktop.org/software/libinput/${name}.tar.xz";
|
||||||
sha256 = "1riircgrj002w1sd1053aq9098s6ys99gya0k0crhb9f3ij2kwx4";
|
sha256 = "08vid3q1la3qiv9d5xcgxznjahzs8w01fhabvxlvzwqf04qnhjvx";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "bin" "out" "dev" ];
|
outputs = [ "bin" "out" "dev" ];
|
||||||
|
|||||||
@ -13,11 +13,17 @@ stdenv.mkDerivation rec {
|
|||||||
stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
|
stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt")
|
||||||
./mingw-boolean.patch
|
./mingw-boolean.patch
|
||||||
++ [
|
++ [
|
||||||
|
./djpeg-rgb-islow-icc-cmp.patch # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/321
|
||||||
(fetchpatch {
|
(fetchpatch {
|
||||||
name = "cve-2018-19664.diff";
|
name = "cve-2018-19664.diff";
|
||||||
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff";
|
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff";
|
||||||
sha256 = "1kgfag62qmphlrq0mz15g17zw7zrg9nzaz7d2vg50m6m7m5aw4y5";
|
sha256 = "1kgfag62qmphlrq0mz15g17zw7zrg9nzaz7d2vg50m6m7m5aw4y5";
|
||||||
})
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
name = "CVE-2018-20330.patch";
|
||||||
|
url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3d9c64e9f8aa1ee954d1d0bb3390fc894bb84da3.diff";
|
||||||
|
sha256 = "1jai8izw6xl05ihx24rpc96d1jcr9rp421cb02pbz3v53cxdasji";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
outputs = [ "bin" "dev" "out" "man" "doc" ];
|
outputs = [ "bin" "dev" "out" "man" "doc" ];
|
||||||
|
|||||||
@ -0,0 +1,11 @@
|
|||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -999,6 +999,8 @@ foreach(libtype ${TEST_LIBTYPES})
|
||||||
|
|
||||||
|
add_test(djpeg-${libtype}-rgb-islow-icc-cmp
|
||||||
|
${MD5CMP} b06a39d730129122e85c1363ed1bbc9e testout_rgb_islow.icc)
|
||||||
|
+ set_tests_properties(djpeg-${libtype}-rgb-islow-icc-cmp PROPERTIES
|
||||||
|
+ DEPENDS djpeg-${libtype}-rgb-islow)
|
||||||
|
|
||||||
|
add_bittest(jpegtran icc "-copy;all;-icc;${TESTIMAGES}/test2.icc"
|
||||||
|
testout_rgb_islow2.jpg testout_rgb_islow.jpg ${MD5_JPEG_RGB_ISLOW2})
|
||||||
@ -1,23 +1,16 @@
|
|||||||
{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }:
|
{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.23.2";
|
version = "1.24.1";
|
||||||
name = "libuv-${version}";
|
name = "libuv-${version}";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "libuv";
|
owner = "libuv";
|
||||||
repo = "libuv";
|
repo = "libuv";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1xfggj0mbbshj7zyccnfw7wyk42qfg4ng3l4aslw014mg8gaskv7";
|
sha256 = "0lpq8anmy69pcmkhk8giyp78q8dadcy2562g4krqaq8a5xy825ab";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d.patch";
|
|
||||||
sha256 = "1s2692h4dvqnzwwicrkpj0zph1i2bhv39w31z5vh7ssgvykaradj";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = let
|
postPatch = let
|
||||||
toDisable = [
|
toDisable = [
|
||||||
"getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent
|
"getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent
|
||||||
@ -52,6 +45,7 @@ stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
|
nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
|
||||||
|
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
LIBTOOLIZE=libtoolize ./autogen.sh
|
LIBTOOLIZE=libtoolize ./autogen.sh
|
||||||
|
|||||||
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
|
|||||||
configureFlags = stdenv.lib.optional stdenv.isLinux
|
configureFlags = stdenv.lib.optional stdenv.isLinux
|
||||||
"--with-module-dir=${libGL_driver.driverLink}/lib/vdpau";
|
"--with-module-dir=${libGL_driver.driverLink}/lib/vdpau";
|
||||||
|
|
||||||
|
NIX_LDFLAGS = if stdenv.isDarwin then "-lX11" else null;
|
||||||
|
|
||||||
installFlags = [ "moduledir=$(out)/lib/vdpau" ];
|
installFlags = [ "moduledir=$(out)/lib/vdpau" ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|||||||
@ -18,6 +18,19 @@ index 005db4248..685c5b1b2 100644
|
|||||||
// env import paths
|
// env import paths
|
||||||
if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {
|
if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {
|
||||||
const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH");
|
const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH");
|
||||||
|
diff --git a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake
|
||||||
|
index 56cb3fb55..74509d601 100644
|
||||||
|
--- a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake
|
||||||
|
+++ b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake
|
||||||
|
@@ -17,7 +17,7 @@ function(QTQUICK_COMPILER_ADD_RESOURCES outfiles)
|
||||||
|
|
||||||
|
find_package(Qt5 COMPONENTS Qml Core)
|
||||||
|
|
||||||
|
- set(compiler_path "${_qt5Core_install_prefix}/bin/qmlcachegen")
|
||||||
|
+ set(compiler_path "qmlcachegen")
|
||||||
|
|
||||||
|
get_target_property(rcc_path ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION)
|
||||||
|
|
||||||
diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf
|
diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf
|
||||||
index 537eaf62e..e21de58f6 100644
|
index 537eaf62e..e21de58f6 100644
|
||||||
--- a/tools/qmlcachegen/qmlcache.prf
|
--- a/tools/qmlcachegen/qmlcache.prf
|
||||||
|
|||||||
@ -3,8 +3,8 @@
|
|||||||
# pointer width, but some expect to use 32-bit integers always
|
# pointer width, but some expect to use 32-bit integers always
|
||||||
# (for compatibility with reference BLAS).
|
# (for compatibility with reference BLAS).
|
||||||
, blas64 ? null
|
, blas64 ? null
|
||||||
|
, buildPackages
|
||||||
# Select a specifc optimization target (other than the default)
|
# Select a specific optimization target (other than the default)
|
||||||
# See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
|
# See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
|
||||||
, target ? null
|
, target ? null
|
||||||
}:
|
}:
|
||||||
@ -19,54 +19,46 @@ let
|
|||||||
# To add support for a new platform, add an element to this set.
|
# To add support for a new platform, add an element to this set.
|
||||||
configs = {
|
configs = {
|
||||||
armv6l-linux = {
|
armv6l-linux = {
|
||||||
BINARY = "32";
|
BINARY = 32;
|
||||||
TARGET = setTarget "ARMV6";
|
TARGET = setTarget "ARMV6";
|
||||||
DYNAMIC_ARCH = "0";
|
DYNAMIC_ARCH = false;
|
||||||
CC = "gcc";
|
USE_OPENMP = true;
|
||||||
USE_OPENMP = "1";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
armv7l-linux = {
|
armv7l-linux = {
|
||||||
BINARY = "32";
|
BINARY = 32;
|
||||||
TARGET = setTarget "ARMV7";
|
TARGET = setTarget "ARMV7";
|
||||||
DYNAMIC_ARCH = "0";
|
DYNAMIC_ARCH = false;
|
||||||
CC = "gcc";
|
USE_OPENMP = true;
|
||||||
USE_OPENMP = "1";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
aarch64-linux = {
|
aarch64-linux = {
|
||||||
BINARY = "64";
|
BINARY = 64;
|
||||||
TARGET = setTarget "ARMV8";
|
TARGET = setTarget "ARMV8";
|
||||||
DYNAMIC_ARCH = "1";
|
DYNAMIC_ARCH = true;
|
||||||
CC = "gcc";
|
USE_OPENMP = true;
|
||||||
USE_OPENMP = "1";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
i686-linux = {
|
i686-linux = {
|
||||||
BINARY = "32";
|
BINARY = 32;
|
||||||
TARGET = setTarget "P2";
|
TARGET = setTarget "P2";
|
||||||
DYNAMIC_ARCH = "1";
|
DYNAMIC_ARCH = true;
|
||||||
CC = "gcc";
|
USE_OPENMP = true;
|
||||||
USE_OPENMP = "1";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
x86_64-darwin = {
|
x86_64-darwin = {
|
||||||
BINARY = "64";
|
BINARY = 64;
|
||||||
TARGET = setTarget "ATHLON";
|
TARGET = setTarget "ATHLON";
|
||||||
DYNAMIC_ARCH = "1";
|
DYNAMIC_ARCH = true;
|
||||||
# Note that clang is available through the stdenv on OSX and
|
USE_OPENMP = false;
|
||||||
# thus is not an explicit dependency.
|
|
||||||
CC = "clang";
|
|
||||||
USE_OPENMP = "0";
|
|
||||||
MACOSX_DEPLOYMENT_TARGET = "10.7";
|
MACOSX_DEPLOYMENT_TARGET = "10.7";
|
||||||
};
|
};
|
||||||
|
|
||||||
x86_64-linux = {
|
x86_64-linux = {
|
||||||
BINARY = "64";
|
BINARY = 64;
|
||||||
TARGET = setTarget "ATHLON";
|
TARGET = setTarget "ATHLON";
|
||||||
DYNAMIC_ARCH = "1";
|
DYNAMIC_ARCH = true;
|
||||||
CC = "gcc";
|
USE_OPENMP = true;
|
||||||
USE_OPENMP = "1";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
@ -85,25 +77,16 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "openblas-${version}";
|
name = "openblas-${version}";
|
||||||
version = "0.3.4";
|
version = "0.3.5";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "xianyi";
|
owner = "xianyi";
|
||||||
repo = "OpenBLAS";
|
repo = "OpenBLAS";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1jdq4msfyg13pdmwwfqpixf4fshss68qzls820lmn0i6y7h4aix3";
|
sha256 = "0hwfplr6ciqjvfqkya5vz92z2rx8bhdg5mkh923z246ylhs6d94k";
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit blas64;
|
inherit blas64;
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fixes build on x86_64-darwin. See:
|
|
||||||
# https://github.com/xianyi/OpenBLAS/issues/1926
|
|
||||||
(fetchpatch {
|
|
||||||
url = https://github.com/xianyi/OpenBLAS/commit/701ea88347461e4c5d896765438dc870281b3834.patch;
|
|
||||||
sha256 = "18rcfgkjsijl9d2510jn961wqvz7zdlz2fgy1yjmax29kvv8fqd9";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
# Some hardening features are disabled due to sporadic failures in
|
# Some hardening features are disabled due to sporadic failures in
|
||||||
# OpenBLAS-based programs. The problem may not be with OpenBLAS itself, but
|
# OpenBLAS-based programs. The problem may not be with OpenBLAS itself, but
|
||||||
# with how these flags interact with hardening measures used downstream.
|
# with how these flags interact with hardening measures used downstream.
|
||||||
@ -119,19 +102,26 @@ stdenv.mkDerivation rec {
|
|||||||
"relro" "bindnow"
|
"relro" "bindnow"
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs =
|
nativeBuildInputs = [
|
||||||
[gfortran perl which]
|
perl
|
||||||
++ optionals stdenv.isDarwin [coreutils];
|
which
|
||||||
|
buildPackages.gfortran
|
||||||
|
buildPackages.stdenv.cc
|
||||||
|
] ++ optionals stdenv.isDarwin [
|
||||||
|
coreutils
|
||||||
|
];
|
||||||
|
|
||||||
makeFlags =
|
makeFlags = mapAttrsToList (var: val: "${var}=${toString val}") (config // {
|
||||||
[
|
FC = "${stdenv.cc.targetPrefix}gfortran";
|
||||||
"FC=gfortran"
|
CC = "${stdenv.cc.targetPrefix}cc";
|
||||||
''PREFIX="''$(out)"''
|
PREFIX = placeholder "out";
|
||||||
"NUM_THREADS=64"
|
NUM_THREADS = 64;
|
||||||
"INTERFACE64=${if blas64 then "1" else "0"}"
|
INTERFACE64 = blas64;
|
||||||
"NO_STATIC=1"
|
NO_STATIC = true;
|
||||||
] ++ stdenv.lib.optional (stdenv.hostPlatform.libc == "musl") "NO_AFFINITY=1"
|
CROSS = stdenv.hostPlatform != stdenv.buildPlatform;
|
||||||
++ mapAttrsToList (var: val: var + "=" + val) config;
|
HOSTCC = "${buildPackages.stdenv.cc.targetPrefix}cc";
|
||||||
|
NO_BINARY_MODE = stdenv.hostPlatform != stdenv.buildPlatform;
|
||||||
|
});
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
checkTarget = "tests";
|
checkTarget = "tests";
|
||||||
|
|||||||
@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
NIX_LDFLAGS = [ "-lsqlite3" ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A complete sqlite3-compatible CLI front-end for libspatialite";
|
description = "A complete sqlite3-compatible CLI front-end for libspatialite";
|
||||||
homepage = https://www.gaia-gis.it/fossil/spatialite-tools;
|
homepage = https://www.gaia-gis.it/fossil/spatialite-tools;
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, flex
|
{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, flex
|
||||||
, pkgconfig, which, gettext, gobject-introspection, pruneLibtoolFiles
|
, pkgconfig, which, gettext, gobject-introspection
|
||||||
, gtk2, gtk3, wayland, libwebp, enchant, sqlite
|
, gtk2, gtk3, wayland, libwebp, enchant, sqlite
|
||||||
, libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg
|
, libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg
|
||||||
, gst-plugins-base, libobjc
|
, gst-plugins-base, libobjc
|
||||||
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
perl python ruby bison gperf flex
|
perl python ruby bison gperf flex
|
||||||
pkgconfig which gettext gobject-introspection pruneLibtoolFiles
|
pkgconfig which gettext gobject-introspection
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|||||||
@ -26,11 +26,11 @@ let
|
|||||||
|
|
||||||
in buildPythonPackage rec {
|
in buildPythonPackage rec {
|
||||||
pname = "Cython";
|
pname = "Cython";
|
||||||
version = "0.29.1";
|
version = "0.29.2";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "15zv9c4ami9hzya28wz1shqljbbk5sxdvqbjxqnf15ssk137daqq";
|
sha256 = "2ac187ff998a95abb7fae452b5178f91e1a713698c9ced89836c94e6b1d3f41e";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@ -50,7 +50,12 @@ in buildPythonPackage rec {
|
|||||||
''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''}
|
''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doCheck = !stdenv.isDarwin;
|
# https://github.com/cython/cython/issues/2785
|
||||||
|
# Temporary solution
|
||||||
|
doCheck = false;
|
||||||
|
|
||||||
|
# doCheck = !stdenv.isDarwin;
|
||||||
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "An optimising static compiler for both the Python programming language and the extended Cython programming language";
|
description = "An optimising static compiler for both the Python programming language and the extended Cython programming language";
|
||||||
|
|||||||
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "Logbook";
|
pname = "Logbook";
|
||||||
version = "1.4.1";
|
version = "1.4.3";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "1nsnz9qdcba85q57qbam6skfvq2k7savn64qdy44cjnh0vkmqdrj";
|
sha256 = "a5a96792abd8172c80d61b7530e134524f20e2841981038031e602ed5920fef5";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ];
|
checkInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ];
|
||||||
|
|||||||
@ -45,13 +45,13 @@ let
|
|||||||
|
|
||||||
in buildPythonPackage rec {
|
in buildPythonPackage rec {
|
||||||
pname = "Theano";
|
pname = "Theano";
|
||||||
version = "1.0.3";
|
version = "1.0.4";
|
||||||
|
|
||||||
disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3");
|
disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3");
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "637f3b34d40ef5e0d54dd4c40618475aaa085c26d2491e925c98e2ad4bc2115a";
|
sha256 = "35c9bbef56b61ffa299265a42a4e8f8cb5a07b2997dabaef0f8830b397086913";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|||||||
@ -5,11 +5,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "alembic";
|
pname = "alembic";
|
||||||
version = "1.0.3";
|
version = "1.0.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "4b6ff7433247fe80b6ef522ef3763acb959cbdef027d03f76f4cd3c7118c1872";
|
sha256 = "35660f7e6159288e2be111126be148ef04cbf7306da73c8b8bd4400837bb08e3";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pytest pytestcov mock coverage ];
|
buildInputs = [ pytest pytestcov mock coverage ];
|
||||||
|
|||||||
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "allpairspy";
|
pname = "allpairspy";
|
||||||
version = "2.4.1";
|
version = "2.4.3";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "e8b35751f91692bf0318091b3f44cdf9bbbe3f37a2ff4786eaffc09dc7114fb3";
|
sha256 = "8ce160db245375a5ccf0831be77cd98394f514c1b3501ddff5f8edb780ee1748";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ six ];
|
propagatedBuildInputs = [ six ];
|
||||||
|
|||||||
@ -9,11 +9,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "awkward";
|
pname = "awkward";
|
||||||
version = "0.5.2";
|
version = "0.5.6";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "bc824882f80ae07d442a011eb6d14a6fce581e022d4ff6c73d89d93c832ee3cc";
|
sha256 = "c6b84d2356c8b1af955054bbef088c61bf87f68e062e866fa8d9ea5cb871389f";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pytestrunner h5py ];
|
buildInputs = [ pytestrunner h5py ];
|
||||||
|
|||||||
@ -7,14 +7,14 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
version = "1.1.16";
|
version = "1.1.17";
|
||||||
pname = "azure-common";
|
pname = "azure-common";
|
||||||
disabled = isPyPy;
|
disabled = isPyPy;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
extension = "zip";
|
extension = "zip";
|
||||||
sha256 = "2606ae77ff81c0036965b92ec2efe03eaec02a66714140ca0f7aa401b8b9bbb0";
|
sha256 = "e7cd5a8ee2ec0639454c1bd0f1ea5f609d83977376abfd304527ec7343fef1be";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ azure-nspkg ];
|
propagatedBuildInputs = [ azure-nspkg ];
|
||||||
|
|||||||
@ -6,13 +6,13 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
version = "0.20.0";
|
version = "0.20.1";
|
||||||
pname = "azure-mgmt-compute";
|
pname = "azure-mgmt-compute";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
extension = "zip";
|
extension = "zip";
|
||||||
sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v";
|
sha256 = "97298fc7f133f1d50a974ed6299151eda494a574b0f7fdf8192a388015c2215a";
|
||||||
};
|
};
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bayespy";
|
pname = "bayespy";
|
||||||
version = "0.5.17";
|
version = "0.5.18";
|
||||||
|
|
||||||
# Python 2 not supported and not some old Python 3 because MPL doesn't support
|
# Python 2 not supported and not some old Python 3 because MPL doesn't support
|
||||||
# them properly.
|
# them properly.
|
||||||
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
|||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "2e04cd9873eea6891ea8dfd5fc6d718727ea7cc416bc2ced50e00a741386925f";
|
sha256 = "86c453d827b8d6c3574ec306f6fadfc5028614e1cd46676841336e6787a7496a";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytest glibcLocales ];
|
checkInputs = [ pytest glibcLocales ];
|
||||||
|
|||||||
@ -4,12 +4,12 @@
|
|||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
version = "3.1.4";
|
version = "3.1.6";
|
||||||
pname = "bcrypt";
|
pname = "bcrypt";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d";
|
sha256 = "44636759d222baa62806bbceb20e96f75a015a6381690d1bc2eda91c01ec02ea";
|
||||||
};
|
};
|
||||||
buildInputs = [ pycparser mock pytest py ];
|
buildInputs = [ pycparser mock pytest py ];
|
||||||
propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi;
|
propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi;
|
||||||
|
|||||||
@ -9,7 +9,7 @@ buildPythonPackage rec {
|
|||||||
sha256 = "90f8e61121d6ae58362ce3bed8cd997efb00c914eae0ff3d363c32f9a9822d10";
|
sha256 = "90f8e61121d6ae58362ce3bed8cd997efb00c914eae0ff3d363c32f9a9822d10";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ nose ];
|
checkInputs = [ nose ];
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
nosetests build
|
nosetests build
|
||||||
'';
|
'';
|
||||||
|
|||||||
@ -1,24 +1,24 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, buildPythonPackage, fetchFromGitHub
|
, buildPythonPackage, fetchFromGitHub
|
||||||
, future, pyparsing
|
, future, pyparsing
|
||||||
, glibcLocales, nose
|
, glibcLocales, nose, unittest2
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bibtexparser";
|
pname = "bibtexparser";
|
||||||
version = "1.0.1";
|
version = "1.1.0";
|
||||||
|
|
||||||
# PyPI tarball does not ship tests
|
# PyPI tarball does not ship tests
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "sciunto-org";
|
owner = "sciunto-org";
|
||||||
repo = "python-${pname}";
|
repo = "python-${pname}";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0lmlarkfbq2hp1wa04a62245jr2mqizqsdlgilj5aq6vy92gr6ai";
|
sha256 = "1yj3hqnmkjh0sjjhmlm4097mmz98kna8rn0dd9g8zaw9g1a35h8c";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ future pyparsing ];
|
propagatedBuildInputs = [ future pyparsing ];
|
||||||
|
|
||||||
checkInputs = [ nose glibcLocales ];
|
checkInputs = [ nose unittest2 glibcLocales ];
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
LC_ALL="en_US.UTF-8" nosetests
|
LC_ALL="en_US.UTF-8" nosetests
|
||||||
|
|||||||
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "block-io";
|
pname = "block-io";
|
||||||
version = "1.1.8";
|
version = "1.1.9";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "15468pvpcp41ly7kjpmikpyi4av57d9zhf5j1v01j78r1xqqk56g";
|
sha256 = "4909d58b32ab7f93d3cd83fa4bbe4edef42ab7566f016bdb6a405a0d8b1907c9";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|||||||
@ -33,11 +33,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bokeh";
|
pname = "bokeh";
|
||||||
version = "1.0.3";
|
version = "1.0.4";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "1s0gi4n8bn0ain3k6jz6xzbbpn1jpb7rkadmsri8dkcpwyfhacvs";
|
sha256 = "ceeb6a75afc1b2de00c2b8b6da121dec3fb77031326897b80d4375a70e96aebf";
|
||||||
};
|
};
|
||||||
|
|
||||||
disabled = isPyPy;
|
disabled = isPyPy;
|
||||||
|
|||||||
@ -9,9 +9,9 @@ let
|
|||||||
};
|
};
|
||||||
setuptools_source = fetchPypi {
|
setuptools_source = fetchPypi {
|
||||||
pname = "setuptools";
|
pname = "setuptools";
|
||||||
version = "40.6.2";
|
version = "40.6.3";
|
||||||
format = "wheel";
|
format = "wheel";
|
||||||
sha256 = "88ee6bcd5decec9bd902252e02e641851d785c6e5e75677d2744a9d13fed0b0a";
|
sha256 = "e2c1ce9a832f34cf7a31ed010aabcab5008eb65ce8f2aadc04622232c14bdd0b";
|
||||||
};
|
};
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
|
|||||||
@ -13,11 +13,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "boto3";
|
pname = "boto3";
|
||||||
version = "1.9.75"; # N.B: if you change this, change botocore too
|
version = "1.9.80"; # N.B: if you change this, change botocore too
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "0l4ifnp7mnf8n7dpf5jf5gwcxccb4qrijqyf3izbz2pdlrv1pw73";
|
sha256 = "99ec19dc4f0aa8a8354db7baebe1ff57bd18aeb6a539b28693b2e8ca8dc3d85b";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
|
propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
|
||||||
|
|||||||
@ -12,11 +12,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "botocore";
|
pname = "botocore";
|
||||||
version = "1.12.79"; # N.B: if you change this, change boto3 and awscli to a matching version
|
version = "1.12.80"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "16ikl3lv9q4i8bwzvm11a5q3bds42p36i4ap01fm3r9w1kzxb1wd";
|
sha256 = "76a2969278250e010253ddf514f4b54eaa7d2b1430f682874c3c2ab92f25a96d";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|||||||
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "bottle";
|
pname = "bottle";
|
||||||
version = "0.12.13";
|
version = "0.12.16";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "39b751aee0b167be8dffb63ca81b735bbf1dd0905b3bc42761efedee8f123355";
|
sha256 = "9c310da61e7df2b6ac257d8a90811899ccb3a9743e77e947101072a2e3186726";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ setuptools ];
|
propagatedBuildInputs = [ setuptools ];
|
||||||
|
|||||||
@ -4,13 +4,13 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "carbon";
|
pname = "carbon";
|
||||||
version = "1.1.4";
|
version = "1.1.5";
|
||||||
|
|
||||||
disabled = isPy3k;
|
disabled = isPy3k;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "1b70e34ac0f0bd32a03ee14eaf1ed2c857e208984fc9761f59a95c21c5264513";
|
sha256 = "a88390553a9ea628fdb74b5b358ed83a657e058bcc811e5819d9db856b4fcf5b";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ twisted whisper txamqp cachetools urllib3 ];
|
propagatedBuildInputs = [ twisted whisper txamqp cachetools urllib3 ];
|
||||||
|
|||||||
@ -1,19 +1,8 @@
|
|||||||
{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, iana-etc, libredirect,
|
{ stdenv, buildPythonPackage, fetchPypi, isPy37, fetchpatch, iana-etc, libredirect,
|
||||||
pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet
|
pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
buildPythonPackage rec {
|
||||||
|
|
||||||
# Needed for celery
|
|
||||||
pytest_32 = pytest.overridePythonAttrs( oldAttrs: rec {
|
|
||||||
version = "3.2.5";
|
|
||||||
src = oldAttrs.src.override {
|
|
||||||
inherit version;
|
|
||||||
sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
in buildPythonPackage rec {
|
|
||||||
pname = "celery";
|
pname = "celery";
|
||||||
version = "4.2.1";
|
version = "4.2.1";
|
||||||
|
|
||||||
@ -22,12 +11,28 @@ in buildPythonPackage rec {
|
|||||||
sha256 = "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp";
|
sha256 = "0y66rz7z8dfcgs3s0qxmdddlaq57bzbgxgfz896nbp14grkv9nkp";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Skip test_RedisBackend.test_timeouts_in_url_coerced
|
# See https://github.com/celery/celery/issues/4500
|
||||||
# See https://github.com/celery/celery/pull/4847
|
# TODO: Remove once upgraded to 4.3
|
||||||
patches = fetchpatch {
|
disabled = isPy37;
|
||||||
url = https://github.com/celery/celery/commit/b2668607c909c61becd151905b4525190c19ff4a.patch;
|
|
||||||
sha256 = "11w0z2ycyh8kccj4y69zb7bxppiipcwwigg6jn1q9yrcsvz170jq";
|
patches = [
|
||||||
};
|
# Skip test_RedisBackend.test_timeouts_in_url_coerced
|
||||||
|
# See https://github.com/celery/celery/pull/4847
|
||||||
|
(fetchpatch {
|
||||||
|
url = https://github.com/celery/celery/commit/b2668607c909c61becd151905b4525190c19ff4a.patch;
|
||||||
|
sha256 = "11w0z2ycyh8kccj4y69zb7bxppiipcwwigg6jn1q9yrcsvz170jq";
|
||||||
|
})
|
||||||
|
# Allow usage of a newer pytest version
|
||||||
|
# See https://github.com/celery/celery/pull/4912
|
||||||
|
(fetchpatch {
|
||||||
|
url = https://github.com/celery/celery/commit/16f56fe6f84cac9f92affac3ad06a1f168a19798.patch;
|
||||||
|
sha256 = "0vz68rl32m34k51nhs898jcfdbj5m7cszzxx0w0j3j1fhn1wq594";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace requirements/test.txt --replace ",<3.9" ""
|
||||||
|
'';
|
||||||
|
|
||||||
# make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
|
# make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox
|
||||||
preCheck = stdenv.lib.optionalString stdenv.isLinux ''
|
preCheck = stdenv.lib.optionalString stdenv.isLinux ''
|
||||||
@ -38,7 +43,7 @@ in buildPythonPackage rec {
|
|||||||
unset NIX_REDIRECTS LD_PRELOAD
|
unset NIX_REDIRECTS LD_PRELOAD
|
||||||
'';
|
'';
|
||||||
|
|
||||||
checkInputs = [ pytest_32 case ];
|
checkInputs = [ pytest case ];
|
||||||
propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ];
|
propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
|||||||
@ -12,7 +12,7 @@ if isPyPy then null else buildPythonPackage rec {
|
|||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
propagatedBuildInputs = [ libffi pycparser ];
|
propagatedBuildInputs = [ libffi pycparser ];
|
||||||
buildInputs = [ pytest ];
|
checkInputs = [ pytest ];
|
||||||
|
|
||||||
# On Darwin, the cffi tests want to hit libm a lot, and look for it in a global
|
# On Darwin, the cffi tests want to hit libm a lot, and look for it in a global
|
||||||
# impure search path. It's obnoxious how much repetition there is, and how difficult
|
# impure search path. It's obnoxious how much repetition there is, and how difficult
|
||||||
|
|||||||
@ -20,11 +20,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "chalice";
|
pname = "chalice";
|
||||||
version = "1.6.1";
|
version = "1.6.2";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "783ba3c603b944ba32f0ee39f272dc192f2097cfc520692f4dcb718bebdf940e";
|
sha256 = "96c22f95ccc91ed3e79cc4a9a88bf27f95a13a2caf5a55137ab081d371258f0f";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ watchdog pytest hypothesis mock ];
|
checkInputs = [ watchdog pytest hypothesis mock ];
|
||||||
@ -46,7 +46,7 @@ buildPythonPackage rec {
|
|||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace setup.py \
|
substituteInPlace setup.py \
|
||||||
--replace 'pip>=9,<=18' 'pip' \
|
--replace 'pip>=9,<=18.1' 'pip' \
|
||||||
--replace 'typing==3.6.4' 'typing' \
|
--replace 'typing==3.6.4' 'typing' \
|
||||||
--replace 'attrs==17.4.0' 'attrs' \
|
--replace 'attrs==17.4.0' 'attrs' \
|
||||||
--replace 'click>=6.6,<7.0' 'click'
|
--replace 'click>=6.6,<7.0' 'click'
|
||||||
|
|||||||
@ -6,11 +6,11 @@
|
|||||||
}:
|
}:
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "cmd2";
|
pname = "cmd2";
|
||||||
version = "0.9.6";
|
version = "0.9.7";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "0279p76n6yny6psys9fc6yjdrqiisbpmrl59a2vxy56hi7094kaw";
|
sha256 = "b04a3421be2ae35e7e8347e29c2f3960eed38d0163e312845147d5d828a09379";
|
||||||
};
|
};
|
||||||
|
|
||||||
LC_ALL="en_US.UTF-8";
|
LC_ALL="en_US.UTF-8";
|
||||||
|
|||||||
@ -9,11 +9,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "cornice";
|
pname = "cornice";
|
||||||
version = "3.4.2";
|
version = "3.4.4";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "c88f246aa6a84a0cdbaa8231a062c60e18ad9c0a65dc178f536ce5eb3a831418";
|
sha256 = "1355f998ac6af53bda985e13ed0695cd206b0a3f14657b83979b31bbc72f1acb";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ pyramid simplejson six venusian ];
|
propagatedBuildInputs = [ pyramid simplejson six venusian ];
|
||||||
|
|||||||
@ -23,11 +23,11 @@
|
|||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
# also bump cryptography_vectors
|
# also bump cryptography_vectors
|
||||||
pname = "cryptography";
|
pname = "cryptography";
|
||||||
version = "2.3.1";
|
version = "2.4.2";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6";
|
sha256 = "1pc60dksi9w9mshl6cvn7gdjazbp3pmydy3qp9wgy5wzd8n0b9h5";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" ];
|
outputs = [ "out" "dev" ];
|
||||||
|
|||||||
@ -3,11 +3,11 @@
|
|||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
# also bump cryptography
|
# also bump cryptography
|
||||||
pname = "cryptography_vectors";
|
pname = "cryptography_vectors";
|
||||||
version = "2.3.1";
|
version = "2.4.2";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46";
|
sha256 = "013qx2hz0jv79yzfzpn0r2kk33i5qy3sdnzgwiv5779d18snblwi";
|
||||||
};
|
};
|
||||||
|
|
||||||
# No tests included
|
# No tests included
|
||||||
|
|||||||
@ -3,11 +3,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "python-debian";
|
pname = "python-debian";
|
||||||
version = "0.1.33";
|
version = "0.1.34";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "06e91d45019fe5f2e111ba827ea77730d6ce2fea698ada4e5b0b70b5fdbc18c5";
|
sha256 = "a02e073214e9f3a371f7ec0ff8b34dd82bd4941194dd69c49ad80b321b9d887e";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ chardet six ];
|
propagatedBuildInputs = [ chardet six ];
|
||||||
|
|||||||
@ -9,11 +9,11 @@ in
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "dependency-injector";
|
pname = "dependency-injector";
|
||||||
version = "3.14.3";
|
version = "3.14.4";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "07366palyav9bawyq2b1gi76iamjkq6r5akzzbqv8s930sxq6yim";
|
sha256 = "ecac135cc4e5824b6bf8242679fc7225f44885877677701da6de7703f060f518";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ six ];
|
propagatedBuildInputs = [ six ];
|
||||||
|
|||||||
@ -4,7 +4,7 @@ buildPythonPackage rec {
|
|||||||
pname = "distro";
|
pname = "distro";
|
||||||
version = "1.3.0";
|
version = "1.3.0";
|
||||||
|
|
||||||
buildInputs = [ pytest pytestcov tox];
|
checkInputs = [ pytest pytestcov tox];
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
touch tox.ini
|
touch tox.ini
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
{ stdenv, buildPythonPackage, fetchPypi, django }:
|
{ stdenv, buildPythonPackage, fetchPypi, django }:
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
version = "3.9.0";
|
version = "3.9.1";
|
||||||
pname = "djangorestframework";
|
pname = "djangorestframework";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "0dk1r2qiifws4bb2pq8xk5dbsrhli0fi14iqg59v360mpfq6ay30";
|
sha256 = "79c6efbb2514bc50cf25906d7c0a5cfead714c7af667ff4bd110312cd380ae66";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Test settings are missing
|
# Test settings are missing
|
||||||
|
|||||||
@ -7,11 +7,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "docrep";
|
pname = "docrep";
|
||||||
version = "0.2.4";
|
version = "0.2.5";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "ec7598fc2497a50f2c6882803d78e3c3cc4f1a554645d2c43c58d53653a1be01";
|
sha256 = "a67c34d3a44892d3e2a0af0ac55c02b949a37ced9d55c0d7ade76362ba6692d7";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytest ];
|
checkInputs = [ pytest ];
|
||||||
|
|||||||
@ -4,11 +4,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "dogpile.cache";
|
pname = "dogpile.cache";
|
||||||
version = "0.6.7";
|
version = "0.6.8";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "fca7deb7c276b879b01c15c5d39b3c05701dc43b263ec3fef1e52cb851cf88ab";
|
sha256 = "e2fbe5d95e6df3fcfff2b666c69f3c06a4a3f77296142ae2bca523a176f88fa0";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Disable concurrency tests that often fail,
|
# Disable concurrency tests that often fail,
|
||||||
|
|||||||
@ -4,12 +4,12 @@
|
|||||||
, git, glibcLocales }:
|
, git, glibcLocales }:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
version = "0.19.9";
|
version = "0.19.10";
|
||||||
pname = "dulwich";
|
pname = "dulwich";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "5e1e39555f594939a8aff1ca08b3bdf6c7efd4b941c2850760983a0197240974";
|
sha256 = "0330787f28c5252f12040b9a1c0f5990f19f806c12b3d510ee7ea1fa53a6f3b4";
|
||||||
};
|
};
|
||||||
|
|
||||||
LC_ALL = "en_US.UTF-8";
|
LC_ALL = "en_US.UTF-8";
|
||||||
|
|||||||
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
# Only needed for tests
|
# Only needed for tests
|
||||||
buildInputs = [ pkgs.openssl ];
|
checkInputs = [ pkgs.openssl ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "ECDSA cryptographic signature library";
|
description = "ECDSA cryptographic signature library";
|
||||||
|
|||||||
@ -14,7 +14,7 @@ buildPythonPackage rec {
|
|||||||
sha256="0nrkhcb6jdrlb6pwkvd4rycw34y3s931hjf409ij9xkjsli9fkb1";
|
sha256="0nrkhcb6jdrlb6pwkvd4rycw34y3s931hjf409ij9xkjsli9fkb1";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ lxml pytest ];
|
checkInputs = [ lxml pytest ];
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
py.test $out
|
py.test $out
|
||||||
'';
|
'';
|
||||||
|
|||||||
@ -15,7 +15,8 @@ buildPythonPackage rec {
|
|||||||
sha256 = "a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a";
|
sha256 = "a7a84d5fa07a089186a329528f127c9d73b9de57f1a1131b82bb5320ee651f6a";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pytest setuptools_scm ];
|
checkInputs = [ pytest ];
|
||||||
|
nativeBuildInputs = [ setuptools_scm ];
|
||||||
propagatedBuildInputs = [ apipkg ];
|
propagatedBuildInputs = [ apipkg ];
|
||||||
|
|
||||||
# remove vbox tests
|
# remove vbox tests
|
||||||
|
|||||||
@ -14,13 +14,13 @@
|
|||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
version = "0.8.8";
|
version = "0.8.9";
|
||||||
pname = "eyeD3";
|
pname = "eyeD3";
|
||||||
disabled = isPyPy;
|
disabled = isPyPy;
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "197lszkyzm377ym5r0ssryfsiz20yjx8y4rii3wc81n92d1qzlaq";
|
sha256 = "b6bb626566f2949da409d7a871576271e2d6254dfb3d416b21713dabc4b6b00f";
|
||||||
};
|
};
|
||||||
|
|
||||||
# https://github.com/nicfit/eyeD3/pull/284
|
# https://github.com/nicfit/eyeD3/pull/284
|
||||||
|
|||||||
@ -5,11 +5,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "Fiona";
|
pname = "Fiona";
|
||||||
version = "1.8.2";
|
version = "1.8.4";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "4c6419b7ac29136708029f6a44b4ccd458735a4d241016c7b1bab41685c08d8f";
|
sha256 = "aec9ab2e3513c9503ec123b1a8573bee55fc6a66e2ac07088c3376bf6738a424";
|
||||||
};
|
};
|
||||||
|
|
||||||
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
|
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
{ pkgs
|
{ lib
|
||||||
|
, glibcLocales
|
||||||
, buildPythonPackage
|
, buildPythonPackage
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, six
|
, six
|
||||||
@ -18,31 +19,28 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "fs";
|
pname = "fs";
|
||||||
version = "2.1.2";
|
version = "2.1.3";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "6f7e36b6381f353339957784a67bd9d440482b7eaeaff7b1f97249ceb7223f63";
|
sha256 = "87e8d4e93040779a407c92b7f2f27117038927b4b1da41bdce23ce226557327d";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgs.glibcLocales ];
|
buildInputs = [ glibcLocales ];
|
||||||
checkInputs = [ nose pyftpdlib mock psutil ];
|
checkInputs = [ nose pyftpdlib mock psutil ];
|
||||||
propagatedBuildInputs = [ six appdirs pytz ]
|
propagatedBuildInputs = [ six appdirs pytz ]
|
||||||
++ pkgs.lib.optionals (!isPy3k) [ backports_os ]
|
++ lib.optionals (!isPy3k) [ backports_os ]
|
||||||
++ pkgs.lib.optionals (!pythonAtLeast "3.6") [ typing ]
|
++ lib.optionals (!pythonAtLeast "3.6") [ typing ]
|
||||||
++ pkgs.lib.optionals (!pythonAtLeast "3.5") [ scandir ]
|
++ lib.optionals (!pythonAtLeast "3.5") [ scandir ]
|
||||||
++ pkgs.lib.optionals (!pythonAtLeast "3.5") [ enum34 ];
|
++ lib.optionals (!pythonAtLeast "3.5") [ enum34 ];
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
# required for installation
|
|
||||||
touch LICENSE
|
|
||||||
# tests modify home directory results in (4 tests failing) / 1600
|
|
||||||
rm tests/test_appfs.py tests/test_opener.py
|
|
||||||
'';
|
|
||||||
|
|
||||||
LC_ALL="en_US.utf-8";
|
LC_ALL="en_US.utf-8";
|
||||||
|
|
||||||
meta = with pkgs.lib; {
|
checkPhase = ''
|
||||||
|
HOME=$(mktemp -d) nosetests tests []
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
description = "Filesystem abstraction";
|
description = "Filesystem abstraction";
|
||||||
homepage = https://github.com/PyFilesystem/pyfilesystem2;
|
homepage = https://github.com/PyFilesystem/pyfilesystem2;
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
|
|||||||
@ -3,11 +3,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-api-core";
|
pname = "google-api-core";
|
||||||
version = "1.5.2";
|
version = "1.7.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "16knimv41rjhrqkibm1p8f5ssmbbcjn7njc71lpr8v03l7mr6f9q";
|
sha256 = "85693e163a1a6faea69a74f8feaf35d54dfa2559fbdbbe389c93ffb3bb4c9a79";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
|||||||
@ -5,18 +5,19 @@
|
|||||||
, grpc_google_iam_v1
|
, grpc_google_iam_v1
|
||||||
, google_api_core
|
, google_api_core
|
||||||
, pytest
|
, pytest
|
||||||
|
, mock
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-asset";
|
pname = "google-cloud-asset";
|
||||||
version = "0.1.1";
|
version = "0.1.2";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "cec2f44a670371e24e6140c454fdac3ed06be0a021042c6756a3284b505335c7";
|
sha256 = "233157c5d902a084477fb5fe6ca1f946d6fe7911577d4a36aee0227777db61b7";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytest ];
|
checkInputs = [ pytest mock ];
|
||||||
propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
|
propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ];
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
|
|||||||
@ -4,18 +4,19 @@
|
|||||||
, enum34
|
, enum34
|
||||||
, google_api_core
|
, google_api_core
|
||||||
, pytest
|
, pytest
|
||||||
|
, mock
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-automl";
|
pname = "google-cloud-automl";
|
||||||
version = "0.1.1";
|
version = "0.1.2";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "793d463f78d22a822196cb3e34b247fbdba07eeae15ceadb911f5ccecd843f87";
|
sha256 = "32890d1e043eb09a86ff1839096dfb49051cd436bdf1a1708299484cfd06db1a";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytest ];
|
checkInputs = [ pytest mock ];
|
||||||
propagatedBuildInputs = [ enum34 google_api_core ];
|
propagatedBuildInputs = [ enum34 google_api_core ];
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
|
|||||||
@ -13,11 +13,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-bigquery";
|
pname = "google-cloud-bigquery";
|
||||||
version = "1.6.0";
|
version = "1.8.1";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "d559ba1e05cf6a960e09bb5aab3aeb4d50ad9e08c77a20a17c01c9b2bd8d6cb7";
|
sha256 = "621e05321d7a26b87fa2d4f8dd24f963d3424d7566a6454d65c4427b9d8552e2";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytest mock ipython ];
|
checkInputs = [ pytest mock ipython ];
|
||||||
|
|||||||
@ -3,18 +3,19 @@
|
|||||||
, fetchPypi
|
, fetchPypi
|
||||||
, google_api_core
|
, google_api_core
|
||||||
, pytest
|
, pytest
|
||||||
|
, mock
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-bigquery-datatransfer";
|
pname = "google-cloud-bigquery-datatransfer";
|
||||||
version = "0.1.1";
|
version = "0.3.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "f5b5d0de43805fa9ebb620c58e1d27e6d32d2fc8e9a2f954ee170f7a026c8757";
|
sha256 = "02bf1a508ffbc730904fd8a5e7d7c33946f0aa539127c1b1e235dfdedd7bc9a5";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytest ];
|
checkInputs = [ pytest mock ];
|
||||||
propagatedBuildInputs = [ google_api_core ];
|
propagatedBuildInputs = [ google_api_core ];
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
|
|||||||
@ -10,11 +10,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-bigtable";
|
pname = "google-cloud-bigtable";
|
||||||
version = "0.31.0";
|
version = "0.32.1";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "b6c8572697b5fdc7fcb95d88f87b8c84cea5a7aef2d57d3de0d6a9e2b0e8424f";
|
sha256 = "bb113894e1322102d4917740be4870798cad76aa4291ff742ada5548988b2223";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytest mock ];
|
checkInputs = [ pytest mock ];
|
||||||
|
|||||||
@ -3,18 +3,19 @@
|
|||||||
, fetchPypi
|
, fetchPypi
|
||||||
, google_api_core
|
, google_api_core
|
||||||
, pytest
|
, pytest
|
||||||
|
, mock
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-container";
|
pname = "google-cloud-container";
|
||||||
version = "0.1.1";
|
version = "0.2.1";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "a89afcb1fe96bc9361c231c223c3bbe19fa3787caeb4697cd5778990e1077270";
|
sha256 = "566834ef43e79917b112e3bd2848e84cfb0f4d7b565581607e2548f5c8e5d87a";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytest ];
|
checkInputs = [ pytest mock ];
|
||||||
propagatedBuildInputs = [ google_api_core ];
|
propagatedBuildInputs = [ google_api_core ];
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
|
|||||||
@ -3,11 +3,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-core";
|
pname = "google-cloud-core";
|
||||||
version = "0.28.1";
|
version = "0.29.1";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "89e8140a288acec20c5e56159461d3afa4073570c9758c05d4e6cb7f2f8cc440";
|
sha256 = "d85b1aaaf3bad9415ad1d8ee5eadce96d7007a82f13ce0a0629a003a11e83f29";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ google_api_core grpcio ];
|
propagatedBuildInputs = [ google_api_core grpcio ];
|
||||||
|
|||||||
@ -3,18 +3,19 @@
|
|||||||
, fetchPypi
|
, fetchPypi
|
||||||
, google_api_core
|
, google_api_core
|
||||||
, pytest
|
, pytest
|
||||||
|
, mock
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-dataproc";
|
pname = "google-cloud-dataproc";
|
||||||
version = "0.2.0";
|
version = "0.3.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "531dbd3e5862df5e67751efdcd89f00d0ded35f3a87a18fd3245e1c365080720";
|
sha256 = "3acbb1bd9e25fd233ae321c137a58306d5d0ef262e3cbe825c511c8ef55b33a2";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytest ];
|
checkInputs = [ pytest mock ];
|
||||||
propagatedBuildInputs = [ google_api_core ];
|
propagatedBuildInputs = [ google_api_core ];
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
|
|||||||
@ -9,11 +9,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-datastore";
|
pname = "google-cloud-datastore";
|
||||||
version = "1.7.1";
|
version = "1.7.3";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "03c1a06b0d94ac2f801513c9255bd5fc8773d036f0e59d63ffe1152cfe4320de";
|
sha256 = "e00bddc03670be206ddcbc5c1cbda0acc51db963f0ff54189bd6710f8e93a4c9";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytest mock ];
|
checkInputs = [ pytest mock ];
|
||||||
|
|||||||
@ -4,18 +4,19 @@
|
|||||||
, enum34
|
, enum34
|
||||||
, google_api_core
|
, google_api_core
|
||||||
, pytest
|
, pytest
|
||||||
|
, mock
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-dlp";
|
pname = "google-cloud-dlp";
|
||||||
version = "0.9.0";
|
version = "0.10.0";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "408e5c6820dc53dd589a7bc378d25c2cf5817c448b7c7b1268bc745ecbe04ec3";
|
sha256 = "5cc7e40842b6c3dc586d04e3d2b2326b44afbe3896da6a30032d64650a7c6b00";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytest ];
|
checkInputs = [ pytest mock ];
|
||||||
propagatedBuildInputs = [ enum34 google_api_core ];
|
propagatedBuildInputs = [ enum34 google_api_core ];
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
|
|||||||
@ -9,11 +9,11 @@
|
|||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "google-cloud-dns";
|
pname = "google-cloud-dns";
|
||||||
version = "0.29.0";
|
version = "0.29.2";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "f6ea35676c59b6bfd4a2e6aa42670c6ed3505ba46f7117cdc953094e568f404e";
|
sha256 = "d1476115c983094f124fe8b7a1350414072c048bf236336f3ab0816912e6e6bf";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = [ pytest mock ];
|
checkInputs = [ pytest mock ];
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user