diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 13:29:04 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 13:29:04 -0400 |
commit | f40aa17933bc07d7913fd705b5f8ce50aab86782 (patch) | |
tree | e34c79e6c3a09dc63011b44d877345f1a6b3bc78 | |
parent | d1c4260859efeef4347d007ef8ce9bea5703cd0f (diff) | |
parent | 4ae207aea0164caee9c39b24177692ab4ef4dab4 (diff) | |
download | nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar.gz nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar.bz2 nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar.lz nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar.xz nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar.zst nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.zip |
Merge remote-tracking branch 'upstream/master' into staging
-rw-r--r-- | pkgs/applications/altcoins/particl/particl-core.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/mpv/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/interpreters/guile/2.0.nix | 9 | ||||
-rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/libraries/SDL/default.nix | 36 | ||||
-rw-r--r-- | pkgs/development/libraries/SDL2/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/libraries/ffmpeg/4.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/libdrm/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libpng/12.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/libssh2/default.nix | 18 | ||||
-rw-r--r-- | pkgs/tools/misc/tio/default.nix | 21 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
14 files changed, 68 insertions, 100 deletions
diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix index 2524408429c3..f47b04c1daea 100644 --- a/pkgs/applications/altcoins/particl/particl-core.nix +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -19,11 +19,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "particl-core-${version}"; - version = "0.16.0.4"; + version = "0.16.0.5"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "1yy8pw13rn821jpi1zvzwi3ipxi1bgfxv8g6jz49qlbjzjmjcr68"; + sha256 = "070crn6nnzrbcaj30w0qbybpm9kfd2ghnvmxp29gckgknw6n0vam"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index aa17cf183e34..58628aa1f8e8 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper -, docutils, perl, pkgconfig, python3, which, ffmpeg +, docutils, perl, pkgconfig, python3, which, ffmpeg_4 , freefont_ttf, freetype, libass, libpthreadstubs , lua, luasocket, libuchardet, libiconv ? null, darwin @@ -83,22 +83,15 @@ let }; in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.27.2"; + version = "0.28.2"; src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; rev = "v${version}"; - sha256 = "1ivyyqajkxq5c1zxp0dm7pljvianhgvwl3dbghgpzyrch59k5wnr"; + sha256 = "0bldxhqjz7z9fgvx4k40l49awpay17fscp8ypswb459yicy8npmg"; }; - patches = [ - (fetchpatch { - url = "https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f.patch"; - sha256 = "1sr0770rvhsgz8d7ysr9qqp4g9gwdhgj8g3rgnz90wl49lgrykhb"; - }) - ]; - postPatch = '' patchShebangs ./TOOLS/ ''; @@ -131,7 +124,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - ffmpeg freetype libass libpthreadstubs + ffmpeg_4 freetype libass libpthreadstubs lua luasocket libuchardet ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index e670f145a5d3..b0eeb89ce431 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -93,15 +93,6 @@ setupHook = ./setup-hook-2.0.sh; - crossAttrs.preConfigure = - stdenv.lib.optionalString (hostPlatform.isHurd) - # On GNU, libgc depends on libpthread, but the cross linker doesn't - # know where to find libpthread, which leads to erroneous test failures - # in `configure', where `-pthread' and `-lpthread' aren't explicitly - # passed. So it needs some help (XXX). - "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib"; - - meta = { description = "Embeddable Scheme implementation"; homepage = http://www.gnu.org/software/guile/; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index f3b36ecd9403..196c899fcea9 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -89,15 +89,6 @@ setupHook = ./setup-hook-2.2.sh; - crossAttrs.preConfigure = - stdenv.lib.optionalString (hostPlatform.isHurd) - # On GNU, libgc depends on libpthread, but the cross linker doesn't - # know where to find libpthread, which leads to erroneous test failures - # in `configure', where `-pthread' and `-lpthread' aren't explicitly - # passed. So it needs some help (XXX). - "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib"; - - meta = { description = "Embeddable Scheme implementation"; homepage = http://www.gnu.org/software/guile/; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 5e1c527eb8b5..7e96cf84686f 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -15,24 +15,6 @@ with lib; assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null && libGLU != null); -let - - configureFlagsFun = attrs: [ - "--disable-oss" - "--disable-video-x11-xme" - "--enable-rpath" - # Building without this fails on Darwin with - # - # ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32' - # SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) - # - # Please try revert the change that introduced this comment when updating SDL. - ] ++ optional stdenv.isDarwin "--disable-x11-shared" - ++ optional (!x11Support) "--without-x" - ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib"; - -in - stdenv.mkDerivation rec { name = "SDL-${version}"; version = "1.2.15"; @@ -62,11 +44,19 @@ stdenv.mkDerivation rec { ++ optional (!hostPlatform.isMinGW) audiofile ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; - configureFlags = configureFlagsFun { inherit alsaLib; }; - - crossAttrs = { - configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; }; - }; + configureFlags = [ + "--disable-oss" + "--disable-video-x11-xme" + "--enable-rpath" + # Building without this fails on Darwin with + # + # ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32' + # SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) + # + # Please try revert the change that introduced this comment when updating SDL. + ] ++ optional stdenv.isDarwin "--disable-x11-shared" + ++ optional (!x11Support) "--without-x" + ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"; patches = [ ./find-headers.patch diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index fe19ecadd0ef..d852b594f6dd 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -19,15 +19,6 @@ with lib; assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null); -let - - configureFlagsFun = attrs: [ - "--disable-oss" - ] ++ optional (!x11Support) "--without-x" - ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib"; - -in - stdenv.mkDerivation rec { name = "SDL2-${version}"; version = "2.0.8"; @@ -61,11 +52,10 @@ stdenv.mkDerivation rec { # pointer-constraints-unstable-v1-client-protocol.h: No such file or directory enableParallelBuilding = false; - configureFlags = configureFlagsFun { inherit alsaLib; }; - - crossAttrs = { - configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; }; - }; + configureFlags = [ + "--disable-oss" + ] ++ optional (!x11Support) "--without-x" + ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"; postInstall = '' moveToOutput lib/libSDL2main.a "$dev" diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix new file mode 100644 index 000000000000..a6e67052cd03 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -0,0 +1,12 @@ +{ stdenv, callPackage, fetchpatch +# Darwin frameworks +, Cocoa, CoreMedia +, ... +}@args: + +callPackage ./generic.nix (args // rec { + version = "${branch}"; + branch = "4.0"; + sha256 = "1f3k8nz5ag6szsfhlrz66qm8s1yxk1vphqvcfr4ps4690vckk2ii"; + darwinFrameworks = [ Cocoa CoreMedia ]; +}) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index e807a5148901..270e96055822 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { "--enable-ffmpeg" "--disable-ffplay" (ifMinVer "0.6" "--enable-ffprobe") - "--disable-ffserver" + (if reqMin "4" then null else "--disable-ffserver") # Libraries (ifMinVer "0.6" "--enable-avcodec") (ifMinVer "0.6" "--enable-avdevice") diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 4d2455d4872b..23aa86af377c 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -62,11 +62,4 @@ in stdenv.mkDerivation rec { wrapProgram "$dev/bin/freetype-config" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig" ''; - - crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc or null != "msvcrt") { - # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead - # of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't - # know why it's on the PATH. - configureFlags = "--disable-static CC_BUILD=gcc"; - }; } diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index ccae6ce50142..50d9a565a6cf 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-install-test-programs" ] ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] - ++ stdenv.lib.optional stdenv.isDarwin "-C"; - - crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ]; + ++ stdenv.lib.optional stdenv.isDarwin "-C" + ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-intel" + ; meta = { homepage = https://dri.freedesktop.org/libdrm/; diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index 457f99ef13bd..01a828f95da5 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -18,11 +18,6 @@ stdenv.mkDerivation rec { passthru = { inherit zlib; }; - crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc == "libSystem") { - propagatedBuildInputs = []; - passthru = {}; - }; - configureFlags = "--enable-static"; postInstall = ''mv "$out/bin" "$dev/bin"''; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index a09a76707390..f85b709cf397 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -12,22 +12,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; - buildInputs = [ openssl zlib ]; - - crossAttrs = { - # link against cross-built libraries - configureFlags = [ - "--with-openssl" - "--with-libssl-prefix=${openssl.crossDrv}" - "--with-libz" - "--with-libz-prefix=${zlib.crossDrv}" - ]; - } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") { - # mingw needs import library of ws2_32 to build the shared library - preConfigure = '' - export LDFLAGS="-L${windows.mingw_w64}/lib $LDFLAGS" - ''; - }; + buildInputs = [ openssl zlib ] + ++ stdenv.lib.optional hostPlatform.isMinGW windows.mingw_w64; meta = { description = "A client-side C library implementing the SSH2 protocol"; diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix new file mode 100644 index 000000000000..475d444c6007 --- /dev/null +++ b/pkgs/tools/misc/tio/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchzip, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "tio-${version}"; + version = "1.30"; + + src = fetchzip { + url = "https://github.com/tio/tio/archive/v${version}.tar.gz"; + sha256 = "1cyjy1jg2s32h1jkb99qb79sxkxh92niiyig0vysr14m4xnw01mr"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "Serial console TTY"; + homepage = https://tio.github.io/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6cb7cfbef2b..32ecd467b6e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5199,6 +5199,8 @@ with pkgs; tiny8086 = callPackage ../applications/virtualization/8086tiny { }; + tio = callPackage ../tools/misc/tio { }; + tldr = callPackage ../tools/misc/tldr { }; tldr-hs = haskellPackages.tldr; @@ -8845,6 +8847,10 @@ with pkgs; ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; + ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; + }; + # Aliases ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2; |