diff options
-rw-r--r-- | pkgs/applications/misc/tqsl/cmake_lib_path.patch | 12 | ||||
-rw-r--r-- | pkgs/applications/radio/ebook2cw/configfile.patch (renamed from pkgs/applications/misc/ebook2cw/configfile.patch) | 0 | ||||
-rw-r--r-- | pkgs/applications/radio/ebook2cw/default.nix (renamed from pkgs/applications/misc/ebook2cw/default.nix) | 10 | ||||
-rw-r--r-- | pkgs/applications/radio/tqsl/default.nix (renamed from pkgs/applications/misc/tqsl/default.nix) | 12 | ||||
-rw-r--r-- | pkgs/development/compilers/fpc/lazarus.nix | 43 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/7/compiler-rt-clock_gettime.patch | 74 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/7/compiler-rt.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/pandas/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/networking/slirp4netns/default.nix | 25 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/php-packages.nix | 4 |
11 files changed, 134 insertions, 60 deletions
diff --git a/pkgs/applications/misc/tqsl/cmake_lib_path.patch b/pkgs/applications/misc/tqsl/cmake_lib_path.patch deleted file mode 100644 index 5eed93834632f..0000000000000 --- a/pkgs/applications/misc/tqsl/cmake_lib_path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -dur tqsl-2.3.1/src/CMakeLists.txt tqsl-2.3.1b/src/CMakeLists.txt ---- tqsl-2.3.1/src/CMakeLists.txt 2017-04-17 20:53:22.000000000 -0400 -+++ tqsl-2.3.1b/src/CMakeLists.txt 2017-10-05 21:14:39.048329343 -0400 -@@ -54,7 +54,7 @@ - if(NOT APPLE AND NOT WIN32) - set_source_files_properties(location.cpp PROPERTIES COMPILE_DEFINITIONS CONFDIR="${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/") - set(HEADERS_TO_INSTALL tqsllib.h tqslerrno.h cabrillo.h adif.h tqslconvert.h) --install(TARGETS tqsllib DESTINATION lib$(LIB_SUFFIX)) -+install(TARGETS tqsllib DESTINATION lib${LIB_SUFFIX}) - install(FILES config.xml DESTINATION share/TrustedQSL) - install(FILES ${HEADERS_TO_INSTALL} DESTINATION include) - endif() diff --git a/pkgs/applications/misc/ebook2cw/configfile.patch b/pkgs/applications/radio/ebook2cw/configfile.patch index c7aafe5227a53..c7aafe5227a53 100644 --- a/pkgs/applications/misc/ebook2cw/configfile.patch +++ b/pkgs/applications/radio/ebook2cw/configfile.patch diff --git a/pkgs/applications/misc/ebook2cw/default.nix b/pkgs/applications/radio/ebook2cw/default.nix index cce10258cf3bb..915d0ba84db37 100644 --- a/pkgs/applications/misc/ebook2cw/default.nix +++ b/pkgs/applications/radio/ebook2cw/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchsvn, lame, libvorbis }: stdenv.mkDerivation rec { - - name = "ebook2cw-${version}"; + pname = "ebook2cw"; version = "0.8.2"; src = fetchsvn { - url = "svn://svn.fkurz.net/ebook2cw/tags/${name}"; + url = "svn://svn.fkurz.net/ebook2cw/tags/${pname}-${version}"; sha256 = "1mvp3nz3k76v757792n9b7fcm5jm3jcwarl1k7cila9fi0c2rsiw"; }; @@ -14,10 +13,6 @@ stdenv.mkDerivation rec { patches = [ ./configfile.patch ]; - postPatch = '' - substituteInPlace Makefile --replace gcc cc - ''; - makeFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { @@ -27,5 +22,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ earldouglas ]; }; - } diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index f001cbcaab92d..ce0fbf0e16dc1 100644 --- a/pkgs/applications/misc/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }: stdenv.mkDerivation rec { - name = "tqsl-${version}"; - version = "2.3.1"; + pname = "tqsl"; + version = "2.4.3"; src = fetchurl { - url = "https://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz"; - sha256 = "10cjlilampwl10hwb7m28m5z9gyrscvvc1rryfjnhj9q2x4ppgxv"; + url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz"; + sha256 = "0f8pa5wnp0x0mjjr5kanka9hirgmp5wf6jsb95dc6hjlzlvy6kz9"; }; nativeBuildInputs = [ makeWrapper ]; @@ -20,11 +20,9 @@ stdenv.mkDerivation rec { wxGTK ]; - patches = [ ./cmake_lib_path.patch ]; - meta = with stdenv.lib; { description = "Software for using the ARRL Logbook of the World"; - homepage = https://lotw.arrl.org/; + homepage = https://www.arrl.org/tqsl-download; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.dpflug ]; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 8507fe4b222ee..74ca246deb09c 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -1,37 +1,29 @@ -{ -stdenv, fetchurl -, fpc -, gtk2, glib, pango, atk, gdk_pixbuf +{ stdenv, fetchurl, makeWrapper +, fpc, gtk2, glib, pango, atk, gdk_pixbuf , libXi, xorgproto, libX11, libXext -, makeWrapper }: -let - s = - rec { - version = "1.8.4"; - versionSuffix = ""; - url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz"; +stdenv.mkDerivation rec { + name = "lazarus-${version}"; + version = "1.8.4"; + + src = fetchurl { + url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}.tar.gz"; sha256 = "1s8hdip973fc1lynklddl0mvg2jd2lzkfk8hzb8jlchs6jn0362s"; - name = "lazarus-${version}"; }; + buildInputs = [ fpc gtk2 glib libXi xorgproto libX11 libXext pango atk stdenv.cc makeWrapper gdk_pixbuf ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; + makeFlags = [ "FPC=fpc" "PP=fpc" "REQUIRE_PACKAGES+=tachartlazaruspkg" "bigide" ]; + preBuild = '' export makeFlags="$makeFlags LAZARUS_INSTALL_DIR=$out/share/lazarus/ INSTALL_PREFIX=$out/" export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.cc.cc.lib}/lib -lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo -lgcc_s" @@ -40,16 +32,17 @@ stdenv.mkDerivation { tar xf ${fpc.src} --strip-components=1 -C $out/share -m sed -e 's@/usr/fpcsrc@'"$out/share/fpcsrc@" -i ide/include/unix/lazbaseconf.inc ''; + postInstall = '' wrapProgram $out/bin/startlazarus --prefix NIX_LDFLAGS ' ' "'$NIX_LDFLAGS'" \ - --prefix LCL_PLATFORM ' ' "'$LCL_PLATFORM'" + --prefix LCL_PLATFORM ' ' "'$LCL_PLATFORM'" ''; - meta = { - inherit (s) version; - license = stdenv.lib.licenses.gpl2Plus ; - platforms = stdenv.lib.platforms.linux; + + meta = with stdenv.lib; { description = "Lazarus graphical IDE for FreePascal language"; homepage = http://www.lazarus.freepascal.org; - maintainers = [stdenv.lib.maintainers.raskin]; + license = licenses.gpl2Plus ; + platforms = platforms.linux; + maintainers = [ maintainers.raskin ]; }; } diff --git a/pkgs/development/compilers/llvm/7/compiler-rt-clock_gettime.patch b/pkgs/development/compilers/llvm/7/compiler-rt-clock_gettime.patch new file mode 100644 index 0000000000000..f9323ed95c05c --- /dev/null +++ b/pkgs/development/compilers/llvm/7/compiler-rt-clock_gettime.patch @@ -0,0 +1,74 @@ +commit f00c7bccf7955b7dfbb4859fd9019e9eb3349f2d +Author: Tobias Mayer <tobim@fastmail.fm> +Date: Wed Feb 13 12:44:17 2019 +0100 + + Provide clock_gettime for xray on macos < 10.12 + +diff --git a/lib/xray/xray_basic_logging.cc b/lib/xray/xray_basic_logging.cc +index a46c151af..38aea6932 100644 +--- a/lib/xray/xray_basic_logging.cc ++++ b/lib/xray/xray_basic_logging.cc +@@ -36,6 +36,29 @@ + #include "xray_tsc.h" + #include "xray_utils.h" + ++#if __MACH__ ++#include <mach/clock.h> ++#include <mach/mach.h> ++enum clockid_t { ++ CLOCK_MONOTONIC = REALTIME_CLOCK, ++ CLOCK_REALTIME = REALTIME_CLOCK ++}; ++ ++int clock_gettime(clockid_t clock_id, struct timespec *ts) { ++ if (ts != NULL) { ++ clock_serv_t cclock; ++ mach_timespec_t mts; ++ host_get_clock_service(mach_host_self(), clock_id, &cclock); ++ clock_get_time(cclock, &mts); ++ mach_port_deallocate(mach_task_self(), cclock); ++ ts->tv_sec = mts.tv_sec; ++ ts->tv_nsec = mts.tv_nsec; ++ return 0; ++ } ++ return -1; ++} ++#endif ++ + namespace __xray { + + SpinMutex LogMutex; +diff --git a/lib/xray/xray_fdr_logging.cc b/lib/xray/xray_fdr_logging.cc +index 4b308b27f..1d044c8fd 100644 +--- a/lib/xray/xray_fdr_logging.cc ++++ b/lib/xray/xray_fdr_logging.cc +@@ -38,6 +38,29 @@ + #include "xray_tsc.h" + #include "xray_utils.h" + ++#if __MACH__ ++#include <mach/clock.h> ++#include <mach/mach.h> ++enum clockid_t { ++ CLOCK_MONOTONIC = REALTIME_CLOCK, ++ CLOCK_REALTIME = REALTIME_CLOCK ++}; ++ ++int clock_gettime(clockid_t clock_id, struct timespec *ts) { ++ if (ts != NULL) { ++ clock_serv_t cclock; ++ mach_timespec_t mts; ++ host_get_clock_service(mach_host_self(), clock_id, &cclock); ++ clock_get_time(cclock, &mts); ++ mach_port_deallocate(mach_task_self(), cclock); ++ ts->tv_sec = mts.tv_sec; ++ ts->tv_nsec = mts.tv_nsec; ++ return 0; ++ } ++ return -1; ++} ++#endif ++ + namespace __xray { + + atomic_sint32_t LoggingStatus = {XRayLogInitStatus::XRAY_LOG_UNINITIALIZED}; diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index 25c38db470d96..dff9cb9c49c05 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -1,5 +1,4 @@ { stdenv, version, fetch, cmake, python, llvm, libcxxabi }: -with stdenv.lib; stdenv.mkDerivation rec { name = "compiler-rt-${version}"; inherit version; @@ -16,7 +15,8 @@ stdenv.mkDerivation rec { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory - ] ++ optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin ./compiler-rt-clock_gettime.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 839e7f1e8192b..0fa5db6ca101c 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -37,9 +37,8 @@ in buildPythonPackage rec { checkInputs = [ pytest glibcLocales moto ]; - buildInputs = [] ++ optional isDarwin libcxx; + buildInputs = [ cython ] ++ optional isDarwin libcxx; propagatedBuildInputs = [ - cython dateutil scipy numexpr diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix new file mode 100644 index 0000000000000..3515a127510f9 --- /dev/null +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "slirp4netns-${version}"; + version = "0.3.0-alpha.2"; + + src = fetchFromGitHub { + owner = "rootless-containers"; + repo = "slirp4netns"; + rev = "v${version}"; + sha256 = "163nwdwi1qigma1c5svm8llgd8pn4sbkchw67ry3v0gfxa9mxibk"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/rootless-containers/slirp4netns; + description = "User-mode networking for unprivileged network namespaces"; + license = licenses.gpl2; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee950c438775b..b660681a6b842 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -173,7 +173,7 @@ in dump1090 = callPackage ../applications/misc/dump1090 { }; - ebook2cw = callPackage ../applications/misc/ebook2cw { }; + ebook2cw = callPackage ../applications/radio/ebook2cw { }; etBook = callPackage ../data/fonts/et-book { }; @@ -5439,6 +5439,8 @@ in slimrat = callPackage ../tools/networking/slimrat { }; + slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; + slsnif = callPackage ../tools/misc/slsnif { }; slstatus = callPackage ../applications/misc/slstatus { @@ -19685,7 +19687,8 @@ in toxiproxy = callPackage ../development/tools/toxiproxy { }; - tqsl = callPackage ../applications/misc/tqsl { }; + tqsl = callPackage ../applications/radio/tqsl { }; + trustedqsl = tqsl; # Alias added 2019-02-10 transcode = callPackage ../applications/audio/transcode { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index da301df65cb06..52018b4399182 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -411,11 +411,11 @@ let phpstan = pkgs.stdenv.mkDerivation rec { name = "phpstan-${version}"; - version = "0.11.1"; + version = "0.11.2"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0iivfp9945gv6pqhp01720rlwzfd260hbfq31a3mmimly721mnsa"; + sha256 = "0pkcak51vfrqlwivxbb5pdvc34pxia8pdraii97wmcg4z0d4i1rx"; }; phases = [ "installPhase" ]; |