public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into master

This commit is contained in:
Frederik Rietdijk 2018-11-20 11:48:27 +01:00
parent 119e4e30c8 fd26e7be2a
commit d0863a628c
485 changed files with 10914 additions and 8067 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
doc/languages-frameworks/python.section.md
View File

@ -486,7 +486,7 @@ and in this case the `python35` interpreter is automatically used.
Versions 2.7, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
respectively `python27`, `python35`, `python36`, and `python37`. The PyPy
interpreter is available as `pypy`. The aliases `python2` and `python3`
correspond to respectively `python27` and `python36`. The default interpreter,
correspond to respectively `python27` and `python37`. The default interpreter,
`python`, maps to `python2`. The Nix expressions for the interpreters can be
found in `pkgs/development/interpreters/python`.
@ -537,7 +537,7 @@ sets are
and the aliases
* `pkgs.python2Packages` pointing to `pkgs.python27Packages`
* `pkgs.python3Packages` pointing to `pkgs.python36Packages`
* `pkgs.python3Packages` pointing to `pkgs.python37Packages`
* `pkgs.pythonPackages` pointing to `pkgs.python2Packages`
#### `buildPythonPackage` function
@ -1078,8 +1078,7 @@ To modify only a Python package set instead of a whole Python derivation, use th
Use the following overlay template:
```nix
self: super:
{
self: super: {
python = super.python.override {
packageOverrides = python-self: python-super: {
zerobin = python-super.zerobin.overrideAttrs (oldAttrs: {
@ -1094,6 +1093,25 @@ self: super:
}
```
### How to use Intel's MKL with numpy and scipy?
A `site.cfg` is created that configures BLAS based on the `blas` parameter
of the `numpy` derivation. By passing in `mkl`, `numpy` and packages depending
on `numpy` will be built with `mkl`.
The following is an overlay that configures `numpy` to use `mkl`:
```nix
self: super: {
python36 = super.python36.override {
packageOverrides = python-self: python-super: {
numpy = python-super.numpy.override {
blas = super.pkgs.mkl;
};
};
};
}
```
## Contributing
### Contributing guidelines

2
nixos/doc/manual/release-notes/rl-1903.xml
View File

@ -19,6 +19,8 @@
<itemizedlist>
<listitem>
<para>
The default Python 3 interpreter is now CPython 3.7 instead of CPython 3.6.
<para />
</listitem>
</itemizedlist>

10
pkgs/applications/audio/a2jmidid/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, alsaLib, dbus, libjack2
, wafHook
, python2Packages}:
let
@ -12,15 +13,10 @@ in stdenv.mkDerivation rec {
sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ makeWrapper alsaLib dbus libjack2 python dbus-python ];
configurePhase = "${python.interpreter} waf configure --prefix=$out";
buildPhase = "${python.interpreter} waf";
installPhase = ''
${python.interpreter} waf install
postInstall = ''
wrapProgram $out/bin/a2j_control --set PYTHONPATH $PYTHONPATH
'';

11
pkgs/applications/audio/ams-lv2/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python3 }:
{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python3
, wafHook }:
stdenv.mkDerivation rec {
name = "ams-lv2-${version}";
@ -11,15 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "1n1dnqnj24xhiy9323lj52nswr5120cj56fpckg802miss05sr6x";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ];
configurePhase = "${python3.interpreter} waf configure --prefix=$out";
buildPhase = "${python3.interpreter} waf";
installPhase = "${python3.interpreter} waf install";
meta = with stdenv.lib; {
description = "An LV2 port of the internal modules found in Alsa Modular Synth";
homepage = http://objectivewave.wordpress.com/ams-lv2;

16
pkgs/applications/audio/ardour/default.nix
View File

@ -4,7 +4,8 @@
, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper
, perl, pkgconfig, python2, rubberband, serd, sord, sratom
, taglib, vampSDK, dbus, fftw, pango, suil, libarchive }:
, taglib, vampSDK, dbus, fftw, pango, suil, libarchive
, wafHook }:
let
@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
sha256 = "0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr";
};
nativeBuildInputs = [ wafHook ];
buildInputs =
[ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac
glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo
@ -47,13 +49,13 @@ stdenv.mkDerivation rec {
patchShebangs ./tools/
'';
configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa,dummy --prefix=$out";
buildPhase = "${python2.interpreter} waf";
installPhase = ''
${python2.interpreter} waf install
configureFlags = [
"--optimize"
"--docs"
"--with-backends=jack,alsa,dummy"
];
postInstall = ''
# Install desktop file
mkdir -p "$out/share/applications"
cat > "$out/share/applications/ardour.desktop" << EOF

10
pkgs/applications/audio/fomp/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lv2, pkgconfig, python2 }:
{ stdenv, fetchurl, lv2, pkgconfig, python2, wafHook }:
stdenv.mkDerivation rec {
name = "fomp-${version}";
@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ lv2 python2 ];
installPhase = ''
python waf configure --prefix=$out
python waf
python waf install
'';
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/fomp/;
description = "An LV2 port of the MCP, VCO, FIL, and WAH plugins by Fons Adriaensen";

10
pkgs/applications/audio/guitarix/default.nix
View File

@ -2,7 +2,7 @@
, avahi, bluez, boost, eigen, fftw, glib, glib-networking
, glibmm, gsettings-desktop-schemas, gtkmm2, libjack2
, ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom
, wrapGAppsHook, zita-convolver, zita-resampler, curl
, wrapGAppsHook, zita-convolver, zita-resampler, curl, wafHook
, optimizationSupport ? false # Enable support for native CPU extensions
}:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "1wfm8wrwrnqpb4ihy75n7l9i6vml536jlq9pdx2pblbc4ba3paac";
};
nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];
nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 wafHook ];
buildInputs = [
avahi bluez boost eigen fftw glib glibmm glib-networking.out
@ -38,12 +38,6 @@ stdenv.mkDerivation rec {
"--convolver-ffmpeg"
] ++ optional optimizationSupport "--optimization";
configurePhase = ''python2 waf configure --prefix=$out $configureFlags'';
buildPhase = ''python2 waf build'';
installPhase = ''python2 waf install'';
meta = with stdenv.lib; {
description = "A virtual guitar amplifier for Linux running with JACK";
longDescription = ''

12
pkgs/applications/audio/ingen/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv
, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
, wafHook
, suil
}:
@ -15,23 +15,19 @@ stdenv.mkDerivation rec {
deepClone = true;
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [
boost ganv glibmm gtkmm2 libjack2 lilv lv2Unstable makeWrapper
python raul serd sord sratom suil
];
configurePhase = ''
preConfigure = ''
sed -e "s@{PYTHONDIR}/'@out/'@" -i wscript
${python.interpreter} waf configure --prefix=$out
'';
propagatedBuildInputs = [ rdflib ];
buildPhase = "${python.interpreter} waf";
installPhase = ''
${python.interpreter} waf install
postInstall = ''
for program in ingenams ingenish
do
wrapProgram $out/bin/$program \

6
pkgs/applications/audio/jackmix/default.nix
View File

@ -17,12 +17,8 @@ stdenv.mkDerivation rec {
jack
];
buildPhase = ''
scons
'';
installPhase = ''
mkdir -p $out/bin
cp jackmix/jackmix $out/bin
install -D jackmix/jackmix $out/bin/jackmix
'';
meta = {

10
pkgs/applications/audio/jalv/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python
, serd, sord , sratom, suil }:
, serd, sord , sratom, suil, wafHook }:
stdenv.mkDerivation rec {
name = "jalv-${version}";
@ -10,17 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [
gtk2 libjack2 lilv lv2 python serd sord sratom suil
];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf";
installPhase = "python waf install";
meta = with stdenv.lib; {
description = "A simple but fully featured LV2 host for Jack";
homepage = http://drobilla.net/software/jalv;

9
pkgs/applications/audio/klick/default.nix
View File

@ -12,15 +12,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ scons libsamplerate libsndfile liblo libjack2 boost ];
prefixKey = "PREFIX=";
NIX_CFLAGS_COMPILE = "-fpermissive";
buildPhase = ''
mkdir -p $out
scons PREFIX=$out
'';
installPhase = "scons install";
meta = {
homepage = http://das.nasophon.de/klick/;
description = "Advanced command-line metronome for JACK";
@ -28,4 +22,3 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.linux;
};
}

10
pkgs/applications/audio/mda-lv2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, python }:
{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
name = "mda-lv2-${version}";
@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ fftwSinglePrec lv2 python ];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf";
installPhase = "python waf install";
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/mda-lv2/;
description = "An LV2 port of the MDA plugins by Paul Kellett";

17
pkgs/applications/audio/mixxx/default.nix
View File

