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

Merge branch 'staging' into auto-update/remmina

Browse Source
This commit is contained in:
Jörg Thalheim 2018-11-18 10:45:23 +00:00 committed by GitHub
commit e354db0f6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
581 changed files with 11348 additions and 8527 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

20
lib/strings.nix
View File

@ -236,6 +236,26 @@ rec {
in lenContent >= lenSuffix &&
substring (lenContent - lenSuffix) lenContent content == suffix;
/* Determine whether a string contains the given infix
Type: hasInfix :: string -> string -> bool
Example:
hasInfix "bc" "abcd"
=> true
hasInfix "ab" "abcd"
=> true
hasInfix "cd" "abcd"
=> true
hasInfix "foo" "abcd"
=> false
*/
hasInfix = infix: content:
let
drop = x: substring 1 (stringLength x) x;
in hasPrefix infix content
|| content != "" && hasInfix infix (drop content);
/* Convert a string to a list of characters (i.e. singleton strings).
This allows you to, e.g., map a function over each character. However,
note that this will likely be horribly inefficient; Nix is not a

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>

4
pkgs/applications/altcoins/mist.nix
View File

@ -2,7 +2,7 @@
let
version = "0.11.1";
name = "mist";
pname = "mist";
throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
@ -26,7 +26,7 @@ let
};
mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation {
inherit name version meta;
inherit pname version meta;
src = {
i686-linux = fetchurl {

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

2
pkgs/applications/audio/cadence/default.nix
View File

@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
version = "0.9.0";
name = "cadence";
pname = "cadence";
src = fetchurl {
url = "https://github.com/falkTX/Cadence/archive/v${version}.tar.gz";

4
pkgs/applications/audio/fluidsynth/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "fluidsynth-${version}";
version = "1.1.11";
version = "2.0.1";
src = fetchFromGitHub {
owner = "FluidSynth";
repo = "fluidsynth";
rev = "v${version}";
sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh";
sha256 = "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7";
};
nativeBuildInputs = [ pkgconfig cmake ];

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;

5
pkgs/applications/audio/vcv-rack/default.nix
View File

@ -3,8 +3,9 @@
, libzip, rtaudio, rtmidi, speex }:
let
glfw-git = glfw.overrideAttrs (oldAttrs: {
name = "glfw-git-20180529";
glfw-git = glfw.overrideAttrs (oldAttrs: rec {
name = "glfw-git-${version}";
version = "unstable-2018-05-29";
src = fetchFromGitHub {
owner = "glfw";
repo = "glfw";

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 ];

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
'';

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

@ -6,7 +6,7 @@
}:
python3Packages.buildPythonApplication rec {
name = "vimiv";
pname = "vimiv";
version = "0.7.3";
src = fetchFromGitHub {

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;

1
pkgs/applications/misc/k2pdfopt/default.nix
View File

@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
let
mupdf_modded = mupdf.overrideAttrs (attrs: {
name = "mupdf-1.10a";
version = "1.10a";
src = fetchurl {
url = "https://mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz";
sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a";

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

2
pkgs/applications/misc/omegat.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
version = "4.1.5.2";
name = "omegat";
pname = "omegat";
src = fetchurl { # their zip has repeated files or something, so no fetchzip
url = mirror://sourceforge/project/omegat/OmegaT%20-%20Latest/OmegaT%204.1.5%20update%202/OmegaT_4.1.5_02_Beta_Without_JRE.zip;

8
pkgs/applications/misc/oneko/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, xorg, xlibsWrapper }:
stdenv.mkDerivation rec {
version = "1.2.sakura.5";
vname = "1.2.5";
name = "oneko-${vname}";
version_name = "1.2.sakura.5";
version = "1.2.5";
name = "oneko-${version}";
src = fetchurl {
url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz";
url = "http://www.daidouji.com/oneko/distfiles/oneko-${version_name}.tar.gz";
sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f";
};
buildInputs = [ xorg.imake xorg.gccmakedep xlibsWrapper ];

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";

2
pkgs/applications/networking/browsers/brave/default.nix
View File

@ -71,7 +71,7 @@ let rpath = lib.makeLibraryPath [
in stdenv.mkDerivation rec {
name = "brave";
pname = "brave";
version = "0.56.12";
src = fetchurl {

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";

4
pkgs/applications/networking/enhanced-ctorrent/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation rec {
version = "dnh3.3.2";
name = "enhanced-ctorrent";
version = "3.3.2";
pname = "enhanced-ctorrent-dhn";
src = fetchurl {
url = "http://www.rahul.net/dholmes/ctorrent/ctorrent-dnh3.3.2.tar.gz";

4
pkgs/applications/networking/flent/http-getter.nix
View File

@ -2,8 +2,8 @@
, curl, pkgconfig }:
stdenv.mkDerivation rec {
name = "http-getter";
version = "20180606";
pname = "http-getter";
version = "unstable-2018-06-06";
src = fetchFromGitHub {
owner = "tohojo";

5
pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
View File

@ -9,12 +9,11 @@ let
in
stdenv.mkDerivation rec {
name = "salut-a-toi-${version}";
pname = "salut-a-toi";
version = "0.6.1";
pname = "sat-${version}";
src = fetchurl {
url = "ftp://ftp.goffi.org/sat/${pname}.tar.bz2";
url = "ftp://ftp.goffi.org/sat/sat-${version}.tar.bz2";
sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d";
};

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; {

2
pkgs/applications/networking/remote/remmina/default.nix
View File

@ -12,7 +12,7 @@
with stdenv.lib;
stdenv.mkDerivation rec {
name = "remmina-${version}";
pname = "remmina";
version = "1.2.32.1";
src = fetchFromGitLab {

6
pkgs/applications/office/bookworm/default.nix
View File

@ -3,14 +3,12 @@
stdenv.mkDerivation rec {
pname = "bookworm";
version = "4f7b118281667d22f1b3205edf0b775341fa49cb";
name = "${pname}-2018-10-21";
version = "unstable-2018-10-21";
src = fetchFromGitHub {
owner = "babluboy";
repo = pname;
rev = version;
rev = "4f7b118281667d22f1b3205edf0b775341fa49cb";
sha256 = "0bcyim87zk4b4xmgfs158lnds3y8jg7ppzw54kjpc9rh66fpn3b9";
};

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";

1
pkgs/applications/science/misc/sasview/xhtml2pdf.nix
View File

@ -3,6 +3,7 @@
let
#xhtml2pdf specifically requires version "1.0b10" of html5lib
html5 = html5lib.overrideAttrs( oldAttrs: rec{
name = "${oldAttrs.pname}-${version}";
version = "1.0b10";
src = oldAttrs.src.override {
inherit version;

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/";

69
pkgs/applications/video/kodi/plugins.nix
View File

@ -1,6 +1,7 @@
{ stdenv, callPackage, fetchurl, fetchFromGitHub, unzip
, cmake, kodiPlain, libcec_platform, tinyxml
, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib }:
, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib
, python2Packages }:
with stdenv.lib;
@ -180,26 +181,6 @@ let self = rec {
// (mkController "ps")
// (mkController "snes");
exodus = mkKodiPlugin rec {
plugin = "exodus";
namespace = "plugin.video.exodus";
version = "3.1.13";
src = fetchurl {
url = "https://offshoregit.com/${plugin}/${namespace}/${namespace}-${version}.zip";
sha256 = "1zyay7cinljxmpzngzlrr4pnk2a7z9wwfdcsk6a4p416iglyggdj";
};
buildInputs = [ unzip ];
meta = {
description = "A streaming plugin for Kodi";
platforms = platforms.all;
maintainers = with maintainers; [ edwtjo ];
};
};
hyper-launcher = let
pname = "hyper-launcher";
version = "1.5.2";
@ -251,6 +232,25 @@ let self = rec {
};
simpleplugin = mkKodiPlugin rec {
plugin = "simpleplugin";
namespace = "script.module.simpleplugin";
version = "2.3.2";
src = fetchFromGitHub {
owner = "romanvm";
repo = namespace;
rev = "v.${version}";
sha256 = "0myar8dqjigb75pcc8zx3i5z79p1ifgphgb82s5syqywk0zaxm3j";
};
meta = {
homepage = src.meta.homepage;
description = "Simpleplugin API";
license = licenses.gpl3;
};
};
svtplay = mkKodiPlugin rec {
plugin = "svtplay";
@ -443,4 +443,31 @@ let self = rec {
};
};
yatp = python2Packages.toPythonModule (mkKodiPlugin rec {
plugin = "yatp";
namespace = "plugin.video.yatp";
version = "3.3.2";
src = fetchFromGitHub {
owner = "romanvm";
repo = "kodi.yatp";
rev = "v.${version}";
sha256 = "12g1f57sx7dy6wy7ljl7siz2qs1kxcmijcg7xx2xpvmq61x9qa2d";
};
patches = [ ./yatp/dont-monkey.patch ];
propagatedBuildInputs = [
simpleplugin
python2Packages.requests
python2Packages.libtorrentRasterbar
];
meta = {
homepage = src.meta.homepage;
description = "Yet Another Torrent Player: libtorrent-based torrent streaming for Kodi";
license = licenses.gpl3;
};
});
}; in self

29
pkgs/applications/video/kodi/yatp/dont-monkey.patch Normal file
View File

@ -0,0 +1,29 @@
diff --git a/plugin.video.yatp/server.py b/plugin.video.yatp/server.py
index 1adcbb5..488b72c 100644
--- a/plugin.video.yatp/server.py
+++ b/plugin.video.yatp/server.py
@@ -20,24 +20,8 @@ addon = Addon()
_ = addon.initialize_gettext()
addon.log_notice('Starting Torrent Server...')
-# A monkey-patch to set the necessary librorrent version
-librorrent_addon = Addon('script.module.libtorrent')
-orig_custom_version = librorrent_addon.get_setting('custom_version', False)
-orig_set_version = librorrent_addon.get_setting('set_version', False)
-librorrent_addon.set_setting('custom_version', 'true')
-if addon.libtorrent_version == '1.0.9':
- librorrent_addon.set_setting('set_version', '4')
-elif addon.libtorrent_version == '1.1.0':
- librorrent_addon.set_setting('set_version', '5')
-elif addon.libtorrent_version == '1.1.1':
- librorrent_addon.set_setting('set_version', '6')
-else:
- librorrent_addon.set_setting('set_version', '0')
-
from libs.server import wsgi_app
-librorrent_addon.set_setting('custom_version', orig_custom_version)
-librorrent_addon.set_setting('set_version', orig_set_version)
# ======
if addon.enable_limits:

9
pkgs/applications/virtualization/docker/default.nix
View File

@ -16,7 +16,8 @@ rec {
} :
let
docker-runc = runc.overrideAttrs (oldAttrs: rec {
name = "docker-runc";
name = "docker-runc-${version}";
inherit version;
src = fetchFromGitHub {
owner = "docker";
repo = "runc";
@ -28,7 +29,8 @@ rec {
});
docker-containerd = (containerd.override { inherit go; }).overrideAttrs (oldAttrs: rec {
name = "docker-containerd";
name = "docker-containerd-${version}";
inherit version;
src = fetchFromGitHub {
owner = "docker";
repo = "containerd";
@ -42,7 +44,8 @@ rec {
});
docker-tini = tini.overrideAttrs (oldAttrs: rec {
name = "docker-init";
name = "docker-init-${version}";
inherit version;
src = fetchFromGitHub {
owner = "krallin";
repo = "tini";

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;
};
}

2
pkgs/build-support/fetchegg/default.nix
View File

@ -8,7 +8,7 @@ if md5 != "" then
throw "fetchegg does not support md5 anymore, please use sha256"
else
stdenvNoCC.mkDerivation {
name = "chicken-${name}-export";
name = "chicken-${name}-export-${version}";
builder = ./builder.sh;
nativeBuildInputs = [ chicken ];

10
pkgs/build-support/setup-hooks/audit-tmpdir.sh
View File

@ -13,23 +13,23 @@ auditTmpdir() {
local dir="$1"
[ -e "$dir" ] || return 0
header "checking for references to $TMPDIR in $dir..."
header "checking for references to $TMPDIR/ in $dir..."
local i
while IFS= read -r -d $'\0' i; do
if [[ "$i" =~ .build-id ]]; then continue; fi
if isELF "$i"; then
if patchelf --print-rpath "$i" | grep -q -F "$TMPDIR"; then
echo "RPATH of binary $i contains a forbidden reference to $TMPDIR"
if patchelf --print-rpath "$i" | grep -q -F "$TMPDIR/"; then
echo "RPATH of binary $i contains a forbidden reference to $TMPDIR/"
exit 1
fi
fi
if isScript "$i"; then
if [ -e "$(dirname "$i")/.$(basename "$i")-wrapped" ]; then
if grep -q -F "$TMPDIR" "$i"; then
echo "wrapper script $i contains a forbidden reference to $TMPDIR"
if grep -q -F "$TMPDIR/" "$i"; then
echo "wrapper script $i contains a forbidden reference to $TMPDIR/"
exit 1
fi
fi

2
pkgs/build-support/setup-hooks/make-wrapper.sh
View File

@ -40,7 +40,7 @@ makeWrapper() {
mkdir -p "$(dirname "$wrapper")"
echo "#! $SHELL -e" > "$wrapper"
echo "#! @shell@ -e" > "$wrapper"
params=("$@")
for ((n = 2; n < ${#params[*]}; n += 1)); do

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; {

4
pkgs/development/beam-modules/hex-registry-snapshot.nix
View File

@ -1,9 +1,9 @@
{stdenv, writeText, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "hex-registry";
pname = "hex-registry";
rev = "11d7a24e9f53f52490ce255a6248e71128e73aa1";
version = "20180712.${rev}";
version = "unstable-2018-07-12";
src = fetchFromGitHub {
inherit rev;

6
pkgs/development/beam-modules/hex/default.nix
View File

@ -7,13 +7,13 @@ let
};
pkg = self: stdenv.mkDerivation rec {
name = "hex";
version = "v0.17.1";
pname = "hex";
version = "0.17.1";
src = fetchFromGitHub {
owner = "hexpm";
repo = "hex";
rev = "${version}";
rev = "v${version}";
sha256 = "1s4asar1mcavzj3w37jcz243ka0z5jm0r42yws3h4aagawxxg02z";
};

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;

31
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
@ -180,7 +177,7 @@ stdenv.mkDerivation ({
inherit patches;
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
hardeningDisable = [ "format" "pie" ];
outputs = [ "out" "lib" "man" "info" ];
setOutputFlags = false;
@ -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;

32
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
@ -188,7 +185,7 @@ stdenv.mkDerivation ({
inherit patches;
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
hardeningDisable = [ "format" "pie" ];
outputs = if langJava || langGo then ["out" "man" "info"]
else [ "out" "lib" "man" "info" ];
@ -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;
};
}

19
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;
@ -181,7 +178,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
hardeningDisable = [ "format" "pie" ];
# This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths.
@ -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;
};
}

29
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;
@ -182,7 +178,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
hardeningDisable = [ "format" "pie" ];
# This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths.
@ -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;
};
}

17
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 =
@ -151,7 +149,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
hardeningDisable = [ "format" "pie" ];
# This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths.
@ -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;
};
}

17
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 =
@ -145,7 +143,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;
hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie";
hardeningDisable = [ "format" "pie" ];
# This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths.
@ -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;
};
}

17
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 =
@ -139,7 +137,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;
hardeningDisable = [ "format" ];
hardeningDisable = [ "format" "pie" ];
postPatch =
if targetPlatform != hostPlatform || stdenv.cc.libc != null then
@ -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;

4
pkgs/development/compilers/go/1.11.nix
View File

@ -22,13 +22,13 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
version = "1.11";
version = "1.11.2";
src = fetchFromGitHub {
owner = "golang";
repo = "go";
rev = "go${version}";
sha256 = "1k18d6rkijlgzn1zw4wphzcv6a6w9hb1msgrsh1102jb18644f2q";
sha256 = "0pk7pxfm3ij2ksdrg49jz501fr1d103zr4mjjwv821if9g279jc9";
};
GOCACHE = "off";

2
pkgs/development/compilers/graalvm/default.nix
View File

@ -65,7 +65,7 @@ in rec {
mx = stdenv.mkDerivation rec {
version = "5.192.0";
name = "mx";
pname = "mx";
src = fetchFromGitHub {
owner = "graalvm";
repo = "mx";

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 ];

4
pkgs/development/compilers/nasm/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "nasm-${version}";
version = "2.13.03";
version = "2.14";
src = fetchurl {
url = "https://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
sha256 = "04bh736zfj3xy5ihh1whshpjxsisv7hqkz954clzdw6kg93qdv33";
sha256 = "0i678zbm1ljn5jwia7gj1n503izwvzlh55xzm4i0qgfmr8kzsg6l";
};
nativeBuildInputs = [ perl ];

16
pkgs/development/compilers/rust/bootstrap.nix
View File

@ -3,16 +3,16 @@
let
# Note: the version MUST be one version prior to the version we're
# building
version = "1.29.2";
version = "1.30.0";
# fetch hashes by running `print-hashes.sh 1.29.2`
# fetch hashes by running `print-hashes.sh 1.30.0`
hashes = {
i686-unknown-linux-gnu = "fd67338c32348fc0cf09dd066975acc221e062fdc3b052912baef93b39a0b27e";
x86_64-unknown-linux-gnu = "e9809825c546969a9609ff94b2793c9107d7d9bed67d557ed9969e673137e8d8";
armv7-unknown-linux-gnueabihf = "943ee757d96be97baccb84b0c2a5da368f8f3adf082805b0f0323240e80975c0";
aarch64-unknown-linux-gnu = "e11461015ca7106ef8ebf00859842bf4be518ee170226cb8eedaaa666946509f";
i686-apple-darwin = "aadec39efcbc476e00722b527dcc587003ab05194efd06ba1b91c1e0f7512d3f";
x86_64-apple-darwin = "63f54e3013406b39fcb5b84bcf5e8ce85860d0b97a1e156700e467bf5fb5d5f2";
i686-unknown-linux-gnu = "4ceb0e3011d96504587abb7edfdea9c1b4b7cb2c4488cc4a25adc2f3b6a88b21";
x86_64-unknown-linux-gnu = "f620e3125cc505c842150bd873c0603432b6cee984cdae8b226cf92c8aa1a80f";
armv7-unknown-linux-gnueabihf = "63991f6769ca8db693562c34ac25473e9d4f9f214d6ee98917891be469d69cfd";
aarch64-unknown-linux-gnu = "9690c7c50eba5a8461184ee4138b4c284bad31ccc4aa1f2ddeec58b253e6363e";
i686-apple-darwin = "b8e5ac31f0a192a58b0e98ff88c47035a2882598946352fa5a86c28ede079230";
x86_64-apple-darwin = "07008d90932712282bc599f1e9a226e97879c758dc1f935e6e2675e45694cc1b";
};
platform =

6
pkgs/development/compilers/rust/default.nix
View File

@ -7,11 +7,11 @@
let
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
version = "1.30.0";
version = "1.30.1";
cargoVersion = "1.30.0";
src = fetchurl {
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
sha256 = "1vh8q5i273xyjvpipqisny11iz0xfgz30cgjr7068nx5rhzsh2yd";
sha256 = "0aavdc1lqv0cjzbqwl5n59yd0bqdlhn0zas61ljf38yrvc18k8rn";
};
in rec {
rustc = callPackage ./rustc.nix {
@ -29,7 +29,7 @@ in rec {
./patches/disable-test-inherit-env.patch
];
forceBundledLLVM = true;
withBundledLLVM = false;
configureFlags = [ "--release-channel=stable" ];

57
pkgs/development/compilers/rust/rustc.nix
View File

@ -1,9 +1,9 @@
{ stdenv, targetPackages
{ stdenv, targetPackages, removeReferencesTo
, fetchurl, fetchgit, fetchzip, file, python2, tzdata, ps
, llvm, jemalloc, ncurses, darwin, rustPlatform, git, cmake, curl
, which, libffi, gdb
, version
, forceBundledLLVM ? false
, withBundledLLVM ? false
, src
, configureFlags ? []
, patches
@ -20,6 +20,8 @@ let
llvmShared = llvm.override { enableSharedLibraries = true; };
prefixedJemalloc = jemalloc.override { stripPrefix = false; };
target = builtins.replaceStrings [" "] [","] (builtins.toString targets);
in
@ -40,7 +42,11 @@ stdenv.mkDerivation {
# See https://github.com/NixOS/nixpkgs/pull/34227
stripDebugList = if stdenv.isDarwin then [ "bin" ] else null;
NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
NIX_LDFLAGS =
# when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch'
optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state"
++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++"
++ optional stdenv.isDarwin "-rpath ${llvmShared}/lib";
# Enable nightly features in stable compiles (used for
# bootstrapping, see https://github.com/rust-lang/rust/pull/37265).
@ -54,13 +60,12 @@ stdenv.mkDerivation {
# We need rust to build rust. If we don't provide it, configure will try to download it.
# Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py
configureFlags = configureFlags
++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath" ]
++ [ "--enable-vendor" ]
# ++ [ "--jemalloc-root=${jemalloc}/lib"
++ [ "--default-linker=${targetPackages.stdenv.cc}/bin/cc" ]
++ optional (!forceBundledLLVM) [ "--enable-llvm-link-shared" ]
++ optional (targets != []) "--target=${target}"
++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";
++ [ "--enable-local-rust" "--local-rust-root=${rustPlatform.rust.rustc}" "--enable-rpath"
"--enable-vendor"
"--jemalloc-root=${prefixedJemalloc}/lib"
"--default-linker=${targetPackages.stdenv.cc}/bin/cc" ]
++ optional (!withBundledLLVM) [ "--enable-llvm-link-shared" "--llvm-root=${llvmShared}" ]
++ optional (targets != []) "--target=${target}";
# The bootstrap.py will generated a Makefile that then executes the build.
# The BOOTSTRAP_ARGS used by this Makefile must include all flags to pass
@ -79,29 +84,13 @@ stdenv.mkDerivation {
postPatch = ''
patchShebangs src/etc
# Fix dynamic linking against llvm
#${optionalString (!forceBundledLLVM) ''sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py''}
${optionalString (!withBundledLLVM) ''rm -rf src/llvm''}
rm -rf src/jemalloc
# Fix the configure script to not require curl as we won't use it
sed -i configure \
-e '/probe_need CFG_CURL curl/d'
# Fix the use of jemalloc prefixes which our jemalloc doesn't have
# TODO: reenable if we can figure out how to get our jemalloc to work
#[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs
#[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
# Disable fragile tests.
rm -vr src/test/run-make-fulldeps/linker-output-non-utf8 || true
rm -vr src/test/run-make-fulldeps/issue-26092 || true
# Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835
rm -vr src/test/ui/run-pass/issue-36023.rs || true
# Disable test getting stuck on hydra - possible fix:
# https://reviews.llvm.org/rL281650
rm -vr src/test/ui/run-pass/issue-36474.rs || true
# On Hydra: `TcpListener::bind(&addr)`: Address already in use (os error 98)'
sed '/^ *fn fast_rebind()/i#[ignore]' -i src/libstd/net/tcp.rs
@ -137,14 +126,14 @@ stdenv.mkDerivation {
# ps is needed for one of the test cases
nativeBuildInputs =
[ file python2 ps rustPlatform.rust.rustc git cmake
which libffi
which libffi removeReferencesTo
]
# Only needed for the debuginfo tests
++ optional (!stdenv.isDarwin) gdb;
buildInputs = [ ncurses ] ++ targetToolchains
buildInputs = targetToolchains
++ optional stdenv.isDarwin Security
++ optional (!forceBundledLLVM) llvmShared;
++ optional (!withBundledLLVM) llvmShared;
outputs = [ "out" "man" "doc" ];
setOutputFlags = false;
@ -165,6 +154,12 @@ stdenv.mkDerivation {
inherit doCheck;
# remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
# and thus a transitive dependency on ncurses
postInstall = ''
find $out/lib -name "*.so" -type f -exec remove-references-to -t ${llvmShared} '{}' '+'
'';
configurePlatforms = [];
# https://github.com/NixOS/nixpkgs/pull/21742#issuecomment-272305764

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";

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

@ -60,9 +60,7 @@ stdenv.mkDerivation rec {
cf-private
];
# /build/SDL2-2.0.7/src/video/wayland/SDL_waylandevents.c:41:10: fatal error:
# pointer-constraints-unstable-v1-client-protocol.h: No such file or directory
enableParallelBuilding = false;
enableParallelBuilding = true;
configureFlags = [
"--disable-oss"

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" ];

2
pkgs/development/libraries/elf-header/default.nix
View File

@ -12,7 +12,7 @@ let
in
stdenvNoCC.mkDerivation {
name = "elf-header";
pname = "elf-header";
inherit (libc) version;
src = null;

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;

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

@ -1,13 +1,13 @@
{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
name = "gdbm-1.18";
# FIXME: remove on update to > 1.18
name = "gdbm-1.18.1";
# FIXME: remove on update to > 1.18.1
NIX_CFLAGS_COMPILE = if stdenv.cc.isClang then "-Wno-error=return-type" else null;
src = fetchurl {
url = "mirror://gnu/gdbm/${name}.tar.gz";
sha256 = "1kimnv12bzjjhaqk4c8w2j6chdj9c6bg21lchaf7abcyfss2r0mq";
sha256 = "1p4ibds6z3ccy65lkmd6lm7js0kwifvl53r0fd759fjxgr917rl6";
};
doCheck = true; # not cross;

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

4
pkgs/development/libraries/gnu-efi/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "gnu-efi-${version}";
version = "3.0.8";
version = "3.0.9";
src = fetchurl {
url = "mirror://sourceforge/gnu-efi/${name}.tar.bz2";
sha256 = "08mpw8s79azip9jbzm6msq0999pnkqzd82axydrcyyynm276s03n";
sha256 = "1w3p4aqlc5j93q44la7dc8cr3hky20zvsd0h0k2lyzhwmrzfl5b7";
};
buildInputs = [ pciutils ];

5
pkgs/development/libraries/gsignond/default.nix
View File

@ -6,16 +6,15 @@
let
unwrapped = stdenv.mkDerivation rec {
pname = "gsignond";
version = "39022c86ddb5062a10fb0503ad9d81a8e532d527";
version = "unstable-2018-10-04";
name = "${pname}-2018-10-04";
outputs = [ "out" "dev" "devdoc" ];
src = fetchFromGitLab {
owner = "accounts-sso";
repo = pname;
rev = version;
rev = "39022c86ddb5062a10fb0503ad9d81a8e532d527";
sha256 = "1gw8vbj3j6wxqy759z97arm8lnqhmraw9s2frv3ar6crnfhlidff";
};

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" ];

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