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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát 2017-06-16 21:59:19 +02:00
commit bfd865dc61
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
26 changed files with 2055 additions and 1282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/audio/artyFX/default.nix
View File

@ -1,13 +1,14 @@
{ stdenv, fetchgit, cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:
{ stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }:
stdenv.mkDerivation rec {
name = "artyFX-git-${version}";
version = "2015-05-07";
name = "artyFX-${version}";
version = "1.3";
src = fetchgit {
url = "https://github.com/harryhaaren/openAV-ArtyFX.git";
rev = "3a8cb9a5e4ffaf27a497a31cc9cd6f2e79622d5b";
sha256 = "0nsmycm64a686ysfnmdvnaazijvfj90z5wyp96kyr81nsrbcv2ij";
src = fetchFromGitHub {
owner = "openAVproductions";
repo = "openAV-ArtyFX";
rev = "release-${version}";
sha256 = "012hcy1mxl7gs2lipfcqp5x0xv1azb9hjrwf0h59yyxnzx96h7c9";
};
buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk pkgconfig ];

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

@ -1,10 +1,10 @@
{ stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }:
stdenv.mkDerivation rec {
name = "eq10q-${version}";
version = "2.1";
version = "2.2";
src = fetchurl {
url = "mirror://sourceforge/project/eq10q/${name}.tar.gz";
sha256 = "0brrr6ydsppi4zzn3vcgl0zgq5r8jmlcap1hpr3k43yvlwggb880";
sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk";
};
buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];

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

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "jalv-${version}";
version = "1.4.6";
version = "1.6.0";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "1f1hcq74n3ziw8bk97mn5a1vgw028dxikv3fchaxd430pbbhqgl9";
sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili";
};
buildInputs = [

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "lv2bm-${version}";
version = "git-2015-04-10";
version = "git-2015-11-29";
src = fetchFromGitHub {
owner = "portalmod";
owner = "moddevices";
repo = "lv2bm";
rev = "08681624fc13eb700ec2b5cabedbffdf095e28b3";
sha256 = "11pi97jy4f4c3vsaizc8a6sw9hnhnanj6y1fil33yd9x7f8f0kbj";
rev = "e844931503b7597f45da6d61ff506bb9fca2e9ca";
sha256 = "1rrz5sp04zjal6v34ldkl6fjj9xqidb8xm1iscjyljf6z4l516cx";
};
buildInputs = [ glib lilv lv2 pkgconfig serd sord sratom ];

7
pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }:
stdenv.mkDerivation rec {
name = "faustCompressors-v${version}";
version = "1.1.1";
version = "1.2";
src = fetchFromGitHub {
owner = "magnetophon";
repo = "faustCompressors";
rev = "v${version}";
sha256 = "0mkram2hm7i5za7pfn5crh2arbajk8praksxzgjx90rrxwl1y3d1";
sha256 = "144f6g17q4m50kxzdncsfzdyycdfprnpwdaxcwgxj4jky1xsha1d";
};
buildInputs = [ faust2jaqt faust2lv2 ];
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
for f in *.dsp;
do
echo "compiling standalone from" $f
faust2jaqt -time -double -t 99999 $f
done
@ -22,6 +23,7 @@ stdenv.mkDerivation rec {
for f in *.dsp;
do
echo "compiling plugin from" $f
faust2lv2 -time -double -gui -t 99999 $f
done
'';
@ -30,6 +32,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib/lv2
mv *.lv2/ $out/lib/lv2
mkdir -p $out/bin
rm newlib.sh
for f in $(find . -executable -type f);
do
cp $f $out/bin/

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

@ -1,14 +1,14 @@
{ stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
stdenv.mkDerivation rec {
version = "0.4.4";
version = "0.4.5";
name = "qjackctl-${version}";
# some dependencies such as killall have to be installed additionally
src = fetchurl {
url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
sha256 = "19bbljb3iz5ss4s5fmra1dxabg2fnp61sa51d63zsm56xkvv47ak";
sha256 = "1dsavjfzz5bpzc80mvfs940w9f9f47cf4r9cqxnaqrl4xilsa3f5";
};
buildInputs = [

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }:
stdenv.mkDerivation rec {
version = "0.4.2";
version = "0.4.3";
name = "qmidinet-${version}";
src = fetchurl {
url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
sha256 = "1sdnd189db44xhl9p8pd8h4bsy8s0bn1y64lrdq7nb21mwg8ymcs";
sha256 = "1qhxhlvi6bj2a06i48pw81zf5vd36idxbq04g30794yhqcimh6vw";
};
hardeningDisable = [ "format" ];

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

@ -1,12 +1,14 @@
{ stdenv, fetchurl, boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }:
{ stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }:
stdenv.mkDerivation rec {
name = "sorcer-${version}";
version = "1.1.1";
version = "1.1.3";
src = fetchurl {
url = "https://github.com/harryhaaren/openAV-Sorcer/archive/release-${version}.tar.gz";
sha256 = "1jkhs2rhn4givac7rlbj8067r7qq6jnj3ixabb346nw7pd6gn1wn";
src = fetchFromGitHub {
owner = "openAVproductions";
repo = "openAV-Sorcer";
rev = "release-${version}";
sha256 = "1x7pi77nal10717l02qpnhrx6d7w5nqrljkn9zx5w7gpb8fpb3vp";
};
buildInputs = [ boost cairomm cmake libsndfile lv2 ntk pkgconfig python ];

4
pkgs/applications/audio/x42-plugins/default.nix
View File

@ -3,12 +3,12 @@
, mesa_glu, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
stdenv.mkDerivation rec {
version = "20161230";
version = "20170428";
name = "x42-plugins-${version}";
src = fetchurl {
url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz";
sha256 = "1yni9c17kl2pi9lqxip07b6g6lyfii1pch5czp183113gk54fwj5";
sha256 = "0yi82rak2277x4nzzr5zwbsnha5pi61w975c8src2iwar2b6m0xg";
};
buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat pkgconfig zita-convolver];

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

@ -1,17 +1,17 @@
{ stdenv, fetchurl, alsaLib, cmake, libjack2, fftw, fltk13, libjpeg
, minixml, pkgconfig, zlib, liblo
{ stdenv, fetchurl, alsaLib, cairo, cmake, libjack2, fftw, fltk13, lash, libjpeg
, libXpm, minixml, ntk, pkgconfig, zlib, liblo
}:
stdenv.mkDerivation rec {
name = "zynaddsubfx-${version}";
version = "2.5.4";
version = "3.0.1";
src = fetchurl {
url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2";
sha256 = "16llaa2wg2gbgjhwp3632b2vx9jvanj4csv7d41k233ms6d1sjq1";
sha256 = "1qijvlbv41lnqaqbp6gh1i42xzf1syviyxz8wr39xbz55cw7y0d8";
};
buildInputs = [ alsaLib libjack2 fftw fltk13 libjpeg minixml zlib liblo ];
buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ];
nativeBuildInputs = [ cmake pkgconfig ];
hardeningDisable = [ "format" ];

7
pkgs/applications/misc/tint2/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "tint2-${version}";
version = "0.14.5";
version = "0.14.6";
src = fetchFromGitLab {
owner = "o9000";
repo = "tint2";
rev = version;
sha256 = "1nfvcw95wggih7pxh53cx4nlamny73nh88ggfh6a0ajjhafrd2j2";
sha256 = "0v7i8araj85cbl45icinvmsz5741cx2ybjgkx72m3xfcb9fqg69l";
};
enableParallelBuilding = true;
@ -28,8 +28,7 @@ stdenv.mkDerivation rec {
'';
prePatch = ''
for f in ./src/tint2conf/properties.c \
./src/launcher/apps-common.c \
for f in ./src/launcher/apps-common.c \
./src/launcher/icon-theme-common.c \
./themes/*tint2rc
do

27
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -1,4 +1,5 @@
{ newScope, stdenv, makeWrapper, makeDesktopItem, ed
, glib, gtk2, gtk3, gnome2, gnome3, gsettings_desktop_schemas
# package customization
, channel ? "stable"
@ -62,10 +63,26 @@ let
sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName;
in stdenv.mkDerivation {
name = "chromium${suffix}-${chromium.browser.version}";
version = chromium.browser.version;
buildInputs = [ makeWrapper ed ];
inherit (stdenv.lib) versionAtLeast;
gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2;
gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2;
in stdenv.mkDerivation {
name = "chromium${suffix}-${version}";
inherit version;
buildInputs = [
makeWrapper ed
# needed for GSETTINGS_SCHEMAS_PATH
gsettings_desktop_schemas glib gtk
# needed for XDG_ICON_DIRS
gnome.defaultIconTheme
];
outputs = ["out" "sandbox"];
@ -92,6 +109,8 @@ in stdenv.mkDerivation {
# libredirect causes chromium to deadlock on startup
export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')"
export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS
.
w
EOF
@ -107,7 +126,7 @@ in stdenv.mkDerivation {
cp -v "${desktopItem}/share/applications/"* "$out/share/applications"
'';
inherit (chromium.browser) meta packageName version;
inherit (chromium.browser) meta packageName;
passthru = {
inherit (chromium) upstream-info browser;

4
pkgs/applications/networking/browsers/chromium/plugins.nix
View File

@ -94,12 +94,12 @@ let
flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
version = "26.0.0.126";
version = "26.0.0.131";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "17ivhkdkbnzxr10ln1ix30k1hmaak5p9zzcchdyrjxdpzfk5qq7s";
sha256 = "1cw5pmzfyaaxxd3kf90nz8zn5r06qmkh8l793j3db4n0ffxg5c1s";
stripRoot = false;
};

19
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -31,6 +31,9 @@
# Only needed for getting information about upstream binaries
, chromium
, gsettings_desktop_schemas
, gnome2, gnome3
}:
with stdenv.lib;
@ -42,6 +45,9 @@ let
withCustomModes = true;
};
gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2;
gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2;
deps = [
glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
@ -53,7 +59,7 @@ let
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
bzip2 libcap
] ++ optional pulseSupport libpulseaudio
++ (if (versionAtLeast version "59.0.0.0") then [gtk3] else [gtk2]);
++ [ gtk ];
suffix = if channel != "stable" then "-" + channel else "";
@ -64,7 +70,15 @@ in stdenv.mkDerivation rec {
src = binary;
buildInputs = [ patchelf ];
buildInputs = [
patchelf
# needed for GSETTINGS_SCHEMAS_PATH
gsettings_desktop_schemas glib gtk
# needed for XDG_ICON_DIRS
gnome.defaultIconTheme
];
unpackPhase = ''
ar x $src
@ -109,6 +123,7 @@ in stdenv.mkDerivation rec {
#!${bash}/bin/sh
export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
export PATH=$binpath\''${PATH:+:\$PATH}
export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS
$out/share/google/$appname/google-$appname ${commandLineArgs} "\$@"
EOF
chmod +x $exe

10
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View File

@ -73,7 +73,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "26.0.0.126";
version = "26.0.0.131";
src = fetchurl {
url =
@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"0i5rr8bymbdzwqpns854i2r9390av89v1ikh8msincczq5vpj012"
"0yqrw2gl9i0z33kcv5dpp3x3jyq9ksqfaqjgkk7xcy127ahric8s"
else
"1mzq3wvq6rxqfdlapd0b1ymw7389414jxwhkd6wk3677qdhr1y42"
"0cmjqm5asqqcqavpkldm6wgjb49m9n018rixi7cj9zcwhfakm7zr"
else
if arch == "x86_64" then
"0684kizzfwfzaj0i54cdlkx3fqb3kyhb9jw88n031bjrzv7ddiz7"
"0agz4k5319m5bd0nqzkzvy8r28nr6c5j9b0jr6a8yh9s844aga8w"
else
"1pn15wnldabacmahlqdsl8nd60982j77bghjlf2cdc7drysby3ns";
"0jzvhyi1qgfjp9l85ffgcxqa87ymi899q2j68b9hfsn9hlw1sc5f";
};
nativeBuildInputs = [ unzip ];

6
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View File

@ -55,7 +55,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
version = "26.0.0.126";
version = "26.0.0.131";
src = fetchurl {
url =
@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"17s55b1ncjj0hnldjmxm133z0i4jf49wbh4sn1cfwrw6xrhgbkiw"
"000a019x15yk6qkx8yg7l496lc5knvw0kqgzial491d73zw8qjhn"
else
"02j98ji2jw2sxrs9hhlkkdrhpf2c4hc336cfvqzdf1iajza5was8";
"0rmsfi70hvp5vvdvcr8w7knz8bzf70r3ysnsgz3yv3b9p5dvsbjk";
};
nativeBuildInputs = [ unzip ];

6
pkgs/applications/networking/instant-messengers/dino/default.nix
View File

@ -13,13 +13,13 @@
}:
stdenv.mkDerivation rec {
name = "dino-unstable-2017-05-31";
name = "dino-unstable-2017-06-13";
src = fetchFromGitHub {
owner = "dino";
repo = "dino";
rev = "2480c1ec26a8e0ccef3ea76e3c29566221405ffb";
sha256 = "0wdjj38gbr2j6yklna3pd8nsfpdfp1j936dy8s49pzayw4pxs2g2";
rev = "7bbbb738fdb233f4ad91ffdd7d9247b28849d715";
sha256 = "09w26c6b5rkrrz7wvm629cncpdmd5n0d0805h8hw69bbzirpjjh2";
fetchSubmodules = true;
};

13
pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py
index eacefdf60bf..40d25f5cef8 100644
--- a/utils/llvm-build/llvmbuild/main.py
+++ b/utils/llvm-build/llvmbuild/main.py
@@ -412,7 +412,7 @@ subdirectories = %s
if library_name is None:
library_name_as_cstr = '0'
else:
- library_name_as_cstr = '"lib%s.a"' % library_name
+ library_name_as_cstr = '"lib%s.so"' % library_name
f.write(' { "%s", %s, %d, { %s } },\n' % (
name, library_name_as_cstr, is_installed,
', '.join('"%s"' % dep

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

@ -53,6 +53,11 @@ in stdenv.mkDerivation rec {
ln -sv $PWD/lib $out
'';
patches = stdenv.lib.optionals (!stdenv.isDarwin) [
# llvm-config --libfiles returns (non-existing) static libs
./fix-llvm-config.patch
];
cmakeFlags = with stdenv; [
"-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
"-DLLVM_INSTALL_UTILS=ON" # Needed by rustc

11
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -67,7 +67,7 @@ self: super: {
name = "git-annex-${drv.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + drv.version;
sha256 = "1iwqxjvga0wam0dg1alwawvnz13hm7d7c9rfph0w6adrdgfmhnzc";
sha256 = "1psyklfyjf4zqh3qxjn11sp2jiwvp8mfxqvsi1wggqpidfmk39jx";
};
}))).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -305,7 +305,6 @@ self: super: {
haeredes = dontCheck super.haeredes;
hashed-storage = dontCheck super.hashed-storage;
hashring = dontCheck super.hashring;
hastache = dontCheck super.hastache;
hath = dontCheck super.hath;
haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing
hdbi-postgresql = dontCheck super.hdbi-postgresql;
@ -683,6 +682,7 @@ self: super: {
stack = super.stack.overrideScope (self: super: {
store-core = self.store-core_0_3;
store = self.store_0_3_1;
hpack = self.hpack_0_17_1;
});
# It makes no sense to have intero-nix-shim in Hackage, so we publish it here only.
@ -861,4 +861,11 @@ self: super: {
# build liquidhaskell with the proper (old) aeson version
liquidhaskell = super.liquidhaskell.override { aeson = self.aeson_0_11_3_0; };
# Test suite fails: https://github.com/lymar/hastache/issues/46.
# Don't install internal mkReadme tool.
hastache = overrideCabal super.hastache (drv: {
doCheck = false;
postInstall = "rm $out/bin/mkReadme && rmdir $out/bin";
});
}

73
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -37,7 +37,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 8.17
# LTS Haskell 8.18
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Vector ==2.3.2
@ -348,7 +348,7 @@ default-package-overrides:
- check-email ==1.0.2
- checkers ==0.4.6
- chell ==0.4.0.1
- choice ==0.2.0
- choice ==0.2.1
- chunked-data ==0.3.0
- cipher-aes ==0.2.11
- cipher-aes128 ==0.7.0.3
@ -403,7 +403,7 @@ default-package-overrides:
- concurrent-output ==1.7.9
- concurrent-split ==0.0.1
- concurrent-supply ==0.1.8
- conduit ==1.2.10
- conduit ==1.2.11
- conduit-combinators ==1.1.1
- conduit-connection ==0.1.0.3
- conduit-extra ==1.1.16
@ -497,7 +497,7 @@ default-package-overrides:
- data-inttrie ==0.1.2
- data-lens-light ==0.1.2.2
- data-memocombinators ==0.5.1
- data-msgpack ==0.0.9
- data-msgpack ==0.0.10
- data-or ==1.0.0.5
- data-ordlist ==0.4.7.0
- data-ref ==0.0.1.1
@ -526,7 +526,7 @@ default-package-overrides:
- diagrams-core ==1.4
- diagrams-gtk ==1.4
- diagrams-html5 ==1.4
- diagrams-lib ==1.4.1
- diagrams-lib ==1.4.1.2
- diagrams-postscript ==1.4
- diagrams-rasterific ==1.4
- diagrams-solve ==0.1.0.1
@ -601,7 +601,7 @@ default-package-overrides:
- ekg-statsd ==0.2.1.0
- ekg-wai ==0.1.0.1
- elerea ==2.9.0
- elm-bridge ==0.4.0
- elm-bridge ==0.4.1
- elm-core-sources ==1.0.0
- elm-export ==0.6.0.1
- elm-export-persistent ==0.1.2
@ -705,7 +705,7 @@ default-package-overrides:
- format-numbers ==0.1.0.0
- formatting ==6.2.4
- fortran-src ==0.1.0.4
- foundation ==0.0.9
- foundation ==0.0.10
- Frames ==0.1.9
- free ==4.12.4
- free-vl ==0.1.4
@ -740,7 +740,7 @@ default-package-overrides:
- ghc-mod ==5.7.0.0
- ghc-paths ==0.1.0.9
- ghc-prof ==1.3.0.2
- ghc-syb-utils ==0.2.3
- ghc-syb-utils ==0.2.3.1
- ghc-tcplugins-extra ==0.2
- ghc-typelits-extra ==0.2.3
- ghc-typelits-knownnat ==0.2.4
@ -757,7 +757,7 @@ default-package-overrides:
- gi-gio ==2.0.12
- gi-glib ==2.0.12
- gi-gobject ==2.0.12
- gi-gtk ==3.0.14
- gi-gtk ==3.0.15
- gi-javascriptcore ==3.0.12
- gi-pango ==1.0.13
- gi-soup ==2.4.12
@ -920,7 +920,7 @@ default-package-overrides:
- haddock-library ==1.4.3
- hailgun ==0.4.1.3
- hailgun-simple ==0.1.0.0
- hakyll ==4.9.5.1
- hakyll ==4.9.7.0
- half ==0.2.2.3
- hamilton ==0.1.0.0
- hamlet ==1.2.0
@ -991,7 +991,7 @@ default-package-overrides:
- hedis ==0.9.8
- here ==1.2.11
- heredoc ==0.2.0.0
- heterocephalus ==1.0.4.0
- heterocephalus ==1.0.5.0
- hex ==0.1.2
- hexml ==0.3.2
- hexpat ==0.20.10
@ -1068,7 +1068,7 @@ default-package-overrides:
- hslua-aeson ==0.1.0.4
- hsndfile ==0.8.0
- hsndfile-vector ==0.5.2
- HsOpenSSL ==0.11.4.8
- HsOpenSSL ==0.11.4.9
- HsOpenSSL-x509-system ==0.1.0.3
- hsp ==0.10.0
- hspec ==2.4.3
@ -1232,7 +1232,7 @@ default-package-overrides:
- jwt ==0.7.2
- kan-extensions ==5.0.2
- kansas-comet ==0.4
- katip ==0.3.1.4
- katip ==0.3.1.5
- katip-elasticsearch ==0.3.0.2
- kawhi ==0.2.3
- kdt ==0.2.4
@ -1254,7 +1254,7 @@ default-package-overrides:
- language-glsl ==0.2.0
- language-haskell-extract ==0.2.4
- language-java ==0.2.8
- language-javascript ==0.6.0.9
- language-javascript ==0.6.0.10
- language-lua2 ==0.1.0.5
- language-puppet ==1.3.7
- language-python ==0.5.4
@ -1355,7 +1355,7 @@ default-package-overrides:
- median-stream ==0.7.0.0
- mega-sdist ==0.3.0.2
- megaparsec ==5.2.0
- memory ==0.14.5
- memory ==0.14.6
- MemoTrie ==0.6.7
- mersenne-random ==1.0.0.1
- mersenne-random-pure64 ==0.2.2.0
@ -1555,7 +1555,7 @@ default-package-overrides:
- parsec ==3.1.11
- parsec-numeric ==0.1.0.0
- ParsecTools ==0.0.2.0
- parsers ==0.12.4
- parsers ==0.12.5
- partial-handler ==1.0.2
- partial-isomorphisms ==0.2.2.1
- patat ==0.5.2.0
@ -1590,7 +1590,7 @@ default-package-overrides:
- picoparsec ==0.1.2.3
- pid1 ==0.1.0.1
- pinboard ==0.9.12.4
- pinch ==0.3.1.0
- pinch ==0.3.2.0
- pinchot ==0.24.0.0
- pipes ==4.3.4
- pipes-attoparsec ==0.5.1.5
@ -1667,12 +1667,12 @@ default-package-overrides:
- prometheus-client ==0.1.1
- prometheus-metrics-ghc ==0.1.1
- prompt ==0.1.1.2
- proto-lens ==0.2.0.1
- proto-lens ==0.2.1.0
- proto-lens-arbitrary ==0.1.0.2
- proto-lens-combinators ==0.1.0.6
- proto-lens-descriptors ==0.2.0.1
- proto-lens-combinators ==0.1.0.7
- proto-lens-descriptors ==0.2.1.0
- proto-lens-optparse ==0.1.0.2
- proto-lens-protoc ==0.2.0.1
- proto-lens-protoc ==0.2.1.0
- protobuf ==0.2.1.1
- protobuf-simple ==0.1.0.4
- protocol-buffers ==2.4.0
@ -1747,7 +1747,7 @@ default-package-overrides:
- reform-happstack ==0.2.5.1
- reform-hsp ==0.2.7.1
- RefSerialize ==0.4.0
- regex ==1.0.1.0
- regex ==1.0.1.3
- regex-applicative ==0.3.3
- regex-applicative-text ==0.1.0.1
- regex-base ==0.93.2
@ -1759,7 +1759,7 @@ default-package-overrides:
- regex-posix ==0.95.2
- regex-tdfa ==1.2.2
- regex-tdfa-text ==1.0.0.3
- regex-with-pcre ==1.0.1.0
- regex-with-pcre ==1.0.1.3
- reinterpret-cast ==0.1.0
- relational-query ==0.8.4.0
- relational-query-HDBC ==0.6.0.3
@ -1819,7 +1819,7 @@ default-package-overrides:
- scalpel ==0.5.1
- scalpel-core ==0.5.1
- scanner ==0.2
- scientific ==0.3.4.13
- scientific ==0.3.4.15
- scotty ==0.11.0
- scrape-changes ==0.1.0.5
- scrypt ==0.5.0
@ -2061,7 +2061,7 @@ default-package-overrides:
- temporary ==1.2.0.4
- temporary-rc ==1.2.0.3
- termcolor ==0.2.0.0
- terminal-progress-bar ==0.1.1
- terminal-progress-bar ==0.1.1.1
- terminal-size ==0.3.2.1
- terminfo ==0.4.1.0
- test-fixture ==0.5.0.1
@ -2124,7 +2124,7 @@ default-package-overrides:
- timemap ==0.0.4
- timerep ==2.0.0.2
- timespan ==0.3.0.0
- timezone-olson ==0.1.7
- timezone-olson ==0.1.8
- timezone-series ==0.1.6.1
- tinylog ==0.14.0
- tinytemplate ==0.1.2.0
@ -2145,7 +2145,7 @@ default-package-overrides:
- true-name ==0.1.0.2
- tsv2csv ==0.1.0.2
- ttrie ==0.1.2.1
- tttool ==1.7.0.2
- tttool ==1.7.0.3
- tuple ==0.3.0.2
- tuple-th ==0.2.5
- tuples-homogenous-h98 ==0.1.1.0
@ -2174,6 +2174,7 @@ default-package-overrides:
- tzdata ==0.1.20161123.0
- ua-parser ==0.7.3
- uglymemo ==0.1.0.1
- unagi-chan ==0.4.0.0
- unbound ==0.5.1
- unbound-generics ==0.3.1
- unbounded-delays ==0.1.1.0
@ -2208,7 +2209,7 @@ default-package-overrides:
- unlit ==0.4.0.0
- unordered-containers ==0.2.8.0
- unsafe ==0.0
- uri-bytestring ==0.2.3.2
- uri-bytestring ==0.2.3.3
- uri-encode ==1.5.0.5
- uri-templater ==0.2.1.0
- url ==2.1.3
@ -2376,12 +2377,12 @@ default-package-overrides:
- YampaSynth ==0.2
- yes-precure5-command ==5.5.3
- yesod ==1.4.5
- yesod-auth ==1.4.17.1
- yesod-auth ==1.4.17.2
- yesod-auth-account ==1.4.3
- yesod-auth-basic ==0.1.0.2
- yesod-auth-hashdb ==1.6.1
- yesod-bin ==1.5.2.3
- yesod-core ==1.4.33
- yesod-core ==1.4.35
- yesod-eventsource ==1.4.1
- yesod-fay ==0.8.0
- yesod-form ==1.4.12
@ -2392,10 +2393,10 @@ default-package-overrides:
- yesod-newsfeed ==1.6
- yesod-persistent ==1.4.2
- yesod-sitemap ==1.4.0.1
- yesod-static ==1.5.2
- yesod-static ==1.5.3
- yesod-static-angular ==0.1.8
- yesod-table ==2.0.3
- yesod-test ==1.5.5
- yesod-test ==1.5.6
- yesod-websockets ==0.2.6
- yi-core ==0.13.5
- yi-frontend-vty ==0.13.5
@ -2416,10 +2417,10 @@ default-package-overrides:
- zero ==0.1.4
- zeromq4-haskell ==0.6.5
- zip ==0.1.11
- zip-archive ==0.3.0.6
- zip-archive ==0.3.1
- zippers ==0.2.3
- ziptastic-client ==0.3.0.2
- ziptastic-core ==0.2.0.2
- ziptastic-client ==0.3.0.3
- ziptastic-core ==0.2.0.3
- zlib ==0.6.1.2
- zlib-bindings ==0.1.1.5
- zlib-lens ==0.1.2.1
@ -2444,6 +2445,7 @@ extra-packages:
- haddock-api == 2.16.* # required on GHC 7.10.x
- haddock-library == 1.2.* # required for haddock-api-2.16.x
- haskell-src-exts == 1.18.* # required by hoogle-5.0.4
- hpack < 0.18 # required by stack-1.4.0
- mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
- mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
- parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3
@ -8329,6 +8331,7 @@ dont-distribute-packages:
transient-universe-tls: [ i686-linux, x86_64-linux, x86_64-darwin ]
translatable-intset: [ i686-linux, x86_64-linux, x86_64-darwin ]
translate: [ i686-linux, x86_64-linux, x86_64-darwin ]
trasa-reflex: [ i686-linux, x86_64-linux, x86_64-darwin ]
travis-meta-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ]
trawl: [ i686-linux, x86_64-linux, x86_64-darwin ]
traypoweroff: [ i686-linux, x86_64-linux, x86_64-darwin ]

16
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -144,9 +144,9 @@ let
allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
optionals doCheck testPkgconfigDepends ++ optionals withBenchmarkDepends benchmarkPkgconfigDepends;
nativeBuildInputs = setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends;
propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ setupHaskellDepends ++
buildTools ++ libraryToolDepends ++ executableToolDepends ++
otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
# ghcjs's hsc2hs calls out to the native hsc2hs
@ -181,8 +181,9 @@ stdenv.mkDerivation ({
inherit src;
nativeBuildInputs = otherBuildInputs ++ optionals (!hasActiveLibrary) propagatedBuildInputs;
propagatedNativeBuildInputs = optionals hasActiveLibrary propagatedBuildInputs;
inherit nativeBuildInputs;
buildInputs = otherBuildInputs ++ optionals (!hasActiveLibrary) propagatedBuildInputs;
propagatedBuildInputs = optionals hasActiveLibrary propagatedBuildInputs;
LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase.
@ -209,11 +210,8 @@ stdenv.mkDerivation ({
setupCompileFlags="${concatStringsSep " " setupCompileFlags}"
configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags"
local inputClosure=""
for i in $propagatedNativeBuildInputs $nativeBuildInputs; do
findInputs $i inputClosure propagated-native-build-inputs
done
for p in $inputClosure; do
# nativePkgs defined in stdenv/setup.hs
for p in $nativePkgs; do
if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then
cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/
continue

3052
pkgs/development/haskell-modules/hackage-packages.nix
View File

File diff suppressed because it is too large Load Diff

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "lilv-${version}";
version = "0.24.0";
version = "0.24.2";
src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2";
sha256 = "17pv4wdaj7m5ghpfs7h7d8jd105xfzyn2lj438xslj1ndm9xwq7s";
sha256 = "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p";
};
buildInputs = [ lv2 pkgconfig python serd sord sratom ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ntk-${version}";
version = "2014-10-18";
version = "2017-04-22";
src = fetchgit {
url = "git://git.tuxfamily.org/gitroot/non/fltk.git";
rev = "5719b0044d9f267de5391fab006370cc7f4e70bd";
sha256 = "1wpqy5kk6sk31qyx1c6gdslcqcbczgji6lk8w1l8kri0s908ywyj";
rev = "92365eca0f9a6f054abc70489c009aba0fcde0ff";
sha256 = "0pph7hf07xaa011zr40cs62f3f7hclfbv5kcrl757gcp2s5pi2iq";
};
buildInputs = [

6
pkgs/development/libraries/aws-sdk-cpp/default.nix
View File

@ -14,13 +14,13 @@ let
else throw "Unsupported system!";
in stdenv.mkDerivation rec {
name = "aws-sdk-cpp-${version}";
version = "1.0.127";
version = "1.0.153";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-sdk-cpp";
rev = version;
sha256 = "1p06rkvi6mm4jylk5j7gji2c52qbls3i0yqg3hgs9iys4nd1p14r";
sha256 = "0mglg9a6klmsam8r9va7y5x2s8xylhljwcg93sr8152rvhxnjv08";
};
# FIXME: might be nice to put different APIs in different outputs
@ -43,6 +43,8 @@ in stdenv.mkDerivation rec {
for i in testing-resources aws-cpp-sdk-*; do
export ${loaderVar}=$(pwd)/$i:''${${loaderVar}}
done
export HOME=$TMPDIR
'';
NIX_LDFLAGS = lib.concatStringsSep " " (