@ -32,26 +32,11 @@ stdenv.mkDerivation rec {
"opus=1"
];
buildPhase = ''
runHook preBuild
mkdir -p "$out"
scons \
-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
$sconsFlags "prefix=$out"
runHook postBuild
'';
installPhase = ''
runHook preInstall
scons $sconsFlags "prefix=$out" install
runHook postInstall
'';
fixupPhase = ''
wrapProgram $out/bin/mixxx \
--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive;
'';
meta = with stdenv.lib; {
homepage = https://mixxx.org;
description = "Digital DJ mixing software";

7
pkgs/applications/audio/non/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, python2, cairo, libjpeg, ntk, libjack2
, libsndfile, ladspaH, liblrdf, liblo, libsigcxx
, libsndfile, ladspaH, liblrdf, liblo, libsigcxx, wafHook
}:
stdenv.mkDerivation rec {
@ -12,13 +12,10 @@ stdenv.mkDerivation rec {
sha256 = "1cljkkyi9dxqpqhx8y6l2ja4zjmlya26m26kqxml8gx08vyvddhx";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ python2 cairo libjpeg ntk libjack2 libsndfile
ladspaH liblrdf liblo libsigcxx
];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf build";
installPhase = "python waf install";
meta = {
description = "Lightweight and lightning fast modular Digital Audio Workstation";

8
pkgs/applications/audio/nova-filters/default.nix
View File

@ -21,14 +21,6 @@ stdenv.mkDerivation rec {
sed -i "s/= check/= detail::filter_base<internal_type, checked>::check/" nova/source/dsp/filter.hpp
'';
buildPhase = ''
scons
'';
installPhase = ''
scons $sconsFlags "prefix=$out" install
'';
meta = with stdenv.lib; {
description = "LADSPA plugins based on filters of nova";
homepage = http://klingt.org/~tim/nova-filters/;

8
pkgs/applications/audio/patchage/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, alsaLib, boost, dbus-glib, fetchsvn, ganv, glibmm
, gtkmm2, libjack2, pkgconfig, python2
, gtkmm2, libjack2, pkgconfig, python2, wafHook
}:
stdenv.mkDerivation rec {
@ -13,13 +13,9 @@ stdenv.mkDerivation rec {
buildInputs = [
alsaLib boost dbus-glib ganv glibmm gtkmm2 libjack2
pkgconfig python2
pkgconfig python2 wafHook
];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf build";
installPhase = "python waf install";
meta = {
description = "Modular patch bay for Jack and ALSA systems";
homepage = http://non.tuxfamily.org;

12
pkgs/applications/audio/rhvoice/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, pkgconfig, fetchFromGitHub, scons, python, glibmm, libpulseaudio, libao
}:
{ stdenv, lib, pkgconfig, fetchFromGitHub, scons
, python, glibmm, libpulseaudio, libao }:
let
version = "unstable-2018-02-10";
@ -30,14 +30,6 @@ in stdenv.mkDerivation rec {
patches = [ ./honor_nix_environment.patch ];
buildPhase = ''
scons prefix=$out
'';
installPhase = ''
scons install
'';
meta = {
description = "A free and open source speech synthesizer for Russian language and others";
homepage = https://github.com/Olga-Yakovleva/RHVoice/wiki;

8
pkgs/applications/graphics/giv/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib,
pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }:
{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib
, pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }:
stdenv.mkDerivation rec {
name = "giv-${version}";
@ -21,10 +21,6 @@ stdenv.mkDerivation rec {
patches = [ ./build.patch ];
buildPhase = "scons";
installPhase = "scons install";
nativeBuildInputs = [ scons pkgconfig vala perl gob2 ];
buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json-glib ];

2
pkgs/applications/graphics/inkscape/default.nix
View File

@ -47,6 +47,8 @@ stdenv.mkDerivation rec {
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
gsl poppler imagemagick libwpg librevenge
libvisio libcdr libexif potrace hicolor-icon-theme
python2Env perlPackages.perl
];
enableParallelBuilding = true;

5
pkgs/applications/graphics/mypaint/default.nix
View File

@ -26,10 +26,7 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ numpy ];
buildPhase = "scons prefix=$out";
installPhase = ''
scons prefix=$out install
postInstall = ''
sed -i -e 's|/usr/bin/env python2.7|${python}/bin/python|' $out/bin/mypaint
'';

14
pkgs/applications/misc/hamster-time-tracker/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchzip, pythonPackages, docbook2x, libxslt, gnome-doc-utils
, intltool, dbus-glib, gnome_python
, hicolor-icon-theme
, wafHook
}:
# TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes
@ -17,28 +18,17 @@ pythonPackages.buildPythonApplication rec {
sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g";
};
nativeBuildInputs = [ wafHook ];
buildInputs = [
docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme
];
propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ];
configurePhase = ''
python waf configure --prefix="$out"
'';
buildPhase = ''
python waf build
'';
postFixup = ''
wrapPythonProgramsIn $out/lib/hamster-time-tracker "$out $pythonPath"
'';
installPhase = ''
python waf install
'';
# error: invalid command 'test'
doCheck = false;

22
pkgs/applications/misc/kupfer/default.nix
View File

@ -8,6 +8,7 @@
, keybinder3
, hicolor-icon-theme
, wrapGAppsHook
, wafHook
}:
with python3Packages;
@ -24,37 +25,20 @@ buildPythonApplication rec {
nativeBuildInputs = [
wrapGAppsHook intltool
# For setup hook
gobjectIntrospection
gobjectIntrospection wafHook
];
buildInputs = [ hicolor-icon-theme docutils libwnck3 keybinder3 ];
propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
configurePhase = ''
runHook preConfigure
python ./waf configure --prefix=$prefix
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
python ./waf
runHook postBuild
'';
installPhase = let
postInstall = let
pythonPath = (stdenv.lib.concatMapStringsSep ":"
(m: "${m}/lib/${python.libPrefix}/site-packages")
propagatedBuildInputs);
in ''
runHook preInstall
python ./waf install
gappsWrapperArgs+=(
"--prefix" "PYTHONPATH" : "${pythonPath}"
"--set" "PYTHONNOUSERSITE" "1"
)
runHook postInstall
'';
doCheck = false; # no tests

17
pkgs/applications/misc/xiphos/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, pkgconfig
{ stdenv, fetchFromGitHub, pkgconfig
, python
, intltool
, docbook2x, docbook_xml_dtd_412, libxslt
@ -9,6 +9,7 @@
, webkitgtk
, dbus-glib, enchant, isocodes, libuuid, icu
, wrapGAppsHook
, wafHook
}:
stdenv.mkDerivation rec {
@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook wafHook ];
buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt
sword clucene_core biblesync gnome-doc-utils libgsf gconf gtkhtml
libglade scrollkeeper webkitgtk dbus-glib enchant isocodes libuuid icu ];
@ -36,17 +37,7 @@ stdenv.mkDerivation rec {
export SWORD_HOME=${sword};
'';
configurePhase = ''
python waf configure --prefix=$out --enable-webkit2
'';
buildPhase = ''
python waf build
'';
installPhase = ''
python waf install
'';
configureFlags= [ "--enable-webkit2" ];
meta = with stdenv.lib; {
description = "A GTK Bible study tool";

6
pkgs/applications/networking/browsers/w3m/default.nix
View File

@ -15,13 +15,13 @@ assert mouseSupport -> gpm-ncurses != null;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "w3m-0.5.3+git20161120";
name = "w3m-0.5.3+git20180125";
src = fetchFromGitHub {
owner = "tats";
repo = "w3m";
rev = "v0.5.3+git20161120";
sha256 = "06n5a9jdyihkd4xdjmyci32dpqp1k2l5awia5g9ng0bn256bacdc";
rev = "v0.5.3+git20180125";
sha256 = "0dafdfx1yhrvhbqzslkcapj09dvf64m2jadz3wl2icni0k4msq90";
};
NIX_LDFLAGS = optionalString stdenv.isSunOS "-lsocket -lnsl";

14
pkgs/applications/networking/instant-messengers/swift-im/default.nix
View File

@ -3,9 +3,7 @@
, lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib
}:
let
_scons = "scons -j$NIX_BUILD_CORES";
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "swift-im-${version}";
version = "4.0.2";
@ -30,14 +28,12 @@ in stdenv.mkDerivation rec {
"-I${miniupnpc}/include/miniupnpc"
"-I${qtwebkit.dev}/include/QtWebKit"
"-I${qtwebkit.dev}/include/QtWebKitWidgets"
"-fpermissive"
];
buildPhase = ''
${_scons} Swift
'';
installPhase = ''
${_scons} SWIFT_INSTALLDIR=$out $out
preInstall = ''
installTargets="$out"
installFlags+=" SWIFT_INSTALLDIR=$out"
'';
meta = with stdenv.lib; {

6
pkgs/applications/science/math/sage/sage-src.nix
View File

@ -65,12 +65,18 @@ stdenv.mkDerivation rec {
./patches/numpy-1.15.1.patch
# ntl upgrade
# https://trac.sagemath.org/ticket/25532#comment:29
(fetchpatch {
name = "lcalc-c++11.patch";
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sagemath-lcalc-c++11.patch?h=packages/sagemath&id=0e31ae526ab7c6b5c0bfacb3f8b1c4fd490035aa";
sha256 = "0p5wnvbx65i7cp0bjyaqgp4rly8xgnk12pqwaq3dqby0j2bk6ijb";
})
(fetchpatch {
name = "cython-0.29.patch";
url = "https://git.sagemath.org/sage.git/patch/?h=f77de1d0e7f90ee12761140500cb8cbbb789ab20";
sha256 = "14wrpy8jgbnpza1j8a2nx8y2r946y82pll1fv3cn6gpfmm6640l3";
})
# https://trac.sagemath.org/ticket/26360
(fetchpatch {
name = "arb-2.15.1.patch";

8
pkgs/applications/video/bombono/default.nix
View File

@ -35,16 +35,10 @@ stdenv.mkDerivation rec {
libxmlxx ffmpeg enca
];
buildPhase = ''
scons PREFIX=$out -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
'';
prefixKey = "PREFIX=";
enableParallelBuilding = true;
installPhase = ''
scons install
'';
meta = {
description = "a DVD authoring program for personal computers";
homepage = "http://www.bombono.org/";

23
pkgs/applications/window-managers/sxhkd/unstable.nix
View File

@ -1,23 +0,0 @@
{ stdenv, fetchFromGitHub, asciidoc, libxcb, xcbutil, xcbutilkeysyms, xcbutilwm }:
stdenv.mkDerivation rec {
name = "sxhkd-unstable-2016-08-29";
src = fetchFromGitHub {
owner = "baskerville";
repo = "sxhkd";
rev = "69b6acc7831bd333b39286c37188e5638ad0de27";
sha256 = "11i451hz0icsbxnvbq2bdl6r5kacxf6ps0yvi9ix3vkpxn4zcanh";
};
buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ];
makeFlags = ''PREFIX=$(out)'';
meta = with stdenv.lib; {
description = "Simple X hotkey daemon (git version)";
inherit (src.meta) homepage;
license = licenses.bsd2;
platforms = platforms.linux;
};
}

11
pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix
View File

@ -1,4 +1,5 @@
{ stdenv, pkgconfig, fetchFromGitHub, python2, bash, vala, dockbarx, gtk2, xfce, pythonPackages }:
{ stdenv, pkgconfig, fetchFromGitHub, python2, bash, vala
, dockbarx, gtk2, xfce, pythonPackages, wafHook }:
stdenv.mkDerivation rec {
ver = "0.5";
@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
pythonPath = [ dockbarx ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ python2 vala gtk2 pythonPackages.wrapPython ]
++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ])
++ pythonPath;
@ -25,12 +26,6 @@ stdenv.mkDerivation rec {
substituteInPlace src/dockbarx.vala --replace '/usr/bin/env python2' ${bash}/bin/bash
'';
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf build";
installPhase = "python waf install";
postFixup = ''
wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath"
'';

11
pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix
View File

@ -1,4 +1,5 @@
{ stdenv, pkgconfig, fetchFromGitHub, python2, vala, gtk2, libwnck, libxfce4util, xfce4-panel }:
{ stdenv, pkgconfig, fetchFromGitHub, python2, vala
, gtk2, libwnck, libxfce4util, xfce4-panel, wafHook }:
stdenv.mkDerivation rec {
ver = "0.3.1";
@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "1sl4qmjywfvv53ch7hyfysjfd91zl38y7gdw2y3k69vkzd3h18ad";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ python2 vala gtk2 libwnck libxfce4util xfce4-panel ];
postPatch = ''
@ -20,12 +21,6 @@ stdenv.mkDerivation rec {
substituteInPlace src/namebar.vala --replace 'Environment.get_system_data_dirs()' "{ \"$out/share\" }"
'';
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf build";
installPhase = "python waf install";
meta = with stdenv.lib; {
homepage = https://github.com/TiZ-EX1/xfce4-namebar-plugin;
description = "A plugins which integrates titlebar and window controls into the xfce4-panel";

11
pkgs/desktops/xfce/thunar-plugins/dropbox/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl, pkgconfig
, gtk
, thunar-bare, python2, hicolor-icon-theme
, wafHook
}:
stdenv.mkDerivation rec {
@ -14,20 +15,12 @@ stdenv.mkDerivation rec {
sha256 = "08vhzzzwshyz371yl7fzfylmhvchhv3s5kml3dva4v39jhvrpnkf";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [
gtk
thunar-bare python2 hicolor-icon-theme
];
configurePhase = "python2 waf configure --prefix=$out";
buildPhase = "python2 waf";
installPhase = ''
python2 waf install
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {

39
pkgs/development/compilers/clasp/default.nix
View File

@ -1,7 +1,8 @@
{stdenv, fetchFromGitHub
, llvmPackages
, cmake, boehmgc, gmp, zlib, ncurses, boost
, python, git, sbcl
{ stdenv, fetchFromGitHub
, llvmPackages
, cmake, boehmgc, gmp, zlib, ncurses, boost
, python, git, sbcl
, wafHook
}:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake python git sbcl ];
nativeBuildInputs = [ cmake python git sbcl wafHook ];
buildInputs = with llvmPackages; (
builtins.map (x: stdenv.lib.overrideDerivation x
@ -32,36 +33,14 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = " -frtti ";
configurePhase = ''
runHook preConfigure
export CXX=clang++
export CC=clang
postPatch = ''
echo "
INSTALL_PATH_PREFIX = '$out'
" | sed -e 's/^ *//' > wscript.config
python ./waf configure update_submodules
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
python ./waf build_cboehm
runHook postBuild
'';
installPhase = ''
runHook preInstall
python ./waf install_cboehm
runHook postInstall
'';
buildTargets = "build_cboehm";
installTargets = "install_cboehm";
meta = {
inherit version;

29
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -52,12 +52,9 @@ with builtins;
let version = "4.8.5";
enableParallelBuilding = true;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches = [ ]
++ optional enableParallelBuilding ../parallel-bconfig.patch
patches = [ ../parallel-bconfig.patch ]
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
++ optional langFortran ../gfortran-driving.patch
@ -214,20 +211,27 @@ stdenv.mkDerivation ({
++ (optional (perl != null) perl)
++ (optional javaAwtGtk pkgconfig);
buildInputs = [ gmp mpfr libmpc libelf ]
++ (optional (cloog != null) cloog)
# For building runtime libs
depsBuildTarget =
if hostPlatform == buildPlatform then [
targetPackages.stdenv.cc.bintools # newly-built gcc will be used
] else assert targetPlatform == hostPlatform; [ # build != host == target
stdenv.cc
];
buildInputs = [
gmp mpfr libmpc libelf
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (cloog != null) cloog)
++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
;
preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
@ -359,8 +363,8 @@ stdenv.mkDerivation ({
++ optional (zlib != null) zlib
++ optional langJava boehmgc
++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk [ gmp mpfr ])
);
++ optionals javaAwtGtk [ gmp mpfr ]
));
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
@ -387,7 +391,8 @@ stdenv.mkDerivation ({
hardeningUnsupportedFlags = [ "stackprotector" ];
};
inherit enableParallelBuilding enableMultilib;
enableParallelBuilding = true;
inherit enableMultilib;
inherit (stdenv) is64bit;

30
pkgs/development/compilers/gcc/4.9/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, targetPackages, fetchurl, noSysDirs, fetchpatch
{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
, langC ? true, langCC ? true, langFortran ? false
, langObjC ? stdenv.targetPlatform.isDarwin
, langObjCpp ? stdenv.targetPlatform.isDarwin
@ -52,13 +52,10 @@ with builtins;
let version = "4.9.4";
enableParallelBuilding = true;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches =
[ ../use-source-date-epoch.patch ]
++ optionals enableParallelBuilding [ ../parallel-bconfig.patch ./parallel-strsignal.patch ]
[ ../use-source-date-epoch.patch ../parallel-bconfig.patch ./parallel-strsignal.patch ]
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
++ optional langFortran ../gfortran-driving.patch
@ -239,8 +236,6 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
@ -255,8 +250,7 @@ stdenv.mkDerivation ({
''
+ stdenv.lib.optionalString (langJava || langGo) ''
export lib=$out;
''
;
'';
dontDisableStatic = true;
@ -268,7 +262,8 @@ stdenv.mkDerivation ({
[
"--with-gmp-include=${gmp.dev}/include"
"--with-gmp-lib=${gmp.out}/lib"
"--with-mpfr=${mpfr.dev}"
"--with-mpfr-include=${mpfr.dev}/include"
"--with-mpfr-lib=${mpfr.out}/lib"
"--with-mpc=${libmpc}"
] ++
optional (libelf != null) "--with-libelf=${libelf}" ++
@ -381,7 +376,8 @@ stdenv.mkDerivation ({
++ optional (zlib != null) zlib
++ optional langJava boehmgc
++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk [ gmp mpfr ]));
++ optionals javaAwtGtk [ gmp mpfr ]
));
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
@ -402,10 +398,13 @@ stdenv.mkDerivation ({
"-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
{ inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
isGNU = true;
};
inherit enableParallelBuilding enableMultilib;
enableParallelBuilding = true;
inherit enableMultilib;
inherit (stdenv) is64bit;
@ -429,7 +428,8 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos;
stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
};
}

17
pkgs/development/compilers/gcc/5/default.nix
View File

@ -49,9 +49,6 @@ with stdenv.lib;
with builtins;
let version = "5.5.0";
sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k";
enableParallelBuilding = true;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@ -170,7 +167,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz";
inherit sha256;
sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k";
};
inherit patches;
@ -244,12 +241,10 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
@ -408,10 +403,13 @@ stdenv.mkDerivation ({
"-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
{ inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
isGNU = true;
};
inherit enableParallelBuilding enableMultilib;
enableParallelBuilding = true;
inherit enableMultilib;
inherit (stdenv) is64bit;
@ -435,6 +433,7 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
};
}

27
pkgs/development/compilers/gcc/6/default.nix
View File

@ -48,9 +48,7 @@ assert langGo -> langCC;
with stdenv.lib;
with builtins;
let version = "6.4.0";
enableParallelBuilding = true;
let version = "6.5.0";
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
@ -59,8 +57,6 @@ let version = "6.4.0";
++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
++ optional noSysDirs ../no-sys-dirs.patch
++ optional langFortran ../gfortran-driving.patch
++ [ ../struct-ucontext.patch ../struct-sigaltstack.patch ] # glibc-2.26
++ optional langJava [ ../struct-ucontext-libjava.patch ] # glibc-2.26
++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch
;
@ -170,7 +166,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz";
sha256 = "1m0lr7938lw5d773dkvwld90hjlcq2282517d1gwvrfzmwgg42w5";
sha256 = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby";
};
inherit patches;
@ -245,12 +241,9 @@ stdenv.mkDerivation ({
++ (optional (zlib != null) zlib)
++ (optionals langJava [ boehmgc zip unzip ])
++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
@ -263,8 +256,7 @@ stdenv.mkDerivation ({
''
+ stdenv.lib.optionalString (langJava || langGo) ''
export lib=$out;
''
;
'';
dontDisableStatic = true;
@ -391,7 +383,8 @@ stdenv.mkDerivation ({
++ optional (zlib != null) zlib
++ optional langJava boehmgc
++ optionals javaAwtGtk xlibs
++ optionals javaAwtGtk [ gmp mpfr ]));
++ optionals javaAwtGtk [ gmp mpfr ]
));
EXTRA_TARGET_FLAGS = optionals
(targetPlatform != hostPlatform && libcCross != null)
@ -412,10 +405,13 @@ stdenv.mkDerivation ({
"-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
{ inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
isGNU = true;
};
inherit enableParallelBuilding enableMultilib;
enableParallelBuilding = true;
inherit enableMultilib;
inherit (stdenv) is64bit;
@ -439,6 +435,7 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
};
}

15
pkgs/development/compilers/gcc/7/default.nix
View File

@ -39,8 +39,6 @@ with builtins;
let version = "7.3.0";
enableParallelBuilding = true;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches =
@ -221,12 +219,9 @@ stdenv.mkDerivation ({
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument";
@ -361,10 +356,13 @@ stdenv.mkDerivation ({
"-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
{ inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
isGNU = true;
};
inherit enableParallelBuilding enableMultilib;
enableParallelBuilding = true;
inherit enableMultilib;
inherit (stdenv) is64bit;
@ -388,6 +386,7 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
};
}

15
pkgs/development/compilers/gcc/8/default.nix
View File

@ -39,8 +39,6 @@ with builtins;
let version = "8.2.0";
enableParallelBuilding = true;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches =
@ -210,12 +208,9 @@ stdenv.mkDerivation ({
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
@ -339,10 +334,13 @@ stdenv.mkDerivation ({
"-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
{ inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
isGNU = true;
};
inherit enableParallelBuilding enableMultilib;
enableParallelBuilding = true;
inherit enableMultilib;
inherit (stdenv) is64bit;
@ -366,6 +364,7 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
};
}

15
pkgs/development/compilers/gcc/snapshot/default.nix
View File

@ -40,8 +40,6 @@ with builtins;
let version = "7-20170409";
enableParallelBuilding = true;
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
patches =
@ -179,12 +177,9 @@ stdenv.mkDerivation ({
targetPackages.stdenv.cc.bintools # For linking code at run-time
] ++ (optional (isl != null) isl)
++ (optional (zlib != null) zlib)
++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
# The builder relies on GNU sed (for instance, Darwin's `sed' fails with
# "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
++ (optional hostPlatform.isDarwin gnused)
++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
;
NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl";
@ -311,10 +306,13 @@ stdenv.mkDerivation ({
"-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}"
]));
passthru =
{ inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
passthru = {
inherit langC langCC langObjC langObjCpp langFortran langGo version;
isGNU = true;
};
inherit enableParallelBuilding enableMultilib;
enableParallelBuilding = true;
inherit enableMultilib;
inherit (stdenv) is64bit;
@ -338,6 +336,7 @@ stdenv.mkDerivation ({
platforms =
stdenv.lib.platforms.linux ++
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
broken = true;

2
pkgs/development/compilers/ghc/8.2.2.nix
View File

@ -217,7 +217,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
buildInputs = libDeps hostPlatform;
buildInputs = [ perl ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;

2
pkgs/development/compilers/ghc/8.4.4.nix
View File

@ -190,7 +190,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
buildInputs = libDeps hostPlatform;
buildInputs = [ perl ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;

2
pkgs/development/compilers/ghc/8.6.1.nix
View File

@ -175,7 +175,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
buildInputs = libDeps hostPlatform;
buildInputs = [ perl ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;

2
pkgs/development/compilers/ghc/8.6.2.nix
View File

@ -175,7 +175,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
buildInputs = libDeps hostPlatform;
buildInputs = [ perl ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;

2
pkgs/development/compilers/ghc/head.nix
View File

@ -157,7 +157,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
buildInputs = libDeps hostPlatform;
buildInputs = [ perl ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;

4
pkgs/development/compilers/llvm/5/llvm.nix
View File

@ -36,9 +36,7 @@ in stdenv.mkDerivation (rec {
nativeBuildInputs = [ cmake python ]
++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
buildInputs = [ libxml2 libffi ]
# TODO(@Ericson2314): Remove next mass rebuild
++ stdenv.lib.optionals (stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform) [ libcxxabi ];
buildInputs = [ libxml2 libffi ];
propagatedBuildInputs = [ ncurses zlib ];

6
pkgs/development/interpreters/python/cpython/2.7/default.nix
View File

@ -74,6 +74,12 @@ let
url = "file://${./type_getattro.patch}";
sha256 = "11v9yx20hs3jmw0wggzvmw39qs4mxay4kb8iq2qjydwy9ya61nrd";
})
(fetchpatch {
name = "CVE-2018-1000802.patch";
url = "https://github.com/python/cpython/pull/8985.patch";
sha256 = "1c8nq2c9sjqa8ipl62hiandg6a7lzrwwfhi3ky6jd3pxgyalrh97";
})
] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch
] ++ optionals stdenv.isLinux [

4
pkgs/development/interpreters/python/cpython/3.6/default.nix
View File

@ -26,7 +26,7 @@ with stdenv.lib;
let
majorVersion = "3.6";
minorVersion = "6";
minorVersion = "7";
minorVersionSuffix = "";
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "python${majorVersion}";
@ -51,7 +51,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
sha256 = "0vz1wqg50zq6g15givdx1s2rq5752y5g2f1978bs6wvf8mfw36yp";
sha256 = "0zgp8nvz3rkiz5cxd42vgpah4rvw3kmg9qz9lfq36rfnm40i9zc1";
};
NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";

4
pkgs/development/interpreters/python/cpython/3.7/default.nix
View File

@ -26,7 +26,7 @@ with stdenv.lib;
let
majorVersion = "3.7";
minorVersion = "0";
minorVersion = "1";
minorVersionSuffix = "";
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "python${majorVersion}";
@ -48,7 +48,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
sha256 = "0j9mic5c9lbd2b20wka7hily7szz740wy9ilfrczxap63rnrk0h3";
sha256 = "0v9x4h22rh5cwpsq1mwpdi3c9lc9820lzp2nmn9g20llij72nzps";
};
NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";

10
pkgs/development/libraries/aubio/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate
, libsndfile, pkgconfig, python
, libsndfile, pkgconfig, python, wafHook
}:
stdenv.mkDerivation rec {
@ -10,15 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "0hd0kzfmr46am00ygxar8alrldv92c5azqy701iilfmbqpz4mvfb";
};
nativeBuildInputs = [ pkgconfig python ];
nativeBuildInputs = [ pkgconfig python wafHook ];
buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile ];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf";
installPhase = "python waf install";
meta = with stdenv.lib; {
description = "Library for audio labelling";
homepage = https://aubio.org/;

10
pkgs/development/libraries/audio/lilv/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom }:
{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, sratom, wafHook }:
stdenv.mkDerivation rec {
name = "lilv-${version}";
@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0f24cd7wkk5l969857g2ydz2kjjrkvvddg1g87xzzs78lsvq8fy3";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ lv2 python serd sord sratom ];
configurePhase = "${python.interpreter} waf configure --prefix=$out";
buildPhase = "${python.interpreter} waf";
installPhase = "${python.interpreter} waf install";
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/lilv;
description = "A C library to make the use of LV2 plugins";

10
pkgs/development/libraries/audio/lv2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python }:
{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
name = "lv2-${version}";
@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0chxwys3vnn3nxc9x2vchm74s9sx0vfra6y893byy12ci61jc1dq";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ gtk2 libsndfile python ];
configurePhase = "${python.interpreter} waf configure --prefix=$out";
buildPhase = "${python.interpreter} waf";
installPhase = "${python.interpreter} waf install";
meta = with stdenv.lib; {
homepage = http://lv2plug.in;
description = "A plugin standard for audio systems";

10
pkgs/development/libraries/audio/lv2/unstable.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python }:
{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
name = "lv2-unstable-${version}";
@ -10,15 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "1gp2rd99dfmpibvpixrqn115mrhybzf3if3h8bssf6siyi13f29r";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ gtk2 libsndfile python ];
configurePhase = "${python.interpreter} waf configure --prefix=$out";
buildPhase = "${python.interpreter} waf";
installPhase = "${python.interpreter} waf install";
meta = with stdenv.lib; {
homepage = http://lv2plug.in;
description = "A plugin standard for audio systems";

17
pkgs/development/libraries/audio/lvtk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python }:
{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
name = "lvtk-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd";
};
nativeBuildInputs = [ pkgconfig python ];
nativeBuildInputs = [ pkgconfig python wafHook ];
buildInputs = [ boost gtkmm2 lv2 ];
enableParallelBuilding = true;
@ -19,15 +19,10 @@ stdenv.mkDerivation rec {
sed -i '/target[ ]*= "ttl2c"/ ilib=["boost_system"],' tools/wscript_build
'';
configurePhase = ''
python waf configure --prefix=$out \
--boost-includes="${boost.dev}/include" \
--boost-libs="${boost.out}/lib"
'';
buildPhase = "python waf";
installPhase = "python waf install";
configureFlags = [
"--boost-includes=${boost.dev}/include"
"--boost-libs=${boost.out}/lib"
];
meta = with stdenv.lib; {
description = "A set C++ wrappers around the LV2 C API";

13
pkgs/development/libraries/audio/ntk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2 }:
{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }:
stdenv.mkDerivation rec {
name = "ntk-${version}";
@ -10,20 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [
cairo libjpeg libXft python2
];
buildPhase = ''
python waf configure --prefix=$out
python waf
'';
installPhase = ''
python waf install
'';
meta = {
description = "Fork of FLTK 1.3.0 with additional functionality";
version = "${version}";

10
pkgs/development/libraries/audio/raul/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, boost, gtk2, pkgconfig, python }:
{ stdenv, fetchgit, boost, gtk2, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
name = "raul-unstable-${rev}";
@ -10,15 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "04fajrass3ymr72flx5js5vxc601ccrmx8ny8scp0rw7j0igyjdr";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ boost gtk2 python ];
configurePhase = "${python.interpreter} waf configure --prefix=$out";
buildPhase = "${python.interpreter} waf";
installPhase = "${python.interpreter} waf install";
meta = with stdenv.lib; {
description = "A C++ utility library primarily aimed at audio/musical applications";
homepage = http://drobilla.net/software/raul;

10
pkgs/development/libraries/audio/sratom/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord }:
{ stdenv, fetchurl, lv2, pkgconfig, python, serd, sord, wafHook }:
stdenv.mkDerivation rec {
name = "sratom-${version}";
@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0lz883ravxjf7r9wwbx2gx9m8vhyiavxrl9jdxfppjxnsralll8a";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ lv2 python serd sord ];
configurePhase = "${python.interpreter} waf configure --prefix=$out";
buildPhase = "${python.interpreter} waf";
installPhase = "${python.interpreter} waf install";
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/sratom;
description = "A library for serialising LV2 atoms to/from RDF";

9
pkgs/development/libraries/audio/suil/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom
, wafHook
, withQt4 ? true, qt4 ? null
, withQt5 ? false, qt5 ? null }:
@ -16,17 +17,11 @@ stdenv.mkDerivation rec {
sha256 = "0j489gm3fhnmwmbgw30bvd4byw1vsy4yazdlnji8jzhcz0qwb5cq";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ gtk2 lv2 python serd sord sratom ]
++ (lib.optionals withQt4 [ qt4 ])
++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ]));
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf";
installPhase = "python waf install";
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/suil;
description = "A lightweight C library for loading and wrapping LV2 plugin UIs";

4
pkgs/development/libraries/boehm-gc/default.nix
View File

@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
name = "boehm-gc-${version}";
version = "7.6.8";
version = "8.0.0";
src = fetchurl {
urls = [
"http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
"https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
];
sha256 = "0n720a0i584ghcwmdsjiq6bl9ig0p9mrja29rp4cgsqvpz6wa2h4";
sha256 = "014gjv3f1qycsv5yh3fyhvrvsig60yc288pipzr0ml4312igj8wg";
};
buildInputs = [ libatomic_ops ];

15
pkgs/development/libraries/c-ares/default.nix
View File

@ -2,23 +2,14 @@
let self =
stdenv.mkDerivation rec {
name = "c-ares-1.14.0";
name = "c-ares-1.15.0";
src = fetchurl {
url = "https://c-ares.haxx.se/download/${name}.tar.gz";
sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5";
sha256 = "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc";
};
configureFlags = if stdenv.hostPlatform.isWindows then [ "--disable-shared" "--enable-static" ] else null;
# ares_android.h header is missing
# see issue https://github.com/c-ares/c-ares/issues/216
postPatch = if stdenv.hostPlatform.isAndroid then ''
cp ${fetchurl {
url = "https://raw.githubusercontent.com/c-ares/c-ares/cares-1_14_0/ares_android.h";
sha256 = "1aw8y6r5c8zq6grjwf4mcm2jj35r5kgdklrp296214s1f1827ps8";
}} ares_android.h
'' else null;
configureFlags = stdenv.lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" ];
meta = with stdenv.lib; {
description = "A C library for asynchronous DNS requests";

4
pkgs/development/libraries/cairo/default.nix
View File

@ -10,14 +10,14 @@
assert glSupport -> libGL != null;
let
version = "1.15.14";
version = "1.16.0";
inherit (stdenv.lib) optional optionals;
in stdenv.mkDerivation rec {
name = "cairo-${version}";
src = fetchurl {
url = "https://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
sha256 = "1399jfdpdhn4hf812hxlj1gyi3bznxwzhp2rnyq1nxjs05n6nmhn";
sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy";
};
outputs = [ "out" "dev" "devdoc" ];

4
pkgs/development/libraries/freetds/default.nix
View File

@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
stdenv.mkDerivation rec {
name = "freetds-${version}";
version = "1.00.94";
version = "1.00.104";
src = fetchurl {
url = "http://www.freetds.org/files/stable/${name}.tar.bz2";
sha256 = "1r03ns0jp2sbbivys5bks376vbdqbnx8v764kjh74gpbajjmkksz";
sha256 = "0mlg027mppv2348f4wwdpxpac9baqkdsg7xqx21kyx5dx5kmr71g";
};
buildInputs = [

10
pkgs/development/libraries/ganv/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python }:
{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
name = "ganv-unstable-${rev}";
@ -10,15 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "0xmbykdl42jn9cgzrqrys5lng67d26nk5xq10wkkvjqldiwdck56";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ graphviz gtk2 gtkmm2 python ];
configurePhase = "${python.interpreter} waf configure --prefix=$out";
buildPhase = "${python.interpreter} waf";
installPhase = "${python.interpreter} waf install";
meta = with stdenv.lib; {
description = "An interactive Gtk canvas widget for graph-based interfaces";
homepage = http://drobilla.net;

2
pkgs/development/libraries/glib/setup-hook.sh
View File

@ -9,7 +9,7 @@ addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas
# Install gschemas, if any, in a package-specific directory
glibPreInstallPhase() {
installFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/")
makeFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/")
}
preInstallPhases+=" glibPreInstallPhase"

4
pkgs/development/libraries/glibc/common.nix
View File

@ -133,9 +133,7 @@ stdenv.mkDerivation ({
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ bison ];
# TODO make linuxHeaders unconditional next mass rebuild
buildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) linuxHeaders
++ lib.optionals withGd [ gd libpng ];
buildInputs = [ linuxHeaders ] ++ lib.optionals withGd [ gd libpng ];
# Needed to install share/zoneinfo/zone.tab. Set to impure /bin/sh to
# prevent a retained dependency on the bootstrap tools in the stdenv-linux

8
pkgs/development/libraries/gstreamer/bad/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, meson, ninja, gettext
, pkgconfig, python, gst-plugins-base, orc
, pkgconfig, python3, gst-plugins-base, orc
, faacSupport ? false, faac ? null
, faad2, libass, libkate, libmms, librdf, ladspaH
, libnice, webrtc-audio-processing, lilv, lv2, serd, sord, sratom
@ -18,7 +18,7 @@ let
in
stdenv.mkDerivation rec {
name = "gst-plugins-bad-${version}";
version = "1.14.2";
version = "1.14.4";
meta = with stdenv.lib; {
description = "Gstreamer Bad Plugins";
@ -54,12 +54,12 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
sha256 = "1bqy3dn7q4kdkd4lqznyly8fv854d0hhncv88jk6ai4rf3dbgyil";
sha256 = "1r8dma3x127rbx42yab7kwq7q1bhkmvz2ykn0rnqnzl95q74w2wi";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ meson ninja pkgconfig python gettext ];
nativeBuildInputs = [ meson ninja pkgconfig python3 gettext ];
buildInputs = [
gst-plugins-base orc

8
pkgs/development/libraries/gstreamer/base/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, lib
, pkgconfig, meson, ninja, gettext, gobjectIntrospection
, python, gstreamer, orc, pango, libtheora
, python3, gstreamer, orc, pango, libtheora
, libintl, libopus
, enableX11 ? stdenv.isLinux, libXv
, enableWayland ? stdenv.isLinux, wayland
@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
name = "gst-plugins-base-${version}";
version = "1.14.2";
version = "1.14.4";
meta = with lib; {
description = "Base plugins and helper libraries";
@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
sha256 = "0z0wy0p0nxxqhsis3n517d6ykldm02g7rca9fhq9kxb9m05yidx4";
sha256 = "0qbllw4kphchwhy4p7ivdysigx69i97gyw6q0rvkx1j81r4kjqfa";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig python gettext gobjectIntrospection ]
nativeBuildInputs = [ pkgconfig python3 gettext gobjectIntrospection ]
# Broken meson with Darwin. Should hopefully be fixed soon. Tracking
# in https://bugzilla.gnome.org/show_bug.cgi?id=781148.

4
pkgs/development/libraries/gstreamer/core/default.nix
View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
name = "gstreamer-${version}";
version = "1.14.2";
version = "1.14.4";
meta = with lib ;{
description = "Open source multimedia framework";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
sha256 = "029fi3v0vrravysgfwhfkrb3ndg64sjmigbb0iwr7wpkk5r15mjb";
sha256 = "1izzhnlsy83rgr4zl3jcl1sryxqbbigrrqw3j4x3nnphqnb6ckzr";
};
patches = [

4
pkgs/development/libraries/gstreamer/ges/default.nix
View File

@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
name = "gstreamer-editing-services-${version}";
version = "1.14.2";
version = "1.14.4";
meta = with stdenv.lib; {
description = "Library for creation of audio/video non-linear editors";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
sha256 = "0d0zqvgxp51mmffz5vvscsdzqqw9mjsv6bnk6ivg2dxnkv8q1ch5";
sha256 = "0pxk65jib3mqszjkyvlzklwia4kbdj6j2b6jw1d502b06mdx5lak";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/gstreamer/good/default.nix
View File

@ -16,7 +16,7 @@ let
in
stdenv.mkDerivation rec {
name = "gst-plugins-good-${version}";
version = "1.14.2";
version = "1.14.4";
meta = with stdenv.lib; {
description = "Gstreamer Good Plugins";
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
sha256 = "1bfa4n6xhr4v4wga8pv1y00rm1aka498snw6kgszy2w624l5wmy0";
sha256 = "0y89qynb4b6fry3h43z1r99qslmi3m8xhlq0i5baq2nbc0r5b2sz";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/gstreamer/libav/default.nix
View File

@ -10,7 +10,7 @@ assert withSystemLibav -> libav != null;
stdenv.mkDerivation rec {
name = "gst-libav-${version}";
version = "1.14.2";
version = "1.14.4";
meta = {
homepage = https://gstreamer.freedesktop.org;
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
sha256 = "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca";
sha256 = "1nk5g24z2xx5kaw5cg8dv8skdc516inahmkymcz8bxqxj28qbmyz";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/gstreamer/rtsp-server/default.nix
View File

@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
name = "gst-rtsp-server-${version}";
version = "1.14.2";
version = "1.14.4";
meta = with stdenv.lib; {
description = "Gstreamer RTSP server";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-rtsp-server/${name}.tar.xz";
sha256 = "161c49hg21xpkdw5ppc7ljbg6kyslxd1y3v1shsg7ibarxapff7p";
sha256 = "1wc4d0y57hpfvv9sykjg8mxj86dw60mf696fbqbiqq6dzlmcw3ix";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/gstreamer/ugly/default.nix
View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec {
name = "gst-plugins-ugly-${version}";
version = "1.14.2";
version = "1.14.4";
meta = with lib; {
description = "Gstreamer Ugly Plugins";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
sha256 = "0s9xrz8knfv06fj1nbv3iq4xj7dj4cnzj3xvgb7zs89rv7crgq2m";
sha256 = "08vd1xgwmapnviah47zv5h2r02qdd20y4f07rvv5zhv6y4vxh0mc";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/gstreamer/vaapi/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "gst-vaapi-${version}";
version = "1.14.2";
version = "1.14.4";
src = fetchurl {
url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";
sha256 = "12hdyfma2lnfj38dj6y891vsxnxrlbqjbd36xx13mgasgzi6843z";
sha256 = "18yha6119v7mwz47idv2vykzfssqfmh6hc824wqqsshwjvzdn66f";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/gstreamer/validate/default.nix
View File

@ -4,7 +4,7 @@
stdenv.mkDerivation rec {
name = "gst-validate-${version}";
version = "1.14.2";
version = "1.14.4";
meta = {
description = "Integration testing infrastructure for the GStreamer framework";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";
sha256 = "17zilvmwv13l6rbj0a7dnbg4kz5bwwa1gshaibpqbvvhahz457pa";
sha256 = "1ismv4i7ldi04swq76pcpd5apxqd52yify5hvlyan2yw9flwrp0q";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/harfbuzz/default.nix
View File

@ -8,7 +8,7 @@
}:
let
version = "1.9.0";
version = "2.1.0";
inherit (stdenv.lib) optional optionals optionalString;
in
@ -17,7 +17,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
sha256 = "004b4j812wgfv8pmcypyrlwrjfa6149lwpz5df6rnm5cy0msdv0i";
sha256 = "1y8jzm76wj8pcj3z47fikhasipyizd6w9r20yc7p139jqxp4jnwf";
};
postPatch = ''

4
pkgs/development/libraries/imlib2/default.nix
View File

@ -5,11 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "imlib2-1.5.0";
name = "imlib2-1.5.1";
src = fetchurl {
url = "mirror://sourceforge/enlightenment/${name}.tar.bz2";
sha256 = "0kg28b5wp886hiy12v7abdybrvlymb7g3nvg0ysn2y8h883s5w8m";
sha256 = "1bms2iwmvnvpz5jqq3r52glarqkafif47zbh1ykz8hw85d2mfkps";
};
buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype libid3tag ]

4
pkgs/development/libraries/libdrm/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
stdenv.mkDerivation rec {
name = "libdrm-2.4.94";
name = "libdrm-2.4.96";
src = fetchurl {
url = "https://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "1ghn3l1dv1rsp9z6jpmy4ryna1s8rm4xx0ds532041bnlfq5jg5p";
sha256 = "14xkip83qgljjaahzq40qgl60j54q7k00la1hbf5kk5lgg7ilmhd";
};
outputs = [ "out" "dev" "bin" ];

7
pkgs/development/libraries/libgcrypt/default.nix
View File

@ -6,11 +6,11 @@ assert enableCapabilities -> stdenv.isLinux;
stdenv.mkDerivation rec {
name = "libgcrypt-${version}";
version = "1.8.3";
version = "1.8.4";
src = fetchurl {
url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
sha256 = "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36";
sha256 = "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n";
};
outputs = [ "out" "dev" "info" ];
@ -21,9 +21,6 @@ stdenv.mkDerivation rec {
# The build enables -O2 by default for everything else.
hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "fortify";
# Accepted upstream, should be in next update: #42150, https://dev.gnupg.org/T4034
patches = [ ./fix-jent-locking.patch ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
buildInputs = [ libgpgerror ]

29
pkgs/development/libraries/libgcrypt/fix-jent-locking.patch
View File

@ -1,29 +0,0 @@
From bbe989be6ca5e093d5244413590bd80e12c2ec9b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 17 Jun 2018 18:53:58 -0500
Subject: [PATCH] rndjent: move locking to fix trying to obtain held lock,
hanging
---
random/rndjent.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/random/rndjent.c b/random/rndjent.c
index 0c5a820b..3740ddd4 100644
--- a/random/rndjent.c
+++ b/random/rndjent.c
@@ -334,9 +334,10 @@ _gcry_rndjent_get_version (int *r_active)
{
if (r_active)
{
- lock_rng ();
/* Make sure the RNG is initialized. */
_gcry_rndjent_poll (NULL, 0, 0);
+
+ lock_rng ();
/* To ease debugging we store 2 for a clock_gettime based
* implementation and 1 for a rdtsc based code. */
*r_active = jent_rng_collector? is_rng_available () : 0;
--
2.18.0-rc2

16
pkgs/development/libraries/libssh/default.nix
View File

@ -1,23 +1,13 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, zlib, openssl, libsodium }:
stdenv.mkDerivation rec {
name = "libssh-0.7.6";
name = "libssh-0.8.4";
src = fetchurl {
url = "https://www.libssh.org/files/0.7/libssh-0.7.6.tar.xz";
sha256 = "14hhdpn2hflywsi9d5bz2pfjxqkyi07znjij89cpakr7b4w7sq0x";
url = "https://www.libssh.org/files/0.8/${name}.tar.xz";
sha256 = "06xqfm1alfb6faqzjhyhjs0arjcd8rnc7ci046x8d18s089pgc3b";
};
patches = [
# Fix mysql-workbench compilation
# https://bugs.mysql.com/bug.php?id=91923
(fetchpatch {
name = "include-fix-segfault-in-getissuebanner-add-missing-wrappers-in-libsshpp.patch";
url = https://git.libssh.org/projects/libssh.git/patch/?id=5ea81166bf885d0fd5d4bb232fc22633f5aaf3c4;
sha256 = "12q818l3nasqrfrsghxdvjcyya1bfcg0idvsf8xwm5zj7criln0a";
})
];
postPatch = ''
# Fix headers to use libsodium instead of NaCl
sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c

14
pkgs/development/libraries/libwacom/default.nix
View File

@ -1,15 +1,17 @@
{ fetchurl, stdenv, glib, pkgconfig, udev, libgudev }:
{ stdenv, fetchFromGitHub, autoreconfHook, glib, pkgconfig, udev, libgudev }:
stdenv.mkDerivation rec {
name = "libwacom-${version}";
version = "0.29";
version = "0.31";
src = fetchurl {
url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2";
sha256 = "1diklgcjhmvcxi9p1ifp6wcnyr6k7z9jhrlzfhzjqd6zipk01slw";
src = fetchFromGitHub {
owner = "linuxwacom";
repo = "libwacom";
rev = "libwacom-${version}";
sha256 = "0qjd4bn2abwzic34cm0sw3srx02spszbsvfdbzbpn2cb62b5gjmw";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ glib udev libgudev ];
meta = with stdenv.lib; {

63
pkgs/development/libraries/mapnik/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
# a distinct dev output makes python-mapnik fail
outputs = [ "out" ];
nativeBuildInputs = [ python scons ];
nativeBuildInputs = [ python ];
buildInputs =
[ boost cairo freetype gdal harfbuzz icu libjpeg libpng libtiff
@ -29,40 +29,35 @@ stdenv.mkDerivation rec {
postgresql
];
configurePhase = ''
scons configure PREFIX="$out" BOOST_INCLUDES="${boost.dev}/include" \
BOOST_LIBS="${boost.out}/lib" \
CAIRO_INCLUDES="${cairo.dev}/include" \
CAIRO_LIBS="${cairo.out}/lib" \
FREETYPE_INCLUDES="${freetype.dev}/include" \
FREETYPE_LIBS="${freetype.out}/lib" \
GDAL_CONFIG="${gdal}/bin/gdal-config" \
HB_INCLUDES="${harfbuzz.dev}/include" \
HB_LIBS="${harfbuzz.out}/lib" \
ICU_INCLUDES="${icu.dev}/include" \
ICU_LIBS="${icu.out}/lib" \
JPEG_INCLUDES="${libjpeg.dev}/include" \
JPEG_LIBS="${libjpeg.out}/lib" \
PNG_INCLUDES="${libpng.dev}/include" \
PNG_LIBS="${libpng.out}/lib" \
PROJ_INCLUDES="${proj}/include" \
PROJ_LIBS="${proj}/lib" \
SQLITE_INCLUDES="${sqlite.dev}/include" \
SQLITE_LIBS="${sqlite.out}/lib" \
TIFF_INCLUDES="${libtiff.dev}/include" \
TIFF_LIBS="${libtiff.out}/lib" \
WEBP_INCLUDES="${libwebp}/include" \
WEBP_LIBS="${libwebp}/lib" \
XML2_INCLUDES="${libxml2.dev}/include" \
XML2_LIBS="${libxml2.out}/lib"
'';
prefixKey = "PREFIX=";
buildPhase = false;
installPhase = ''
mkdir -p "$out"
scons install
'';
configureFlags = [
"BOOST_INCLUDES=${boost.dev}/include"
"BOOST_LIBS=${boost.out}/lib"
"CAIRO_INCLUDES=${cairo.dev}/include"
"CAIRO_LIBS=${cairo.out}/lib"
"FREETYPE_INCLUDES=${freetype.dev}/include"
"FREETYPE_LIBS=${freetype.out}/lib"
"GDAL_CONFIG=${gdal}/bin/gdal-config"
"HB_INCLUDES=${harfbuzz.dev}/include"
"HB_LIBS=${harfbuzz.out}/lib"
"ICU_INCLUDES=${icu.dev}/include"
"ICU_LIBS=${icu.out}/lib"
"JPEG_INCLUDES=${libjpeg.dev}/include"
"JPEG_LIBS=${libjpeg.out}/lib"
"PNG_INCLUDES=${libpng.dev}/include"
"PNG_LIBS=${libpng.out}/lib"
"PROJ_INCLUDES=${proj}/include"
"PROJ_LIBS=${proj}/lib"
"SQLITE_INCLUDES=${sqlite.dev}/include"
"SQLITE_LIBS=${sqlite.out}/lib"
"TIFF_INCLUDES=${libtiff.dev}/include"
"TIFF_LIBS=${libtiff.out}/lib"
"WEBP_INCLUDES=${libwebp}/include"
"WEBP_LIBS=${libwebp}/lib"
"XML2_INCLUDES=${libxml2.dev}/include"
"XML2_LIBS=${libxml2.out}/lib"
];
meta = with stdenv.lib; {
description = "An open source toolkit for developing mapping applications";

4
pkgs/development/libraries/mesa/default.nix
View File

@ -67,7 +67,7 @@ let
in
let
version = "18.2.2";
version = "18.2.4";
branch = head (splitString "." version);
in
@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
];
sha256 = "1i3ky3d210vi3f5hlr9la1kspdyv093npndxsbzdklw95aqq5fn3";
sha256 = "0knbr6nl7qk5bijz6p7yqr8fc806gvmz9p6jlnvdaxkqnpmil7b2";
};
prePatch = "patchShebangs .";

20
pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch
View File

@ -1,4 +1,4 @@
From 9c9df280b318c26aece9873cf77b32e4f95634c1 Mon Sep 17 00:00:00 2001
From 2a1e32b4105fe95413a615a44d40938920ea1a19 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Mon, 6 Aug 2018 15:52:11 -0300
Subject: [PATCH] disk_cache: include dri driver path in cache key
@ -11,10 +11,10 @@ timestamps in /nix/store are zero.
2 files changed, 6 insertions(+)
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 07bf052175..aea09f60b3 100644
index bafb57439a..a22e2e41eb 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -30,6 +30,9 @@ noinst_LTLIBRARIES = \
@@ -35,6 +35,9 @@ noinst_LTLIBRARIES = \
libmesautil.la \
libxmlconfig.la
@ -25,28 +25,28 @@ index 07bf052175..aea09f60b3 100644
$(PTHREAD_CFLAGS) \
-I$(top_srcdir)/include
diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index 4a762eff20..8086c0be75 100644
index 368ec41792..071220b2ba 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -388,8 +388,10 @@ disk_cache_create(const char *gpu_name, const char *timestamp,
@@ -388,8 +388,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
/* Create driver id keys */
size_t ts_size = strlen(timestamp) + 1;
size_t id_size = strlen(driver_id) + 1;
+ size_t key_size = strlen(DISK_CACHE_KEY) + 1;
size_t gpu_name_size = strlen(gpu_name) + 1;
cache->driver_keys_blob_size += ts_size;
cache->driver_keys_blob_size += id_size;
+ cache->driver_keys_blob_size += key_size;
cache->driver_keys_blob_size += gpu_name_size;
/* We sometimes store entire structs that contains a pointers in the cache,
@@ -410,6 +412,7 @@ disk_cache_create(const char *gpu_name, const char *timestamp,
@@ -410,6 +412,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
uint8_t *drv_key_blob = cache->driver_keys_blob;
DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size)
DRV_KEY_CPY(drv_key_blob, timestamp, ts_size)
DRV_KEY_CPY(drv_key_blob, driver_id, id_size)
+ DRV_KEY_CPY(drv_key_blob, DISK_CACHE_KEY, key_size)
DRV_KEY_CPY(drv_key_blob, gpu_name, gpu_name_size)
DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size)
DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size)
--
2.18.0
2.19.1

24
pkgs/development/libraries/ndn-cxx/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchFromGitHub, openssl, doxygen, boost, sqlite, pkgconfig, python, pythonPackages }:
{ stdenv, fetchFromGitHub, openssl, doxygen
, boost, sqlite, pkgconfig, python, pythonPackages, wafHook }:
let
version = "0.6.3";
in
@ -10,22 +11,13 @@ stdenv.mkDerivation {
rev = "a3bf4319ed483a4a6fe2c96b79ec4491d7217f00";
sha256 = "076jhrjigisqz5n8dgxwd5fhimg69zhm834m7w9yvf9afgzrr50h";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ openssl doxygen boost sqlite python pythonPackages.sphinx];
preConfigure = ''
patchShebangs waf
./waf configure \
--prefix=$out \
--with-openssl=${openssl.dev} \
--boost-includes=${boost.dev}/include \
--boost-libs=${boost.out}/lib
'';
buildPhase = ''
./waf
'';
installPhase = ''
./waf install
'';
configureFlags = [
"--with-openssl=${openssl.dev}"
"--boost-includes=${boost.dev}/include"
"--boost-libs=${boost.out}/lib"
];
meta = with stdenv.lib; {
homepage = http://named-data.net/;
description = "A Named Data Neworking (NDN) or Content Centric Networking (CCN) abstraction";

6
pkgs/development/libraries/nghttp2/default.nix
View File

@ -18,13 +18,15 @@ let inherit (stdenv.lib) optional; in
stdenv.mkDerivation rec {
name = "nghttp2-${version}";
version = "1.32.0";
version = "1.34.0";
src = fetchurl {
url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
sha256 = "0jlndbp4bnyvdg8b59pznrzz0bvwb9nmag7zgcflg51lm1pq2q06";
sha256 = "1l5rir8d73x97p3p1x4l8cawjc9m2adnippnb27fmrbcd3rfaxbl";
};
patches = [ ./fix-stream-operator.patch /* can't fetchpatch during bootstrap */ ];
outputs = [ "bin" "out" "dev" "lib" ];
nativeBuildInputs = [ pkgconfig ];

63
pkgs/development/libraries/nghttp2/fix-stream-operator.patch Normal file
View File

@ -0,0 +1,63 @@
From 153531d4d0ebe00ac95047dbf1fec1d9d694f29f Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 7 Oct 2018 22:19:00 +0900
Subject: [PATCH] nghttpx: Use the same type as standard stream operator<<
---
src/shrpx_log.cc | 4 ++--
src/shrpx_log.h | 20 ++++++++++++++------
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/shrpx_log.cc b/src/shrpx_log.cc
index 8459d15e3..6966cf945 100644
--- a/src/shrpx_log.cc
+++ b/src/shrpx_log.cc
@@ -228,7 +228,7 @@ Log &Log::operator<<(const ImmutableString &s) {
return *this;
}
-Log &Log::operator<<(int64_t n) {
+Log &Log::operator<<(long long n) {
if (n >= 0) {
return *this << static_cast<uint64_t>(n);
}
@@ -262,7 +262,7 @@ Log &Log::operator<<(int64_t n) {
return *this;
}
-Log &Log::operator<<(uint64_t n) {
+Log &Log::operator<<(unsigned long long n) {
if (flags_ & fmt_hex) {
write_hex(n);
return *this;
diff --git a/src/shrpx_log.h b/src/shrpx_log.h
index 1130b8da8..17b90536e 100644
--- a/src/shrpx_log.h
+++ b/src/shrpx_log.h
@@ -100,12 +100,20 @@ class Log {
Log &operator<<(const char *s);
Log &operator<<(const StringRef &s);
Log &operator<<(const ImmutableString &s);
- Log &operator<<(int16_t n) { return *this << static_cast<int64_t>(n); }
- Log &operator<<(int32_t n) { return *this << static_cast<int64_t>(n); }
- Log &operator<<(int64_t n);
- Log &operator<<(uint16_t n) { return *this << static_cast<uint64_t>(n); }
- Log &operator<<(uint32_t n) { return *this << static_cast<uint64_t>(n); }
- Log &operator<<(uint64_t n);
+ Log &operator<<(short n) { return *this << static_cast<long long>(n); }
+ Log &operator<<(int n) { return *this << static_cast<long long>(n); }
+ Log &operator<<(long n) { return *this << static_cast<long long>(n); }
+ Log &operator<<(long long n);
+ Log &operator<<(unsigned short n) {
+ return *this << static_cast<unsigned long long>(n);
+ }
+ Log &operator<<(unsigned int n) {
+ return *this << static_cast<unsigned long long>(n);
+ }
+ Log &operator<<(unsigned long n) {
+ return *this << static_cast<unsigned long long>(n);
+ }
+ Log &operator<<(unsigned long long n);
Log &operator<<(float n) { return *this << static_cast<double>(n); }
Log &operator<<(double n);
Log &operator<<(long double n);

14
pkgs/development/libraries/science/networking/ns3/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv
, fetchFromGitHub
, python
, wafHook
# for binding generation
, castxml ? null
@ -50,6 +51,7 @@ stdenv.mkDerivation rec {
sha256 = "17kzfjpgw2mvyx1c9bxccnvw67jpk09fxmcnlkqx9xisk10qnhng";
};
nativeBuildInputs = [ wafHook ];
# ncurses is a hidden dependency of waf when checking python
buildInputs = lib.optionals generateBindings [ castxml ncurses ]
++ stdenv.lib.optional enableDoxygen [ doxygen graphviz imagemagick ]
@ -58,12 +60,9 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ gcc6 pythonEnv ];
postPatch = ''
patchShebangs ./waf
patchShebangs doc/ns3_html_theme/get_version.sh
'';
configureScript = "${python.interpreter} ./waf configure";
configureFlags = with stdenv.lib; [
"--enable-modules=${stdenv.lib.concatStringsSep "," modules}"
"--with-python=${pythonEnv.interpreter}"
@ -74,12 +73,9 @@ stdenv.mkDerivation rec {
++ optional doCheck " --enable-tests "
;
postBuild = with stdenv.lib; let flags = concatStringsSep ";" (
optional enableDoxygen "./waf doxygen"
++ optional withManual "./waf sphinx"
);
in "${flags}"
;
buildTargets = "build"
+ lib.optionalString enableDoxygen " doxygen"
+ lib.optionalString withManual "sphinx";
doCheck = true;

10
pkgs/development/libraries/serd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, python }:
{ stdenv, fetchurl, pkgconfig, python, wafHook }:
stdenv.mkDerivation rec {
name = "serd-${version}";
@ -9,13 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1yyfyvc6kwagi5w43ljp1bbjdvdpmgpds74lmjxycm91bkx0xyvf";
};
nativeBuildInputs = [ pkgconfig python ];
configurePhase = "python waf configure --prefix=$out";
buildPhase = "python waf";
installPhase = "python waf install";
nativeBuildInputs = [ pkgconfig python wafHook ];
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/serd;

28
pkgs/development/libraries/serf/default.nix
View File

@ -9,28 +9,22 @@ stdenv.mkDerivation rec {
sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ apr scons openssl aprutil zlib libiconv ]
nativeBuildInputs = [ pkgconfig scons ];
buildInputs = [ apr openssl aprutil zlib libiconv ]
++ stdenv.lib.optional (!stdenv.isCygwin) kerberos;
patches = [ ./scons.patch ];
buildPhase = ''
scons \
-j $NIX_BUILD_CORES \
APR="$(echo ${apr.dev}/bin/*-config)" \
APU="$(echo ${aprutil.dev}/bin/*-config)" \
CC=$CC \
OPENSSL=${openssl} \
PREFIX="$out" \
ZLIB=${zlib} \
${
if stdenv.isCygwin then "" else "GSSAPI=${kerberos.dev}"
}
'';
prefixKey = "PREFIX=";
installPhase = ''
scons install
preConfigure = ''
sconsFlags+=" APR=$(echo ${apr.dev}/bin/*-config)"
sconsFlags+=" APU=$(echo ${aprutil.dev}/bin/*-config)"
sconsFlags+=" CC=$CC"
sconsFlags+=" OPENSSL=${openssl}"
sconsFlags+=" ZLIB=${zlib}"
'' + stdenv.lib.optionalString (!stdenv.isCygwin) ''
sconsFlags+=" GSSAPI=${kerberos.dev}"
'';
enableParallelBuilding = true;

10
pkgs/development/libraries/sord/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, python, serd, pcre }:
{ stdenv, fetchurl, pkgconfig, python, serd, pcre, wafHook }:
stdenv.mkDerivation rec {
name = "sord-${version}";
@ -9,15 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "13fshxwpipjrvsah1m2jw1kf022z2q5vpw24bzcznglgvms13x89";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig wafHook ];
buildInputs = [ python serd pcre ];
configurePhase = "${python.interpreter} waf configure --prefix=$out";
buildPhase = "${python.interpreter} waf";
installPhase = "${python.interpreter} waf install";
meta = with stdenv.lib; {
homepage = http://drobilla.net/software/sord;
description = "A lightweight C library for storing RDF data in memory";

4
pkgs/development/libraries/speex/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw, speexdsp }:
stdenv.mkDerivation rec {
name = "speex-1.2rc2";
name = "speex-1.2.0";
src = fetchurl {
url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz";
sha256 = "14g8ph39inkrif749lzjm089g7kwk0hymq1a3i9ch5gz8xr7r8na";
sha256 = "150047wnllz4r94whb9r73l5qf0z5z3rlhy98bawfbblmkq8mbpa";
};
postPatch = ''

22
pkgs/development/libraries/swiften/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, python, fetchurl, openssl, boost }:
{ stdenv, python, fetchurl, openssl, boost, scons }:
stdenv.mkDerivation rec {
name = "swiften-${version}";
version = "4.0.2";
nativeBuildInputs = [ scons];
buildInputs = [ python ];
propagatedBuildInputs = [ openssl boost ];
@ -10,16 +11,17 @@ stdenv.mkDerivation rec {
url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz";
sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
};
buildPhase = ''
patchShebangs ./scons
./scons openssl=${openssl.dev} \
boost_includedir=${boost.dev}/include \
boost_libdir=${boost.out}/lib \
boost_bundled_enable=false \
SWIFTEN_INSTALLDIR=$out $out
sconsFlags = [
"openssl=${openssl.dev}"
"boost_includedir=${boost.dev}/include"
"boost_libdir=${boost.out}/lib"
"boost_bundled_enable=false"
];
preInstall = ''
installTargets="$out"
installFlags+=" SWIFT_INSTALLDIR=$out"
'';
installPhase = "true";
meta = with stdenv.lib; {
description = "An XMPP library for C++, used by the Swift client";

8
pkgs/development/libraries/termbox/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python3 }:
{ stdenv, fetchFromGitHub, python3, wafHook }:
stdenv.mkDerivation rec {
name = "termbox-${version}";
@ -9,10 +9,7 @@ stdenv.mkDerivation rec {
rev = "v${version}";
sha256 = "08yqxzb8fny8806p7x8a6f3phhlbfqdd7dhkv25calswj7w1ssvs";
};
nativeBuildInputs = [ python3 ];
configurePhase = "python3 ./waf configure --prefix=$out";
buildPhase = "python3 ./waf build";
installPhase = "python3 ./waf install --destdir=$out";
nativeBuildInputs = [ python3 wafHook ];
meta = with stdenv.lib; {
description = "Library for writing text-based user interfaces";
license = licenses.mit;
@ -21,4 +18,3 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ fgaz ];
};
}

6
pkgs/development/python-modules/Cython/default.nix
View File

@ -13,6 +13,7 @@
let
excludedTests = []
++ [ "reimport_from_subinterpreter" ]
# cython's testsuite is not working very well with libc++
# We are however optimistic about things outside of testsuite still working
++ stdenv.lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ]
@ -25,11 +26,11 @@ let
in buildPythonPackage rec {
pname = "Cython";
version = "0.28.5";
version = "0.29";
src = fetchPypi {
inherit pname version;
sha256 = "b64575241f64f6ec005a4d4137339fb0ba5e156e826db2fdb5f458060d9979e0";
sha256 = "15zama7fgp7yyi3z39xp3z2lvwcgch8fn3ycscw2cs37vqg6v4cl";
};
nativeBuildInputs = [
@ -44,6 +45,7 @@ in buildPythonPackage rec {
checkPhase = ''
export HOME="$NIX_BUILD_TOP"
${python.interpreter} runtests.py -j$NIX_BUILD_CORES \
--no-code-style \
${stdenv.lib.optionalString (builtins.length excludedTests != 0)
''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''}
'';

35
pkgs/development/python-modules/aioeventlet/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, eventlet
, trollius
, asyncio
, mock
, python
}:
buildPythonPackage rec {
pname = "aioeventlet";
version = "0.4";
src = fetchPypi {
inherit pname version;
sha256 = "19krvycaiximchhv1hcfhz81249m3w3jrbp2h4apn1yf4yrc4y7y";
};
propagatedBuildInputs = [ eventlet trollius asyncio ];
buildInputs = [ mock ];
# 2 tests error out
doCheck = false;
checkPhase = ''
${python.interpreter} runtests.py
'';
meta = with stdenv.lib; {
description = "aioeventlet implements the asyncio API (PEP 3156) on top of eventlet. It makes";
homepage = http://aioeventlet.readthedocs.org/;
license = licenses.asl20;
};
}

33
pkgs/development/python-modules/argh/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pytest
, py
, mock
, pkgs
}:
buildPythonPackage rec {
pname = "argh";
version = "0.26.1";
src = fetchPypi {
inherit pname version;
sha256 = "1nqham81ihffc9xmw85dz3rg3v90rw7h0dp3dy0bh3qkp4n499q6";
};
buildInputs = [ pytest py mock pkgs.glibcLocales ];
checkPhase = ''
export LANG="en_US.UTF-8"
py.test
'';
meta = with stdenv.lib; {
homepage = http://github.com/neithere/argh/;
description = "An unobtrusive argparse wrapper with natural syntax";
license = licenses.lgpl2;
maintainers = with maintainers; [ domenkozar ];
};
}

4
pkgs/development/python-modules/autobahn/default.nix
View File

@ -4,11 +4,11 @@
}:
buildPythonPackage rec {
pname = "autobahn";
version = "18.8.2";
version = "18.10.1";
src = fetchPypi {
inherit pname version;
sha256 = "448df2e241011ea2948799918930042d81e63d26b01912c472f5a9a37f42f319";
sha256 = "b5767bebd94ba13fc286604f889f208e7babc77d72d9f372d331bc14c89c5a40";
};
propagatedBuildInputs = [ six txaio twisted zope_interface cffi ] ++

12
pkgs/development/python-modules/autopep8/default.nix
View File

@ -1,19 +1,23 @@
{ stdenv, fetchPypi, buildPythonPackage, pycodestyle }:
{ stdenv, fetchPypi, buildPythonPackage, pycodestyle, glibcLocales }:
buildPythonPackage rec {
pname = "autopep8";
version = "1.3.5";
version = "1.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "192bvhzi4d0claqxgzymvv7k3qnj627742bc8sgxpzjj42pd9112";
sha256 = "1b8d42ebba751a91090d3adb5c06840b1151d71ed43e1c7a9ed6911bfe8ebe6c";
};
propagatedBuildInputs = [ pycodestyle ];
# One test fails:
# FAIL: test_recursive_should_not_crash_on_unicode_filename (test.test_autopep8.CommandLineTests)
doCheck = false;
# doCheck = false;
checkInputs = [ glibcLocales ];
LC_ALL = "en_US.UTF-8";
meta = with stdenv.lib; {
description = "A tool that automatically formats Python code to conform to the PEP 8 style guide";

43
pkgs/development/python-modules/basemap/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ stdenv
, buildPythonPackage
, fetchurl
, numpy
, matplotlib
, pillow
, setuptools
, pkgs
}:
buildPythonPackage rec {
pname = "basemap";
version = "1.0.7";
src = fetchurl {
url = "mirror://sourceforge/project/matplotlib/matplotlib-toolkits/basemap-1.0.7/basemap-1.0.7.tar.gz";
sha256 = "0ca522zirj5sj10vg3fshlmgi615zy5gw2assapcj91vsvhc4zp0";
};
propagatedBuildInputs = [ numpy matplotlib pillow ];
buildInputs = [ setuptools pkgs.geos pkgs.proj ];
# Standard configurePhase from `buildPythonPackage` seems to break the setup.py script
configurePhase = ''
export GEOS_DIR=${pkgs.geos}
'';
# The 'check' target is not supported by the `setup.py` script.
# TODO : do the post install checks (`cd examples && ${python.interpreter} run_all.py`)
doCheck = false;
meta = with stdenv.lib; {
homepage = "https://matplotlib.org/basemap/";
description = "Plot data on map projections with matplotlib";
longDescription = ''
An add-on toolkit for matplotlib that lets you plot data on map projections with
coastlines, lakes, rivers and political boundaries. See
http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do.
'';
license = with licenses; [ mit gpl2 ];
};
}

Some files were not shown because too many files have changed in this diff Show More