diff options
Diffstat (limited to 'pkgs')
102 files changed, 1105 insertions, 376 deletions
diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix index a4ac2943bfbc..461fc260207d 100644 --- a/pkgs/applications/audio/amarok/kf5.nix +++ b/pkgs/applications/audio/amarok/kf5.nix @@ -21,6 +21,8 @@ in mkDerivation { sha256 = "05w7kl6qfmkjz0y1bhgkkbmsqdll30bkjd6npkzvivrvp7dplmbh"; }; + patches = [ ./qt5_11.patch ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ qca-qt5 qjson qtscript qtwebkit diff --git a/pkgs/applications/audio/amarok/qt5_11.patch b/pkgs/applications/audio/amarok/qt5_11.patch new file mode 100644 index 000000000000..36041c136c8b --- /dev/null +++ b/pkgs/applications/audio/amarok/qt5_11.patch @@ -0,0 +1,11 @@ +--- a/src/aboutdialog/ExtendedAboutDialog.cpp ++++ b/src/aboutdialog/ExtendedAboutDialog.cpp +@@ -30,6 +30,7 @@ + #include <QLayout> + #include <QPushButton> + #include <QScrollBar> ++#include <QStyle> + #include <QTabWidget> + + #include <qapplication.h> + diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index 246e02c53c72..fc01a543e285 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -2,13 +2,13 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.0.16"; + version = "4.0.17"; pname = "fldigi"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "1gcahm1lv3yfscaxanrx6q7dydxjznw98vdc0f8zgdb15na3f0g7"; + sha256 = "1z8w0dxfc2nm1iy1vv18s5s88ys9vvbqawjvhsymxj56jqjzzp4q"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 68315373a023..678ea529dc44 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { name = "gpodder-${version}"; - version = "3.10.2"; + version = "3.10.3"; format = "other"; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "gpodder"; repo = "gpodder"; rev = version; - sha256 = "0nbhyh44cympslcf4miwc2n1gccm5ghjf9slg0r8xnpvg921jv04"; + sha256 = "0j0amjq1wvr5p10vckg900a8xfnxw6z028qw72ayh58216m5jb5l"; }; postPatch = with stdenv.lib; '' diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix new file mode 100644 index 000000000000..3afd73493b05 --- /dev/null +++ b/pkgs/applications/audio/snapcast/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +, asio, alsaLib, avahi, libogg, libvorbis, flac }: + +let + + popl = stdenv.mkDerivation rec { + name = "popl-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = "popl"; + rev = "v${version}"; + sha256 = "1zgjgcingyi1xw61azxxasaidbgqidncml5c2y2cj90mz23yam1i"; + }; + nativeBuildInputs = [ cmake ]; + }; + + aixlog = stdenv.mkDerivation rec { + name = "aixlog-${version}"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = "aixlog"; + rev = "v${version}"; + sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr"; + }; + nativeBuildInputs = [ cmake ]; + }; + +in + +stdenv.mkDerivation rec { + name = "snapcast-${version}"; + version = "0.14.0"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = "snapcast"; + rev = "v${version}"; + sha256 = "14f5jrsarjdk2mixmznmighrh22j6flp7y47r9j3qzxycmm1mcf6"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ asio popl aixlog alsaLib avahi libogg libvorbis flac ]; + + meta = with lib; { + description = "Synchronous multi-room audio player"; + homepage = https://github.com/badaix/snapcast; + maintainers = with maintainers; [ fpletz ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index b13e9fe12587..c37064ee6000 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -60,12 +60,12 @@ let }; in stdenv.lib.mapAttrs common { atom = { - version = "1.27.2"; - sha256 = "0xriv142asc82mjxzkqsafaqalxa3icz4781z2fsgyfkkw6zbz2v"; + version = "1.28.0"; + sha256 = "0k09316897qb9ypkqm6w78nz7sj5385xfdm9bm97m8pka7v61g7h"; }; atom-beta = { - version = "1.28.0-beta3"; - sha256 = "07mmzkbc7xzcwh6ylrs2w1g3l5gmyfk0gdmr2kzr6jdr00cq73y0"; + version = "1.29.0-beta0"; + sha256 = "05xk63wsjfssf8ckph2bgrxaf99fhz3gs8n8pira8cc9yjk7diz7"; }; } diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 6b37f9b9145d..5c5769db1b46 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -47,7 +47,11 @@ stdenv.mkDerivation rec { --replace "/usr/local/share/man" "../share/man" ''; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; - patches = [ ./darwin.patch ]; + + patches = [ + ./darwin.patch + ./qt511.patch + ]; cmakeFlags = [ "-DKEEPASSXC_BUILD_TYPE=Release" diff --git a/pkgs/applications/misc/keepassx/qt511.patch b/pkgs/applications/misc/keepassx/qt511.patch new file mode 100644 index 000000000000..b4d312c8c263 --- /dev/null +++ b/pkgs/applications/misc/keepassx/qt511.patch @@ -0,0 +1,15 @@ +diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp +index 6fd65c1a..e99275b0 100644 +--- a/src/gui/entry/EditEntryWidget.cpp ++++ b/src/gui/entry/EditEntryWidget.cpp +@@ -29,6 +29,7 @@ + #include <QMenu> + #include <QSortFilterProxyModel> + #include <QTemporaryFile> ++#include <QButtonGroup> + #include <QMimeData> + #include <QEvent> + #include <QColorDialog> +-- +2.17.1 + diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index ca381e14dd17..6b057186eaf3 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -6,29 +6,37 @@ let overrides = self: super: with self; { backports_ssl_match_hostname = self.backports_ssl_match_hostname_3_4_0_2; + flask = super.flask.overridePythonAttrs (oldAttrs: rec { + version = "0.12.4"; + src = oldAttrs.src.override { + inherit version; + sha256 = "2ea22336f6d388b4b242bc3abf8a01244a8aa3e236e7407469ef78c16ba355dd"; + }; + }); + tornado = buildPythonPackage rec { - name = "tornado-${version}"; + pname = "tornado"; version = "4.0.2"; propagatedBuildInputs = [ backports_ssl_match_hostname certifi ]; - src = fetchurl { - url = "mirror://pypi/t/tornado/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h"; }; }; flask_login = buildPythonPackage rec { - name = "Flask-Login-${version}"; + pname = "Flask-Login"; version = "0.2.2"; - src = fetchurl { - url = "mirror://pypi/F/Flask-Login/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p"; }; propagatedBuildInputs = [ flask ]; - buildInputs = [ nose ]; + checkInputs = [ nose ]; # No tests included doCheck = false; @@ -37,10 +45,9 @@ let jinja2 = buildPythonPackage rec { pname = "Jinja2"; version = "2.8.1"; - name = "${pname}-${version}"; - src = fetchurl { - url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m"; }; @@ -53,14 +60,14 @@ let }; in pythonPackages.buildPythonApplication rec { - name = "OctoPrint-${version}"; - version = "1.3.6"; + pname = "OctoPrint"; + version = "1.3.8"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "0pgpkjw5zjnks5bky51gjaksq8mhrzkl52kpgf799hl35pd08xr3"; + sha256 = "00zd5yrlihwfd3ly0mxibr77ffa8r8vkm6jhml2ml43dqb99caa3"; }; # We need old Tornado @@ -70,9 +77,10 @@ in pythonPackages.buildPythonApplication rec { psutil pyserial flask_login netaddr markdown sockjs-tornado pylru pyyaml sarge feedparser netifaces click websocket_client scandir chainmap future dateutil futures wrapt monotonic emoji + frozendict ]; - buildInputs = with pythonPackages; [ nose mock ddt ]; + checkInputs = with pythonPackages; [ nose mock ddt ]; # Jailbreak dependencies. postPatch = '' @@ -88,7 +96,7 @@ in pythonPackages.buildPythonApplication rec { -e 's,PyYAML>=[^"]*,PyYAML,g' \ -e 's,scandir>=[^"]*,scandir,g' \ -e 's,werkzeug>=[^"]*,werkzeug,g' \ - -e 's,psutil>=[^"]*,psutil,g' \ + -e 's,psutil==[^"]*,psutil,g' \ -e 's,requests>=[^"]*,requests,g' \ -e 's,future>=[^"]*,future,g' \ -e 's,pyserial>=[^"]*,pyserial,g' \ diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 59b3ab7e8b4c..6bd7ba3eac2c 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -16,13 +16,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.10.4"; + version = "1.10.5"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0q1llnqy83fkx3vhcfjyl3frd41h7g1cvl38lfhsz1z1v9av3bpd"; + sha256 = "1k6ayb43l68l0qw31cc4k1pwvm8aks3l2xm0gdxdxbbww1mnzix2"; }; # Build using golang v1.9 in accordance with https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix index 9b738fe3863f..6d134708a5eb 100644 --- a/pkgs/applications/networking/gmailieer/default.nix +++ b/pkgs/applications/networking/gmailieer/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "gmailieer-${version}"; - version = "0.6"; + version = "0.9"; src = fetchFromGitHub { owner = "gauteh"; repo = "gmailieer"; rev = "v${version}"; - sha256 = "1z7r78ck81l8xdpjynjv8dfm4j0p6a1cbzgdckp41id27sq1vc76"; + sha256 = "1ixs5hip37hzcxwi2gsxp34r914f1wrl4r3swxqmzln3a15kngsk"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 739842bbec3a..9de394422279 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -71,6 +71,8 @@ in with stdenv; mkDerivation rec { --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; + patches = [ ./qt5_11.patch ]; + meta = with stdenv.lib; { homepage = https://quassel-irc.org/; description = "Qt/KDE distributed IRC client suppporting a remote daemon"; diff --git a/pkgs/applications/networking/irc/quassel/qt5_11.patch b/pkgs/applications/networking/irc/quassel/qt5_11.patch new file mode 100644 index 000000000000..45e43d7f96be --- /dev/null +++ b/pkgs/applications/networking/irc/quassel/qt5_11.patch @@ -0,0 +1,72 @@ +From 92f4dca367c3a6f0536a1e0f3fbb44bb6ed4da62 Mon Sep 17 00:00:00 2001 +From: Manuel Nickschas <sputnick@quassel-irc.org> +Date: Thu, 3 May 2018 23:19:34 +0200 +Subject: [PATCH] cmake: Fix build with Qt 5.11 + +Qt 5.11 removes the qt5_use_modules function, so add a copy. If +present, the Qt-provided function will be used instead. + +Closes GH-355. +--- + cmake/QuasselMacros.cmake | 38 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +diff --git a/cmake/QuasselMacros.cmake b/cmake/QuasselMacros.cmake +index 652c0042..d77ba1cf 100644 +--- a/cmake/QuasselMacros.cmake ++++ b/cmake/QuasselMacros.cmake +@@ -5,6 +5,9 @@ + # The qt4_use_modules function was taken from CMake's Qt4Macros.cmake: + # (C) 2005-2009 Kitware, Inc. + # ++# The qt5_use_modules function was taken from Qt 5.10.1 (and modified): ++# (C) 2005-2011 Kitware, Inc. ++# + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +@@ -43,6 +46,41 @@ function(qt4_use_modules _target _link_type) + endforeach() + endfunction() + ++# Qt 5.11 removed the qt5_use_modules function, so we need to provide it until we can switch to a modern CMake version. ++# If present, the Qt-provided version will be used automatically instead. ++function(qt5_use_modules _target _link_type) ++ if (NOT TARGET ${_target}) ++ message(FATAL_ERROR "The first argument to qt5_use_modules must be an existing target.") ++ endif() ++ if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" ) ++ set(_qt5_modules ${ARGN}) ++ set(_qt5_link_type ${_link_type}) ++ else() ++ set(_qt5_modules ${_link_type} ${ARGN}) ++ endif() ++ ++ if ("${_qt5_modules}" STREQUAL "") ++ message(FATAL_ERROR "qt5_use_modules requires at least one Qt module to use.") ++ endif() ++ foreach(_module ${_qt5_modules}) ++ if (NOT Qt5${_module}_FOUND) ++ find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH) ++ if (NOT Qt5${_module}_FOUND) ++ message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.") ++ endif() ++ endif() ++ target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES}) ++ set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_module}_INCLUDE_DIRS}) ++ set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_module}_COMPILE_DEFINITIONS}) ++ if (Qt5_POSITION_INDEPENDENT_CODE ++ AND (CMAKE_VERSION VERSION_LESS 2.8.12 ++ AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" ++ OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))) ++ set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE}) ++ endif() ++ endforeach() ++endfunction() ++ + # Some wrappers for simplifying dual-Qt support + + function(qt_use_modules) +-- +2.16.2 + diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index a4d2e85a9119..a1a1f12a8c1c 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -3,18 +3,20 @@ makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }: stdenv.mkDerivation rec { name = "x2goclient-${version}"; - version = "4.1.1.1"; + version = "4.1.2.0"; src = fetchurl { url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; - sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3"; + sha256 = "1x1iiyszz6mbrnsqacxzclyx172djq865bw3y83ya7lc9j8a71zn"; }; buildInputs = [ cups libssh libXpm nxproxy openldap openssh qtbase qtsvg qtx11extras qttools phonon ]; nativeBuildInputs = [ makeWrapper ]; - patchPhase = '' + patches = [ ./qt511.patch ]; + + postPatch = '' substituteInPlace Makefile \ --replace "SHELL=/bin/bash" "SHELL=$SHELL" \ --replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \ diff --git a/pkgs/applications/networking/remote/x2goclient/qt511.patch b/pkgs/applications/networking/remote/x2goclient/qt511.patch new file mode 100644 index 000000000000..8f02cd62277d --- /dev/null +++ b/pkgs/applications/networking/remote/x2goclient/qt511.patch @@ -0,0 +1,15 @@ +diff --git a/src/printwidget.cpp b/src/printwidget.cpp +index 58a8af7..131d340 100644 +--- a/src/printwidget.cpp ++++ b/src/printwidget.cpp +@@ -23,6 +23,7 @@ + #include "x2gosettings.h" + #include "x2gologdebug.h" + #include <QDir> ++#include <QButtonGroup> + #ifdef Q_OS_WIN + #include "wapi.h" + #endif +-- +2.17.1 + diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 01014e6687cb..80046ecb2cd5 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -23,6 +23,8 @@ mkDerivation rec { sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638"; }; + patches = [ ./qt5_11.patch ]; + enableParallelBuilding = true; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; diff --git a/pkgs/applications/office/calligra/qt5_11.patch b/pkgs/applications/office/calligra/qt5_11.patch new file mode 100644 index 000000000000..66ff8c6eedcd --- /dev/null +++ b/pkgs/applications/office/calligra/qt5_11.patch @@ -0,0 +1,98 @@ +diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp +index 0ffdcf6..cdca006 100644 +--- a/libs/widgets/KoCsvImportDialog.cpp ++++ b/libs/widgets/KoCsvImportDialog.cpp +@@ -21,6 +21,7 @@ + #include "KoCsvImportDialog.h" + + // Qt ++#include <QButtonGroup> + #include <QTextCodec> + #include <QTextStream> + +diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp +index f91555c..a3816f9 100644 +--- a/libs/widgets/KoPageLayoutWidget.cpp ++++ b/libs/widgets/KoPageLayoutWidget.cpp +@@ -23,6 +23,8 @@ + + #include <KoUnit.h> + ++#include <QButtonGroup> ++ + class Q_DECL_HIDDEN KoPageLayoutWidget::Private + { + public: +diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp +index c0d5136..d2a772e 100644 +--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp ++++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp +@@ -24,6 +24,7 @@ + + // Qt + #include <QAbstractItemModel> ++#include <QAction> + + // Calligra + #include <KoIcon.h> +diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp +index ed10919..8f52177 100644 +--- a/plugins/formulashape/FormulaToolWidget.cpp ++++ b/plugins/formulashape/FormulaToolWidget.cpp +@@ -30,6 +30,7 @@ + #include <QWidgetAction> + #include <QTableWidget> + #include <QAction> ++#include <QHeaderView> + #include <QMenu> + + FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) +diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp +index a0a9832..7d7db53 100644 +--- a/sheets/dialogs/LayoutDialog.cpp ++++ b/sheets/dialogs/LayoutDialog.cpp +@@ -36,6 +36,7 @@ + #include <math.h> + + #include <QIntValidator> ++#include <QButtonGroup> + #include <QCheckBox> + #include <QFrame> + #include <QLabel> +diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp +index d64208c..bfddb3a 100644 +--- a/words/part/dialogs/KWAnchoringProperties.cpp ++++ b/words/part/dialogs/KWAnchoringProperties.cpp +@@ -35,6 +35,7 @@ + + #include <kundo2command.h> + ++#include <QButtonGroup> + #include <QComboBox> + + const int KWAnchoringProperties::vertRels[4][20] = { +diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp +index e38599a..7e8b2d5 100644 +--- a/words/part/dialogs/KWRunAroundProperties.cpp ++++ b/words/part/dialogs/KWRunAroundProperties.cpp +@@ -28,6 +28,8 @@ + + #include <kundo2command.h> + ++#include <QButtonGroup> ++ + KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) + : m_state(state) + { +diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp +index ae743da..3007f91 100644 +--- a/stage/part/KPrPresentationTool.cpp ++++ b/stage/part/KPrPresentationTool.cpp +@@ -32,6 +32,7 @@ + #include <QDesktopServices> + #include <QUrl> + #include <QDBusConnection> ++#include <QFrame> + + #include <KoShape.h> + #include <KoShapeManager.h> diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index ded099632460..87fe343613e5 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,7 +3,7 @@ rec { major = "6"; minor = "0"; - patch = "4"; + patch = "5"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1xqh4l1nrvgara4ni9zk8pqywz3gbq4a8sw9v0ggxsch409zp0ch"; + sha256 = "16h60j7h9z48vfhhj22m64myksnrrgrnh0qc6i4bxgshmm8kkzdn"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 1d309fae9af7..e3ff0b594b4e 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0bjl3hdckd5bcgskh46xqna1hpxjjx0ycgpnilyk7j8l6407hpw6"; + sha256 = "1p8gb9jxv4n8ggksbfsqzdw5amxg575grxifsabhgjllpisjzrlr"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1z21bk5lwd5gxsyjdwh0fmgkys4lhnx7flbjd6dbn9d99paz1w6f"; + sha256 = "1dkzm766zi4msk6w35bvfk5b5bx1xyqg2wx58wklr5375kjv6ba9"; }; }; @@ -264,10 +264,9 @@ in stdenv.mkDerivation rec { libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses epoxy libodfgen CoinMP librdf_rasqal defaultIconTheme gettext - gdb ] ++ lib.optional kdeIntegration kdelibs4; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gdb ]; passthru = { inherit srcs jdk; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index e82fa241c00c..36500166dccf 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -581,11 +581,11 @@ md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; - sha256 = "a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34"; - md5 = "a084cd548b586552cb7d3ee51f1af969"; - md5name = "a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; + name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; + sha256 = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769"; + md5 = ""; + md5name = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; } { name = "officeotron-0.7.4-master.jar"; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 251aa44a2c58..66d1baed2dae 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -105,11 +105,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.58.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.58.0.tar.gz"; - sha256 = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115"; + name = "curl-7.60.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.60.0.tar.gz"; + sha256 = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5"; md5 = ""; - md5name = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115-curl-7.58.0.tar.gz"; + md5name = "e9c37986337743f37fd14fe8737f246e97aec94b39d1b71e8a5973f72a9fc4f5-curl-7.60.0.tar.gz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -455,11 +455,11 @@ md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz"; } { - name = "language-subtag-registry-2017-12-14.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2"; - sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362"; + name = "language-subtag-registry-2018-03-30.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2"; + sha256 = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854"; md5 = ""; - md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2"; + md5name = "b7ad618b7db518155f00490a11b861496864f18b23b4b537eb80bfe84ca6f854-language-subtag-registry-2018-03-30.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -623,11 +623,11 @@ md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; - sha256 = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf"; + name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; + sha256 = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769"; md5 = ""; - md5name = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; + md5name = "702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"; } { name = "officeotron-0.7.4-master.jar"; diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix index b1aa10800d6f..22216af3723c 100644 --- a/pkgs/applications/office/libreoffice/still-primary-src.nix +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -3,7 +3,7 @@ rec { major = "5"; minor = "4"; - patch = "6"; + patch = "7"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0icd8h221gp2dsbn6d35flwhqhcfpx66cjc5dg8yifhhvrfam74i"; + sha256 = "0s9s4nhp2whwxis54jbxrf1dwpnpl95b9781d1pdj4xk5z9v90fv"; }; } diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 52baed720c5f..dbfeb0f2fe86 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme +, defaultIconTheme, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ] , withHelp ? true , kdeIntegration ? false @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "16g85bn6qkql81a0k9iv3nwrpg2kpvz5nk4r7lab5jzlcl20qplc"; + sha256 = "05ixmqbs3pkdpyqcwadz9i3wg797vimsm75rmfby7z71wc3frcyk"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "02382d09svcgmp5q2xglhbx1na9ycd77f5cbcj9jgs8lpkgwbxxc"; + sha256 = "0ifyh4m8mwpkb16g6883ivk2s2qybr4s4s7pdjzp4cpx1nalzibl"; }; }; @@ -238,6 +238,7 @@ in stdenv.mkDerivation rec { "--without-system-libstaroffice" # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" + "--without-system-xmlsec" ]; checkPhase = '' @@ -258,12 +259,11 @@ in stdenv.mkDerivation rec { python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme - librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy + librevenge libe-book libmwaw glm glew ncurses epoxy libodfgen CoinMP librdf_rasqal defaultIconTheme - gdb ] ++ lib.optional kdeIntegration kdelibs4; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook gdb ]; passthru = { inherit srcs jdk; diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 7ff9cc517c6e..9edc6220899e 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { ''; platforms = stdenv.lib.platforms.mesaPlatforms; + hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out }; } diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 3c7af809b884..945294c556f4 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,25 +1,32 @@ -{ mkDerivation, lib, fetchurl +{ mkDerivation, lib, fetchFromGitHub , cmake, freetype, libpng, libGLU_combined, gettext, openssl, perl, libiconv , qtscript, qtserialport, qttools -, qtmultimedia, qtlocation +, qtmultimedia, qtlocation, makeWrapper, qtbase }: mkDerivation rec { name = "stellarium-${version}"; - version = "0.16.1"; + version = "0.18.0"; - src = fetchurl { - url = "mirror://sourceforge/stellarium/${name}.tar.gz"; - sha256 = "087x6mbcn2yj8d3qi382vfkzgdwmanxzqi5l1x3iranxmx9c40dh"; + src = fetchFromGitHub { + owner = "Stellarium"; + repo = "stellarium"; + rev = "v${version}"; + sha256 = "11rh4gan8bhqb2n6a94g773drbq4ffii7aqjwxv97r036579azb2"; }; nativeBuildInputs = [ cmake perl ]; buildInputs = [ freetype libpng libGLU_combined openssl libiconv qtscript qtserialport qttools - qtmultimedia qtlocation + qtmultimedia qtlocation qtbase makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/stellarium \ + --prefix QT_PLUGIN_PATH : "${qtbase}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins" + ''; + meta = with lib; { description = "Free open-source planetarium"; homepage = http://stellarium.org/; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index dc983e003365..db2fdf0199e3 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "3.6.3"; + version = "3.6.4"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "1bl4zz4k9whv5q6bkf6hyki26dkjhm19rzx2800zzadbrdgs7iz4"; + sha256 = "0n14lwmga0hhi4m4pwgpzpxmsmfy6an7b2pk59afsydhxjj88z4x"; }; libPath = makeLibraryPath [ diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 15ae244b3291..9c16733e4a07 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -2,10 +2,10 @@ libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, systemd}: stdenv.mkDerivation rec { - name = "spice-vdagent-0.17.0"; + name = "spice-vdagent-0.18.0"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "0gdkyylyg1hksg0i0anvznqfli2q39335fnrmcd6847frpc8njpi"; + sha256 = "1bmyvapwj1x0m6y8q0r1df2q37vsnb04qkgnnrfbnzf1qzipxvl0"; }; postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 803d8b9fa12e..aca96f58ed97 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -280,6 +280,10 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" pic" '' + + optionalString targetPlatform.isMinGW '' + hardening_unsupported_flags+=" stackprotector" + '' + + '' substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 09f8da17e096..124cd644467e 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-desktop-${version}"; - version = "1.20.3"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "132z1wwmh5115cpgkx9w6hzkk87f1vh66paaf3b2d2qfci7myffs"; + sha256 = "0qd76p5zqgifiawkgv2casb9ll55j4qq4pfxgxj3j5zvjr3dgr47"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 7291b475fe16..115384584a68 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0lmsmsamgg1s6qrk19qwa76ld7x1k3pwhy4vs1ixn1as4iaaddk5"; + sha256 = "1xzlwmwz1jnksa4rs0smkxhqv3j50y78cf9y5g6aki9iw4dvhvva"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index b90211ae0611..036f996da6aa 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-terminal-${version}"; - version = "1.20.0"; + version = "1.20.1"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "03366hs7mxazn6m6y53ppkb1din4jywljg0lx8zw101qg6car0az"; + sha256 = "0yfr857mpxy35zzdmicvd7mpwka8s1h0rqagfjqc2p1gv4a7ka97"; }; buildInputs = [ diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index fab9b8fe7458..d671743ee629 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -254,6 +254,9 @@ stdenv.mkDerivation ({ ++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools) ; + # TODO: Use optionalString with next rebuild. + ${if (stdenv.cc.isClang && langFortran) then "NIX_CFLAGS_COMPILE" else null} = "-Wno-unused-command-line-argument"; + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 2d49742c6510..fefd07b12043 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -8,7 +8,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 +, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index ac3578927bd5..4d2f3894f178 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -7,7 +7,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 +, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 05893704d872..cc25a41b0400 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -13,7 +13,8 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - buildInputs = [ cmake libxml2 llvm python ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libxml2 llvm python ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-std=c++11" @@ -27,6 +28,8 @@ let postPatch = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp ''; outputs = [ "out" "lib" "python" ]; diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix index cc3f5545146c..5a0410302f2f 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -17,15 +17,22 @@ stdenv.mkDerivation rec { patches = [ # glibc 2.26 fix ../../3.9/libc++/xlocale-glibc-2.26.patch - ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + ] + ++ lib.optional stdenv.isDarwin ./darwin.patch + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ../../libcxx-0001-musl-hacks.patch + ../../libcxx-max_align_t.patch + ]; + + nativeBuildInputs = [ cmake ]; - buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix index 45fb7b5be4f6..8b25681c2dbf 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation { export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include" '' + stdenv.lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 2c65234b6a47..b847a67e7e3f 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -36,8 +36,12 @@ in stdenv.mkDerivation rec { # Fix a segfault in llc # See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html - patches = [ ./D17533-1.patch ] ++ - stdenv.lib.optionals (!stdenv.isDarwin) [./fix-llvm-config.patch]; + patches = [ ./D17533-1.patch ] + ++ stdenv.lib.optional (!stdenv.isDarwin) ./fix-llvm-config.patch + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ../TLI-musl.patch + ../dynamiclibrary-musl.patch + ]; # hacky fix: New LLVM releases require a newer macOS SDK than # 10.9. This is a temporary measure until nixpkgs darwin support is @@ -49,7 +53,7 @@ in stdenv.mkDerivation rec { --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \ --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' "" '' - + stdenv.lib.optionalString (stdenv ? glibc) '' + + '' ( cd projects/compiler-rt patch -p1 < ${ @@ -81,6 +85,14 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals ( isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + # Not yet supported + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + ]; postBuild = '' diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index 1f6d80ab3be9..f597c559dba6 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -29,6 +29,8 @@ let postPatch = '' sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/Tools.cpp ''; outputs = [ "out" "lib" "python" ]; diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index 7e5c30bdfd35..bd2cc19d2e0b 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -17,15 +17,21 @@ stdenv.mkDerivation rec { patches = [ # glibc 2.26 fix ./xlocale-glibc-2.26.patch - ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + ] + ++ lib.optional stdenv.isDarwin ./darwin.patch + ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ../../libcxx-0001-musl-hacks.patch + ../../libcxx-max_align_t.patch + ]; - buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix index dc508757ab6d..dffb207a32b6 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation { export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_INCLUDES=$PWD/$(ls -d libcxx-*)/include" '' + stdenv.lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 71b67aa7dc57..708e471bd4ac 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -62,7 +62,10 @@ in stdenv.mkDerivation rec { url = https://github.com/llvm-mirror/llvm/commit/5340b5b3d970069aebf3dde49d8964583742e01a.patch; sha256 = "095f8knplwqbc2p7rad1kq8633i34qynni9jna93an7kyc80wdxl"; }) - ]; + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + ../TLI-musl.patch + ../dynamiclibrary-musl.patch + ]; postPatch = "" + '' @@ -91,7 +94,7 @@ in stdenv.mkDerivation rec { substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib patch -p1 < ./llvm-outputs.patch '' - + stdenv.lib.optionalString (stdenv ? glibc) '' + + '' ( cd projects/compiler-rt patch -p1 < ${ @@ -129,6 +132,14 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals (buildPlatform != hostPlatform) [ "-DCMAKE_CROSSCOMPILING=True" "-DLLVM_TABLEGEN=${buildPackages.llvmPackages_39.llvm}/bin/llvm-tblgen" + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" + "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + # Not yet supported + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + ]; postBuild = '' diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 718abc420a97..6ce9c0d4792b 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./xlocale-glibc-2.26.patch ] ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch - ./max_align_t.patch + ../../libcxx-max_align_t.patch ]; prePatch = '' diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix index 41eb40e124eb..5eeec395b97a 100644 --- a/pkgs/development/compilers/llvm/4/libc++abi.nix +++ b/pkgs/development/compilers/llvm/4/libc++abi.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { export TRIPLE=x86_64-apple-darwin '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} - patch -p1 -d $(ls -d libcxx-*) -i ${./libc++/max_align_t.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-max_align_t.patch} ''; installPhase = if stdenv.isDarwin diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index a371296db326..06bcd74456c4 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -83,7 +83,7 @@ in stdenv.mkDerivation (rec { patch -p0 < ${../aarch64.patch} '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${../TLI-musl.patch} - patch -p1 -i ${./dynamiclibrary-musl.patch} + patch -p1 -i ${../dynamiclibrary-musl.patch} patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt ''; diff --git a/pkgs/development/compilers/llvm/4/dynamiclibrary-musl.patch b/pkgs/development/compilers/llvm/dynamiclibrary-musl.patch index d5d7f07b5e11..d5d7f07b5e11 100644 --- a/pkgs/development/compilers/llvm/4/dynamiclibrary-musl.patch +++ b/pkgs/development/compilers/llvm/dynamiclibrary-musl.patch diff --git a/pkgs/development/compilers/llvm/4/libc++/max_align_t.patch b/pkgs/development/compilers/llvm/libcxx-max_align_t.patch index 060be5b23de8..060be5b23de8 100644 --- a/pkgs/development/compilers/llvm/4/libc++/max_align_t.patch +++ b/pkgs/development/compilers/llvm/libcxx-max_align_t.patch diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index de383410b9c6..a4b706d35aa5 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "45c74adb35f08dfa9add1112ae17330e5d902ebb4a36e7046caee8b79e6f3bd0"; }; - doCheck = true; + doCheck = !stdenv.isDarwin; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/pkgs/development/compilers/ocaml/4.07.nix index b39d57cc092b..5a3e75e648d9 100644 --- a/pkgs/development/compilers/ocaml/4.07.nix +++ b/pkgs/development/compilers/ocaml/4.07.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "07"; - patch_version = "0+beta2"; - sha256 = "0rrvl47kq982z2ns7cnasmlbj60mpmza2zyhl1kh45c5a3n7692n"; + patch_version = "0+rc1"; + sha256 = "0ggzh078k68na2mahj3nrqkl57i1iv9aymlz8mmlcd8hbvp1fcn8"; # If the executable is stripped it does not work dontStrip = true; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index a669d71036a8..cede1b67475b 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -353,7 +353,7 @@ in { }; php72 = generic { - version = "7.2.6"; - sha256 = "1hzj1z6v1ij4f4zjl1giix9qinf20wyn9gf8s29x5fc0va53wpdf"; + version = "7.2.7"; + sha256 = "18ymjqy8vpmwlzzfrxvaz2nsn8n66rmg40pwiy6x2kdgjrd6g0fc"; }; } diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 6f7f2df96bff..e2b64fd4e028 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { homepage = https://picolisp.com/; license = licenses.mit; platforms = platforms.all; + broken = stdenv.isDarwin; # times out maintainers = with maintainers; [ raskin tohl ]; }; diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index f28ab55010b6..0a71186cd4c7 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}: stdenv.mkDerivation { - name = "Xaw3d-1.6.2"; + name = "Xaw3d-1.6.3"; src = fetchurl { - url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.2.tar.bz2; - sha256 = "0awplv1nf53ywv01yxphga3v6dcniwqnxgnb0cn4khb121l12kxp"; + url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2; + sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [imake gccmakedep libXpm libXp bison flex]; diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index c72572139c68..331039ec329f 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -23,6 +23,7 @@ agda.mkDerivation (self: rec { description = "A standard library for use with the Agda compiler"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; + broken = stdenv.isDarwin; maintainers = with maintainers; [ jwiegley fuuzetsu mudri ]; }; }) diff --git a/pkgs/development/libraries/boost/1.66.nix b/pkgs/development/libraries/boost/1.66.nix index 02cf511a6fdf..932ebdcb463a 100644 --- a/pkgs/development/libraries/boost/1.66.nix +++ b/pkgs/development/libraries/boost/1.66.nix @@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec { # SHA256 from http://www.boost.org/users/history/version_1_66_0.html sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; }; - - toolset = if stdenv.cc.isClang then "clang" else null; }) diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix index 2831104410b1..8b9e7ccca7f1 100644 --- a/pkgs/development/libraries/boost/1.67.nix +++ b/pkgs/development/libraries/boost/1.67.nix @@ -8,6 +8,4 @@ callPackage ./generic.nix (args // rec { # SHA256 from http://www.boost.org/users/history/version_1_66_0.html sha256 = "2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba"; }; - - toolset = if stdenv.cc.isClang then "clang" else null; }) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index efe1151359d7..00c6d279c7ac 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv , which , buildPackages, buildPlatform, hostPlatform -, toolset ? /**/ if stdenv.cc.isClang then "clang" - else if stdenv.cc.isGNU && hostPlatform != buildPlatform then "gcc-cross" +, toolset ? /**/ if stdenv.cc.isClang then "clang" else null , enableRelease ? true , enableDebug ? false @@ -58,16 +57,26 @@ let "link=${link}" "-sEXPAT_INCLUDE=${expat.dev}/include" "-sEXPAT_LIBPATH=${expat.out}/lib" + + # TODO: make this unconditional + ] ++ optionals (hostPlatform != buildPlatform) [ + "address-model=${toString hostPlatform.parsed.cpu.bits}" + "architecture=${toString hostPlatform.parsed.cpu.family}" + "binary-format=${toString hostPlatform.parsed.kernel.execFormat.name}" + "target-os=${toString hostPlatform.parsed.kernel.name}" + + # adapted from table in boost manual + # https://www.boost.org/doc/libs/1_66_0/libs/context/doc/html/context/architectures.html + "abi=${if hostPlatform.parsed.cpu.family == "arm" then "aapcs" + else if hostPlatform.isWindows then "ms" + else if hostPlatform.isMips then "o32" + else "sysv"}" ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ optional (variant == "release") "debug-symbols=off" ++ optional (toolset != null) "toolset=${toolset}" ++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam" ++ optionals (hostPlatform.libc == "msvcrt") [ - "target-os=windows" "threadapi=win32" - "binary-format=pe" - "address-model=${toString hostPlatform.parsed.cpu.bits}" - "architecture=x86" ]); in diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index b62d764a2c65..9f704dc6a089 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -4,7 +4,7 @@ , libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }: let - version = "0.11.8.3"; + version = "0.99.1"; desktop_schemas = gnome3.gsettings_desktop_schemas; in stdenv.mkDerivation rec { name = "flatpak-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz"; - sha256 = "1dgkr1kr00111vsrql2ng2sw2b2j9axmay0fl6p540j952v3yimy"; + sha256 = "0f0mfmnc531pifrpkp1qv20wvbvi4la41rwyb3m8lnh1q5bmrch0"; }; patches = [ diff --git a/pkgs/development/libraries/libgsystem/default.nix b/pkgs/development/libraries/libgsystem/default.nix deleted file mode 100644 index e29b3ed89dea..000000000000 --- a/pkgs/development/libraries/libgsystem/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection -, glib, attr, systemd -}: - -stdenv.mkDerivation { - name = "libgsystem-2015.1"; - - meta = with stdenv.lib; { - description = "GIO-based library with Unix/Linux specific API"; - homepage = "https://wiki.gnome.org/Projects/LibGSystem"; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - }; - - src = fetchFromGitHub { - owner = "GNOME"; - repo = "libgsystem"; - rev = "v2015.1"; - sha256 = "0j5dqn1pnspfxifklw4wkikqlbxr4faib07550n5gi58m89gg68n"; - }; - - nativeBuildInputs = [ - autoreconfHook pkgconfig gtk-doc gobjectIntrospection - ]; - - propagatedBuildInputs = [ glib attr systemd ]; - - preAutoreconf = '' - mkdir m4 - ''; -} diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 2d5fa20c7cf8..9db56aa3a9ec 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, expat, rpm, db }: +{ stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { rev = "0.6.34"; @@ -11,9 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1knr48dilg8kscbmpjvd7m2krvgcdq0f9vpbqcgmxxa969mzrcy7"; }; - cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true"; + cmakeFlags = [ + "-DENABLE_COMPLEX_DEPS=true" + "-DENABLE_RPMMD=true" + "-DENABLE_RPMDB=true" + "-DENABLE_PUBKEY=true" + "-DENABLE_RPMDB_BYRPMHEADER=true" + ]; - buildInputs = [ cmake zlib expat rpm db ]; + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ zlib expat rpm db ]; meta = with stdenv.lib; { description = "A free package dependency solver"; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 5323b757b2bc..d0b2d79e9fab 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,26 +1,33 @@ -{ stdenv, fetchurl, fetchpatch, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf, zlib +, boost, openssl, libtool, python, libiconv, geoip }: -stdenv.mkDerivation rec { - name = "libtorrent-rasterbar-${version}"; +let version = "1.1.7"; + formattedVersion = lib.replaceChars ["."] ["_"] version; +in stdenv.mkDerivation { + name = "libtorrent-rasterbar-${version}"; - src = - let formattedVersion = lib.replaceChars ["."] ["_"] version; - in fetchurl { - url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz"; - sha256 = "0vbw7wcw8x9787rq5fwaibpvvspm3237l8ahbf20gjpzxhn4yfwc"; - }; + src = fetchFromGitHub { + owner = "arvidn"; + repo = "libtorrent"; + rev = "libtorrent-${formattedVersion}"; + sha256 = "073nb7yca5jg1i8z5h76qrmddl2hdy8fc1pnchkg574087an31r3"; + }; -patches = [ - (fetchpatch { - url = "https://github.com/arvidn/libtorrent/commit/64d6b4900448097b0157abb328621dd211e2947d.patch"; - sha256 = "0d4h0g129rsgm8xikybxypgv6nnya7ap7kskl7q78p4h6y2a0fhc"; - }) -]; + patches = [ + (fetchpatch { + url = "https://github.com/arvidn/libtorrent/commit/64d6b4900448097b0157abb328621dd211e2947d.patch"; + sha256 = "1bdv0icqzbg1il60sckcly4y22lkdbkkwdjadwdzxv7cdj586bzd"; + }) + (fetchpatch { + url = "https://github.com/arvidn/libtorrent/commit/9cd0ae67e74a507c1b9ff9c057ee97dda38ccb81.patch"; + sha256 = "1cscqpc6fq9iwspww930dsxf0yb01bgrghzf5hdhl09a87r6q2zg"; + }) + ]; + enableParallelBuilding = true; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ boost openssl zlib python libiconv geoip ]; - preConfigure = "./autotool.sh"; configureFlags = [ @@ -32,12 +39,8 @@ patches = [ "--with-libiconv=yes" ]; - enableParallelBuilding = true; - - doCheck = false; # fails to link - meta = with stdenv.lib; { - homepage = http://www.rasterbar.com/products/libtorrent/; + homepage = "https://libtorrent.org/"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index be2f83cb498e..8a3d7abdfa57 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -3,6 +3,7 @@ , buildPlatform, hostPlatform , pythonSupport ? buildPlatform == hostPlatform , icuSupport ? false, icu ? null +, enableStatic ? false }: let @@ -18,7 +19,8 @@ in stdenv.mkDerivation rec { }; outputs = [ "bin" "dev" "out" "man" "doc" ] - ++ lib.optional pythonSupport "py"; + ++ lib.optional pythonSupport "py" + ++ lib.optional enableStatic "static"; propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py"; buildInputs = lib.optional pythonSupport python @@ -32,7 +34,8 @@ in stdenv.mkDerivation rec { configureFlags = lib.optional pythonSupport "--with-python=${python}" ++ lib.optional icuSupport "--with-icu" - ++ [ "--exec_prefix=$dev" ]; + ++ [ "--exec_prefix=$dev" ] + ++ lib.optional enableStatic "--enable-static"; enableParallelBuilding = true; @@ -57,6 +60,8 @@ in stdenv.mkDerivation rec { moveToOutput bin/xml2-config "$dev" moveToOutput lib/xml2Conf.sh "$dev" moveToOutput share/man/man1 "$bin" + '' + lib.optionalString enableStatic '' + moveToOutput lib/libxml2.a "$static" ''; passthru = { inherit version; pythonSupport = pythonSupport; }; diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index b9fba467457e..a7b7f5243fb0 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -2,13 +2,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "tbb-${version}"; - version = "2018_U4"; + version = "2018_U5"; src = fetchFromGitHub { owner = "01org"; repo = "tbb"; rev = version; - sha256 = "00y7b4x0blkn0cymnrbh6fw7kp4xcdp4bi14rj33sl1lypawa1j6"; + sha256 = "080df8h2whnly6n9pslpg07dc9vr0p45gqgy9qijpjvxkjwfkdkp"; }; makeFlags = concatStringsSep " " ( diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 32ce856eddd3..e17ac6d15075 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -2,14 +2,14 @@ , openssl, nss, makeWrapper }: let - version = "1.2.25"; + version = "1.2.26"; in stdenv.mkDerivation rec { name = "xmlsec-${version}"; src = fetchurl { url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "1lpwj8dxwhha54sby0v5axjk79h56jnhjjiwiasbbk15vwzahz4n"; + sha256 = "0l1dk344rn3j2vnj13daz72xd8j1msvzhg82n2il5ji0qz4pd0ld"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix new file mode 100644 index 000000000000..617b0ea101fc --- /dev/null +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -0,0 +1,89 @@ +{ stdenv, buildPythonPackage, fetchPypi, pyyaml, openssh +, nose, bc, hostname, coreutils, bash, gnused +}: + +buildPythonPackage rec { + pname = "ClusterShell"; + version = "1.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bm0pq8w2rql9q9i2bhs865rqvb6zck3h3gkb1d0mh59arrr7p4m"; + }; + + propagatedBuildInputs = [ pyyaml ]; + + postPatch = '' + substituteInPlace lib/ClusterShell/Worker/Ssh.py \ + --replace '"ssh"' '"${openssh}/bin/ssh"' \ + --replace '"scp"' '"${openssh}/bin/scp"' + + substituteInPlace lib/ClusterShell/Worker/fastsubprocess.py \ + --replace '"/bin/sh"' '"${bash}/bin/sh"' + ''; + + checkInputs = [ nose bc hostname coreutils gnused ]; + + # Many tests want to open network connections + # https://github.com/cea-hpc/clustershell#test-suite + # + # Several tests fail on Darwin + checkPhase = '' + for f in tests/*; do + substituteInPlace $f \ + --replace '/bin/hostname' '${hostname}/bin/hostname' \ + --replace '/bin/sleep' '${coreutils}/bin/sleep' \ + --replace '"sleep' '"${coreutils}/bin/sleep' \ + --replace '/bin/echo' '${coreutils}/bin/echo' \ + --replace '/bin/uname' '${coreutils}/bin/uname' \ + --replace '/bin/false' '${coreutils}/bin/false' \ + --replace '/bin/true' '${coreutils}/bin/true' \ + --replace '/usr/bin/printf' '${coreutils}/bin/printf' \ + --replace '"sed' '"${gnused}/bin/sed' \ + --replace ' sed ' ' ${gnused}/bin/sed ' + done + + rm tests/CLIClushTest.py + rm tests/TreeWorkerTest.py + rm tests/TaskDistantMixin.py + rm tests/TaskDistantTest.py + rm tests/TaskDistantPdshMixin.py + rm tests/TaskDistantPdshTest.py + rm tests/TaskRLimitsTest.py + + nosetests -v \ + -e test_channel_ctl_shell_remote1 \ + -e test_channel_ctl_shell_remote2 \ + -e test_fromall_grouplist \ + -e test_rank_placeholder \ + -e test_engine_on_the_fly_launch \ + -e test_ev_pickup_fanout \ + -e test_ev_pickup_fanout_legacy \ + -e test_timeout \ + -e test_008_broken_pipe_on_write \ + -e testLocalBufferRCGathering \ + -e testLocalBuffers \ + -e testLocalErrorBuffers \ + -e testLocalFanout \ + -e testLocalRetcodes \ + -e testLocalRCBufferGathering \ + -e testLocalSingleLineBuffers \ + -e testLocalWorkerFanout \ + -e testSimpleMultipleCommands \ + -e testClushConfigSetRlimit \ + -e testTimerInvalidateInHandler \ + -e testTimerSetNextFireInHandler \ + -e test_channel_ctl_shell_mlocal1 \ + -e test_channel_ctl_shell_mlocal2 \ + -e test_channel_ctl_shell_mlocal3 \ + -e test_node_placeholder \ + tests/*.py + ''; + + meta = with stdenv.lib; { + description = "Scalable Python framework for cluster administration"; + homepage = https://cea-hpc.github.io/clustershell; + license = licenses.lgpl21; + maintainers = [ maintainers.alexvorobiev ]; + }; +} diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index 04fae0db1b7a..6cb6e626f279 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -1,5 +1,6 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchurl -, utillinux, pygit2, gitMinimal, git-annex }: +{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch +, utillinux, pygit2, gitMinimal, git-annex +}: buildPythonPackage rec { pname = "git-annex-adapter"; @@ -22,10 +23,13 @@ buildPythonPackage rec { ''; # TODO: Remove for next version - patches = fetchurl { - url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch"; - sha256 = "1hbw8651amjskakvs1wv2msd1wryrq0vpryvbispg5267rs8q7hp"; - }; + patches = [ + ./not-a-git-repo-testcase.patch + (fetchpatch { + url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch"; + sha256 = "0yh66gial6bx7kbl7s7lkzljnkpgvgr8yahqqcq9z76d0w752dir"; + }) + ]; checkInputs = [ utillinux # `rev` is needed in tests/test_process.py @@ -43,6 +47,6 @@ buildPythonPackage rec { homepage = https://github.com/alpernebbi/git-annex-adapter; description = "Call git-annex commands from Python"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda ma27 ]; }; } diff --git a/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch b/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch new file mode 100644 index 000000000000..2a386ee3f2f9 --- /dev/null +++ b/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test_process.py b/tests/test_process.py +index 493fc8f..feb1833 100644 +--- a/tests/test_process.py ++++ b/tests/test_process.py +@@ -126,7 +126,7 @@ class TestProcessOnEmptyDir(TempDirTestCase): + with self.assertRaises(subprocess.CalledProcessError) as cm: + runner('status', '-sb') + self.assertIn( +- "fatal: Not a git repository", ++ "fatal: not a git repository", + cm.exception.stderr, + ) + diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix index ade4111c5a3b..3899be92b1e9 100644 --- a/pkgs/development/python-modules/hbmqtt/default.nix +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, isPy3k , transitions, websockets, passlib, docopt, pyyaml, nose }: buildPythonPackage rec { @@ -12,6 +12,13 @@ buildPythonPackage rec { sha256 = "6f61e05007648a4f33e300fafcf42776ca95508ba1141799f94169427ce5018c"; }; + patches = [ + (fetchpatch { + url = "https://github.com/beerfactory/hbmqtt/commit/75a85d1ea4cb41f2a15f2681d3114da7158942ae.patch"; + sha256 = "0bl4v5zxp4kz2w7riwrx48f7yqmp7pxg79g9qavkda0i85lxswnp"; + }) + ]; + propagatedBuildInputs = [ transitions websockets passlib docopt pyyaml ]; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/jupyterlab_launcher/default.nix b/pkgs/development/python-modules/jupyterlab_launcher/default.nix index 5bbc36f53dfe..f316fe10563d 100644 --- a/pkgs/development/python-modules/jupyterlab_launcher/default.nix +++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, jsonschema, notebook }: buildPythonPackage rec { pname = "jupyterlab_launcher"; - version = "0.11.0"; + version = "0.10.5"; src = fetchPypi { inherit pname version; - sha256 = "2eea0cc95b312e136e6e5abc64e2e62baaeca493cd32f553c2205f79e01c0423"; + sha256 = "1v1ir182zm2dl14lqvqjhx2x40wnp0i32n6rldxnm1allfpld1n7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix new file mode 100644 index 000000000000..e53098f6f232 --- /dev/null +++ b/pkgs/development/python-modules/monty/default.nix @@ -0,0 +1,38 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, nose, numpy, six, ruamel_yaml, msgpack-python, coverage, coveralls, pymongo, lsof }: + +buildPythonPackage rec { + pname = "monty"; + version = "1.0.2"; + + # No tests in Pypi + src = fetchFromGitHub { + owner = "materialsvirtuallab"; + repo = pname; + rev = "v${version}"; + sha256 = "0ss70fanavqdpj56yymj06lacgnknb4ap39m2q28v9lz32cs6xdg"; + }; + + propagatedBuildInputs = [ nose numpy six ruamel_yaml msgpack-python coverage coveralls pymongo lsof ]; + + preCheck = '' + substituteInPlace tests/test_os.py \ + --replace 'def test_which(self):' '#' \ + --replace 'py = which("python")' '#' \ + --replace 'self.assertEqual(os.path.basename(py), "python")' '#' \ + --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' \ + --replace 'self.assertIs(which("non_existent_exe"), None)' '#' \ + ''; + + meta = with stdenv.lib; { + description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems"; + longDescription = " + Monty implements supplementary useful functions for Python that are not part of the + standard library. Examples include useful utilities like transparent support for zipped files, useful design + patterns such as singleton and cached_class, and many more. + "; + homepage = https://github.com/materialsvirtuallab/monty; + license = licenses.mit; + maintainers = with maintainers; [ psyanticy ]; + }; +} + diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index 412d42bafddd..af7e4dde59e3 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "netdisco"; - version = "1.4.0"; + version = "1.5.0"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = pname; rev = version; - sha256 = "0q1cl76a0fwxm80lkk7cpd4p23r2bvf1a45nb7n61cgzrqcv43q1"; + sha256 = "1lr0zpzdjkhcaihyxq8wv7c1wjm7xgx2sl8xmwp1kyivkgybk6n9"; }; propagatedBuildInputs = [ requests zeroconf netifaces ]; diff --git a/pkgs/development/python-modules/pyserial/default.nix b/pkgs/development/python-modules/pyserial/default.nix index 95ab0f339b06..e8de912c3754 100644 --- a/pkgs/development/python-modules/pyserial/default.nix +++ b/pkgs/development/python-modules/pyserial/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage, hostPlatform }: buildPythonPackage rec { pname = "pyserial"; @@ -11,6 +11,7 @@ buildPythonPackage rec { }; checkPhase = "python -m unittest discover -s test"; + doInstallCheck = !hostPlatform.isDarwin; # broken on darwin meta = with lib; { homepage = "https://github.com/pyserial/pyserial"; diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix new file mode 100644 index 000000000000..b2b103858cce --- /dev/null +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "python-periphery"; + version = "1.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "fe8f351934edce72cd919b4eb070878ebff551db5e21aea61e0f446101f0a79f"; + }; + + # Some tests require physical probing and additional physical setup + doCheck = false; + + meta = { + homepage = https://github.com/vsergeev/python-periphery; + description = "Linux Peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) with Python 2 & 3"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bandresen ]; + }; +} diff --git a/pkgs/development/python-modules/seekpath/default.nix b/pkgs/development/python-modules/seekpath/default.nix new file mode 100644 index 000000000000..de17e65d2bfb --- /dev/null +++ b/pkgs/development/python-modules/seekpath/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, fetchPypi, numpy, future, spglib, glibcLocales }: + +buildPythonPackage rec { + pname = "seekpath"; + version = "1.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0bdc0400c96952525b1165894807e4bec90aaedb11cfeb27a57414e6091eb026"; + }; + + LC_ALL = "en_US.utf-8"; + + propagatedBuildInputs = [ numpy spglib future ]; + + nativeBuildInputs = [ glibcLocales ]; + + meta = with stdenv.lib; { + description = "A module to obtain and visualize band paths in the Brillouin zone of crystal structures."; + homepage = https://github.com/giovannipizzi/seekpath; + license = licenses.mit; + maintainers = with maintainers; [ psyanticy ]; + }; +} + diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix index 6b14eebb310f..07cbdc57ef9e 100644 --- a/pkgs/development/python-modules/user-agents/default.nix +++ b/pkgs/development/python-modules/user-agents/default.nix @@ -14,6 +14,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ ua-parser ]; + doCheck = false; # some tests fail due to ua-parser bump to 0.8.0 + meta = with stdenv.lib; { description = "A Python library to identify devices by parsing user agent strings"; homepage = https://github.com/selwin/python-user-agents; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 941004234011..1dac9513f948 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { - version = "0.12.0"; + version = "0.13.0"; meta = with stdenv.lib; { homepage = "https://github.com/bazelbuild/bazel/"; description = "Build tool that builds code quickly and reliably"; license = licenses.asl20; - maintainers = [ maintainers.philandstuff ]; + maintainers = [ maintainers.mboes ]; platforms = platforms.linux ++ platforms.darwin; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "3b3e7dc76d145046fdc78db7cac9a82bc8939d3b291e53a7ce85315feb827754"; + sha256 = "143nd9dmw2x88azf8spinl2qnvw9m8lqlqc765l9q2v6hi807sc2"; }; sourceRoot = "."; @@ -64,14 +64,17 @@ stdenv.mkDerivation rec { --replace /bin/bash ${customBash}/bin/bash \ --replace /usr/bin/env ${coreutils}/bin/env done + # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. + substituteInPlace scripts/bootstrap/compile.sh \ + --replace /bin/sh ${customBash}/bin/bash echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc - sed -i -e "348 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "348 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "348 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh - sed -i -e "348 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "366 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh patchShebangs . ''; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 494866d27d8c..46433233992b 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -20,12 +20,12 @@ let newPython = python.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.4.4"; + version = "1.4.5"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "1g03f8rw9l198w9ph0gi0q3g84ilp1dxxc9nmj0dgnymcfgpf89n"; + sha256 = "1mjakrv1d7la3lrxsv6jjqprqwmslpjmfxkw3z7pk56rzlp99nv2"; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index 286190436bff..9fb7c0e64b80 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "shards-${version}"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "https://github.com/crystal-lang/shards/archive/v${version}.tar.gz"; - sha256 = "02v69xl7x6sn0ddn29mjx3srwk4fyz0hz2pwaqa25fwwyhxvyn3p"; + sha256 = "198768izbsqqp063847r2x9ddcf4qfxx7vx7c6gwbmgjmjv4mivm"; }; buildInputs = [ crystal libyaml which ]; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 351ec2c77dba..5552bdcc5e6c 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -19,6 +19,7 @@ , bzip2 , coreutils , cpio +, curl , elfutils , flatpak , gitMinimal @@ -35,7 +36,7 @@ }: let - version = "0.10.10"; + version = "0.99.1"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; @@ -43,7 +44,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "0b0c2rmf2vj596600blbhsiv2dg7qwpr33lgdcn0bnqc4ddri6f2"; + sha256 = "0xgywl4qsxq7lw1v7hmvczzv3pl12bzz3jv59y8s5gbk54rzbyi5"; }; nativeBuildInputs = [ @@ -62,6 +63,7 @@ in stdenv.mkDerivation rec { buildInputs = [ acl bzip2 + curl elfutils flatpak glib diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 39677ba719e2..4beef3de2723 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cfr-${version}"; - version = "0.128"; + version = "0.130"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "09mx1f6d1p57q5r05nvgm1xrhqv34n7v7rwq875whb441h1dnsix"; + sha256 = "0zy63jxl05f0wm9s344y846hzqn0zk34w6qpbf48a98si5ciwsmn"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index 6d91007e4860..4b04f70a2c2e 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "kcgi"; - version = "0.10.5"; + version = "0.10.6"; underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version; name = "${pname}-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "kristapsdz"; repo = pname; rev = "VERSION_${underscoreVersion}"; - sha256 = "0ksdjqibkj7h1a99i84i6y0949c0vwx789q0sslzdkkgqvjnw3xw"; + sha256 = "0vaqz7krlvkjlc0189pkcj1al1p5ic577dn6bb4ivca1bss1i3m2"; }; patchPhase = ''substituteInPlace configure \ --replace /usr/local / diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index dbd2814a6fb6..1391ca70223a 100644 --- a/pkgs/games/ball-and-paddle/default.nix +++ b/pkgs/games/ball-and-paddle/default.nix @@ -38,5 +38,7 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = stdenv.lib.platforms.unix; + + hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 37176750763f..56a926e63f6d 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; + hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out maintainers = with stdenv.lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 28d273ad5cc4..2fe76649d552 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { description = "A reimplementation of the Ultima VII game engine"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.unix; + hydraPlatforms = stdenv.lib.platforms.linux; # darwin times out }; } diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index ee93d162396d..8003468f50fa 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ pierron ]; platforms = platforms.unix; + hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index c1bfda9e2f2f..d5efe2b3ebd9 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -54,5 +54,6 @@ in stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.bjg ]; platforms = stdenv.lib.platforms.all; + hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix index 5ab9954739b2..b5f858b99ad7 100644 --- a/pkgs/games/lbreakout2/default.nix +++ b/pkgs/games/lbreakout2/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.ciil ]; platforms = platforms.unix; + hydraPlatforms = stdenv.lib.platforms.linux; # sdl-config times out on darwin }; } diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix deleted file mode 100644 index 5ea84b9ef41f..000000000000 --- a/pkgs/games/unvanquished/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ stdenv, fetchurl, cmake, libGLU_combined, SDL, libjpeg, libpng, glew, libwebp, ncurses -, gmp, curl, nettle, openal, speex, libogg, libvorbis, libtheora, xvidcore -, makeWrapper }: -stdenv.mkDerivation rec { - name = "unvanquished-${version}"; - version = "0.13.1"; - src = fetchurl { - url = "https://github.com/Unvanquished/Unvanquished/archive/v${version}.tar.gz"; - sha256 = "1k7mlpwalimn6xb2s760f124xncpg455qvls6z3x0ii5x0wc1mp2"; - }; - buildInputs = [ cmake libGLU_combined SDL libjpeg libpng glew libwebp ncurses gmp curl - nettle openal speex libogg libvorbis libtheora xvidcore - makeWrapper ]; - preConfigure = ''prefix="$prefix/opt"''; - postInstall = '' - # cp -r ../main "$prefix/Unvanquished/" - mkdir -p "$out/bin" - substituteInPlace download-pk3.sh --replace /bin/bash ${stdenv.shell} - cp -v download-pk3.sh "$out/bin/unvanquished-download-pk3" - makeWrapper "$prefix/Unvanquished/daemon" "$out/bin/unvanquished" \ - --run '[ -f ~/.Unvanquished/main/md5sums ] && - cd ~/.Unvanquished/main/ && - md5sum --quiet -c md5sums || - unvanquished-download-pk3' \ - --run "cd '$prefix/Unvanquished'" - makeWrapper "$prefix/Unvanquished/daemonded" "$out/bin/unvanquished-ded" \ - --run '[ -f ~/.Unvanquished/main/md5sums ] && - cd ~/.Unvanquished/main/ && - md5sum --quiet -c md5sums || - unvanquished-download-pk3' \ - --run "cd '$prefix/Unvanquished'" - ''; - - meta = { - description = "FPS game set in a futuristic, sci-fi setting"; - longDescription = '' - Unvanquished is a free, open-source first-person shooter - combining real-time strategy elements with a futuristic, sci-fi - setting. It is available for Windows, Linux, and macOS. - - Features: - - * Two teams - Play as either the technologically advanced humans or the highly - adaptable aliens, with a fresh gameplay experience on both - sides. - - * Build a base - Construct and maintain your base with a variety of useful - structures, or group up with teammates to take on the other - team. - - * Level up - Earn rewards for victories against the other team, whether it's - a deadly new weapon or access to a whole new alien form. - - * Customize - Compatibility with Quake 3 file formats and modification tools - allows for extensive customization of the game and its - setting. - ''; - homepage = http://unvanquished.net; - #license = "unknown"; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = stdenv.lib.platforms.linux; - # This package can take a lot of disk space, so unavailable from channel - hydraPlatforms = []; - }; -} diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index 73ae6801bc2b..c2e950b4ba48 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { stripLen = 2; extraPrefix = "1.0.0.rc16/"; }) + (fetchpatch { + url = "https://raw.githubusercontent.com/void-linux/void-packages/fceed4b8e96b3c1da07babf6f67b6ed1588a28b2/srcpkgs/dmraid/patches/007-fix-loff_t-musl.patch"; + sha256 = "0msnq39qnzg3b1pdksnz1dgqwa3ak03g41pqh0lw3h7w5rjc016k"; + stripLen = 2; + extraPrefix = "1.0.0.rc16/"; + }) ]; postPatch = '' diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e2acee87d1ab..7bf7d6237488 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.69.1"; + version = "0.72.0"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -91,11 +91,14 @@ "binary_sensor.hikvision" = ps: with ps; [ ]; "binary_sensor.hive" = ps: with ps; [ ]; "binary_sensor.homematic" = ps: with ps; [ pyhomematic ]; + "binary_sensor.homematicip_cloud" = ps: with ps; [ ]; + "binary_sensor.hydrawise" = ps: with ps; [ ]; "binary_sensor.ihc" = ps: with ps; [ ]; "binary_sensor.insteon_plm" = ps: with ps; [ ]; "binary_sensor.iss" = ps: with ps; [ ]; "binary_sensor.isy994" = ps: with ps; [ ]; "binary_sensor.knx" = ps: with ps; [ ]; + "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "binary_sensor.linode" = ps: with ps; [ linode-api ]; "binary_sensor.maxcube" = ps: with ps; [ ]; "binary_sensor.modbus" = ps: with ps; [ ]; @@ -111,6 +114,7 @@ "binary_sensor.ping" = ps: with ps; [ ]; "binary_sensor.qwikswitch" = ps: with ps; [ ]; "binary_sensor.raincloud" = ps: with ps; [ ]; + "binary_sensor.rainmachine" = ps: with ps; [ ]; "binary_sensor.random" = ps: with ps; [ ]; "binary_sensor.raspihats" = ps: with ps; [ ]; "binary_sensor.rest" = ps: with ps; [ ]; @@ -130,6 +134,7 @@ "binary_sensor.threshold" = ps: with ps; [ ]; "binary_sensor.trend" = ps: with ps; [ numpy ]; "binary_sensor.upcloud" = ps: with ps; [ ]; + "binary_sensor.uptimerobot" = ps: with ps; [ ]; "binary_sensor.velbus" = ps: with ps; [ ]; "binary_sensor.vera" = ps: with ps; [ ]; "binary_sensor.verisure" = ps: with ps; [ ]; @@ -137,6 +142,7 @@ "binary_sensor.vultr" = ps: with ps; [ vultr ]; "binary_sensor.wemo" = ps: with ps; [ ]; "binary_sensor.wink" = ps: with ps; [ ]; + "binary_sensor.wirelesstag" = ps: with ps; [ ]; "binary_sensor.workday" = ps: with ps; [ ]; "binary_sensor.xiaomi_aqara" = ps: with ps; [ ]; "binary_sensor.zha" = ps: with ps; [ ]; @@ -146,7 +152,7 @@ "bloomsky" = ps: with ps; [ ]; "bmw_connected_drive" = ps: with ps; [ ]; "browser" = ps: with ps; [ ]; - "calendar" = ps: with ps; [ ]; + "calendar" = ps: with ps; [ aiohttp-cors ]; "calendar.caldav" = ps: with ps; [ ]; "calendar.demo" = ps: with ps; [ ]; "calendar.google" = ps: with ps; [ ]; @@ -162,6 +168,7 @@ "camera.canary" = ps: with ps; [ ha-ffmpeg ]; "camera.demo" = ps: with ps; [ ]; "camera.doorbird" = ps: with ps; [ ]; + "camera.familyhub" = ps: with ps; [ ]; "camera.ffmpeg" = ps: with ps; [ ha-ffmpeg ]; "camera.foscam" = ps: with ps; [ ]; "camera.generic" = ps: with ps; [ ]; @@ -181,9 +188,11 @@ "camera.uvc" = ps: with ps; [ ]; "camera.verisure" = ps: with ps; [ ]; "camera.xeoma" = ps: with ps; [ ]; + "camera.xiaomi" = ps: with ps; [ ha-ffmpeg ]; "camera.yi" = ps: with ps; [ ha-ffmpeg ]; "camera.zoneminder" = ps: with ps; [ ]; "canary" = ps: with ps; [ ]; + "cast" = ps: with ps; [ PyChromecast ]; "climate" = ps: with ps; [ ]; "climate.daikin" = ps: with ps; [ ]; "climate.demo" = ps: with ps; [ ]; @@ -197,6 +206,7 @@ "climate.heatmiser" = ps: with ps; [ ]; "climate.hive" = ps: with ps; [ ]; "climate.homematic" = ps: with ps; [ pyhomematic ]; + "climate.homematicip_cloud" = ps: with ps; [ ]; "climate.honeywell" = ps: with ps; [ ]; "climate.knx" = ps: with ps; [ ]; "climate.maxcube" = ps: with ps; [ ]; @@ -218,6 +228,7 @@ "climate.venstar" = ps: with ps; [ ]; "climate.vera" = ps: with ps; [ ]; "climate.wink" = ps: with ps; [ ]; + "climate.zhong_hong" = ps: with ps; [ ]; "climate.zwave" = ps: with ps; [ ]; "cloud" = ps: with ps; [ aiohttp-cors warrant ]; "cloud.auth_api" = ps: with ps; [ ]; @@ -231,7 +242,7 @@ "config.config_entries" = ps: with ps; [ voluptuous-serialize ]; "config.core" = ps: with ps; [ ]; "config.customize" = ps: with ps; [ ]; - "config.entity_registry" = ps: with ps; [ ]; + "config.entity_registry" = ps: with ps; [ aiohttp-cors ]; "config.group" = ps: with ps; [ ]; "config.hassbian" = ps: with ps; [ ]; "config.script" = ps: with ps; [ ]; @@ -258,6 +269,7 @@ "cover.rflink" = ps: with ps; [ ]; "cover.rfxtrx" = ps: with ps; [ ]; "cover.rpi_gpio" = ps: with ps; [ ]; + "cover.ryobi_gdo" = ps: with ps; [ ]; "cover.scsgate" = ps: with ps; [ ]; "cover.tahoma" = ps: with ps; [ ]; "cover.tellduslive" = ps: with ps; [ ]; @@ -288,6 +300,7 @@ "device_tracker.cisco_ios" = ps: with ps; [ pexpect ]; "device_tracker.ddwrt" = ps: with ps; [ ]; "device_tracker.demo" = ps: with ps; [ ]; + "device_tracker.freebox" = ps: with ps; [ ]; "device_tracker.fritz" = ps: with ps; [ fritzconnection ]; "device_tracker.geofency" = ps: with ps; [ aiohttp-cors ]; "device_tracker.google_maps" = ps: with ps; [ ]; @@ -407,6 +420,7 @@ "hue.config_flow" = ps: with ps; [ ]; "hue.const" = ps: with ps; [ ]; "hue.errors" = ps: with ps; [ ]; + "hydrawise" = ps: with ps; [ ]; "ifttt" = ps: with ps; [ ]; "ihc" = ps: with ps; [ ]; "ihc.const" = ps: with ps; [ ]; @@ -415,6 +429,7 @@ "image_processing.demo" = ps: with ps; [ ]; "image_processing.dlib_face_detect" = ps: with ps; [ face_recognition ]; "image_processing.dlib_face_identify" = ps: with ps; [ face_recognition ]; + "image_processing.facebox" = ps: with ps; [ ]; "image_processing.microsoft_face_detect" = ps: with ps; [ aiohttp-cors ]; "image_processing.microsoft_face_identify" = ps: with ps; [ aiohttp-cors ]; "image_processing.openalpr_cloud" = ps: with ps; [ ]; @@ -440,6 +455,7 @@ "keyboard_remote" = ps: with ps; [ evdev ]; "kira" = ps: with ps; [ ]; "knx" = ps: with ps; [ ]; + "konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "lametric" = ps: with ps; [ ]; "light" = ps: with ps; [ ]; "light.abode" = ps: with ps; [ ]; @@ -459,6 +475,7 @@ "light.hive" = ps: with ps; [ ]; "light.homekit_controller" = ps: with ps; [ ]; "light.homematic" = ps: with ps; [ pyhomematic ]; + "light.homematicip_cloud" = ps: with ps; [ ]; "light.hue" = ps: with ps; [ aiohue ]; "light.hyperion" = ps: with ps; [ ]; "light.iglo" = ps: with ps; [ ]; @@ -473,6 +490,7 @@ "light.litejet" = ps: with ps; [ ]; "light.lutron" = ps: with ps; [ ]; "light.lutron_caseta" = ps: with ps; [ ]; + "light.lw12wifi" = ps: with ps; [ ]; "light.mochad" = ps: with ps; [ ]; "light.mqtt" = ps: with ps; [ paho-mqtt ]; "light.mqtt_json" = ps: with ps; [ paho-mqtt ]; @@ -518,6 +536,7 @@ "lock.demo" = ps: with ps; [ ]; "lock.homematic" = ps: with ps; [ pyhomematic ]; "lock.isy994" = ps: with ps; [ ]; + "lock.kiwi" = ps: with ps; [ ]; "lock.lockitron" = ps: with ps; [ ]; "lock.mqtt" = ps: with ps; [ paho-mqtt ]; "lock.nello" = ps: with ps; [ ]; @@ -528,6 +547,7 @@ "lock.verisure" = ps: with ps; [ ]; "lock.volvooncall" = ps: with ps; [ ]; "lock.wink" = ps: with ps; [ ]; + "lock.xiaomi_aqara" = ps: with ps; [ ]; "lock.zwave" = ps: with ps; [ ]; "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "logentries" = ps: with ps; [ ]; @@ -559,11 +579,13 @@ "media_player.directv" = ps: with ps; [ ]; "media_player.dunehd" = ps: with ps; [ ]; "media_player.emby" = ps: with ps; [ ]; + "media_player.epson" = ps: with ps; [ ]; "media_player.firetv" = ps: with ps; [ ]; "media_player.frontier_silicon" = ps: with ps; [ ]; "media_player.gpmdp" = ps: with ps; [ websocket_client ]; "media_player.gstreamer" = ps: with ps; [ ]; "media_player.hdmi_cec" = ps: with ps; [ ]; + "media_player.horizon" = ps: with ps; [ ]; "media_player.itunes" = ps: with ps; [ ]; "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; "media_player.lg_netcast" = ps: with ps; [ ]; @@ -589,7 +611,7 @@ "media_player.songpal" = ps: with ps; [ ]; "media_player.sonos" = ps: with ps; [ ]; "media_player.soundtouch" = ps: with ps; [ libsoundtouch ]; - "media_player.spotify" = ps: with ps; [ aiohttp-cors spotipy ]; + "media_player.spotify" = ps: with ps; [ aiohttp-cors ]; "media_player.squeezebox" = ps: with ps; [ ]; "media_player.ue_smart_radio" = ps: with ps; [ ]; "media_player.universal" = ps: with ps; [ ]; @@ -616,7 +638,11 @@ "namecheapdns" = ps: with ps; [ ]; "neato" = ps: with ps; [ ]; "nest" = ps: with ps; [ ]; + "nest.config_flow" = ps: with ps; [ ]; + "nest.const" = ps: with ps; [ ]; + "nest.local_auth" = ps: with ps; [ ]; "netatmo" = ps: with ps; [ ]; + "netgear_lte" = ps: with ps; [ ]; "no_ip" = ps: with ps; [ ]; "notify" = ps: with ps; [ ]; "notify.apns" = ps: with ps; [ ]; @@ -633,6 +659,7 @@ "notify.ecobee" = ps: with ps; [ ]; "notify.facebook" = ps: with ps; [ ]; "notify.file" = ps: with ps; [ ]; + "notify.flock" = ps: with ps; [ ]; "notify.free_mobile" = ps: with ps; [ ]; "notify.gntp" = ps: with ps; [ ]; "notify.group" = ps: with ps; [ ]; @@ -652,8 +679,8 @@ "notify.message_bird" = ps: with ps; [ ]; "notify.mycroft" = ps: with ps; [ ]; "notify.mysensors" = ps: with ps; [ ]; + "notify.netgear_lte" = ps: with ps; [ ]; "notify.nfandroidtv" = ps: with ps; [ ]; - "notify.nma" = ps: with ps; [ ]; "notify.prowl" = ps: with ps; [ ]; "notify.pushbullet" = ps: with ps; [ pushbullet ]; "notify.pushetta" = ps: with ps; [ ]; @@ -712,6 +739,7 @@ "rpi_gpio" = ps: with ps; [ ]; "rpi_pfio" = ps: with ps; [ ]; "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; + "sabnzbd" = ps: with ps; [ ]; "satel_integra" = ps: with ps; [ ]; "scene" = ps: with ps; [ ]; "scene.deconz" = ps: with ps; [ ]; @@ -799,6 +827,7 @@ "sensor.file" = ps: with ps; [ ]; "sensor.filesize" = ps: with ps; [ ]; "sensor.filter" = ps: with ps; [ ]; + "sensor.fints" = ps: with ps; [ ]; "sensor.fitbit" = ps: with ps; [ aiohttp-cors ]; "sensor.fixer" = ps: with ps; [ ]; "sensor.folder" = ps: with ps; [ ]; @@ -822,6 +851,7 @@ "sensor.homematicip_cloud" = ps: with ps; [ ]; "sensor.hp_ilo" = ps: with ps; [ ]; "sensor.htu21d" = ps: with ps; [ ]; + "sensor.hydrawise" = ps: with ps; [ ]; "sensor.hydroquebec" = ps: with ps; [ ]; "sensor.ihc" = ps: with ps; [ ]; "sensor.imap" = ps: with ps; [ aioimaplib ]; @@ -830,6 +860,7 @@ "sensor.insteon_plm" = ps: with ps; [ ]; "sensor.ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "sensor.iota" = ps: with ps; [ ]; + "sensor.iperf3" = ps: with ps; [ ]; "sensor.irish_rail_transport" = ps: with ps; [ ]; "sensor.isy994" = ps: with ps; [ ]; "sensor.juicenet" = ps: with ps; [ ]; @@ -865,7 +896,9 @@ "sensor.nest" = ps: with ps; [ ]; "sensor.netatmo" = ps: with ps; [ ]; "sensor.netdata" = ps: with ps; [ ]; + "sensor.netgear_lte" = ps: with ps; [ ]; "sensor.neurio_energy" = ps: with ps; [ ]; + "sensor.nsw_fuel_station" = ps: with ps; [ ]; "sensor.nut" = ps: with ps; [ ]; "sensor.nzbget" = ps: with ps; [ ]; "sensor.octoprint" = ps: with ps; [ ]; @@ -891,6 +924,7 @@ "sensor.radarr" = ps: with ps; [ ]; "sensor.rainbird" = ps: with ps; [ ]; "sensor.raincloud" = ps: with ps; [ ]; + "sensor.rainmachine" = ps: with ps; [ ]; "sensor.random" = ps: with ps; [ ]; "sensor.rest" = ps: with ps; [ ]; "sensor.rflink" = ps: with ps; [ ]; @@ -971,6 +1005,7 @@ "sensor.waze_travel_time" = ps: with ps; [ ]; "sensor.whois" = ps: with ps; [ ]; "sensor.wink" = ps: with ps; [ ]; + "sensor.wirelesstag" = ps: with ps; [ ]; "sensor.worldclock" = ps: with ps; [ ]; "sensor.worldtidesinfo" = ps: with ps; [ ]; "sensor.worxlandroid" = ps: with ps; [ ]; @@ -996,6 +1031,8 @@ "sleepiq" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ]; "snips" = ps: with ps; [ paho-mqtt ]; + "sonos" = ps: with ps; [ ]; + "spaceapi" = ps: with ps; [ aiohttp-cors ]; "spc" = ps: with ps; [ websockets ]; "splunk" = ps: with ps; [ ]; "statsd" = ps: with ps; [ statsd ]; @@ -1030,13 +1067,16 @@ "switch.hive" = ps: with ps; [ ]; "switch.homekit_controller" = ps: with ps; [ ]; "switch.homematic" = ps: with ps; [ pyhomematic ]; + "switch.homematicip_cloud" = ps: with ps; [ ]; "switch.hook" = ps: with ps; [ ]; + "switch.hydrawise" = ps: with ps; [ ]; "switch.ihc" = ps: with ps; [ ]; "switch.insteon_local" = ps: with ps; [ ]; "switch.insteon_plm" = ps: with ps; [ ]; "switch.isy994" = ps: with ps; [ ]; "switch.kankun" = ps: with ps; [ ]; "switch.knx" = ps: with ps; [ ]; + "switch.konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "switch.linode" = ps: with ps; [ linode-api ]; "switch.litejet" = ps: with ps; [ ]; "switch.lutron_caseta" = ps: with ps; [ ]; @@ -1087,6 +1127,7 @@ "switch.wake_on_lan" = ps: with ps; [ wakeonlan ]; "switch.wemo" = ps: with ps; [ ]; "switch.wink" = ps: with ps; [ ]; + "switch.wirelesstag" = ps: with ps; [ ]; "switch.xiaomi_aqara" = ps: with ps; [ ]; "switch.xiaomi_miio" = ps: with ps; [ construct ]; "switch.zha" = ps: with ps; [ ]; @@ -1138,12 +1179,14 @@ "vultr" = ps: with ps; [ vultr ]; "wake_on_lan" = ps: with ps; [ wakeonlan ]; "waterfurnace" = ps: with ps; [ ]; + "watson_iot" = ps: with ps; [ ]; "weather" = ps: with ps; [ ]; "weather.bom" = ps: with ps; [ ]; "weather.buienradar" = ps: with ps; [ ]; "weather.darksky" = ps: with ps; [ ]; "weather.demo" = ps: with ps; [ ]; "weather.ecobee" = ps: with ps; [ ]; + "weather.ipma" = ps: with ps; [ ]; "weather.metoffice" = ps: with ps; [ ]; "weather.openweathermap" = ps: with ps; [ pyowm ]; "weather.yweather" = ps: with ps; [ yahooweather ]; @@ -1152,6 +1195,7 @@ "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ ]; "wink" = ps: with ps; [ ]; + "wirelesstag" = ps: with ps; [ ]; "xiaomi_aqara" = ps: with ps; [ ]; "zabbix" = ps: with ps; [ ]; "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index fbc233398735..d1315611157a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -7,18 +7,25 @@ let py = python3.override { packageOverrides = self: super: { - aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "3.1.3"; + requests = super.requests.overridePythonAttrs (oldAttrs: rec { + version = "2.18.4"; src = oldAttrs.src.override { inherit version; - sha256 = "9fcef0489e3335b200d31a9c1fb6ba80fdafe14cd82b971168c2f9fa1e4508ad"; + sha256 = "0zi3v9nsmv9j27d0c0m1dvqyvaxz53g8m0aa1h3qanxs4irkwi4w"; }; }); - pytest = super.pytest.overridePythonAttrs (oldAttrs: rec { - version = "3.4.2"; + urllib3 = super.urllib3.overridePythonAttrs (oldAttrs: rec { + version = "1.22"; src = oldAttrs.src.override { inherit version; - sha256 = "117bad36c1a787e1a8a659df35de53ba05f9f3398fb9e4ac17e80ad5903eb8c5"; + sha256 = "0kyvc9zdlxr5r96bng5rhm9a6sfqidrbvvkz64s76qs5267dli6c"; + }; + }); + idna = super.idna.overridePythonAttrs (oldAttrs: rec { + version = "2.6"; + src = oldAttrs.src.override { + inherit version; + sha256 = "13qaab6d0s15gknz8v3zbcfmbj6v86hn9pjxgkdf62ch13imssic"; }; }); voluptuous = super.voluptuous.overridePythonAttrs (oldAttrs: rec { @@ -42,13 +49,6 @@ let sha256 = "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d"; }; }); - async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec { - version = "2.0.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "00cff4d2dce744607335cba84e9929c3165632da2d27970dbc55802a0c7873d0"; - }; - }); # used by check_config script # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved colorlog = super.colorlog.overridePythonAttrs (oldAttrs: rec { @@ -74,7 +74,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.69.1"; + hassVersion = "0.72.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -89,7 +89,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1y74zq1nah9k6rif8k384ri11h1f23ggr613f7qnn0107b23asr4"; + sha256 = "1jz16ikxdh8bkscjs5pczvjqbfllz8avs11gkw8a97c2lds8la76"; }; propagatedBuildInputs = [ @@ -109,7 +109,7 @@ in with py.pkgs; buildPythonApplication rec { # Some basic components should be tested however py.test \ tests/components/{group,http} \ - tests/components/test_{api,configurator,demo,discovery,frontend,init,introduction,logger,script,shell_command,system_log,websocket_api}.py + tests/components/test_{api,configurator,demo,discovery,init,introduction,logger,script,shell_command,system_log,websocket_api}.py ''; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 38dc4f73fb8c..665c9e2867d0 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20180607.0"; + version = "20180622.1"; src = fetchPypi { inherit pname version; - sha256 = "22ac0b7615c9c7e6700db250079d8a1041c8d40788375402701adaace8b21889"; + sha256 = "1kzz1cmnpmsnrbc9amjcg8rb4a544xx2mpq4g23si6rk46b7n0x7"; }; propagatedBuildInputs = [ user-agents ]; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 9f9714e6d99a..a7f90b3b3037 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "restic-${version}"; - version = "0.9.0"; + version = "0.9.1"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "09520ggr98w7nn6kl3yx0nrx4f79q4vhg4q1hiv2nlwxd0jz1p6y"; + sha256 = "116dc86fjmflmk0n2nywvv2f6z1jig3czqxz0cx0z77n8rmj9npv"; }; buildPhase = '' diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 21f91691a718..715996e8f61a 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -4,13 +4,13 @@ # There is also cdebootstrap now. Is that easier to maintain? stdenv.mkDerivation rec { name = "debootstrap-${version}"; - version = "1.0.102"; + version = "1.0.103"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz"; - sha256 = "1i8fnxyf073dqywcvj6n32k1crzl7bwlmn373n5342pz71rmqrq9"; + sha256 = "07qqbm50ji1j04hgv1fmy7y1jwl4rjh8q57znh9g3rr4j6fmax7q"; }; buildInputs = [ dpkg gettext gawk perl ]; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index a437eba49574..98154d9d5628 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -1,40 +1,56 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, gobjectIntrospection -, libgsystem, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse -, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42 +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk-doc, gobjectIntrospection, gnome3 +, glib, systemd, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse, utillinuxMinimal, libselinux +, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42, python3 }: let + version = "2018.6"; + libglnx-src = fetchFromGitHub { - owner = "GNOME"; - repo = "libglnx"; - rev = "0c82203cd459a35cc3f471e3205355e9fb79160f"; - sha256 = "0xbrv7q6b2ygrbr0yr7p01zpryw45643qfwnlw0z2yv515qs7isc"; + owner = "GNOME"; + repo = "libglnx"; + rev = "e1a78cf2f5351d5394ccfb79f3f5a7b4917f73f3"; + sha256 = "10kzyjbrmr98i65hlz8jc1v5bijyqwwfp6qqjbd5g3y0n520iaxc"; }; bsdiff-src = fetchFromGitHub { - owner = "mendsley"; - repo = "bsdiff"; - rev = "1edf9f656850c0c64dae260960fabd8249ea9c60"; + owner = "mendsley"; + repo = "bsdiff"; + rev = "1edf9f656850c0c64dae260960fabd8249ea9c60"; sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1"; }; - - version = "2018.4"; in stdenv.mkDerivation { name = "ostree-${version}"; + outputs = [ "out" "dev" "man" "installedTests" ]; + src = fetchFromGitHub { - rev = "v${version}"; - owner = "ostreedev"; - repo = "ostree"; - sha256 = "00jgj6vcjpz1akfbmf82q1bcs3njrmvdgy4c2gnn24vkmh9yr0lr"; + rev = "v${version}"; + owner = "ostreedev"; + repo = "ostree"; + sha256 = "0kk04pznk6m6fqdz609m2zcnkalcw9q8fsx8wm42k6dhf6cw7l3g"; }; + patches = [ + # Tests access the helper using relative path + # https://github.com/ostreedev/ostree/issues/1593 + (fetchpatch { + url = https://github.com/ostreedev/ostree/pull/1633.patch; + sha256 = "07xiw1dr7j4yw3w92qhw37f9crlglibflcqj2kf0v5gfrl9i6g4j"; + }) + ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig gtk-doc gobjectIntrospection which yacc libxslt docbook_xsl docbook_xml_dtd_42 ]; - buildInputs = [ libgsystem xz e2fsprogs libsoup gpgme fuse libarchive libcap bzip2 ]; + buildInputs = [ + glib systemd e2fsprogs libsoup gpgme fuse libselinux libcap + libarchive bzip2 xz + utillinuxMinimal # for libmount + (python3.withPackages (p: with p; [ pyyaml ])) gnome3.gjs # for tests + ]; prePatch = '' rmdir libglnx bsdiff @@ -44,16 +60,24 @@ in stdenv.mkDerivation { preConfigure = '' env NOCONFIGURE=1 ./autogen.sh - - configureFlags+="--with-systemdsystemunitdir=$out/lib/systemd/system" ''; + configureFlags = [ + "--with-systemdsystemunitdir=$(out)/lib/systemd/system" + "--with-systemdsystemgeneratordir=$(out)/lib/systemd/system-generators" + "--enable-installed-tests" + ]; + + makeFlags = [ + "installed_testdir=$(installedTests)/libexec/installed-tests/libostree" + "installed_test_metadir=$(installedTests)/share/installed-tests/libostree" + ]; + meta = with stdenv.lib; { description = "Git for operating system binaries"; - homepage = https://ostree.readthedocs.io/en/latest/; - license = licenses.lgpl2Plus; - platforms = platforms.linux; + homepage = https://ostree.readthedocs.io/en/latest/; + license = licenses.lgpl2Plus; + platforms = platforms.linux; maintainers = with maintainers; [ copumpkin ]; }; } - diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 8c2845dc8ebd..75b9dd15fb7f 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,40 +1,57 @@ -{ stdenv, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, - libcap, glib, libgsystem, json-glib, libarchive, libsolv, librepo, gtk-doc, elfutils, - gperf, cmake, pcre, check, python, libxslt, docbook_xsl, docbook_xml_dtd_42, acl }: +{ stdenv, fetchpatch, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, + gobjectIntrospection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, gperf, cmake, + libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit, + bubblewrap, pcre, check, python }: let libglnx-src = fetchFromGitHub { - owner = "GNOME"; - repo = "libglnx"; - rev = "4ae5e3beaaa674abfabf7404ab6fafcc4ec547db"; - sha256 = "1npb9zbyb4bl0nxqf0pcqankcwzs3k1x8i2wkdwhgak4qcvxvfqn"; + owner = "GNOME"; + repo = "libglnx"; + rev = "97b5c08d2f93dc93ba296a84bbd2a5ab9bd8fc97"; + sha256 = "0cz4x63f6ys7dln54g6mrr7hksvqwz78wdc8qb7zr1h2cp1azcvs"; }; libdnf-src = fetchFromGitHub { - owner = "rpm-software-management"; - repo = "libhif"; - rev = "b69552b3b3a42fd41698a925d5f5f623667bac63"; - sha256 = "0h6k09rb4imzbmsn7mspwl0js2awqdpb4ysdqq550vw2nr0dzszr"; + owner = "rpm-software-management"; + repo = "libdnf"; + rev = "b3fcc53f6f3baf4f51f836f5e1eb54eb82d5df49"; + sha256 = "15nl9x4blyc9922rvz7iq56yy8hxhpsf31cs3ag7aypqpfx3czci"; }; - version = "2016.10"; + version = "2018.5"; in stdenv.mkDerivation { name = "rpm-ostree-${version}"; + outputs = [ "out" "dev" "man" "devdoc" ]; + src = fetchFromGitHub { - rev = "v${version}"; - owner = "projectatomic"; - repo = "rpm-ostree"; - sha256 = "0a0wwklzk1kvk3bbxxfvxgk4ck5dn7a7v32shqidb674fr2d5pvb"; + rev = "v${version}"; + owner = "projectatomic"; + repo = "rpm-ostree"; + sha256 = "0y37hr8mmrsww4ka2hlqmz7wp57ibzhah4j87yg8q8dks5hxcbsx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig which autoconf automake libtool cmake gperf + gobjectIntrospection gtk-doc libxml2 libxslt docbook_xsl docbook_xml_dtd_42 + ]; buildInputs = [ - which autoconf automake libtool libcap ostree rpm glib libgsystem gperf - json-glib libarchive libsolv librepo gtk-doc libxslt docbook_xsl docbook_xml_dtd_42 - cmake pcre check python - # FIXME: get rid of this once libarchive properly propagates this - acl + libcap ostree rpm glib systemd polkit bubblewrap + json-glib libarchive libsolv librepo + pcre check python + ]; + + patches = [ + # Use gdbus-codegen from PATH + (fetchpatch { + url = https://github.com/projectatomic/rpm-ostree/commit/315406d8cd0937e786723986e88d376c88806c60.patch; + sha256 = "073yfa62515kyf58s0sz56w0a40062lh761y2y4assqipybwxbvp"; + }) + ]; + + configureFlags = [ + "--enable-gtk-doc" + "--with-bubblewrap=${bubblewrap}/bin/bwrap" ]; dontUseCmakeConfigure = true; @@ -47,14 +64,11 @@ in stdenv.mkDerivation { # According to #cmake on freenode, libdnf should bundle the FindLibSolv.cmake module cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake libdnf/cmake/modules/ - # See https://github.com/projectatomic/rpm-ostree/issues/480 - substituteInPlace src/libpriv/rpmostree-unpacker.c --replace 'include <selinux/selinux.h>' "" - # libdnf normally wants sphinx to build its hawkey manpages, but we don't care about those manpages since we don't use hawkey substituteInPlace configure.ac --replace 'cmake \' 'cmake -DWITH_MAN=off \' # Let's not hardcode the rpm-gpg path... - substituteInPlace libdnf/libdnf/dnf-keyring.c \ + substituteInPlace libdnf/libdnf/dnf-keyring.cpp \ --replace '"/etc/pki/rpm-gpg"' 'getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") ? getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") : "/etc/pki/rpm-gpg"' ''; @@ -64,10 +78,10 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model"; - homepage = "https://rpm-ostree.readthedocs.io/en/latest/"; - license = licenses.lgpl2Plus; - platforms = platforms.linux; + homepage = https://rpm-ostree.readthedocs.io/en/latest/; + license = licenses.lgpl2Plus; maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix new file mode 100644 index 000000000000..f6c4c25559e2 --- /dev/null +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -0,0 +1,146 @@ +{ stdenv, writeScript, buildFHSUserEnv, coreutils +, extraPkgs ? pkgs: [] }: + +buildFHSUserEnv { + name = "appimage-run"; + + # Most of the packages were taken from the Steam chroot + targetPkgs = pkgs: with pkgs; [ + gtk3 + bashInteractive + gnome3.zenity + python2 + xorg.xrandr + which + perl + xdg_utils + iana-etc + ] ++ extraPkgs pkgs; + + multiPkgs = pkgs: with pkgs; [ + desktop-file-utils + xorg.libXcomposite + xorg.libXtst + xorg.libXrandr + xorg.libXext + xorg.libX11 + xorg.libXfixes + libGL + + gst_all_1.gstreamer + gst_all_1.gst-plugins-ugly + libdrm + xorg.xkeyboardconfig + xorg.libpciaccess + + glib + gtk2 + bzip2 + zlib + gdk_pixbuf + + xorg.libXinerama + xorg.libXdamage + xorg.libXcursor + xorg.libXrender + xorg.libXScrnSaver + xorg.libXxf86vm + xorg.libXi + xorg.libSM + xorg.libICE + gnome2.GConf + freetype + (curl.override { gnutlsSupport = true; sslSupport = false; }) + nspr + nss + fontconfig + cairo + pango + expat + dbus + cups + libcap + SDL2 + libusb1 + dbus-glib + libav + atk + libudev0-shim + networkmanager098 + + xorg.libXt + xorg.libXmu + xorg.libxcb + libGLU + libuuid + libogg + libvorbis + SDL + SDL2_image + glew110 + openssl + libidn + tbb + wayland + mesa_noglu + libxkbcommon + + flac + freeglut + libjpeg + libpng12 + libsamplerate + libmikmod + libtheora + libtiff + pixman + speex + SDL_image + SDL_ttf + SDL_mixer + SDL2_ttf + SDL2_mixer + gstreamer + gst-plugins-base + libappindicator-gtk2 + libcaca + libcanberra + libgcrypt + libvpx + librsvg + xorg.libXft + libvdpau + alsaLib + strace + ]; + + runScript = writeScript "appimage-exec" '' + #!${stdenv.shell} + APPIMAGE="$(realpath "$1")" + + if [ ! -x "$APPIMAGE" ]; then + echo "fatal: $APPIMAGE is not executable" + exit 1 + fi + + SHA256="$(${coreutils}/bin/sha256sum "$APPIMAGE" | cut -d ' ' -f 1)" + SQUASHFS_ROOT="''${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256/" + mkdir -p "$SQUASHFS_ROOT" + + export APPDIR="$SQUASHFS_ROOT/squashfs-root" + if [ ! -x "$APPDIR" ]; then + cd "$SQUASHFS_ROOT" + "$APPIMAGE" --appimage-extract 2>/dev/null + fi + + cd "$APPDIR" + export PATH="$PATH:$PWD/usr/bin" + export APPIMAGE_SILENT_INSTALL=1 + + if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then + exec "$APPIMAGE_DEBUG_EXEC" + fi + + exec ./AppRun + ''; +} diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 8eb266a9e654..44b67ae4dccd 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "home-manager-${version}"; - version = "2017-12-7"; + version = "2018-06-14"; src = fetchFromGitHub{ owner = "rycee"; repo = "home-manager"; - rev = "0be32c9d42e3a8739263ae7886dc2448c833c19c"; - sha256 = "06lmnzlf5fmiicbgai27ad9m3bj980xf8ifdpc5lzbsy77pfcfap"; + rev = "5641ee3f942e700de35b28fc879b0d8a10a7a1fe"; + sha256 = "0bqzwczbr5c2y3ms7m7ly0as9zsnqwljq61ci2y2gbqzw3md1x2j"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 6c0bcb406218..8f1367d3fdce 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "efivar-${version}"; - version = "35"; + version = "36"; outputs = [ "bin" "out" "dev" "man" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "rhinstaller"; repo = "efivar"; rev = version; - sha256 = "0hc7l5z0hw5472bm6p4d9n24bbggv9lgw7px1hqrdkfjghqfnlxh"; + sha256 = "0r39kx6sqgpk8rz19g1sil4dp7r82d5g1wlkbw1czwas95s50y7n"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 47e6766d21fa..4ebe62ef9a5f 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "mpage-2.5.6"; src = fetchurl { - url = "http://www.libGLU_combined.nl/pub/mpage/${name}.tgz"; + url = "http://www.mesa.nl/pub/mpage/${name}.tgz"; sha256 = "016w9sm06sn1d2lim4p8fzl6wbmad3wigxhflsybzi7p4zy6vrjg"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; license = "liberal"; # a non-copyleft license, see `Copyright' file - homepage = http://www.libGLU_combined.nl/pub/mpage/; + homepage = http://www.mesa.nl/pub/mpage/; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5dafcfe22575..b653dfc7db69 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -219,7 +219,6 @@ mapAliases ({ pltScheme = racket; # just to be sure polarssl = mbedtls; # added 2018-04-25 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 - postage = pgmanage; # added 2017-11-03 procps = procps-ng; # added 2018-04-25 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 pulseaudioLight = pulseaudio; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6a715a6ecd8..7c5ecb49bc3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -502,6 +502,8 @@ with pkgs; buildTools = androidenv.buildTools; }; + appimage-run = callPackage ../tools/package-management/appimage-run {}; + apt-cacher-ng = callPackage ../servers/http/apt-cacher-ng { }; apt-offline = callPackage ../tools/misc/apt-offline { }; @@ -5054,6 +5056,8 @@ with pkgs; snabb = callPackage ../tools/networking/snabb { } ; + snapcast = callPackage ../applications/audio/snapcast { }; + sng = callPackage ../tools/graphics/sng { libpng = libpng12; }; @@ -10139,8 +10143,6 @@ with pkgs; libgssglue = callPackage ../development/libraries/libgssglue { }; - libgsystem = callPackage ../development/libraries/libgsystem { }; - libgudev = callPackage ../development/libraries/libgudev { }; libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix {}; @@ -16793,7 +16795,7 @@ with pkgs; libreoffice = hiPrio libreoffice-still; - libreoffice-unwrapped =callPackage ../applications/office/libreoffice { + libreoffice-args = { inherit (perlPackages) ArchiveZip CompressZlib; inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) defaultIconTheme; @@ -16816,12 +16818,20 @@ with pkgs; stdenv = overrideCC stdenv gcc5; }; - libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = libreoffice-unwrapped; }); + libreoffice-unwrapped =callPackage ../applications/office/libreoffice + (libreoffice-args // { + }); + libreoffice-still-unwrapped =callPackage ../applications/office/libreoffice/still.nix + (libreoffice-args // { + poppler = poppler_0_61; + }); + + libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { + libreoffice = libreoffice-unwrapped; + }); libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = libreoffice-unwrapped.override { - poppler = poppler_0_61; - }; + libreoffice = libreoffice-still-unwrapped; }); liferea = callPackage ../applications/networking/newsreaders/liferea { @@ -19747,8 +19757,6 @@ with pkgs; unnethack = callPackage ../games/unnethack { }; - unvanquished = callPackage ../games/unvanquished { }; - uqm = callPackage ../games/uqm { }; urbanterror = callPackage ../games/urbanterror { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a6e4100ea499..a47c17a5a87a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -233,6 +233,8 @@ in { cdecimal = callPackage ../development/python-modules/cdecimal { }; + clustershell = callPackage ../development/python-modules/clustershell { }; + dendropy = callPackage ../development/python-modules/dendropy { }; dbf = callPackage ../development/python-modules/dbf { }; @@ -291,7 +293,9 @@ in { logster = callPackage ../development/python-modules/logster { }; - mail-parser = callPackage ../development/python-modules/mail-parser { }; + mail-parser = callPackage ../development/python-modules/mail-parser { }; + + monty = callPackage ../development/python-modules/monty { }; mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; @@ -434,6 +438,8 @@ in { then ../development/python-modules/python3-openid else ../development/python-modules/python-openid) { }; + python-periphery = callPackage ../development/python-modules/python-periphery { }; + python-sql = callPackage ../development/python-modules/python-sql { }; python-stdnum = callPackage ../development/python-modules/python-stdnum { }; @@ -458,6 +464,8 @@ in { salmon-mail = callPackage ../development/python-modules/salmon-mail { }; + seekpath = callPackage ../development/python-modules/seekpath { }; + serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; simpleeval = callPackage ../development/python-modules/simpleeval { }; |