From e5b1a5724e22bbe09966c62c33ed5822268b911d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 1 Jan 2018 21:50:26 +0100 Subject: [PATCH 01/95] Qt5: 5.9.3 -> 5.10.0 --- maintainers/scripts/fetch-kde-qt.sh | 2 +- .../libraries/qt-5/5.10/default.nix | 124 ++ pkgs/development/libraries/qt-5/5.10/fetch.sh | 2 + .../libraries/qt-5/5.10/qtbase.patch | 1133 +++++++++++++++++ .../libraries/qt-5/5.10/qtdeclarative.patch | 33 + .../libraries/qt-5/5.10/qtscript.patch | 13 + .../libraries/qt-5/5.10/qtserialport.patch | 22 + .../libraries/qt-5/5.10/qttools.patch | 71 ++ .../5.10/qtwebengine-paxmark-mksnapshot.patch | 48 + .../libraries/qt-5/5.10/qtwebkit.patch | 77 ++ pkgs/development/libraries/qt-5/5.10/srcs.nix | 341 +++++ pkgs/top-level/all-packages.nix | 19 +- 12 files changed, 1882 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.10/default.nix create mode 100644 pkgs/development/libraries/qt-5/5.10/fetch.sh create mode 100644 pkgs/development/libraries/qt-5/5.10/qtbase.patch create mode 100644 pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch create mode 100644 pkgs/development/libraries/qt-5/5.10/qtscript.patch create mode 100644 pkgs/development/libraries/qt-5/5.10/qtserialport.patch create mode 100644 pkgs/development/libraries/qt-5/5.10/qttools.patch create mode 100644 pkgs/development/libraries/qt-5/5.10/qtwebengine-paxmark-mksnapshot.patch create mode 100644 pkgs/development/libraries/qt-5/5.10/qtwebkit.patch create mode 100644 pkgs/development/libraries/qt-5/5.10/srcs.nix diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh index a2b8080e2a43..1357f87aaa5d 100755 --- a/maintainers/scripts/fetch-kde-qt.sh +++ b/maintainers/scripts/fetch-kde-qt.sh @@ -21,7 +21,7 @@ find . -type f | while read src; do # Sanitize file name filename=$(basename "$src" | tr '@' '_') nameVersion="${filename%.tar.*}" - name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,') + name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,' | sed -e 's,-everywhere-src$,,') version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') echo "$name,$version,$src,$filename" >>$csv done diff --git a/pkgs/development/libraries/qt-5/5.10/default.nix b/pkgs/development/libraries/qt-5/5.10/default.nix new file mode 100644 index 000000000000..34ab82d42abe --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/default.nix @@ -0,0 +1,124 @@ +/* + +# Updates + +Before a major version update, make a copy of this directory. (We like to +keep the old version around for a short time after major updates.) Add a +top-level attribute to `top-level/all-packages.nix`. + +1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. +2. From the top of the Nixpkgs tree, run + `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. +3. Update `qtCompatVersion` below if the minor version number changes. +4. Check that the new packages build correctly. +5. Commit the changes and open a pull request. + +*/ + +{ + newScope, + stdenv, fetchurl, makeSetupHook, makeWrapper, + bison, cups ? null, harfbuzz, mesa, perl, + gstreamer, gst-plugins-base, gtk3, dconf, + + # options + developerBuild ? false, + decryptSslTraffic ? false, + debug ? null, +}: + +with stdenv.lib; + +let + + qtCompatVersion = "5.10"; + + mirror = "http://download.qt.io"; + srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; + + patches = { + qtbase = [ ./qtbase.patch ]; + qtdeclarative = [ ./qtdeclarative.patch ]; + qtscript = [ ./qtscript.patch ]; + qtserialport = [ ./qtserialport.patch ]; + qttools = [ ./qttools.patch ]; + qtwebengine = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + qtwebkit = [ ./qtwebkit.patch ]; + }; + + mkDerivation = + import ../mkDerivation.nix + { inherit stdenv; inherit (stdenv) lib; } + { inherit debug; }; + + qtModule = + import ../qtModule.nix + { inherit mkDerivation perl; inherit (stdenv) lib; } + { inherit self srcs patches; }; + + addPackages = self: with self; + let + callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; }; + in { + + inherit mkDerivation; + + qtbase = callPackage ../modules/qtbase.nix { + inherit (srcs.qtbase) src version; + patches = patches.qtbase; + inherit bison cups harfbuzz mesa; + withGtk3 = true; inherit dconf gtk3; + inherit developerBuild decryptSslTraffic; + }; + + qtcharts = callPackage ../modules/qtcharts.nix {}; + qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; + qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; + qtdoc = callPackage ../modules/qtdoc.nix {}; + qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; + qtimageformats = callPackage ../modules/qtimageformats.nix {}; + qtlocation = callPackage ../modules/qtlocation.nix {}; + qtmacextras = callPackage ../modules/qtmacextras.nix {}; + qtmultimedia = callPackage ../modules/qtmultimedia.nix { + inherit gstreamer gst-plugins-base; + }; + qtquick1 = null; + qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {}; + qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {}; + qtscript = callPackage ../modules/qtscript.nix {}; + qtsensors = callPackage ../modules/qtsensors.nix {}; + qtserialport = callPackage ../modules/qtserialport.nix {}; + qtsvg = callPackage ../modules/qtsvg.nix {}; + qttools = callPackage ../modules/qttools.nix {}; + qttranslations = callPackage ../modules/qttranslations.nix {}; + qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; + qtwayland = callPackage ../modules/qtwayland.nix {}; + qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; + qtwebengine = callPackage ../modules/qtwebengine.nix {}; + qtwebkit = callPackage ../modules/qtwebkit.nix {}; + qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; + qtx11extras = callPackage ../modules/qtx11extras.nix {}; + qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; + + env = callPackage ../qt-env.nix {}; + full = env "qt-${qtbase.version}" ([ + qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript + qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets + qtx11extras qtxmlpatterns + ] ++ optional (!stdenv.isDarwin) qtwayland + ++ optional (stdenv.isDarwin) qtmacextras); + + qmake = makeSetupHook { + deps = [ self.qtbase.dev ]; + substitutions = { + inherit (stdenv) isDarwin; + qtbase_dev = self.qtbase.dev; + fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; + }; + } ../hooks/qmake-hook.sh; + }; + + self = makeScope newScope addPackages; + +in self diff --git a/pkgs/development/libraries/qt-5/5.10/fetch.sh b/pkgs/development/libraries/qt-5/5.10/fetch.sh new file mode 100644 index 000000000000..849e76d616df --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/fetch.sh @@ -0,0 +1,2 @@ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.10/5.10.0/submodules/ \ + -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.10/qtbase.patch b/pkgs/development/libraries/qt-5/5.10/qtbase.patch new file mode 100644 index 000000000000..b8c7f363de8e --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtbase.patch @@ -0,0 +1,1133 @@ +diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf +index 5208379f9a..92fe29a0ac 100644 +--- a/mkspecs/common/mac.conf ++++ b/mkspecs/common/mac.conf +@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ + + QMAKE_FIX_RPATH = install_name_tool -id + +-QMAKE_LFLAGS_RPATH = -Wl,-rpath, ++QMAKE_LFLAGS_RPATH = + QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip + + QMAKE_LFLAGS_REL_RPATH = +diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf +index bb5083c925..da8e2cb386 100644 +--- a/mkspecs/features/create_cmake.prf ++++ b/mkspecs/features/create_cmake.prf +@@ -21,7 +21,7 @@ load(cmake_functions) + # at cmake time whether package has been found via a symlink, and correct + # that to an absolute path. This is only done for installations to + # the /usr or / prefix. +-CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS]) ++CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/) + contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR + + CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake +@@ -47,47 +47,22 @@ split_incpath { + $$cmake_extra_source_includes.output + } + +-CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { +- CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ +- CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True +-} ++CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ ++CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True + + !exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = true + +-CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_LIB_DIR,"^\\.\\./.*") { +- CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ +- CMAKE_LIB_DIR_IS_ABSOLUTE = True +-} else { +- CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) +- # We need to go up another two levels because the CMake files are +- # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} +- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" +-} ++CMAKE_LIB_DIR = $$NIX_OUTPUT_DEV/lib/ ++CMAKE_LIB_DIR_IS_ABSOLUTE = True + +-CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_BIN_DIR, "^\\.\\./.*") { +- CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ +- CMAKE_BIN_DIR_IS_ABSOLUTE = True +-} ++CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/ ++CMAKE_BIN_DIR_IS_ABSOLUTE = True + +-CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { +- CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ +- CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True +-} ++CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/ ++CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True + +-win32:!static:!staticlib { +- CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) +- contains(CMAKE_DLL_DIR, "^\\.\\./.*") { +- CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ +- CMAKE_DLL_DIR_IS_ABSOLUTE = True +- } +-} else { +- CMAKE_DLL_DIR = $$CMAKE_LIB_DIR +- CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE +-} ++CMAKE_DLL_DIR = $$NIX_OUTPUT_DEV/lib/ ++CMAKE_DLL_DIR_IS_ABSOLUTE = True + + static|staticlib:CMAKE_STATIC_TYPE = true + +@@ -167,7 +142,7 @@ contains(CONFIG, plugin) { + cmake_target_file + + cmake_qt5_plugin_file.files = $$cmake_target_file.output +- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++ cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + INSTALLS += cmake_qt5_plugin_file + + return() +@@ -314,7 +289,7 @@ exists($$cmake_macros_file.input) { + cmake_qt5_module_files.files += $$cmake_macros_file.output + } + +-cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + + # We are generating cmake files. Most developers of Qt are not aware of cmake, + # so we require automatic tests to be available. The only module which should +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index 55c74aad66..0bbc8718eb 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) + endif() + !!ENDIF + +-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ELSE +-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) +-# Use original install prefix when loaded through a +-# cross-prefix symbolic link such as /lib -> /usr/lib. +-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) +-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) +-if(_realCurr STREQUAL _realOrig) +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) +-else() +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-endif() +-unset(_realOrig) +-unset(_realCurr) +-unset(_IMPORT_PREFIX) +-!!ENDIF +-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-!!ELSE +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ENDIF +- + !!IF !equals(TEMPLATE, aux) + # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. + set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") +@@ -58,11 +34,7 @@ endmacro() + macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + +-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") +-!!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") +-!!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" +@@ -75,11 +47,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + ) + + !!IF !isEmpty(CMAKE_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ELSE + set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) + if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES +@@ -95,24 +63,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!IF !no_module_headers + !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) + set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" ++ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" ++ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" + ) + !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" +- ) +-!!ELSE +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +-!!ENDIF +-!!ELSE +-!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") +-!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" ++ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" ++ \"$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" + ) + !!ELSE + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +@@ -128,7 +85,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") + !!ENDIF + !!ENDIF +-!!ENDIF + !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) + include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) + !!ENDIF +@@ -280,25 +236,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_DEBUG_TYPE) + !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) + !!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS +-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" +-!!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" +-!!ENDIF + AND EXISTS +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() +@@ -317,25 +261,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_RELEASE_TYPE) + !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) + !!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS +-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" +-!!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" +-!!ENDIF + AND EXISTS +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() +@@ -354,11 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + +-!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ELSE + set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set_target_properties(Qt5::${Plugin} PROPERTIES + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} +diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf +index e645ba5803..a0e5c68b7e 100644 +--- a/mkspecs/features/mac/default_post.prf ++++ b/mkspecs/features/mac/default_post.prf +@@ -24,166 +24,3 @@ qt { + } + } + } +- +-# Add the same default rpaths as Xcode does for new projects. +-# This is especially important for iOS/tvOS/watchOS where no other option is possible. +-!no_default_rpath { +- QMAKE_RPATHDIR += @executable_path/Frameworks +- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks +-} +- +-# Don't pass -headerpad_max_install_names when using Bitcode. +-# In that case the linker emits a warning stating that the flag is ignored when +-# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). +-# Using this flag is also unnecessary in practice on UIKit platforms since they +-# are sandboxed, and only UIKit platforms support bitcode to begin with. +-!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD +- +-app_extension_api_only { +- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +-} +- +-macx-xcode { +- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { +- debug_information_format.name = DEBUG_INFORMATION_FORMAT +- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT +- debug_information_format.build = debug +- QMAKE_MAC_XCODE_SETTINGS += debug_information_format +- } +- +- QMAKE_XCODE_ARCHS = +- +- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" +- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_device +- +- simulator { +- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" +- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_simulator +- } +- +- only_active_arch.name = ONLY_ACTIVE_ARCH +- only_active_arch.value = YES +- only_active_arch.build = debug +- QMAKE_MAC_XCODE_SETTINGS += only_active_arch +-} else { +- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS +- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS +- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS +- +- isEmpty(VALID_ARCHS): \ +- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") +- +- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) +- +- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) +- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) +- +- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS +- +- arch_flags = $(EXPORT_ARCH_ARGS) +- +- QMAKE_CFLAGS += $$arch_flags +- QMAKE_CXXFLAGS += $$arch_flags +- QMAKE_LFLAGS += $$arch_flags +- +- QMAKE_PCH_ARCHS = $$VALID_ARCHS +- +- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET +- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET +- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET +- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET +- +- # If we're doing a simulator and device build, device and simulator +- # architectures use different paths and flags for the sysroot and +- # deployment target switch, so we must multiplex them across multiple +- # architectures using -Xarch. Otherwise we fall back to the simple path. +- # This is not strictly necessary, but results in cleaner command lines +- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit +- # individual rules to a different set of architecture(s) from the overall +- # build (such as machtest in QtCore). +- simulator:device { +- QMAKE_XARCH_CFLAGS = +- QMAKE_XARCH_LFLAGS = +- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS +- +- for (arch, VALID_ARCHS) { +- contains(VALID_SIMULATOR_ARCHS, $$arch) { +- sdk = $$simulator.sdk +- version_identifier = $$simulator.deployment_identifier +- } else { +- sdk = $$device.sdk +- version_identifier = $$device.deployment_identifier +- } +- +- version_min_flags = \ +- -Xarch_$${arch} \ +- -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -isysroot$$xcodeSDKInfo(Path, $$sdk) +- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk) +- +- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) +- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) +- +- QMAKE_EXTRA_VARIABLES += \ +- QMAKE_XARCH_CFLAGS_$${arch} \ +- QMAKE_XARCH_LFLAGS_$${arch} +- } +- +- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) +- } else { +- simulator: \ +- version_identifier = $$simulator.deployment_identifier +- else: \ +- version_identifier = $$device.deployment_identifier +- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag +- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag +- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag +- } +- +- # Enable precompiled headers for multiple architectures +- QMAKE_CFLAGS_USE_PRECOMPILE = +- for (arch, VALID_ARCHS) { +- icc_pch_style: \ +- use_flag = "-pch-use " +- else: \ +- use_flag = -include +- +- # Only use Xarch with multi-arch, as the option confuses ccache +- count(VALID_ARCHS, 1, greaterThan): \ +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- -Xarch_$${arch} +- +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} +- } +- icc_pch_style { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} +- QMAKE_CFLAGS_USE_PRECOMPILE = +- } else { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- } +- +- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} +-} +- +-cache(QMAKE_XCODE_DEVELOPER_PATH, stash) +-!isEmpty(QMAKE_XCODE_VERSION): \ +- cache(QMAKE_XCODE_VERSION, stash) +- +-QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() +diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf +index 44636f2288..61ed486a76 100644 +--- a/mkspecs/features/mac/default_pre.prf ++++ b/mkspecs/features/mac/default_pre.prf +@@ -1,56 +1,3 @@ + CONFIG = asset_catalogs rez $$CONFIG + load(default_pre) + +-isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { +- # Get path of Xcode's Developer directory +- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") +- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") +- +- # Make sure Xcode path is valid +- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") +-} +- +-isEmpty(QMAKE_XCODEBUILD_PATH): \ +- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") +- +-!isEmpty(QMAKE_XCODEBUILD_PATH) { +- # Make sure Xcode is set up properly +- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ +- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") +- +- isEmpty(QMAKE_XCODE_VERSION) { +- # Extract Xcode version using xcodebuild +- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") +- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) +- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") +- unset(xcode_version) +- } +-} +- +-isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { +- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist +- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ +- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") +- +- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ +- cache(QMAKE_TARGET_BUNDLE_PREFIX) +-} +- +-QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon +- +-# Make the default debug info format for static debug builds +-# DWARF instead of DWARF with dSYM. This cuts down build times +-# for application debug builds significantly, as Xcode doesn't +-# have to pull out all the DWARF info from the Qt static libs +-# and put it into a dSYM file. We don't need that dSYM file in +-# the first place, since the information is available in the +-# object files inside the archives (static libraries). +-macx-xcode:qtConfig(static): \ +- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf +- +-# This variable is used by the xcode_dynamic_library_suffix +-# feature, which allows Xcode to choose the Qt libraries to link to +-# at build time, depending on the current Xcode SDK and configuration. +-QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX +diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf +index 3f6dc076ca..8b13789179 100644 +--- a/mkspecs/features/mac/sdk.prf ++++ b/mkspecs/features/mac/sdk.prf +@@ -1,58 +1 @@ + +-isEmpty(QMAKE_MAC_SDK): \ +- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") +- +-contains(QMAKE_MAC_SDK, .*/.*): \ +- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") +- +-defineReplace(xcodeSDKInfo) { +- info = $$1 +- equals(info, "Path"): \ +- info = --show-sdk-path +- equals(info, "PlatformPath"): \ +- info = --show-sdk-platform-path +- equals(info, "SDKVersion"): \ +- info = --show-sdk-version +- sdk = $$2 +- isEmpty(sdk): \ +- sdk = $$QMAKE_MAC_SDK +- +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { +- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null") +- # --show-sdk-platform-path won't work for Command Line Tools; this is fine +- # only used by the XCTest backend to testlib +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \ +- error("Could not resolve SDK $$info for \'$$sdk\'") +- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) +- } +- +- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) +-} +- +-QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) +-QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) +-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) +- +-sysrootified = +-for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val +-QMAKE_INCDIR_OPENGL = $$sysrootified +- +-QMAKESPEC_NAME = $$basename(QMAKESPEC) +- +-# Resolve SDK version of various tools +-for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL)) { +- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} +- !isEmpty($$tool_variable) { +- $$tool = $$eval($$tool_variable) +- next() +- } +- +- value = $$eval($$tool) +- isEmpty(value): next() +- +- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") +- isEmpty(sysrooted): next() +- +- $$tool = $$sysrooted $$member(value, 1, -1) +- cache($$tool_variable, set stash, $$tool) +-} +diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf +index 4db0040dc5..65d6da1f4d 100644 +--- a/mkspecs/features/qml_module.prf ++++ b/mkspecs/features/qml_module.prf +@@ -23,13 +23,8 @@ for(qmlf, AUX_QML_FILES): fq_aux_qml_files += $$absolute_path($$qmlf, $$_PRO_FIL + + load(qt_build_paths) + +-qml1_target { +- DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH +- instbase = $$[QT_INSTALL_IMPORTS] +-} else { +- DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH +- instbase = $$[QT_INSTALL_QML] +-} ++DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH ++instbase = $$NIX_OUTPUT_QML + + !qml1_target:static: CONFIG += builtin_resources + +diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf +index d49f4c49c1..097dcd7d39 100644 +--- a/mkspecs/features/qml_plugin.prf ++++ b/mkspecs/features/qml_plugin.prf +@@ -48,13 +48,8 @@ exists($$QMLTYPEFILE): AUX_QML_FILES += $$QMLTYPEFILE + + load(qt_build_paths) + +-qml1_target { +- DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH +- instbase = $$[QT_INSTALL_IMPORTS] +-} else { +- DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH +- instbase = $$[QT_INSTALL_QML] +-} ++DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH ++instbase = $$NIX_OUTPUT_QML + + target.path = $$instbase/$$TARGETPATH + INSTALLS += target +diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf +index 883f8ca215..81db8eb2d4 100644 +--- a/mkspecs/features/qt_app.prf ++++ b/mkspecs/features/qt_app.prf +@@ -33,7 +33,7 @@ host_build:force_bootstrap { + target.path = $$[QT_HOST_BINS] + } else { + !build_pass:qtConfig(debug_and_release): CONFIG += release +- target.path = $$[QT_INSTALL_BINS] ++ target.path = $$NIX_OUTPUT_BIN/bin + CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable + } + INSTALLS += target +diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf +index 1848f00e90..2af93675c5 100644 +--- a/mkspecs/features/qt_build_paths.prf ++++ b/mkspecs/features/qt_build_paths.prf +@@ -23,6 +23,6 @@ exists($$MODULE_BASE_INDIR/.git): \ + !force_independent { + # If the module is not built independently, everything ends up in qtbase. + # This is the case in non-prefix builds, except for selected modules. +- MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX] +- MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX] ++ MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT ++ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT + } +diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf +index f4ae5bde80..6d4c6d223f 100644 +--- a/mkspecs/features/qt_common.prf ++++ b/mkspecs/features/qt_common.prf +@@ -32,8 +32,8 @@ contains(TEMPLATE, .*lib) { + qqt_libdir = \$\$\$\$[QT_HOST_LIBS] + qt_libdir = $$[QT_HOST_LIBS] + } else { +- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] +- qt_libdir = $$[QT_INSTALL_LIBS] ++ qqt_libdir = \$\$\$\$NIX_OUTPUT_OUT/lib ++ qt_libdir = $$NIX_OUTPUT_OUT/lib + } + contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { + lib_replace.match = "[^ ']*$$rplbase/lib" +diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf +index 72dde61a40..f891a2baed 100644 +--- a/mkspecs/features/qt_docs.prf ++++ b/mkspecs/features/qt_docs.prf +@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR + + QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) + !build_online_docs: \ +- QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) ++ QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC) + PREP_DOC_INDEXES = + DOC_INDEXES = + !isEmpty(QTREPOS) { +@@ -64,8 +64,8 @@ DOC_INDEXES = + DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) + } else { + prepare_docs: \ +- PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) +- DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) ++ PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) ++ DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) + } + + qtattributionsscanner.target = qtattributionsscanner +@@ -88,12 +88,12 @@ prepare_docs { + qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) + + inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR +- inst_html_docs.path = $$[QT_INSTALL_DOCS] ++ inst_html_docs.path = $$NIX_OUTPUT_DOC + inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build + INSTALLS += inst_html_docs + + inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch +- inst_qch_docs.path = $$[QT_INSTALL_DOCS] ++ inst_qch_docs.path = $$NIX_OUTPUT_DOC + inst_qch_docs.CONFIG += no_check_exist no_default_install no_build + INSTALLS += inst_qch_docs + +diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf +index 668669e4cd..30f7fbac41 100644 +--- a/mkspecs/features/qt_example_installs.prf ++++ b/mkspecs/features/qt_example_installs.prf +@@ -77,13 +77,13 @@ for(extra, extras): \ + # Just for Qt Creator + OTHER_FILES += $$sourcefiles + +-sourcefiles += \ +- $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \ +- $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ +- $$DBUS_ADAPTORS $$DBUS_INTERFACES +-addInstallFiles(sources.files, $$sourcefiles) +-sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase +-INSTALLS += sources ++ sourcefiles += \ ++ $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \ ++ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ ++ $$DBUS_ADAPTORS $$DBUS_INTERFACES ++ addInstallFiles(sources.files, $$sourcefiles) ++ sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase ++ INSTALLS += sources + + check_examples { + srcfiles = $$sources.files +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 1903e509c8..ae7b585989 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { + defineTest(qtPrepareTool) { + cmd = $$eval(QT_TOOL.$${2}.binary) + isEmpty(cmd) { +- cmd = $$[QT_HOST_BINS]/$$2 ++ cmd = $$system("command -v $$2") + exists($${cmd}.pl) { + $${1}_EXE = $${cmd}.pl + cmd = perl -w $$system_path($${cmd}.pl) +diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf +index 90d84cc535..387481bfc6 100644 +--- a/mkspecs/features/qt_installs.prf ++++ b/mkspecs/features/qt_installs.prf +@@ -12,16 +12,10 @@ + #library + !qt_no_install_library { + win32 { +- host_build: \ +- dlltarget.path = $$[QT_HOST_BINS] +- else: \ +- dlltarget.path = $$[QT_INSTALL_BINS] ++ dlltarget.path = $$NIX_OUTPUT_BIN/bin + INSTALLS += dlltarget + } +- host_build: \ +- target.path = $$[QT_HOST_LIBS] +- else: \ +- target.path = $$[QT_INSTALL_LIBS] ++ target.path = $$NIX_OUTPUT_OUT/lib + !static: target.CONFIG = no_dll + INSTALLS += target + } +@@ -29,33 +23,33 @@ + #headers + qt_install_headers { + class_headers.files = $$SYNCQT.HEADER_CLASSES +- class_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME ++ class_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME + INSTALLS += class_headers + + targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES +- targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME ++ targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME + INSTALLS += targ_headers + + private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES +- private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private ++ private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private + INSTALLS += private_headers + + qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES +- qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa ++ qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa + INSTALLS += qpa_headers + } + + #module + qt_install_module { + !isEmpty(MODULE_PRI) { +- pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules ++ pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules + pritarget.files = $$MODULE_PRI + INSTALLS += pritarget + } else: isEmpty(MODULE_PRIVATE_PRI) { + warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") + } + !isEmpty(MODULE_PRIVATE_PRI) { +- privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules ++ privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules + privpritarget.files = $$MODULE_PRIVATE_PRI + INSTALLS += privpritarget + } +diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf +index 62e1b69fde..abd63123f9 100644 +--- a/mkspecs/features/qt_plugin.prf ++++ b/mkspecs/features/qt_plugin.prf +@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { + } + } + +-target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE ++target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE + INSTALLS += target + + TARGET = $$qt5LibraryTarget($$TARGET) +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index 545b9a3d1e..6ac0cdefe4 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) + add_executable(Qt5::qmake IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) + add_executable(Qt5::moc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) + add_executable(Qt5::rcc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -133,7 +133,7 @@ if (NOT TARGET Qt5::WinMain) + !!IF !isEmpty(CMAKE_RELEASE_TYPE) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ENDIF +@@ -147,7 +147,7 @@ if (NOT TARGET Qt5::WinMain) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ENDIF +diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +index c357237d0e..6f0c75de3c 100644 +--- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +index 706304cf34..546420f6ad 100644 +--- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp +index 609e52d9d2..f0f29ce61f 100644 +--- a/src/corelib/kernel/qcoreapplication.cpp ++++ b/src/corelib/kernel/qcoreapplication.cpp +@@ -2580,6 +2580,15 @@ QStringList QCoreApplication::libraryPaths() + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); ++ } ++ } ++ + const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); + if (!libPathEnv.isEmpty()) { + QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); +diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp +index bcc1285472..a77eb472a3 100644 +--- a/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ b/src/corelib/tools/qtimezoneprivate_tz.cpp +@@ -70,7 +70,11 @@ typedef QHash QTzTimeZoneHash; + // Parse zone.tab table, assume lists all installed zones, if not will need to read directories + static QTzTimeZoneHash loadTzTimeZones() + { +- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); ++ // Try TZDIR first, in case we're running on NixOS. ++ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); ++ // Fallback to traditional paths in case we are not on NixOS. ++ if (!QFile::exists(path)) ++ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); + if (!QFile::exists(path)) + path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); + +@@ -644,12 +648,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) + if (!tzif.open(QIODevice::ReadOnly)) + return; + } else { +- // Open named tz, try modern path first, if fails try legacy path +- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ // Try TZDIR first, in case we're running on NixOS ++ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); + if (!tzif.open(QIODevice::ReadOnly)) { +- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); +- if (!tzif.open(QIODevice::ReadOnly)) +- return; ++ // Open named tz, try modern path first, if fails try legacy path ++ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) { ++ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) ++ return; ++ } + } + } + +diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in +index 1d947159e2..b36865fc48 100644 +--- a/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +@@ -2,11 +2,7 @@ + if (NOT TARGET Qt5::qdbuscpp2xml) + add_executable(Qt5::qdbuscpp2xml IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + _qt5_DBus_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qdbuscpp2xml PROPERTIES +@@ -17,11 +13,7 @@ endif() + if (NOT TARGET Qt5::qdbusxml2cpp) + add_executable(Qt5::qdbusxml2cpp IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + _qt5_DBus_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qdbusxml2cpp PROPERTIES +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 07869efd7d..37b95d1b6b 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -2,7 +2,7 @@ + !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) + + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") ++set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ELSE + set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ENDIF +@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO + set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ELSE + set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ENDIF +diff --git a/src/network/kernel/qdnslookup_unix.cpp b/src/network/kernel/qdnslookup_unix.cpp +index 1da00813ce..0bf877afcb 100644 +--- a/src/network/kernel/qdnslookup_unix.cpp ++++ b/src/network/kernel/qdnslookup_unix.cpp +@@ -92,7 +92,7 @@ static bool resolveLibraryInternal() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV)); + if (!lib.load()) + return false; + } +diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp +index 8d2cffc304..9730fb33f2 100644 +--- a/src/network/kernel/qhostinfo_unix.cpp ++++ b/src/network/kernel/qhostinfo_unix.cpp +@@ -98,7 +98,7 @@ static bool resolveLibraryInternal() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String(NIXPKGS_LIBRESOLV)); + if (!lib.load()) + return false; + } +diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm +index 341d3bccf2..3368234c26 100644 +--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm ++++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm +@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations() + QMacAutoReleasePool pool; + userProfiles.clear(); + +- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + + CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName]; +@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate() + + QMacAutoReleasePool pool; + +- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; ++ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; + for (NSString *ifName in wifiInterfaces) { + scanThread->interfaceName = QString::fromNSString(ifName); + scanThread->start(); +diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +index b5a0a5bbeb..6c20305f4d 100644 +--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp ++++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() + m_possibleLocations.reserve(7); + if (qEnvironmentVariableIsSet("QTCOMPOSE")) + m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); +- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); +- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale")); +- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); +- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale")); + m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); + m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); ++ m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE)); + } + + QString TableGenerator::findComposeFile() +diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +index 3bc8590d36..2a78fde518 100644 +--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp ++++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +@@ -580,7 +580,14 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) + #if QT_CONFIG(library) + extern const QString qt_gl_library_name(); + // QLibrary lib(qt_gl_library_name()); ++ // Check system library paths first + QLibrary lib(QLatin1String("GL")); ++#ifdef NIXPKGS_MESA_GL ++ if (!lib.load()) { ++ // Fallback to Mesa driver ++ lib.setFileName(QLatin1String(NIXPKGS_MESA_GL)); ++ } ++#endif // NIXPKGS_MESA_GL + glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); + #endif + } +diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp +index da63360333..95e34e2e50 100644 +--- a/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ b/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -311,10 +311,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) + #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) + static bool function_ptrs_not_initialized = true; + if (function_ptrs_not_initialized) { +- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); ++ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); + bool xcursorFound = xcursorLib.load(); + if (!xcursorFound) { // try without the version number +- xcursorLib.setFileName(QLatin1String("Xcursor")); ++ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); + xcursorFound = xcursorLib.load(); + } + if (xcursorFound) { +diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp +index c4cd66c33b..b6f2691587 100644 +--- a/src/plugins/platformthemes/gtk3/main.cpp ++++ b/src/plugins/platformthemes/gtk3/main.cpp +@@ -39,6 +39,7 @@ + + #include + #include "qgtk3theme.h" ++#include + + QT_BEGIN_NAMESPACE + +@@ -54,8 +55,22 @@ public: + QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) + { + Q_UNUSED(params); +- if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) ++ if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) { ++ ++#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS ++ QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':'); ++ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS); ++ qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':'))); ++#endif ++ ++#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES ++ QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':'); ++ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); ++ qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':'))); ++#endif ++ + return new QGtk3Theme; ++ } + + return 0; + } +diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +index 99d87e2e46..a4eab2aa72 100644 +--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) + add_executable(Qt5::uic IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ENDIF diff --git a/pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch new file mode 100644 index 000000000000..bb1bbbeb05e0 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch @@ -0,0 +1,33 @@ +diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp +index ee5b38717..bbccef8c4 100644 +--- a/src/qml/qml/qqmlimport.cpp ++++ b/src/qml/qml/qqmlimport.cpp +@@ -1678,6 +1678,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + addImportPath(installImportsPath); + ++ // Add import paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir)); ++ } ++ } ++ + // env import paths + if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { + const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); +diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf +index 330da358b..cdf570205 100644 +--- a/tools/qmlcachegen/qmlcache.prf ++++ b/tools/qmlcachegen/qmlcache.prf +@@ -44,7 +44,7 @@ defineReplace(qmlCacheOutputFileName) { + } + + qmlcacheinst.base = $$QMLCACHE_DESTDIR +-qmlcacheinst.path = $$[QT_INSTALL_QML]/$$TARGETPATH ++qmlcacheinst.path = $$NIX_OUTPUT_QML/$$TARGETPATH + qmlcacheinst.CONFIG = no_check_exist + + qmlcachegen.input = CACHEGEN_FILES diff --git a/pkgs/development/libraries/qt-5/5.10/qtscript.patch b/pkgs/development/libraries/qt-5/5.10/qtscript.patch new file mode 100644 index 000000000000..5508dec1280e --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtscript.patch @@ -0,0 +1,13 @@ +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +index 1f6d25e..087c3fb 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +@@ -81,7 +81,7 @@ + #include + #elif PLATFORM(GTK) + #include +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GCond GCond; + #endif + diff --git a/pkgs/development/libraries/qt-5/5.10/qtserialport.patch b/pkgs/development/libraries/qt-5/5.10/qtserialport.patch new file mode 100644 index 000000000000..f25524e80bcf --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtserialport.patch @@ -0,0 +1,22 @@ +diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h +index af2dab2..8e17f64 100644 +--- a/src/serialport/qtudev_p.h ++++ b/src/serialport/qtudev_p.h +@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN + inline bool resolveSymbols(QLibrary *udevLibrary) + { + if (!udevLibrary->isLoaded()) { ++#ifdef NIXPKGS_LIBUDEV ++ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1); ++#else + udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); ++#endif + if (!udevLibrary->load()) { ++#ifdef NIXPKGS_LIBUDEV ++ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0); ++#else + udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); ++#endif + if (!udevLibrary->load()) { + qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); + return false; diff --git a/pkgs/development/libraries/qt-5/5.10/qttools.patch b/pkgs/development/libraries/qt-5/5.10/qttools.patch new file mode 100644 index 000000000000..fbba439ef7a5 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qttools.patch @@ -0,0 +1,71 @@ +diff --git a/src/assistant/help/Qt5HelpConfigExtras.cmake.in b/src/assistant/help/Qt5HelpConfigExtras.cmake.in +index 3b97923a..63336bd5 100644 +--- a/src/assistant/help/Qt5HelpConfigExtras.cmake.in ++++ b/src/assistant/help/Qt5HelpConfigExtras.cmake.in +@@ -2,11 +2,10 @@ + if (NOT TARGET Qt5::qcollectiongenerator) + add_executable(Qt5::qcollectiongenerator IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") +-!!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ if(NOT EXISTS \"${imported_location}\") ++ set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") ++ endif() + _qt5_Help_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qcollectiongenerator PROPERTIES +@@ -17,11 +16,7 @@ endif() + if (NOT TARGET Qt5::qhelpgenerator) + add_executable(Qt5::qhelpgenerator IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") +-!!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") +-!!ENDIF + _qt5_Help_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qhelpgenerator PROPERTIES +diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in +index 4318b16f..d60db4ff 100644 +--- a/src/linguist/Qt5LinguistToolsConfig.cmake.in ++++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in +@@ -44,11 +44,7 @@ endmacro() + if (NOT TARGET Qt5::lrelease) + add_executable(Qt5::lrelease IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") +-!!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") +-!!ENDIF + _qt5_LinguistTools_check_file_exists(${imported_location}) + + set_target_properties(Qt5::lrelease PROPERTIES +@@ -59,11 +55,7 @@ endif() + if (NOT TARGET Qt5::lupdate) + add_executable(Qt5::lupdate IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") +-!!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") +-!!ENDIF + _qt5_LinguistTools_check_file_exists(${imported_location}) + + set_target_properties(Qt5::lupdate PROPERTIES +@@ -74,11 +66,7 @@ endif() + if (NOT TARGET Qt5::lconvert) + add_executable(Qt5::lconvert IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") +-!!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") +-!!ENDIF + _qt5_LinguistTools_check_file_exists(${imported_location}) + + set_target_properties(Qt5::lconvert PROPERTIES diff --git a/pkgs/development/libraries/qt-5/5.10/qtwebengine-paxmark-mksnapshot.patch b/pkgs/development/libraries/qt-5/5.10/qtwebengine-paxmark-mksnapshot.patch new file mode 100644 index 000000000000..e1621b005c61 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtwebengine-paxmark-mksnapshot.patch @@ -0,0 +1,48 @@ +diff --git a/src/3rdparty/chromium/v8/src/v8.gyp b/chromium/v8/src/v8.gyp +index e7e19f5059..934448c7d8 100644 +--- a/src/3rdparty/chromium/v8/src/v8.gyp ++++ b/src/3rdparty/chromium/v8/src/v8.gyp +@@ -35,6 +35,7 @@ + 'v8_extra_library_files%': [], + 'v8_experimental_extra_library_files%': [], + 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', ++ 'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)', + 'v8_os_page_size%': 0, + }, + 'includes': ['../gypfiles/toolchain.gypi', '../gypfiles/features.gypi', 'inspector/inspector.gypi'], +@@ -2576,7 +2577,7 @@ + ] + }, + { +- 'target_name': 'mksnapshot', ++ 'target_name': 'mksnapshot_u', + 'type': 'executable', + 'dependencies': [ + 'v8_base', +@@ -2606,5 +2607,26 @@ + }], + ], + }, ++ { ++ 'target_name': 'mksnapshot', ++ 'type': 'executable', ++ 'dependencies': ['mksnapshot_u'], ++ 'actions': [ ++ { ++ 'action_name': 'paxmark_m_mksnapshot', ++ 'inputs': [ ++ '<(mksnapshot_u_exec)', ++ ], ++ 'outputs': [ ++ '<(mksnapshot_exec)', ++ ], ++ 'action': [ ++ 'sh', ++ '-c', ++ 'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxctl -czexm <(mksnapshot_exec)', ++ ], ++ }, ++ ], ++ }, + ], + } diff --git a/pkgs/development/libraries/qt-5/5.10/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.10/qtwebkit.patch new file mode 100644 index 000000000000..c78cb58f564b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/qtwebkit.patch @@ -0,0 +1,77 @@ +diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri +index 69e4cd1f3..3f729a75e 100644 +--- a/Source/WTF/WTF.pri ++++ b/Source/WTF/WTF.pri +@@ -12,7 +12,7 @@ mac { + # Mac OS does ship libicu but not the associated header files. + # Therefore WebKit provides adequate header files. + INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH +- LIBS += -licucore ++ LIBS += /usr/lib/libicucore.dylib + } else:!use?(wchar_unicode): { + win32 { + CONFIG(static, static|shared) { +diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp +index a923d49aa..46772a4bb 100644 +--- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp ++++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp +@@ -136,7 +136,11 @@ static void initializeGtk(QLibrary* module = 0) + } + } + ++#ifdef NIXPKGS_LIBGTK2 ++ QLibrary library(QLatin1String(NIXPKGS_LIBGTK2), 0); ++#else + QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); ++#endif + if (library.load()) { + typedef void *(*gtk_init_check_ptr)(int*, char***); + gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); +diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp +index de06a2fea..86fe39ef1 100644 +--- a/Source/WebCore/plugins/qt/PluginViewQt.cpp ++++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp +@@ -697,7 +697,11 @@ static Display *getPluginDisplay() + // support gdk based plugins (like flash) that use a different X connection. + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); ++#ifdef NIXPKGS_LIBGDK2 ++ QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0); ++#else + QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++#endif + if (!library.load()) + return 0; + +diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +index 8de65216b..38f5c05e5 100644 +--- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp ++++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +@@ -53,7 +53,11 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr + + static bool initializeGtk() + { ++#ifdef NIXPKGS_LIBGTK2 ++ QLibrary gtkLibrary(QLatin1String(NIXPKGS_LIBGTK2), 0); ++#else + QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0); ++#endif + if (!gtkLibrary.load()) + return false; + typedef void* (*gtk_init_ptr)(void*, void*); +diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +index d734ff684..0f6ff63d1 100644 +--- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp ++++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +@@ -64,7 +64,11 @@ static Display* getPluginDisplay() + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); + ++#ifdef NIXPKGS_LIBGDK2 ++ QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0); ++#else + QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++#endif + if (!library.load()) + return 0; + diff --git a/pkgs/development/libraries/qt-5/5.10/srcs.nix b/pkgs/development/libraries/qt-5/5.10/srcs.nix new file mode 100644 index 000000000000..5369169aa67f --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.10/srcs.nix @@ -0,0 +1,341 @@ +# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh +{ fetchurl, mirror }: + +{ + qt3d = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qt3d-everywhere-src-5.10.0.tar.xz"; + sha256 = "1arlplfpqdk0qki7bs1pp16y9cwa0awn071p551jg4y74xr7wi8j"; + name = "qt3d-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtactiveqt = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtactiveqt-everywhere-src-5.10.0.tar.xz"; + sha256 = "0x6nbi5hlbr1pncbd8zzkwmqi04gcy64q3bjy5w45rg6zws41mzr"; + name = "qtactiveqt-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtandroidextras = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtandroidextras-everywhere-src-5.10.0.tar.xz"; + sha256 = "1ifb49px86abaf4znmlis9wyyxq132nlgj3fyqppbx1sranikygk"; + name = "qtandroidextras-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtbase = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtbase-everywhere-src-5.10.0.tar.xz"; + sha256 = "0qpp56cbw1sfz5ayhj2mskb07cl6jd1ijayg29y624qa6b6phmgx"; + name = "qtbase-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtcanvas3d = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtcanvas3d-everywhere-src-5.10.0.tar.xz"; + sha256 = "11r98mdxy833kcnywlsjrfaqhax7m3b6yhb56072qvr30rpn52fj"; + name = "qtcanvas3d-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtcharts = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtcharts-everywhere-src-5.10.0.tar.xz"; + sha256 = "1vri3f7wyg84w6j84452g8h2p7sk7k01r0xszpn4klv7hi52rkhj"; + name = "qtcharts-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtconnectivity = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtconnectivity-everywhere-src-5.10.0.tar.xz"; + sha256 = "19k9n6gzrbg0sbgyhhcl5gv0d4b2gjwmz5966gn6b424fblf4grf"; + name = "qtconnectivity-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtdatavis3d = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdatavis3d-everywhere-src-5.10.0.tar.xz"; + sha256 = "06363x449k7wkqrd7c0y6b5vqlpwssnkl0g5s1bhp8lkl3bw81lj"; + name = "qtdatavis3d-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtdeclarative = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdeclarative-everywhere-src-5.10.0.tar.xz"; + sha256 = "07kicxzbwiqwkg1x2k6447rwzvzn31cv1yyggc1m8r84lny4vjsw"; + name = "qtdeclarative-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtdoc = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtdoc-everywhere-src-5.10.0.tar.xz"; + sha256 = "01z4ikqrnnx9mzf5pvk4i2lqks4xai32fs9qqbqnsp0qrrcb1jfn"; + name = "qtdoc-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtgamepad = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtgamepad-everywhere-src-5.10.0.tar.xz"; + sha256 = "1rl77rsfgs69cdv75nfjp9w66mndwi211wix5cwl46d7i3wm0xak"; + name = "qtgamepad-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtgraphicaleffects = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtgraphicaleffects-everywhere-src-5.10.0.tar.xz"; + sha256 = "0c2y0ixxncn5xslpxciigq1gfaxd3n7wkcf14k4iy5i15w8nkfcp"; + name = "qtgraphicaleffects-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtimageformats = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtimageformats-everywhere-src-5.10.0.tar.xz"; + sha256 = "1z7lnw85apzf6ph3dgnbb6py17qzpgww92kz31n6vbv5z62bigwi"; + name = "qtimageformats-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtlocation = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtlocation-everywhere-src-5.10.0.tar.xz"; + sha256 = "1iw5m9v5p6l6mivjvj7g1macpqf2n21mg4wg0hza36dwrz3wwkfq"; + name = "qtlocation-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtmacextras = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtmacextras-everywhere-src-5.10.0.tar.xz"; + sha256 = "08n8na36j9c15hvicqfs7h915m2av5xd5v0azf7660z0q9lk9zb3"; + name = "qtmacextras-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtmultimedia = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtmultimedia-everywhere-src-5.10.0.tar.xz"; + sha256 = "0vw0i5jgn4q63g5ijwwrb6835qdaxcw7sfcjffbqfbdwqgyk70q0"; + name = "qtmultimedia-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtnetworkauth = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtnetworkauth-everywhere-src-5.10.0.tar.xz"; + sha256 = "1lnqi1qpy9j5pi2lcmdihf81lspxv6hgdg5jmbqqdqxwzblgpnpc"; + name = "qtnetworkauth-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtpurchasing = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtpurchasing-everywhere-src-5.10.0.tar.xz"; + sha256 = "0mkxslc8qc6sclpngllby3bb86qq5csrsz0xrc14nwmbkhwksxwc"; + name = "qtpurchasing-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtquickcontrols = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtquickcontrols-everywhere-src-5.10.0.tar.xz"; + sha256 = "0ab19raip9828br21qqaglr4y0kqmxix882r13sfxlnm4ivyycx1"; + name = "qtquickcontrols-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtquickcontrols2 = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtquickcontrols2-everywhere-src-5.10.0.tar.xz"; + sha256 = "18d1b5aivaqgs1px61glkyclkky60xd7yzy1vwa1f89sg8j711w1"; + name = "qtquickcontrols2-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtremoteobjects = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtremoteobjects-everywhere-src-5.10.0.tar.xz"; + sha256 = "01bf1ykqxb4d8wz58vxy15yj4jsaqhi258k05dhy7ygdvfgscdnz"; + name = "qtremoteobjects-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtscript = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtscript-everywhere-src-5.10.0.tar.xz"; + sha256 = "1z6a14x9yj0p2znc0vny8y4zkdvm5fp42rnisnf9rynakkqg5wkc"; + name = "qtscript-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtscxml = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtscxml-everywhere-src-5.10.0.tar.xz"; + sha256 = "142qysd5s706r62gap62s89xm7334i1ys29dqsp09av9n7b1kfsb"; + name = "qtscxml-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtsensors = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtsensors-everywhere-src-5.10.0.tar.xz"; + sha256 = "0w9rzqc0hva4521i5j298lrsvys3jqddmqd80cxj9nsvnapwb66d"; + name = "qtsensors-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtserialbus = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtserialbus-everywhere-src-5.10.0.tar.xz"; + sha256 = "06rr0191zy5yxqzxiv0c6dvshncjg8kdc33lszk41pajv624fn9z"; + name = "qtserialbus-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtserialport = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtserialport-everywhere-src-5.10.0.tar.xz"; + sha256 = "0mqlhdp20jl6agv58mszznsikmi1dflhalkpfbgpiafjzzczx075"; + name = "qtserialport-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtspeech = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtspeech-everywhere-src-5.10.0.tar.xz"; + sha256 = "1hashidb33f1215f0azjby1lh8iw7v2bvxp08mqvdk02jld9w5br"; + name = "qtspeech-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtsvg = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtsvg-everywhere-src-5.10.0.tar.xz"; + sha256 = "1c77wnpzjz4wwic5if876y5v1n44v2g2nhjmcs25cc8awz5afaja"; + name = "qtsvg-everywhere-src-5.10.0.tar.xz"; + }; + }; + qttools = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qttools-everywhere-src-5.10.0.tar.xz"; + sha256 = "0cpybii2yznk6gwaa2cz83rk3cpzzm6l4wvn4n2xwdbrgdsdrx8z"; + name = "qttools-everywhere-src-5.10.0.tar.xz"; + }; + }; + qttranslations = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qttranslations-everywhere-src-5.10.0.tar.xz"; + sha256 = "1gmrisf08nsrni7fyjlz5ggfgfzzkjpq3g7l2hc6vq5g04vbskgc"; + name = "qttranslations-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtvirtualkeyboard = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtvirtualkeyboard-everywhere-src-5.10.0.tar.xz"; + sha256 = "0mqb9sgvq7djd2lz4q4p6p9f0c23cfhk447zx4axvv1mldjxsb9c"; + name = "qtvirtualkeyboard-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtwayland = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwayland-everywhere-src-5.10.0.tar.xz"; + sha256 = "14sb0227rzqzf5z8dz8b9nzkk5rwq6hrfxifz603iy4mdijzjmsn"; + name = "qtwayland-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtwebchannel = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebchannel-everywhere-src-5.10.0.tar.xz"; + sha256 = "18rml5xyb9chz8wrfamsgx4z32kkjbk1rc47ynvhn49mcbf2897j"; + name = "qtwebchannel-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtwebengine = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebengine-everywhere-src-5.10.0.tar.xz"; + sha256 = "1yb7jpydxg0dwdrx0iv7i5dq4wb9ld1iff8zpjdj8yl4xy4mkgx8"; + name = "qtwebengine-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtwebglplugin = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebglplugin-everywhere-src-5.10.0.tar.xz"; + sha256 = "0hgwb5lll3275knnj3ms04y1n0i6gph9kac2246ixmcq8sc7a2k7"; + name = "qtwebglplugin-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtwebsockets = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebsockets-everywhere-src-5.10.0.tar.xz"; + sha256 = "00wlyhw7h2axyhinksfm912jfa3n73szxdccz5dlir8742i0zaqp"; + name = "qtwebsockets-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtwebview = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwebview-everywhere-src-5.10.0.tar.xz"; + sha256 = "1955fkc7a22d7a0y2n7kz7r1md56v2s5qvyb3h68szs60zjnk3xa"; + name = "qtwebview-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtwinextras = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtwinextras-everywhere-src-5.10.0.tar.xz"; + sha256 = "1mx5qihmh3awqcr9k3z2chxz8273bi5ha90v7f4fqr2vk3g6w4yd"; + name = "qtwinextras-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtx11extras = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtx11extras-everywhere-src-5.10.0.tar.xz"; + sha256 = "11jp0a40jqwcdq7isyip4f4mq2d58c9fx1kvg9g71m92n52ffyfb"; + name = "qtx11extras-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtxmlpatterns = { + version = "5.10.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.10/5.10.0/submodules/qtxmlpatterns-everywhere-src-5.10.0.tar.xz"; + sha256 = "1hq3sbimbhaiw570d2cd84jhki0n2jw2x2s7iq92m53y4akbr2mh"; + name = "qtxmlpatterns-everywhere-src-5.10.0.tar.xz"; + }; + }; + qtwebkit = { + version = "5.9.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz"; + sha256 = "1ksjn1vjbfhdm4y4rg08ag4krk87ahp7qcdcpwll42l0rnz61998"; + name = "qtwebkit-opensource-src-5.9.1.tar.xz"; + }; + }; + qtwebkit-examples = { + version = "5.9.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz"; + sha256 = "1l2l7ycgqql6rf4gx6sjhsqjapdhvy6vxaxssax3l938nkk4vkp4"; + name = "qtwebkit-examples-opensource-src-5.9.1.tar.xz"; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 912714a45509..891e8f91d616 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10527,8 +10527,23 @@ with pkgs; libsForQt59 = recurseIntoAttrs (lib.makeScope qt59.newScope mkLibsForQt5); - qt5 = qt59; - libsForQt5 = libsForQt59; + qt510 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.10) { + inherit newScope; + inherit stdenv fetchurl makeSetupHook makeWrapper; + bison = bison2; # error: too few arguments to function 'int yylex(... + inherit cups; + harfbuzz = harfbuzz-icu; + mesa = mesa_noglu; + inherit perl; + inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gnome3) gtk3 dconf; + }); + + libsForQt510 = recurseIntoAttrs (lib.makeScope qt510.newScope mkLibsForQt5); + + qt5 = qt510; + libsForQt5 = libsForQt510; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; From 3b646f79e02451e1abf8163de3e2991d7368bd72 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Thu, 4 Jan 2018 18:21:18 +0100 Subject: [PATCH 02/95] go-protobuf: init at 2018-01-04 With the commit 1e59b77b52bf8e4b449a57e6f79f21226d571845 --- .../development/tools/go-protobuf/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/go-protobuf/default.nix diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix new file mode 100644 index 000000000000..361fc74c729b --- /dev/null +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "go-protobuf-${version}"; + version = "2018-01-04"; + rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845"; + + goPackagePath = "github.com/golang/protobuf"; + + src = fetchFromGitHub { + inherit rev; + owner = "golang"; + repo = "protobuf"; + sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/golang/protobuf"; + description = " Go bindings for protocol buffer"; + maintainers = with maintainers; [ lewo ]; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10a5307a5b8d..7aa4b66554fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13111,6 +13111,8 @@ with pkgs; go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; + go-protobuf = callPackage ../development/tools/go-protobuf { }; + gocode = callPackage ../development/tools/gocode { }; goconvey = callPackage ../development/tools/goconvey { }; From 2280c6233c9a7b37633dd73335011f151e128e33 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 8 Jan 2018 03:16:24 +0000 Subject: [PATCH 03/95] pidgin: hyphenate plugins --- pkgs/top-level/aliases.nix | 8 +++++++- pkgs/top-level/all-packages.nix | 12 ++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a93350f52f46..f0054b9841b8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -121,7 +121,13 @@ mapAliases (rec { owncloudclient = owncloud-client; # added 2016-08 pgp-tools = signing-party; # added 2017-03-26 pidgin-with-plugins = pidgin; # added 2016-06 - pidginlatexSF = pidginlatex; # added 2014-11-02 + pidginlatexSF = pidgin-latex; # added 2014-11-02 + pidginlatex = pidgin-latex; # added 2018-01-08 + pidginmsnpecan = pidgin-msn-pecan; # added 2018-01-08 + pidginotr = pidgin-otr; # added 2018-01-08 + pidginosd = pidgin-osd; # added 2018-01-08 + pidginsipe = pidgin-sipe; # added 2018-01-08 + pidginwindowmerge = pidgin-window-merge; # added 2018-01-08 postage = pgmanage; # added 2017-11-03 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 PPSSPP = ppsspp; # added 2017-10-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3008f2975eaf..e2a3c3b29c05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16437,11 +16437,11 @@ with pkgs; plugins = []; }; - pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { + pidgin-latex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { texLive = texlive.combined.scheme-basic; }; - pidginmsnpecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { }; + pidgin-msn-pecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { }; pidgin-mra = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-mra { }; @@ -16451,13 +16451,13 @@ with pkgs; pidgin-xmpp-receipts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts { }; - pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { }; + pidgin-otr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { }; - pidginosd = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-osd { }; + pidgin-osd = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-osd { }; - pidginsipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { }; + pidgin-sipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { }; - pidginwindowmerge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { }; + pidgin-window-merge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { }; purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; From 31031577c1a0c763ae05f9533d408dcc0ea6e82f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 28 Dec 2017 11:29:12 +0000 Subject: [PATCH 04/95] meld: 3.16.4 -> 3.18.0 --- .../applications/version-management/meld/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 05db6d964c3a..d5bd24cf9382 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, itstool, python2Packages, intltool, wrapGAppsHook +{ stdenv, fetchurl, itstool, python3Packages, intltool, wrapGAppsHook , libxml2, gobjectIntrospection, gtk3, gnome3, cairo, file }: let - minor = "3.16"; - version = "${minor}.4"; - inherit (python2Packages) python buildPythonApplication pycairo pygobject3; + minor = "3.18"; + version = "${minor}.0"; + inherit (python3Packages) python buildPythonApplication pycairo pygobject3; in buildPythonApplication rec { name = "meld-${version}"; src = fetchurl { url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; - sha256 = "0rwflfkfnb9ydnk4k591x0il29d4dvz95cjs2f279blx64lgki4k"; + sha256 = "0gi2jzgsrd5q2icyp6wphbn532ddg82nxhfxlffkniy7wnqmi0c4"; }; buildInputs = [ @@ -41,6 +41,8 @@ in buildPythonApplication rec { pythonPath = [ gtk3 ]; + doCheck = false; + meta = with stdenv.lib; { description = "Visual diff and merge tool"; homepage = http://meldmerge.org/; From 66a0ac9358de6007b2f91f39c248f44a78716724 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 8 Jan 2018 07:35:23 +0000 Subject: [PATCH 05/95] pythonPackages.rabbitvcs: disable tests --- pkgs/applications/version-management/rabbitvcs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 019296550819..2d77a9c32656 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -30,6 +30,8 @@ python2Packages.buildPythonApplication rec { wrapPythonProgramsIn $cli "$out $pythonPath" ''; + doCheck = false; + meta = { description = "Graphical tools for working with version control systems"; homepage = http://rabbitvcs.org/; From 37933209588792db24104dbfaef0106c3bef870d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 9 Jan 2018 22:46:34 +0100 Subject: [PATCH 06/95] qt5-qtbase: update darwin patch --- .../libraries/qt-5/5.10/qtbase.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.10/qtbase.patch b/pkgs/development/libraries/qt-5/5.10/qtbase.patch index b8c7f363de8e..06eff174359f 100644 --- a/pkgs/development/libraries/qt-5/5.10/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.10/qtbase.patch @@ -1082,6 +1082,41 @@ index da63360333..95e34e2e50 100644 xcursorFound = xcursorLib.load(); } if (xcursorFound) { +diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm +index d1f19f2..1ac2cf1 100644 +--- a/src/plugins/platforms/cocoa/qcocoawindow.mm ++++ b/src/plugins/platforms/cocoa/qcocoawindow.mm +@@ -1699,7 +1699,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window) + + if (!m_drawContentBorderGradient) { + window.styleMask = window.styleMask & ~NSTexturedBackgroundWindowMask; +- [window.contentView.superview setNeedsDisplay:YES]; ++ [[window.contentView superview] setNeedsDisplay:YES]; + window.titlebarAppearsTransparent = NO; + return; + } +diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm +index e846fa0..4171cd4 100644 +--- a/src/plugins/platforms/cocoa/qnswindow.mm ++++ b/src/plugins/platforms/cocoa/qnswindow.mm +@@ -224,7 +224,7 @@ static bool isMouseEvent(NSEvent *ev) + if (pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) { + NSPoint loc = [theEvent locationInWindow]; + NSRect windowFrame = [self convertRectFromScreen:self.frame]; +- NSRect contentFrame = self.contentView.frame; ++ NSRect contentFrame = [self.contentView frame]; + if (NSMouseInRect(loc, windowFrame, NO) && !NSMouseInRect(loc, contentFrame, NO)) + [qnsview_cast(pw->view()) handleFrameStrutMouseEvent:theEvent]; + } +@@ -253,7 +253,7 @@ static bool isMouseEvent(NSEvent *ev) + + (void)applicationActivationChanged:(NSNotification*)notification + { + const id sender = self; +- NSEnumerator *windowEnumerator = nullptr; ++ NSEnumerator *windowEnumerator = nullptr; + NSApplication *application = [NSApplication sharedApplication]; + + #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp index c4cd66c33b..b6f2691587 100644 --- a/src/plugins/platformthemes/gtk3/main.cpp From 5911b8d41593d3958585d43812945481d2672f57 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 12 Jan 2018 18:06:53 -0600 Subject: [PATCH 07/95] release-small: Don't attempt to access "dbus.libs", etc., don't exist dbus_libs and others do, but they're deprecated. Just build 'dbus', these are now its various outputs. --- pkgs/top-level/release-small.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 8e95bdd92314..391d79e47f18 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -35,6 +35,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; cpio = all; cron = linux; cups = linux; + dbus = linux; dhcp = linux; diffutils = all; e2fsprogs = linux; @@ -174,10 +175,4 @@ with import ./release-lib.nix { inherit supportedSystems; }; zile = linux; zip = all; - dbus = { - libs = linux; - daemon = linux; - tools = linux; - }; - } )) From 1b43f4fe865dd76b1dfcd0c3cc4ceecf9cd28545 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 11 Jan 2018 07:57:57 +0000 Subject: [PATCH 08/95] ocamlPackages.uri: 1.9.2 -> 1.9.5 --- .../development/ocaml-modules/uri/default.nix | 54 +++++++------------ pkgs/development/ocaml-modules/uri/legacy.nix | 51 ++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 8 ++- 3 files changed, 75 insertions(+), 38 deletions(-) create mode 100644 pkgs/development/ocaml-modules/uri/legacy.nix diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index f08ee7fc2fc1..535af5708218 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -1,51 +1,33 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, re, stringext, ounit -, sexplib, ppx_sexp_conv -, legacyVersion ? false -, sexplib_p4 +{ stdenv, fetchurl, ocaml, findlib, jbuilder, ppx_sexp_conv, ounit +, ppx_deriving, re, sexplib, stringext }: -if !stdenv.lib.versionAtLeast ocaml.version "4" -|| legacyVersion && stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "uri${stdenv.lib.optionalString legacyVersion "_p4"} is not available for OCaml ${ocaml.version}" else - -with - if legacyVersion - then { - version = "1.9.1"; - sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85"; - } else { - version = "1.9.2"; - sha256 = "137pg8j654x7r0d1664iy2zp3l82nki1kkh921lwdrwc5qqdl6jx"; - }; - -stdenv.mkDerivation { +stdenv.mkDerivation rec { + version = "1.9.5"; name = "ocaml${ocaml.version}-uri-${version}"; - src = fetchzip { - url = "https://github.com/mirage/ocaml-uri/archive/v${version}.tar.gz"; - inherit sha256; + src = fetchurl { + url = "https://github.com/mirage/ocaml-uri/releases/download/v${version}/uri-${version}.tbz"; + sha256 = "11cix26fisjbzd1kj12a78wjf3bfgaxpj8nz88bl3dssdakhswyc"; }; - buildInputs = [ ocaml findlib ocamlbuild ounit ] - ++ stdenv.lib.optional (!legacyVersion) ppx_sexp_conv; - propagatedBuildInputs = [ re (if legacyVersion then sexplib_p4 else sexplib) stringext ]; + unpackCmd = "tar -xjf $curSrc"; + + buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ounit ]; + propagatedBuildInputs = [ ppx_deriving re sexplib stringext ]; + + buildPhase = "jbuilder build"; - configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; - buildPhase = '' - ocaml setup.ml -build - ocaml setup.ml -doc - ''; doCheck = true; - checkPhase = "ocaml setup.ml -test"; - installPhase = "ocaml setup.ml -install"; + checkPhase = "jbuilder runtest"; - createFindlibDestdir = true; + inherit (jbuilder) installPhase; meta = { - homepage = https://github.com/mirage/ocaml-uri; - platforms = ocaml.meta.platforms or []; + homepage = "https://github.com/mirage/ocaml-uri"; description = "RFC3986 URI parsing library for OCaml"; license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/uri/legacy.nix b/pkgs/development/ocaml-modules/uri/legacy.nix new file mode 100644 index 000000000000..f08ee7fc2fc1 --- /dev/null +++ b/pkgs/development/ocaml-modules/uri/legacy.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, re, stringext, ounit +, sexplib, ppx_sexp_conv +, legacyVersion ? false +, sexplib_p4 +}: + +if !stdenv.lib.versionAtLeast ocaml.version "4" +|| legacyVersion && stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "uri${stdenv.lib.optionalString legacyVersion "_p4"} is not available for OCaml ${ocaml.version}" else + +with + if legacyVersion + then { + version = "1.9.1"; + sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85"; + } else { + version = "1.9.2"; + sha256 = "137pg8j654x7r0d1664iy2zp3l82nki1kkh921lwdrwc5qqdl6jx"; + }; + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-uri-${version}"; + + src = fetchzip { + url = "https://github.com/mirage/ocaml-uri/archive/v${version}.tar.gz"; + inherit sha256; + }; + + buildInputs = [ ocaml findlib ocamlbuild ounit ] + ++ stdenv.lib.optional (!legacyVersion) ppx_sexp_conv; + propagatedBuildInputs = [ re (if legacyVersion then sexplib_p4 else sexplib) stringext ]; + + configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; + buildPhase = '' + ocaml setup.ml -build + ocaml setup.ml -doc + ''; + doCheck = true; + checkPhase = "ocaml setup.ml -test"; + installPhase = "ocaml setup.ml -install"; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/mirage/ocaml-uri; + platforms = ocaml.meta.platforms or []; + description = "RFC3986 URI parsing library for OCaml"; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4a7c77172cc0..c44124c3ffff 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -667,8 +667,12 @@ let uucp = callPackage ../development/ocaml-modules/uucp { }; uunf = callPackage ../development/ocaml-modules/uunf { }; - uri = callPackage ../development/ocaml-modules/uri { }; - uri_p4 = callPackage ../development/ocaml-modules/uri { + uri = + if lib.versionAtLeast ocaml.version "4.3" + then callPackage ../development/ocaml-modules/uri { } + else callPackage ../development/ocaml-modules/uri/legacy.nix { }; + + uri_p4 = callPackage ../development/ocaml-modules/uri/legacy.nix { legacyVersion = true; }; From bed805f4edd0f5ba561087b76b39f5cc912297d0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 14 Jan 2018 05:33:36 +0000 Subject: [PATCH 09/95] ocamlPackages.uri: 1.9.5 -> 1.9.6 --- pkgs/development/ocaml-modules/uri/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index 535af5708218..5059ef24aa32 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.9.5"; + version = "1.9.6"; name = "ocaml${ocaml.version}-uri-${version}"; src = fetchurl { url = "https://github.com/mirage/ocaml-uri/releases/download/v${version}/uri-${version}.tbz"; - sha256 = "11cix26fisjbzd1kj12a78wjf3bfgaxpj8nz88bl3dssdakhswyc"; + sha256 = "1m845rwd70wi4iijkrigyz939m1x84ba70hvv0d9sgk6971w4kz0"; }; unpackCmd = "tar -xjf $curSrc"; From 17dcd33e008ec3e7d6d77fe6dbecdd605e000237 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 9 Jan 2018 01:21:48 +0100 Subject: [PATCH 10/95] android-studio: set `ANDROID_EMULATOR_USE_SYSTEM_LIBS` This change sets an environment variable to ensure that Android Studio uses the correct drivers to avoid any breackage when trying to run a native application on a virtual device. Without proper configuration `android-studio` would be unable to load the drivers for the AVD and yield messages like this: ``` 3:32 PM Executing tasks: [:app:assembleDebug] 3:32 PM Emulator: libGL error: unable to load driver: i965_dri.so 3:32 PM Emulator: libGL error: driver pointer missing 3:32 PM Emulator: libGL error: failed to load driver: i965 3:32 PM Emulator: libGL error: unable to load driver: i965_dri.so 3:32 PM Emulator: libGL error: driver pointer missing 3:32 PM Emulator: libGL error: failed to load driver: i965 3:32 PM Emulator: libGL error: unable to load driver: swrast_dri.so 3:32 PM Emulator: libGL error: failed to load driver: swrast 3:32 PM Emulator: X Error of failed request: BadValue (integer parameter out of range for operation) 3:32 PM Emulator: Major opcode of failed request: 155 (GLX) 3:32 PM Emulator: Minor opcode of failed request: 24 (X_GLXCreateNewContext) 3:32 PM Emulator: Value in failed request: 0x0 3:32 PM Emulator: Serial number of failed request: 64 3:32 PM Emulator: Current serial number in output stream: 65 3:32 PM Emulator: emulator: ERROR: Missing initial data partition file: /home/ma27/.android/avd/Nexus_5X_API_27.avd/userdata.img 3:32 PM Emulator: Process finished with exit code 1 3:32 PM Gradle build finished with 2 warnings(s) in 6s 378ms ``` For further reference have a look at the following StackOverflow message: https://stackoverflow.com/a/40790339 --- pkgs/applications/editors/android-studio/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 360d373f0707..2c2227dd4ee9 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -34,7 +34,7 @@ let androidStudio = stdenv.mkDerivation { - name = "${pname}"; + name = "${pname}-${version}"; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; @@ -48,6 +48,7 @@ let installPhase = '' cp -r . $out wrapProgram $out/bin/studio.sh \ + --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --set PATH "${stdenv.lib.makeBinPath [ # Checked in studio.sh @@ -68,7 +69,6 @@ let # Runtime stuff git - ]}" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ From e45a06ebd1d761ccd48b6279c7ebb4429b17a6aa Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Mon, 15 Jan 2018 14:34:58 +0700 Subject: [PATCH 11/95] openvpn: add option to store credentials --- nixos/modules/services/networking/openvpn.nix | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 3fbf5a9f0227..8a059f609546 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -50,6 +50,11 @@ let "up ${pkgs.writeScript "openvpn-${name}-up" upScript}"} ${optionalString (cfg.down != "" || cfg.updateResolvConf) "down ${pkgs.writeScript "openvpn-${name}-down" downScript}"} + ${optionalString (cfg.authUserPass != null) + "auth-user-pass ${pkgs.writeText "openvpn-credentials-${name}" '' + ${cfg.authUserPass.username} + ${cfg.authUserPass.password} + ''}"} ''; in { @@ -161,6 +166,27 @@ in ''; }; + authUserPass = mkOption { + default = null; + description = '' + This option can be used to store the username / password credentials + with the "auth-user-pass" authentication method. + ''; + type = types.nullOr (types.submodule { + + options = { + username = mkOption { + description = "The username to store inside the credentials file."; + type = types.string; + }; + + password = mkOption { + description = "The password to store inside the credentials file."; + type = types.string; + }; + }; + }); + }; }; }); From addf1d5da37236f0e0dbb7959f7eedb7d255e65b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 15 Jan 2018 17:51:19 +0100 Subject: [PATCH 12/95] miniupnpd: 2.0 -> 2.0.20171212 (fixes CVE-2017-1000494) changelog since the last version bump: 2017/12/12: Fix a few buffer overrun in SSDP and SOAP parsing 2017/11/02: PCP : reset epoch after address change 2017/05/26: merge https://github.com/miniupnp/miniupnp/tree/randomize_url branch 2017/05/24: get SSDP packet receiving interface index and use it to check if the packet is from a LAN 2017/03/13: default to client address for AddPortMapping when is empty pass ext_if_name to add_pinhole() 2016/12/23: Fix UDA-1.2.10 Man header empty or invalid 2016/12/16: Do not try to open IPv6 sockets once it is disabled 2016/12/01: Fix "AddPinhole Twice" test 2016/11/11: fixes build for Solaris/SunOS 2016/07/23: fixes build error on DragonFly BSD --- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 6003471bed93..3e3b4ec34a30 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-2.0"; + name = "miniupnpd-2.0.20171212"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1dxzhvkylrnbkd5srb9rb2g4f9ydd1zbjg5sdf190m0g1sha6snr"; + sha256 = "0jdcll1nd8jf356fpl0n2yw8sww58nfz6hkx052d77l34afq6sn7"; name = "${name}.tar.gz"; }; From 761ed40c5cef73beb2827d47a7494a7b99a23955 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 15 Jan 2018 17:55:00 +0100 Subject: [PATCH 13/95] miniupnpc_2: 2.0.20170509 -> 2.0.20171212 This potentially addresses CVE-2017-1000494. Changes since last version bump: 2017/12/11: Fix buffer over run in minixml.c Fix uninitialized variable access in upnpreplyparse.c --- pkgs/tools/networking/miniupnpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 2cca57121e91..fe3568c3a83f 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -27,8 +27,8 @@ let }; in { miniupnpc_2 = generic { - version = "2.0.20170509"; - sha256 = "0spi75q6nafxp3ndnrhrlqagzmjlp8wwlr5x7rnvdpswgxi6ihyk"; + version = "2.0.20171212"; + sha256 = "0za7pr6hrr3ajkifirhhxfn3hlhl06f622g8hnj5h8y18sp3bwff"; }; miniupnpc_1 = generic { version = "1.9.20160209"; From af9724d9791fcda0217bd60dfdb7332fb181c9da Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 15 Jan 2018 12:34:56 -0500 Subject: [PATCH 14/95] vscode: 1.19.1 -> 1.19.2 --- pkgs/applications/editors/vscode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 15477c5c7d45..6b449193337d 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.19.1"; + version = "1.19.2"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "0ypx1jrzg76f8p4yh9hi3bhsrc6w4r7rg6i2aa6q7s8ny0q9hrlx"; - "x86_64-linux" = "1934wdiy2d1fzcjxjyf60dw1g1pp3lk2wv41xgrabfy5j2xfz14r"; - "x86_64-darwin" = "1zbcddgdwvmnk1gpmgw6rz0rswhkfc72wcjdbvgghm4msfwcgvc8"; + "i686-linux" = "05qfcmwl1r43slwkb2rxh99hwpzd8c622la0ffd9p2jg4lbkgs1p"; + "x86_64-linux" = "0kjwmw68av9mnqcg1vaazm3k240y9jvbng6n7ycgzxwddzx0qlac"; + "x86_64-darwin" = "1mjmi5r9qlc6ggh3w566454ar06by15xsm6dymr8zv4sb352w70h"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; From d8d17d101df8d8809cd0427c619d00d23aab71d4 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Mon, 15 Jan 2018 19:29:20 +0100 Subject: [PATCH 15/95] freeradius: 3.0.15 -> 3.0.16 --- pkgs/servers/freeradius/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index bf74ca81ced8..c6ec3d46dda3 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -40,11 +40,11 @@ assert withCollectd -> collectd != null; with stdenv.lib; stdenv.mkDerivation rec { name = "freeradius-${version}"; - version = "3.0.15"; + version = "3.0.16"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - sha256 = "1qygf5if2xjzl7kfzwl428ydz5q1m0j5sx077n12v7znlgnwaagx"; + sha256 = "062dw4ckaa7k2br16l3naz9dr7hvzqhpxdwam3klq1i44v4hvl1b"; }; nativeBuildInputs = [ autoreconfHook ]; From 9059c93b8436f6d591d956111dc6be02adb84436 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Mon, 15 Jan 2018 20:50:03 +0100 Subject: [PATCH 16/95] linuxPackages.vhba: fix add libelf build input --- pkgs/misc/emulators/cdemu/vhba.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 56f63e747342..1dd34fa23c33 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kernel }: +{ stdenv, fetchurl, kernel, libelf }: stdenv.mkDerivation rec { name = "vhba-${version}"; @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; + buildInputs = [ libelf ]; hardeningDisable = [ "pic" ]; From 56c02aedee4ed261e2f959aac2fc43608611dab3 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 15 Jan 2018 13:10:58 -0500 Subject: [PATCH 17/95] elpa-packages: 2018-01-15 --- .../editors/emacs-modes/elpa-generated.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 6a438672601b..754061270123 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -135,10 +135,10 @@ arbitools = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "arbitools"; - version = "0.93"; + version = "0.94"; src = fetchurl { - url = "https://elpa.gnu.org/packages/arbitools-0.93.el"; - sha256 = "0z3lqp8dqfkams5h4sw569p48d2rvpd3d8lb4xaw0z8l49y2mvg8"; + url = "https://elpa.gnu.org/packages/arbitools-0.94.el"; + sha256 = "00iq8rr1275p48ic5mibcx657li723q8r7ax4g21w6bzwsj3gksd"; }; packageRequires = [ cl-lib ]; meta = { @@ -768,10 +768,10 @@ el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.4.0.14"; + version = "1.4.0.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.4.0.14.tar"; - sha256 = "1qc30dia59i2bklhivfhmsghirnpgz5mvcjdc78n0r8nizb68jfp"; + url = "https://elpa.gnu.org/packages/el-search-1.4.0.17.tar"; + sha256 = "14jacy0gjhpvia15ffa99np2wyblmadb95f17a9azl6dsn6dq1m6"; }; packageRequires = [ emacs stream ]; meta = { @@ -1386,10 +1386,10 @@ mines = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "mines"; - version = "1.2"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/mines-1.2.tar"; - sha256 = "1xwnw2hyk1qz98mdnckk0i05li0gzygq12kkmrlidxnk7ngbq9vw"; + url = "https://elpa.gnu.org/packages/mines-1.5.tar"; + sha256 = "1wpkn47iza78hzj396z5c05hsimnhhhmr1cq598azd6h8c1zca7g"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2320,10 +2320,10 @@ }) {}; which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "which-key"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/which-key-3.0.2.tar"; - sha256 = "1s7bq7vq9xsf2pz1w03l743yzaxm9gk5qgympcwlkiq90ph13vcn"; + url = "https://elpa.gnu.org/packages/which-key-3.1.0.tar"; + sha256 = "17n09i92m7qdicybxl60j81c8fn7jcx25wds0sb7j8i364psjabq"; }; packageRequires = [ emacs ]; meta = { From 8a24756dd848f141dc48f53475fff137c02677a9 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 15 Jan 2018 13:11:11 -0500 Subject: [PATCH 18/95] org-packages: 2018-01-15 --- .../editors/emacs-modes/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index b173dcff936c..9673166c2fd1 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20180108"; + version = "20180115"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20180108.tar"; - sha256 = "02rs7zi3dzps0mlyfbgiywd2smnlw0pk8ps1nqk0d5hx3n6d15yv"; + url = "https://orgmode.org/elpa/org-20180115.tar"; + sha256 = "1zc75kxbx9bk1xag46s027a290fnva1id8vv92lz9i5nkqnrm430"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20180108"; + version = "20180115"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20180108.tar"; - sha256 = "10mhiqsrxxmhsy8dl88r456shx6ajm4w19pz259b960551r596iz"; + url = "https://orgmode.org/elpa/org-plus-contrib-20180115.tar"; + sha256 = "1gm6b0hpa4y83bxsbps39b1xvq99m1dh9nbvn9r4spw4rxhhfppy"; }; packageRequires = []; meta = { From e621929d972ca74e7b0a310e465585d06c15ad0f Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 15 Jan 2018 13:11:29 -0500 Subject: [PATCH 19/95] melpa-stable-packages: 2018-01-15 --- .../emacs-modes/melpa-stable-generated.nix | 233 +++++++++++++----- 1 file changed, 169 insertions(+), 64 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index dd3a30271f39..567ba06c82af 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1753,12 +1753,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "5d25972192cd34553997ba193c09eab093a2b870"; - sha256 = "1pp2gzw17k58s9akraf8p4jxbar8viym2a43rkc7agzy47qsybs0"; + rev = "7935275ee45f0359d887b8563ffd1d002f0c618e"; + sha256 = "1p6sj46135dh7fgpzrfzsp5zkmx5si5lndwc7pnk30fbz5pindsw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2047,12 +2047,12 @@ auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "emacscollective"; repo = "auto-compile"; - rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a"; - sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa"; + rev = "8d117868a0a091389d528428136e60f951e9c550"; + sha256 = "1qkw8qzhqzk16kvk1200ha10gi6ny0saqvyqm6b1ww0iw3q1ic5c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; @@ -3061,12 +3061,12 @@ bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bog"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "kyleam"; repo = "bog"; - rev = "cf7817de3f37ce2404ee637a655f1a511b829585"; - sha256 = "0h166w8bg864ppwg64m0vhg649mmkclld85zcd0lmbqa9wfml5j5"; + rev = "6ed4d3edbe771e586d873b826330f3ef23aa1611"; + sha256 = "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog"; @@ -3142,6 +3142,27 @@ license = lib.licenses.free; }; }) {}; + borg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "borg"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "emacscollective"; + repo = "borg"; + rev = "34eac585d6829e17ce59b09fe6ad5d675302c096"; + sha256 = "1q7k2c7pxcywg6xjk8awg73skyw59a6w4aa9sxbsz9vdj2zn04k9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg"; + sha256 = "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr"; + name = "borg"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/borg"; + license = lib.licenses.free; + }; + }) {}; boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "boxquote"; @@ -6476,6 +6497,27 @@ license = lib.licenses.free; }; }) {}; + cubicle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cubicle-mode"; + version = "1.1.2"; + src = fetchFromGitHub { + owner = "cubicle-model-checker"; + repo = "cubicle"; + rev = "b043b0247bf9b144a5c3360e5096a4b141dd1fb6"; + sha256 = "0zsfz1h68xpbgdb1ln8l081vwrgd7i01ap4rjlyrsk8j3q3ry5wz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode"; + sha256 = "0xcmd0s6dfryl1ihfaqq0pfqc906yzzwk3d3nv8g6b6w78pv1lzv"; + name = "cubicle-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/cubicle-mode"; + license = lib.licenses.free; + }; + }) {}; cuda-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cuda-mode"; @@ -6626,12 +6668,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "6b260611dc08468fca9b9af132a00783dd2cf8d9"; - sha256 = "0s5wi010sn3ng9fr7fqbc11kmjqirr28wya3rnnzzb3m5gyxs8id"; + rev = "1a25bf26ee8d9878ce858cfaff84b083339056d6"; + sha256 = "0kvsx9n8qm9s2w9bz167jzcb1b3d4fgc807w1miwil9dcyar6rkk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -6962,12 +7004,12 @@ deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deft"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "jrblevin"; repo = "deft"; - rev = "4001a55cf5f79cdbfa00f1405e8a4645af4acd40"; - sha256 = "157c6ck6gb59i7dikbdnaq7cwlh3nnk0vqgil4v1294s2xbpp46n"; + rev = "c4b30d780bfa732ff52d85f0311e4a045f44a7b4"; + sha256 = "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; @@ -9433,12 +9475,12 @@ elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-mirror"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "9cf096448b69c795b20aab89557e9add6029b13c"; - sha256 = "05la1v1p7wyrjflh8lv3pwr7ywm2rvvzhh8phr24w31jfs2kp4gf"; + rev = "83a38b5721c459d311833522903de96f874e1a4e"; + sha256 = "0j2nk1nhbihfqajkmzp3501mhv5617qhb7qbj46qz8azs8a1dvri"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -9545,12 +9587,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5"; - sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh"; + rev = "127fd4fca8ac6470cfda62f47bb1c29859862cfc"; + sha256 = "0j7j7wh89a34scilw11pbdb86nf515ig38pjkwyarfvj93gigc04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; @@ -12435,12 +12477,12 @@ fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fish-mode"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "wwwjfy"; repo = "emacs-fish"; - rev = "22aabbccd564883684f6d224b8e0a512f334be41"; - sha256 = "17djaz79spms9il71m4xdfjhm58dzswb6fpncngkgx8kxvcy9y24"; + rev = "cd0387f7f1d5c50e080091f86ca97d8a67d603a6"; + sha256 = "0q4cq1rkiz5mjxhp7p5awmw59q1yjb2sryc9i54cwhr5dwwqf95k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode"; @@ -14760,12 +14802,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "e04050f81106029c342deb7adbfc67b2a888ec58"; - sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6"; + rev = "8cfdaf42446a68e6aa4eb0655d43563407cb5636"; + sha256 = "0acfqf1219bnzyf64sv68fvpi4a13nc0wv8dz5a8h6r1j0ysx6qj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -18065,12 +18107,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "26749ff9f34b2abddf7c47ff71b1046942e38398"; - sha256 = "1q969rlqj706wdzd3s54pqpfpqkg18bzl5srl7xkw43cfzxpcpj2"; + rev = "68f01726795ca3054cfc6327dcdb22c9c83dfdfa"; + sha256 = "0vak9phqgxz5dk1zj3i4cs94y797h77qadirsf33gl073cg95l8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -18632,12 +18674,12 @@ helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "9fdbf5b24df28b046731db1c7a1cc90338d55dce"; - sha256 = "13kw0i4vhd8fgwgchap5qxckvhs00ifr7z68whnd3xzklx3v47bj"; + rev = "e1b660e2a48b39b0a81119c2593362dd60076757"; + sha256 = "031hglxwlq8fryi8vs11hyflcrk09qc9qja28nqby0adn20z47mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -19409,12 +19451,12 @@ ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ialign"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mkcms"; repo = "interactive-align"; - rev = "df591e452f9a56c69fb69de961baa75751bae3d8"; - sha256 = "1k3c0wxbn6yrd75275ny66avp70qpd3glnmagsgq3x8mbyxh233d"; + rev = "f022c86d566a4b0b4ffdc5c8c75a4a7b9468fa71"; + sha256 = "087rjk26pfa29igq3cbp48yaxlm4xqz62svszbdb1hjfip5y453a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; @@ -19889,6 +19931,27 @@ license = lib.licenses.free; }; }) {}; + imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "imake"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "imake"; + rev = "edd2e59f7996c35450987cf8f137ecb54777e9ca"; + sha256 = "12mq1ki001jgjdfr3fx43z1xz4jrki18rb0wkb7n956dvl34w0fg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28de8f7f5302b27c7c6600ad65a998119518be43/recipes/imake"; + sha256 = "0j732fi6999n9990w4l28raw140fvqfbynyh4x65yilhw95r7c34"; + name = "imake"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/imake"; + license = lib.licenses.free; + }; + }) {}; imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imapfilter"; @@ -21569,12 +21632,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "d4a1cbae1fc77192e5844291821709c82c9dc455"; - sha256 = "04k2yz3vrj1h0zf6cz0jd97fg8zah2j980l5ycsgyy0dk9ysink8"; + rev = "88a25b89a480f1193cc1c5502f3a5d0b68cb7227"; + sha256 = "03bbpaih29yx8s16v59mca8v6sak6294zq7d534613la28n4h6w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -23115,12 +23178,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit-popup"; - rev = "05a836caf02eba91fa26bdf5dd6fd183fe23937d"; - sha256 = "08p57alfbkcsqkhnfjhfckqhans278ffjyhhhvgy8s7asa6as9kl"; + rev = "5a2a6f2907a09c7592c4631d2678dd7ab44fd5a2"; + sha256 = "0m8h6jc87bcl3lhygc06la4hs7sh6c7vflxlqvwr3bfmknl8l8yw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; @@ -25388,12 +25451,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.11"; + version = "0.5.12"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "a4b42b185b65e78bc3bb6523e23aefb1213eb3b2"; - sha256 = "1yzcawvz3vbq6pgr0b3sk0qg24jx1fpkinwcmsdl283ib8msbc7g"; + rev = "8e321f1036770c20637a0f946b655805cd070e25"; + sha256 = "11hxf0fkka4mv1qsw0nx3ymvgcav95r2bvk1gwyj5m5cbwb4a1n9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -25490,11 +25553,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.26pre2"; + version = "0.26"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "4cb1eeba83416a12c616aca6469c027b8b8a303d"; - sha256 = "0brcdwblfj3nb2ca0izvhlm3x1pf0r72wsa9f2hf0ssnh9w2z40s"; + rev = "3c4e64d976eb561ac5157df1bbe5882e3e65b583"; + sha256 = "00a9ggrc63n88g7vp57c09r859pl2dbxnqgf543ks94lm0jzyz3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -28310,12 +28373,12 @@ parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "joostkremers"; repo = "parsebib"; - rev = "bc31b627c666df576aa37e21c27a2223b3cb91a3"; - sha256 = "1bnqnxkb9dnl0fjrrjx0xn9jsqki2h8ygw3d5dm4bl79smah3qkh"; + rev = "c8d59deb20552f9a1885297b5ae0b8f753d191a5"; + sha256 = "1b1iiiy184czp014gg1bb3jks9frmkw8hs5z2l2lnzjmfjr6jm6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; @@ -29040,6 +29103,27 @@ license = lib.licenses.free; }; }) {}; + php-runtime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "php-runtime"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "emacs-php"; + repo = "php-runtime.el"; + rev = "fa4312863245511462b75cb31df2f8558288f4df"; + sha256 = "1glwy0cgnn0z4rnd45pqy0bmyaddhxfjlj778hz7ghy40h9kqbdn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/615c9ac208d8c20082a8ac83e49e93d99e2cbc89/recipes/php-runtime"; + sha256 = "0dvnwajrjsgyqzglzpkx9vwx3f55mrag6dsbdjqc9vvpvxhmgfwb"; + name = "php-runtime"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/php-runtime"; + license = lib.licenses.free; + }; + }) {}; phpcbf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "phpcbf"; @@ -29292,6 +29376,27 @@ license = lib.licenses.free; }; }) {}; + play-crystal = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "play-crystal"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "veelenga"; + repo = "play-crystal.el"; + rev = "86b54346e7c832c14f8e5654a462f6490a6b11d7"; + sha256 = "0kvkr24f8r21pahm2lsvbr9bg53770wxwpdfmmjljs2zmgxf2c40"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/92715977136afa731e85e894542dc88b664b3304/recipes/play-crystal"; + sha256 = "1jqf36b1mhyf4j7fs386g6isy09q7k8zwdc4rb34mhjg1a56gcnf"; + name = "play-crystal"; + }; + packageRequires = [ dash emacs request ]; + meta = { + homepage = "https://melpa.org/#/play-crystal"; + license = lib.licenses.free; + }; + }) {}; play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "play-routes-mode"; @@ -31491,12 +31596,12 @@ req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }: melpaBuild { pname = "req-package"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "edvorg"; repo = "req-package"; - rev = "30f76a9c52994562191c90c315002410706f6c0b"; - sha256 = "0qdr2pshfq6v75s9hx9wgvn56pd7b65vaqaa64dryr7v4yzd4r15"; + rev = "15c0dfecad2bb939e97abf9d0c7fa086676e5c05"; + sha256 = "0qidddvnv2qdcqx4b1fkp8lbax6hzp7np4c6r66h0d33dk6b7m77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package"; @@ -37792,12 +37897,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "6d2e17c949ff7bfebfe0b0878a93d94b31585031"; - sha256 = "03szbjp6j6rjj43k3vs2jay4y7bnhhh1ymgqv8vvdnqsf88pdg88"; + rev = "7559a79e95aada65601f7413a1c3f08bfa34557b"; + sha256 = "1l9m04hypk8j5qkg7rlhsknj9hx5l3zjy97s3kv7wbcwvcx3yxhz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -38089,8 +38194,8 @@ version = "0.9.8"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "52fa9101d8c4"; - sha256 = "1ijzd3xmygkkkwm0ckkmi576y93drcs63l6bsc8qz2pvjcn5k8sw"; + rev = "d04938232934"; + sha256 = "1sjadb0kh3hrdsvwywi04agrzrs21sxzh1v1km0z3x6f15nr048c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -38127,12 +38232,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "99d3278b1c79718de16dd4f57dcc8c4aa31a4051"; - sha256 = "1mcfinr1wv87hqn2787dcyn7lkgfni4xfgsji50pwj3zfgg0yqyr"; + rev = "04d59d68dab58a7cf3034c84d8ba0553b78ae30c"; + sha256 = "080f39m9nmi163arpmxw45xwadb7q7w7p385yi1jy62bzvqnk0pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -38864,8 +38969,8 @@ version = "1.80"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "668632d9392e"; - sha256 = "1d37yr7yqqg1gavi3406rv9rfvcm5ic365jhs6pispfx1kr77k6n"; + rev = "cef987df070f"; + sha256 = "1nryf7pizmwhyk2jw5dgild031xb6xylyyhr8pwx74iijcbpz2qh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; From fbb8fc18ee59c7a1142298e7ed587cea9af3998a Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 15 Jan 2018 13:14:27 -0500 Subject: [PATCH 20/95] melpa-packages: 2018-01-15 --- .../editors/emacs-modes/melpa-generated.nix | 1048 +++++++++-------- 1 file changed, 576 insertions(+), 472 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index a2b9564faa50..906737e381bd 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -761,8 +761,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "519b5cd886f484693fd69b226e307d56137b321b"; - sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18"; + rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; + sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -778,12 +778,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20171209.2145"; + version = "20180111.116"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "519b5cd886f484693fd69b226e307d56137b321b"; - sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18"; + rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; + sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -824,8 +824,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; - sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; + rev = "3584c326a93a994cd329cd7d15d627d9375b678b"; + sha256 = "0j123j6gmbgkk58k188wa3dm68dmdvs67b1awhwfx0jkdfdkx61h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1552,12 +1552,12 @@ alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; - version = "20180107.1311"; + version = "20180113.1316"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "418e23d9ab85deeaa4818f8dc72e27061687b3e3"; - sha256 = "1b1rsnm85haq04p4189vg2hxff8ncrjv8xmmiwr527ipq7wmd4wf"; + rev = "b30158d5d9e43318fa0e4a211d81fe4b2495c027"; + sha256 = "0hylvk7ivibm8l6y21v88j1gfv8mwggdcbgw6gb4rz5ws6n0jdxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -1720,12 +1720,12 @@ amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "20161124.550"; + version = "20180111.602"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "11e27444692bbf0eb38ec28af6bd041618c5c091"; - sha256 = "1qcag5sjg2p64lllgy237j8gkm7vp2kxr6wppkps5wgkf7bn4q4z"; + rev = "01fd19e0d635ccaf8e812364d8720733f2e84126"; + sha256 = "040g07k2hcwqspansjqfpng0lxzkmip26ipz26q6mvkpwm2wilv4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -1771,12 +1771,12 @@ ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ample-theme"; - version = "20161213.912"; + version = "20180115.627"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "ample-theme"; - rev = "8fbae3a9965f933c487f4cfdf2d881753d9feeb1"; - sha256 = "0knzfxdncb1x41zqknv70p62zwr4k5nxf8l108x9w043drxc10lw"; + rev = "64845a6b67627e897dd42d8302c25c03ddce2aee"; + sha256 = "0fb5pq5242xqss02si4nlwgy073kpvf909avwdngvyg6apyk66p2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme"; @@ -2505,12 +2505,12 @@ apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apiwrap"; - version = "20171202.1653"; + version = "20180111.2112"; src = fetchFromGitHub { owner = "vermiculus"; repo = "apiwrap.el"; - rev = "5363671b6a8fe8ecd4674497664974e089b2b035"; - sha256 = "04a4v6vpzmhj3g4mqr2fsq47k8spi8c7v4pbzkdz9si097dskvrg"; + rev = "7935275ee45f0359d887b8563ffd1d002f0c618e"; + sha256 = "1p6sj46135dh7fgpzrfzsp5zkmx5si5lndwc7pnk30fbz5pindsw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap"; @@ -2966,12 +2966,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20171217.2049"; + version = "20180112.609"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "d5b785ba6118110a9404a7f65429a954ae820d69"; - sha256 = "1a0ayw7jhbw3im5frs0rycl1ya18lbfslcr4xqsgs4kvczar4rzx"; + rev = "273661ca30517e189e7d62233ba5ad1359a2a810"; + sha256 = "0mk2pf5vq353l2zjh18sabx1yd8fp8sdvx6b5k3a7hdq5x6ddwn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -3155,12 +3155,12 @@ auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "20171213.756"; + version = "20180111.436"; src = fetchFromGitHub { owner = "emacscollective"; repo = "auto-compile"; - rev = "694b92ea58feb30a0104ccf2424fd921235ba517"; - sha256 = "1im7z4sf4zxv97dcwviv7rzlc8ff5ibx8lhqmvhm8kxc0jf84iid"; + rev = "8d117868a0a091389d528428136e60f951e9c550"; + sha256 = "1qkw8qzhqzk16kvk1200ha10gi6ny0saqvyqm6b1ww0iw3q1ic5c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile"; @@ -4295,12 +4295,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20171212.1621"; + version = "20180114.1149"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "3b0bb640572825873754276f699b18765c7e5172"; - sha256 = "14pyf9aw8qbc1367j32yl8hn9lxs9027cxsxw510x9qa8ffrmi7n"; + rev = "3492ce6613e974a329c8773e09a615c28b48aa10"; + sha256 = "140yxkg1gnfhmsw6pira2p0nq2ll1x8swi9rlngraxshldf0c6zv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4990,8 +4990,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5a50f6703140992723a434b9a733644bfab15306"; - sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f"; + rev = "05a4033b830bf52c596ceedea10b2cbd91f85fdb"; + sha256 = "1y8slvsmlgfriaa6svanyypv0qq5hq8gbyfzsxif4wbr9hcyfikf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/bind-chord"; @@ -5011,8 +5011,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5a50f6703140992723a434b9a733644bfab15306"; - sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f"; + rev = "05a4033b830bf52c596ceedea10b2cbd91f85fdb"; + sha256 = "1y8slvsmlgfriaa6svanyypv0qq5hq8gbyfzsxif4wbr9hcyfikf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5385,12 +5385,12 @@ bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bog"; - version = "20161109.1647"; + version = "20180113.759"; src = fetchFromGitHub { owner = "kyleam"; repo = "bog"; - rev = "88f69fe61955d655b774427ca95ce359f52d5e21"; - sha256 = "1br1li9ffxynqm8v5ayfl6pb36di0syplxfjs9x64gsq0y4fbcng"; + rev = "6ed4d3edbe771e586d873b826330f3ef23aa1611"; + sha256 = "0s4jwlaq3mqyzkyg3x4nh4nx7vw825jhz7ggakay7a2cfvpa4i2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog"; @@ -5508,6 +5508,27 @@ license = lib.licenses.free; }; }) {}; + borg = callPackage ({ dash, emacs, epkg, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "borg"; + version = "20180115.428"; + src = fetchFromGitHub { + owner = "emacscollective"; + repo = "borg"; + rev = "362ae8aebc69aab81e04427d221717dd6bc1a81d"; + sha256 = "0mj841vjrwrfsvpvlcwcdj6zm6ia87qsinv16gcjj93rkhlpdxwg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/878ab90d444f3a1fd2c9f9068ca7b477e218f1da/recipes/borg"; + sha256 = "0gn4hf7hn190gl0kg59nr6jzjnb39c0hy9b3brrsfld9hyxga9jr"; + name = "borg"; + }; + packageRequires = [ dash emacs epkg magit ]; + meta = { + homepage = "https://melpa.org/#/borg"; + license = lib.licenses.free; + }; + }) {}; borland-blue-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "borland-blue-theme"; @@ -6690,8 +6711,8 @@ src = fetchFromGitHub { owner = "ocaml"; repo = "ocaml"; - rev = "cc539b70ff27afa241936aacc88983d63474e770"; - sha256 = "0nwmbsa9gy5qpmy45qn4ihawrbg6avbancbg0va5dcfbjavp1wz2"; + rev = "150f8d2e39be9ba3dba5db1389be533387b4111f"; + sha256 = "01888dr85jcnr1rh6rxsvw61n2bkv03va3hg5gxil44dqkkyd49x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; @@ -7084,12 +7105,12 @@ centered-cursor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "centered-cursor-mode"; - version = "20170830.948"; + version = "20180112.755"; src = fetchFromGitHub { owner = "andre-r"; repo = "centered-cursor-mode.el"; - rev = "670af669b6871d4447e11710d1d39a4d5fcd4b17"; - sha256 = "1vihsd0kp6skad7j5y5is5c7qiisz9myspsxsi86i7x8vrhmsvc3"; + rev = "319636448ffb7dba5fade3b2599ed9c1fd3bf8c8"; + sha256 = "1fib5db8rjyjrr86nw1jvf30pz2zva0v21khyz7fkh2nkf8b3a7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a7a28caba49a20413dec3c3d0cc9c36b859834d/recipes/centered-cursor-mode"; @@ -7193,8 +7214,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "388f399536b757722886b777084e22ddad4eb451"; - sha256 = "0qaxgqrgj9dpgv1d9k9a66lqpclrs22pcyppgl2m71fkqzm09ip4"; + rev = "23cd431ad02e9b56f90346fee4e4fed3d1a31ee2"; + sha256 = "1mq7zfbc7bwr2c58rd7d4sv1vx1vw39mw8vkdshrqqvr1v9dj1f0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7756,12 +7777,12 @@ chruby = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chruby"; - version = "20170509.700"; + version = "20180114.852"; src = fetchFromGitHub { owner = "plexus"; repo = "chruby.el"; - rev = "3eddd2f5fc2ac979b496394c74e4aee436b64a28"; - sha256 = "15fihl38fa3jzn4r0abjpkqzibsrn0pnlvab6xba0ffr4sv4m0y2"; + rev = "42bc6d521f832eca8e2ba210f30d03ad5529788f"; + sha256 = "06pvjw40qk017py9km26vjrh90acycnkr5r04nxf664qqkjlg2mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1989a3c6fa4cd7aaf6b0b202f197eb7db51936b9/recipes/chruby"; @@ -7777,12 +7798,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20180107.2236"; + version = "20180115.7"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "4fe3a30cf45ee8af911a80b78e6d4d05c42d0f32"; - sha256 = "0z6q2h9nis72sydj1ky37v6g1klchzd04w7ykin0rpm2c0mvbigr"; + rev = "32c25bee573dbec429e6df25357c8b526e2708fa"; + sha256 = "1kn8il4jsz3mp1cizfmjzwyr59jj4jw3layl372i1v2p29627kn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8461,12 +8482,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20171103.1150"; + version = "20180114.911"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "118c19700c904ae6a45fb409ca795bb93ff8dbd8"; - sha256 = "0kdk94ffrw27fz8ycka7a24hj3p3w09rhq3ppga7dwgsxqjfjb5l"; + rev = "9bbc8d59b3b4dfe3f0564f0d06832a309b4e4e4e"; + sha256 = "0brwcxlz337bd1y1vjlix2aq6qjzqqrl0g9hag5lmpkimnbbnbv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8482,12 +8503,12 @@ clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode-extra-font-locking"; - version = "20171102.1020"; + version = "20180114.911"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "118c19700c904ae6a45fb409ca795bb93ff8dbd8"; - sha256 = "0kdk94ffrw27fz8ycka7a24hj3p3w09rhq3ppga7dwgsxqjfjb5l"; + rev = "9bbc8d59b3b4dfe3f0564f0d06832a309b4e4e4e"; + sha256 = "0brwcxlz337bd1y1vjlix2aq6qjzqqrl0g9hag5lmpkimnbbnbv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8545,12 +8566,12 @@ clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, simple-httpd }: melpaBuild { pname = "clomacs"; - version = "20180101.1354"; + version = "20180113.1550"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "20706c65f218dd0671b0331f35bd8965e443062a"; - sha256 = "1mkn5y2mgdxv6njhy1njbpigzhx3x2hb618fzcd54yxn59mb5r47"; + rev = "38240d15e4929a3c9f3788815f9743a855926812"; + sha256 = "0vql6hcraa6y6njxz62kwwfnkhl8l2gjs52bvpgsrgrkq471w48h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -8717,8 +8738,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "2c089d80de3945e4f08f13557d59e04cbc942a60"; - sha256 = "01164wd8p0wwabnynsqv34pz53ji1s3k7nb0ff51i616q6095rdx"; + rev = "675adaa4a4c5348049324d8cabe0cdde7a3d0ef0"; + sha256 = "02szks3ymhiw4k7imryn06k1c0hp4alrxw0gvzc2dnsn5j4vzlvp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9175,12 +9196,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20171202.1759"; + version = "20180114.2348"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "e3e051f88734593d4b7b92f157e618ebfe63693b"; - sha256 = "1nh26v8vk7g5rkqbklan2ai4i4lx3bdn03pch84xyn3drpq40rb3"; + rev = "dd60e9929a0e1819457eeb4a7934864a31a0266a"; + sha256 = "0ljzgiy9pdzr9b64zfxkxrs84d82iiwvykg6wq19mzgd7gpd3g63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -10012,8 +10033,8 @@ src = fetchFromGitHub { owner = "hotpxl"; repo = "company-irony-c-headers"; - rev = "5bbd427a2d3d4445e3413f7516def9aa80543b2a"; - sha256 = "172wf0ywbvqn9smwnh4kgxx8gw9g2f76irg3fmcv4d8d53mi08wa"; + rev = "72c386aeb079fb261d9ec02e39211272f76bbd97"; + sha256 = "1f462v8xq2hdsr4ks4i79icpfz6fjpb4q7khnx6si55agxj3rvaq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f9f62d8ef438a9ba4872bd7731768eddc5905de/recipes/company-irony-c-headers"; @@ -10071,12 +10092,12 @@ company-lsp = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }: melpaBuild { pname = "company-lsp"; - version = "20180102.1535"; + version = "20180108.2225"; src = fetchFromGitHub { owner = "tigersoldier"; repo = "company-lsp"; - rev = "678d5e8f1ad76e7bd9e5bf93ed6813f54e769773"; - sha256 = "1yqcikpgnnqg986zyy23jifq40pspdhrhhz825vp92g1k724gj86"; + rev = "f790850035c38a19a153cd5babca1ff778432cbc"; + sha256 = "12d4ajk1lz3r92smg69yfn1nj8g08jjddg4zfjzxvswvgnyk2ka7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp"; @@ -10201,8 +10222,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "519b5cd886f484693fd69b226e307d56137b321b"; - sha256 = "1pig5kang3yvzzahgn8rfpy3gvpfz7myvf7ic0yc6rivvbl03k18"; + rev = "b9f455d863d3e92fcf32eaa722447c6d62ee1297"; + sha256 = "1mwx61yxsxzd9d6jas61rsc68vc7mrlzkxxyyzcq21qvikadigrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10354,8 +10375,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; - sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; + rev = "3584c326a93a994cd329cd7d15d627d9375b678b"; + sha256 = "0j123j6gmbgkk58k188wa3dm68dmdvs67b1awhwfx0jkdfdkx61h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10581,12 +10602,12 @@ composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-runtime, request, s, seq }: melpaBuild { pname = "composer"; - version = "20171227.421"; + version = "20180111.942"; src = fetchFromGitHub { owner = "emacs-php"; repo = "composer.el"; - rev = "e6ef820c7f7f221881d185e59943a7ec4fbc484a"; - sha256 = "0cdx17gpcyx8azannk8wiy62fzyf9r9niavr83axsapdidcyrl8i"; + rev = "e34ebe795d267e28965c85bd84cbb16b18165bd8"; + sha256 = "1vqjraldl2an10q1w91l7rx66mpsvqvjgg3j1k7xcvw07570aabl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer"; @@ -10980,12 +11001,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20180106.127"; + version = "20180114.1336"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2"; - sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv"; + rev = "80a51e0cac4f0554b0008674f49c664ebaded7b4"; + sha256 = "1n5fv39bpk4wpf1ar1f7h7g37jhnadi7kdp4i74j2awn5qhmz8hl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11526,12 +11547,12 @@ crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "crux"; - version = "20171230.1100"; + version = "20180113.251"; src = fetchFromGitHub { owner = "bbatsov"; repo = "crux"; - rev = "6c02dab04fadd8ffb96dc513467e443b0549d1d3"; - sha256 = "08yv469k3rvnxnqrj7iwywq974z9lp0szkrgxlxxfap03wv59f66"; + rev = "3e07035660f953cb08847362378267f5859bbe69"; + sha256 = "07l49l5fb7sv2ncvakr7nq616vw6nwrpl9czvqi46dnwvcdpjaxl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux"; @@ -11652,12 +11673,12 @@ csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: melpaBuild { pname = "csound-mode"; - version = "20180106.1819"; + version = "20180112.1056"; src = fetchFromGitHub { owner = "hlolli"; repo = "csound-mode"; - rev = "3af632652c33e733e0da598f1254f8fcc50fe5b6"; - sha256 = "11xmc3kqn0i702lc103h49yya70fhyib8qi4b15slpnliqx2q8f4"; + rev = "5d16d2ea42dd4c8a4ead75d4fd4f89c3a8c9a4ff"; + sha256 = "1dx8vigch38rax5xycb7hhn6i7xq19fm1nqvh61l80k7v8zv6vfm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; @@ -11866,8 +11887,8 @@ src = fetchFromGitHub { owner = "cubicle-model-checker"; repo = "cubicle"; - rev = "9d108b900e0123236b4991c2d06b5061f34feee8"; - sha256 = "1n3x6m19swkq07zah4hh0ni6gx864bq1w0km06nq33x8189zczrr"; + rev = "b043b0247bf9b144a5c3360e5096a4b141dd1fb6"; + sha256 = "0zsfz1h68xpbgdb1ln8l081vwrgd7i01ap4rjlyrsk8j3q3ry5wz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode"; @@ -12097,8 +12118,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "5b6497c8329c778c97f6f59f3f358304bc1ebd1e"; - sha256 = "07wwv24zcpxbdjf3mrx2ax4ji70kz1s2llisycfkv8lpfnw96yc9"; + rev = "f9d1114696ff3a6eda20b64b3604d5839d64d3d4"; + sha256 = "0sz0hmmic0wq6rvpakinyshkpzgv1yiqrgx2rsjnwf4ccyxibkj2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12261,12 +12282,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20180107.1329"; + version = "20180115.709"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "f597233a765b80660c6332b5565c7d651e378acc"; - sha256 = "1jjdr1h0hihwh3jabxyy4dq4l6z7w4lhrlmyb6xsxkqss7xsb74c"; + rev = "2ddf94defd23189ae2435a27824900cb56e0e511"; + sha256 = "1qzi5h0qnjp6rkr2r09r31zlfq12rlj2zim8ss2lv6hwx8zsvq3p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -12555,12 +12576,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "20180101.2352"; + version = "20180110.1153"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "7b514b2c4895034b645cb2028220a411882e3b0e"; - sha256 = "0wrlj4nvqr6qcdap0wa6f1pjf77mnyrw820249qb2flb2j4xbd7x"; + rev = "e3fc28a6d3626c8cae9eb2e448b2f2e6b1a98f52"; + sha256 = "0kfdx5za610v3s8hmvy39gqn5w6xc8yljz6ybxzbg09byjinhxmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; @@ -12975,12 +12996,12 @@ deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deft"; - version = "20171031.530"; + version = "20180112.1155"; src = fetchFromGitHub { owner = "jrblevin"; repo = "deft"; - rev = "c7413a390ac22331ad5226a8c8c007bd08759bc8"; - sha256 = "1rdjffw8vw71ay93zlr2klbr8q4q1sjnw03gsfdyll1q4idbarg1"; + rev = "c4b30d780bfa732ff52d85f0311e4a045f44a7b4"; + sha256 = "0z7cilgiz6krvl5h2z72hkch43qxmypb0k6p5vxn5lx1p6v0mrf2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft"; @@ -13436,12 +13457,12 @@ dimmer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dimmer"; - version = "20180104.2127"; + version = "20180114.1924"; src = fetchFromGitHub { owner = "gonewest818"; repo = "dimmer.el"; - rev = "f2e9a383cf03597bde9bcd3fa2e7ecb4ca266041"; - sha256 = "14nmk6kld5q6wd6z3r8v938gyi1x6875i0fbfbmfs5v1hykdm2s5"; + rev = "0c92663e476413dafd6eb231e19c351bcc195cae"; + sha256 = "07988a5jsvchrnra5smdaqirw7jc0nr6bih596r1dydib1rzypbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae80e9202d69ed3214325dd15c4b2f114263954/recipes/dimmer"; @@ -14955,12 +14976,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20180105.1142"; + version = "20180108.1934"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "464774515c348ad32bad4b062d768d443f44beaf"; - sha256 = "17pszvr2i27drym63j4hkmdhra5j6ixv5i2ab5b8i8049fbrnqzf"; + rev = "d74fb168948c2b0142a2ae9cb6180d7c67b137eb"; + sha256 = "0pra1kq4z2cmkgm278dw9nxza2sw056hh2463f28crdw6scdim3d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -15459,12 +15480,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20180107.2324"; + version = "20180109.1318"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "2e87dc528cfdde9b8e13bb7dcadc12f482bf98fa"; - sha256 = "1jl2mg3w2xj7njdvldilav0drgvr15ddx0bq8jkgxa9l0k718dl7"; + rev = "a2bcfd357e16b3404cd0e210fedbc9a584da83b8"; + sha256 = "1pqwra01w7wga9jrhafbnnlbn5rh31a0j84ffzsdpkcmac4xk0gy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -15920,12 +15941,12 @@ easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-jekyll"; - version = "20180103.1726"; + version = "20180108.559"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-jekyll"; - rev = "4a529ce42a720960f2594b7081359c8766fc2643"; - sha256 = "1gr72wqs620i56cchblwgsca9wd0fxxcz750fpp594j7xcxn9scl"; + rev = "9a66d5c5dddac7d5b924df0c3bb414d3f797d8a5"; + sha256 = "0qx6lgpg2szjgy1a3a856klm7vh544braq8v2s7f81lq0ks2bjhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; @@ -16046,12 +16067,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20171110.1"; + version = "20180111.30"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "ab9596e03b749785919857f9785dc37c3c5dfc4e"; - sha256 = "0xn1dna7bwk5m144z53lpv0fxh5mg42gk8a7mgfz9d6yj890k33w"; + rev = "8c4735fbd7864a8420a16378ac2240fa60af5332"; + sha256 = "0g6prr8512dkr4mizqy1jkqc60w88i7kcx1lbarqi2mfkqdhhvg6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -17246,12 +17267,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20171229.304"; + version = "20180114.1000"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "e414534bd0a4149919647beec8fe4e342d2d1219"; - sha256 = "0ahxxjlfpr2zj3sbiz9xyb422pld8xhzzj5nkzxyfksbnbvms5hd"; + rev = "63661980cef82a8032108f5ce14d5bd4f44d1255"; + sha256 = "1wanfvhx3wv3iych0v93kaxapg86vzgbsd8l7r460s8l2nl5yybr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -17330,12 +17351,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20180107.1156"; + version = "20180109.1604"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "138fd5661ac07b19525de7750177b1f0d2054006"; - sha256 = "1wknh0ns0cqbqygyn7xr1drb7zq1c02r10ap1spsazkbsq5nhdwd"; + rev = "e99f232fb3400545f096a19688a5030d0ed3afa6"; + sha256 = "0gga3nbpl1n5rbm87p030sidp38yq3hm9pwr0vavz75m1bcdbv3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17425,8 +17446,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "138fd5661ac07b19525de7750177b1f0d2054006"; - sha256 = "1wknh0ns0cqbqygyn7xr1drb7zq1c02r10ap1spsazkbsq5nhdwd"; + rev = "e99f232fb3400545f096a19688a5030d0ed3afa6"; + sha256 = "0gga3nbpl1n5rbm87p030sidp38yq3hm9pwr0vavz75m1bcdbv3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17544,22 +17565,22 @@ license = lib.licenses.free; }; }) {}; - elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: + elisp-refs = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "elisp-refs"; - version = "20171224.1532"; + version = "20180111.1431"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "d0a63ae9e564f082c904c02fa5123f3a557886c6"; - sha256 = "1h1jr72nxsjpshqp725dh4wcsahr9hkj6y3zc99m8lilndm3x114"; + rev = "eee751a6120f925cdffcfbb6a4545e599b953e94"; + sha256 = "01gckl8fwmwr5kp1qy4dcmvm7dh4677brwjy4xpqwhiq094fw9b1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; sha256 = "16h7dccmzvmap3knnwhjq79wm82xm3whria70vq5msl2y252f6cx"; name = "elisp-refs"; }; - packageRequires = [ dash f list-utils loop s ]; + packageRequires = [ dash loop s ]; meta = { homepage = "https://melpa.org/#/elisp-refs"; license = lib.licenses.free; @@ -17652,12 +17673,12 @@ elm-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "elm-mode"; - version = "20171114.1225"; + version = "20180114.9"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "a01626ce462fffc11af1f7e64f6d520e363157f9"; - sha256 = "0v2c7h7j5y9mjvgwi7ki5pz8w9d2xcvab6s5i21yb5a6lihm0gma"; + rev = "09c6e62e14a2c9afaad03a867c7a268b6bc68ab0"; + sha256 = "0vc0m5rg9py01w07pifg3fp2z9cna6y21k2xmfns7p6i5c5fjj2g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17862,12 +17883,12 @@ elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-mirror"; - version = "20171012.15"; + version = "20180113.2321"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "f4a84f71368dc343d09093312d1b2c2e9a5a3987"; - sha256 = "07j3bsv3vinpkxxbw4fyfgb5jb1kcd068821l59pk9yrw145kb96"; + rev = "a545e51c73baabdd42535c6064030fb018d38290"; + sha256 = "1bvhgi6msimhfgv9y6is0kbyrckb83qnf8z4q22gy3l83impql01"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -17883,12 +17904,12 @@ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20180107.1243"; + version = "20180113.339"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "e59e3d67b5a2053cb121d235bc51a0d6d438058a"; - sha256 = "1l3sr011cx8sclhw720iph9r03ja7fx3qcixpc65gmxy4r3ihjz0"; + rev = "db532f91d96bcd0371ea65bdfe22bd2696360b1d"; + sha256 = "04rv5f6pcnkqv07nrmq6fkcwsd145arp5b7p615bhcjc8q20d3g5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -18122,12 +18143,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20170805.449"; + version = "20180114.707"; src = fetchFromGitHub { owner = "emacscollective"; repo = "elx"; - rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5"; - sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh"; + rev = "127fd4fca8ac6470cfda62f47bb1c29859862cfc"; + sha256 = "0j7j7wh89a34scilw11pbdb86nf515ig38pjkwyarfvj93gigc04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx"; @@ -18517,6 +18538,27 @@ license = lib.licenses.free; }; }) {}; + emms-bilibili = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "emms-bilibili"; + version = "20180102.2018"; + src = fetchFromGitHub { + owner = "0xDEATHCODE"; + repo = "emms-bilibili"; + rev = "294bca3dfc42fe3a55fb326ab39bc0fcfc8c5090"; + sha256 = "0q8z3q1agwgb3d0kpvac7a98p3q4ljjnv404cf9kihjjfxvh4vm5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/533f96d1e68eda20b2d2e7f8eb3e7fa118904970/recipes/emms-bilibili"; + sha256 = "1mx3fn2x526np8awjn0ydsqh59b4aznf3sig410fbr6wk6pa6y47"; + name = "emms-bilibili"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/emms-bilibili"; + license = lib.licenses.free; + }; + }) {}; emms-info-mediainfo = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-info-mediainfo"; @@ -19128,12 +19170,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20171220.1658"; + version = "20180112.457"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "71ce3ffd41bdc90c649a044ddbee0b32b329c612"; - sha256 = "0wfhhmv92ymq43h26bn0f7vjbmp9wisl76mqaydqir33a13y3a55"; + rev = "c8ab0e5e1fda70113633ac6ee01c0aaecd8a1a99"; + sha256 = "0kf1gcyfmh7zids4q2jwz6b0kffdhalfqx9ibk11adla8sf6bvj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19698,8 +19740,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "68a0f569410f7375c44a9d806930b1172c1d92a8"; - sha256 = "0vbrnca9rfncgyz95505mmg25wl95dab5djjw5nffd627sxgnj2q"; + rev = "fd30cdac0f62c70336330d94ac944bb110932cc2"; + sha256 = "1s48r5s5bc3lzngpfi9zpifd8nrzi4g654i2crz7ldjv0aiipdms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -20134,12 +20176,12 @@ eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-prompt-extras"; - version = "20171020.2207"; + version = "20180109.2234"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "eshell-prompt-extras"; - rev = "9b1a49853909c4fae95d32bb9a68cace471c161e"; - sha256 = "03sr68mfi52ajqb6d9k3lpcrapjkqx9yynpfwin9y2328pmriaib"; + rev = "1d8825dcc005b488c6366d0b3015fc6686194eea"; + sha256 = "1nqzd24wwvyzf3bn7m7vd4xqmj4p8z51h8cnli07yja17cr5gwx6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras"; @@ -20323,12 +20365,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20171204.1404"; + version = "20180114.632"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "8a5cefe1bfec7c76d03332c4f6dfc224ad4bc61b"; - sha256 = "1p0j7s1vz184l4100gri8x8g453x43k5fmfp3pkvlgifny1vf26a"; + rev = "157a3a911200eec217b439b82495eb4759756206"; + sha256 = "0ljirg9zbhq0cvyl5z635j7v6l5bp35bj8cfhzlrq4wiblfmh1ay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20684,8 +20726,8 @@ src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "d5e3a83a5783fb0317efbe349bb6a03e65011506"; - sha256 = "0bra0cp1ncnxndkc317ighm396f526hbrfzx542yfpfq74s51qj5"; + rev = "49d6167d6bb97454afe1d06a5324483682de8ab6"; + sha256 = "0l3hmmkys3fw5yxs4kmjx5nrbjh9w19d0bfkryhbxhc5xszydvzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -20827,12 +20869,12 @@ evil-collection = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-collection"; - version = "20180106.1137"; + version = "20180115.156"; src = fetchFromGitHub { owner = "jojojames"; repo = "evil-collection"; - rev = "1e448e5a426e5c03b8da5f0a203eaa4c681833c6"; - sha256 = "05b70vn46s05ag0s27wagpaznvas3n68hwl03sz84n8d48ix7i59"; + rev = "9d2f38130fd6a36dd6548d68b88a63edc0ddb1d4"; + sha256 = "0wdw4i20i3qi9xsbkdk9jvvkg92g41h2nrkx1z3ykw2cgikm6vq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7538c9eb00b6826867891b037e7aa537ac5b160/recipes/evil-collection"; @@ -20890,12 +20932,12 @@ evil-easymotion = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-easymotion"; - version = "20180102.2115"; + version = "20180113.2254"; src = fetchFromGitHub { owner = "PythonNut"; repo = "evil-easymotion"; - rev = "07e1c88b2ea9962e837f97b57dbf3c5bab22662e"; - sha256 = "1j3z7j2g3vsylaykinvbm47c2z8gr172qc6zdfpgzz0hskklkszy"; + rev = "79c13ed3bce018ac09d358e642e5bd7025e93603"; + sha256 = "0496dnbciq8gbivihas1y58gwd4nbfz767rr98zpwgkz8l2jvy73"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e67955ead0b9d69acab40d66d4e0b821229d635c/recipes/evil-easymotion"; @@ -20999,8 +21041,8 @@ src = fetchFromGitHub { owner = "edkolev"; repo = "evil-expat"; - rev = "152fdfacea2847d438cdd4e83779fe5a57edfde2"; - sha256 = "15lmv74nd9z87q09pg8dqfr94kmxbzd6a30dnadz3xv3sfvaqkv4"; + rev = "ff443637fc514813ed3139d99950391189a9360a"; + sha256 = "1w1yj0avg54gl7a143ib3rszi0a6arrvcb3s8j5pjr4hs7sy9jbd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f08f6396e66479eb9510727968c5bb01ac239476/recipes/evil-expat"; @@ -21814,12 +21856,12 @@ evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-test-helpers"; - version = "20171122.1206"; + version = "20180109.1040"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "d5e3a83a5783fb0317efbe349bb6a03e65011506"; - sha256 = "0bra0cp1ncnxndkc317ighm396f526hbrfzx542yfpfq74s51qj5"; + rev = "49d6167d6bb97454afe1d06a5324483682de8ab6"; + sha256 = "0l3hmmkys3fw5yxs4kmjx5nrbjh9w19d0bfkryhbxhc5xszydvzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -22451,12 +22493,12 @@ f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "f3"; - version = "20171222.138"; + version = "20180109.2042"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "f3"; - rev = "632b2c44d6e0c8b4b069e3188a1ea42a403c1ad1"; - sha256 = "0nxibjpjifpb6v2k1s1rbci1gjdnls94gd404jfmj4996z4q1wr2"; + rev = "f896674c527f41fac8faea2ddeafb2757c7b9766"; + sha256 = "0w605iw5p4z8jzvzq0608jpcp0hdk9x48w1rvqz9hmjncsi3af8s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3"; @@ -23267,12 +23309,12 @@ fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fish-mode"; - version = "20170430.623"; + version = "20180114.445"; src = fetchFromGitHub { owner = "wwwjfy"; repo = "emacs-fish"; - rev = "888d037008272f6001207a2990e51ba87fe187e6"; - sha256 = "1r2clxm68nq8jhgc5cly51i6axjmi720r5m34dhf6zblwib4lfdp"; + rev = "cd0387f7f1d5c50e080091f86ca97d8a67d603a6"; + sha256 = "0q4cq1rkiz5mjxhp7p5awmw59q1yjb2sryc9i54cwhr5dwwqf95k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode"; @@ -23760,8 +23802,8 @@ src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "6bc54f00666d14197cb8685b42dbd49e19c82ec8"; - sha256 = "0wdmwiy9fd5lbxdp2iix3krb7ia0aly8n5bwxap1pmrl2anjzik9"; + rev = "4c2a09579d05453d1e21773165e8d4120d7990e3"; + sha256 = "0f2lp2jrxl5gx6ii9xfz7kz0n0q9x55xis2dylzpi19rgrqq8pyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -24239,12 +24281,12 @@ flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "20170816.648"; + version = "20180109.1512"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "5a2e65fbae90e1dd69cfa78e4af0bda25c7db973"; - sha256 = "1zh6yb5snjrp09zh24fip97pqq7vk472g8nmjjqk0iq8m9i8sphs"; + rev = "43c45859af448125dd48359dfd1259366c961ba0"; + sha256 = "118mm2khlrhlqw9074430vg78ixkb42f4xj7bcjl55yz5s01n3mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; @@ -24999,8 +25041,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; - sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; + rev = "3584c326a93a994cd329cd7d15d627d9375b678b"; + sha256 = "0j123j6gmbgkk58k188wa3dm68dmdvs67b1awhwfx0jkdfdkx61h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -26322,8 +26364,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "28d7339f2e70c617f2e8e3979b45d78883a27282"; - sha256 = "1ank29f64cwdg9faqz8fknaz0cn4jma18197n6q3fhb6mfl081hn"; + rev = "8925ea85143c4c91589213fbacb275e81968d76d"; + sha256 = "1f02idd8dw02q3ddr3p33xz3n3nhc33qv6fjsbz00pslw082gr8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast"; @@ -26591,12 +26633,12 @@ frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "frames-only-mode"; - version = "20180107.901"; + version = "20180114.1048"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "frames-only-mode"; - rev = "5351741363bb9b4d44ec62ae91cbc9f102cf09f5"; - sha256 = "1a8hz0wqxb14d3kkv91v1wawqllggz7245h4sv62291jmvvhdbb9"; + rev = "4dbc6871d8220cb95d287dd35475725a1b7662ab"; + sha256 = "19y23jdfp9i950vl8ahywfh6gkf8cmy0nd3fk931xkx0x5kp64h9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; @@ -26800,8 +26842,8 @@ src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "bf5e51b5c33d5bdd5658f7e8275850d11fc39ca8"; - sha256 = "1sgq8nq6jzgy8akxycvcmgqjaf424v7v9r41pk7r8lw57csrnz37"; + rev = "b6f2f8564308509fda48753c6159367706d32215"; + sha256 = "0skf6cdmwjfx2ap8f4izf6awdxpjmcg6lx0vn67cdjk67kamxh74"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -26926,8 +26968,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "7c726dd897420c9387b3117f11fa78806b66d715"; - sha256 = "0lrpn51ncix4f6cmzac4kymb8w2g3fr44z66xchggdflhys6bvp8"; + rev = "89476d6f2c6c3d1fb8eebdad4200320a1e4e06de"; + sha256 = "1qpbsfa43fsqczpvxkdpjpnsjmwrwqn77kxayq892wmc58z2wkxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -27148,6 +27190,27 @@ license = lib.licenses.free; }; }) {}; + gdscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gdscript-mode"; + version = "20180101.1426"; + src = fetchFromGitHub { + owner = "AdamBark"; + repo = "gdscript-mode"; + rev = "6a94583b36b87d30974cea754b42ff719b6d3b37"; + sha256 = "1cz6w9q3z7c729nff1gvwdzs7hlhi7daq8hql0w3pya4magi27pp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/52f99eafb2e80a7fa13a98add98b03a147f35e8b/recipes/gdscript-mode"; + sha256 = "0v4ab5xxpq1kya2is5qq61fmfgxgvbigyz7wp907z3mc00kg2818"; + name = "gdscript-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gdscript-mode"; + license = lib.licenses.free; + }; + }) {}; geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; @@ -27361,12 +27424,12 @@ gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }: melpaBuild { pname = "gh"; - version = "20171120.1302"; + version = "20180112.1110"; src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "b46dce307e90c3527bc9ed9532a06f29ecf3b085"; - sha256 = "01r8pyfjb6jpa1fi2n4wplymyk0gz2b60g0ngn5hlpirbzqyvy8y"; + rev = "519e8397fb223bb1071b726ed65c59a9ebd9fa48"; + sha256 = "0fz6f9g1r6lzwvnqmlnn4lr91nn2s59wrv9ajm9baxvivgr4x8w1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; @@ -27529,12 +27592,12 @@ ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "ghub"; - version = "20171223.916"; + version = "20180114.948"; src = fetchFromGitHub { owner = "magit"; repo = "ghub"; - rev = "1395d56496c1581dda0c70a091500e2b947b8d35"; - sha256 = "0p5vn34jln08y4hnywf2vxdcjcqmr043if4da0s3h2cawd7liw2i"; + rev = "2962611aad56a0f1586383b3e4ba6a65508a3991"; + sha256 = "1fj9942qd563wy7z97ylqc2xiwclg9qhfapwnabyi9m8pivwmwww"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; @@ -27550,12 +27613,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20171203.1627"; + version = "20180114.1758"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "4c4a1d009790a805404edf72ff55df6fce3645a7"; - sha256 = "1m0r6g2arzh87iha1kbqb327vv7wy3m9iafw9czp3655k0sx240h"; + rev = "8cfdaf42446a68e6aa4eb0655d43563407cb5636"; + sha256 = "0acfqf1219bnzyf64sv68fvpi4a13nc0wv8dz5a8h6r1j0ysx6qj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -27739,12 +27802,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20180107.1020"; + version = "20180108.603"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "53eeafcdcb12f9deb74548ffa5b17c397ad7def2"; - sha256 = "0pvwmbgmqdpy599nr6518yxzl5k8lkdi7a93v1dr7hcf3lg5ygpg"; + rev = "24ce90832ddff0db86581c1b7e947e83a13fe83e"; + sha256 = "0sxham9vg6m4j7f7p5ral56s4rzxfmy8an23zvq2n3832jsvvri1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -27974,8 +28037,8 @@ src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "7cb0d03bc370d3e734c8ee23b809a4e768b01743"; - sha256 = "11yjw08dp8m25psl27qfgk8c9m9v51rbiyq3lp0mp9mhr17wdp9d"; + rev = "92f8ad4afc802d01c24426ff52ad6fefb3bb91be"; + sha256 = "1ljgc7jmll3534zj1r72gh4al909slhiriscqv9lmvqzdiy3l21g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; @@ -28684,12 +28747,12 @@ gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnus-summary-ext"; - version = "20171231.549"; + version = "20180113.516"; src = fetchFromGitHub { owner = "vapniks"; repo = "gnus-summary-ext"; - rev = "b2259a2501f4e0c23b51aedf056b812c8140b958"; - sha256 = "1y4379wrd2y9jzbg2bhifwa03nbf84xzb4rhfih6xmh9h5gg4bi1"; + rev = "025fd853fe9280ae696a89ec2c2cac9befd010aa"; + sha256 = "07ww2nc03daz70f2ajw7b2gin22xa306001zclhrxkm1cpjif2fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca4a905b5f81991074c7d3e41d4422c7e6713d5/recipes/gnus-summary-ext"; @@ -29146,12 +29209,12 @@ go-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "go-snippets"; - version = "20170831.2302"; + version = "20180112.2211"; src = fetchFromGitHub { owner = "toumorokoshi"; repo = "go-snippets"; - rev = "7e38fc0ddf2cc786cdb273882ff9b3563abc3c7a"; - sha256 = "0dsbp0x8qmv2k649x7l264zc8cv08dlrxz09lv643fchm56rsljm"; + rev = "d437df148879566ffe7f2e503a3cf2602aa9fb28"; + sha256 = "0rs2yj9bh0snf13hfj9bvyawl16j8416naz6h52l21q72ymd4b0k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca9f3022e7f4d5391be394cd56f6db75c9cff3b6/recipes/go-snippets"; @@ -29188,12 +29251,12 @@ go-tag = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-tag"; - version = "20180106.2125"; + version = "20180110.713"; src = fetchFromGitHub { owner = "brantou"; repo = "emacs-go-tag"; - rev = "e7cfc490b728dad085ae3c741ef5220d5e88dacf"; - sha256 = "1zpj88kyvsnsxzwnmb2a0nlrgviskw6q31faw8y84q08iyp7d8gc"; + rev = "c04928bfd7ac571c831c1e5afe4cea6e009c3498"; + sha256 = "0433zy7fb1j15s74b8xsz0vl2z44613aimgv7r1y7bdlkgf7ma12"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc4cd3fd8fb0707912e205b9d71789ea8126c442/recipes/go-tag"; @@ -29230,12 +29293,12 @@ god-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "god-mode"; - version = "20171221.106"; + version = "20180114.1119"; src = fetchFromGitHub { owner = "chrisdone"; repo = "god-mode"; - rev = "8bc22eda77af3dc04d0e92e41b0776f61a8c90fe"; - sha256 = "1wg5hngpc16n1ds7yq6kqdf23q8r27v3ppcqcl4jdnx97h9fif99"; + rev = "d58f57b98ab13bbf4dc5775bdf456b2a57c41127"; + sha256 = "0x9f4rrfrz96kiwcnpgklw23bffxl7f14scck2vmp1wmkwzig7kb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2dff8dc08583048f9b7b4cb6d8f05a18dd4e8b42/recipes/god-mode"; @@ -29675,8 +29738,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "d70eca22cace05a6ed7a5787ecd660724d65d911"; - sha256 = "0rgvlvv8dbm47qcw9wxrdd85rxa1csysqiyrhql6gwd4a5iwrbp1"; + rev = "ea983f87a41cd624eb743413193b6dd4a8a70e32"; + sha256 = "1fy507si285mk9ix0l3l6dm1df466dn2xv9bxxjnn2xjyx10n1xa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29801,8 +29864,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "fb024c2ace201a3d8b869802276b8e6a581e8fc1"; - sha256 = "0iw6wwmi48b0q46pszb57s5wxfwkpgjcfbx6b7sk8n6j60sz0i87"; + rev = "186aae7d8b69f2679876c4606c1df3dd0e07403c"; + sha256 = "124abs1gpxmb76wilszrdkxk4hyszj9gc1x0hvwvn7i40shcr22k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -30184,12 +30247,12 @@ groovy-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20180105.215"; + version = "20180109.718"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "fb024c2ace201a3d8b869802276b8e6a581e8fc1"; - sha256 = "0iw6wwmi48b0q46pszb57s5wxfwkpgjcfbx6b7sk8n6j60sz0i87"; + rev = "186aae7d8b69f2679876c4606c1df3dd0e07403c"; + sha256 = "124abs1gpxmb76wilszrdkxk4hyszj9gc1x0hvwvn7i40shcr22k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -31169,12 +31232,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20180108.414"; + version = "20180114.2330"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "455ef14604064296b5e382b044d4775814d89eaa"; - sha256 = "07kplf1a4zkyczq9mv5kilbj8lf1bv1khwwnzmxn1yd9dgzyfcnf"; + rev = "43569379167f4cce6d7ab3f6b490135054de2c39"; + sha256 = "10wwm5d9s6h9lq365gbg7hj4j21k7z4k1dspzy7ir546gmj7n4ki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -31400,12 +31463,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20171213.317"; + version = "20180110.1209"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "84863a37695b786c6c6980a589f8ea282c385ab2"; - sha256 = "0nh0n17mnrf9qf68mxcxclci1qmqal1li827a1qia3fkjry4vqxk"; + rev = "adf0e363ef1a1feaa1c83ef7f16a7d6c408b62ce"; + sha256 = "0jj2qgia2sf4954g56ldgx1wf734qzqhxjy31m06xanvsmamyl6i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -31799,12 +31862,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20180108.514"; + version = "20180113.40"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "455ef14604064296b5e382b044d4775814d89eaa"; - sha256 = "07kplf1a4zkyczq9mv5kilbj8lf1bv1khwwnzmxn1yd9dgzyfcnf"; + rev = "43569379167f4cce6d7ab3f6b490135054de2c39"; + sha256 = "10wwm5d9s6h9lq365gbg7hj4j21k7z4k1dspzy7ir546gmj7n4ki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -32951,22 +33014,22 @@ license = lib.licenses.free; }; }) {}; - helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-lastpass"; - version = "20170914.142"; + version = "20180114.937"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-lastpass"; - rev = "ae5d1252d60450082a5c26af3ad2be43994201ec"; - sha256 = "0qlcy8g9m3mfnr6p7kax6i1bq0dsxpz22vy5zjp24farx96mj5mi"; + rev = "65ac0a80b5908b43ecd6a89c17f22f5c9c6734b0"; + sha256 = "18ncb6lnw06amwr1avh53gqifwg0wpwf2849z2k781dls3n5j4hr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass"; sha256 = "0zgq3szds5l3ah39wiacqcc1j0dlbhwm0cjx64j28jx93300kx57"; name = "helm-lastpass"; }; - packageRequires = [ csv emacs helm-core ]; + packageRequires = [ csv emacs helm ]; meta = { homepage = "https://melpa.org/#/helm-lastpass"; license = lib.licenses.free; @@ -33269,12 +33332,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20171202.1216"; + version = "20180115.137"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "94cb602d6373229c88126a5888f03f4b538f0771"; - sha256 = "0jf6dc461ki21w4s5hxj5mx57y3jilxxgd2sc11cv5ilh4x0776v"; + rev = "cd875b796e1a5d36ca99dede653a8e315a00029a"; + sha256 = "004sxd3v414ac7d85jkfq36nbicyr153gias0rbmlykv660xf5dy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -33756,8 +33819,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; - sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; + rev = "3584c326a93a994cd329cd7d15d627d9375b678b"; + sha256 = "0j123j6gmbgkk58k188wa3dm68dmdvs67b1awhwfx0jkdfdkx61h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -34298,12 +34361,12 @@ helpful = callPackage ({ dash, dash-functional, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "helpful"; - version = "20180107.728"; + version = "20180111.1504"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "04073c80f3c82fa488edcd0cffa4961ff40cf885"; - sha256 = "1cv7ajqrb0mqqlbv1b34ccj4k2qpi3bv217fkh580l8y6g2lcdk6"; + rev = "5746e9dbe486c75fe4904575f9663c2da455013e"; + sha256 = "1any3ikbr8q1i5shwiwmal2d2i3bcnlkjfhq56xaxcm5rx2k1ss2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -34973,8 +35036,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "cba1110ca413a41a443b8368d63d295d7d36de7a"; - sha256 = "020dj6q483b7fabspgvnjqw0rhrgj3q1ncdcpafmyn1fgip5y0zq"; + rev = "6f6db40cca1b759f78d7e4b971111e40833c3aa0"; + sha256 = "05xlk8pq19vh61cvpbp6156pd5ynnp8zqnj09j0hp8k6kd3wq62z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -35828,12 +35891,12 @@ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20171202.1141"; + version = "20180111.2238"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "3220f00a9bdb24667a1c3876b4a2f889dcb77501"; - sha256 = "06aw6l8nn8w6a7dfwh9ifs41acyq0jycszhhisv0idqrs8q5njsv"; + rev = "c2a86c9d5e763723abb52a603614bfa39d2ddde4"; + sha256 = "11pf65616hrzfglmwgiwc4ar866hdz1f3zbfraiqigm0fczmm5fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -35973,12 +36036,12 @@ ialign = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ialign"; - version = "20180107.305"; + version = "20180112.757"; src = fetchFromGitHub { owner = "mkcms"; repo = "interactive-align"; - rev = "df591e452f9a56c69fb69de961baa75751bae3d8"; - sha256 = "1k3c0wxbn6yrd75275ny66avp70qpd3glnmagsgq3x8mbyxh233d"; + rev = "f022c86d566a4b0b4ffdc5c8c75a4a7b9468fa71"; + sha256 = "087rjk26pfa29igq3cbp48yaxlm4xqz62svszbdb1hjfip5y453a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/072f1f7ce17e2972863bce10af9c52b3c6502eab/recipes/ialign"; @@ -37251,12 +37314,12 @@ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "indium"; - version = "20171213.236"; + version = "20180108.728"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "4769ab443e153a19c9d40522e5f40656b0ef4385"; - sha256 = "13rii0vnh9d981jklb6apilx8yhqyc69fxp095f7i4n0aimfa413"; + rev = "2b1ff2742c9b443529524d293c327817733b8d92"; + sha256 = "1zrfxn1k5npiqz9x2x30sxkxdni5d0dilps6131348lmf1lhli51"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; @@ -38363,12 +38426,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20180104.1212"; + version = "20180112.958"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2"; - sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv"; + rev = "80a51e0cac4f0554b0008674f49c664ebaded7b4"; + sha256 = "1n5fv39bpk4wpf1ar1f7h7g37jhnadi7kdp4i74j2awn5qhmz8hl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -38384,12 +38447,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20171213.317"; + version = "20180110.1209"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "84863a37695b786c6c6980a589f8ea282c385ab2"; - sha256 = "0nh0n17mnrf9qf68mxcxclci1qmqal1li827a1qia3fkjry4vqxk"; + rev = "adf0e363ef1a1feaa1c83ef7f16a7d6c408b62ce"; + sha256 = "0jj2qgia2sf4954g56ldgx1wf734qzqhxjy31m06xanvsmamyl6i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -38514,8 +38577,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2"; - sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv"; + rev = "80a51e0cac4f0554b0008674f49c664ebaded7b4"; + sha256 = "1n5fv39bpk4wpf1ar1f7h7g37jhnadi7kdp4i74j2awn5qhmz8hl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -38615,12 +38678,12 @@ ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-rich"; - version = "20180107.1736"; + version = "20180109.1933"; src = fetchFromGitHub { owner = "yevgnen"; repo = "ivy-rich"; - rev = "a87d37430afb4cfe1bfff8f65acf3197ca8e0fe9"; - sha256 = "15vshxg2yv2fy1s78xh7gns3lgk50x40y7kw3qvlsdrkfrwbkfdv"; + rev = "efe35d2f579202ca14a90cfd46ecac624109558c"; + sha256 = "1vsgz2qg8mxd3lw590zzy9zn72lcvmrixp8j9h65gjqqdwz7xzwn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; @@ -38640,8 +38703,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; - sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; + rev = "3584c326a93a994cd329cd7d15d627d9375b678b"; + sha256 = "0j123j6gmbgkk58k188wa3dm68dmdvs67b1awhwfx0jkdfdkx61h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -39201,12 +39264,12 @@ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize, s }: melpaBuild { pname = "jdee"; - version = "20171007.835"; + version = "20180109.1233"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "ebe5d2e36a6a367376ed6cde590d5f805830ec9e"; - sha256 = "0rq8vp3pmnyabqzzplc91dk2ka48k809is9v4q486xv7y43013jh"; + rev = "bffcac3e7a8c57da359185e01ae5a6bdce0ba8e0"; + sha256 = "0bv1pkl6a9a9cs7ka3v17lqb45nx11mg779x7l54rvlkxg4ppchs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -40457,12 +40520,12 @@ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-themes"; - version = "20180103.1058"; + version = "20180114.917"; src = fetchFromGitHub { owner = "ogdenwebb"; repo = "emacs-kaolin-themes"; - rev = "3fd999ba8940ddda2ad9db7359901d3573a58864"; - sha256 = "1mc9x9pr51dkm1h70ijvllympk2nch52pqy1qzh4m09haqw6akxq"; + rev = "8689b8533bc8530f5380e913c8e3f8f467501732"; + sha256 = "1q3178s22m3vxqikjzwlzwrk32xac1ksvrpqpjbqj0f9mzs6ljsg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; @@ -41779,12 +41842,12 @@ ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20171227.1709"; + version = "20180112.1950"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "cf0c9d84a4f24c1af8059b73cf4ff40343f2b8b2"; - sha256 = "18dlsvsk3az7z26929nx30rkxw9v7aj3x11zfr6rfbawm6xc6fql"; + rev = "eff3e16d7b98af3f74ebc464d7bd4f156335600d"; + sha256 = "0lnvqhgcc1wg485x2qvjy13bfdkysrdfg30x3zjgpgrqxmv123ih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode"; @@ -42056,8 +42119,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "3878e7009e9d1d8f3fb26e1b8bdaf21e681f1b52"; - sha256 = "0c88my6c4ycbjqwd8m5jw4ilh4bfap3202sr11z0r6wvc6kf44wk"; + rev = "5faa7106419263689bfc0bc08a7451ccb1fba718"; + sha256 = "010l1xz9wa6wm7fnajxcdxjl1nmbkwxxwszd4h14xmhj830560ph"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -42333,12 +42396,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20180105.1040"; + version = "20180114.605"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "ee96631f416c410dd30077311f593bf1c58eb50e"; - sha256 = "1hvlvyx0iarh7p8n8sgz4x75clg0i3f4chfis0zi0nxag274nl1r"; + rev = "3ef046fab34c3ed645d03f3ab0d8c510454aa647"; + sha256 = "089w81565k915j2bzg8d7xqf2k30004j0sn720kd434f2qjgx05y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -42648,12 +42711,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20180107.2134"; + version = "20180114.2302"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "00b7d06e525ef8d18064261ff125ac965ad06e8f"; - sha256 = "03qklbvz4w0qxcw43pj9kmsj5gnl1c3x3nywirjsn0klldi5q37r"; + rev = "84d165ad5abddd2579ebad0bf0bf5bde92d307fd"; + sha256 = "1mhdw2nw30zy253icw0wviwxz9yxpkbd7pga2diclwcmapn9l2w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -42756,8 +42819,8 @@ version = "20150910.644"; src = fetchgit { url = "https://llvm.org/git/llvm"; - rev = "14e29de03db7e2b075b70fdb419f7ac428381b11"; - sha256 = "01ly5kms4w7b3jqq3d8d11cg18mlqivzk6ps9hb14wissv4mqg9f"; + rev = "3b8332372a3b2083da26a11a2de4a5a452e1119c"; + sha256 = "0fi732z5ilav8dx7zbq86398pq3glxf67z2xanj9r8j9v0zyvks7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; @@ -42999,6 +43062,26 @@ license = lib.licenses.free; }; }) {}; + lognav-mode = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lognav-mode"; + version = "20171230.1052"; + src = fetchhg { + url = "https://bitbucket.com/ellisvelo/lognav-mode"; + rev = "a9b53f2da040"; + sha256 = "0ka92x63zfgraby5ycypn3ri2s3s2b1m2j7fpb4r37bk9xkf90v4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ad86b93f4982a0c6291c771e12c8f42ace3b88f9/recipes/lognav-mode"; + sha256 = "1941scifg3nn7gmnki3sa9zvwsbb84w5lw2xjmdx0sh8rbxaw8gb"; + name = "lognav-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/lognav-mode"; + license = lib.licenses.free; + }; + }) {}; logstash-conf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logstash-conf"; @@ -43296,12 +43379,12 @@ lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20180105.103"; + version = "20180110.1914"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "768b07d3a76af7ba8dbe4c25aae6379da05fb306"; - sha256 = "1lv8i9lwi1r2npab0nrxmma8ghzlj8nm06kw8iyjyh5c83vi9wab"; + rev = "a8f23913753a2df7901c19bcc98d620feeafb1d9"; + sha256 = "0g9sglwvqwbzy5wilhjwcy8xc56mjvd0m33y3bjxrwyy1vfk99mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -43359,12 +43442,12 @@ lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, rust-mode }: melpaBuild { pname = "lsp-rust"; - version = "20171128.331"; + version = "20180115.556"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-rust"; - rev = "e560b81f21f770648a1a8621add9a2fe3dbe83af"; - sha256 = "1xscv5zbbz2pr893pb8a0c4mpdfkz5x2b8xmsk69960azslv7cd6"; + rev = "bdd9e82864a2fb34f7a67775158caa948e237e7e"; + sha256 = "00rlmsq9pab5r6lari82bhqfh6yr875p5vn7npckl0gfcwzad8kv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust"; @@ -43380,12 +43463,12 @@ lsp-ui = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, lsp-mode, markdown-mode, melpaBuild }: melpaBuild { pname = "lsp-ui"; - version = "20180107.2330"; + version = "20180114.811"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-ui"; - rev = "cc4e2035b1a7594bc0de1dd84e5bb6d7b607c39b"; - sha256 = "1i6z4slca09rnsd0n589wxm5dazkm7dkxzp0l5v522glys0p36xk"; + rev = "2c108f2dd7b7c09c43ae6b446762eb70fdc0716b"; + sha256 = "1m9ghm1wlp8fgfjsmisw0xyy17782n68q6zahqal2h9hnrndjdrp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e4fa7cdf71f49f6998b26d81de9522248bc58e6/recipes/lsp-ui"; @@ -43737,12 +43820,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, ghub, git-commit, let-alist, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20180107.832"; + version = "20180112.900"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "53eeafcdcb12f9deb74548ffa5b17c397ad7def2"; - sha256 = "0pvwmbgmqdpy599nr6518yxzl5k8lkdi7a93v1dr7hcf3lg5ygpg"; + rev = "24ce90832ddff0db86581c1b7e947e83a13fe83e"; + sha256 = "0sxham9vg6m4j7f7p5ral56s4rzxfmy8an23zvq2n3832jsvvri1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit"; @@ -43956,12 +44039,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20171217.1235"; + version = "20180114.904"; src = fetchFromGitHub { owner = "magit"; repo = "magit-popup"; - rev = "3f23e81eb0267d6578d8f1733c5e42699b0229a1"; - sha256 = "1nv3gc3wb7r2l9hbsgx78gqbcdi6iw1l9a0nqq5vjvr3cmb014r4"; + rev = "5a2a6f2907a09c7592c4631d2678dd7ab44fd5a2"; + sha256 = "0m8h6jc87bcl3lhygc06la4hs7sh6c7vflxlqvwr3bfmknl8l8yw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0263ca6aea7bf6eae26a637454affbda6bd106df/recipes/magit-popup"; @@ -46215,12 +46298,12 @@ modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modern-cpp-font-lock"; - version = "20170625.1306"; + version = "20180110.1231"; src = fetchFromGitHub { owner = "ludwigpacifici"; repo = "modern-cpp-font-lock"; - rev = "b0a45dc1d7c49854988103c2570c783f46f44566"; - sha256 = "1gh7l6c4xznpjialbmswhfm1cmmbzkl2s6acjcway0nb52rshgr6"; + rev = "9b10e1831bac34685be89e32e83ed969c4bac683"; + sha256 = "0csaky9k24hd3qjhb3kyraycvlsdkjhmw6bbd36z0q0ac56sd2sg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock"; @@ -48501,12 +48584,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20180108.305"; + version = "20180111.947"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "e585ca177a55808a17a53e8a9020198a18175543"; - sha256 = "197dr52a2xw3da7zaia48qndmgrs3h8nx6wan9zslpy8497c8bbn"; + rev = "8e321f1036770c20637a0f946b655805cd070e25"; + sha256 = "11hxf0fkka4mv1qsw0nx3ymvgcav95r2bvk1gwyj5m5cbwb4a1n9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -48711,8 +48794,8 @@ version = "20180104.1635"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "54982e520c3bee74e947e311ee5b1219396fa1a8"; - sha256 = "00ni0vnsq4p7cka9jy9fw2rdmkm3gxii7blq1c87bpbvrlwjzrhl"; + rev = "12541fea7fe333f7c154a4a12a1d40394c2d6364"; + sha256 = "1r5a5smg2mc28wy3iq4sp8p0rmpqsi5ajk31hwc9lhldklz2c0nj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -49258,12 +49341,12 @@ ob-clojure-literate = callPackage ({ cider, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-clojure-literate"; - version = "20180106.2121"; + version = "20180111.210"; src = fetchFromGitHub { owner = "stardiviner"; repo = "ob-clojure-literate"; - rev = "e2b264f0f42467436f71aac81ca848fe9ab517d5"; - sha256 = "1w0mga44s7lghivw0ixm8gb8ryav5myd9i4x0xbdc8512jgy6a91"; + rev = "7acb5d1e9a84c9caa1e8477cdbb60d9a5dbf2eaa"; + sha256 = "1n5w7c181x5zbkmcvnzk2hxi339p2mfjwlhkxnfh3i20hzgqxci6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e958745861c9673248955443bcc2c76d504b32f7/recipes/ob-clojure-literate"; @@ -49531,12 +49614,12 @@ ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; - version = "20171209.634"; + version = "20180113.929"; src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; - rev = "a3bf46dd6c9a76f4cd5058f3ab5426d90f0c073a"; - sha256 = "0ck3r5qwp4184anpa9f9hjp3rra6yx5hkwcxg1byippp75hdc50m"; + rev = "75b84cb1ca09dfa84113fa0790e182299b72244c"; + sha256 = "05yhrivsxf8qvnhvsdb5kdq1a881l5c7d3apz1sk2mdxw89vcv7k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; @@ -50968,12 +51051,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20180107.1655"; + version = "20180111.1500"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "42596a3c29e9b6b64c05b04db04d23ea282560e4"; - sha256 = "1ca0x87i6vqs004dr6qc9hi1lqbvj82464cbfj3vr0z2n5pi7hl5"; + rev = "a21280a0dec3a44d9673deec0e4bb4d57da4db5f"; + sha256 = "15ikqddngdzfsbsapdfnn6c10waxy4cf228k4f02pcp2zk4zchhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -51322,22 +51405,22 @@ license = lib.licenses.free; }; }) {}; - org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-plus-contrib, s }: + org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-drill-table"; - version = "20170408.1205"; + version = "20180115.209"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "org-drill-table"; - rev = "5662511e98697e086149a223a64f9f01fabf7330"; - sha256 = "1bd9wifw57v31bihqrq5305a5xmjq980crlnqak0l9pksjkbw2bx"; + rev = "096387d929bcf3eb479e0a9d5da9cf32c756a759"; + sha256 = "1a8ygrcag8i9hdpy2vsn0sh8lwhl9b56rv91j3rddy1jv5qx1ipb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3347da186765877826b224e1f5d1b585ebd3692c/recipes/org-drill-table"; sha256 = "1gb5b4hj4xr8nv8bxfar145i38zcic6c34gk98wpshvwzvb43r69"; name = "org-drill-table"; }; - packageRequires = [ cl-lib dash emacs org-plus-contrib s ]; + packageRequires = [ cl-lib dash emacs org s ]; meta = { homepage = "https://melpa.org/#/org-drill-table"; license = lib.licenses.free; @@ -51828,12 +51911,12 @@ org-noter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-noter"; - version = "20171229.1823"; + version = "20180109.1823"; src = fetchFromGitHub { owner = "weirdNox"; repo = "org-noter"; - rev = "ad3ecfc75bba19625dab07f4ff0483f043ddaf70"; - sha256 = "09y9pamb7zld41qlvfpp5szl0lyblrjd2211qzbs8zm4mk3hlzy3"; + rev = "3f1f1c7856e3e3b1482acba990bf440c13274752"; + sha256 = "1ll0ips9hs8ayk2ykh3297kby8imjl638rv12zps480mg15fmrvi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a2bc0d95dc2744277d6acbba1f7483b4c14d75c/recipes/org-noter"; @@ -52240,12 +52323,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20171222.818"; + version = "20180109.1919"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "66e23994c0964762b7a4bfe8662e81aa609e7a22"; - sha256 = "15kqfp0l0dsyw7qb7yfdfxsbjqzg7kcfp43nv7xiw808616vn7m9"; + rev = "4e32cc616df85b3e23874697abb2d1a0ac538679"; + sha256 = "1qg51km535s0i1m1zcgx6lvcsv687fx60dmvpq6p8cfqfq31h5z7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -53667,12 +53750,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20180107.1554"; + version = "20180111.1032"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "44ac07fb5d3a30662dd2c4643fe9d9e3ce85465d"; - sha256 = "1p3053kkjq1kv91jm6myp3ikjvh53c3yrnvrxfg5jndr6p1zawqz"; + rev = "53cfa26dd7518b13f0d39e3fce060a844e485de1"; + sha256 = "02v4gf88lc6v3kwxx419bpg71wlb949gnz0ywjh45knbgn5kyb1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -53898,12 +53981,12 @@ ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-rst"; - version = "20171004.1553"; + version = "20180115.405"; src = fetchFromGitHub { owner = "msnoigrs"; repo = "ox-rst"; - rev = "6d1eab55ff7c8dc4bcf511c9483e69f2a840e928"; - sha256 = "10z922lcg8hz517kg57knx2irfcac8plp9nsxayrbxpkjx7mmjlj"; + rev = "58715dcba3922b5c7fc8ed5e7915277a9732fae3"; + sha256 = "1267rfj1rq04g9ngw0yglsdjma6bb04j3fc8afwsjixnbqv618kj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst"; @@ -53919,12 +54002,12 @@ ox-textile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-textile"; - version = "20171120.1758"; + version = "20180110.516"; src = fetchFromGitHub { owner = "yashi"; repo = "org-textile"; - rev = "e40472b13aee3d7dbf7bd916825431547024303d"; - sha256 = "112d8rzwz5r9ny0k9l080qxq0ly6alwbj0wfh22678hjwgx69zcn"; + rev = "0af57d17c93049bf7533061863f711d13fbed891"; + sha256 = "17jgb5bn3c4q4gasb2xas5bs3mrd1drnizgbqpnc50c8jfmcr4kd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02a68a7a99ecce8f1afa03e72ff1f636edaf5868/recipes/ox-textile"; @@ -54381,12 +54464,12 @@ pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: melpaBuild { pname = "pamparam"; - version = "20171217.551"; + version = "20180111.1014"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "4e10a68314afb5087163ee09133b9032a368c85f"; - sha256 = "11v0q3d68q9am9scjd38lw2vqx48aqzqs32316i9xsbp962snrxw"; + rev = "1eddc9be67ff66cc4a8e4eefc28f891f455df8d9"; + sha256 = "1pgkxyrgcf7c2yydq3694kgaz2h85iw2ybh9z4w297yh0zkp9a45"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; @@ -54469,8 +54552,8 @@ src = fetchFromGitHub { owner = "cadadr"; repo = "elisp"; - rev = "28d7339f2e70c617f2e8e3979b45d78883a27282"; - sha256 = "1ank29f64cwdg9faqz8fknaz0cn4jma18197n6q3fhb6mfl081hn"; + rev = "8925ea85143c4c91589213fbacb275e81968d76d"; + sha256 = "1f02idd8dw02q3ddr3p33xz3n3nhc33qv6fjsbz00pslw082gr8c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme"; @@ -54694,12 +54777,12 @@ parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; - version = "20170501.347"; + version = "20180111.20"; src = fetchFromGitHub { owner = "joostkremers"; repo = "parsebib"; - rev = "bc31b627c666df576aa37e21c27a2223b3cb91a3"; - sha256 = "1bnqnxkb9dnl0fjrrjx0xn9jsqki2h8ygw3d5dm4bl79smah3qkh"; + rev = "c8d59deb20552f9a1885297b5ae0b8f753d191a5"; + sha256 = "1b1iiiy184czp014gg1bb3jks9frmkw8hs5z2l2lnzjmfjr6jm6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; @@ -54757,12 +54840,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, password-store-otp }: melpaBuild { pname = "pass"; - version = "20171010.410"; + version = "20180109.201"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "0f4ff034fb31b18f387e67f1de4029826db6cd0b"; - sha256 = "084497na8qql638qjhgad02rvhwyzz81xwh70p6rxxwfzj0i1p17"; + rev = "855e89446676f03065ed01e4a5c8dfba5eca3610"; + sha256 = "0s784pvv8jxiicvqcb9x0nynnpp0m431vw835qhp1pi1y4cfbbf8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -55345,12 +55428,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20171012.2226"; + version = "20180109.1234"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "0f99f0c06514acf51445e7e4cb0f638fa0c75ee5"; - sha256 = "1gc7n5r60ib65bnkgpac3bn71pxnm58sxajnwjfkwi9xzgw72acv"; + rev = "9241a79bbf159ba0b079ebdbfa8ad1b3e69cf8c0"; + sha256 = "00v2rqrh3z93s651j1i1z9i6chr0lxw1kbnkpr56pqrh5rbvy0q5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -56183,12 +56266,12 @@ php-runtime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-runtime"; - version = "20170901.1106"; + version = "20180110.934"; src = fetchFromGitHub { owner = "emacs-php"; repo = "php-runtime.el"; - rev = "e1bca88ab5472e9b520b4ce915cd27d1e7803c2d"; - sha256 = "1krnfzck9j5wmda1rkmzhl9lcdzxfw324xfy4lz92nwb92mgw8gq"; + rev = "fa4312863245511462b75cb31df2f8558288f4df"; + sha256 = "1glwy0cgnn0z4rnd45pqy0bmyaddhxfjlj778hz7ghy40h9kqbdn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/615c9ac208d8c20082a8ac83e49e93d99e2cbc89/recipes/php-runtime"; @@ -56726,6 +56809,27 @@ license = lib.licenses.free; }; }) {}; + play-crystal = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "play-crystal"; + version = "20180114.224"; + src = fetchFromGitHub { + owner = "veelenga"; + repo = "play-crystal.el"; + rev = "0b4810a9025213bd11dbcbfd38b3ca928829e0a5"; + sha256 = "15gqr11paz5qmx43qb0f95wc87nn2snr7my22b0n6jwbk5djf402"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/92715977136afa731e85e894542dc88b664b3304/recipes/play-crystal"; + sha256 = "1jqf36b1mhyf4j7fs386g6isy09q7k8zwdc4rb34mhjg1a56gcnf"; + name = "play-crystal"; + }; + packageRequires = [ dash emacs request ]; + meta = { + homepage = "https://melpa.org/#/play-crystal"; + license = lib.licenses.free; + }; + }) {}; play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "play-routes-mode"; @@ -57701,12 +57805,12 @@ prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prettier-js"; - version = "20170823.159"; + version = "20180108.2326"; src = fetchFromGitHub { owner = "prettier"; repo = "prettier-emacs"; - rev = "6cc79cc933968f9ecae988ed79398d9dc97790e2"; - sha256 = "01k1k68rwwpjdajc12dvpjr8jfncvj8lli2l6065jwbq8ldg2ja0"; + rev = "0e8b95c4e5898a03e85dbc555c37b4f968292aec"; + sha256 = "0l8i0fbwwyhllkpk8xd6w5gcv65z4ja1ygf6slh5sd1g0ixh29md"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js"; @@ -58544,8 +58648,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "bab843b8b96757ed2138fdc01dc5d82d47a2239c"; - sha256 = "0b5vj227rr501fzy8y6hbg0q2y0z6hs8yk39m7crw3fwd4zqyn0h"; + rev = "47b7d2c7cadf74ceec90fc5042232819cd0dd557"; + sha256 = "0kjhxqrbyj5rlfrkfbn8wlr4w1yi2i2r8pgsw7dz63rabf1xd0fd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -59283,12 +59387,12 @@ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "20180108.310"; + version = "20180111.1529"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "eefbdec87ae923c91dbe33fcfc1af5a47b2e2ba5"; - sha256 = "0y7m9446dlip4qwx7s3w2jgx5s0r1s4cjvgacby20l1vs25k5drk"; + rev = "157bfbab77ac74d504567ce2a3874b575976f7a5"; + sha256 = "0l9p7yc57agiq7hh2jkb8jb93nswm9skg4s6di32n99cpjv22npw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; @@ -60669,12 +60773,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20180102.1645"; + version = "20180115.127"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "2b3ffb5c375dd32a633668eec969148590b489b4"; - sha256 = "0sbldlhji6rzxjs2hip54sn376ar6rqbyaancmg85y85349q6q3b"; + rev = "a5853d53a63e8a23b7b4c2ae0faf575623637c8d"; + sha256 = "0yalj4nn42g32xjr2s5hvlhinyhz1jjyx74494c018prybs16z75"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -60990,12 +61094,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20180102.1356"; + version = "20180112.838"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "73a87f907871e5dcd559e2ed2ea73370021b0390"; - sha256 = "1j1i8l81a3s5h482r7whsdl1fbgmnb2s2zijf7vbnq92dvmx6pfm"; + rev = "191555243a38977493954276f61851c182f7ee06"; + sha256 = "091j5f1i5fscvlpr68mfdsb7gbcl0xkbzqibphyarlnmgzw31wsa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -61451,12 +61555,12 @@ req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }: melpaBuild { pname = "req-package"; - version = "20170826.2252"; + version = "20180114.2334"; src = fetchFromGitHub { owner = "edvorg"; repo = "req-package"; - rev = "179ab70bb3d4f7a94401dace64f695c50acfe389"; - sha256 = "1j54l002vq8hz1pghyas4aalqhsnma5czjh4fh5s5cs4v7v6d7s8"; + rev = "770234c5b3370f758ed4d1935bf7e1d0d3a7dcec"; + sha256 = "0650x87dp692rkn8z04kvxxzyxygx65fn5cmjjjy9wgvgxr3w0dy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package"; @@ -61980,8 +62084,8 @@ src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "4c10dcd764ade8e3d5dc235c26ba9299576a513d"; - sha256 = "034hrzcvbnsrr9cxy2wzggnsax708hd231hfkixwffzrrwdlhwz8"; + rev = "ed8ff80f7fb7a9d46715577e4937de756b001ff7"; + sha256 = "14a6qhh4rvsn1z8jhj4wjlljmxmmq2hrmsqpfmvx7yn1r3x51liq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -62211,8 +62315,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "db5ad3a48c579b3522411bd2411c09dbb27af578"; - sha256 = "1ihv65hfq22yk4wx4njkm73q4s04fr84ib3mjjk8l18xpzl6alal"; + rev = "3584c326a93a994cd329cd7d15d627d9375b678b"; + sha256 = "0j123j6gmbgkk58k188wa3dm68dmdvs67b1awhwfx0jkdfdkx61h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -62606,12 +62710,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20171208.1015"; + version = "20180109.544"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "27911c88b0d32b66429d61bb056ecf1b10e66598"; - sha256 = "1p8z1s3j0cbwxkbcb1p3h4m1vmrxrpkch0xax24jmkpzjrqhl7j9"; + rev = "cfb440810a010b099e7196f8701c9d990a3641d8"; + sha256 = "17mm7mk8s4s9ka7035bf7bd6sfxwi3m2iss9q3pg2d7931nzh1dz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -62669,12 +62773,12 @@ ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ryo-modal"; - version = "20180102.547"; + version = "20180114.1004"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "ryo-modal"; - rev = "fee33898b5726b3c15b6ceb2ebb051bebd4f3592"; - sha256 = "1rpn309s7a7rgs2n9l4m409x2r5p83xkgaq1aa2dab4p594hy29g"; + rev = "4dbe9e472306e5d293213842d9488c0b531eae8b"; + sha256 = "0l4153dczvkl88xnppqwdmj78c9rfj1bhl2d4c2sr1gc6hy7nj9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ryo-modal"; @@ -63047,12 +63151,12 @@ scad-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scad-mode"; - version = "20170219.2003"; + version = "20180108.1809"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "3473eb1a568669779e3e896ededd0d0708766fe4"; - sha256 = "0d6ky2kglqraq61k9ikk1nbrpmra8h16vhhafkail41wq36vx6x5"; + rev = "b8327fda10f90801209c584e596a572275452f1c"; + sha256 = "06p5ig8haz03vd0by60b5nrf3qy0damwhidvr2s5ycm5mapqaxkc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -64410,12 +64514,12 @@ shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shimbun"; - version = "20171224.1958"; + version = "20180108.1712"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "948a1a0f3e96e6c09c938e060f352ec126054ab1"; - sha256 = "1dwfw7hbcz88dvfy9hrllxhmhwdx6gfh9n457b6svcdjcn831d6d"; + rev = "d56e64b44cebb53a06c5a1eadafdbeba696dc9df"; + sha256 = "1l5kl8y46c62q9fhb173zkygfli9cnya8n9k3vc52k3i43xikg90"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun"; @@ -65229,12 +65333,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20171230.1630"; + version = "20180111.429"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "179741a0616f78f4e5901fe04dea79654c504fba"; - sha256 = "0vljhr6gkmw5jkdzhq6vsl9sa48hv1a02d9g4sfwqraz85k4x85k"; + rev = "2e7f94633acebd5cf4074ce9601b021624ad8233"; + sha256 = "15brbny68wjfcm1sm6981d3w6hylvblg1y4jiq652bp04nhzdr84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -65397,12 +65501,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20171220.1443"; + version = "20180113.717"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "436094626698e77efa38cbf45681db7ea6b7e9f7"; - sha256 = "08zii0vaa8w72adi2fy7v5rwvqp8kbv2wv0cws1q6wz9z95jjnmx"; + rev = "70df0149391302619b69cf56884ac8711430974e"; + sha256 = "1nw5h6icmvfd88n51hlrrpr39zm2h8387364sfk2s1kr41y2d707"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -67124,12 +67228,12 @@ spiral = callPackage ({ a, avy, clojure-mode, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, treepy }: melpaBuild { pname = "spiral"; - version = "20180105.1253"; + version = "20180114.342"; src = fetchFromGitHub { owner = "unrepl"; repo = "spiral"; - rev = "b25c42dd5add3192e846a5fe34be689e73f0c28c"; - sha256 = "16ls5iy98p9y8f5q9l3wz1g187zbpli2zgcjvnsbsv480bdpzgf6"; + rev = "7c79f538524b8ffef2cd8592dbdd6ec2965a2f7d"; + sha256 = "10rc84p30iqy19bdiz0bnki8c47jv42fdidxi7dkizjxmymx0hn5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77609e10c836a26de43ddb304ecfa275e314da21/recipes/spiral"; @@ -67628,12 +67732,12 @@ stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stan-mode"; - version = "20161023.1958"; + version = "20180110.1441"; src = fetchFromGitHub { owner = "stan-dev"; repo = "stan-mode"; - rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac"; - sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw"; + rev = "a8e88473ef996b455523dc3fbcf2d8520659652f"; + sha256 = "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67a44a0abe675238b10decdd612b67e418caf34b/recipes/stan-mode"; @@ -67653,8 +67757,8 @@ src = fetchFromGitHub { owner = "stan-dev"; repo = "stan-mode"; - rev = "45b8242611fe0437fcff48f5f4f7d8f0552531ac"; - sha256 = "14yv57grsw3zyjcqasaanx8g2skix0i3w1f5r1fng3sgwclwbkdw"; + rev = "a8e88473ef996b455523dc3fbcf2d8520659652f"; + sha256 = "13qw6n26jpr208h2366pcfv10d11880wlfzr0kiadrsg219wjgsi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8539b7d8da3a458a38f7536ed03580f9088c3/recipes/stan-snippets"; @@ -67817,12 +67921,12 @@ stem-english = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stem-english"; - version = "20170113.24"; + version = "20180108.1958"; src = fetchFromGitHub { owner = "kawabata"; repo = "stem-english"; - rev = "c8d9ccf1ea38ea403ba360b79b1042b0fd449a70"; - sha256 = "15bwbqapr3kfazpxagpzy6fpkgc669mb8n8psz7gaqhlpxsliwiz"; + rev = "c9fc4c6ed6bf82382e479dae80912f4ae17d31f4"; + sha256 = "1bkmgjfp7xir6d0yf782xkjvf595blrqhr3hack26jg5zl8qsrya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8e97e70e7a86b9f5e55bdd2db492994e8abdd5/recipes/stem-english"; @@ -68256,12 +68360,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20171229.1712"; + version = "20180111.1523"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "5caf98ab49c6b3c421d8f274c0682bbb7fc662fe"; - sha256 = "1niifkdirlwcyx5rk398dgk9lqnqr06ilhh0r89hx1xxdnbjglbi"; + rev = "79d3b73848b41498d33f009dfa20dcdfe52837ff"; + sha256 = "1zcl53knrwqz7ifhdlg6ya77zd9glnn1hfixhhqfp46c71c3ns56"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -68508,12 +68612,12 @@ swap-regions = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swap-regions"; - version = "20160413.1023"; + version = "20180114.936"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "swap-regions.el"; - rev = "2789091b6f34c0d4b82546eb39c4e73dc96e8679"; - sha256 = "1m0apxjcj6xhbic36il1mbbril6pw2h6d9kmsb0jhibyy6mc8r78"; + rev = "c74ddad3d3916fc57becfbad90c8981d063c27c6"; + sha256 = "1ag5y81v3z8jgwjvi7dk8g63f2dawixmdb7ghna516dnjsdg2njq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6805c7710618ed1178ffd3488295d4d6b33e8ebe/recipes/swap-regions"; @@ -68613,12 +68717,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20180102.1035"; + version = "20180112.1001"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "e5c5037fd5f2735b11fc90363f312431619fa8c2"; - sha256 = "0ssm6dgzzqvwwmwvnws8s0ac4f8dif5sxl9flx296df7s7xryzcv"; + rev = "80a51e0cac4f0554b0008674f49c664ebaded7b4"; + sha256 = "1n5fv39bpk4wpf1ar1f7h7g37jhnadi7kdp4i74j2awn5qhmz8hl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -68928,12 +69032,12 @@ syntactic-close = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "syntactic-close"; - version = "20180105.831"; + version = "20180109.316"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "syntactic-close"; - rev = "01fa7cf280d27dbb2af2261cc0e8ff2aa14742b1"; - sha256 = "19snnxiyjkgzsrdynxdyzmqc168jdzcvk9jr5g2w9ca2f0x7m9s8"; + rev = "0118d3a041448dbf98c1ab8cc25ed75d7649ca17"; + sha256 = "0s1hamnrnh64v8sl816vd259y6j7r8rjy8avxwlfp65ah4xlcdcr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close"; @@ -68990,12 +69094,12 @@ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20180103.1837"; + version = "20180109.1407"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "f5576f36885f97c9c753e5f1b80318efc626210f"; - sha256 = "1ylmqlv2n0f3qqxf60gq93fr7z9zjghivy5swml3s8r3pc8a3iyy"; + rev = "936bb1a1f3df903e73d1485a14dc483a790b2573"; + sha256 = "0hrs1mmw03aylxmmrp6gcnzs5by2fp18zsyiw4jkmzwg4fhxb1ik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; @@ -69997,12 +70101,12 @@ texfrag = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "texfrag"; - version = "20171229.1913"; + version = "20180109.1546"; src = fetchFromGitHub { owner = "TobiasZawada"; repo = "texfrag"; - rev = "ba1382c073b1f73cb411fb30e618480b9a804916"; - sha256 = "19cinynqicsfdvpa8jmrrx9xmbplw2wnykm3bcii8rs5vkwdh61b"; + rev = "204349999ed8655f1013267e90caed68c1e7b6e7"; + sha256 = "0x6mgpds5gbm9igqwzglnddxbm3dbdba16xg73m7c20ws3wjdz2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/756649bbe2dc6233c66c3d128a8096be12231078/recipes/texfrag"; @@ -70274,8 +70378,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "1b855d47aab32dc89e6e4271e8ac8872b049e1ba"; - sha256 = "1qrisw42nzbd1m09aihpigc63xm0yhhli5103aibww0pa904fr2d"; + rev = "f64a3fcaf9ae03b94b6b462168eb6f990f71084e"; + sha256 = "06fc8gxxyf4x5j7hbp6p7zipncqwmai7k6clcma5d5wmgjal3wj6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -71108,8 +71212,8 @@ src = fetchFromGitHub { owner = "raghavgautam"; repo = "tramp-hdfs"; - rev = "b64f24d0419a80dffaa2c4ecec317aa2bba56e35"; - sha256 = "1bfqzwn19w6fs5npslw0sjqrwdswsv5m3wcdnk438pz1lp199wfy"; + rev = "f8406f77bf83b66306ced693a5e4aaf606f46762"; + sha256 = "15zr1fcmjk4mzjvmfbbkz5v9ryfgcjk0ag6rwxk8rp6wzwxcxvvl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c185553314a2a9fe18907fd9251077777b33538/recipes/tramp-hdfs"; @@ -71272,12 +71376,12 @@ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20180107.1246"; + version = "20180110.923"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2dabf88d5948a04d0313b0195be397761fc22b58"; - sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk"; + rev = "692f5be4ab6a4868978dcb2639334f78a267cfd2"; + sha256 = "1r279a4avaccqjgw4wczai293rxcvacp9iw8gfqimfhl02gacklp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; @@ -71293,12 +71397,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "20171225.951"; + version = "20180110.905"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2dabf88d5948a04d0313b0195be397761fc22b58"; - sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk"; + rev = "692f5be4ab6a4868978dcb2639334f78a267cfd2"; + sha256 = "1r279a4avaccqjgw4wczai293rxcvacp9iw8gfqimfhl02gacklp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; @@ -71318,8 +71422,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "2dabf88d5948a04d0313b0195be397761fc22b58"; - sha256 = "0j1ampw5i3m0q69cp2nf9xr9qqxiyasjk7wmsg9nwnx7sibhfddk"; + rev = "692f5be4ab6a4868978dcb2639334f78a267cfd2"; + sha256 = "1r279a4avaccqjgw4wczai293rxcvacp9iw8gfqimfhl02gacklp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; @@ -72582,12 +72686,12 @@ use-package = callPackage ({ bind-key, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20171226.1104"; + version = "20180108.1754"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5a50f6703140992723a434b9a733644bfab15306"; - sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f"; + rev = "05a4033b830bf52c596ceedea10b2cbd91f85fdb"; + sha256 = "1y8slvsmlgfriaa6svanyypv0qq5hq8gbyfzsxif4wbr9hcyfikf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package"; @@ -72607,8 +72711,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5a50f6703140992723a434b9a733644bfab15306"; - sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f"; + rev = "05a4033b830bf52c596ceedea10b2cbd91f85fdb"; + sha256 = "1y8slvsmlgfriaa6svanyypv0qq5hq8gbyfzsxif4wbr9hcyfikf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-chords"; @@ -72628,8 +72732,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5a50f6703140992723a434b9a733644bfab15306"; - sha256 = "1495kkmfkl56kg8kbc21rqibrmdyg12mfsww79gm8v5q4nn6xq5f"; + rev = "05a4033b830bf52c596ceedea10b2cbd91f85fdb"; + sha256 = "1y8slvsmlgfriaa6svanyypv0qq5hq8gbyfzsxif4wbr9hcyfikf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6240afa625290187785e4b7535ee7b0d7aad8969/recipes/use-package-ensure-system-package"; @@ -73678,8 +73782,8 @@ src = fetchFromGitHub { owner = "emacsorphanage"; repo = "w3m"; - rev = "948a1a0f3e96e6c09c938e060f352ec126054ab1"; - sha256 = "1dwfw7hbcz88dvfy9hrllxhmhwdx6gfh9n457b6svcdjcn831d6d"; + rev = "d56e64b44cebb53a06c5a1eadafdbeba696dc9df"; + sha256 = "1l5kl8y46c62q9fhb173zkygfli9cnya8n9k3vc52k3i43xikg90"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m"; @@ -73778,12 +73882,12 @@ wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "wand"; - version = "20171103.513"; + version = "20180112.454"; src = fetchFromGitHub { owner = "cmpitg"; repo = "wand"; - rev = "83c0c723dae7d8a37e67a9d9f2d00e005b5486ca"; - sha256 = "0wc1gmaz02bfbapwrmmc5r7rcfwqlfr52x3jqk6bhxpiav141yq4"; + rev = "e8939812e03255fff3e15c5d0f9d4da849aaf07b"; + sha256 = "0l79vhf0s5rz9s02bmcfyx7yn4pvn3dnxkr50qfhqajrvfx1105g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand"; @@ -74240,12 +74344,12 @@ weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }: melpaBuild { pname = "weechat"; - version = "20171128.440"; + version = "20180112.1217"; src = fetchFromGitHub { owner = "the-kenny"; repo = "weechat.el"; - rev = "f8e6a2361f4de2299b861dd8fea1d0a5502be7c4"; - sha256 = "1hqjc43bmn5bgad6iais9b4plb6ijcwwvvgyfgjfjmpb81inxdvh"; + rev = "4842e966a557e13fa4f16052cb60d221cdb886cf"; + sha256 = "0y4vdsm4rb221hmr2a2sn0kj51jsgndkmhwcjiryqxzn2giy9siw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat"; @@ -74429,12 +74533,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20171217.1916"; + version = "20180108.1930"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "ef384e781e6107850c7fadc78cb0675d7fe72e69"; - sha256 = "1xiw2blc1z2fvpz30i350gk28nfwlallnqvqmxibb84rydadx705"; + rev = "1219622b756f149efe4b44c625f2140c5229f936"; + sha256 = "14wfaqlixiqg79q6vb89jjvgvxwfgcdkgxyqh2bqsjwam9xksmlp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -74999,8 +75103,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "52fa9101d8c4"; - sha256 = "1ijzd3xmygkkkwm0ckkmi576y93drcs63l6bsc8qz2pvjcn5k8sw"; + rev = "d04938232934"; + sha256 = "1sjadb0kh3hrdsvwywi04agrzrs21sxzh1v1km0z3x6f15nr048c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -75037,12 +75141,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20171217.1239"; + version = "20180111.433"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "05338d893f3879391d7283324364b472e3f4f4d1"; - sha256 = "0h5wlskfb0xpw1jjijcvyl2ivylky3y2czmfi8f0qv9vz6g495w3"; + rev = "04d59d68dab58a7cf3034c84d8ba0553b78ae30c"; + sha256 = "080f39m9nmi163arpmxw45xwadb7q7w7p385yi1jy62bzvqnk0pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -75583,12 +75687,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20170821.400"; + version = "20180114.506"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "7167c7a9a0f0dcc167dafa833efd43a0c9ae4307"; - sha256 = "1iychyj79g9mxpr688f2a9w8bbsgm2r88rr11b42gagal0kgk8q4"; + rev = "281b079fca7e3889f56f754dd00b0ae08fb55090"; + sha256 = "1mszy0xav31wk936gwj1xb43mp10l3nfh2cnk3baq2jx55z1cm1c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-css-mode"; @@ -76322,8 +76426,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "b851eb86a8a78378ad0f734e2c56f3f5f4d052ec"; - sha256 = "009j6b7k5dc4n2zyi86d0bnl2a77ril9phqkx29jz5lcr0ndarwj"; + rev = "b028fc03a1526b166043e783add3be4f04b7a92e"; + sha256 = "0abl81q726jdhlirz77vl55xdbhpyfqrfqc2x6qdz9jmh04r912g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -76591,12 +76695,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20180102.1824"; + version = "20180111.1533"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "04062d8b4f7391069058345e1efd673add0357f8"; - sha256 = "11xn4h182p738apiphxvdzrnb4gc2nam039xzxfx9fsvfxph6ziw"; + rev = "203059a95e320b031ac0d2cabe9c1de68604baec"; + sha256 = "186varms4zmvlvakwnyip19z46fagwa05mnahhpb8ncmpjg6i7cl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -76612,12 +76716,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20180107.147"; + version = "20180112.516"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "3ab16fb46517d3f084ce838bb5fce71d22601a16"; - sha256 = "1nw95nmnc4y1l3dm44yn1kb88179x5455g5sap20dm7a6zxbf94g"; + rev = "f76efc2054ac41434544de96ed0a09a455b6c040"; + sha256 = "0lnmhlz1xml9ykishqn18ivpyf5il6lgv3bi5dx9bfnnd55j41wi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -76633,12 +76737,12 @@ yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yatemplate"; - version = "20161108.1305"; + version = "20180114.734"; src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "07da11de32feb6cbce0f8c140c0304e3ba1b42c0"; - sha256 = "10af3pa8rh3rs0vpm436vm5wlwvqkfa3zpqyhdf2i3q4gaqfb902"; + rev = "caa8734afc559a28eb4ec5dc3f240434e51cafc9"; + sha256 = "0zzmhkadyyw56j1z6dgj3x81sb5mxd0s2r20vy5mrfm18cyvsdd1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; @@ -76653,11 +76757,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20180106.654"; + version = "20180108.2035"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "668632d9392e"; - sha256 = "1d37yr7yqqg1gavi3406rv9rfvcm5ic365jhs6pispfx1kr77k6n"; + rev = "cef987df070f"; + sha256 = "1nryf7pizmwhyk2jw5dgild031xb6xylyyhr8pwx74iijcbpz2qh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; @@ -76935,12 +77039,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20171216.1027"; + version = "20180114.907"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "62d91fd7c054b0747f1309c012976deb471d4608"; - sha256 = "1ddr47xy86kajwwf7dnzz9a9qh7bd9wkf7x30qwlygc41mg6w6zy"; + rev = "ce1f08372391fa17a974769930b904a0b893fec2"; + sha256 = "0dx7xcvgvsbd3y0glc8pwjzrra3a5gpwm894lay2ql1fcf8z8lhh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; From e73ac924c62369cc4ac05912e7a67facfc2e66b8 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Mon, 15 Jan 2018 13:22:38 -0500 Subject: [PATCH 21/95] melpa-stable: Don't `markBroken rcirc-menu` (that doesn't exist) This `markBroken` annotation was either added in error (by me), or the package was removed from melpa-stable, but either way, it's no longer in that package set, so remove the annotation. --- .../applications/editors/emacs-modes/melpa-stable-packages.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 6d23d508228b..a2ba794933ea 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -164,9 +164,6 @@ self: # upstream issue: missing file header qiita = markBroken super.qiita; - # upstream issue: missing file header - rcirc-menu = markBroken super.rcirc-menu; - # upstream issue: missing file header speech-tagger = markBroken super.speech-tagger; From 9ea67c101cd721fa02309cb3788f098033ad85a9 Mon Sep 17 00:00:00 2001 From: Alain Lehmann Date: Mon, 15 Jan 2018 20:17:04 +0100 Subject: [PATCH 22/95] perlPackages.MacPasteboard: init at 0.009 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f7df25af393d..9145eb56a5f0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8320,6 +8320,20 @@ let self = _self // overrides; _self = with self; { inherit fetchurl buildPerlPackage stdenv DBDmysql; }; + MacPasteboard = buildPerlPackage rec { + name = "Mac-Pasteboard-0.009"; + src = fetchurl { + url = "mirror://cpan/authors/id/W/WY/WYANT/${name}.tar.gz"; + sha256 = "85b1d5e9630973b997c3c1634e2df964d6a8d6cb57d9abe1f7093385cf26cf54"; + }; + meta = with stdenv.lib; { + description = "Manipulate Mac OS X pasteboards"; + license = with licenses; [ artistic1 gpl1Plus ]; + platforms = platforms.darwin; + }; + buildInputs = [ pkgs.darwin.apple_sdk.frameworks.ApplicationServices ]; + }; + MailMaildir = buildPerlPackage rec { version = "1.0.0"; name = "Mail-Maildir-${version}"; From 9e2e2196087f5afd7b0aea5b922b01def105a3d3 Mon Sep 17 00:00:00 2001 From: Alain Lehmann Date: Mon, 15 Jan 2018 20:23:14 +0100 Subject: [PATCH 23/95] perlPackages.Clipboard: Fix darwin build Darwin requires dependency on MacPasteboard The test runs successfully when executed interactively from a nix-shell. Disable doCheck as paste pasteboard is not accessible in (non-interactive) nix-build. --- pkgs/top-level/perl-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 9145eb56a5f0..bd77ac1d55b2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2184,6 +2184,12 @@ let self = _self // overrides; _self = with self; { description = "Clipboard - Copy and Paste with any OS"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin MacPasteboard; + # Disable test on darwin because MacPasteboard fails when not logged in interactively. + # Mac OS error -4960 (coreFoundationUnknownErr): The unknown error at lib/Clipboard/MacPasteboard.pm line 3. + # Mac-Pasteboard-0.009.readme: 'NOTE that Mac OS X appears to restrict pasteboard access to processes that are logged in interactively. + # Ssh sessions and cron jobs can not create the requisite pasteboard handles, giving coreFoundationUnknownErr (-4960)' + doCheck = !stdenv.isDarwin; }; From f198189177de72d6c7f299ebc92977ebe89b6632 Mon Sep 17 00:00:00 2001 From: Alain Lehmann Date: Mon, 15 Jan 2018 20:24:35 +0100 Subject: [PATCH 24/95] kpcli: Fix darwin build adding MacPasteboard to perl path to support using clipboard on darwin --- pkgs/tools/security/kpcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 8d2ac2af010c..3776c883ac71 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { chmod +x $out/bin/kpcli wrapProgram $out/bin/kpcli --set PERL5LIB \ - "${with perlPackages; stdenv.lib.makePerlPath [ + "${with perlPackages; stdenv.lib.makePerlPath ([ CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser - ]}" + ] ++ stdenv.lib.optional stdenv.isDarwin MacPasteboard)}" ''; From ab06f3e99c7858657762649b9ebd23aba1c05d0b Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 11 Dec 2017 17:26:41 +0900 Subject: [PATCH 25/95] neovim: init wrapper Adding a python package to the neovim environment should not trigger a recompilation. This adds a wrapper to prevent that. --- pkgs/applications/editors/neovim/default.nix | 87 +-------------- pkgs/applications/editors/neovim/wrapper.nix | 109 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 118 insertions(+), 84 deletions(-) create mode 100644 pkgs/applications/editors/neovim/wrapper.nix diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 0233d6345285..d7cfcf34a4d2 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,16 +1,7 @@ { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey , libtool, libuv, luaPackages, ncurses, perl, pkgconfig -, unibilium, makeWrapper, vimUtils, xsel, gperf, callPackage - -, withPython ? true, pythonPackages, extraPythonPackages ? [] -, withPython3 ? true, python3Packages, extraPython3Packages ? [] +, unibilium, vimUtils, xsel, gperf, callPackage , withJemalloc ? true, jemalloc -, withRuby ? true, bundlerEnv, ruby - -, withPyGUI ? false -, vimAlias ? false -, viAlias ? false -, configure ? null }: with stdenv.lib; @@ -46,47 +37,8 @@ let }; }; - rubyEnv = bundlerEnv { - name = "neovim-ruby-env"; - gemdir = ./ruby_provider; - postBuild = '' - ln -s ${ruby}/bin/* $out/bin - ''; - }; - rubyWrapper = ''--cmd \"let g:ruby_host_prog='$out/bin/nvim-ruby'\" ''; - - pluginPythonPackages = if configure == null then [] else builtins.concatLists - (map ({ pythonDependencies ? [], ...}: pythonDependencies) - (vimUtils.requiredPlugins configure)); - pythonEnv = pythonPackages.python.buildEnv.override { - extraLibs = ( - if withPyGUI - then [ pythonPackages.neovim_gui ] - else [ pythonPackages.neovim ] - ) ++ extraPythonPackages ++ pluginPythonPackages; - ignoreCollisions = true; - }; - pythonWrapper = ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" ''; - - pluginPython3Packages = if configure == null then [] else builtins.concatLists - (map ({ python3Dependencies ? [], ...}: python3Dependencies) - (vimUtils.requiredPlugins configure)); - python3Env = python3Packages.python.buildEnv.override { - extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages ++ pluginPython3Packages; - ignoreCollisions = true; - }; - python3Wrapper = ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\" ''; - - additionalFlags = - optionalString (withPython || withPython3 || withRuby) - ''--add-flags "${(optionalString withPython pythonWrapper) + - (optionalString withPython3 python3Wrapper) + - (optionalString withRuby rubyWrapper)}" --unset PYTHONPATH '' + - optionalString (withRuby) - ''--suffix PATH : ${rubyEnv}/bin --set GEM_HOME ${rubyEnv}/${rubyEnv.ruby.gemPath} ''; - neovim = stdenv.mkDerivation rec { - name = "neovim-${version}"; + name = "neovim-unwrapped-${version}"; version = "0.2.1"; src = fetchFromGitHub { @@ -113,7 +65,6 @@ let nativeBuildInputs = [ cmake gettext - makeWrapper pkgconfig ]; @@ -140,17 +91,6 @@ let install_name_tool -change libjemalloc.1.dylib \ ${jemalloc}/lib/libjemalloc.1.dylib \ $out/bin/nvim - '' + optionalString withPython '' - ln -s ${pythonEnv}/bin/python $out/bin/nvim-python - '' + optionalString withPython3 '' - ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3 - '' + optionalString withPython3 '' - ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby - '' + optionalString withPyGUI '' - makeWrapper "${pythonEnv}/bin/pynvim" "$out/bin/pynvim" \ - --prefix PATH : "$out/bin" - '' + optionalString (withPython || withPython3 || withRuby) '' - wrapProgram $out/bin/nvim ${additionalFlags} ''; meta = { @@ -175,24 +115,5 @@ let }; }; -in if (vimAlias == false && viAlias == false && configure == null) - then neovim - else stdenv.mkDerivation { - name = "neovim-${neovim.version}-configured"; - inherit (neovim) version meta; - - nativeBuildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/bin - for item in ${neovim}/bin/*; do - ln -s $item $out/bin/ - done - '' + optionalString vimAlias '' - ln -s $out/bin/nvim $out/bin/vim - '' + optionalString viAlias '' - ln -s $out/bin/nvim $out/bin/vi - '' + optionalString (configure != null) '' - wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}" - ''; -} +in + neovim diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix new file mode 100644 index 000000000000..2acba83d00bb --- /dev/null +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -0,0 +1,109 @@ +{ stdenv, lib, makeDesktopItem, makeWrapper, lndir +, vimUtils +, neovim +, bundlerEnv, ruby +, pythonPackages +, python3Packages +}: +with stdenv.lib; + +neovim: + +let + wrapper = { + name ? "neovim" + , withPython ? true, extraPythonPackages ? [] + , withPython3 ? true, extraPython3Packages ? [] + , withRuby ? true + , withPyGUI ? false + , vimAlias ? false + , viAlias ? false + , configure ? null + }: + let + + rubyEnv = bundlerEnv { + name = "neovim-ruby-env"; + gemdir = ./ruby_provider; + postBuild = '' + ln -s ${ruby}/bin/* $out/bin + ''; + }; + + pluginPythonPackages = if configure == null then [] else builtins.concatLists + (map ({ pythonDependencies ? [], ...}: pythonDependencies) + (vimUtils.requiredPlugins configure)); + pythonEnv = pythonPackages.python.buildEnv.override { + extraLibs = ( + if withPyGUI + then [ pythonPackages.neovim_gui ] + else [ pythonPackages.neovim ] + ) ++ extraPythonPackages ++ pluginPythonPackages; + ignoreCollisions = true; + }; + + pluginPython3Packages = if configure == null then [] else builtins.concatLists + (map ({ python3Dependencies ? [], ...}: python3Dependencies) + (vimUtils.requiredPlugins configure)); + python3Env = python3Packages.python.buildEnv.override { + extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages ++ pluginPython3Packages; + ignoreCollisions = true; + }; + + in + stdenv.mkDerivation { + inherit name; + buildCommand = let bin="${neovim}/bin/nvim"; in '' + if [ ! -x "${bin}" ] + then + echo "cannot find executable file \`${bin}'" + exit 1 + fi + + makeWrapper "$(readlink -v --canonicalize-existing "${bin}")" \ + "$out/bin/nvim" --add-flags " \ + --cmd \"${if withPython then "let g:python_host_prog='$out/bin/nvim-python'" else "let g:loaded_python_provider = 1"}\" \ + --cmd \"${if withPython3 then "let g:python3_host_prog='$out/bin/nvim-python3'" else "let g:loaded_python3_provider = 1"}\" \ + --cmd \"${if withRuby then "let g:ruby_host_prog='$out/bin/nvim-ruby'" else "let g:loaded_ruby_provider=1"}\" " \ + --unset PYTHONPATH \ + ${optionalString withRuby '' --suffix PATH : ${rubyEnv}/bin --set GEM_HOME ${rubyEnv}/${rubyEnv.ruby.gemPath}'' } + + # copy and patch the original neovim.destkop file + mkdir -p $out/share/applications + substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ + --replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \ + --replace 'Name=Neovim' 'Name=WrappedNeovim' + '' + + optionalString withPython '' + ln -s ${pythonEnv}/bin/python $out/bin/nvim-python + '' + optionalString withPython3 '' + ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3 + '' + optionalString withRuby '' + ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby + '' + + optionalString withPyGUI '' + makeWrapper "${pythonEnv}/bin/pynvim" "$out/bin/pynvim" \ + --prefix PATH : "$out/bin" + '' + optionalString vimAlias '' + ln -s $out/bin/nvim $out/bin/vim + '' + optionalString viAlias '' + ln -s $out/bin/nvim $out/bin/vi + '' + optionalString (configure != null) '' + wrapProgram $out/bin/nvim --add-flags "-u ${vimUtils.vimrcFile configure}" + '' + ; + + preferLocalBuild = true; + + buildInputs = [makeWrapper]; + passthru = { unwrapped = neovim; }; + + meta = neovim.meta // { + description = neovim.meta.description; + hydraPlatforms = []; + # prefer wrapper over the package + priority = (neovim.meta.priority or 0) - 1; + }; + }; +in + lib.makeOverridable wrapper diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50d21a120d88..651f1015e440 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17415,10 +17415,14 @@ with pkgs; vimpc = callPackage ../applications/audio/vimpc { }; - neovim = callPackage ../applications/editors/neovim { + wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { }; + + neovim-unwrapped = callPackage ../applications/editors/neovim { luaPackages = luajitPackages; }; + neovim = wrapNeovim neovim-unwrapped { }; + neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; neovim-pygui = pythonPackages.neovim_gui; From 730f8530a8d5744532c5f6e3e87d0ea9e2bbb414 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 15 Jan 2018 23:17:12 +0000 Subject: [PATCH 26/95] amd-hybrid-graphics module: remove This was only applicable to very specific hardware, and the only person with an apparent interest in maintaining it (me) no longer uses the hardware in question. --- nixos/doc/manual/release-notes/rl-1803.xml | 5 ++ nixos/modules/module-list.nix | 1 - .../services/hardware/amd-hybrid-graphics.nix | 46 ------------------- 3 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 nixos/modules/services/hardware/amd-hybrid-graphics.nix diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index e7e0e4e8f25e..1a146473e23c 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -144,6 +144,11 @@ following incompatible changes: will be accessible at /run/memcached/memcached.sock. + + + The hardware.amdHybridGraphics.disable option was removed for lack of a maintainer. If you still need this module, you may wish to include a copy of it from an older version of nixos in your imports. + + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8d329b5b4b25..eaa5f606cb6b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -225,7 +225,6 @@ ./services/games/terraria.nix ./services/hardware/acpid.nix ./services/hardware/actkbd.nix - ./services/hardware/amd-hybrid-graphics.nix ./services/hardware/bluetooth.nix ./services/hardware/brltty.nix ./services/hardware/freefall.nix diff --git a/nixos/modules/services/hardware/amd-hybrid-graphics.nix b/nixos/modules/services/hardware/amd-hybrid-graphics.nix deleted file mode 100644 index b0f9ff56d1b2..000000000000 --- a/nixos/modules/services/hardware/amd-hybrid-graphics.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - - ###### interface - - options = { - - hardware.amdHybridGraphics.disable = lib.mkOption { - default = false; - type = lib.types.bool; - description = '' - Completely disable the AMD graphics card and use the - integrated graphics processor instead. - ''; - }; - - }; - - - ###### implementation - - config = lib.mkIf config.hardware.amdHybridGraphics.disable { - systemd.services."amd-hybrid-graphics" = { - path = [ pkgs.bash ]; - description = "Disable AMD Card"; - after = [ "sys-kernel-debug.mount" ]; - before = [ "systemd-vconsole-setup.service" "display-manager.service" ]; - requires = [ "sys-kernel-debug.mount" "vgaswitcheroo.path" ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "${pkgs.bash}/bin/sh -c 'echo -e \"IGD\\nOFF\" > /sys/kernel/debug/vgaswitcheroo/switch'"; - ExecStop = "${pkgs.bash}/bin/sh -c 'echo ON >/sys/kernel/debug/vgaswitcheroo/switch'"; - }; - }; - systemd.paths."vgaswitcheroo" = { - pathConfig = { - PathExists = "/sys/kernel/debug/vgaswitcheroo/switch"; - Unit = "amd-hybrid-graphics.service"; - }; - wantedBy = ["multi-user.target"]; - }; - }; - -} From 75d2a7dc4dd0dc084cbc1b47dc7f6b69566ee35c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 2 Jan 2018 07:16:38 -0600 Subject: [PATCH 27/95] qt5: reduce closure size First, closure size is reduced by including the static libraries in $out instead of trying to move them to $dev. The Qt build system cannot handle libraries being split between different prefixes. Previously, the static libraries were moved into $dev and the shared libraries were symlinked from $out to $dev to fool the build system. However, this causes $dev to be retained at runtime. Instead, we now keep the static libraries in $out. Fortunately, the static libraries are not very large anyway. Second, we build with QT_NO_DEBUG defined unless debugging is enabled. This causes some assertions to be removed; when assertions are included, they pull paths from $dev into the runtime closure by using the __FILE__ macro. We also now patch qtbase to remove even more assertions when QT_NO_DEBUG is defined. --- .../libraries/qt-5/5.10/qtbase.patch | 125 ++++++------------ .../libraries/qt-5/5.10/qtdeclarative.patch | 6 +- .../libraries/qt-5/5.6/qtbase.patch | 32 ++++- .../libraries/qt-5/5.9/qtbase.patch | 103 ++++++--------- .../qt-5/hooks/fix-qt-module-paths.sh | 11 +- .../qt-5/hooks/fix-qt-static-libs.sh | 32 ----- .../libraries/qt-5/hooks/qtbase-setup-hook.sh | 10 -- .../libraries/qt-5/mkDerivation.nix | 2 + .../libraries/qt-5/modules/qtbase.nix | 6 - 9 files changed, 110 insertions(+), 217 deletions(-) delete mode 100644 pkgs/development/libraries/qt-5/hooks/fix-qt-static-libs.sh diff --git a/pkgs/development/libraries/qt-5/5.10/qtbase.patch b/pkgs/development/libraries/qt-5/5.10/qtbase.patch index 06eff174359f..b79ce9fc3568 100644 --- a/pkgs/development/libraries/qt-5/5.10/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.10/qtbase.patch @@ -12,7 +12,7 @@ index 5208379f9a..92fe29a0ac 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index bb5083c925..da8e2cb386 100644 +index bb5083c925..77034f9bb6 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -21,7 +21,7 @@ load(cmake_functions) @@ -48,7 +48,7 @@ index bb5083c925..da8e2cb386 100644 - # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} - CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" -} -+CMAKE_LIB_DIR = $$NIX_OUTPUT_DEV/lib/ ++CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ +CMAKE_LIB_DIR_IS_ABSOLUTE = True -CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) @@ -77,7 +77,7 @@ index bb5083c925..da8e2cb386 100644 - CMAKE_DLL_DIR = $$CMAKE_LIB_DIR - CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE -} -+CMAKE_DLL_DIR = $$NIX_OUTPUT_DEV/lib/ ++CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ +CMAKE_DLL_DIR_IS_ABSOLUTE = True static|staticlib:CMAKE_STATIC_TYPE = true @@ -432,13 +432,13 @@ index e645ba5803..a0e5c68b7e 100644 - -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index 44636f2288..61ed486a76 100644 +index 44636f2288..3b01424e67 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf -@@ -1,56 +1,3 @@ +@@ -1,56 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) - +- -isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { - # Get path of Xcode's Developer directory - QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") @@ -493,11 +493,11 @@ index 44636f2288..61ed486a76 100644 -# at build time, depending on the current Xcode SDK and configuration. -QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3f6dc076ca..8b13789179 100644 +index 3f6dc076ca..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf -@@ -1,58 +1 @@ - +@@ -1,58 +0,0 @@ +- -isEmpty(QMAKE_MAC_SDK): \ - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") - @@ -676,30 +676,18 @@ index 72dde61a40..f891a2baed 100644 INSTALLS += inst_qch_docs diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 668669e4cd..30f7fbac41 100644 +index 668669e4cd..eb4840a0aa 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf -@@ -77,13 +77,13 @@ for(extra, extras): \ - # Just for Qt Creator - OTHER_FILES += $$sourcefiles - --sourcefiles += \ -- $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \ -- $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ -- $$DBUS_ADAPTORS $$DBUS_INTERFACES --addInstallFiles(sources.files, $$sourcefiles) +@@ -82,7 +82,7 @@ sourcefiles += \ + $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ + $$DBUS_ADAPTORS $$DBUS_INTERFACES + addInstallFiles(sources.files, $$sourcefiles) -sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase --INSTALLS += sources -+ sourcefiles += \ -+ $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \ -+ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ -+ $$DBUS_ADAPTORS $$DBUS_INTERFACES -+ addInstallFiles(sources.files, $$sourcefiles) -+ sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase -+ INSTALLS += sources ++sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase + INSTALLS += sources check_examples { - srcfiles = $$sources.files diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 1903e509c8..ae7b585989 100644 --- a/mkspecs/features/qt_functions.prf @@ -952,7 +940,7 @@ index 1d947159e2..b36865fc48 100644 set_target_properties(Qt5::qdbusxml2cpp PROPERTIES diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..37b95d1b6b 100644 +index 07869efd7d..fb4183bada 100644 --- a/src/gui/Qt5GuiConfigExtras.cmake.in +++ b/src/gui/Qt5GuiConfigExtras.cmake.in @@ -2,7 +2,7 @@ @@ -976,7 +964,7 @@ index 07869efd7d..37b95d1b6b 100644 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ELSE set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF @@ -1006,28 +994,6 @@ index 8d2cffc304..9730fb33f2 100644 if (!lib.load()) return false; } -diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm -index 341d3bccf2..3368234c26 100644 ---- a/src/plugins/bearer/corewlan/qcorewlanengine.mm -+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm -@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations() - QMacAutoReleasePool pool; - userProfiles.clear(); - -- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; -+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; - for (NSString *ifName in wifiInterfaces) { - - CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName]; -@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate() - - QMacAutoReleasePool pool; - -- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; -+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; - for (NSString *ifName in wifiInterfaces) { - scanThread->interfaceName = QString::fromNSString(ifName); - scanThread->start(); diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp index b5a0a5bbeb..6c20305f4d 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -1082,41 +1048,6 @@ index da63360333..95e34e2e50 100644 xcursorFound = xcursorLib.load(); } if (xcursorFound) { -diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm -index d1f19f2..1ac2cf1 100644 ---- a/src/plugins/platforms/cocoa/qcocoawindow.mm -+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm -@@ -1699,7 +1699,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window) - - if (!m_drawContentBorderGradient) { - window.styleMask = window.styleMask & ~NSTexturedBackgroundWindowMask; -- [window.contentView.superview setNeedsDisplay:YES]; -+ [[window.contentView superview] setNeedsDisplay:YES]; - window.titlebarAppearsTransparent = NO; - return; - } -diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm -index e846fa0..4171cd4 100644 ---- a/src/plugins/platforms/cocoa/qnswindow.mm -+++ b/src/plugins/platforms/cocoa/qnswindow.mm -@@ -224,7 +224,7 @@ static bool isMouseEvent(NSEvent *ev) - if (pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) { - NSPoint loc = [theEvent locationInWindow]; - NSRect windowFrame = [self convertRectFromScreen:self.frame]; -- NSRect contentFrame = self.contentView.frame; -+ NSRect contentFrame = [self.contentView frame]; - if (NSMouseInRect(loc, windowFrame, NO) && !NSMouseInRect(loc, contentFrame, NO)) - [qnsview_cast(pw->view()) handleFrameStrutMouseEvent:theEvent]; - } -@@ -253,7 +253,7 @@ static bool isMouseEvent(NSEvent *ev) - + (void)applicationActivationChanged:(NSNotification*)notification - { - const id sender = self; -- NSEnumerator *windowEnumerator = nullptr; -+ NSEnumerator *windowEnumerator = nullptr; - NSApplication *application = [NSApplication sharedApplication]; - - #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp index c4cd66c33b..b6f2691587 100644 --- a/src/plugins/platformthemes/gtk3/main.cpp @@ -1153,6 +1084,26 @@ index c4cd66c33b..b6f2691587 100644 return 0; } +diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h +index 6498ea84ef..d821ced7fc 100644 +--- a/src/testlib/qtestassert.h ++++ b/src/testlib/qtestassert.h +@@ -44,10 +44,13 @@ + + QT_BEGIN_NAMESPACE + +- ++#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) ++#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) ++#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) ++#else + #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) +- + #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) ++#endif + + QT_END_NAMESPACE + diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in index 99d87e2e46..a4eab2aa72 100644 --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in diff --git a/pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch index bb1bbbeb05e0..01a975c14ec7 100644 --- a/pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch +++ b/pkgs/development/libraries/qt-5/5.10/qtdeclarative.patch @@ -1,8 +1,8 @@ diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp -index ee5b38717..bbccef8c4 100644 +index a7cafa1a9..e17ffd35b 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp -@@ -1678,6 +1678,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) +@@ -1737,6 +1737,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); addImportPath(installImportsPath); @@ -17,7 +17,7 @@ index ee5b38717..bbccef8c4 100644 + // env import paths if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) { - const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); + const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH"); diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf index 330da358b..cdf570205 100644 --- a/tools/qmlcachegen/qmlcache.prf diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase.patch b/pkgs/development/libraries/qt-5/5.6/qtbase.patch index 6bdf774e15d6..d8322cbc1997 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.6/qtbase.patch @@ -1,5 +1,5 @@ diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 11fb52a0b1..a4cca1fdcb 100644 +index 11fb52a0b1..614fdbb046 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -21,7 +21,7 @@ load(cmake_functions) @@ -35,7 +35,7 @@ index 11fb52a0b1..a4cca1fdcb 100644 - # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} - CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" -} -+CMAKE_LIB_DIR = $$NIX_OUTPUT_DEV/lib/ ++CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ +CMAKE_LIB_DIR_IS_ABSOLUTE = True -CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) @@ -64,7 +64,7 @@ index 11fb52a0b1..a4cca1fdcb 100644 - CMAKE_DLL_DIR = $$CMAKE_LIB_DIR - CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE -} -+CMAKE_DLL_DIR = $$NIX_OUTPUT_DEV/lib/ ++CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ +CMAKE_DLL_DIR_IS_ABSOLUTE = True static|staticlib:CMAKE_STATIC_TYPE = true @@ -628,7 +628,7 @@ index 1d947159e2..b36865fc48 100644 set_target_properties(Qt5::qdbusxml2cpp PROPERTIES diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..37b95d1b6b 100644 +index 07869efd7d..fb4183bada 100644 --- a/src/gui/Qt5GuiConfigExtras.cmake.in +++ b/src/gui/Qt5GuiConfigExtras.cmake.in @@ -2,7 +2,7 @@ @@ -652,7 +652,7 @@ index 07869efd7d..37b95d1b6b 100644 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ELSE set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF @@ -758,6 +758,28 @@ index 4646ced954..ff3111f393 100644 xcursorFound = xcursorLib.load(); } if (xcursorFound) { +diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h +index ca3e02ca06..28dd73d772 100644 +--- a/src/testlib/qtestassert.h ++++ b/src/testlib/qtestassert.h +@@ -38,10 +38,13 @@ + + QT_BEGIN_NAMESPACE + +- +-#define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (0) +- +-#define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (0) ++#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) ++#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) ++#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) ++#else ++#define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) ++#define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) ++#endif + + QT_END_NAMESPACE + diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in index 99d87e2e46..a4eab2aa72 100644 --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase.patch b/pkgs/development/libraries/qt-5/5.9/qtbase.patch index 69e389a5a6d4..086ddf4fe3e7 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase.patch @@ -12,7 +12,7 @@ index 5208379f9a..92fe29a0ac 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index bb5083c925..da8e2cb386 100644 +index bb5083c925..77034f9bb6 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -21,7 +21,7 @@ load(cmake_functions) @@ -48,7 +48,7 @@ index bb5083c925..da8e2cb386 100644 - # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} - CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" -} -+CMAKE_LIB_DIR = $$NIX_OUTPUT_DEV/lib/ ++CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ +CMAKE_LIB_DIR_IS_ABSOLUTE = True -CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) @@ -77,7 +77,7 @@ index bb5083c925..da8e2cb386 100644 - CMAKE_DLL_DIR = $$CMAKE_LIB_DIR - CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE -} -+CMAKE_DLL_DIR = $$NIX_OUTPUT_DEV/lib/ ++CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ +CMAKE_DLL_DIR_IS_ABSOLUTE = True static|staticlib:CMAKE_STATIC_TYPE = true @@ -432,13 +432,13 @@ index e645ba5803..a0e5c68b7e 100644 - -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index 44636f2288..61ed486a76 100644 +index 44636f2288..3b01424e67 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf -@@ -1,56 +1,3 @@ +@@ -1,56 +1,2 @@ CONFIG = asset_catalogs rez $$CONFIG load(default_pre) - +- -isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { - # Get path of Xcode's Developer directory - QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") @@ -493,11 +493,11 @@ index 44636f2288..61ed486a76 100644 -# at build time, depending on the current Xcode SDK and configuration. -QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3f6dc076ca..8b13789179 100644 +index 3f6dc076ca..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf -@@ -1,58 +1 @@ - +@@ -1,58 +0,0 @@ +- -isEmpty(QMAKE_MAC_SDK): \ - error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") - @@ -676,30 +676,18 @@ index 72dde61a40..f891a2baed 100644 INSTALLS += inst_qch_docs diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 668669e4cd..30f7fbac41 100644 +index 668669e4cd..eb4840a0aa 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf -@@ -77,13 +77,13 @@ for(extra, extras): \ - # Just for Qt Creator - OTHER_FILES += $$sourcefiles - --sourcefiles += \ -- $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \ -- $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ -- $$DBUS_ADAPTORS $$DBUS_INTERFACES --addInstallFiles(sources.files, $$sourcefiles) +@@ -82,7 +82,7 @@ sourcefiles += \ + $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ + $$DBUS_ADAPTORS $$DBUS_INTERFACES + addInstallFiles(sources.files, $$sourcefiles) -sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase --INSTALLS += sources -+ sourcefiles += \ -+ $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \ -+ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ -+ $$DBUS_ADAPTORS $$DBUS_INTERFACES -+ addInstallFiles(sources.files, $$sourcefiles) -+ sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase -+ INSTALLS += sources ++sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase + INSTALLS += sources check_examples { - srcfiles = $$sources.files diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 1903e509c8..ae7b585989 100644 --- a/mkspecs/features/qt_functions.prf @@ -952,7 +940,7 @@ index 1d947159e2..b36865fc48 100644 set_target_properties(Qt5::qdbusxml2cpp PROPERTIES diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 07869efd7d..37b95d1b6b 100644 +index 07869efd7d..fb4183bada 100644 --- a/src/gui/Qt5GuiConfigExtras.cmake.in +++ b/src/gui/Qt5GuiConfigExtras.cmake.in @@ -2,7 +2,7 @@ @@ -976,7 +964,7 @@ index 07869efd7d..37b95d1b6b 100644 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ELSE set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF @@ -1028,28 +1016,6 @@ index c92d8fc3f8..6008063bcf 100644 { // specific curves requested, but not possible to set -> error sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); -diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm -index 341d3bccf2..3368234c26 100644 ---- a/src/plugins/bearer/corewlan/qcorewlanengine.mm -+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm -@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations() - QMacAutoReleasePool pool; - userProfiles.clear(); - -- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; -+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; - for (NSString *ifName in wifiInterfaces) { - - CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName]; -@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate() - - QMacAutoReleasePool pool; - -- NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; -+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames]; - for (NSString *ifName in wifiInterfaces) { - scanThread->interfaceName = QString::fromNSString(ifName); - scanThread->start(); diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp index b5a0a5bbeb..6c20305f4d 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -1068,19 +1034,6 @@ index b5a0a5bbeb..6c20305f4d 100644 } QString TableGenerator::findComposeFile() -diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm -index 5cd4beb4f0..84919e6d6a 100644 ---- a/src/plugins/platforms/cocoa/qcocoawindow.mm -+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm -@@ -320,7 +320,7 @@ static void qt_closePopups() - + (void)applicationActivationChanged:(NSNotification*)notification - { - const id sender = self; -- NSEnumerator *windowEnumerator = nullptr; -+ NSEnumerator *windowEnumerator = nullptr; - NSApplication *application = [NSApplication sharedApplication]; - - #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12) diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp index e2e573f0e1..1c8289f81e 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -1153,6 +1106,26 @@ index c4cd66c33b..b6f2691587 100644 return 0; } +diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h +index 6498ea84ef..d821ced7fc 100644 +--- a/src/testlib/qtestassert.h ++++ b/src/testlib/qtestassert.h +@@ -44,10 +44,13 @@ + + QT_BEGIN_NAMESPACE + +- ++#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) ++#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) ++#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) ++#else + #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) +- + #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) ++#endif + + QT_END_NAMESPACE + diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in index 99d87e2e46..a4eab2aa72 100644 --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in diff --git a/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh b/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh index 916981b5299f..33682f6f3c69 100644 --- a/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh +++ b/pkgs/development/libraries/qt-5/hooks/fix-qt-module-paths.sh @@ -15,8 +15,8 @@ fixQtModulePaths () { if grep -q '\$\$QT_MODULE_' "${pr:?}"; then echo "fixQtModulePaths: Fixing module paths in \`${pr:?}'..." sed -i "${pr:?}" \ - -e "s|\\\$\\\$QT_MODULE_LIB_BASE|$dev/lib|g" \ - -e "s|\\\$\\\$QT_MODULE_HOST_LIB_BASE|$dev/lib|g" \ + -e "s|\\\$\\\$QT_MODULE_LIB_BASE|$lib/lib|g" \ + -e "s|\\\$\\\$QT_MODULE_HOST_LIB_BASE|$lib/lib|g" \ -e "s|\\\$\\\$QT_MODULE_INCLUDE_BASE|$dev/include|g" \ -e "s|\\\$\\\$QT_MODULE_BIN_BASE|$dev/bin|g" fi @@ -27,13 +27,6 @@ fixQtModulePaths () { echo "fixQtModulePaths: Warning: \`$dir' does not exist" fi - if [ "z$dev" != "z$lib" ]; then - if [ -d "$lib/lib" ]; then - mkdir -p "$dev/lib" - lndir -silent "$lib/lib" "$dev/lib" - fi - fi - if [ "z$bin" != "z$dev" ]; then if [ -d "$bin/bin" ]; then mkdir -p "$dev/bin" diff --git a/pkgs/development/libraries/qt-5/hooks/fix-qt-static-libs.sh b/pkgs/development/libraries/qt-5/hooks/fix-qt-static-libs.sh deleted file mode 100644 index 2a20e77e7ba7..000000000000 --- a/pkgs/development/libraries/qt-5/hooks/fix-qt-static-libs.sh +++ /dev/null @@ -1,32 +0,0 @@ -# fixQtStaticLibs -# -# Usage: fixQtStaticLibs _lib_ _dev_ -# -# Find static Qt libraries in output _lib_ and move them to the corresponding -# path in output _dev_. Any QMake library definitions (*.prl files) are also -# moved and library paths are patched. -# -fixQtStaticLibs() { - local lib="$1" - local dev="$2" - - pushd "$lib" - if [ -d "lib" ]; then - find lib \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | \ - while read -r -d $'\0' file; do - mkdir -p "$dev/$(dirname "$file")" - mv "$lib/$file" "$dev/$file" - done - fi - popd - - if [ -d "$dev" ]; then - find "$dev" -name '*.prl' | while read prl; do - echo "fixQtStaticLibs: Fixing built-in paths in \`$prl'..." - sed -i "$prl" \ - -e '/^QMAKE_PRL_BUILD_DIR =/d' \ - -e '/^QMAKE_PRO_INPUT =/d' \ - -e "s|-L\\\$\\\$NIX_OUTPUT_OUT/lib|-L$lib/lib -L$dev/lib|g" - done - fi -} diff --git a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 8ec7eeda8aee..1dc0a8f0e663 100644 --- a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh @@ -4,7 +4,6 @@ qtDocPrefix=@qtDocPrefix@ . @fix_qt_builtin_paths@ . @fix_qt_module_paths@ -. @fix_qt_static_libs@ providesQtRuntime() { [ -d "$1/$qtPluginPrefix" ] || [ -d "$1/$qtQmlPrefix" ] @@ -67,12 +66,3 @@ postPatchMkspecs() { if [ -z "$dontPatchMkspecs" ]; then postPhases="${postPhases}${postPhases:+ }postPatchMkspecs" fi - -postMoveQtStaticLibs() { - if [ "z${!outputLib}" != "z${!outputDev}" ]; then - fixQtStaticLibs "${!outputLib}" "${!outputDev}" - fi -} -if [ -z "$dontMoveQtStaticLibs" ]; then - postPhases="${postPhases}${postPhases:+ }postMoveQtStaticLibs" -fi diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix index 385ebeacd8f8..97bd09c327b2 100644 --- a/pkgs/development/libraries/qt-5/mkDerivation.nix +++ b/pkgs/development/libraries/qt-5/mkDerivation.nix @@ -14,6 +14,8 @@ let ++ optional (debug != null) (if debug then "CONFIG+=debug" else "CONFIG+=release"); + NIX_CFLAGS_COMPILE = optional (debug != null) "-DQT_NO_DEBUG"; + cmakeFlags = (args.cmakeFlags or []) ++ [ "-DBUILD_TESTING=OFF" ] diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 172b20bc51bb..67b9a72ee3f1 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -97,7 +97,6 @@ stdenv.mkDerivation { fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; fix_qt_module_paths = ../hooks/fix-qt-module-paths.sh; preHook = '' - . "$fix_qt_static_libs" . "$fix_qt_builtin_paths" . "$fix_qt_module_paths" . ${../hooks/move-qt-dev-tools.sh} @@ -363,11 +362,6 @@ stdenv.mkDerivation { fixQtBuiltinPaths "''${!outputDev}" '*.pr?' '' - # Move static libraries and QMake library definitions into $dev. - + '' - fixQtStaticLibs "''${!outputLib}" "''${!outputDev}" - '' - # Move development tools to $dev + '' moveQtDevTools From 7e5346c5844afcbe77d88d0729d1c45d0d615195 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 15 Jan 2018 19:07:05 -0600 Subject: [PATCH 28/95] kwidgetsaddons: 5.42.0 -> 5.42.1 Fix regression with Kate sidebar. See also: https://mail.kde.org/pipermail/release-team/2018-January/010780.html --- pkgs/development/libraries/kde-frameworks/srcs.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index d4390da66506..f8d4bcf5c8f9 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -499,11 +499,11 @@ }; }; kwidgetsaddons = { - version = "5.42.0"; + version = "5.42.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.42/kwidgetsaddons-5.42.0.tar.xz"; - sha256 = "19fhcscc0irznqmjpi57sl22vrv2lcmqbhkcg2smimgd0r7pm7wg"; - name = "kwidgetsaddons-5.42.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.42/kwidgetsaddons-5.42.1.tar.xz"; + sha256 = "0h0vfrfl5zi01fpvmd825kazzlyawz3i66qrfkymdrnvqmfzcmlg"; + name = "kwidgetsaddons-5.42.1.tar.xz"; }; }; kwindowsystem = { From 5783980fc6945d95549f5955a9d9312f35b8d49c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 15 Jan 2018 19:12:01 -0600 Subject: [PATCH 29/95] qtbase: fix evaluation error `git rebase` strikes again! --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 3c070bf6ce97..aa4449504bb9 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -93,7 +93,6 @@ stdenv.mkDerivation { inherit patches; - fix_qt_static_libs = ../hooks/fix-qt-static-libs.sh; fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; fix_qt_module_paths = ../hooks/fix-qt-module-paths.sh; preHook = '' From 95783a0380c2945e8c768dde64284d93cb945e8e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 16 Jan 2018 02:52:22 +0800 Subject: [PATCH 30/95] ethsign: init at 0.8.2 --- pkgs/applications/altcoins/default.nix | 2 + .../applications/altcoins/ethsign/default.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/altcoins/ethsign/default.nix diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 7d834be5da88..757c6e276fdf 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -29,6 +29,8 @@ rec { dogecoin = callPackage ./dogecoin.nix { withGui = true; }; dogecoind = callPackage ./dogecoin.nix { withGui = false; }; + ethsign = callPackage ./ethsign { }; + freicoin = callPackage ./freicoin.nix { boost = boost155; }; go-ethereum = callPackage ./go-ethereum.nix { inherit (darwin) libobjc; diff --git a/pkgs/applications/altcoins/ethsign/default.nix b/pkgs/applications/altcoins/ethsign/default.nix new file mode 100644 index 000000000000..b7d14a43921b --- /dev/null +++ b/pkgs/applications/altcoins/ethsign/default.nix @@ -0,0 +1,59 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit, clang }: + +buildGoPackage rec { + name = "ethsign-${version}"; + version = "0.8.2"; + + goPackagePath = "github.com/dapphub/ethsign"; + hardeningDisable = ["fortify"]; + + src = fetchFromGitHub { + owner = "dapphub"; + repo = "ethsign"; + rev = "v${version}"; + sha256 = "1gd0bq5x49sjm83r2wivjf03dxvhdli6cvwb9b853wwcvy4inmmh"; + }; + + extraSrcs = [ + { + goPackagePath = "github.com/ethereum/go-ethereum"; + src = fetchFromGitHub { + owner = "ethereum"; + repo = "go-ethereum"; + rev = "v1.7.3"; + sha256 = "1w6rbq2qpjyf2v9mr18yiv2af1h2sgyvgrdk4bd8ixgl3qcd5b11"; + }; + } + { + goPackagePath = "gopkg.in/urfave/cli.v1"; + src = fetchFromGitHub { + owner = "urfave"; + repo = "cli"; + rev = "v1.19.1"; + sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122"; + sha256 = "095zyvjb0m2pz382500miqadhk7w3nis8z3j941z8cq4rdafijvi"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + src = fetchgit { + url = "https://go.googlesource.com/sys"; + rev = "53aa286056ef226755cd898109dbcdaba8ac0b81"; + sha256 = "1yd17ccklby099cpdcsgx6lf0lj968hsnppp16mwh9009ldf72r1"; + }; + } + ]; + + meta = with stdenv.lib; { + homepage = http://github.com/dapphub/ethsign; + description = "Make raw signed Ethereum transactions"; + license = [licenses.gpl3]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 233196995fa7..eceb8e1b44b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2819,7 +2819,7 @@ with pkgs; inadyn = callPackage ../tools/networking/inadyn { }; inboxer = callPackage ../applications/networking/mailreaders/inboxer { }; - + inetutils = callPackage ../tools/networking/inetutils { }; inform7 = callPackage ../development/compilers/inform7 { }; @@ -14184,6 +14184,7 @@ with pkgs; go-ethereum = self.altcoins.go-ethereum; + ethsign = self.altcoins.ethsign; ethabi = self.altcoins.ethabi; ethrun = self.altcoins.ethrun; seth = self.altcoins.seth; From 608eaeaeab10593a3f661e9e1012286febbaeb45 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 16 Jan 2018 02:52:41 +0800 Subject: [PATCH 31/95] seth: 0.5.6 -> 0.6.2 --- pkgs/applications/altcoins/seth.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix index b2f5cfdea067..40fbf2ceb6a7 100644 --- a/pkgs/applications/altcoins/seth.nix +++ b/pkgs/applications/altcoins/seth.nix @@ -1,22 +1,24 @@ { stdenv, makeWrapper, lib, fetchFromGitHub -, bc, coreutils, curl, ethabi, git, gnused, jshon, perl, solc, which }: +, bc, coreutils, curl, ethabi, git, gnused, jshon, perl, solc, which +, nodejs, ethsign +}: stdenv.mkDerivation rec { name = "seth-${version}"; - version = "0.5.6"; + version = "0.6.2"; src = fetchFromGitHub { owner = "dapphub"; repo = "seth"; rev = "v${version}"; - sha256 = "1zl70xy7njjwy4k4g84v7lpf9a2nnnbxh4mkpw7jzqfs2mr636z6"; + sha256 = "1lbr7i3rznfp3h03y7pc094r0m992lbzr926rnr0xxbyp755wvm4"; }; nativeBuildInputs = [makeWrapper]; buildPhase = "true"; makeFlags = ["prefix=$(out)"]; postInstall = let path = lib.makeBinPath [ - bc coreutils curl ethabi git gnused jshon perl solc which + bc coreutils curl ethabi git gnused jshon perl solc which nodejs ethsign ]; in '' wrapProgram "$out/bin/seth" --prefix PATH : "${path}" ''; From ddb2150112bbf3ec3172072dbe50620a376c63c3 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 15 Jan 2018 17:06:23 +0100 Subject: [PATCH 32/95] i3status-rust: 0.9.0.2017-11-09 -> 0.9.0.2018-01-15 --- pkgs/applications/window-managers/i3/status-rust.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 05965fc37174..0b86c0283e0c 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "i3status-rust-${version}"; - version = "0.9.0.2017-11-09"; + version = "0.9.0.2018-01-15"; src = fetchFromGitHub { owner = "greshake"; repo = "i3status-rust"; - rev = "5daf2cdd611bed3db804d011d5d5af34b558e615"; - sha256 = "0j6h7x5mm3m7wq0if20qxc9z3qw29xgf5qb3sqwdbdpz8ykpqdgk"; + rev = "aa7bc98d945ba63358cd48c66e0261c201b999e4"; + sha256 = "1q2p53nl499yxsw0i81ryyc2ln80p8i3iii5hx7aiwfi4ybm55b1"; }; cargoSha256 = "1197hp6d4z14j0r22bvw9ly294li0ivg6yfql4lgi27hbvzag71h"; From b6a90700b8883f505fa9d814d6c86f8f155f6505 Mon Sep 17 00:00:00 2001 From: Ashley Gillman Date: Tue, 16 Jan 2018 13:35:49 +1000 Subject: [PATCH 33/95] wakatime: don't run check phase --- pkgs/tools/misc/wakatime/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index c1091d47c5a8..d9b72d9a69ca 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -11,6 +11,8 @@ buildPythonApplication rec { sha256 = "1bg8fzd3rdc6na0a7z1d55m2gbnfq6d72mf2jlyzc817r6dr4bfx"; }; + doCheck = false; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "WakaTime command line interface"; From 22e83d26673160bc7ad6f5a36b9ee01373806cd8 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Tue, 16 Jan 2018 11:40:16 +0700 Subject: [PATCH 34/95] openvpn: add warning about world-readable credentials --- nixos/modules/services/networking/openvpn.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 8a059f609546..7a96b673c51e 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -171,6 +171,8 @@ in description = '' This option can be used to store the username / password credentials with the "auth-user-pass" authentication method. + + WARNING: Using this option will put the credentials WORLD-READABLE in the Nix store! ''; type = types.nullOr (types.submodule { From f71d9bfd6b85e74b7dd9446f42cd6fea2b5ea4a1 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 29 Dec 2017 19:41:41 +0900 Subject: [PATCH 35/95] parallel-rust: init at 0.11.3 --- pkgs/tools/misc/parallel-rust/default.nix | 25 +++++++++++++++++++ .../fix_cargo_lock_version.patch | 12 +++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/tools/misc/parallel-rust/default.nix create mode 100644 pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/pkgs/tools/misc/parallel-rust/default.nix new file mode 100644 index 000000000000..699fe4cf9718 --- /dev/null +++ b/pkgs/tools/misc/parallel-rust/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "parallel-rust-${version}"; + version = "0.11.3"; + + src = fetchFromGitHub { + owner = "mmstick"; + repo = "parallel"; + rev = version; + sha256 = "1bb1m3ckkrxlnw9w24ig70bd1zwyrbaw914q3xz5yv43c0l6pn9c"; + }; + + cargoSha256 = "0p3wpjz3jrqjasi39zq6q54dhpymc5jp0mfsnzbq6dvz18s8m588"; + + patches = [ ./fix_cargo_lock_version.patch ]; + + meta = with stdenv.lib; { + description = "A command-line CPU load balancer written in Rust"; + homepage = https://github.com/mmstick/parallel; + license = licenses.mit; + maintainers = []; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch b/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch new file mode 100644 index 000000000000..75a1ba35e129 --- /dev/null +++ b/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch @@ -0,0 +1,12 @@ +diff --git a/Cargo.lock b/Cargo.lock +index c01308d..dba3927 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,6 +1,6 @@ + [root] + name = "parallel" +-version = "0.11.2" ++version = "0.11.3" + dependencies = [ + "arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d95b668a071..9da735b9eee3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1253,6 +1253,8 @@ with pkgs; ps_mem = callPackage ../tools/system/ps_mem { }; + parallel-rust = callPackage ../tools/misc/parallel-rust { }; + socklog = callPackage ../tools/system/socklog { }; staccato = callPackage ../tools/text/staccato { }; From 7e0402632d35817bd567da0909439176115a8cf3 Mon Sep 17 00:00:00 2001 From: y0no Date: Tue, 16 Jan 2018 08:40:49 +0100 Subject: [PATCH 36/95] bettercap: init at 1.6.2 (#33902) --- lib/maintainers.nix | 1 + pkgs/tools/security/bettercap/Gemfile | 2 + pkgs/tools/security/bettercap/Gemfile.lock | 42 +++++++ pkgs/tools/security/bettercap/default.nix | 23 ++++ pkgs/tools/security/bettercap/gemset.nix | 121 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 191 insertions(+) create mode 100644 pkgs/tools/security/bettercap/Gemfile create mode 100644 pkgs/tools/security/bettercap/Gemfile.lock create mode 100644 pkgs/tools/security/bettercap/default.nix create mode 100644 pkgs/tools/security/bettercap/gemset.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e45ccbe8f5dc..8404886533d1 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -739,6 +739,7 @@ xvapx = "Marti Serra "; xwvvvvwx = "David Terry "; xzfc = "Albert Safin "; + y0no = "Yoann Ono "; yarr = "Dmitry V. "; yegortimoshenko = "Yegor Timoshenko "; ylwghst = "Burim Augustin Berisa "; diff --git a/pkgs/tools/security/bettercap/Gemfile b/pkgs/tools/security/bettercap/Gemfile new file mode 100644 index 000000000000..8fb2a1c300a7 --- /dev/null +++ b/pkgs/tools/security/bettercap/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'bettercap' diff --git a/pkgs/tools/security/bettercap/Gemfile.lock b/pkgs/tools/security/bettercap/Gemfile.lock new file mode 100644 index 000000000000..9260d1fd5ab6 --- /dev/null +++ b/pkgs/tools/security/bettercap/Gemfile.lock @@ -0,0 +1,42 @@ +GEM + remote: https://rubygems.org/ + specs: + bettercap (1.6.2) + colorize (~> 0.8.0) + em-proxy (~> 0.1, >= 0.1.8) + net-dns (~> 0.8, >= 0.8.0) + network_interface (~> 0.0, >= 0.0.1) + packetfu (~> 1.1, >= 1.1.10) + pcaprub (~> 0.12, >= 0.12.0, <= 1.1.11) + rubydns (~> 1.0, >= 1.0.3) + celluloid (0.16.0) + timers (~> 4.0.0) + celluloid-io (0.16.2) + celluloid (>= 0.16.0) + nio4r (>= 1.1.0) + colorize (0.8.1) + em-proxy (0.1.9) + eventmachine + eventmachine (1.2.5) + hitimes (1.2.6) + net-dns (0.8.0) + network_interface (0.0.2) + nio4r (2.2.0) + packetfu (1.1.13) + pcaprub + pcaprub (0.12.4) + rubydns (1.0.3) + celluloid (= 0.16.0) + celluloid-io (= 0.16.2) + timers (~> 4.0.1) + timers (4.0.4) + hitimes + +PLATFORMS + ruby + +DEPENDENCIES + bettercap + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix new file mode 100644 index 000000000000..46832e83ac96 --- /dev/null +++ b/pkgs/tools/security/bettercap/default.nix @@ -0,0 +1,23 @@ +{ lib, bundlerEnv, ruby, libpcap}: + +bundlerEnv rec { + name = "bettercap-${version}"; + + version = (import gemset).bettercap.version; + inherit ruby; + gemdir = ./.; + gemset = ./gemset.nix; + + buildInputs = [ libpcap ruby ]; + + meta = with lib; { + description = "A man in the middle tool"; + longDescription = '' + BetterCAP is a powerful, flexible and portable tool created to perform various types of MITM attacks against a network, manipulate HTTP, HTTPS and TCP traffic in realtime, sniff for credentials and much more. + '' ; + homepage = https://www.bettercap.org/; + license = with licenses; gpl3; + maintainers = with maintainers; [ y0no ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/security/bettercap/gemset.nix b/pkgs/tools/security/bettercap/gemset.nix new file mode 100644 index 000000000000..bd5c33ba22c6 --- /dev/null +++ b/pkgs/tools/security/bettercap/gemset.nix @@ -0,0 +1,121 @@ +{ + bettercap = { + dependencies = ["colorize" "em-proxy" "net-dns" "network_interface" "packetfu" "pcaprub" "rubydns"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mns96yfyfnksk720p8k83qkwwsid4sicwgrzxaa9gbc53aalll0"; + type = "gem"; + }; + version = "1.6.2"; + }; + celluloid = { + dependencies = ["timers"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3"; + type = "gem"; + }; + version = "0.16.0"; + }; + celluloid-io = { + dependencies = ["celluloid" "nio4r"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l1x0p6daa5vskywrvaxdlanwib3k5pps16axwyy4p8d49pn9rnx"; + type = "gem"; + }; + version = "0.16.2"; + }; + colorize = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b"; + type = "gem"; + }; + version = "0.8.1"; + }; + em-proxy = { + dependencies = ["eventmachine"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yzkg6jkmcg859b5mf13igpf8q2bjhsmqjsva05948fi733w5n2j"; + type = "gem"; + }; + version = "0.1.9"; + }; + eventmachine = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z"; + type = "gem"; + }; + version = "1.2.5"; + }; + hitimes = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06222h9236jw9jgmdlpi0q7psac1shvxqxqx905qkvabmxdxlfar"; + type = "gem"; + }; + version = "1.2.6"; + }; + net-dns = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12nal6vhdyg0pbcqpsxqr59h7mbgdhcqp3v0xnzvy167n40gabf9"; + type = "gem"; + }; + version = "0.8.0"; + }; + network_interface = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xh4knfq77ii4pjzsd2z1p3nd6nrcdjhb2vi5gw36jqj43ffw0zp"; + type = "gem"; + }; + version = "0.0.2"; + }; + nio4r = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jjrj7vs29w6dfgsxq08226jfbi2j0x62lf4p9zmvyp19dj4z00a"; + type = "gem"; + }; + version = "2.2.0"; + }; + packetfu = { + dependencies = ["pcaprub"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16ppq9wfxq4x2hss61l5brs3s6fmi8gb50mnp1nnnzb1asq4g8ll"; + type = "gem"; + }; + version = "1.1.13"; + }; + pcaprub = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pl4lqy7308185pfv0197n8b4v20fhd0zb3wlpz284rk8ssclkvz"; + type = "gem"; + }; + version = "0.12.4"; + }; + rubydns = { + dependencies = ["celluloid" "celluloid-io" "timers"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cvj8li8shz7zn1rc5hdrkqmvr9j187g4y28mvkfvmv1j9hdln62"; + type = "gem"; + }; + version = "1.0.3"; + }; + timers = { + dependencies = ["hitimes"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jx4wb0x182gmbcs90vz0wzfyp8afi1mpl9w5ippfncyk4kffvrz"; + type = "gem"; + }; + version = "4.0.4"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d95b668a071..b2489a30e0ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1372,6 +1372,8 @@ with pkgs; bepasty = callPackage ../tools/misc/bepasty { }; + bettercap = callPackage ../tools/security/bettercap { }; + bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner; bgs = callPackage ../tools/X11/bgs { }; From fa3d1c5dfbc48b822661c67b69508765b51003fe Mon Sep 17 00:00:00 2001 From: Drew Hess Date: Sun, 14 Jan 2018 20:19:49 -0800 Subject: [PATCH 37/95] netsniff-ng: 0.6.2 -> 0.6.3 --- pkgs/tools/networking/netsniff-ng/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index b0921375849d..6619d0a0f693 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchFromGitHub, bison, flex, geoip, geolite-legacy, libcli, libnet -, libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl -, pkgconfig, zlib }: +{ stdenv, fetchFromGitHub, makeWrapper, bison, flex, geoip, geolite-legacy +, libcli, libnet, libnetfilter_conntrack, libnl, libpcap, libsodium +, liburcu, ncurses, perl, pkgconfig, zlib }: stdenv.mkDerivation rec { name = "netsniff-ng-${version}"; - version = "0.6.2"; + version = "0.6.3"; # Upstream recommends and supports git src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; rev = "v${version}"; - sha256 = "1lz4hwgwdq3znlqjmvl7cw3g3ilbayn608h0hwqdf7v2jq6n67kg"; + sha256 = "0g3105c5ha897bpwsnrp72gx4n61gspxmld594i37g8k7vwzny4l"; }; patches = [ ./glibc-2.26.patch ]; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl libnetfilter_conntrack libpcap libsodium liburcu ncurses perl - pkgconfig zlib ]; + pkgconfig zlib makeWrapper ]; # ./configure is not autoGNU but some home-brewn magic configurePhase = '' @@ -33,6 +33,10 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ]; postInstall = '' + # trafgen and bpfc can call out to cpp to process config files. + wrapProgram "$out/sbin/trafgen" --prefix PATH ":" "${stdenv.cc}/bin" + wrapProgram "$out/sbin/bpfc" --prefix PATH ":" "${stdenv.cc}/bin" + ln -sv ${geolite-legacy}/share/GeoIP/GeoIP.dat $out/etc/netsniff-ng/country4.dat ln -sv ${geolite-legacy}/share/GeoIP/GeoIPv6.dat $out/etc/netsniff-ng/country6.dat ln -sv ${geolite-legacy}/share/GeoIP/GeoIPCity.dat $out/etc/netsniff-ng/city4.dat From b880ef935a45255c2133a4ed24d6f280a3338a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 16 Jan 2018 08:06:22 +0000 Subject: [PATCH 38/95] python.pkgs.nose-parameterized: 0.5.0 -> 0.6.0 --- .../nose-parameterized/default.nix | 27 +++++++++++++++++ pkgs/top-level/python-packages.nix | 30 ++----------------- 2 files changed, 29 insertions(+), 28 deletions(-) create mode 100644 pkgs/development/python-modules/nose-parameterized/default.nix diff --git a/pkgs/development/python-modules/nose-parameterized/default.nix b/pkgs/development/python-modules/nose-parameterized/default.nix new file mode 100644 index 000000000000..3c7cd077cdc0 --- /dev/null +++ b/pkgs/development/python-modules/nose-parameterized/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchPypi, buildPythonPackage, nose, six, glibcLocales, isPy3k }: + +buildPythonPackage rec { + pname = "nose-parameterized"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1khlabgib4161vn6alxsjaa8javriywgx9vydddi659gp9x6fpnk"; + }; + + # Tests require some python3-isms but code works without. + doCheck = isPy3k; + + buildInputs = [ nose glibcLocales ]; + propagatedBuildInputs = [ six ]; + + checkPhase = '' + LC_ALL="en_US.UTF-8" nosetests -v + ''; + + meta = with stdenv.lib; { + description = "Parameterized testing with any Python test framework"; + homepage = https://pypi.python.org/pypi/nose-parameterized; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10705d02d6bc..4e4c3b9c12ee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3947,33 +3947,7 @@ in { }; }); - nose-parameterized = buildPythonPackage (rec { - name = "nose-parameterized-${version}"; - version = "0.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/nose-parameterized/${name}.tar.gz"; - sha256 = "a11c41b0cf8218e7cdc19ab7a1bdf5c141d161cd2350daee819473cc63cd0685"; - }; - - # Tests require some python3-isms but code works without. - doCheck = isPy3k; - - LC_ALL = "en_US.UTF-8"; - buildInputs = with self; [ nose pkgs.glibcLocales ]; - propagatedBuildInputs = with self; [ self.six ]; - - checkPhase = '' - nosetests -v - ''; - - - meta = { - description = "Parameterized testing with any Python test framework"; - homepage = https://pypi.python.org/pypi/nose-parameterized; - license = licenses.bsd3; - }; - }); + nose-parameterized = callPackage ../development/python-modules/nose-parameterized {}; neurotools = buildPythonPackage (rec { name = "NeuroTools-${version}"; @@ -17752,7 +17726,7 @@ in { tiros = callPackage ../development/python-modules/tiros { }; tifffile = callPackage ../development/python-modules/tifffile { }; - + # Tkinter/tkinter is part of the Python standard library. # The Python interpreters in Nixpkgs come without tkinter by default. # To make the module available, we make it available as any other From 03b43c0325f10121cfc27d42cbdca91b0752fa30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 16 Jan 2018 08:10:22 +0000 Subject: [PATCH 39/95] wakatime: 10.0.1 -> 10.1.0 --- pkgs/tools/misc/wakatime/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index d9b72d9a69ca..ba760496a729 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -1,17 +1,26 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub }: +{ stdenv, python3Packages, fetchFromGitHub, glibcLocales }: +with python3Packages; buildPythonApplication rec { name = "wakatime-${version}"; - version = "10.0.1"; + version = "10.1.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime"; rev = version; - sha256 = "1bg8fzd3rdc6na0a7z1d55m2gbnfq6d72mf2jlyzc817r6dr4bfx"; + sha256 = "0mq1b5hwm03jz1mhlfiwi8k5r6556r1nfv9h7qs3y32zrj9mvifv"; }; + # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt + # especially nose-capturestderr, which we do not package yet. doCheck = false; + checkInputs = [ mock testfixtures pytest glibcLocales ]; + + checkPhase = '' + export HOME=$(mktemp -d) LC_ALL=en_US.utf-8 + pytest tests + ''; meta = with stdenv.lib; { inherit (src.meta) homepage; From 266a65eaa9b0588f7ce0af43bfebf154a15b67b4 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 16 Jan 2018 17:41:31 +0900 Subject: [PATCH 40/95] neovim: don't install desktop file on darwin nvim.desktop doesn't exist on darwin so forcefully reading it fails. --- pkgs/applications/editors/neovim/wrapper.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 2acba83d00bb..e2218473d723 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -68,7 +68,9 @@ let --unset PYTHONPATH \ ${optionalString withRuby '' --suffix PATH : ${rubyEnv}/bin --set GEM_HOME ${rubyEnv}/${rubyEnv.ruby.gemPath}'' } - # copy and patch the original neovim.destkop file + '' + + optionalString (!stdenv.isDarwin) '' + # copy and patch the original neovim.desktop file mkdir -p $out/share/applications substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ --replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \ From f6c2fb38461462395b25df8c0fb9fa78bbee25aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Tue, 16 Jan 2018 09:52:04 +0100 Subject: [PATCH 41/95] kimageformats: Fixes build --- pkgs/development/libraries/kde-frameworks/kimageformats.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 26a8637bafc2..29748a5f7f42 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -12,5 +12,5 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive openexr qtbase ]; outputs = [ "out" ]; # plugins only - NIX_CFLAGS_COMPILE = "-I${getDev ilmbase}/include/OpenEXR"; + CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR"; } From 6f7c1977005401a6a7a3e6ff00b5cf386f16bd0e Mon Sep 17 00:00:00 2001 From: schuppentier Date: Tue, 16 Jan 2018 10:05:42 +0100 Subject: [PATCH 42/95] evdi: 1.4.1+git2017-06-12 -> unstable-2018-01-12 (#33907) --- pkgs/os-specific/linux/evdi/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 11d0a461da09..5db64e15e048 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -2,15 +2,17 @@ stdenv.mkDerivation rec { name = "evdi-${version}"; - version = "1.4.1+git2017-06-12"; + version = "unstable-2018-01-12"; src = fetchFromGitHub { owner = "DisplayLink"; repo = "evdi"; - rev = "ee1c578774e62fe4b08d92750620ed3094642160"; - sha256 = "1m3wkmw4hjpjax7rvhmpicz09d7vxcxklq797ddjg6ljvf12671b"; + rev = "e7a08d08e3876efba8007e91df1b296f2447b8de"; + sha256 = "01z7bx5rgpb5lc4c6dxfiv52ni25564djxmvmgy3d7r1x1mqhxgs"; }; + nativeBuildInputs = kernel.moduleBuildDependencies; + buildInputs = [ kernel libdrm ]; makeFlags = [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; @@ -27,6 +29,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2; homepage = http://www.displaylink.com/; - broken = versionOlder kernel.version "4.9" || !stdenv.lib.versionOlder kernel.version "4.13"; + broken = versionOlder kernel.version "4.9"; }; } From 91e99899117c8712f5523dbaed4c275900922b43 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Tue, 16 Jan 2018 01:40:40 -0800 Subject: [PATCH 43/95] aenum: make tests pass (#33805) For Python 2, tests were failing because they depended on a particular way of executing the tests module as it defined a global variable and created a temporary file. Running it through setup.py didn't work. Invoking it directly solved the issue. For Python 3, aenum tests were disabled, however, they did't have to fail. Configuring UTF8 locale resolved the failure that was happening after the above fix for Python 2 was applied. --- .../python-modules/aenum/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 45e7f8915acf..466c20e19ca5 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy3k }: +{ stdenv, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }: buildPythonPackage rec { pname = "aenum"; @@ -10,12 +10,17 @@ buildPythonPackage rec { sha256 = "d98bc55136d696fcf323760c3db0de489da9e41fd51283fa6f90205deb85bf6a"; }; - doCheck = !isPy3k; - # The following tests fail (only in python3 - # test_convert (aenum.test.TestIntEnumConvert) - # test_convert_value_lookup_priority (aenum.test.TestIntEnumConvert) - # test_convert (aenum.test.TestIntEnumConvert) - # test_convert_value_lookup_priority (aenum.test.TestIntEnumConvert) + # For Python 3, locale has to be set to en_US.UTF-8 for + # tests to pass + checkInputs = if isPy3k then [ glibcLocales ] else []; + + checkPhase = '' + runHook preCheck + ${if isPy3k then "export LC_ALL=en_US.UTF-8" else ""} + PYTHONPATH=`pwd` ${python.interpreter} aenum/test.py + runHook postCheck + ''; + meta = { description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants"; From 748d5709b501fb0420981127e88b1ca77d428eea Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 16 Jan 2018 12:22:55 +0200 Subject: [PATCH 44/95] pythonPackages.stem: init at 1.6.0 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4e4c3b9c12ee..5f76212bdbb6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6890,6 +6890,24 @@ in { schema = callPackage ../development/python-modules/schema {}; + stem = buildPythonPackage rec { + name = "stem-${version}"; + version = "1.6.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/stem/${name}.tar.gz"; + sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp"; + }; + + meta = { + description = "Controller library that allows applications to interact with Tor (https://www.torproject.org/"; + homepage = https://stem.torproject.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ phreedom ]; + }; + + }; + svg-path = buildPythonPackage rec { name = "svg.path-${version}"; version = "2.0b1"; From 2bb5e5e7484365e0c4799b5f81ffc804e7526cb2 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Tue, 16 Jan 2018 12:24:09 +0200 Subject: [PATCH 45/95] onioncircuits: init at 0.5 --- pkgs/tools/security/onioncircuits/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/security/onioncircuits/default.nix diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix new file mode 100644 index 000000000000..24840426fd46 --- /dev/null +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, pythonPackages, intltool, gtk3, gobjectIntrospection, defaultIconTheme }: + +pythonPackages.buildPythonApplication rec { + name = "onioncircuits-${version}"; + version = "0.5"; + + src = fetchgit { + url = "https://git-tails.immerda.ch/onioncircuits/"; + rev = version; + sha256 = "13mqif9b9iajpkrl9ijspdnvy82kxhprxd5mw3njk68rcn4z2pcm"; + }; + + buildInputs = [ intltool gtk3 gobjectIntrospection ]; + propagatedBuildInputs = with pythonPackages; [ stem distutils_extra pygobject3 ]; + + postFixup = '' + wrapProgram "$out/bin/onioncircuits" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix XDG_DATA_DIRS : "$out/share:${defaultIconTheme}/share" + ''; + + meta = with stdenv.lib; { + homepage = https://tails.boum.org; + description = "GTK application to display Tor circuits and streams"; + license = licenses.gpl3; + maintainers = [ maintainers.phreedom ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 915c66b4a0c8..b4063591476c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3818,6 +3818,10 @@ with pkgs; ola = callPackage ../applications/misc/ola { }; + onioncircuits = callPackage ../tools/security/onioncircuits { + inherit (gnome3) defaultIconTheme; + }; + opencc = callPackage ../tools/text/opencc { }; opencl-info = callPackage ../tools/system/opencl-info { }; From 2995066e9bf24f9f929589c3019d2cc4d2150ef0 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Tue, 16 Jan 2018 11:31:35 +0100 Subject: [PATCH 46/95] alembic: use threadsafe hdf5 (#30682) * hdf5: introduce hdf5-threadsafe variant Compiled with thread safe support and without the High Level library which is incompatible with thread safety. * alembic: clean buildInputs to nativeBuildInputs * alembic: use hdf5-threadsafe --- pkgs/development/libraries/alembic/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index bd540cdd5005..a185f19a9a16 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5 }: +{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5-threadsafe }: stdenv.mkDerivation rec { @@ -14,7 +14,8 @@ stdenv.mkDerivation rec outputs = [ "bin" "dev" "out" "lib" ]; - buildInputs = [ unzip cmake openexr hdf5 ]; + nativeBuildInputs = [ unzip cmake ]; + buildInputs = [ openexr hdf5-threadsafe ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4063591476c..06a6eaec0a28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2688,6 +2688,13 @@ with pkgs; inherit gfortran; }); + hdf5-threadsafe = appendToName "threadsafe" (hdf5.overrideAttrs (oldAttrs: { + # Threadsafe hdf5 + # However, hdf5 hl (High Level) library is not considered stable + # with thread safety and should be disabled. + configureFlags = oldAttrs.configureFlags ++ ["--enable-threadsafe" "--disable-hl" ]; + })); + hdfview = callPackage ../tools/misc/hdfview { javac = jdk; }; From fd00da52050bc9e1ef49c329325c8eb88d9c3a62 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 16 Jan 2018 11:50:25 +0100 Subject: [PATCH 47/95] toot: 0.16.2 -> 0.17.1 --- pkgs/applications/misc/toot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index be8652619125..1f8ab8b438dd 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.16.2"; + version = "0.17.1"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = "${version}"; - sha256 = "19n6rmm44y24zvkpk56vd2xmx49sn6wc5qayi1jm83jlnlbbwfh7"; + sha256 = "05fzsakm089bn03z8gip6yp4xfmwa054v40x2f3gqpl04r504gis"; }; checkInputs = with python3Packages; [ pytest ]; From 97db14353878edbee994ef686cf7fa46f6a8aa88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Tue, 16 Jan 2018 12:21:18 +0100 Subject: [PATCH 48/95] kinit: Fixes build --- .../libraries/kde-frameworks/kinit/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index 1036ea277452..538078fd7457 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -14,10 +14,10 @@ mkDerivation { kconfig kcrash ki18n kio kservice kwindowsystem ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - NIX_CFLAGS_COMPILE = [ - ''-DNIXPKGS_KF5_KIOCORE="${getLib kio}/lib/libKF5KIOCore.so.5"'' - ''-DNIXPKGS_KF5_PARTS="${getLib kparts}/lib/libKF5Parts.so.5"'' - ''-DNIXPKGS_KF5_PLASMA="${getLib plasma-framework}/lib/libKF5Plasma.so.5"'' + CXXFLAGS = [ + ''-DNIXPKGS_KF5_KIOCORE=\"${getLib kio}/lib/libKF5KIOCore.so.5\"'' + ''-DNIXPKGS_KF5_PARTS=\"${getLib kparts}/lib/libKF5Parts.so.5\"'' + ''-DNIXPKGS_KF5_PLASMA=\"${getLib plasma-framework}/lib/libKF5Plasma.so.5\"'' ]; postFixup = '' moveToOutput "lib/libexec/kf5/start_kdeinit" "$bin" From 222f905fd9042f80d4cdef65bb7d2801fdb63429 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 16 Jan 2018 14:17:40 +0200 Subject: [PATCH 49/95] rustc: Supports ARMv7 --- pkgs/development/compilers/rust/bootstrap.nix | 3 +++ pkgs/development/compilers/rust/print-hashes.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 7814bc94828f..034334f58500 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -9,6 +9,7 @@ let hashes = { i686-unknown-linux-gnu = "b7caed0f602cdb8ef22e0bfa9125a65bec411e15c0b8901d937e43303ec7dbee"; x86_64-unknown-linux-gnu = "b41e70e018402bc04d02fde82f91bea24428e6be432f0df12ac400cfb03108e8"; + armv7-unknown-linux-gnueabihf = "416fa6f107ad9e386002e6af1aec495472e2ee489c842183dd429a25b07488d6"; aarch64-unknown-linux-gnu = "491ee6c43cc672006968d665bd34c94cc2219ef3592d93d38097c97eaaa864c3"; i686-apple-darwin = "c8b0fabeebcde66b683f3a871187e614e07305adda414c2862cb332aecb2b3bf"; x86_64-apple-darwin = "75a7f4bd7c72948030bb9e421df27e8a650dea826fb5b836cf59d23d6f985a0d"; @@ -19,6 +20,8 @@ let then "i686-unknown-linux-gnu" else if stdenv.system == "x86_64-linux" then "x86_64-unknown-linux-gnu" + else if stdenv.system == "armv7l-linux" + then "armv7-unknown-linux-gnueabihf" else if stdenv.system == "aarch64-linux" then "aarch64-unknown-linux-gnu" else if stdenv.system == "i686-darwin" diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index dc7e3719355c..7eb00a30ad73 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -10,6 +10,7 @@ set -euo pipefail PLATFORMS=( i686-unknown-linux-gnu x86_64-unknown-linux-gnu + armv7-unknown-linux-gnueabihf aarch64-unknown-linux-gnu i686-apple-darwin x86_64-apple-darwin From 2332e8b0d9f15aeac39b164977008a8cd35cd7c1 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Tue, 16 Jan 2018 01:46:37 +0900 Subject: [PATCH 50/95] kindlegen: Use unzip where necessary --- pkgs/tools/typesetting/kindlegen/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix index 159119a8a710..4e9a40239bfe 100644 --- a/pkgs/tools/typesetting/kindlegen/default.nix +++ b/pkgs/tools/typesetting/kindlegen/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, unzip }: let version = "2.9"; @@ -32,6 +32,8 @@ in stdenv.mkDerivation rec { sourceRoot = "."; + nativeBuildInputs = stdenv.lib.optional (stdenv.lib.hasSuffix ".zip" url) unzip; + installPhase = '' mkdir -p $out/bin $out/share/kindlegen/doc install -m755 kindlegen $out/bin/kindlegen From b72de3e28613cee990b24c2f93503f40413ff3f8 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 16 Jan 2018 21:37:51 +0800 Subject: [PATCH 51/95] kio-extras: Fix build with qt 5.10 --- pkgs/applications/kde/kio-extras.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index a78da6f48ca2..8abb58b46b27 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -18,5 +18,5 @@ mkDerivation { kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support kpty libmtp libssh openexr openslp phonon qtsvg samba solid ]; - NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; + CXXFLAGS = [ "-I${ilmbase.dev}/include/OpenEXR" ]; } From ec9ae466845abd431474ac9ebbf0eb4b95397fb9 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 16 Jan 2018 21:38:07 +0800 Subject: [PATCH 52/95] kwin: Fix build with qt 5.10 --- pkgs/desktops/plasma-5/kwin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index f31294e00d6f..289d5a812f7f 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -30,8 +30,8 @@ mkDerivation { ]; outputs = [ "bin" "dev" "out" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - NIX_CFLAGS_COMPILE = [ - ''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"'' + CXXFLAGS = [ + ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' ]; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; postInstall = '' From 9d57972cd55a6d75cf32c80ab89d933aa1627702 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 16 Jan 2018 21:38:22 +0800 Subject: [PATCH 53/95] plasma-desktop: Fix build with qt 5.10 --- pkgs/desktops/plasma-5/plasma-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 18675159df6d..318d416d8859 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -34,9 +34,9 @@ mkDerivation rec { postPatch = '' sed '1i#include ' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp ''; - NIX_CFLAGS_COMPILE = [ + CXXFLAGS = [ "-I${lib.getDev xorgserver}/include/xorg" - ''-DNIXPKGS_HWCLOCK="${lib.getBin utillinux}/sbin/hwclock"'' + ''-DNIXPKGS_HWCLOCK=\"${lib.getBin utillinux}/sbin/hwclock\"'' ]; cmakeFlags = [ "-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg" From f8630c9568a35f655d99b1ac149a662b93e4a63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Tue, 16 Jan 2018 14:40:57 +0100 Subject: [PATCH 54/95] plasma-vault: Fixes build --- pkgs/desktops/plasma-5/plasma-vault/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix index 203ff50d7357..300627163e57 100644 --- a/pkgs/desktops/plasma-5/plasma-vault/default.nix +++ b/pkgs/desktops/plasma-5/plasma-vault/default.nix @@ -26,13 +26,13 @@ mkDerivation { kactivities plasma-framework kwindowsystem libksysguard ]; - NIX_CFLAGS_COMPILE = [ - ''-DNIXPKGS_ENCFS="${lib.getBin encfs}/bin/encfs"'' - ''-DNIXPKGS_ENCFSCTL="${lib.getBin encfs}/bin/encfsctl"'' + CXXFLAGS = [ + ''-DNIXPKGS_ENCFS=\"${lib.getBin encfs}/bin/encfs\"'' + ''-DNIXPKGS_ENCFSCTL=\"${lib.getBin encfs}/bin/encfsctl\"'' - ''-DNIXPKGS_CRYFS="${lib.getBin cryfs}/bin/cryfs"'' + ''-DNIXPKGS_CRYFS=\"${lib.getBin cryfs}/bin/cryfs\"'' - ''-DNIXPKGS_FUSERMOUNT="${lib.getBin fuse}/bin/fusermount"'' + ''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount\"'' ]; } From 7d70261aa43eaef9116fd7c84defd79ded8f248c Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 16 Jan 2018 13:44:59 +0000 Subject: [PATCH 55/95] redshift: fix redshift-gtk, autoreconfHook --- pkgs/applications/misc/redshift/575.patch | 51 ++++++++++++ pkgs/applications/misc/redshift/default.nix | 89 +++++++++------------ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 90 insertions(+), 52 deletions(-) create mode 100644 pkgs/applications/misc/redshift/575.patch diff --git a/pkgs/applications/misc/redshift/575.patch b/pkgs/applications/misc/redshift/575.patch new file mode 100644 index 000000000000..d731d8ec43ad --- /dev/null +++ b/pkgs/applications/misc/redshift/575.patch @@ -0,0 +1,51 @@ +From 467156efccc5e36a36bec8c0b64cc5a70f14d5ed Mon Sep 17 00:00:00 2001 +From: Yegor Timoshenko +Date: Tue, 16 Jan 2018 11:43:46 +0000 +Subject: [PATCH] Fix Autoconf script + +gettext/intltool macros are not used correctly, see: +https://bugs.launchpad.net/inkscape/+bug/1418943 +--- + bootstrap | 6 +----- + configure.ac | 5 +---- + 2 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/bootstrap b/bootstrap +index 0599cf5..40b1dca 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -1,7 +1,3 @@ + #!/bin/sh + +-# change to root directory +-cd $(dirname "$0") +- +-autopoint --force && \ +- AUTOPOINT="intltoolize --automake --copy" autoreconf --force --install --verbose ++autoreconf --force --install && intltoolize +diff --git a/configure.ac b/configure.ac +index be0b51a..a2e7c42 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,6 +17,7 @@ AC_PROG_OBJC # For macOS support modules + AC_LANG([C]) + + AC_PROG_INTLTOOL([0.50]) ++AC_SUBST(LIBINTL) + + AC_CANONICAL_HOST + +@@ -51,10 +52,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [ + ]) + AC_LANG_POP([Objective C]) + +-# Checks for libraries. +-AM_GNU_GETTEXT_VERSION([0.17]) +-AM_GNU_GETTEXT([external]) +- + GETTEXT_PACKAGE=redshift + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext]) +-- +2.15.1 + diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 3fe0503d7f9d..92745a404c38 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,68 +1,55 @@ -{ fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig -, geoclue2 -, guiSupport ? true, hicolor_icon_theme, librsvg, gtk3, python, pygobject3, pyxdg -, drmSupport ? true, libdrm -, randrSupport ? true, libxcb -, vidModeSupport ? true, libX11, libXxf86vm -}: +{ stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool +, libtool, pkgconfig, wrapGAppsHook, wrapPython, geoclue2, gobjectIntrospection +, gtk3, python, pygobject3, pyxdg, libdrm, libxcb }: -let - mkFlag = flag: name: if flag - then "--enable-${name}" - else "--disable-${name}"; -in stdenv.mkDerivation rec { name = "redshift-${version}"; version = "1.11"; - src = fetchurl { - sha256 = "0ngkwj7rg8nfk806w0sg443w6wjr91xdc0zisqfm5h2i77wm1qqh"; - url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz"; + src = fetchFromGitHub { + owner = "jonls"; + repo = "redshift"; + rev = "v${version}"; + sha256 = "0jfi4wqklqw2rm0r2xwalyzir88zkdvqj0z5id0l5v20vsrfiiyj"; }; - buildInputs = [ geoclue2 ] - ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme librsvg gtk3 - python pygobject3 pyxdg ] - ++ stdenv.lib.optionals drmSupport [ libdrm ] - ++ stdenv.lib.optionals randrSupport [ libxcb ] - ++ stdenv.lib.optionals vidModeSupport [ libX11 libXxf86vm ]; - nativeBuildInputs = [ gettext intltool makeWrapper pkgconfig ]; - - configureFlags = [ - (mkFlag guiSupport "gui") - (mkFlag drmSupport "drm") - (mkFlag randrSupport "randr") - (mkFlag vidModeSupport "vidmode") + patches = [ + # https://github.com/jonls/redshift/pull/575 + ./575.patch ]; + nativeBuildInputs = [ + autoconf + automake + gettext + intltool + libtool + pkgconfig + wrapGAppsHook + wrapPython + ]; + + buildInputs = [ + geoclue2 + gobjectIntrospection + gtk3 + libdrm + libxcb + python + ]; + + pythonPath = [ pygobject3 pyxdg ]; + + preConfigure = "./bootstrap"; + postFixup = "wrapPythonPrograms"; + enableParallelBuilding = true; - preInstall = stdenv.lib.optionalString guiSupport '' - substituteInPlace src/redshift-gtk/redshift-gtk \ - --replace "/usr/bin/env python3" "${python}/bin/${python.executable}" - ''; - postInstall = stdenv.lib.optionalString guiSupport '' - wrapProgram "$out/bin/redshift-gtk" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:${hicolor_icon_theme}/share" - - install -Dm644 {.,$out/share/doc/redshift}/redshift.conf.sample - ''; - meta = with stdenv.lib; { - description = "Gradually change screen color temperature"; - longDescription = '' - The color temperature is set according to the position of the - sun. A different color temperature is set during night and - daytime. During twilight and early morning, the color - temperature transitions smoothly from night to daytime - temperature to allow your eyes to slowly adapt. - ''; + description = "Screen color temperature manager"; license = licenses.gpl3Plus; homepage = http://jonls.dk/redshift; platforms = platforms.linux; maintainers = with maintainers; [ mornfall nckx ]; - }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06a6eaec0a28..9393a1f17ff4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18801,7 +18801,7 @@ with pkgs; }; redshift = callPackage ../applications/misc/redshift { - inherit (python3Packages) python pygobject3 pyxdg; + inherit (python3Packages) python pygobject3 pyxdg wrapPython; }; redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { }; From 5eb58fbc37245f94d7689ab644cb964818636b6a Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:16:59 +0100 Subject: [PATCH 56/95] vim-plugins/autopairs init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index d50667e80e63..0a0990836e38 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -127,6 +127,17 @@ rec { # --- generated packages bellow this line --- + Auto_Pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Auto_Pairs-2017-07-03"; + src = fetchgit { + url = "git://github.com/jiangmiao/auto-pairs"; + rev = "f0019fc6423e7ce7bbd01d196a7e027077687fda"; + sha256 = "1kzrdq3adwxwm3fw65g05ww9405lwqi368win5kayamyj9i0z7r6"; + }; + dependencies = []; + + }; + CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "CSApprox-2013-07-26"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 268888b08ec3..11198e101950 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -168,6 +168,7 @@ "github:zig-lang/zig.vim" "goyo" "gruvbox" +"jiangmiao-auto-pairs" "matchit.zip" "pathogen" "quickfixstatus" From bb2bbe4ee677a00b1ca500cdcd5b40672c4351e2 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:37:04 +0100 Subject: [PATCH 57/95] vim-plugins/Cosco init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 0a0990836e38..2b3c16160faf 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -160,6 +160,17 @@ rec { }; + Cosco = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Cosco-2017-07-26"; + src = fetchgit { + url = "git://github.com/lfilho/cosco.vim"; + rev = "4a2a080415860196c936a32679d9032f41ba21e4"; + sha256 = "0gljxy6shr7kmm8vvj6rm4c0lr0ydbny9lrsp64c3d4d0b2wnmig"; + }; + dependencies = []; + + }; + Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "Gist-2016-10-10"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 11198e101950..ff3c31fdd0c5 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,5 +1,6 @@ "CSApprox" "CheckAttach" +"Cosco" "Gist" "Hoogle" "Solarized" From f2f4d7a658944640ea68a1cfbd4d29a49fe847f7 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:39:10 +0100 Subject: [PATCH 58/95] vim-plugins/Syntastic: 2017 -> 2018 --- pkgs/misc/vim-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 2b3c16160faf..7962ac4914a0 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -216,11 +216,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2017-11-17"; + name = "Syntastic-2018-01-12"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "96cc251075f3f9d290c5afd4adf1b64c1542d469"; - sha256 = "1c2nch9037565n3mrpxf17dnn4c6j7w8wwzfj3fw9anwzr1m5kwl"; + rev = "937d77d1f3ba8de08ad275e052e38d0e680a175b"; + sha256 = "10qrq1fs53srp4inxmcm8zq5kjdl56hh1lwh2jhda9mfwrbhg3fp"; }; dependencies = []; From 52903053e3c11d14a1bd9c60b547fda5c9501f9e Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:42:16 +0100 Subject: [PATCH 59/95] vim-plugins/SyntaxRange init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 7962ac4914a0..306354f88ab2 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -226,6 +226,17 @@ rec { }; + SyntaxRange = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "SyntaxRange-2017-07-03"; + src = fetchgit { + url = "git://github.com/inkarkat/vim-SyntaxRange"; + rev = "213cfda0a0f11505665dbfe1e58c803f498761a6"; + sha256 = "1dg9n3zll3a79lv96kdlxxs141binb8w79zdisj7djxc5y2k48qs"; + }; + dependencies = []; + + }; + Tabular = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "Tabular-2016-05-04"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ff3c31fdd0c5..fb91ea03ece6 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -6,6 +6,7 @@ "Solarized" "Supertab" "Syntastic" +"SyntaxRange" "Tabular" "Tagbar" "The_NERD_Commenter" From 8c83fd3edc0a27c63e92f78086957fc97512e4dd Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:42:48 +0100 Subject: [PATCH 60/95] vim-plugins/caw init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 306354f88ab2..dbe25d4924e2 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -330,6 +330,17 @@ rec { sourceRoot = "."; }; + caw = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "caw-2018-01-01"; + src = fetchgit { + url = "git://github.com/tyru/caw.vim"; + rev = "50efcd94e00dc3e814bcc0d3d8ccfa3ff324ea42"; + sha256 = "06hpby2amh2pb4dlfd7s6wybzc8rh8wa3jz0gyv6xx3l91agfari"; + }; + dependencies = []; + + }; + clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "clang_complete-2017-09-25"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index fb91ea03ece6..6f348f6c2f45 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -15,6 +15,7 @@ "VimOutliner" "WebAPI" "YankRing" +"caw" "clang_complete" "commentary" "ctrlp-cmatcher" From 9bd6dc7a7851ee11f5fda4277bccde49e44cb78e Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:43:04 +0100 Subject: [PATCH 61/95] vim-plugins/csv init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index dbe25d4924e2..4c516cb129ac 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -373,6 +373,17 @@ rec { }; + csv = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "csv-2018-01-03"; + src = fetchgit { + url = "git://github.com/chrisbra/csv.vim"; + rev = "a50b977fa25a854e7d099198bfa65e2dc680898b"; + sha256 = "02a6289rbjw8r0l668ala5abfr2rls3slrnk4yrsfc6ka550zj9y"; + }; + dependencies = []; + + }; + ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "ctrlp-cmatcher-2015-10-15"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 6f348f6c2f45..4af05cd5d01f 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -18,6 +18,7 @@ "caw" "clang_complete" "commentary" +"csv" "ctrlp-cmatcher" "ctrlp-py-matcher" "ctrlp-z" From 413ddd19bded487c733203183518f65c31815a46 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:43:17 +0100 Subject: [PATCH 62/95] vim-plugins/easygit init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 4c516cb129ac..d61c56419d62 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -421,6 +421,17 @@ rec { }; + easygit = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "easygit-2017-08-11"; + src = fetchgit { + url = "git://github.com/chemzqm/vim-easygit"; + rev = "8f66da54da627395309548efee6d8705b7f50768"; + sha256 = "013jl330k9yjcvzzqhwz93adm4349gkl3q1c55m1zfkg3afmvnwd"; + }; + dependencies = []; + + }; + extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "extradite-2015-09-22"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 4af05cd5d01f..365b7638bc46 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -22,6 +22,7 @@ "ctrlp-cmatcher" "ctrlp-py-matcher" "ctrlp-z" +"easygit" "extradite" "fugitive" "ghcmod" From db75ba31aa910f9bac947d01571da788e7f212ca Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:43:48 +0100 Subject: [PATCH 63/95] vim-plugins/xterm-color-table init --- pkgs/misc/vim-plugins/default.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index d61c56419d62..7898d8076dda 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2703,4 +2703,16 @@ rec { dependencies = []; }; + + xterm-color-table = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "xterm-color-table-2013-12-31"; + src = fetchgit { + url = "git://github.com/guns/xterm-color-table.vim"; + rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; + sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; + }; + dependencies = []; + + }; + } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 365b7638bc46..8b2969f3c4bb 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -222,3 +222,4 @@ "vimwiki" "vinegar" "vundle" +"xterm-color-table" From 10412490c749a01981adbb8c803f9b73a0beb123 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:44:16 +0100 Subject: [PATCH 64/95] vim-plugins/zeavim init --- pkgs/misc/vim-plugins/default.nix | 10 ++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 11 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 7898d8076dda..ac66c4b96986 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2715,4 +2715,14 @@ rec { }; + zeavim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "zeavim-2017-12-20"; + src = fetchgit { + url = "git://github.com/KabbAmine/zeavim.vim"; + rev = "88f81078059d98d7637a93b90730897a3af231a4"; + sha256 = "1p43f6bbs9fcvvp1i90kzx1xj7k6c5w3ajf9wlrplpkz6hsiv2wv"; + }; + dependencies = []; + + }; } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 8b2969f3c4bb..4d1ba4a8faf0 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -223,3 +223,4 @@ "vinegar" "vundle" "xterm-color-table" +"zeavim" From c690cb6995d87cd9223763d140f9f4096b396eee Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:47:15 +0100 Subject: [PATCH 65/95] vim-plugins/neco-look init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index ac66c4b96986..17c6557eca3e 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2177,6 +2177,17 @@ rec { ''; }; + neco-look = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neco-look-2018-01-07"; + src = fetchgit { + url = "git://github.com/ujihisa/neco-look"; + rev = "ff3de2731177694d0e85f1227b6cfd51c8e2bc8d"; + sha256 = "0zpny9sj7alzsbrjbph71b44zf575hij1ky8pwgba0ygp2p2fxd4"; + }; + dependencies = []; + + }; + pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "pathogen-2017-08-04"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 4d1ba4a8faf0..fd667302be94 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -175,6 +175,7 @@ "gruvbox" "jiangmiao-auto-pairs" "matchit.zip" +"neco-look" "pathogen" "quickfixstatus" "rainbow_parentheses" From 5f891a72b5d9ab47685b73e6b9a3269002c2b71a Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:49:05 +0100 Subject: [PATCH 66/95] vim-plugins/prettyprint init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 17c6557eca3e..b70e41f729b7 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2199,6 +2199,17 @@ rec { }; + prettyprint = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "prettyprint-2016-07-16"; + src = fetchgit { + url = "git://github.com/thinca/vim-prettyprint"; + rev = "d6060d2b1ff1cff71714e126addd3b10883ade12"; + sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9"; + }; + dependencies = []; + + }; + quickfixstatus = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "quickfixstatus-2011-09-02"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index fd667302be94..378047233c8b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -177,6 +177,7 @@ "matchit.zip" "neco-look" "pathogen" +"prettyprint" "quickfixstatus" "rainbow_parentheses" "sensible" From 14329d303531ce212c8705bd3b6bc2ae248dec3f Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:51:02 +0100 Subject: [PATCH 67/95] vim-plugins/vim-scouter init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index b70e41f729b7..804362012865 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2638,6 +2638,17 @@ rec { }; + vim-scouter = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-scouter-2014-08-10"; + src = fetchgit { + url = "git://github.com/thinca/vim-scouter"; + rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc"; + sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8"; + }; + dependencies = []; + + }; + vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-signature-2017-09-24"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 378047233c8b..d5e8e47c078f 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -216,6 +216,7 @@ "vim-iced-coffee-script" "vim-latex-live-preview" "vim-multiple-cursors" +"vim-scouter" "vim-signature" "vim-signify" "vim-snippets" From 565a912cbbca9c34ef7bd8dff5650a4b980f4cd3 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:51:52 +0100 Subject: [PATCH 68/95] vim-plugins/riv init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 804362012865..e5dbc3afee94 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2232,6 +2232,17 @@ rec { }; + riv = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "riv-2017-02-07"; + src = fetchgit { + url = "git://github.com/Rykka/riv.vim"; + rev = "d1efdd92fbb51dc452c61eec54a0ec084f011b4b"; + sha256 = "18qcglbrixgqk05x34dy2cksaw0dg7n51p48i6zkh5sqspv98zz3"; + }; + dependencies = []; + + }; + sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "sensible-2017-05-09"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index d5e8e47c078f..ad508ea52aab 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -180,6 +180,7 @@ "prettyprint" "quickfixstatus" "rainbow_parentheses" +"riv" "sensible" "sleuth" "snipmate" From 18ce75d24c04f2159bd972bd882462bfb185a0f8 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:52:07 +0100 Subject: [PATCH 69/95] vim-plugins/vim-ruby init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index e5dbc3afee94..7f1d24b7b50c 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2649,6 +2649,17 @@ rec { }; + vim-ruby = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-ruby-2017-06-22"; + src = fetchgit { + url = "git://github.com/vim-ruby/vim-ruby"; + rev = "074200ffa39b19baf9d9750d399d53d97f21ee07"; + sha256 = "1w2d12cl40nf73f3hcpqc4sqma8h1a557fy8kds2x143gq7s5vx6"; + }; + dependencies = []; + + }; + vim-scouter = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-scouter-2014-08-10"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ad508ea52aab..7cdc406d4c8b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -217,6 +217,7 @@ "vim-iced-coffee-script" "vim-latex-live-preview" "vim-multiple-cursors" +"vim-ruby" "vim-scouter" "vim-signature" "vim-signify" From d2bec58233fdd3c712e1fc25d44950204adbeeef Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:53:05 +0100 Subject: [PATCH 70/95] vim-plugins/table-mode: 2017 -> 2018 --- pkgs/misc/vim-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 7f1d24b7b50c..f4fdf0ed0c54 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2299,11 +2299,11 @@ rec { }; table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2017-10-26"; + name = "table-mode-2018-01-04"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "40fe641708c58476c3a1b9aeafb68dd888d4920b"; - sha256 = "1rb2jq81965gpziqxlljr2bqjyfbikqa9ncxaaak3x61prn4z084"; + rev = "b25fe6f9f0f0b704d05ebd05edbbf0be3038cef9"; + sha256 = "14ykj2yrwi8k6mkzg0vi4favwg88l8c7zf7m6qzvndpjqw8jggdy"; }; dependencies = []; From edd27a8a300f119bfc5516f7fdda206fb5aed8bd Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:53:52 +0100 Subject: [PATCH 71/95] vim-plugins/sparkup init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index f4fdf0ed0c54..5c02cf918c09 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2287,6 +2287,17 @@ rec { }; + sparkup = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "sparkup-2012-06-10"; + src = fetchgit { + url = "git://github.com/chrisgeo/sparkup"; + rev = "6fbfceef890e705c47b42b27be743ffed6f9296e"; + sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm"; + }; + dependencies = []; + + }; + surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "surround-2016-06-01"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 7cdc406d4c8b..b825c57afb6b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -185,6 +185,7 @@ "sleuth" "snipmate" "sourcemap" +"sparkup" "surround" "table-mode" "taglist" From 78108d37f398d6989de698334f36b10b9c76fad1 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:54:19 +0100 Subject: [PATCH 72/95] vim-plugins/vim-cursorword init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 5c02cf918c09..b9ed2ed6cea1 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2594,6 +2594,17 @@ rec { }; + vim-cursorword = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-cursorword-2017-10-19"; + src = fetchgit { + url = "git://github.com/itchyny/vim-cursorword"; + rev = "4878d6185b99131c5f610cc6ad0e223439ac4601"; + sha256 = "170nf0w7i5k3cr72dkvraq2p0lzsvb3cmdvslyz7cmxnz611n6bf"; + }; + dependencies = []; + + }; + vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-easy-align-2017-06-03"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index b825c57afb6b..ff3b7552364d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -212,6 +212,7 @@ "vim-addon-xdebug" "vim-airline" "vim-coffee-script" +"vim-cursorword" "vim-easy-align" "vim-gista" "vim-gitgutter" From 632fb7d5b43ecc7a0e547a34ec46e08708809c4f Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:55:49 +0100 Subject: [PATCH 73/95] vim-plugins/vim-javascript init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index b9ed2ed6cea1..4eb399fe571d 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2649,6 +2649,17 @@ rec { }; + vim-javascript = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-javascript-2018-01-10"; + src = fetchgit { + url = "git://github.com/pangloss/vim-javascript"; + rev = "4c0a554423df72ecb8d13b143afa7a4cfcb994ec"; + sha256 = "01lbkcfjqwrn2pbxz1jj8g2vxasc2i7s6nc7665s1warn066ykjr"; + }; + dependencies = []; + + }; + vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-latex-live-preview-2017-11-09"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ff3b7552364d..c541e0aaafce 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -217,6 +217,7 @@ "vim-gista" "vim-gitgutter" "vim-iced-coffee-script" +"vim-javascript" "vim-latex-live-preview" "vim-multiple-cursors" "vim-ruby" From 2f1be1f27dc2dd82c0d5d7c6777add07a71fda4f Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:56:10 +0100 Subject: [PATCH 74/95] vim-plugins/vim-jsbeautify init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 4eb399fe571d..295e231249a9 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2660,6 +2660,17 @@ rec { }; + vim-jsbeautify = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-jsbeautify-2017-05-20"; + src = fetchgit { + url = "git://github.com/maksimr/vim-jsbeautify"; + rev = "e83f749c3de7e958e7bc285e80e484707b6f1e12"; + sha256 = "0dy9ljqp6shac406xgawzrqcapm80rjxmbzwy93ypzlhi8b67w0a"; + }; + dependencies = []; + + }; + vim-latex-live-preview = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-latex-live-preview-2017-11-09"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c541e0aaafce..2a7b5e07f543 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -218,6 +218,7 @@ "vim-gitgutter" "vim-iced-coffee-script" "vim-javascript" +"vim-jsbeautify" "vim-latex-live-preview" "vim-multiple-cursors" "vim-ruby" From fccaa2acab1756b018a4f99b51cd7880e199be37 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Tue, 16 Jan 2018 16:18:06 +0000 Subject: [PATCH 75/95] redshift: reintroduce longDescription --- pkgs/applications/misc/redshift/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 92745a404c38..b4f37719046d 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -47,6 +47,14 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Screen color temperature manager"; + longDescription = '' + Redshift adjusts the color temperature according to the position + of the sun. A different color temperature is set during night and + daytime. During twilight and early morning, the color temperature + transitions smoothly from night to daytime temperature to allow + your eyes to slowly adapt. At night the color temperature should + be set to match the lamps in your room. + ''; license = licenses.gpl3Plus; homepage = http://jonls.dk/redshift; platforms = platforms.linux; From f1e3289286db1c2e55bc30469167113e48bde36f Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:56:24 +0100 Subject: [PATCH 76/95] vim-plugins/vim-logreview init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 295e231249a9..c6d7b119bfef 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2682,6 +2682,17 @@ rec { }; + vim-logreview = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-logreview-2017-07-08"; + src = fetchgit { + url = "git://github.com/andreshazard/vim-logreview"; + rev = "b7b66ab338e904127d796af49235b8c29742f18f"; + sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; + }; + dependencies = []; + + }; + vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-multiple-cursors-2017-08-04"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 2a7b5e07f543..8b466f02baba 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -220,6 +220,7 @@ "vim-javascript" "vim-jsbeautify" "vim-latex-live-preview" +"vim-logreview" "vim-multiple-cursors" "vim-ruby" "vim-scouter" From ad746d1beb1993b577291009d883094053f4fb3f Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:56:50 +0100 Subject: [PATCH 77/95] vim-plugins/vim-ft-diff_fold init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index c6d7b119bfef..019eb8e486c9 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2616,6 +2616,17 @@ rec { }; + vim-ft-diff_fold = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-ft-diff_fold-2013-02-10"; + src = fetchgit { + url = "git://github.com/thinca/vim-ft-diff_fold"; + rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87"; + sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma"; + }; + dependencies = []; + + }; + vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-gista-2017-02-20"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 8b466f02baba..070110b145b8 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -214,6 +214,7 @@ "vim-coffee-script" "vim-cursorword" "vim-easy-align" +"vim-ft-diff_fold" "vim-gista" "vim-gitgutter" "vim-iced-coffee-script" From c0436f5c0bcfce684022b312b8d09cc67271eb95 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:57:07 +0100 Subject: [PATCH 78/95] vim-plugins/tabpagecd init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 019eb8e486c9..ccf22b5a1a84 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2320,6 +2320,17 @@ rec { }; + tabpagecd = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tabpagecd-2013-11-29"; + src = fetchgit { + url = "git://github.com/kana/vim-tabpagecd"; + rev = "8b71a03a037608fa5918f5096812577cec6355e4"; + sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm"; + }; + dependencies = []; + + }; + taglist = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "taglist"; src = fetchurl { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 070110b145b8..5b17b9bd1eae 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -188,6 +188,7 @@ "sparkup" "surround" "table-mode" +"tabpagecd" "taglist" "tlib" "undotree" From 14fed7b7b94fea91ca085c9a928cfe25951b5681 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:57:47 +0100 Subject: [PATCH 79/95] vim-plugins/fzf.vim: 2017 -> 2018 --- pkgs/misc/vim-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index ccf22b5a1a84..b7de8f9c3ebc 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1096,11 +1096,11 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2017-12-06"; + name = "fzf-vim-2018-01-09"; src = fetchgit { url = "https://github.com/junegunn/fzf.vim"; - rev = "11b7fb91e152258c59b0bb0526c3fb04469cf38c"; - sha256 = "1p6p557bg56763vq49lfhyr8h30kf1gwiqz1jf6j0mqg46w4q77j"; + rev = "c0a5fee7071ed89602b9b59fb67e83d6cd23addc"; + sha256 = "0biqq9g116zziv9k0axgn8wasgwb57fwaxwjj8vsajrmq5phdl4z"; }; dependencies = []; From c1ef975d001186c0acf43e9fd16994573c2c363c Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:58:09 +0100 Subject: [PATCH 80/95] vim-plugins/deoplete.nvim: 2017 -> 2018 --- pkgs/misc/vim-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index b7de8f9c3ebc..e62aec04cd2a 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -510,11 +510,11 @@ rec { }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2017-12-06"; + name = "deoplete-nvim-2018-01-14"; src = fetchgit { url = "https://github.com/Shougo/deoplete.nvim"; - rev = "9d048047807b7bfacd7406ebe85acdb1dc019018"; - sha256 = "15b881j6f54ykljqhbpl9ajjbhjlgqywr963a7g0d35qnyxzidb8"; + rev = "b164eb8c36ddbb8835434e013358de29b9c8f1f2"; + sha256 = "0k3zmpdlg4y4f0y3pgfcqmglrrs1iagw8iaaz131nyswz0m2pf6x"; }; dependencies = []; From 82f0cfaf58d5fd8baa7b78a7076dc85e5c08c08b Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:58:44 +0100 Subject: [PATCH 81/95] vim-plugins/vim-dashboard init --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index e62aec04cd2a..c3ca0e5269e4 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2660,6 +2660,17 @@ rec { }; + vim-dashboard = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-dashboard-2017-08-08"; + src = fetchgit { + url = "git://github.com/junegunn/vim-github-dashboard"; + rev = "054d7c69d9882a6ffccedd6e43623e184958d3b6"; + sha256 = "1ns6dd8719hqrkqnxd52ssi7gxjxni7w4l1ih7ag72d62qzw0p8y"; + }; + dependencies = []; + + }; + vim-iced-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-iced-coffee-script-2013-12-27"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 5b17b9bd1eae..4c5a79091c99 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -214,6 +214,7 @@ "vim-airline" "vim-coffee-script" "vim-cursorword" +"vim-dashboard" "vim-easy-align" "vim-ft-diff_fold" "vim-gista" From 999b889907fccee93e78ae324b88052b6e2dfb19 Mon Sep 17 00:00:00 2001 From: Anders Sildnes Date: Tue, 16 Jan 2018 16:59:29 +0100 Subject: [PATCH 82/95] vim-plugins/fugitive: 2017 -> 2018 --- pkgs/misc/vim-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index c3ca0e5269e4..ddb1555dd832 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -444,11 +444,11 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2017-11-30"; + name = "fugitive-2017-12-16"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "5032d9ee72361dc3cfaae1a9b3353211203e443f"; - sha256 = "1zx5l8lx7440l3pvs2bx81r3wmpvbmq7qs8ziz9lvlp91s7dqy88"; + rev = "f3ccb0c12ee4985b8808f83059830a24cc92821c"; + sha256 = "1ry67wi5dci4jy54jyf3lsf0yq13a42z9w5qh39rwv5w9wiab2fb"; }; dependencies = []; From f6ee29dda226195bf9965ac8461c9a45c9e3a1b8 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 15 Jan 2018 09:40:18 +0300 Subject: [PATCH 83/95] libnetfilter_queue: 1.0.2 -> 1.0.3 fixes #33887 --- pkgs/development/libraries/libnetfilter_queue/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 5de9409b729f..12a45d088ef6 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, libmnl, libnfnetlink }: stdenv.mkDerivation rec { - name = "libnetfilter_queue-1.0.2"; + version = "1.0.3"; + name = "libnetfilter_queue-${version}"; src = fetchurl { - url = "ftp://ftp.netfilter.org/pub/libnetfilter_queue/${name}.tar.bz2"; - sha256 = "0chsmj9ky80068vn458ijz9sh4sk5yc08dw2d6b8yddybpmr1143"; + url = "https://www.netfilter.org/projects/libnetfilter_queue/files/${name}.tar.bz2"; + sha256 = "0x77m1fvbqzz5z64jz59fb6j8dvv8b9pg4fmznqwax4x6imjcncq"; }; nativeBuildInputs = [ pkgconfig ]; From 82cab72dd41cf3e243a76bdbbe2ba9631e9ffa5a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 16 Jan 2018 18:28:21 +0200 Subject: [PATCH 84/95] release-lib: forAllSupportedSystems -> forTheseSystems I'm going to move forAllSystems from nixos/release.nix, and these functions sound too similar while doing different things. --- pkgs/top-level/release-cross.nix | 2 +- pkgs/top-level/release-lib.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index ce6fba9c40f3..f6b2ecfb5dbe 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -75,7 +75,7 @@ in f (["buildPackages"] ++ path) { inherit system crossSystem; } ); - testEqual = path: systems: forAllSupportedSystems systems (testEqualOne path); + testEqual = path: systems: forTheseSystems systems (testEqualOne path); mapTestEqual = lib.mapAttrsRecursive testEqual; diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index fd05be0e1097..a56df53d27ef 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -58,7 +58,7 @@ rec { interested in the result of cross building a package. */ crossMaintainers = [ maintainers.viric ]; - forAllSupportedSystems = systems: f: + forTheseSystems = systems: f: genAttrs (filter (x: elem x supportedSystems) systems) f; /* Build a package on the given set of platforms. The function `f' @@ -66,14 +66,14 @@ rec { platform as an argument . We return an attribute set containing a derivation for each supported platform, i.e. ‘{ x86_64-linux = f pkgs_x86_64_linux; i686-linux = f pkgs_i686_linux; ... }’. */ - testOn = systems: f: forAllSupportedSystems systems + testOn = systems: f: forTheseSystems systems (system: hydraJob' (f (pkgsFor system))); /* Similar to the testOn function, but with an additional 'crossSystem' parameter for allPackages, defining the target platform for cross builds. */ - testOnCross = crossSystem: systems: f: forAllSupportedSystems systems + testOnCross = crossSystem: systems: f: forTheseSystems systems (system: hydraJob' (f (allPackages { inherit system crossSystem; }))); From b3c50ec1e9a3e2a4f356c4eaed46450b73f52dba Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 16 Jan 2018 18:29:43 +0200 Subject: [PATCH 85/95] nixos/release.nix: Move forAllSystems to release-lib There's already a similar forTheseSystems in release-lib, so be more consistent. --- nixos/release.nix | 3 +-- pkgs/top-level/release-lib.nix | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index 33916243e97b..9a25b9a1919a 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -3,6 +3,7 @@ , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ] }: +with import ../pkgs/top-level/release-lib.nix { inherit supportedSystems; }; with import ../lib; let @@ -11,8 +12,6 @@ let versionSuffix = (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; - forAllSystems = genAttrs supportedSystems; - importTest = fn: args: system: import fn ({ inherit system; } // args); diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index a56df53d27ef..87fb00a9682d 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -58,6 +58,7 @@ rec { interested in the result of cross building a package. */ crossMaintainers = [ maintainers.viric ]; + forAllSystems = genAttrs supportedSystems; forTheseSystems = systems: f: genAttrs (filter (x: elem x supportedSystems) systems) f; From 4ccf308d665fd2cd60c57d2fe17d5c597570e978 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 16 Jan 2018 18:42:47 +0200 Subject: [PATCH 86/95] nixos/release.nix: Use forTheseSystems from release-lib Currently, even if you pass `supportedSystems = [ "aarch64-linux" ]` you end up with e.g. `nixos.iso_graphical.x86_64-linux` job. Using forTheseSystems from release-lib avoids that. This shouldn't affect the usual x86 trunk-combined jobset. --- nixos/release.nix | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index 9a25b9a1919a..39c550b62774 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -123,22 +123,13 @@ in rec { # Build the initial ramdisk so Hydra can keep track of its size over time. initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk); - netboot = { - x86_64-linux = makeNetboot { - system = "x86_64-linux"; - modules = [ - ./modules/installer/netboot/netboot-minimal.nix - versionModule - ]; - }; - } // (optionalAttrs (elem "aarch64-linux" supportedSystems) { - aarch64-linux = makeNetboot { - system = "aarch64-linux"; - modules = [ - ./modules/installer/netboot/netboot-minimal.nix - versionModule - ]; - };}); + netboot = forTheseSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot { + inherit system; + modules = [ + ./modules/installer/netboot/netboot-minimal.nix + versionModule + ]; + }); iso_minimal = forAllSystems (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-minimal.nix; @@ -146,7 +137,7 @@ in rec { inherit system; }); - iso_graphical = genAttrs [ "x86_64-linux" ] (system: makeIso { + iso_graphical = forTheseSystems [ "x86_64-linux" ] (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-graphical-kde.nix; type = "graphical"; inherit system; @@ -154,7 +145,7 @@ in rec { # A variant with a more recent (but possibly less stable) kernel # that might support more hardware. - iso_minimal_new_kernel = genAttrs [ "x86_64-linux" ] (system: makeIso { + iso_minimal_new_kernel = forTheseSystems [ "x86_64-linux" ] (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix; type = "minimal-new-kernel"; inherit system; @@ -162,7 +153,7 @@ in rec { # A bootable VirtualBox virtual appliance as an OVA file (i.e. packaged OVF). - ova = genAttrs [ "x86_64-linux" ] (system: + ova = forTheseSystems [ "x86_64-linux" ] (system: with import nixpkgs { inherit system; }; From 2ea3db283090c43baed12f9cf6019fbbb99170e1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 16 Jan 2018 17:59:30 +0100 Subject: [PATCH 87/95] Python docs: remove `name` attribute The `name` attribute is filled in when `pname` and `version` are specified. See https://github.com/NixOS/nixpkgs/pull/31173 --- doc/languages-frameworks/python.md | 62 ++++++++++++++++-------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 3700d2e57d47..039ca8545e9f 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -191,7 +191,6 @@ building Python libraries is `buildPythonPackage`. Let's see how we can build th toolz = buildPythonPackage rec { pname = "toolz"; version = "0.7.4"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; @@ -237,7 +236,6 @@ with import {}; my_toolz = python35.pkgs.buildPythonPackage rec { pname = "toolz"; version = "0.7.4"; - name = "${pname}-${version}"; src = python35.pkgs.fetchPypi { inherit pname version; @@ -283,15 +281,15 @@ order to build [`datashape`](https://github.com/blaze/datashape). { # ... datashape = buildPythonPackage rec { - name = "datashape-${version}"; + pname = "datashape"; version = "0.4.7"; - src = pkgs.fetchurl { - url = "mirror://pypi/D/DataShape/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278"; }; - buildInputs = with self; [ pytest ]; + checkInputs = with self; [ pytest ]; propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ]; meta = { @@ -318,10 +316,11 @@ when building the bindings and are therefore added as `buildInputs`. { # ... lxml = buildPythonPackage rec { - name = "lxml-3.4.4"; + pname = "lxml"; + version = "3.4.4"; - src = pkgs.fetchurl { - url = "mirror://pypi/l/lxml/${name}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk"; }; @@ -351,11 +350,11 @@ and `CFLAGS`. { # ... pyfftw = buildPythonPackage rec { - name = "pyfftw-${version}"; + pname = "pyFFTW"; version = "0.9.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyFFTW/pyFFTW-${version}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074"; }; @@ -440,11 +439,11 @@ We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` { pkgs, buildPythonPackage }: buildPythonPackage rec { - name = "toolz-${version}"; + pname = "toolz"; version = "0.7.4"; - src = pkgs.fetchurl { - url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz"; + src = fetchPypi { + inherit pname version; sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; }; @@ -549,25 +548,31 @@ The `buildPythonPackage` function is implemented in The following is an example: ```nix -{ # ... - twisted = buildPythonPackage { - name = "twisted-8.1.0"; +buildPythonPackage rec { + version = "3.3.1"; + pname = "pytest"; - src = pkgs.fetchurl { - url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2; - sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl"; - }; + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; - propagatedBuildInputs = [ self.ZopeInterface ]; + src = fetchPypi { + inherit pname version; + sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93"; + }; - meta = { - homepage = http://twistedmatrix.com/; - description = "Twisted, an event-driven networking engine written in Python"; - license = stdenv.lib.licenses.mit; - }; + checkInputs = [ hypothesis ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ attrs py setuptools six pluggy ]; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + description = "Framework for writing tests"; }; } + ``` The `buildPythonPackage` mainly does four things: @@ -623,7 +628,6 @@ with import {}; packageOverrides = self: super: { pandas = super.pandas.overridePythonAttrs(old: rec { version = "0.19.1"; - name = "pandas-${version}"; src = super.fetchPypi { pname = "pandas"; inherit version; From 6c1277a8649a41fd480aa868e868b86363d09897 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Tue, 16 Jan 2018 11:26:50 -0500 Subject: [PATCH 88/95] julia: 0.6.0 -> 0.6.2 --- pkgs/development/compilers/julia/0.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix index fabb2a7d6d73..14ead42d4f7d 100644 --- a/pkgs/development/compilers/julia/0.6.nix +++ b/pkgs/development/compilers/julia/0.6.nix @@ -54,12 +54,12 @@ in stdenv.mkDerivation rec { pname = "julia"; - version = "0.6.0"; + version = "0.6.2"; name = "${pname}-${version}"; src = fetchzip { url = "https://github.com/JuliaLang/${pname}/releases/download/v${version}/${name}.tar.gz"; - sha256 = "19xk2cs43lnsy9y0d8wmxj7ich908ipb40vkf7xg9031x272brxw"; + sha256 = "0ym4n9vn6w8vj175mmsc2nzvdk2ij0cdrs44lkr3p0signji73b5"; }; prePatch = '' mkdir deps/srccache From b55d4c0564b0bde4cbc0c01b6ba7a1276382335a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 16 Jan 2018 18:29:46 +0100 Subject: [PATCH 89/95] programs.zsh.ohMyZsh: add `cacheDir` option (#33150) The default cache directory set by oh-my-zsh is $ohMyZsh/cache which lives in the Nix store in our case. This causes issues with several completion plugins provided by oh-my-zsh. --- nixos/modules/programs/zsh/oh-my-zsh.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index 9077643c4440..b7834fa5f872 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -48,6 +48,15 @@ in Name of the theme to be used by oh-my-zsh. ''; }; + + cacheDir = mkOption { + default = "$HOME/.cache/oh-my-zsh"; + type = types.str; + description = '' + Cache directory to be used by `oh-my-zsh`. + Default is /nix/store//cache. + ''; + }; }; }; @@ -74,6 +83,13 @@ in "ZSH_THEME=\"${cfg.theme}\"" } + ${optionalString (cfg.cacheDir != null) '' + if [[ ! -d "${cfg.cacheDir}" ]]; then + mkdir -p "${cfg.cacheDir}" + fi + ZSH_CACHE_DIR=${cfg.cacheDir} + ''} + source $ZSH/oh-my-zsh.sh ''; }; From 847db60f02b0eada7d1b1ac17c150303ba84bbb9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 16 Jan 2018 19:30:04 +0000 Subject: [PATCH 90/95] julia: 0.6.0 -> 0.6.2 --- pkgs/development/compilers/julia/0.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix index 14ead42d4f7d..6acb192933e6 100644 --- a/pkgs/development/compilers/julia/0.6.nix +++ b/pkgs/development/compilers/julia/0.6.nix @@ -33,10 +33,10 @@ let sha256 = "03kaqbjbi6viz0n33dk5jlf6ayxqlsq4804n7kwkndiga9s4hd42"; }; - libuvVersion = "52d72a52cc7ccd570929990f010ed16e2ec604c8"; + libuvVersion = "d8ab1c6a33e77bf155facb54215dd8798e13825d"; libuv = fetchurl { url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}"; - sha256 = "1vldy94sfmlfqmi14126g590wi61fv78rzh7afk82zkipaixvak8"; + sha256 = "0q5ahc9dzca2yc6cjbhpfi9nwc4yhhjbgxgsychksn13d24gv7ba"; }; rmathVersion = "0.1"; From f908f65dec0187edce6e5c4f2fca0982033d9b4d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 16 Jan 2018 20:32:40 +0100 Subject: [PATCH 91/95] uuagc: add static executable from haskellPackages --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9393a1f17ff4..1bd6a263d9cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17380,6 +17380,8 @@ with pkgs; urh = callPackage ../applications/misc/urh { }; + uuagc = haskell.lib.justStaticExecutables haskellPackages.uuagc; + uucp = callPackage ../tools/misc/uucp { }; uvccapture = callPackage ../applications/video/uvccapture { }; From ac16ec60323737fb513c99de33d9955e005d7d25 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 16 Jan 2018 20:37:46 +0100 Subject: [PATCH 92/95] bustle: add top-level alias --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bd6a263d9cd..79a2afba643a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -841,6 +841,8 @@ with pkgs; buildtorrent = callPackage ../tools/misc/buildtorrent { }; + bustle = haskellPackages.bustle; + bwm_ng = callPackage ../tools/networking/bwm-ng { }; byobu = callPackage ../tools/misc/byobu { From 9bceb2b353ee4962ee15ad27b7e58cda2bc13f44 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 16 Jan 2018 21:02:54 +0100 Subject: [PATCH 93/95] oh-my-zsh module: reword & fix manual build docbook interpreted this as a tag and this sounded as if the option defaulted to putting the cached directory into the nix store. cc @Ma27 @fpletz --- nixos/modules/programs/zsh/oh-my-zsh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index b7834fa5f872..b995d390b279 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -54,7 +54,7 @@ in type = types.str; description = '' Cache directory to be used by `oh-my-zsh`. - Default is /nix/store//cache. + Without this option it would default to the read-only nix store. ''; }; }; From 60468bf4e5862350f970407ed7f86c1bb3ddd6f9 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 16 Jan 2018 21:31:51 +0100 Subject: [PATCH 94/95] scitkitlearn: disable doctests on darwin as they are known to be broken there for this version. --- pkgs/development/python-modules/scikitlearn/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index b2826588a288..6d32b056a0a9 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -20,8 +20,9 @@ buildPythonPackage rec { LC_ALL="en_US.UTF-8"; + # Disable doctests on OSX: https://github.com/scikit-learn/scikit-learn/issues/10213 checkPhase = '' - HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests $out/${python.sitePackages}/sklearn/ + HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests ${stdenv.lib.optionalString stdenv.isDarwin "--doctest-options=+SKIP"} $out/${python.sitePackages}/sklearn/ ''; meta = with stdenv.lib; { From b62c601e911398a6c20fc7cc33509526fb999cd3 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 16 Jan 2018 21:32:35 +0100 Subject: [PATCH 95/95] werkzeug: disable one test on darwin. --- pkgs/development/python-modules/werkzeug/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index 78380900416d..58be98f183b6 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytest requests glibcLocales hypothesis ]; checkPhase = '' - LC_ALL="en_US.UTF-8" py.test + LC_ALL="en_US.UTF-8" py.test ${stdenv.lib.optionalString stdenv.isDarwin "-k 'not test_get_machine_id'"} ''; meta = with stdenv.lib; {