From bc2905b02032ce66f012482b638edc2e1cea5e55 Mon Sep 17 00:00:00 2001 From: Lana Black Date: Mon, 24 Sep 2018 20:40:45 +0000 Subject: [PATCH 001/219] libbladeRF: 1.9.0 -> 2.0.2 --- pkgs/development/libraries/libbladeRF/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 04bd3f3d71e..ac8de886fad 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -2,14 +2,14 @@ , libusb1, udev }: stdenv.mkDerivation rec { - version = "1.9.0"; + version = "2.0.2"; name = "libbladeRF-${version}"; src = fetchFromGitHub { owner = "Nuand"; repo = "bladeRF"; rev = "libbladeRF_v${version}"; - sha256 = "0frvphp4xxdxwzmi94b0asl7b891sd3fk8iw9kfk8h6f3cdhj8xa"; + sha256 = "18qwljjdnf4lds04kc1zvslr5hh9cjnnjkcy07lbkrq7pj0pfnc6"; }; nativeBuildInputs = [ pkgconfig ]; From f96349c45658174d33836ea6c2b5528473977284 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 20 Jan 2018 03:58:35 -0500 Subject: [PATCH 002/219] pypy: Change libPrefix from pypy5.10 to pypy2.7 To avoid conflicting with pypy3, as per https://github.com/NixOS/nixpkgs/pull/34066#issuecomment-359155484. Signed-off-by: Anders Kaseorg --- .../development/interpreters/python/pypy/2.7/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index d95707ecb22..3e2aa9d8d83 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -10,19 +10,16 @@ assert zlibSupport -> zlib != null; let - majorVersion = "6.0"; - minorVersion = "0"; - minorVersionSuffix = ""; + version = "6.0.0"; pythonVersion = "2.7"; - version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; - libPrefix = "pypy${majorVersion}"; + libPrefix = "pypy${pythonVersion}"; sitePackages = "site-packages"; pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]); in stdenv.mkDerivation rec { name = "pypy-${version}"; - inherit majorVersion version pythonVersion; + inherit version pythonVersion; src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; From 91333c1740f45fe55ae248dddc9c86f057f02310 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 20 Jan 2018 04:00:41 -0500 Subject: [PATCH 003/219] pypy: Remove redundant --withmod-* flags --allworkingmodules is already the default. Signed-off-by: Anders Kaseorg --- pkgs/development/interpreters/python/pypy/2.7/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 3e2aa9d8d83..854467e65a8 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -66,12 +66,7 @@ in stdenv.mkDerivation rec { ${pythonForPypy.interpreter} rpython/bin/rpython \ --make-jobs="$NIX_BUILD_CORES" \ -Ojit \ - --batch pypy/goal/targetpypystandalone.py \ - --withmod-_minimal_curses \ - --withmod-unicodedata \ - --withmod-thread \ - --withmod-bz2 \ - --withmod-_multiprocessing + --batch pypy/goal/targetpypystandalone.py ''; setupHook = python-setup-hook sitePackages; From 8b80dec522bd5e0e628e8ac018ed7b58f397a57f Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 20 Jan 2018 04:01:25 -0500 Subject: [PATCH 004/219] pypy: Reenable tests fixed upstream Signed-off-by: Anders Kaseorg --- pkgs/development/interpreters/python/pypy/2.7/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 854467e65a8..d8fb633958e 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -79,9 +79,7 @@ in stdenv.mkDerivation rec { # disable shutils because it assumes gid 0 exists # disable socket because it has two actual network tests that fail # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com) - # disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure - # disable test_zipfile64 because it causes ENOSPACE - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_zipfile64 )' lib-python + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not ( test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil )' lib-python ''; installPhase = '' From 6d80927a43baee1b006fd54944084001dc04b5a5 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 20 Jan 2018 04:06:08 -0500 Subject: [PATCH 005/219] pypy: Set isPy2, isPy27 Signed-off-by: Anders Kaseorg --- pkgs/development/interpreters/python/pypy/2.7/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index d8fb633958e..6f7fa962296 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -116,6 +116,8 @@ in stdenv.mkDerivation rec { inherit zlibSupport libPrefix sitePackages; executable = "pypy"; isPypy = true; + isPy2 = true; + isPy27 = true; buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; }; interpreter = "${self}/bin/${executable}"; withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; From 24c3b7cc4eae423e16b26935688fd733a6fe33e9 Mon Sep 17 00:00:00 2001 From: plchldr Date: Sun, 25 Nov 2018 09:30:03 +0100 Subject: [PATCH 006/219] add myself to maintainers --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 87c144f0d42..f93aca68aaa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3404,6 +3404,11 @@ github = "pkmx"; name = "Chih-Mao Chen"; }; + plchldr = { + email = "mail@oddco.de"; + github = "plchldr"; + name = "Jonas Beyer"; + }; plcplc = { email = "plcplc@gmail.com"; github = "plcplc"; From 0972bde7d22f10838485682cfc00ad4ef95e8d09 Mon Sep 17 00:00:00 2001 From: plchldr Date: Sun, 25 Nov 2018 09:49:01 +0100 Subject: [PATCH 007/219] rtl8821a: init at 5.1.5 --- pkgs/os-specific/linux/rtl8821au/default.nix | 40 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/os-specific/linux/rtl8821au/default.nix diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix new file mode 100644 index 00000000000..9cb28d5dc8d --- /dev/null +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, kernel, bc }: + +stdenv.mkDerivation rec { + name = "rtl8821au-${kernel.version}-${version}"; + version = "5.1.5"; + + src = fetchFromGitHub { + owner = "zebulon2"; + repo = "rtl8812au"; + rev = "61d0cd95afc01eae64da0c446515803910de1a00"; + sha256 = "0dlzyiaa3hmb2qj3lik52px88n4mgrx7nblbm4s0hn36g19ylssw"; + }; + + nativeBuildInputs = [ bc ]; + buildInputs = kernel.moduleBuildDependencies; + + hardeningDisable = [ "pic" "format" ]; + + NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; + + prePatch = '' + substituteInPlace ./Makefile \ + --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ + --replace '$(shell uname -r)' "${kernel.modDirVersion}" \ + --replace /sbin/depmod \# \ + --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + meta = with stdenv.lib; { + description = "rtl8821AU, rtl8812AU and rtl8811AU chipset driver with firmware"; + homepage = https://github.com/zebulon2/rtl8812au; + license = licenses.gpl2; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ plchldr ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3773df2c94f..4b1bc4254fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14481,6 +14481,8 @@ with pkgs; rtl8814au = callPackage ../os-specific/linux/rtl8814au { }; + rtl8821au = callPackage ../os-specific/linux/rtl8821au { }; + rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; openafs = callPackage ../servers/openafs/1.6/module.nix { }; From c6913213ebe7f584e7398e0f245905e00a1c1e41 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 25 Nov 2018 21:26:25 +0100 Subject: [PATCH 008/219] nextcloud-client: switch to libsecret and use it by default This change makes it easier for users to setup the nextcloud client with GNOME keyring support as discussed in the IRC[1][2]. Additionaly we now use `libsecret` instead of `libgnome-keyring` which integrates better in a GNOME setup (libgnome-keyring defaults to the Gnome2 library)[3]. [1] https://logs.nix.samueldr.com/nixos/2018-11-24#1745871; [2] https://logs.nix.samueldr.com/nixos/2018-11-24#1746033; [3] #38266 --- .../networking/nextcloud-client/default.nix | 9 ++++++--- .../networking/nextcloud-client/wrapper.nix | 14 -------------- pkgs/top-level/all-packages.nix | 6 +----- 3 files changed, 7 insertions(+), 22 deletions(-) delete mode 100644 pkgs/applications/networking/nextcloud-client/wrapper.nix diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 3d54ff3a7c3..ca1accf2f91 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, qttools, sqlite -, inotify-tools, makeWrapper, libgnome-keyring, openssl_1_1, pcre, qtwebengine +, inotify-tools, makeWrapper, openssl_1_1, pcre, qtwebengine, libsecret }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; buildInputs = [ qtbase qtwebkit qtkeychain qttools qtwebengine sqlite openssl_1_1.out pcre inotify-tools ]; @@ -32,7 +32,10 @@ stdenv.mkDerivation rec { postInstall = '' sed -i 's/\(Icon.*\)=nextcloud/\1=Nextcloud/g' \ - $out/share/applications/nextcloud.desktop + $out/share/applications/nextcloud.desktop + + wrapProgram "$out/bin/nextcloud" \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libsecret ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/nextcloud-client/wrapper.nix b/pkgs/applications/networking/nextcloud-client/wrapper.nix deleted file mode 100644 index 292cbaa1c40..00000000000 --- a/pkgs/applications/networking/nextcloud-client/wrapper.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, nextcloud-client, makeWrapper, symlinkJoin, withGnomeKeyring ? false, libgnome-keyring }: - -if (!withGnomeKeyring) then nextcloud-client else symlinkJoin { - name = "${nextcloud-client.name}-with-gnome-keyring"; - paths = [ nextcloud-client ]; - nativeBuildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram "$out/bin/nextcloud" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libgnome-keyring ]} - ''; - - inherit (nextcloud-client) meta; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76f9067f787..e956ca6ef3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4388,11 +4388,7 @@ with pkgs; nextcloud = callPackage ../servers/nextcloud { }; - nextcloud-client-unwrapped = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; - - nextcloud-client = callPackage ../applications/networking/nextcloud-client/wrapper.nix { - nextcloud-client = nextcloud-client-unwrapped; - }; + nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; From e75ecf777b93228f889fbe8c6642bde1a1804c13 Mon Sep 17 00:00:00 2001 From: hlolli Date: Mon, 3 Dec 2018 02:11:16 +0100 Subject: [PATCH 009/219] python-qt init 3.2 --- .../libraries/python-qt/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 8 ++++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/libraries/python-qt/default.nix diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix new file mode 100644 index 00000000000..e1f2596f87c --- /dev/null +++ b/pkgs/development/libraries/python-qt/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, python, qmake, + qtwebengine, qtxmlpatterns, + qttools, unzip }: + +stdenv.mkDerivation rec { + version = "3.2"; + name = "python-qt-${version}"; + + src = fetchurl { + url="mirror://sourceforge/pythonqt/PythonQt${version}.zip"; + sha256="13hzprk58m3yj39sj0xn6acg8796lll1256mpd81kw0z3yykyl8c"; + }; + + hardeningDisable = [ "all" ]; + + nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools ]; + + buildInputs = [ python unzip ]; + + qmakeFlags = [ "PythonQt.pro" + "INCLUDEPATH+=${python}/include/python3.6" + "PYTHON_PATH=${python}/bin" + "PYTHON_LIB=${python}/lib"]; + + unpackCmd = "unzip $src"; + + installPhase = '' + mkdir -p $out/include/PythonQt + cp -r ./lib $out + cp -r ./src/* $out/include/PythonQt + cp extensions/PythonQt_QtAll/PythonQt_QtAll.h $out/include/PythonQt + cp extensions/PythonQt_QtAll/PythonQt_QtAll.cpp $out/include/PythonQt + ''; + + meta = with stdenv.lib; { + description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications."; + homepage = http://pythonqt.sourceforge.net/; + license = licenses.lgpl21; + platforms = platforms.all; + maintainers = with maintainers; [ hlolli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e52ed542982..3962037210f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11912,6 +11912,14 @@ with pkgs; pybind11 = callPackage ../development/libraries/pybind11 { }; + python-qt = callPackage ../development/libraries/python-qt { + python = python27; + qmake = qt59.qmake; + qttools = qt59.qttools; + qtwebengine = qt59.qtwebengine; + qtxmlpatterns = qt59.qtxmlpatterns; + }; + re2 = callPackage ../development/libraries/re2 { }; qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; From e9b18349c952c8a17a04722fef0471020cd06cf3 Mon Sep 17 00:00:00 2001 From: hlolli Date: Mon, 3 Dec 2018 10:55:15 +0100 Subject: [PATCH 010/219] csound-qt init: 0.9.6-beta2 --- .../audio/csound/csound-qt/default.nix | 49 +++++++++++++++++++ .../audio/csound/csound-qt/rtmidipath.patch | 17 +++++++ pkgs/top-level/all-packages.nix | 6 +++ 3 files changed, 72 insertions(+) create mode 100644 pkgs/applications/audio/csound/csound-qt/default.nix create mode 100644 pkgs/applications/audio/csound/csound-qt/rtmidipath.patch diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix new file mode 100644 index 00000000000..e9415335388 --- /dev/null +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -0,0 +1,49 @@ +{ stdenv, csound, desktop-file-utils, + fetchFromGitHub, python, python-qt, qmake, + qtwebengine, rtmidi, unzip }: + +stdenv.mkDerivation rec { + name = "csound-qt-${version}"; + version = "0.9.6-beta2"; + + src = fetchFromGitHub { + owner = "CsoundQt"; + repo = "CsoundQt"; + rev = "${version}"; + sha256 = "12jv7cvns3wj2npha0mvpn88kkkfsxsvhgzs2wrw04kbrvbhbffi"; + }; + + patches = [ ./rtmidipath.patch ]; + + nativeBuildInputs = [ qmake qtwebengine ]; + + buildInputs = [ csound desktop-file-utils rtmidi unzip ]; + + qmakeFlags = [ "qcs.pro" "CONFIG+=rtmidi" "CONFIG+=pythonqt" + "CSOUND_INCLUDE_DIR=${csound}/include/csound" + "CSOUND_LIBRARY_DIR=${csound}/lib" + "RTMIDI_DIR=${rtmidi.src}" + "PYTHONQT_SRC_DIR=${python-qt}/lib" + "PYTHONQT_LIB_DIR=${python-qt}/lib" + "LIBS+=${python-qt}/lib/libPythonQt-Qt5-Python2.7.so" + "LIBS+=${python-qt}/lib/libPythonQt_QtAll-Qt5-Python2.7.so" + "INCLUDEPATH+=${python-qt}/include/PythonQt" + "INCLUDEPATH+=${python}/include/python2.7" + "INSTALL_DIR=$(out)" + "SHARE_DIR=$(out)/share" + ]; + + installPhase = '' + mkdir -p $out + cp -r bin $out + make install + ''; + + meta = with stdenv.lib; { + description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features."; + homepage = https://csoundqt.github.io/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ hlolli ]; + }; +} diff --git a/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch b/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch new file mode 100644 index 00000000000..f9522adb4b3 --- /dev/null +++ b/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch @@ -0,0 +1,17 @@ +diff --git a/src/src.pri b/src/src.pri +index e5e0c896..9a9fa513 100644 +--- a/src/src.pri ++++ b/src/src.pri +@@ -155,9 +155,9 @@ pythonqt { + "src/pyqcsobject.cpp" + } + rtmidi { +- HEADERS += "src/../$${RTMIDI_DIR}/RtMidi.h" +- SOURCES += "src/../$${RTMIDI_DIR}/RtMidi.cpp" +- INCLUDEPATH += src/../$${RTMIDI_DIR} ++ HEADERS += "$${RTMIDI_DIR}/RtMidi.h" ++ SOURCES += "$${RTMIDI_DIR}/RtMidi.cpp" ++ INCLUDEPATH += $${RTMIDI_DIR} + } + + perfThread_build { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3962037210f..65de3bceb40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16179,6 +16179,12 @@ with pkgs; csound = callPackage ../applications/audio/csound { }; + csound-qt = callPackage ../applications/audio/csound/csound-qt { + python = python27; + qmake = qt59.qmake; + qtwebengine = qt59.qtwebengine; + }; + cinepaint = callPackage ../applications/graphics/cinepaint { fltk = fltk13; libpng = libpng12; From 656b74f021c204b4ef1ecdfedd180e3336f8cdc5 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Tue, 4 Dec 2018 19:33:05 +0000 Subject: [PATCH 011/219] nixos: add AppStream module --- nixos/modules/config/appstream.nix | 25 +++++++++++++++++++++++++ nixos/modules/module-list.nix | 1 + 2 files changed, 26 insertions(+) create mode 100644 nixos/modules/config/appstream.nix diff --git a/nixos/modules/config/appstream.nix b/nixos/modules/config/appstream.nix new file mode 100644 index 00000000000..483ac9c3cd7 --- /dev/null +++ b/nixos/modules/config/appstream.nix @@ -0,0 +1,25 @@ +{ config, lib, ... }: + +with lib; +{ + options = { + appstream.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install files to support the + AppStream metadata specification. + ''; + }; + }; + + config = mkIf config.appstream.enable { + environment.pathsToLink = [ + # per component metadata + "/share/metainfo" + # legacy path for above + "/share/appdata" + ]; + }; + +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e2b2666888c..3ec55e46875 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -11,6 +11,7 @@ ./config/xdg/icons.nix ./config/xdg/menus.nix ./config/xdg/mime.nix + ./config/appstream.nix ./config/gtk/gtk-icon-cache.nix ./config/gnu.nix ./config/i18n.nix From 9a619df54753e28945c8251af4837ed282915d55 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Dec 2018 14:48:39 -0800 Subject: [PATCH 012/219] xl2tpd: 1.3.12 -> 1.3.13 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xl2tpd/versions --- pkgs/tools/networking/xl2tpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix index d86b1613a9a..f3c1fbd853a 100644 --- a/pkgs/tools/networking/xl2tpd/default.nix +++ b/pkgs/tools/networking/xl2tpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xl2tpd-${version}"; - version = "1.3.12"; + version = "1.3.13"; src = fetchFromGitHub { owner = "xelerance"; repo = "xl2tpd"; rev = "v${version}"; - sha256 = "0slza1v8qligy8c83j0x3jzb85m9ibjxyyvpwsykrkypav8a6ii1"; + sha256 = "1nzkmhi9arwd4smhr07l0sssx46w48z0cblv7xcz25wg4hw86mcd"; }; buildInputs = [ libpcap ]; From 828547556e39191eb1d8b3cb60e0cd03fd56329e Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Mon, 10 Dec 2018 16:19:05 -0500 Subject: [PATCH 013/219] botocore: 1.12.48 -> 1.12.62 boto3: 1.9.36 -> 1.9.62 awscli: 1.16.72 I update all three of these at a time because they rely on each other and get annoyed when such changes are non-atomic. Also added a note to the packages telling people that this is needed. I tested awscli and the libraries against a real account. --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- pkgs/development/python-modules/botocore/default.nix | 4 ++-- pkgs/tools/admin/awscli/default.nix | 10 ++-------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index db505d84eea..0d78b3463cc 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.9.36"; + version = "1.9.62"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "2a9f3809b480803c1b1f28a19c554f1e1ceafd8db994a4236a0843b999ee6c56"; + sha256 = "0rf3ik4bqr0qab2648rcaahycr2sih257ngz8brizyfln0lk1sg9"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index e67256b0853..699357437b9 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.12.48"; + version = "1.12.62"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "7140e51ab0a7aa3b7fa9cf5fefa663e0cd097098fcbd51b12ff8884c8d967754"; + sha256 = "0zgq3cldrh1x65s3vy1mhp1h5nnsdxw7ig1v0di7p8yns3iazsv7"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 052f4abb8af..ee17922cb78 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.16.60"; + version = "1.16.72"; # N.B: if you change this, change botocore to a matching version too src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "25bcc6cf2304356a78429671999857ff33f88761d81bcee63463a86a6780dcdc"; + sha256 = "1ld4a6yxnh0v96fjjp8wjf7zvx41grl57mqg92p6zbfssr2jbqfv"; }; # No tests included @@ -42,12 +42,6 @@ in py.pkgs.buildPythonApplication rec { less ]; - postPatch = '' - for i in {py,cfg}; do - substituteInPlace setup.$i --replace "botocore==1.12.50" "botocore>=1.11,<1.13" - done - ''; - postInstall = '' mkdir -p $out/etc/bash_completion.d echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli From 189fbae95b4f328287777e6e752a20f67f6d3eef Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Mon, 10 Dec 2018 16:43:24 -0600 Subject: [PATCH 014/219] ldns: relax platform requirements Seems to have built OK on darwin. I only needed it to build freeswitch though, so not sure how to test functionality. I successfully ran the `drill` command. --- pkgs/development/libraries/ldns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index c4120e5bb0e..468ab90edb5 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { description = "Library with the aim of simplifying DNS programming in C"; license = licenses.bsd3; homepage = http://www.nlnetlabs.nl/projects/ldns/; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ jgeerds ]; }; } From 5234948642f5a257a44fe6a5f1f11e3e0e5e71f8 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Mon, 10 Dec 2018 16:49:26 -0600 Subject: [PATCH 015/219] freeswitch: build on darwin - relax platform requirement - include required apple framework --- pkgs/servers/sip/freeswitch/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 32acba433b1..ab4147230a9 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,6 +1,9 @@ { fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline , openssl, perl, sqlite, libjpeg, speex, pcre -, ldns, libedit, yasm, which, lua, libopus, libsndfile }: +, ldns, libedit, yasm, which, lua, libopus, libsndfile + +, SystemConfiguration +}: stdenv.mkDerivation rec { name = "freeswitch-1.6.20"; @@ -20,7 +23,7 @@ stdenv.mkDerivation rec { openssl ncurses curl gnutls readline perl libjpeg sqlite pcre speex ldns libedit yasm which lua libopus libsndfile - ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ]; NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -31,6 +34,6 @@ stdenv.mkDerivation rec { homepage = https://freeswitch.org/; license = stdenv.lib.licenses.mpl11; maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d85a1ddf9a1..a157a53dc6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13435,6 +13435,7 @@ in freeswitch = callPackage ../servers/sip/freeswitch { openssl = openssl_1_0_2; + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; }; fusionInventory = callPackage ../servers/monitoring/fusion-inventory { }; From 0023e1d0de7c0a61f884f286a1a25326f0c0a568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 10 Dec 2018 18:05:42 +0100 Subject: [PATCH 016/219] python.pkgs.CommonMark: correct pname --- pkgs/development/python-modules/commonmark/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix index 63d84f3da77..93eb0327286 100644 --- a/pkgs/development/python-modules/commonmark/default.nix +++ b/pkgs/development/python-modules/commonmark/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, future }: buildPythonPackage rec { - pname = "CommonMark"; + pname = "commonmark"; version = "0.8.1"; src = fetchPypi { From 935810e0f3182e80be9da6241d7208f0a7fc2e2a Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Wed, 12 Dec 2018 14:47:39 +0700 Subject: [PATCH 017/219] luigi: include boto3 A number of luigi modules use boto3 to access AWS and will not work without it. --- pkgs/applications/networking/cluster/luigi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index 35721208a6e..7e1fb6cf9c8 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { sed -i 's/<2.2.0//' setup.py ''; - propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon ]; + propagatedBuildInputs = with python3Packages; [ tornado_4 python-daemon boto3 ]; # Requires tox, hadoop, and google cloud doCheck = false; From ad27b068d7fe11536a34abc074ff1f77d537843a Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 2 Dec 2018 00:34:58 -0500 Subject: [PATCH 018/219] installer: Adds AArch64 UEFI installer support. --- nixos/lib/make-iso9660-image.sh | 5 +- nixos/modules/installer/cd-dvd/iso-image.nix | 78 +++++++++++++------- 2 files changed, 55 insertions(+), 28 deletions(-) diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index 45cdef1ef4d..b7b1ab52a63 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -47,7 +47,8 @@ if test -n "$bootable"; then isoBootFlags="-eltorito-boot ${bootImage} -eltorito-catalog .boot.cat - -no-emul-boot -boot-load-size 4 -boot-info-table" + -no-emul-boot -boot-load-size 4 -boot-info-table + --sort-weight 1 /isolinux" # Make sure isolinux is near the beginning of the ISO fi if test -n "$usbBootable"; then @@ -112,7 +113,7 @@ xorriso="xorriso -r -path-list pathlist --sort-weight 0 / - --sort-weight 1 /isolinux" # Make sure isolinux is near the beginning of the ISO +" $xorriso -output $out/iso/$isoName diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index aa8003fef2c..9475da23b1f 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -50,7 +50,7 @@ let finalCfg = { name = "NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel}"; params = "init=${config.system.build.toplevel}/init ${additional} ${toString config.boot.kernelParams}"; - image = "/boot/bzImage"; + image = "/boot/${config.system.boot.loader.kernelFile}"; initrd = "/boot/initrd"; }; in @@ -163,7 +163,7 @@ let cp -v ${pkgs.refind}/share/refind/refind_x64.efi $out/EFI/boot/ '' else - "# No refind for ia32" + "# No refind for ${targetArch}" ; grubMenuCfg = '' @@ -222,18 +222,34 @@ let efiDir = pkgs.runCommand "efi-directory" {} '' mkdir -p $out/EFI/boot/ + # ALWAYS required modules. MODULES="fat iso9660 part_gpt part_msdos \ normal boot linux configfile loopback chain halt \ - efifwsetup efi_gop efi_uga \ + efifwsetup efi_gop \ ls search search_label search_fs_uuid search_fs_file \ gfxmenu gfxterm gfxterm_background gfxterm_menu test all_video loadenv \ exfat ext2 ntfs btrfs hfsplus udf \ videoinfo png \ echo serial \ " + + echo "Building GRUB with modules:" + for mod in $MODULES; do + echo " - $mod" + done + + # Modules that may or may not be available per-platform. + echo "Adding additional modules:" + for mod in efi_uga; do + if [ -f ${pkgs.grub2_efi}/lib/grub/${pkgs.grub2_efi.grubTarget}/$mod.mod ]; then + echo " - $mod" + MODULES+=" $mod" + fi + done + # Make our own efi program, we can't rely on "grub-install" since it seems to # probe for devices, even with --skip-fs-probe. - ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/${if targetArch == "x64" then "bootx64" else "bootia32"}.efi -p /EFI/boot -O ${if targetArch == "x64" then "x86_64" else "i386"}-efi \ + ${pkgs.grub2_efi}/bin/grub-mkimage -o $out/EFI/boot/boot${targetArch}.efi -p /EFI/boot -O ${pkgs.grub2_efi.grubTarget} \ $MODULES cp ${pkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/ @@ -344,12 +360,19 @@ let ${pkgs.dosfstools}/sbin/fsck.vfat -vn "$out" ''; # */ - targetArch = if pkgs.stdenv.isi686 then - "ia32" - else if pkgs.stdenv.isx86_64 then - "x64" - else - throw "Unsupported architecture"; + # Name used by UEFI for architectures. + targetArch = + if pkgs.stdenv.isi686 then + "ia32" + else if pkgs.stdenv.isx86_64 then + "x64" + else if pkgs.stdenv.isAarch64 then + "aa64" + else + throw "Unsupported architecture"; + + # Syslinux (and isolinux) only supports x86-based architectures. + canx86BiosBoot = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64; in @@ -483,9 +506,9 @@ in # here and it causes a cyclic dependency. boot.loader.grub.enable = false; - # !!! Hack - attributes expected by other modules. - system.boot.loader.kernelFile = "bzImage"; - environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ]; + environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi ] + ++ optional canx86BiosBoot pkgs.syslinux + ; # In stage 1 of the boot, mount the CD as the root FS by label so # that we don't need to know its device. We pass the label of the @@ -556,13 +579,7 @@ in # Individual files to be included on the CD, outside of the Nix # store on the CD. isoImage.contents = - [ { source = pkgs.substituteAll { - name = "isolinux.cfg"; - src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg; - bootRoot = "/boot"; - }; - target = "/isolinux/isolinux.cfg"; - } + [ { source = config.boot.kernelPackages.kernel + "/" + config.system.boot.loader.kernelFile; target = "/boot/" + config.system.boot.loader.kernelFile; } @@ -572,9 +589,6 @@ in { source = config.system.build.squashfsStore; target = "/nix-store.squashfs"; } - { source = "${pkgs.syslinux}/share/syslinux"; - target = "/isolinux"; - } { source = config.isoImage.efiSplashImage; target = "/EFI/boot/efi-background.png"; } @@ -584,6 +598,17 @@ in { source = pkgs.writeText "version" config.system.nixos.label; target = "/version.txt"; } + ] ++ optionals canx86BiosBoot [ + { source = pkgs.substituteAll { + name = "isolinux.cfg"; + src = pkgs.writeText "isolinux.cfg-in" isolinuxCfg; + bootRoot = "/boot"; + }; + target = "/isolinux/isolinux.cfg"; + } + { source = "${pkgs.syslinux}/share/syslinux"; + target = "/isolinux"; + } ] ++ optionals config.isoImage.makeEfiBootable [ { source = efiImg; target = "/boot/efi.img"; @@ -591,7 +616,7 @@ in { source = "${efiDir}/EFI"; target = "/EFI"; } - ] ++ optionals config.boot.loader.grub.memtest86.enable [ + ] ++ optionals (config.boot.loader.grub.memtest86.enable && canx86BiosBoot) [ { source = "${pkgs.memtest86plus}/memtest.bin"; target = "/boot/memtest.bin"; } @@ -606,9 +631,10 @@ in # Create the ISO image. system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({ inherit (config.isoImage) isoName compressImage volumeID contents; - bootable = true; + bootable = canx86BiosBoot; bootImage = "/isolinux/isolinux.bin"; - } // optionalAttrs config.isoImage.makeUsbBootable { + syslinux = if canx86BiosBoot then pkgs.syslinux else null; + } // optionalAttrs (config.isoImage.makeUsbBootable && canx86BiosBoot) { usbBootable = true; isohybridMbrImage = "${pkgs.syslinux}/share/syslinux/isohdpfx.bin"; } // optionalAttrs config.isoImage.makeEfiBootable { From b33fc4e6180639da886e62b2bf2ee703dc1557bb Mon Sep 17 00:00:00 2001 From: Sage Raflik Date: Thu, 13 Dec 2018 02:20:31 -0800 Subject: [PATCH 019/219] retroarch: Remove --menu from wrapper --- pkgs/misc/emulators/retroarch/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix index f85d85f8621..71ae168f1b2 100644 --- a/pkgs/misc/emulators/retroarch/wrapper.nix +++ b/pkgs/misc/emulators/retroarch/wrapper.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch \ --suffix-each LD_LIBRARY_PATH ':' "$cores" \ - --add-flags "-L $out/lib/ --menu" \ + --add-flags "-L $out/lib/" \ ''; cores = map (x: x + x.libretroCore) cores; From f9f2f951b6a38ea3acbc893a008f791beccfbadf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 13 Dec 2018 21:48:31 -0800 Subject: [PATCH 020/219] gnome3.webkitgtk: 2.22.4 -> 2.22.5 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/webkitgtk/versions --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index e18142eb1d0..8baa6b0fc83 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.22.4"; + version = "2.22.5"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "1f2335hjzsvjxjf6hy5cyypsn65wykpx2pbk1sp548w0hclbxdgs"; + sha256 = "04ybyvaz5xhfkd2k65pc0sqizngjvd82j1p56wz3lz4a84zqdlwr"; }; patches = optionals stdenv.isDarwin [ From 0288d43a2d148061850a93cf841d5f1cbb96c89c Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 14 Dec 2018 10:10:00 +0300 Subject: [PATCH 021/219] php: remove unsupported options --- pkgs/development/interpreters/php/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index ae4e9b9635d..f1e0128abb9 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -2,7 +2,7 @@ { lib, stdenv, fetchurl, flex, bison, autoconf , mysql, libxml2, readline, zlib, curl, postgresql, gettext , openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype -, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds +, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2, libzip }: @@ -17,7 +17,6 @@ let , imapSupport ? config.php.imap or (!stdenv.isDarwin) , ldapSupport ? config.php.ldap or true , mhashSupport ? config.php.mhash or true - , mysqlSupport ? (config.php.mysql or true) , mysqlndSupport ? config.php.mysqlnd or true , mysqliSupport ? config.php.mysqli or true , pdo_mysqlSupport ? config.php.pdo_mysql or true @@ -27,7 +26,6 @@ let , bcmathSupport ? config.php.bcmath or true , socketsSupport ? config.php.sockets or true , curlSupport ? config.php.curl or true - , curlWrappersSupport ? config.php.curlWrappers or true , gettextSupport ? config.php.gettext or true , pcntlSupport ? config.php.pcntl or true , postgresqlSupport ? config.php.postgresql or true @@ -48,7 +46,6 @@ let , ftpSupport ? config.php.ftp or true , fpmSupport ? config.php.fpm or true , gmpSupport ? config.php.gmp or true - , mssqlSupport ? config.php.mssql or (!stdenv.isDarwin) , ztsSupport ? config.php.zts or false , calendarSupport ? config.php.calendar or true , sodiumSupport ? (config.php.sodium or true) && (versionAtLeast version "7.2") @@ -92,7 +89,6 @@ let ++ optional postgresqlSupport postgresql ++ optional pdo_pgsqlSupport postgresql ++ optional pdo_mysqlSupport mysqlBuildInputs - ++ optional mysqlSupport mysqlBuildInputs ++ optional mysqliSupport mysqlBuildInputs ++ optional gmpSupport gmp ++ optional gettextSupport gettext @@ -100,7 +96,6 @@ let ++ optional xslSupport libxslt ++ optional mcryptSupport libmcrypt' ++ optional bz2Support bzip2 - ++ optional (mssqlSupport && !stdenv.isDarwin) freetds ++ optional sodiumSupport libsodium ++ optional tidySupport html-tidy ++ optional argon2Support libargon2 @@ -130,7 +125,6 @@ let ++ optional embedSupport "--enable-embed" ++ optional mhashSupport "--with-mhash" ++ optional curlSupport "--with-curl=${curl.dev}" - ++ optional curlWrappersSupport "--with-curlwrappers" ++ optional zlibSupport "--with-zlib=${zlib.dev}" ++ optional libxml2Support "--with-libxml-dir=${libxml2.dev}" ++ optional pcntlSupport "--enable-pcntl" @@ -139,11 +133,10 @@ let ++ optional postgresqlSupport "--with-pgsql=${postgresql}" ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}" ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}" - ++ optional mysqlSupport "--with-mysql${if mysqlndSupport then "=mysqlnd" else ""}" ++ optionals mysqliSupport [ "--with-mysqli=${if mysqlndSupport then "mysqlnd" else "${mysql.connector-c}/bin/mysql_config"}" ] - ++ optional ( pdo_mysqlSupport || mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock" + ++ optional ( pdo_mysqlSupport || mysqliSupport ) "--with-mysql-sock=/run/mysqld/mysqld.sock" ++ optional bcmathSupport "--enable-bcmath" # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108. ++ optionals gdSupport [ @@ -166,7 +159,6 @@ let ++ optional zipSupport "--enable-zip" ++ optional ftpSupport "--enable-ftp" ++ optional fpmSupport "--enable-fpm" - ++ optional (mssqlSupport && !stdenv.isDarwin) "--with-mssql=${freetds}" ++ optional ztsSupport "--enable-maintainer-zts" ++ optional calendarSupport "--enable-calendar" ++ optional sodiumSupport "--with-sodium=${libsodium.dev}" From bd850ff624df240d5447dfab18ce215d97993e70 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 14 Dec 2018 10:40:34 +0300 Subject: [PATCH 022/219] php: fix build without libxml2Support --- pkgs/development/interpreters/php/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index f1e0128abb9..24bfb4f6a80 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -32,7 +32,7 @@ let , pdo_pgsqlSupport ? config.php.pdo_pgsql or true , readlineSupport ? config.php.readline or true , sqliteSupport ? config.php.sqlite or true - , soapSupport ? config.php.soap or true + , soapSupport ? (config.php.soap or true) && (libxml2Support) , zlibSupport ? config.php.zlib or true , opensslSupport ? config.php.openssl or true , mbstringSupport ? config.php.mbstring or true @@ -127,6 +127,15 @@ let ++ optional curlSupport "--with-curl=${curl.dev}" ++ optional zlibSupport "--with-zlib=${zlib.dev}" ++ optional libxml2Support "--with-libxml-dir=${libxml2.dev}" + ++ optional (!libxml2Support) [ + "--disable-dom" + "--disable-libxml" + "--disable-simplexml" + "--disable-xml" + "--disable-xmlreader" + "--disable-xmlwriter" + "--without-pear" + ] ++ optional pcntlSupport "--enable-pcntl" ++ optional readlineSupport "--with-readline=${readline.dev}" ++ optional sqliteSupport "--with-pdo-sqlite=${sqlite.dev}" From 535b6298c76f4ffda833c1c180984c5361915741 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 14 Dec 2018 10:56:46 +0300 Subject: [PATCH 023/219] php: add option config.php.xmlrpc --- pkgs/development/interpreters/php/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 24bfb4f6a80..2757b9bd4ba 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -56,6 +56,7 @@ let , cgiSupport ? config.php.cgi or true , cliSupport ? config.php.cli or true , pharSupport ? config.php.phar or true + , xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support) }: let @@ -178,7 +179,8 @@ let ++ optional (!phpdbgSupport) "--disable-phpdbg" ++ optional (!cgiSupport) "--disable-cgi" ++ optional (!cliSupport) "--disable-cli" - ++ optional (!pharSupport) "--disable-phar"; + ++ optional (!pharSupport) "--disable-phar" + ++ optional xmlrpcSupport "--with-xmlrpc"; hardeningDisable = [ "bindnow" ]; From 8ff8e7e8f3ff9fe0a3ee9445c1aebf69d755c04b Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 14 Dec 2018 11:12:57 +0300 Subject: [PATCH 024/219] phpPackages.ast: 0.1.5 -> 1.0.0 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 481bdcdf81c..08a98604870 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -27,9 +27,9 @@ let }; ast = buildPecl { - name = "ast-0.1.5"; + name = "ast-1.0.0"; - sha256 = "0vv2w5fkkw9n7qdmi5aq50416zxmvyzjym8kb6j1v8kd4xcsjjgw"; + sha256 = "0abccvwif1pih222lbj2z4cf9ibciz48xj35lfixyry163vabkck"; }; couchbase = buildPecl rec { From 6a6266a34449cea7928b52b0efb2fec9951c1bab Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 14 Dec 2018 11:35:46 +0300 Subject: [PATCH 025/219] phpPackages.redis: 3.1.4 -> 4.2.0 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 08a98604870..c08daa274af 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -216,8 +216,8 @@ let }; redis = buildPecl { - name = "redis-3.1.4"; - sha256 = "0rgjdrqfif8pfn3ipk1v4gyjkkdcdrdk479qbpda89w25vaxzsxd"; + name = "redis-4.2.0"; + sha256 = "105k2rfz97svrqzdhd0a0668mn71c8v0j7hks95832fsvn5dhmbn"; }; v8 = buildPecl rec { From c729c17b94a5409b11e6b61687d165642f3185c0 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 14 Dec 2018 11:39:02 +0300 Subject: [PATCH 026/219] phpPackages.v8: 0.1.9 -> 0.2.2 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index c08daa274af..56f350e7c77 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -221,10 +221,10 @@ let }; v8 = buildPecl rec { - version = "0.1.9"; + version = "0.2.2"; name = "v8-${version}"; - sha256 = "0bj77dfmld5wfwl4wgqnpa0i4f3mc1mpsp9dmrwqv050gs84m7h1"; + sha256 = "103nys7zkpi1hifqp9miyl0m1mn07xqshw3sapyz365nb35g5q71"; buildInputs = [ pkgs.v8_6_x ]; configureFlags = [ "--with-v8=${pkgs.v8_6_x}" ]; From 555489219197d5e394877cb10e29d96aa5991cf0 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 14 Dec 2018 11:42:23 +0300 Subject: [PATCH 027/219] phpPackages.composer: 1.7.2 -> 1.8.0 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 56f350e7c77..2fddf4787b2 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -242,11 +242,11 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.7.2"; + version = "1.8.0"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "03km8qw3nshj7qzk5pidziha2ldx1l2yxhh2s7vpg25f9782hd7c"; + sha256 = "19pg9ip2mpyf5cyq34fld7qwl77mshqw3c4nif7sxmpnar6sh089"; }; unpackPhase = ":"; From 87481c2ff165b5d07624cde969e39da8f42bdbd0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 01:07:34 -0800 Subject: [PATCH 028/219] star: 2.6.1c -> 2.6.1d Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/star/versions --- pkgs/applications/science/biology/star/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index e22043d9eb9..cbe38649503 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "star-${version}"; - version = "2.6.1c"; + version = "2.6.1d"; src = fetchFromGitHub { repo = "STAR"; owner = "alexdobin"; rev = version; - sha256 = "0macdbxa0v5xplag83fpdhfpyhnqncmi9wf9r92wa7w8zkln12vd"; + sha256 = "1h0j8qj95a0brv7p3gxmg3z7z6f4670jzjg56kzyc33k8dmzxvli"; }; sourceRoot = "source/source"; From f5b3450e887742a0d862b4eecc5cc94ef7e0e64b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 02:46:00 -0800 Subject: [PATCH 029/219] synthv1: 0.9.3 -> 0.9.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/synthv1/versions --- pkgs/applications/audio/synthv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index 13560e34062..e44df51404a 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "synthv1-${version}"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { url = "mirror://sourceforge/synthv1/${name}.tar.gz"; - sha256 = "0f58k5n2k667q8wsigg7bzl3lfgaf6jdj98r2a5nvyb18v1wpy2c"; + sha256 = "18xjj14g8gnnbwyrf39bdxc5aswb620w9i323skdf6rnaq229jyv"; }; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; From b17326750173cf9c0033aba11ec1c3ae777f4af9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 03:27:38 -0800 Subject: [PATCH 030/219] sound-juicer: 3.16.1 -> 3.24.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sound-juicer/versions --- pkgs/applications/audio/sound-juicer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 5679a4d5342..686b27223a6 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -4,13 +4,13 @@ let pname = "sound-juicer"; - version = "3.16.1"; + version = "3.24.0"; in stdenv.mkDerivation rec{ name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz"; + sha256 = "19qg4xv0f9rkq34lragkmhii1llxsa87llbl28i759b0ks4f6sny"; }; nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; From f0d95f00d0aff960bebe3ea708abfde27a184ec9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 04:51:58 -0800 Subject: [PATCH 031/219] riemann_c_client: 1.10.3 -> 1.10.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/riemann-c-client/versions --- pkgs/tools/misc/riemann-c-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index bbbb19fc200..970cf28c26d 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }: stdenv.mkDerivation rec { - name = "riemann-c-client-1.10.3"; + name = "riemann-c-client-1.10.4"; src = fetchFromGitHub { owner = "algernon"; repo = "riemann-c-client"; rev = "${name}"; - sha256 = "0944l0wlx1m4x8b4dpjsq994614bxd7pi1c1va3qyk93hld9d3qc"; + sha256 = "01gzqxqm1xvki2vd78c7my2kgp4fyhkcf5j5fmy8z0l93lgj82rr"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From fbe282b25a6770d22a31584651f5219fd2ee50dc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 05:19:41 -0800 Subject: [PATCH 032/219] samplv1: 0.9.3 -> 0.9.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/samplv1/versions --- pkgs/applications/audio/samplv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 71912e73c47..73f24e03e30 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "samplv1-${version}"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { url = "mirror://sourceforge/samplv1/${name}.tar.gz"; - sha256 = "1yvdr0fvw13lj2r8dppmn0aw83g9f5r1hp5ixvw7cdhrxs7fh4vw"; + sha256 = "17a61lliplhs14b3x83qz3kv7ww4dn3a02jfdlcx2z903hwn5sld"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; From 567910d3e31548a0af54fafdb35bf8fe126d9a7a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 06:11:09 -0800 Subject: [PATCH 033/219] pywal: 3.1.0 -> 3.2.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pywal/versions --- pkgs/tools/graphics/pywal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pywal/default.nix b/pkgs/tools/graphics/pywal/default.nix index a1d1f21a007..4d493bdd73e 100644 --- a/pkgs/tools/graphics/pywal/default.nix +++ b/pkgs/tools/graphics/pywal/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "pywal"; - version = "3.1.0"; + version = "3.2.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1i4i9jjnm4f0zhz4nqbb4253517w33bsh5f246n5930hwrr9xn76"; + sha256 = "1pj30h19ijwhmbm941yzbkgr19q06dhp9492h9nrqw1wfjfdbdic"; }; # necessary for imagemagick to be found during tests From a7e1717d4bc36a20772710b562693d4cedcb52f0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 07:37:22 -0800 Subject: [PATCH 034/219] qalculate-gtk: 2.8.1 -> 2.8.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qalculate-gtk/versions --- pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 7cd22f22a4e..42dc2853409 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "029yq9db2rm4fy83c11aynxjsd6vvi7ffamaf9zvkkamqqj1sjlf"; + sha256 = "0vdrpnarbwhappwgp38jjndnq30h1lh8hbk75i9rhkb7x4kblqfi"; }; patchPhase = '' From b98926d55a33e5d50692a18bb3b4f26f11e17c9f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 08:14:10 -0800 Subject: [PATCH 035/219] qbs: 1.12.1 -> 1.12.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qbs/versions --- pkgs/development/tools/build-managers/qbs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix index 99fb9090c0d..3c5a485e36f 100644 --- a/pkgs/development/tools/build-managers/qbs/default.nix +++ b/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "qbs-${version}"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "14b7bz07yfrmbry57n3xh8w4nbapm6aknk45fgi7ljvsfzp85fzl"; + sha256 = "0spkkq7nmh27rbx61p23fzkxffx3qdhjqw95pqgsbc76xczd45sv"; }; nativeBuildInputs = [ qmake ]; From c7386145ad6a33fa12f15027677ad59af7001f6f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 08:25:36 -0800 Subject: [PATCH 036/219] qsampler: 0.5.2 -> 0.5.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qsampler/versions --- pkgs/applications/audio/qsampler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 8ad251652d0..69bf41e1e4f 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "qsampler-${version}"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { url = "mirror://sourceforge/qsampler/${name}.tar.gz"; - sha256 = "0xb0j57k03pkdl7yl5mcv1i21ljnxcq6b9h3zp6mris916lj45zq"; + sha256 = "02xazvz8iaksglbgq3jhw4fq3f5pdcq9sss79jxs082md0mry17d"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; From 6b77a7f8bfb507eb5cd16c41068a885b2630c3b6 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 14 Dec 2018 20:27:50 +0300 Subject: [PATCH 037/219] fprint_demo: drop package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://fprint.freedesktop.org/ fprint_demo is obsolete. Most features are integrated into fprintd’s helpers, and libfprint has an examples section --- pkgs/tools/security/fprint_demo/default.nix | 24 --------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/tools/security/fprint_demo/default.nix diff --git a/pkgs/tools/security/fprint_demo/default.nix b/pkgs/tools/security/fprint_demo/default.nix deleted file mode 100644 index 2179b2b7b03..00000000000 --- a/pkgs/tools/security/fprint_demo/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, libfprint, gtk2 }: - -stdenv.mkDerivation rec { - name = "fprint_demo-2008-03-03"; - - src = fetchgit { - url = "git://github.com/dsd/fprint_demo"; - rev = "5d86c3f778bf97a29b73bdafbebd1970e560bfb0"; - sha256 = "1rysqd8kdqgis1ykrbkiy1bcxav3vna8zdgbamyxw4hj5764xdcm"; - }; - - buildInputs = [ libfprint gtk2 ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - - hardeningDisable = [ "format" ]; - - meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/fprint/fprint_demo/; - description = "A simple GTK+ application to demonstrate and test libfprint's capabilities"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05dbfacb628..7a4ea7aecd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2750,8 +2750,6 @@ in fprintd = callPackage ../tools/security/fprintd { }; - fprint_demo = callPackage ../tools/security/fprint_demo { }; - franz = callPackage ../applications/networking/instant-messengers/franz { }; freedroidrpg = callPackage ../games/freedroidrpg { }; From 339a9980ec1b62e6546da15a52f6ef78daa5d82d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 13 Dec 2018 17:25:12 +0100 Subject: [PATCH 038/219] home-assistant: 0.83.3 -> 0.84.2 --- .../home-assistant/component-packages.nix | 23 +++++++++++++++---- pkgs/servers/home-assistant/default.nix | 10 ++++---- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 30fe7354f65..f79390442a6 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.83.3"; + version = "0.84.2"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -264,6 +264,8 @@ "climate.zwave" = ps: with ps; [ ]; "cloud" = ps: with ps; [ aiohttp-cors warrant ]; "cloud.auth_api" = ps: with ps; [ ]; + "cloud.cloud_api" = ps: with ps; [ ]; + "cloud.cloudhooks" = ps: with ps; [ ]; "cloud.const" = ps: with ps; [ ]; "cloud.http_api" = ps: with ps; [ ]; "cloud.iot" = ps: with ps; [ ]; @@ -438,6 +440,7 @@ "geo_location.demo" = ps: with ps; [ ]; "geo_location.geo_json_events" = ps: with ps; [ ]; "geo_location.nsw_rural_fire_service_feed" = ps: with ps; [ ]; + "geo_location.usgs_earthquakes_feed" = ps: with ps; [ ]; "geofency" = ps: with ps; [ aiohttp-cors ]; "goalfeed" = ps: with ps; [ ]; "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; @@ -467,6 +470,7 @@ "history" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "history_graph" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "hive" = ps: with ps; [ ]; + "hlk_sw16" = ps: with ps; [ ]; "homekit" = ps: with ps; [ ]; "homekit.const" = ps: with ps; [ ]; "homekit.util" = ps: with ps; [ ]; @@ -564,6 +568,7 @@ "light.knx" = ps: with ps; [ ]; "light.lifx" = ps: with ps; [ ]; "light.lifx_legacy" = ps: with ps; [ ]; + "light.lightwave" = ps: with ps; [ ]; "light.limitlessled" = ps: with ps; [ ]; "light.litejet" = ps: with ps; [ ]; "light.lutron" = ps: with ps; [ ]; @@ -571,8 +576,6 @@ "light.lw12wifi" = ps: with ps; [ ]; "light.mochad" = ps: with ps; [ ]; "light.mqtt" = ps: with ps; [ paho-mqtt ]; - "light.mqtt_json" = ps: with ps; [ paho-mqtt ]; - "light.mqtt_template" = ps: with ps; [ paho-mqtt ]; "light.mysensors" = ps: with ps; [ ]; "light.mystrom" = ps: with ps; [ ]; "light.nanoleaf_aurora" = ps: with ps; [ nanoleaf ]; @@ -608,6 +611,7 @@ "light.zha" = ps: with ps; [ ]; "light.zigbee" = ps: with ps; [ ]; "light.zwave" = ps: with ps; [ ]; + "lightwave" = ps: with ps; [ ]; "linode" = ps: with ps; [ linode-api ]; "lirc" = ps: with ps; [ ]; "litejet" = ps: with ps; [ ]; @@ -770,7 +774,6 @@ "notify.hipchat" = ps: with ps; [ ]; "notify.homematic" = ps: with ps; [ pyhomematic ]; "notify.html5" = ps: with ps; [ aiohttp-cors ]; - "notify.instapush" = ps: with ps; [ ]; "notify.ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "notify.joaoapps_join" = ps: with ps; [ ]; "notify.knx" = ps: with ps; [ ]; @@ -866,6 +869,7 @@ "scene" = ps: with ps; [ ]; "scene.deconz" = ps: with ps; [ ]; "scene.elkm1" = ps: with ps; [ ]; + "scene.fibaro" = ps: with ps; [ ]; "scene.homeassistant" = ps: with ps; [ ]; "scene.hunterdouglas_powerview" = ps: with ps; [ ]; "scene.knx" = ps: with ps; [ ]; @@ -896,6 +900,7 @@ "sensor.arlo" = ps: with ps; [ ]; "sensor.arwn" = ps: with ps; [ paho-mqtt ]; "sensor.asuswrt" = ps: with ps; [ ]; + "sensor.awair" = ps: with ps; [ ]; "sensor.bbox" = ps: with ps; [ ]; "sensor.bh1750" = ps: with ps; [ ]; "sensor.bitcoin" = ps: with ps; [ ]; @@ -948,6 +953,7 @@ "sensor.emoncms" = ps: with ps; [ ]; "sensor.enocean" = ps: with ps; [ ]; "sensor.enphase_envoy" = ps: with ps; [ ]; + "sensor.entur_public_transport" = ps: with ps; [ ]; "sensor.envirophat" = ps: with ps; [ ]; "sensor.envisalink" = ps: with ps; [ ]; "sensor.etherscan" = ps: with ps; [ ]; @@ -1066,6 +1072,7 @@ "sensor.pushbullet" = ps: with ps; [ pushbullet ]; "sensor.pvoutput" = ps: with ps; [ ]; "sensor.pyload" = ps: with ps; [ ]; + "sensor.qbittorrent" = ps: with ps; [ ]; "sensor.qnap" = ps: with ps; [ ]; "sensor.qwikswitch" = ps: with ps; [ ]; "sensor.radarr" = ps: with ps; [ ]; @@ -1235,6 +1242,7 @@ "switch.hdmi_cec" = ps: with ps; [ ]; "switch.hikvisioncam" = ps: with ps; [ ]; "switch.hive" = ps: with ps; [ ]; + "switch.hlk_sw16" = ps: with ps; [ ]; "switch.homekit_controller" = ps: with ps; [ ]; "switch.homematic" = ps: with ps; [ pyhomematic ]; "switch.homematicip_cloud" = ps: with ps; [ ]; @@ -1246,6 +1254,7 @@ "switch.kankun" = ps: with ps; [ ]; "switch.knx" = ps: with ps; [ ]; "switch.konnected" = ps: with ps; [ aiohttp-cors netdisco ]; + "switch.lightwave" = ps: with ps; [ ]; "switch.linode" = ps: with ps; [ linode-api ]; "switch.litejet" = ps: with ps; [ ]; "switch.lupusec" = ps: with ps; [ ]; @@ -1319,6 +1328,8 @@ "telegram_bot.polling" = ps: with ps; [ ]; "telegram_bot.webhooks" = ps: with ps; [ aiohttp-cors ]; "tellduslive" = ps: with ps; [ ]; + "tellduslive.const" = ps: with ps; [ ]; + "tellduslive.entry" = ps: with ps; [ ]; "tellstick" = ps: with ps; [ ]; "tesla" = ps: with ps; [ ]; "thethingsnetwork" = ps: with ps; [ ]; @@ -1402,11 +1413,15 @@ "wemo" = ps: with ps; [ ]; "wink" = ps: with ps; [ ]; "wirelesstag" = ps: with ps; [ ]; + "wunderlist" = ps: with ps; [ ]; "xiaomi_aqara" = ps: with ps; [ ]; "zabbix" = ps: with ps; [ ]; "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; "zha" = ps: with ps; [ ]; + "zha.config_flow" = ps: with ps; [ ]; "zha.const" = ps: with ps; [ ]; + "zha.entities" = ps: with ps; [ ]; + "zha.helpers" = ps: with ps; [ ]; "zigbee" = ps: with ps; [ ]; "zone" = ps: with ps; [ ]; "zone.config_flow" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 88b82453063..e4a68fdfc69 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -36,8 +36,8 @@ let "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46") (mkOverride "requests" "2.20.1" "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263") - (mkOverride "ruamel_yaml" "0.15.78" - "85793c5fe321e9202eba521b0bb3e6303bcb61f6e56378f59e874ca36a7e9d5f") + (mkOverride "ruamel_yaml" "0.15.80" + "4f203351575dba0829c7b1e5d376d08cf5f58e4a2b844e8ce552b3e41cd414e6") (mkOverride "voluptuous" "0.11.5" "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef") (mkOverride "voluptuous-serialize" "2.0.0" @@ -85,7 +85,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.83.3"; + hassVersion = "0.84.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -100,7 +100,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1lv9ixv0qd97xpcpb9zzhn82jsgiq4kmcfnfraksq60xwzzqkwar"; + sha256 = "1w1p0w8bwajiz6dms5x1vdc9sxnxdrjflnxvflxg4kba0w1mxq9m"; }; propagatedBuildInputs = [ @@ -111,7 +111,7 @@ in with py.pkgs; buildPythonApplication rec { ] ++ componentBuildInputs ++ extraBuildInputs; checkInputs = [ - pytest requests-mock pydispatcher pytest-aiohttp + asynctest pytest pytest-aiohttp requests-mock pydispatcher ]; checkPhase = '' diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 1695a6eb95d..006d242f841 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20181121.1"; + version = "20181211.0"; src = fetchPypi { inherit pname version; - sha256 = "9cedc4dc4258823b084b9d7634995ab038be109fea4c087e38412b9ef1cb6433"; + sha256 = "ebb5d96154590794e9df9b5b48ec0c122419762c7460c4e67c535b65b7a00487"; }; propagatedBuildInputs = [ user-agents ]; From 3492943d178f1923105ba344c0a2622713e074c8 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Fri, 14 Dec 2018 15:58:25 -0500 Subject: [PATCH 039/219] clean: 2.4 -> 3.0 --- pkgs/development/compilers/clean/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix index cc6197922fd..91c163fd343 100644 --- a/pkgs/development/compilers/clean/default.nix +++ b/pkgs/development/compilers/clean/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "clean-2.4"; + name = "clean-3.0"; src = if stdenv.hostPlatform.system == "i686-linux" then (fetchurl { - url = "http://clean.cs.ru.nl/download/Clean24/linux/clean2.4_boot.tar.gz"; - sha256 = "1w8vvmkwzq8g51639r62apcy75sj69nm08082a34xvqm9ymfgkq5"; + url = "https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_32_boot.tar.gz"; + sha256 = "0cjxv3vqrg6pz3aicwfdz1zyhk0q650464j3qyl0wzaikh750010"; }) else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl { - url = "https://clean.cs.ru.nl/download/Clean24/linux/clean2.4_64_boot.tar.gz"; - sha256 = "08gsa1pjl5wyzh4ah8ccfx8a7mdcn6ycsn1lzkrr9adygv1gmm7r"; + url = "https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_64_boot.tar.gz"; + sha256 = "06k283y9adbi28f78k3m5ssg6py73qqkz3sm8dgxc89drv4krl2i"; }) else throw "Architecture not supported"; From 3f145d8e50ca8b4ba4e98a6d2a384d0354fabdb7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 15:01:29 -0800 Subject: [PATCH 040/219] python27Packages.cmdtest: 0.18 -> 0.32 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python2.7-cmdtest/versions --- pkgs/development/python-modules/cmdtest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/pkgs/development/python-modules/cmdtest/default.nix index 605529b1747..73c05c01aed 100644 --- a/pkgs/development/python-modules/cmdtest/default.nix +++ b/pkgs/development/python-modules/cmdtest/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { name = "cmdtest-${version}"; - version = "0.18"; + version = "0.32"; disabled = isPy3k || isPyPy; src = fetchurl { url = "http://code.liw.fi/debian/pool/main/c/cmdtest/cmdtest_${version}.orig.tar.xz"; - sha256 = "068f24k8ad520hcf8g3gj7wvq1wspyd46ay0k9xa360jlb4dv2mn"; + sha256 = "0scc47h1nkmbm5zlvk9bsnsg64kb9r4xadchdinf4f1mph9qpgn6"; }; propagatedBuildInputs = [ cliapp ttystatus markdown ]; From 04e2dd4c4fd16cbf6bb58540363340347df940ef Mon Sep 17 00:00:00 2001 From: tilpner Date: Sat, 15 Dec 2018 00:48:32 +0100 Subject: [PATCH 041/219] mkdocs: 0.17.5 -> 1.0.4 --- .../tools/documentation/mkdocs/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 925d0a786af..5f3dff95e35 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -4,25 +4,24 @@ with python.pkgs; buildPythonApplication rec { pname = "mkdocs"; - version = "0.17.5"; + version = "1.0.4"; src = fetchFromGitHub { owner = "mkdocs"; repo = "mkdocs"; rev = version; - sha256 = "1l1dahpwqikmww3yx2m6j2134npk8vcikg9klsmpqjpza8nigwzw"; + sha256 = "1x35vgiskgz4wwrvi4m1mri5wlphf15p90fr3rxsy5bf19v3s9hs"; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "tornado>=4.1,<5.0" "tornado>=4.1" - ''; - checkInputs = [ nose nose-exclude mock ]; - NOSE_EXCLUDE_TESTS="mkdocs.tests.gh_deploy_tests.TestGitHubDeploy;mkdocs.tests.config.config_tests.ConfigTests"; + NOSE_EXCLUDE_TESTS = lib.concatStringsSep ";" [ + "mkdocs.tests.gh_deploy_tests.TestGitHubDeploy" + "mkdocs.tests.config.config_tests.ConfigTests" + "mkdocs.tests.config.config_options_tests.DirTest" + ]; checkPhase = "nosetests mkdocs"; @@ -33,6 +32,7 @@ buildPythonApplication rec { pyyaml markdown jinja2 + backports_tempfile ]; meta = { From 25debad443253a2c94a0f9b205480c0d22fbced0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 15 Dec 2018 00:44:03 +0000 Subject: [PATCH 042/219] tilix: fix Po4a path --- pkgs/applications/misc/tilix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 98e320b7aaf..5cd1b78e5c1 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preBuild = '' makeFlagsArray=( - PERL5LIB="${perlPackages.Po4a}/lib/perl5" + PERL5LIB="${perlPackages.Po4a}/lib/perl5/site_perl" DCFLAGS='-O -inline -release -version=StdLoggerDisableTrace' ) ''; From df8749b5a0214c8673d70725ed7bde69f4132b05 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 15 Dec 2018 00:45:34 +0000 Subject: [PATCH 043/219] apt: fix Po4a path --- pkgs/tools/package-management/apt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index b2d5e96f391..7139454733a 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5"; + export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5/site_perl"; cmakeFlagsArray+=( -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include From 19d06bc517fe5b697a7f386c69a2d0febaa2cff9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 15 Dec 2018 01:12:14 +0000 Subject: [PATCH 044/219] apt: remove 'export PERL5LIB' --- pkgs/tools/package-management/apt/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 7139454733a..abd5e6f2f4f 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5/site_perl"; - cmakeFlagsArray+=( -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include -DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl From 8fd01fd7c8bd2316f03a860fee9ef33052c2dff9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 15 Dec 2018 01:13:00 +0000 Subject: [PATCH 045/219] tilix: remove 'export PERL5LIB' --- pkgs/applications/misc/tilix/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 5cd1b78e5c1..eb7a8e41d4b 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { preBuild = '' makeFlagsArray=( - PERL5LIB="${perlPackages.Po4a}/lib/perl5/site_perl" DCFLAGS='-O -inline -release -version=StdLoggerDisableTrace' ) ''; From ac62227cfe4d8b864b84f45cd55ca15b776e6950 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 20:10:07 -0800 Subject: [PATCH 046/219] padthv1: 0.9.3 -> 0.9.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/padthv1/versions --- pkgs/applications/audio/padthv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 5d74db5ec3e..084487fd407 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "padthv1-${version}"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { url = "mirror://sourceforge/padthv1/${name}.tar.gz"; - sha256 = "157w28wxggqpqkibz716v3r756q2z78g70ipncpalchb9dfr42b6"; + sha256 = "0k4vlg3clsn2i4k12imvcjiwlp9nx1mikwyrnarg9shxzzdzcf4y"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; From 82c3d05d9e7e29857640c3cdaafbc1e29b33fec6 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 14 Dec 2018 22:37:18 -0500 Subject: [PATCH 047/219] rtl8812au: 5.2.20_25672.20171213 -> 5.2.20.2_28373.20180619 --- pkgs/os-specific/linux/rtl8812au/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 879c427b049..4205cab6da6 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; - version = "5.2.20_25672.20171213"; + version = "5.2.20.2_28373.20180619"; src = fetchFromGitHub { owner = "zebulon2"; repo = "rtl8812au-driver-5.2.20"; - rev = "aca1e0677bfe56c6c4914358df007c97486e7095"; - sha256 = "19av8fkh3mvs2f57iibrg0cfyhjnnx4cbnfzv5aj7v5gb0j3dp0p"; + rev = "2dad788f5d71d50df4f692b67a4428967ba3d42c"; + sha256 = "17pn73j2xqya0g8f86hn1jyf9x9wp52md05yrg1md58ixsbh1kz3"; }; nativeBuildInputs = [ bc ]; From 84800eb00381c4ae1538b54bba5e8e3788f95d6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 21:14:14 -0800 Subject: [PATCH 048/219] oniguruma: 6.9.0 -> 6.9.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/onig/versions --- pkgs/development/libraries/oniguruma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 956c8b58ffc..4c994d596ba 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "onig-${version}"; - version = "6.9.0"; + version = "6.9.1"; src = fetchFromGitHub { owner = "kkos"; repo = "oniguruma"; rev = "v${version}"; - sha256 = "064nk8nxygqrk5b6n7zvrksf5shrsapn12zdi6crbbfbw0s7pn8h"; + sha256 = "0dbdd9r15fsqn0rimkjwlv8v68v4i1830h0m7dw56b335wwl6bbg"; }; nativeBuildInputs = [ cmake ]; From 1cd8c81d50b92ac3c97d7e93d97b0bfd17811df5 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 15 Dec 2018 14:20:34 +0900 Subject: [PATCH 049/219] [bluezFull] add bluezFull package that enables all plugins This PR adds the top-level `bluezFull` package. This `bluezFull` package enables all the plugins provided by the `bluez` package. --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e392af3f65..b930b0e0d26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14195,6 +14195,12 @@ in bluez = bluez5; + bluezFull = bluez.override { + enableWiimote = true; + enableMidi = true; + enableSixaxis = true; + }; + inherit (python3Packages) bedup; bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; From 9039cc3f28e21d14bc4c9af8b2aac4cd7d8875fa Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 15 Dec 2018 14:49:41 +0900 Subject: [PATCH 050/219] Add explanation of using the bluezFull package in nixos documentation. --- nixos/modules/services/hardware/bluetooth.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index d7ca8a43179..2a8dfe4a66c 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -25,9 +25,14 @@ in { type = types.package; default = pkgs.bluez; defaultText = "pkgs.bluez"; - example = "pkgs.bluez.override { enableMidi = true; }"; + example = "pkgs.bluezFull"; description = '' Which BlueZ package to use. + + + Use the pkgs.bluezFull package to enable all + bluez plugins. + ''; }; From 44b2145dbe1642ad9b22b0aa6be1529332dad106 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 22:10:24 -0800 Subject: [PATCH 051/219] osrm-backend: 5.19.0 -> 5.20.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/osrm-backend/versions --- pkgs/servers/osrm-backend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 97612f656cb..4e43fffb196 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "osrm-backend-${version}"; - version = "5.19.0"; + version = "5.20.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "1y3k2j4c3jparzm9ck1jkw5g12jr6kd9llq50jran2dwikc6hpyz"; + sha256 = "0frq16p4wms8zfb6mhn7xbxrvf81f1wn37lqlf5p1yjly5fbljhc"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 4c3e1114d8994d5787fad964a93011430b4ef717 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 23:01:19 -0800 Subject: [PATCH 052/219] neovim-qt: 0.2.10 -> 0.2.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/neovim-qt/versions --- pkgs/applications/editors/neovim/qt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index cfdcd7fe939..315a51256f2 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "neovim-qt-${version}"; - version = "0.2.10"; + version = "0.2.11"; src = fetchFromGitHub { owner = "equalsraf"; repo = "neovim-qt"; rev = "v${version}"; - sha256 = "0hq3w9d6qbzf0j7zm3ls0wpvnab64kypb4i0bhmsnk605mvx63r4"; + sha256 = "0pc1adxc89p2rdvb6nxyqr9sjzqz9zw2dg7a4ardxsl3a8jga1wh"; }; cmakeFlags = [ From ff294a71621c8a949cb257fa09f788fdb2876c0a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 00:51:43 -0800 Subject: [PATCH 053/219] maven: 3.5.4 -> 3.6.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/apache-maven/versions --- .../development/tools/build-managers/apache-maven/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 455cd0a3fe8..c48954a6aaa 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -2,7 +2,7 @@ assert jdk != null; -let version = "3.5.4"; in +let version = "3.6.0"; in stdenv.mkDerivation rec { name = "apache-maven-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz"; - sha256 = "0kd1jzlz3b2kglppi85h7286vdwjdmm7avvpwgppgjv42g4v2l6f"; + sha256 = "0ds61yy6hs7jgmld64b65ss6kpn5cwb186hw3i4il7vaydm386va"; }; buildInputs = [ makeWrapper ]; From 8e6ee63aa4135441033637711004c04ed95bff13 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 01:43:38 -0800 Subject: [PATCH 054/219] now-cli: 12.1.3 -> 12.1.12 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/now-cli/versions --- pkgs/development/web/now-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index 47be5ff4250..1057a987cbc 100644 --- a/pkgs/development/web/now-cli/default.nix +++ b/pkgs/development/web/now-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "now-cli-${version}"; - version = "12.1.3"; + version = "12.1.12"; # TODO: switch to building from source, if possible src = fetchurl { url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz"; - sha256 = "0jg0x227g0x2fby7mnhfyrfyja59003isg7wyh2vqcfshh5hsaq0"; + sha256 = "019lbysfwax69mmgia6h6kbljd7adbh319g3ky2s8djy7n6js4dz"; }; sourceRoot = "."; From 6e21679285ee3fa758b4e739d413113ed2757c04 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 01:52:20 -0800 Subject: [PATCH 055/219] nxproxy: 3.5.99.16 -> 3.5.99.17-1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nxproxy/versions --- pkgs/tools/admin/nxproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix index b29d80e159b..45ec8bb72e3 100644 --- a/pkgs/tools/admin/nxproxy/default.nix +++ b/pkgs/tools/admin/nxproxy/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "nxproxy-${version}"; - version = "3.5.99.16"; + version = "3.5.99.17-1"; src = fetchurl { - sha256 = "1m3z9w3h6qpgk265xf030w7lcs181jgw2cdyzshb7l97mn1f7hh2"; + sha256 = "18a7cvjnaf50lf1cc5axx9jmi8n9g75d2i5y4s6q9r3phpwyp918"; url = "https://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz"; }; From 0bf6022325c4a5c77e361f9dbbe9169e9c668d26 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 03:44:48 -0800 Subject: [PATCH 056/219] logrotate: 3.14.0 -> 3.15.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/logrotate/versions --- pkgs/tools/system/logrotate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index 75f60968440..e01636f2944 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "logrotate-${version}"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "logrotate"; repo = "logrotate"; rev = version; - sha256 = "1wdjqbly97y1i11nl6cmlfpld3yqak270ixf29wixjgrjn8p4xzh"; + sha256 = "094wv4d3gv5dmw55d0xij06lgcg5q9bmq49hipc2jhp4vdsj4xr5"; }; # Logrotate wants to access the 'mail' program; to be done. From 5fa6721358c5ada2d229c0a02fbeaa1c0c99f126 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 14 Dec 2018 19:44:41 +0100 Subject: [PATCH 057/219] kitty: 0.12.3 -> 0.13.1 --- pkgs/applications/misc/kitty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 8cff766371e..d3f20f0282f 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -7,7 +7,7 @@ with python3Packages; buildPythonApplication rec { - version = "0.12.3"; + version = "0.13.1"; name = "kitty-${version}"; format = "other"; @@ -15,7 +15,7 @@ buildPythonApplication rec { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1nhk8pbwr673gw9qjgca4lzjgp8rw7sf99ra4wsh8jplf3kvgq5c"; + sha256 = "1j24zjasdh48z7majfpqr71n1wn5a9688wsmmqn26v8kfb68pqs4"; }; buildInputs = [ From 8c836fab9c2b6559cf4cb0a30021d9306be3bcdb Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 14 Dec 2018 19:29:04 +0100 Subject: [PATCH 058/219] vimPlugins: Update --- pkgs/misc/vim-plugins/generated.nix | 90 ++++++++++++++--------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 3e8c0d715d5..4f73822b573 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -437,12 +437,12 @@ }; dhall-vim = buildVimPluginFrom2Nix { - name = "dhall-vim-2018-12-02"; + name = "dhall-vim-2018-12-12"; src = fetchFromGitHub { owner = "vmchale"; repo = "dhall-vim"; - rev = "caec6efbfc537f1a3a7bf6c5b0f6ab9cffa6911c"; - sha256 = "0r9jd6pq94sjrsppa1avm4x01y01m9vv64p89l32vrpkrczgxgfa"; + rev = "ef31cfee6d8c555d44d282e4cec1367512ad7fe9"; + sha256 = "0r7y614xld5spgpa4c8ms4rm1p8xzsayp91j4jiqhxn6ly6igv7f"; }; }; @@ -991,12 +991,12 @@ }; neomake = buildVimPluginFrom2Nix { - name = "neomake-2018-12-12"; + name = "neomake-2018-12-15"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "2e0b5facc8452b145162b6f45b571b30188d9774"; - sha256 = "180znybxvs9cvlglx6kw5z3chyax7vadlcfj76zh39bzmgim6m7y"; + rev = "b84769baf9f04e1018ca16bb5d22287500c25e43"; + sha256 = "0wfh0332yczq42pr2fyv5bv3ryf09021n1nsfrgiyrcy00k62r4j"; }; }; @@ -1081,12 +1081,12 @@ }; nim-vim = buildVimPluginFrom2Nix { - name = "nim-vim-2018-09-19"; + name = "nim-vim-2018-12-13"; src = fetchFromGitHub { owner = "zah"; repo = "nim.vim"; - rev = "b0c4c6c7318866e5d74715885cb379aab70d2763"; - sha256 = "18wdyw8kchfi0zglzvcnakzm9w8h22a1qjcqnk9j64siwcj6bzcy"; + rev = "358e2e013056af5ad09b3e2963e3390db8677680"; + sha256 = "0ygyxcbbf6vqimzi71gdq40xx7kyi03yc73h5lyycnzwqc7wyxm2"; }; }; @@ -1541,12 +1541,12 @@ }; traces-vim = buildVimPluginFrom2Nix { - name = "traces-vim-2018-12-09"; + name = "traces-vim-2018-12-13"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "5152813d9b91692d37db176a9383f147373a7a8a"; - sha256 = "1f07nb4vn1nawcd32qy7wy0vgkd15ysg3f3yh1xd5jbfxixisbss"; + rev = "46e01b6159a21c89695b9d03ea3529ddc92d3b1f"; + sha256 = "0a77qx12kg4hmfz5zb2ng7lhd855gichs9qjrvich32v04qb2rwv"; }; }; @@ -1601,12 +1601,12 @@ }; unite-vim = buildVimPluginFrom2Nix { - name = "unite-vim-2018-12-03"; + name = "unite-vim-2018-12-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "unite.vim"; - rev = "77ae78f277896bc560a46a27a51c49f04b6d4ce1"; - sha256 = "06asqf2hkszz4i9c676jvax6gbqzrcpqckjjb0dy175vifsiclnv"; + rev = "f08df66abda88a83f0436e0bd1ffa05009a9645a"; + sha256 = "15mrmawxa1gwhirb11w10lw1prl3sjr6xy7xgsfjja2fzz5wm1jy"; }; }; @@ -1941,12 +1941,12 @@ }; vim-codefmt = buildVimPluginFrom2Nix { - name = "vim-codefmt-2018-12-05"; + name = "vim-codefmt-2018-12-14"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "5a198e23de16e3efabd041dc67b7718007bb7d83"; - sha256 = "0z7f5qh453hpcba1gbyknn7244lhkwn18bkjx0xhrhi9qjz8bz9d"; + rev = "62c09d51dd5fda2cbd579a3c4f261bbf34a1f655"; + sha256 = "10bv35xm0qs44sff5nkp3pvvvi1fh339m4a2fcnnz2bbd0nal8dl"; }; }; @@ -2141,12 +2141,12 @@ }; vim-elixir = buildVimPluginFrom2Nix { - name = "vim-elixir-2018-12-06"; + name = "vim-elixir-2018-12-12"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "34873ee66e0dfd7c8105d6f0ad048a2df04e77f2"; - sha256 = "0vg82nhmliz8330znfy5yqldrgfpb9h52jc9bdhc9pw3d0szx74q"; + rev = "7e65a353ea332c79c348ac0d4487cb19529759cd"; + sha256 = "1vgg348m95q0l67fz6wfzp6aamj7aq16dq17xx7n6qdz7nys0q1f"; }; }; @@ -2261,12 +2261,12 @@ }; vim-gitgutter = buildVimPluginFrom2Nix { - name = "vim-gitgutter-2018-11-26"; + name = "vim-gitgutter-2018-12-13"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "c2651aefbd92dca05de1943619df965b848f9b4f"; - sha256 = "1wsmmym3l3r57r8s972iflv1pcsidk8yjb9w4y2rh7dbgf6rkbqr"; + rev = "5c636b128ed40f3ed926d18adb307e01dfc082f8"; + sha256 = "014ylh6cmrfw7qp6nrjz0dr4f5v09fmmfi729kpkf97lx79sd37i"; }; }; @@ -2481,12 +2481,12 @@ }; vim-javacomplete2 = buildVimPluginFrom2Nix { - name = "vim-javacomplete2-2018-12-05"; + name = "vim-javacomplete2-2018-12-14"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "876aaf702bb4632c15f44b7f679bd5dbe84ae756"; - sha256 = "1p3g16gk6b3wv0hmg0wzahpg3l0vk35abcr6hgs0rkwhgbnhl3xk"; + rev = "e896e0b249f6115a921cb27aaabdb688374d9f21"; + sha256 = "0lqhb5kgswvsni456nmskrmn9lrnxwg523x5yaylm8s71w3kv1a6"; }; }; @@ -2622,12 +2622,12 @@ }; vim-maktaba = buildVimPluginFrom2Nix { - name = "vim-maktaba-2018-05-07"; + name = "vim-maktaba-2018-12-13"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "ffdb1a5a9921f7fd722c84d0f60e166f9916b67d"; - sha256 = "1cmhgd9xvx09l6ypks09gxqs1vad1bddinf4cx2jmd516bv8qss3"; + rev = "99470333a54ff3c45406f6e99333b7771f864d42"; + sha256 = "0l16ix2p89w6r9da5biv6mzg8g1ajjkmnh085f0601yml5vdzlda"; }; }; @@ -2802,12 +2802,12 @@ }; vim-pathogen = buildVimPluginFrom2Nix { - name = "vim-pathogen-2018-12-12"; + name = "vim-pathogen-2018-12-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-pathogen"; - rev = "24f5cdd8055787463dd8ca73c80c1424ff06b358"; - sha256 = "0hyn8i3gmx1vismiww7snrmfz95zmfk8j6mbyvn50gwid6wjwk14"; + rev = "e9fb0914dba5bdfe2feaa364dda2e9495c5620a2"; + sha256 = "1hqfmk6xpkldhs8n5hmnvx0qn955fnzf19pp2gh4c2kvrq1y6sm8"; }; }; @@ -3062,12 +3062,12 @@ }; vim-snippets = buildVimPluginFrom2Nix { - name = "vim-snippets-2018-12-09"; + name = "vim-snippets-2018-12-14"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "1accde62ad62fe4adac62bbb16c4915d97786637"; - sha256 = "0rgshn7w2c6dgykaqnlxvwb92wvv2rpvx5i7h5xmh67bira4bc5f"; + rev = "a6090b9bffeec418ee7deaa31f90c4a8fd3b1170"; + sha256 = "1f0jnsdn0zavpz5727683442c22mjgcnj1j5dkhaysrkdzn4qc64"; }; }; @@ -3412,12 +3412,12 @@ }; vimtex = buildVimPluginFrom2Nix { - name = "vimtex-2018-12-10"; + name = "vimtex-2018-12-12"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "861e7b2fa00a9b0391dd8de0bf63b86dce9eb44a"; - sha256 = "1a1zvr1g8k97s8n3s2sjgi5drjsamj91fc649kgwsjjs880rfjsl"; + rev = "6165a4421e7605a96d9b6c83f3ac853bf2f90a03"; + sha256 = "01yp79w53wyxqjd1dnba069pmj1b56nl52x2r3mfzzldm1p5gx4k"; }; }; @@ -3532,12 +3532,12 @@ }; yats-vim = buildVimPluginFrom2Nix { - name = "yats-vim-2018-10-17"; + name = "yats-vim-2018-12-15"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "4675d7ff4b04aa5c5eabd5a1d862fcf78a7cd759"; - sha256 = "1hb36d4lb79dzn4idmar8zq1w4ya4a52a5gpzksj9x9k4fx6gakr"; + rev = "e95d5895988a5f7c5c130ea6697a7cc73f5e4ad9"; + sha256 = "1f1q6invygwig58kwmw7acd8cz0asxlvs7achnyij00w9cyyly82"; fetchSubmodules = true; }; }; @@ -3584,12 +3584,12 @@ }; zig-vim = buildVimPluginFrom2Nix { - name = "zig-vim-2018-11-17"; + name = "zig-vim-2018-12-12"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "0479c0ade7c27210e3a7982d36bd2673d560ffa9"; - sha256 = "1ndbrzvkiyy55avmk6z7x7qd5b9v4ylc7i8n9xlcas90q6cjw9ga"; + rev = "c24d058fef53601b1381d80243bffcb356815e31"; + sha256 = "1nsji87vbz5rpl25rysy4np7zdwyqzv6qh8g15pvll0jqmsd5z0v"; }; }; From ab091810b6da01ac28df4c0c860682b7ccc854dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 04:49:02 -0800 Subject: [PATCH 059/219] libqalculate: 2.8.1 -> 2.8.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libqalculate/versions --- pkgs/development/libraries/libqalculate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index bb823f69135..6a6adf06dba 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libqalculate-${version}"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1fakvv5vvx99pp5x72djp3313jxjwfhsl34gbyrpgkj5b4nnm7mz"; + sha256 = "10d3dcq8zprj1bnhq6gl9smpbv7fq0nx3jw9s3f8lkl3bavc34ca"; }; outputs = [ "out" "dev" "doc" ]; From 6a3364cc9fb49bd86b541271afa142e0c6b5929a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 05:56:14 -0800 Subject: [PATCH 060/219] libwnck3: 3.24.1 -> 3.30.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libwnck/versions --- pkgs/development/libraries/libwnck/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index eb591d4e184..e4bbeacb362 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -2,13 +2,13 @@ let pname = "libwnck"; - version = "3.24.1"; + version = "3.30.0"; in stdenv.mkDerivation rec{ name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "010zk9zvydggxqnxfml3scml5yxmpjy90irpqcayrzw26lldr9mg"; + sha256 = "0f9lvhm3w25046dqq8xyg7nzggxpmdriwrb661nng05a8qk0svdc"; }; outputs = [ "out" "dev" "devdoc" ]; From 13d3bf5b9880efbcb41a90f6309f625a3e733b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 15 Dec 2018 15:00:29 +0100 Subject: [PATCH 061/219] resilio-sync: 2.6.1 -> 2.6.2 Changelog: https://help.resilio.com/hc/en-us/articles/206216855-Sync-2-x-change-log --- pkgs/applications/networking/resilio-sync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index b6c54a6d452..c855277e225 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { name = "resilio-sync-${version}"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz"; sha256 = { - "x86_64-linux" = "02wbllrj80kqpyywfr05fsqpgwrv2i8smr3gfdpn7ni9b8hkj0ji"; - "i686-linux" = "02zhh6gfds6miznbx30ghzihhm330mh5xnm42mxj8j29aqlzgd95"; + "x86_64-linux" = "0vq8jz4v740zz3pvgqfya8mhy35fh49wpn8d08xjrs5062hl1yc2"; + "i686-linux" = "1gvq29bkdqvbcgnnhl3018h564rswk3r88s33lx5iph1rpxc6v5h"; }.${stdenv.hostPlatform.system}; }; From 5451116321a66c5012fd4c72b0a77c526ca685ab Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 15 Dec 2018 09:37:35 -0500 Subject: [PATCH 062/219] gitAndTools.lab: init at 0.14.0 --- .../git-and-tools/default.nix | 2 + .../git-and-tools/lab/default.nix | 25 ++ .../git-and-tools/lab/deps.nix | 327 ++++++++++++++++++ 3 files changed, 354 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/lab/default.nix create mode 100644 pkgs/applications/version-management/git-and-tools/lab/deps.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index a1f79452242..9ee5df11830 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -122,6 +122,8 @@ let hubUnstable = throw "use gitAndTools.hub instead"; + lab = callPackage ./lab { }; + pre-commit = callPackage ./pre-commit { }; pass-git-helper = python3Packages.callPackage ./pass-git-helper { }; diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix new file mode 100644 index 00000000000..fdda6ff4e88 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "hub-${version}"; + version = "0.14.0"; + + goPackagePath = "github.com/zaquestion/lab"; + + src = fetchFromGitHub { + owner = "zaquestion"; + repo = "lab"; + rev = "v${version}"; + sha256 = "0dqahzm721kpps4i33qgk78y982n8gj5afpk73qyzbraf5y3cw92"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab"; + homepage = https://zaquestion.github.io/lab; + license = licenses.unlicense; + maintainers = [ maintainers.marsam ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/lab/deps.nix b/pkgs/applications/version-management/git-and-tools/lab/deps.nix new file mode 100644 index 00000000000..03959300b43 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/lab/deps.nix @@ -0,0 +1,327 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/avast/retry-go"; + fetch = { + type = "git"; + url = "https://github.com/avast/retry-go"; + rev = "5469272a8171235352a56af37e5f7facf814423f"; + sha256 = "0ql8x5c99sh1f4vdd5614zd0bi4z8z19228vm4xkvii11bsj8dx6"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "20f5889cbdc3c73dbd2862796665e7c465ade7d1"; + sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9"; + sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a"; + }; + } + { + goPackagePath = "github.com/gdamore/tcell"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/tcell"; + rev = "2f258105ca8ce35819115b49f5ac58197241653e"; + sha256 = "1sji4fjd7i70lc6l19zhz718xld96k0h1sb1as1mmrx0iv858xaz"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; + sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "53e6ce116135b80d037921a7fdd5138cf32d7a8a"; + sha256 = "0lkbm067nhmxk66pyjx59d77dbjjzwyi43gdvzyx2f8m1942rq7f"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; + sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "231272389856c976b7500c4fffcc52ddf06ff4eb"; + sha256 = "161n224v46mln3swzv0009ffj9fxg2n814l9vqs3zh9dq1dmj0jn"; + }; + } + { + goPackagePath = "github.com/lunixbochs/vtclean"; + fetch = { + type = "git"; + url = "https://github.com/lunixbochs/vtclean"; + rev = "2d01aacdc34a083dca635ba869909f5fc0cd4f41"; + sha256 = "1ss88dyx5hr4imvpg5lixvp0cf7c2qm4x9m8mdgshjpm92g5rqmf"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "c3beff4c2358b44d0493c7dda585e7db7ff28ae6"; + sha256 = "04ccjc9nd1wffvw24ixyfw3v5g48zq7pbq1wz1zg9cyqyxy14qgr"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; + sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "00c29f56e2386353d58c599509e8dc3801b0d716"; + sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8"; + sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/rivo/tview"; + fetch = { + type = "git"; + url = "https://github.com/rivo/tview"; + rev = "f855bee0205c35e6a055b86cc341effea0f446ce"; + sha256 = "0jn9r3gzvm3gr72rb7zz2g8794nnl56l8flqfav00pfk0qiqp8xw"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5"; + sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "63644898a8da0bc22138abf860edaf5277b6102e"; + sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "8965335b8c7107321228e3e3702cab9832751bac"; + sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "615425954c3b0d9485a7027d4d451fdcdfdee84e"; + sha256 = "01zsislgc72j86a1zq7xs7xj3lvxjjviz4lgn4144jzgppwanpk6"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; + sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; + sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4"; + sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71"; + sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd"; + }; + } + { + goPackagePath = "github.com/tcnksm/go-gitconfig"; + fetch = { + type = "git"; + url = "https://github.com/tcnksm/go-gitconfig"; + rev = "d154598bacbf4501c095a309753c5d4af66caa81"; + sha256 = "0sz7h383h7ngrqkk35ic37kfvhlk07g4kanps8bnapwczrcm2am9"; + }; + } + { + goPackagePath = "github.com/xanzy/go-gitlab"; + fetch = { + type = "git"; + url = "https://github.com/xanzy/go-gitlab"; + rev = "8d21e61ce4a9b9c7fe645e48672872e9fdb71138"; + sha256 = "1lac57ard1vrd16ri8gfyd0ck8d7xg7zbcjlz90223jp0vc3l8nv"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "e73bf333ef8920dbb52ad18d4bd38ad9d9bc76d7"; + sha256 = "1amcpva20vff8v0lww655icaaf7388ns8xhm859whn4w4v0vanyg"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "f4c29de78a2a91c00474a2e689954305c350adf9"; + sha256 = "02nibjrr1il8sxnr0w1s5fj7gz6ayhg3hsywf948qhc68n5adv8x"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "3d292e4d0cdc3a0113e6d207bb137145ef1de42f"; + sha256 = "0jvivlvx7snacd6abd1prqxa7h1z6b7s6mqahn8lpqlag3asryrl"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "79b0c6888797020a994db17c8510466c72fe75d9"; + sha256 = "0aydjw886c4dwcjg7ssb7xp39ag1529nh3ly1la71rqjr94cjnag"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "b1f26356af11148e710935ed1ac8a7f5702c7612"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } +] \ No newline at end of file From 2bae825da1fa56d2361785132eaf1d8632e915dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 07:04:11 -0800 Subject: [PATCH 063/219] libosmium: 2.14.2 -> 2.15.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libosmium/versions --- pkgs/development/libraries/libosmium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index e889a3cb275..1b7bcc8fa89 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libosmium-${version}"; - version = "2.14.2"; + version = "2.15.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "123ri1l0a2b9fljgpwsl7z2w4i3kmgxz79d4ns9z4mwbp8sw0250"; + sha256 = "0s51qk7py5dzr07q4a78b4mjjrpgbghnj2r8yjq1hnn6pgafbjv0"; }; nativeBuildInputs = [ cmake ]; From b2ef061bc21446b73829b1b0721437daa3714314 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 07:35:40 -0800 Subject: [PATCH 064/219] jruby: 9.2.4.0 -> 9.2.5.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jruby/versions --- pkgs/development/interpreters/jruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 330e6b282ce..cfefa8c95dc 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "9.2.4.0"; + version = "9.2.5.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "034asndnqjgha74b6qr1gza9xfrmq9m8f6ysnblgd2axr218qqxr"; + sha256 = "0jgkpp90x4v3izl58r53lg5ndf9pm6q6qgwqvxhkb9zcha00ibgl"; }; buildInputs = [ makeWrapper ]; From dd78e629aa8bf53015592b41cbbb4482584f404f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 10 Dec 2018 18:22:03 -0600 Subject: [PATCH 065/219] treewide: use "buildPackages" darwin for bootstrap_cmds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are almost always from buildPackages. Another issue where splicing doesn’t seem to pick them up correctly. (cherry picked from commit 9ab67898f75be85acc2406f2110690b16d1f9b0a) --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd963b6ee01..fd7559ead14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6319,7 +6319,7 @@ with pkgs; }; ccl = callPackage ../development/compilers/ccl { - inherit (darwin) bootstrap_cmds; + inherit (buildPackages.darwin) bootstrap_cmds; }; chez = callPackage ../development/compilers/chez { @@ -8772,7 +8772,7 @@ with pkgs; jhiccup = callPackage ../development/tools/java/jhiccup { }; valgrind = callPackage ../development/tools/analysis/valgrind { - inherit (darwin) xnu bootstrap_cmds cctools; + inherit (buildPackages.darwin) xnu bootstrap_cmds cctools; llvm = llvm_39; }; valgrind-light = self.valgrind.override { gdb = null; }; @@ -10033,7 +10033,7 @@ with pkgs; kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { }; krb5 = callPackage ../development/libraries/kerberos/krb5.nix { - inherit (darwin) bootstrap_cmds; + inherit (buildPackages.darwin) bootstrap_cmds; }; krb5Full = krb5; libkrb5 = krb5.override { @@ -13574,7 +13574,7 @@ with pkgs; xorg = recurseIntoAttrs ((lib.callPackageWith __splicedPackages ../servers/x11/xorg { }).overrideScope' (lib.callPackageWith __splicedPackages ../servers/x11/xorg/overrides.nix { inherit (darwin) apple_sdk; - bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; + bootstrap_cmds = if stdenv.isDarwin then buildPackages.darwin.bootstrap_cmds else null; python = python2; # Incompatible with Python 3x udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null; From 9451bbf85296ba089af0c3af488f1f72bf64b2bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 16:18:13 -0800 Subject: [PATCH 066/219] kotlin: 1.3.10 -> 1.3.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/kotlin/versions --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 4d8b3f39814..f557f32a13a 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.3.10"; + version = "1.3.11"; in stdenv.mkDerivation rec { inherit version; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0zf6p0pzdi6dz2d4dca364wf30zyq326xdfg97zk8kp1a4qwjyfa"; + sha256 = "02d4x65z6kp20hmf5ri56zmq4rq45yc9br0awqrn9ls99cd0zph3"; }; propagatedBuildInputs = [ jre ] ; From 538c38d5a6092db62f084ddda3df4a0e8e4021b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 17:39:26 -0800 Subject: [PATCH 067/219] gupnp-av: 0.12.10 -> 0.12.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gupnp-av/versions --- pkgs/development/libraries/gupnp-av/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 5e68a027470..cf04ca73f9e 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "gupnp-av-${version}"; - version = "0.12.10"; + version = "0.12.11"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gupnp-av/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0nmq6wlbfsssanv3jgv2z0nhfkv8vzfr3gq5qa8svryvvn2fyf40"; + sha256 = "1p3grslwqm9bc8rmpn4l48d7v9s84nina4r9xbd932dbj8acz7b8"; }; nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; From fd08f8ed9457187805cc1da0c94af84fa18e936d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 17:45:32 -0800 Subject: [PATCH 068/219] grib-api: 1.27.0 -> 1.28.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/grib-api/versions --- pkgs/development/libraries/grib-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index c8ce99dc90d..224cd125dce 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec{ name = "grib-api-${version}"; - version = "1.27.0"; + version = "1.28.0"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz"; - sha256 = "1vx6bx9jhz5vdh2vx5y532ihwgyylagqz6pbx2p2bsx4kmj4pxdd"; + sha256 = "0qbj12ap7yy2rl1pq629chnss2jl73wxdj1lwzv0xp87r6z5qdfl"; }; preConfigure = '' From 54ece098fd82ccb3ff233b29e11c6ff43b5d62c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 18:07:39 -0800 Subject: [PATCH 069/219] gtkwave: 3.3.95 -> 3.3.97 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gtkwave/versions --- pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 3f664006cd0..214a918fa34 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkwave-${version}"; - version = "3.3.95"; + version = "3.3.97"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "1999wnipah1ncvjzjf95pfdrvgq1kd6hli8xlaj2hfjka8pamfaf"; + sha256 = "0jy5qk0b0np9xsxgnvv8jjgyw81l170wrm5q04qs48wpw7d0rm3v"; }; nativeBuildInputs = [ pkgconfig ]; From 5276119858a5960579921deee00d782b520d221d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 18:28:59 -0800 Subject: [PATCH 070/219] libgnurl: 7.61.1 -> 7.62.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libgnurl/versions --- pkgs/development/libraries/libgnurl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 6938cfd8c51..c7cf4a37b98 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -2,13 +2,13 @@ libidn2, libunistring, nghttp2 }: stdenv.mkDerivation rec { - version = "7.61.1"; + version = "7.62.0"; name = "libgnurl-${version}"; src = fetchurl { url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; - sha256 = "0y56k15vp3m2r8q6mnc6ivflwq9lv6npdhbbvxxcf4r8vwjhv91q"; + sha256 = "15b5fn4na9vzmzp4i0jf7al9v3q0abx51g1sgkrdsvdxhypwji1v"; }; nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; From a331afb05bbc59ae8215d66cfd3b6eca89814ff3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 19:28:44 -0800 Subject: [PATCH 071/219] gthumb: 3.6.1 -> 3.6.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gthumb/versions --- pkgs/applications/graphics/gthumb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 7dc69bceda9..e8f831a21c2 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -5,13 +5,13 @@ let pname = "gthumb"; - version = "3.6.1"; + version = "3.6.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1vj26gw9b5y4bmb2m49wplqg0md568g3gxin500v3slggzhzkaww"; + sha256 = "0rjb0bsjhn7nyl5jyjgrypvr6qdr9dc2g586j3lzan96a2vnpgy9"; }; nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ]; From 55a96df66a61c7cdc1c05fb6af4a233a93295308 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 19:58:32 -0800 Subject: [PATCH 072/219] img2pdf: 0.3.1 -> 0.3.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/img2pdf/versions --- pkgs/applications/misc/img2pdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/img2pdf/default.nix b/pkgs/applications/misc/img2pdf/default.nix index 9b6ac086efd..c718d6c7bfd 100644 --- a/pkgs/applications/misc/img2pdf/default.nix +++ b/pkgs/applications/misc/img2pdf/default.nix @@ -4,11 +4,11 @@ with python3Packages; buildPythonApplication rec { pname = "img2pdf"; - version = "0.3.1"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "071s3gf28nb8ifxkix7dzjny6vib7791mnp0v3f4zagcjcic22a4"; + sha256 = "07wxgn5khmy94zqqv8l84q9b3yy84ddvwr2f7j4pjycrj2gg7si8"; }; doCheck = false; # needs pdfrw From e94afe9dfd7f57956621eb9128b3c1a49247dff1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 20:06:04 -0800 Subject: [PATCH 073/219] gnome3.gtksourceview: 3.24.8 -> 3.24.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gtksourceview/versions --- pkgs/development/libraries/gtksourceview/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index 58c8ebccc3c..0f9dd30d204 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -5,11 +5,11 @@ let checkInputs = [ xvfb_run dbus ]; in stdenv.mkDerivation rec { name = "gtksourceview-${version}"; - version = "3.24.8"; + version = "3.24.9"; src = fetchurl { url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1zinqid62zjcsq7vy1y4mq1qh3hzd3zj7p8np7g0bdqd37zvi6qy"; + sha256 = "1hh7brcvpip96mkf9460ksy2qpx2pwynwd0634rx78z6afj7d7b9"; }; propagatedBuildInputs = [ From df8dccfdcf027ebd94f51b58fa8104434a66925d Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 15 Dec 2018 23:08:35 -0500 Subject: [PATCH 074/219] vscode-with-extensions: only add flag if extensions > 0 --- pkgs/applications/editors/vscode/with-extensions.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index 0af96e8bea8..88bea0c0809 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -68,7 +68,7 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" { ln -sT "${vscode}/share/pixmaps/code.png" "$out/share/pixmaps/code.png" ln -sT "${vscode}/share/applications/${executableName}.desktop" "$out/share/applications/${executableName}.desktop" - makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" \ - --add-flags \ - "--extensions-dir ${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions" + makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${lib.optionalString (vscodeExtensions != []) '' + --add-flags "--extensions-dir ${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions" + ''} '' From b25c32fc5c7984d81ee8f2abca7b1c33de10a238 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 20:15:36 -0800 Subject: [PATCH 075/219] insomnia: 6.2.0 -> 6.2.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/insomnia/versions --- pkgs/development/web/insomnia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index c7582f4d5b7..6f0de3932b5 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -17,11 +17,11 @@ let ]; in stdenv.mkDerivation rec { name = "insomnia-${version}"; - version = "6.2.0"; + version = "6.2.3"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "1wxgcriszsbgpicaj4h1ycyykgwsjr8m7x5xi02y5bs5k6l7gcva"; + sha256 = "1pq5y0w4yx2inyk6djcd1sb4c1m3awmn3mvr3smngwx9lsszn84i"; }; nativeBuildInputs = [ From 7c5bf040bb0b270937c045b33cfcb2ff71aad4bf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 20:28:12 -0800 Subject: [PATCH 076/219] groonga: 8.0.8 -> 8.0.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/groonga/versions --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index c692cee08bd..fd14a214be5 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "8.0.8"; + version = "8.0.9"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "1fl5s0a5ncw8lj3ild2qqqxa3h4d3k98dmyki760c54kw6p6bycv"; + sha256 = "1fd5smhqchnjv0injj3x0zsqzffw1r4gq625znqljg6chny3cq08"; }; buildInputs = with stdenv.lib; From 2aa36e2c8eac668f370ed90e7d45e38510c49d25 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 21:12:24 -0800 Subject: [PATCH 077/219] goaccess: 1.2 -> 1.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/goaccess/versions --- pkgs/tools/misc/goaccess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index b7ce52f49b3..fce9f8272f0 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, geoipWithDatabase, ncurses, glib }: stdenv.mkDerivation rec { - version = "1.2"; + version = "1.3"; name = "goaccess-${version}"; src = fetchurl { url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; - sha256 = "051lrprg9svl5ccc3sif8fl78vfpkrgjcxgi2wngqn7a81jzdabb"; + sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc"; }; configureFlags = [ From 03234ada9629b93a731e7e3ecdd116b3ab02aa1b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 21:24:31 -0800 Subject: [PATCH 078/219] gtkd: 3.8.3 -> 3.8.4 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gtkd/versions --- pkgs/development/libraries/gtkd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index d89b00af4ce..66ba526f08e 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gtkd-${version}"; - version = "3.8.3"; + version = "3.8.4"; src = fetchzip { url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip"; - sha256 = "10jhwy1421bypq62ki1dzv8irvlgwr7s40z6l6vxallm4jkgk9gj"; + sha256 = "0q2kf1jwr89i8ajjzyf3b4bbla33djvnwrvljq17y206q7qknfyz"; stripRoot = false; }; From 4ba0a3d645c34873e144aced5460110f931508c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 21:43:39 -0800 Subject: [PATCH 079/219] python37Packages.eyeD3: 0.8.7 -> 0.8.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-eyed3/versions --- pkgs/development/python-modules/eyed3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 1cd3b5a934f..b2394f0a0c3 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "0.8.7"; + version = "0.8.8"; pname = "eyeD3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "1fzqy6hkg73xvpapdjrdzr3r0fsamnplvjfl7dz7rzgzx2r4x4pg"; + sha256 = "197lszkyzm377ym5r0ssryfsiz20yjx8y4rii3wc81n92d1qzlaq"; }; # https://github.com/nicfit/eyeD3/pull/284 From 08e45895a571688ce44a022cdf11affdf9807232 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 22:16:51 -0800 Subject: [PATCH 080/219] eid-mw: 4.4.9 -> 4.4.11 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/eid-mw/versions --- pkgs/tools/security/eid-mw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 637d2af9ae3..3534115bdb0 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.4.9"; + version = "4.4.11"; src = fetchFromGitHub { - sha256 = "019cfxgffl6z6ilz1w6b531dr8pi63ikflxmkc95glh7cxsaylax"; + sha256 = "13mhz23j2gp5bywdq2xiwkk0gnc354j31ry8x35pzlwrcn19by10"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; From 1758debbaf4918f4299231172e0f0172bb370ac4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 23:08:58 -0800 Subject: [PATCH 081/219] geos: 3.7.0 -> 3.7.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/geos/versions --- pkgs/development/libraries/geos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 2417af3dbfd..d857c9931fe 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.7.0"; + name = "geos-3.7.1"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "1mrz778m6bd1x9k6sha5kld43kalhq79h2lynlx2jx7xjakl3gsg"; + sha256 = "1312m02xk4sp6f1xdpb9w0ic0zbxg90p5y66qnwidl5fksscf1h0"; }; enableParallelBuilding = true; From bb36a7284799b8873d5f8013fecb8164903a73f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 23:57:16 -0800 Subject: [PATCH 082/219] efivar: 36 -> 37 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/efivar/versions --- pkgs/tools/system/efivar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix index 4072b8834ca..e77d4487582 100644 --- a/pkgs/tools/system/efivar/default.nix +++ b/pkgs/tools/system/efivar/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "efivar-${version}"; - version = "36"; + version = "37"; outputs = [ "bin" "out" "dev" "man" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "rhinstaller"; repo = "efivar"; rev = version; - sha256 = "0r39kx6sqgpk8rz19g1sil4dp7r82d5g1wlkbw1czwas95s50y7n"; + sha256 = "1z2dw5x74wgvqgd8jvibfff0qhwkc53kxg54v12pzymyibagwf09"; }; nativeBuildInputs = [ pkgconfig ]; From 884095dcad94b18301302919c4b64b5761063a9a Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Sun, 16 Dec 2018 01:23:52 -0800 Subject: [PATCH 083/219] jetbrains: 2018.3 -> 2018.3.1 --- .../editors/jetbrains/default.nix | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 3d905a83c8e..1cff72f5979 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.2.6"; /* updated by script */ + version = "2018.3.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1mgm3a6ph3j085bidl6vsy85kpscfspzxbzdmh3biklwfv3445rf"; /* updated by script */ + sha256 = "0wv4hmh71ca9fl4pslf8nn6wppa98sc94272z4nb42jbs6dnb9ji"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2018.3"; /* updated by script */ + version = "2018.3.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0hd44flxqnnxg390mkf4ppjs2nxv0nwdc7a2i65f69bp5h61x783"; /* updated by script */ + sha256 = "0z3z9hc7h3n63mfy7c5zh5sz8c0bzgxk79xamw08sxphrsjahasz"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand Release"; @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.3"; /* updated by script */ + version = "2018.3.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "01ccz5ksbv8xh8mnk3zxqpia8zgayy8bcgmbwqibrykz47y6r7yy"; /* updated by script */ + sha256 = "1zi4aib1h4jfn241gsg83jsqfj99fpbci4pkh8xarap6xrallyiq"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA Release"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.3"; /* updated by script */ + version = "2018.3.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "16z0pqmxjn5dl42rbz7mx8gi13xs3220pzkdsdkh1k1ny9caqzvj"; /* updated by script */ + sha256 = "0x0dplmv37gqdbrwxsx6xaix9dbaa6kqc09ganln5r4nl2bg64i8"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA Release"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2018.2.5"; /* updated by script */ + version = "2018.2.6"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0crr3056hlv9x2q1i1n00aavj53xkwkfy4lgyyphk81c0gly4dg1"; /* updated by script */ + sha256 = "0z627q9mcxlz8a92dndnaz2qa9dkaapimsfqkvc0i8ab88yw75v1"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm 2018.2"; @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.3"; /* updated by script */ + version = "2018.3.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0kgrh3w4lpk7qkp5gss24in1nqahdfllvf97qz6r77zn9n5k1wq7"; /* updated by script */ + sha256 = "02vs8nxxm139jl622nhxs59i9gw9rs5rjymkg8a0ajpybang24jk"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm Release"; @@ -341,12 +341,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.3"; /* updated by script */ + version = "2018.3.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0q4scwnqy0h725g9z5hd145c3n10iaj04z790s4lixg1c63h3y8q"; /* updated by script */ + sha256 = "0g4ag9lid2km69s5g31hhhvz3zjx52wxca1q4qz1h0s9km0ca1sq"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm Release"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2018.2.5"; /* updated by script */ + version = "2018.2.6"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0b01fnifk5iawyf2zi7r5ffz8dxlh18g2ilrkc5746vmnsp0jxq4"; /* updated by script */ + sha256 = "0xbmj7d1ccq2qf1jsvch1zxdrypkvzxdfkr431c8fnabh993yxx1"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine 2018.2"; @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.3"; /* updated by script */ + version = "2018.3.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0msvgdjbdipc4g8j705d1jya2mjmx4wwhb23nch3znh7grryr75s"; /* updated by script */ + sha256 = "1l3jy1ifx82gdnvpgz77ycxbwymcwwd830i4mfidkr9gkndlxpsp"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm Release"; From 2b3dda6c5118b8383eb741330423853bba5cf612 Mon Sep 17 00:00:00 2001 From: Frank Lanitz Date: Sun, 16 Dec 2018 12:51:49 +0100 Subject: [PATCH 084/219] geany: 1.33 -> 1.34 --- pkgs/applications/editors/geany/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 24954a602cc..d1499fc2180 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - version = "1.33"; + version = "1.34"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.geany.org/${name}.tar.bz2"; - sha256 = "66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2"; + sha256 = "63b93d25d037eaffa77895ae6dd29c91bca570e4053eff5cc8490f87e6021f8e"; }; nativeBuildInputs = [ pkgconfig intltool libintl ]; From 7a97f697d53fd9802c919a0e2b94fb230f1337cb Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 16 Dec 2018 12:28:32 +0100 Subject: [PATCH 085/219] dashing: enable on darwin --- pkgs/tools/misc/dashing/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index a8a878b1998..5a82c766089 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -21,6 +21,6 @@ buildGoPackage rec { homepage = https://github.com/technosophos/dashing; license = licenses.mit; maintainers = [ ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From ffc586cf49c0ded1026e92b0fa8d9cb2805be6ba Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sun, 16 Dec 2018 09:30:10 -0200 Subject: [PATCH 086/219] fluidsynth_1: init at 1.1.11 --- .../applications/audio/fluidsynth/default.nix | 23 +++++++++++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 33ac7218778..8727c49398e 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -1,17 +1,32 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake , alsaLib, glib, libjack2, libsndfile, libpulseaudio , AudioUnit, CoreAudio, CoreMIDI, CoreServices +, version ? "2" }: +let + versionMap = { + "1" = { + fluidsynthVersion = "1.1.11"; + sha256 = "0n75jq3xgq46hfmjkaaxz3gic77shs4fzajq40c8gk043i84xbdh"; + }; + "2" = { + fluidsynthVersion = "2.0.1"; + sha256 = "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7"; + }; + }; +in + +with versionMap.${version}; + stdenv.mkDerivation rec { - name = "fluidsynth-${version}"; - version = "2.0.1"; + name = "fluidsynth-${fluidsynthVersion}"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; - rev = "v${version}"; - sha256 = "1mqyym5qkh8xd1rqj3yhfxbw5dxjcrljb6nkfqzvcarlv4h6rjn7"; + rev = "v${fluidsynthVersion}"; + inherit sha256; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64ef63f55ab..82db9a17f38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16836,6 +16836,7 @@ in fluidsynth = callPackage ../applications/audio/fluidsynth { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices; }; + fluidsynth_1 = fluidsynth.override { version = "1"; }; fmit = libsForQt5.callPackage ../applications/audio/fmit { }; From 86fac8b52863dac169f92c9b5abb286244a8db28 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sun, 16 Dec 2018 09:30:16 -0200 Subject: [PATCH 087/219] csound: depend on fluidsynth_1 csound is incompatible with fluidsynth 2 https://github.com/csound/csound/issues/1078 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82db9a17f38..bb1be7dc2e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16267,7 +16267,9 @@ in csa = callPackage ../applications/audio/csa { }; - csound = callPackage ../applications/audio/csound { }; + csound = callPackage ../applications/audio/csound { + fluidsynth = fluidsynth_1; + }; cinepaint = callPackage ../applications/graphics/cinepaint { fltk = fltk13; From ac85a1ec47352806d803c392186abe4362e824cd Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 16 Dec 2018 13:08:23 +0100 Subject: [PATCH 088/219] hwloc: 2.0.2 -> 2.0.3 Refactor version string and download link to make it comatible with automatic updates. --- pkgs/development/libraries/hwloc/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 8f38170d87e..81e30d675d2 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -6,12 +6,17 @@ assert x11Support -> libX11 != null && cairo != null; with stdenv.lib; -stdenv.mkDerivation rec { - name = "hwloc-2.0.2"; +let + version = "2.0.3"; + versmm = versions.major version + "." + versions.minor version; + name = "hwloc-${version}"; + +in stdenv.mkDerivation { + inherit name; src = fetchurl { - url = "http://www.open-mpi.org/software/hwloc/v2.0/downloads/${name}.tar.bz2"; - sha256 = "1phc863d5b2fvwpyyq4mlh4rkjdslh6h0h197zmyk3prwrq7si8l"; + url = "http://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2"; + sha256 = "09f7ajak8wv5issr0hw72vs3jkldc7crcc7z5fd34sspkvrsm4z3"; }; configureFlags = [ From 6bbe1da8100cdfc9cb0c1a86484ad4dc464e3024 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Dec 2018 08:23:17 -0800 Subject: [PATCH 089/219] awslogs: 0.10 -> 0.11.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/awslogs/versions --- pkgs/tools/admin/awslogs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index c4dbb39cdd8..d2b6a5dca9f 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "awslogs"; - version = "0.10"; + version = "0.11.0"; src = fetchFromGitHub { owner = "jorgebastida"; repo = "awslogs"; rev = "${version}"; - sha256 = "18s3xxdhhbz96mgj9ipgyrdcax3p9gy8gpmr0rblw8g0grj31dsp"; + sha256 = "0vdpld7r7y78x1lcd5z3qsx047dwichxb8f3447yzl75fnsm75dc"; }; doCheck = false; From c51a1b89c20a0125132271a05476b78fa5e72ab0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Dec 2018 08:59:25 -0800 Subject: [PATCH 090/219] cadvisor: 0.31.0 -> 0.32.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cadvisor/versions --- pkgs/servers/monitoring/cadvisor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index dd56bc89c0d..ff0c926de59 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "0dnn2vgjbbb82kvbmgrfq0hqwfk0jh5gc3xrcfqwvvq673yf4f2m"; + sha256 = "1li2qgfi4lfa2i1m7ykjxy1xm9hlq42fgdkb2wh2db9chyg5r4qp"; }; nativeBuildInputs = [ go ]; From 51f9526460fd726018d835f3c7238a0521010381 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Dec 2018 09:22:15 -0800 Subject: [PATCH 091/219] ace: 6.5.2 -> 6.5.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ace/versions --- pkgs/development/libraries/ace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 560ccb768b1..27997540c06 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "1ibc62r3nh33c5w9mbnmzzhalb0jry6ccfb5ph62xsayy9nksfgh"; + sha256 = "06lvy5ylcg4vsc58p1yqr5607n542a57n0whpchmrlab74bagmmi"; }; enableParallelBuilding = true; From 0134db94d9e5623125d6e049c9c3da3c63e154e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Dec 2018 11:14:28 -0800 Subject: [PATCH 092/219] AgdaStdlib: 0.16.1 -> 0.17 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/agda-stdlib/versions --- pkgs/development/libraries/agda/agda-stdlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index 12d35e27020..276e1531acd 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -1,14 +1,14 @@ { stdenv, agda, fetchFromGitHub, ghcWithPackages }: agda.mkDerivation (self: rec { - version = "0.16.1"; + version = "0.17"; name = "agda-stdlib-${version}"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "17dv5r3ygmbwwh7k8qaffp2965sv165b47i53ymc0gbfcwr6cy2n"; + sha256 = "05c5zgj9fcaqz7z2l70jh48b3g4811vm7bccj0vd9r82wi02g3p1"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; From 4e994f3fc213bd7bdeaaf992ebcd0292e8abda05 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 16 Dec 2018 22:37:46 +0100 Subject: [PATCH 093/219] osmium-tool: 1.9.1 -> 1.10.0 --- pkgs/applications/misc/osmium-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index 36e58cf5070..2b35cb77038 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "osmium-tool-${version}"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "1cwabjbrdpqbi2gl7448sgniiwwa73avi9l6pnvh4r0jia2wi5wk"; + sha256 = "1balhz78nva0agmbp8n9vg8fhmdssnd9fjxj20bpw7b45mxhjc20"; }; nativeBuildInputs = [ cmake ]; From b3beeab0149a548196e489a00232a12bc1dab91e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 Dec 2018 00:31:45 +0100 Subject: [PATCH 094/219] python.pkgs.cmdtest: use pname --- pkgs/development/python-modules/cmdtest/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/pkgs/development/python-modules/cmdtest/default.nix index 73c05c01aed..0d0bc368295 100644 --- a/pkgs/development/python-modules/cmdtest/default.nix +++ b/pkgs/development/python-modules/cmdtest/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - name = "cmdtest-${version}"; + pname = "cmdtest"; version = "0.32"; disabled = isPy3k || isPyPy; From b961de9c4b7d4c2e88721fba920aae96f2baf5c4 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 17 Dec 2018 00:50:34 +0100 Subject: [PATCH 095/219] gitAndTools.lab: fix name --- .../version-management/git-and-tools/lab/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index fdda6ff4e88..f2d1f1d8556 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "hub-${version}"; + name = "lab-${version}"; version = "0.14.0"; goPackagePath = "github.com/zaquestion/lab"; From 5b9aa055225c0e0a169f5ebf3c96b71b89c4961e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 17:32:41 -0800 Subject: [PATCH 096/219] prosody: 0.10.2 -> 0.11.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/prosody/versions --- pkgs/servers/xmpp/prosody/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index ed6fef05a26..228c074bf7e 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -25,12 +25,12 @@ let in stdenv.mkDerivation rec { - version = "0.10.2"; + version = "0.11.1"; name = "prosody-${version}"; src = fetchurl { url = "https://prosody.im/downloads/source/${name}.tar.gz"; - sha256 = "13knr7izscw0zx648b9582dx11aap4cq9bzfiqh5ykd7wwsz1dbm"; + sha256 = "1ak5bkx09kscyifxhzybgp5a73jr8nki6xi05c59wwlq0wzw9gli"; }; communityModules = fetchhg { From 5a93f6149abb404e053f3759e64e93f20de312da Mon Sep 17 00:00:00 2001 From: Satoshi Shishiku Date: Thu, 26 Apr 2018 09:12:36 +0000 Subject: [PATCH 097/219] prosody service: set cafile Fix s2s_secure_auth. --- nixos/modules/services/networking/prosody.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index a37ef98caec..25b7d6dbeba 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -228,6 +228,7 @@ let createSSLOptsStr = o: '' ssl = { + cafile = "/etc/ssl/certs/ca-bundle.crt"; key = "${o.key}"; certificate = "${o.cert}"; ${concatStringsSep "\n" (mapAttrsToList (name: value: "${name} = ${toLua value};") o.extraOptions)} From c32752fb129ab40699a83ab1ef2828a269c28dd0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 16 Dec 2018 19:07:48 -0500 Subject: [PATCH 098/219] gopass: 1.8.2 -> 1.8.3 --- pkgs/tools/security/gopass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 88b15ebf43f..2242a9c109e 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, makeWrapper }: buildGoPackage rec { - version = "1.8.2"; + version = "1.8.3"; name = "gopass-${version}"; goPackagePath = "github.com/gopasspw/gopass"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "gopasspw"; repo = "gopass"; rev = "v${version}"; - sha256 = "0a2nnm3liilp2jcsvgyp87cjw92gspcc3azaszfvx125l63r4c9f"; + sha256 = "1m4dmydgbpyrqv0blbrw66f2340c6hbz2wg22mpybf0zvd5i9ba6"; }; wrapperPath = with stdenv.lib; makeBinPath ([ From 3ab361cb57b1c37a46b568e97d2e5025a1361c0c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 17 Dec 2018 01:19:42 +0100 Subject: [PATCH 099/219] hwloc-nox: remove, x11 now disabled by default --- pkgs/top-level/all-packages.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8cc825d6eb..787e223bdfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10297,10 +10297,6 @@ in hwloc = callPackage ../development/libraries/hwloc {}; - hwloc-nox = hwloc.override { - x11Support = false; - }; - hydra = callPackage ../development/tools/misc/hydra { }; hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { }; @@ -18135,7 +18131,6 @@ in xmr-stak = callPackage ../applications/misc/xmr-stak { stdenvGcc6 = overrideCC stdenv gcc6; - hwloc = hwloc-nox; }; xmrig = callPackage ../applications/misc/xmrig { }; From 9be286ecb7aea4751a8a853e7a561176c2f7c60f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Dec 2018 00:19:40 -0800 Subject: [PATCH 100/219] fwup: 1.2.6 -> 1.2.7 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fwup/versions --- pkgs/tools/misc/fwup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 160ea2faab6..4a95563b2ec 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "fwup-${version}"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "1rbpa0dcm9w1anz2bhcpmj2b678807s8j43zzkbkwh71aymfwr14"; + sha256 = "0r48l5jcb4pxb72ykigmaissm4ikadi7f6lkfma4jnd037w15bnl"; }; doCheck = true; From 03fddb139eff8d83ad279c073029872ecf4cede4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 16 Dec 2018 19:37:12 -0500 Subject: [PATCH 101/219] libvncserver: add CVE-2018-7225 patch --- pkgs/development/libraries/libvncserver/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index b325c9b246c..0a7819743e0 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, +{stdenv, fetchurl, fetchpatch, libtool, libjpeg, openssl, zlib, libgcrypt, autoreconfHook, pkgconfig, libpng, systemd }: @@ -18,6 +18,13 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + patches = [ + # CVE-2018-7225. Remove with the next release + (fetchpatch { + url = https://salsa.debian.org/debian/libvncserver/raw/master/debian/patches/CVE-2018-7225.patch; + sha256 = "1hj1lzxsrdmzzl061vg0ncdpvfmvvkrpk8q12mp70qvszcqa7ja3"; + }) + ]; preConfigure = '' sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure ''; From 8bb236c4d51536b8c28464ca300b30a6e870a2d1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 04:54:06 -0800 Subject: [PATCH 102/219] libwebsockets: 3.0.1 -> 3.1.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libwebsockets/versions --- pkgs/development/libraries/libwebsockets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 8c0db4a7396..023e08c336b 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libwebsockets-${version}"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "warmcat"; repo = "libwebsockets"; rev = "v${version}"; - sha256 = "1x3qrz2hqsrv2lg0y9irdx37c8r9j9vf9mwzgw61znzvk6hc9ymq"; + sha256 = "1w1wz6snf3cmcpa3f4dci2nz9za2f5rrylxl109id7bcb36xhbdl"; }; buildInputs = [ cmake openssl zlib libuv ]; From b439f9032b17bae5af2c368b54f7f499ac06608d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 06:08:53 -0800 Subject: [PATCH 103/219] libdap: 3.20.0 -> 3.20.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libdap/versions --- pkgs/development/libraries/libdap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index d399998455e..c0ec9d927a8 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }: stdenv.mkDerivation rec { - version = "3.20.0"; + version = "3.20.2"; name = "libdap-${version}"; nativeBuildInputs = [ bison flex ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.opendap.org/pub/source/${name}.tar.gz"; - sha256 = "0cr3d7dlzq583dqqrkbs1bkcrwag4hp7hwrx5c0mjk7q4vrslh92"; + sha256 = "0kp35ghj48wqgy67xyplwhmw21r8r0p00y2hw0fv65g4yrsgvsk0"; }; meta = with stdenv.lib; { From 44482c54ff9212808a541dee028e7328494f53b2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 20:35:02 -0800 Subject: [PATCH 104/219] haproxy: 1.8.14 -> 1.8.15 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/haproxy/versions --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 381489cc436..785c22ff4f8 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -9,12 +9,12 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "1.8.14"; + version = "1.8.15"; name = "${pname}-${version}"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz"; - sha256 = "1przpp8xp2ygcklz4ypnm6z56nb73ydwksm3yy5fb1dyg0jl0zmi"; + sha256 = "0cm008i7cz4gq0j7wxmpyzvwfcrmmck5ix34is5xxms624pqc4vi"; }; buildInputs = [ openssl zlib ] From 7c42da3a1e48ce74b79ec72f734cc624965427bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sun, 16 Dec 2018 16:03:37 +0100 Subject: [PATCH 105/219] eccodes: 2.9.2 -> 2.10.0 Python3 is now officially supported as "beta", see relase notes at: https://confluence.ecmwf.int/display/ECC/ecCodes+version+2.10.0+released --- pkgs/development/libraries/eccodes/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 57a55cfc39b..c26956f6ea2 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; - version = "2.9.2"; + version = "2.10.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "18gjzhz7bkibc34a0djq1r4b2y3hpn7ym0zs0nj07yq58v4pdx08"; + sha256 = "1n429najxlq6y76wyx1mbw41b0l4prdhfmy4id9ni8zwm96cp8xy"; }; postPatch = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4bb2c0ed0f..adafdb40e4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1613,11 +1613,10 @@ in { easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; - eccodes = disabledIf (!isPy27) - (toPythonModule (pkgs.eccodes.override { - enablePython = true; - pythonPackages = self; - })); + eccodes = toPythonModule (pkgs.eccodes.override { + enablePython = true; + pythonPackages = self; + }); EditorConfig = callPackage ../development/python-modules/editorconfig { }; From f554d4e40f80ca7a969e0607bd3e8d66e5c78e61 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 15 Dec 2018 22:52:25 -0500 Subject: [PATCH 106/219] raspberrypifw: 1.20180919 -> 1.20181112 --- pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index db1091e349d..8965e5d60d7 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "raspberrypi-firmware-${version}"; - version = "1.20180919"; + version = "1.20181112"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "0aw5fzz7kr18cc4phdn81g45swkpaf4022sgi72pq2q6zzqnrdg4"; + sha256 = "0jjxr8k8vdziynj8101ikcc9hmm61r2la51nrx6zv8a7j9a4m5zg"; }; installPhase = '' From 6d7e94aa1e5c436aeaba1e56ff4c7e3a266c69aa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 18:42:24 -0800 Subject: [PATCH 107/219] graphicsmagick: 1.3.30 -> 1.3.31 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/graphicsmagick/versions --- pkgs/applications/graphics/graphicsmagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index ee58e9831e9..c93b4fe958d 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "graphicsmagick-${version}"; - version = "1.3.30"; + version = "1.3.31"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "1warar0731xf94r4bn5x1km85rjabl4iq8r0dk3ywmczap3farfr"; + sha256 = "0y22740f25qxsqqqg26xqlfp920dm57b7hrgaqmx7azksrcvnsq9"; }; patches = [ From 374a672424f9407ac5c3f66578e42b7fa8775c34 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Sun, 16 Dec 2018 00:18:39 +0100 Subject: [PATCH 108/219] firmware-linux-nonfree: 20181017 -> 20181213 --- .../linux/firmware/firmware-linux-nonfree/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 43747aeaf0d..57135bf515b 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2018-10-17"; + version = "2018-12-13"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "de9cefa74bba6fce3834144460868a468b8818f2"; - sha256 = "101j4jk3ixl8r3mxbkcrr5ybhb44ij3l52js4dqfxpylpiaw2cgk"; + rev = "813fa1fc6fba6638decd974c4a6a2e485069ea15"; + sha256 = "0zspisbrvplgz1plk4ya22h7ilnsk60srk4q38h6n5d18fpn7rdw"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1ndwp9yhpmx0kzayddy9i93mpv3d8gxypqm85069ic13lrjz1gdf"; + outputHash = "1yr6wcvc3s97h4w0qapma4l17dqsj175an6kmn5w6dppz19g0r5b"; meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; From 2cbaaa55d53584be24a1a3c6e543d64599530b18 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 22:01:59 -0800 Subject: [PATCH 109/219] fswatch: 1.13.0 -> 1.14.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/fswatch/versions --- pkgs/development/tools/misc/fswatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index 0e8e0116a8b..0e4af134890 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "fswatch-${version}"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "emcrisostomo"; repo = "fswatch"; rev = version; - sha256 = "18nrp2l1rzrhnw4p6d9r6jaxkkvxkiahvahgws2j00q623v0f3ij"; + sha256 = "1d1fvm36qgh6a5j9v24wai61d297pvzxr14jngjlhh4i474ff21i"; }; nativeBuildInputs = [ autoreconfHook ]; From cb6c9af457236013061ddc4b73691acd977396b2 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 16 Dec 2018 22:09:03 -0500 Subject: [PATCH 110/219] linux_testing: 4.20-rc6 -> 4.20-rc7 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 81945290bf6..1e810a12931 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "4.20-rc6"; - modDirVersion = "4.20.0-rc6"; + version = "4.20-rc7"; + modDirVersion = "4.20.0-rc7"; extraMeta.branch = "4.20"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1hmcwlf3lcim4z265pqz6v4na6072xcqzrnq57wacznmg31m7y0c"; + sha256 = "0qga2x4rz1vphi7j044f4b4la24qyk5sm7lm8q991imq5wm5s2rl"; }; # Should the testing kernels ever be built on Hydra? From f2b1f51a3242209cbfcf916dfe4aa8ac8ef2aa53 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 22:38:27 -0800 Subject: [PATCH 111/219] opendht: 1.7.4 -> 1.8.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/opendht/versions --- pkgs/development/libraries/opendht/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 49d70bc211a..17e2c9098a1 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "opendht-${version}"; - version = "1.7.4"; + version = "1.8.0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "${version}"; - sha256 = "1wqib5plak9bw2bla7y4qyjqi0b00kf8mfwlml16qj3i0aq6h2cp"; + sha256 = "1mj3zsywxphh9wcazyqsldwwn14r77xv9cjsmc0nmcybsl2bwnpl"; }; nativeBuildInputs = From f640a811986cabf503e663fb97681b45416579fd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 05:42:32 -0800 Subject: [PATCH 112/219] libiio: 0.15 -> 0.16 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libiio/versions --- pkgs/development/libraries/libiio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 51cdc289d62..31225730442 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "libiio-${version}"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { owner = "analogdevicesinc"; repo = "libiio"; rev = "refs/tags/v${version}"; - sha256 = "05sbvvjka03qi080ad6g2y6gfwqp3n3zv7dpv237dym0zjyxqfa7"; + sha256 = "1j27kyizdwawskwg1va894qaw3z5dx5s6cla1rd0ngr9kls88q2h"; }; outputs = [ "out" "lib" "dev" "python" ]; From 9e36eee829273f7a7a11a198ad03a345be6ec24a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 17 Dec 2018 04:41:16 +0000 Subject: [PATCH 113/219] libopenaptx: init at 0.1.0 --- .../libraries/libopenaptx/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/libopenaptx/default.nix diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/development/libraries/libopenaptx/default.nix new file mode 100644 index 00000000000..a29f8dc4a80 --- /dev/null +++ b/pkgs/development/libraries/libopenaptx/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libopenaptx-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "pali"; + repo = "libopenaptx"; + rev = version; + sha256 = "0996qmkmbax7ccknxrd3bx8xibs79a1ffms69scsj59f3kgj6854"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Audio Processing Technology codec (aptX)"; + license = licenses.lgpl21Plus; + homepage = https://github.com/pali/libopenaptx; + platforms = platforms.linux; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08523ba099f..2b3ce642bb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11207,6 +11207,8 @@ in liboop = callPackage ../development/libraries/liboop { }; + libopenaptx = callPackage ../development/libraries/libopenaptx { }; + libopus = callPackage ../development/libraries/libopus { }; libopusenc = callPackage ../development/libraries/libopusenc { }; From 28d85b274dbcd7267bda3e3cfb32b8f9e9ec6440 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 15 Dec 2018 23:47:09 -0600 Subject: [PATCH 114/219] boost169: init (at 1.69) --- pkgs/development/libraries/boost/1.69.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 12 insertions(+) create mode 100644 pkgs/development/libraries/boost/1.69.nix diff --git a/pkgs/development/libraries/boost/1.69.nix b/pkgs/development/libraries/boost/1.69.nix new file mode 100644 index 00000000000..798db8dd46e --- /dev/null +++ b/pkgs/development/libraries/boost/1.69.nix @@ -0,0 +1,11 @@ +{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.69_0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_69_0.tar.bz2"; + # SHA256 from http://www.boost.org/users/history/version_1_69_0.html + sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08523ba099f..0dfd9df6973 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9369,6 +9369,7 @@ in boost166 = callPackage ../development/libraries/boost/1.66.nix { }; boost167 = callPackage ../development/libraries/boost/1.67.nix { }; boost168 = callPackage ../development/libraries/boost/1.68.nix { }; + boost169 = callPackage ../development/libraries/boost/1.69.nix { }; boost16x = boost167; boost = boost16x; From ea1db27e22a8f4b2fd3248ea5b3a58075d7c346a Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 17 Dec 2018 06:24:55 +0000 Subject: [PATCH 115/219] ut2004demo: fix download URL http://treefort.icculus.org/ut2004/UT2004-LNX-Demo3334.run.gz is gone. --- pkgs/games/ut2004/demo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix index 9aea992ac75..7039ff44a09 100644 --- a/pkgs/games/ut2004/demo.nix +++ b/pkgs/games/ut2004/demo.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { version = "3334"; src = fetchurl { - url = "http://treefort.icculus.org/ut2004/UT2004-LNX-Demo${version}.run.gz"; + url = "http://vlaai.snt.utwente.nl/pub/games/UT2004/demo/UT2004-LNX-Demo${version}.run.gz"; sha256 = "0d5f84qz8l1rg16yzx2k4ikr46n9iwj68na1bqi87wrww7ck6jh7"; }; From 9314c6a5633b703776c379f5c3ba36557b02d51f Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Mon, 17 Dec 2018 05:55:44 +0000 Subject: [PATCH 116/219] firejail: disable parallel building firejail was frequently failing to build on my Hydra machine at -j16, and the error looked like a typical parallel build problem: <3>make[1]: Entering directory '/build/firejail-0.9.56/src/fcopy' <3>gcc -ggdb -O2 -DVERSION='"0.9.56"' -DPREFIX='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56"' -DSYSCONFDIR='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56/etc/firejail"' -DLIBDIR='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56/lib"' -DHAVE_X11 -DHAVE_PRIVATE_HOME -DHAVE_OVERLAYFS -DHAVE_SECCOMP -DHAVE_GLOBALCFG -DHAVE_SECCOMP_H -DHAVE_CHROOT -DHAVE_NETWORK -DHAVE_USERNS -DHAVE_FILE_TRANSFER -DHAVE_WHITELIST -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security -mindirect-branch=thunk -c main.c -o main.o <3>gcc -pie -Wl,-z,relro -Wl,-z,now -lpthread -o fcopy main.o <3>make[1]: Leaving directory '/build/firejail-0.9.56/src/fcopy' <3>make -C src/fldd <3>make[1]: Entering directory '/build/firejail-0.9.56/src/fldd' <3>gcc -ggdb -O2 -DVERSION='"0.9.56"' -DPREFIX='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56"' -DSYSCONFDIR='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56/etc/firejail"' -DLIBDIR='"/nix/store/0dm1agiwiggn8pmnqkknil7mkh25il0k-firejail-0.9.56/lib"' -DHAVE_X11 -DHAVE_PRIVATE_HOME -DHAVE_OVERLAYFS -DHAVE_SECCOMP -DHAVE_GLOBALCFG -DHAVE_SECCOMP_H -DHAVE_CHROOT -DHAVE_NETWORK -DHAVE_USERNS -DHAVE_FILE_TRANSFER -DHAVE_WHITELIST -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -pie -Wformat -Wformat-security -mindirect-branch=thunk -c main.c -o main.o <3>gcc -pie -Wl,-z,relro -Wl,-z,now -lpthread -o fldd main.o ../lib/ldd_utils.o <3>make[1]: Leaving directory '/build/firejail-0.9.56/src/fldd' <3>make -C src/libpostexecseccomp <3>make[1]: Entering directory '/build/firejail-0.9.56/src/libpostexecseccomp' <3>gcc -ggdb -O2 -DVERSION='"0.9.56"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security -c libpostexecseccomp.c -o libpostexecseccomp.o <3>gcc -pie -Wl,-z,relro -Wl,-z,now -shared -fPIC -z relro -o libpostexecseccomp.so libpostexecseccomp.o -ldl <3>make[1]: Leaving directory '/build/firejail-0.9.56/src/libpostexecseccomp' <3>src/fseccomp/fseccomp default seccomp <3>src/fsec-optimize/fsec-optimize seccomp <3>/nix/store/6abyjgibafsbhlc7v7lab50mb3dj81jg-bash-4.4-p23/bin/bash: src/fsec-optimize/fsec-optimize: No such file or directory <3>make: *** [Makefile:43: filters] Error 127 <3>builder for '/nix/store/30srqmpqrjyr11nhx4jbpr84m9pnmyv5-firejail-0.9.56.drv' failed with exit code 2 --- pkgs/os-specific/linux/firejail/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 0e982d54a9e..672ee823fe8 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -43,7 +43,9 @@ stdenv.mkDerivation { sed -E -e 's@^include (.*)(/firejail/.*.local)$@include /etc\2@g' -i $out/etc/firejail/*.profile ''; - enableParallelBuilding = true; + # At high parallelism, the build sometimes fails with: + # bash: src/fsec-optimize/fsec-optimize: No such file or directory + enableParallelBuilding = false; meta = { inherit (s) version; From c761524f30b4ad35b95f0ca32c7c9fe360d32216 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 15 Dec 2018 18:06:43 -0600 Subject: [PATCH 117/219] efibootmgr: grab upstream commit as patch to fix w/efivar 37 (removes workaround for previous versions) --- pkgs/tools/system/efibootmgr/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index f23345fb71d..638b018fd41 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, efivar, popt }: +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, efivar, popt }: stdenv.mkDerivation rec { name = "efibootmgr-${version}"; @@ -15,6 +15,14 @@ stdenv.mkDerivation rec { sha256 = "1niicijxg59rsmiw3rsjwy4bvi1n42dynvm01lnp9haixdzdpq03"; }; + patches = [ + (fetchpatch { + name = "remove-extra-decl.patch"; + url = "https://github.com/rhboot/efibootmgr/commit/99b578501643377e0b1994b2a068b790d189d5ad.patch"; + sha256 = "1sbijvlpv4khkix3vix9mbhzffj8lp8zpnbxm9gnzjz8yssz9p5h"; + }) + ]; + makeFlags = [ "EFIDIR=nixos" ]; installFlags = [ "prefix=$(out)" ]; From bf6678be01f71f7f92a58484c0325ae515f296c5 Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Mon, 17 Dec 2018 13:40:43 +0300 Subject: [PATCH 118/219] parity-beta: 2.2.4 -> 2.2.5 --- pkgs/applications/altcoins/parity/beta.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index 389bd820cc5..46985fd065e 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.2.4"; - sha256 = "12qcfmc56vnay25nlflgwhm3iwlr7hd286wzzanlsalizaj5s5ja"; - cargoSha256 = "11cwzqd459ld0apl2wnarfc4nb6j9j0dh26y3smvr0zsxvaz1r53"; + version = "2.2.5"; + sha256 = "0q9vgwc0jlja73r4na7yil624iagq1607ac47wh8a7xgfjmjjai1"; + cargoSha256 = "0ibdmyh1jvfq51vhwn4riyhilqwhf71hjd4vyj525smn95p75b14"; in import ./parity.nix { inherit version sha256 cargoSha256; } From bd8ee164c009bd4deff5fd11a4be54a9bfac53aa Mon Sep 17 00:00:00 2001 From: Alexander Krupenkin Date: Mon, 17 Dec 2018 13:41:08 +0300 Subject: [PATCH 119/219] parity: 2.1.9 -> 2.1.10 --- pkgs/applications/altcoins/parity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 2ce8c3e0520..81923849094 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.1.9"; - sha256 = "1xxpv2cxfcjwxfxkn2732y1wxh9rpiwmlb2ij09cg5nph669hy0v"; - cargoSha256 = "1v44l90bacw8d3ilnmrc49dxdpyckh7iamylkpa1pc0rrpiv5vy4"; + version = "2.1.10"; + sha256 = "1l4yl8i24q8v4hzljzai37f587x8m3cz3byzifhvq3bjky7p8h80"; + cargoSha256 = "04pni9cmz8nhlqznwafz9d81006808kh24aqnb8rjdcr84d11zis"; in import ./parity.nix { inherit version sha256 cargoSha256; } From f106becb65d14a4207f107c9f58ce55db9a202f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 05:02:19 -0800 Subject: [PATCH 120/219] libsolv: 0.7.1 -> 0.7.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libsolv/versions --- pkgs/development/libraries/libsolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 7d93b3f7d80..c2fa940d59a 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.1"; + version = "0.7.2"; name = "libsolv-${version}"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "0ssiadh10d28gzmq9vpgvvwmkw5ccb5iglafzsx3pf33z1zp5a3b"; + sha256 = "03zwf7zqz7ghd0bgs0wvlhnsd828z69kl28q2n6m4z57ai8zzqng"; }; cmakeFlags = [ From 65b679cd3cfbb175363d3692b54ad5ef2e72a6e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 06:16:46 -0800 Subject: [PATCH 121/219] libextractor: 1.7 -> 1.8 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libextractor/versions --- pkgs/development/libraries/libextractor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index e3f3604f94e..b2d9af657a9 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg != null && libmpeg2 != null; stdenv.mkDerivation rec { - name = "libextractor-1.7"; + name = "libextractor-1.8"; src = fetchurl { url = "mirror://gnu/libextractor/${name}.tar.gz"; - sha256 = "13wf6vj7mkv6gw8h183cnk7m24ir0gyf198pyb2148ng4klgv9p0"; + sha256 = "1z1cb35griqzvshqdv5ck98dy0sgpsswn7fgiy7lbzi34sma8dg2"; }; preConfigure = From 78ccd6edc859429c2549207f6c723e3dd9aa4f23 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 20:15:42 -0800 Subject: [PATCH 122/219] parallel: 20181022 -> 20181122 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/parallel/versions --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index fec81b580f3..22a032a4a46 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20181022"; + name = "parallel-20181122"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1v6vrfnn6acjjlp8xiizvcrb3zzs94av5xcl6xm8zfvcapixx11f"; + sha256 = "1mcqymf6vg8jhnjv71sswcz5xrwpq2h2ishi8m1hz8rwhc65h1ig"; }; nativeBuildInputs = [ makeWrapper ]; From 1928f801a64b4c9e7a958a7bfb249dbdbb7ebfcd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 13 Oct 2018 14:13:58 +0200 Subject: [PATCH 123/219] tdesktop: 1.5.1 -> 1.5.2 tdesktopPackages.preview: 1.5.1 -> 1.5.2 --- .../instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 7a9bef45b25..c74226e1e40 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -4,8 +4,8 @@ let mkTelegram = args: qt5.callPackage (import ./generic.nix args) { }; stableVersion = { stable = true; - version = "1.5.1"; - sha256Hash = "1y2fhw57g6raiv820sb53hjsqrmm81ij58dxlrv64z7ng0s8cnar"; + version = "1.5.2"; + sha256Hash = "0kg1xw1b4zj5a2yf6x5r7wrpl7w0fs52s58w606n9gyx7kdcgkj8"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk archPatchesRevision = "415526"; archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik"; From ee9ba43a1cadb8b90681c1f1700daf0e47ed566a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 17 Dec 2018 14:39:53 +0100 Subject: [PATCH 124/219] knot-resolver: 3.1.0 -> 3.2.0 https://lists.nic.cz/pipermail/knot-resolver-announce/2018/000005.html --- pkgs/servers/dns/knot-resolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index ceefa542e6a..b4768f32bf1 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -12,11 +12,11 @@ inherit (stdenv.lib) optional concatStringsSep; unwrapped = stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "8f3deba4695784a666cde317bc6af80ecf42ce1047b01f4b9c582fdc021c7492"; + sha256 = "924f1aebad04cacbc4545571239914d2c42e9253784c0df0f391dfad97c59f42"; }; outputs = [ "out" "dev" ]; From 53c490a7eef249a17ff63d93be0095a71bc55a73 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 17 Dec 2018 09:18:30 -0500 Subject: [PATCH 125/219] linux: 4.9.145 -> 4.9.146 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 97a730210d6..f1fa1baea37 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.145"; + version = "4.9.146"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0pmwnnjk05xpw9qvzl59llf4ihjdicrm52ardkra41f3x0vwl0b9"; + sha256 = "0ncf7yqavxqkkwdrapy72hb7rsj67fm1rvd2hdy12p88wf5ml6aq"; }; } // (args.argsOverride or {})) From c5234d7dbd56ba9b922240b776724513535f61ca Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 17 Dec 2018 09:18:38 -0500 Subject: [PATCH 126/219] linux: 4.14.88 -> 4.14.89 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 0f115476b5d..0e8215133ad 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.88"; + version = "4.14.89"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0bgm4vr1c4s4k8gyw8i92lxj82nl67jh55q0yg5bdsh8cz3viw5h"; + sha256 = "098b38518va6hhv5114vkyhyr2xzx01wxwib4dm0vpfx8jn1cvnf"; }; } // (args.argsOverride or {})) From 31ddf1f136ae25bb5008434b6c16577aef318bf3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 17 Dec 2018 09:18:45 -0500 Subject: [PATCH 127/219] linux: 4.19.9 -> 4.19.10 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 451af3f8c8d..4b33c121788 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.9"; + version = "4.19.10"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1wnvd4901ppzmx26fiav4glfkpb8qc7srcyk2m198wwwhb36q4gw"; + sha256 = "151ync20fz8bmiw3826jznx8kd7fna85vygrfchsqgm9xk76isdg"; }; } // (args.argsOverride or {})) From f7ec30328981a89e8c0a3facd1922a768f157aff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Dec 2018 07:31:12 -0800 Subject: [PATCH 128/219] ammonite: 1.4.2 -> 1.5.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ammonite/versions --- pkgs/development/tools/ammonite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index ab1f6c7706f..d80270f65b7 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.4.2"; + version = "1.5.0"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "10m6nnvrwzkbyhiq77wlqgzvqfqmn16y4sp983dyihjljxalygax"; + sha256 = "0ivfas9lfx3wsc2c4jxi1z54vn5f4cc4j1aqq53nxfl8sx2hbm3v"; }; propagatedBuildInputs = [ jre ] ; From 059920226802cc771fa1461286d6825fabc140dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 13 Dec 2018 19:00:59 -0800 Subject: [PATCH 129/219] umockdev: 0.12 -> 0.12.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/umockdev/versions --- pkgs/development/libraries/umockdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 0bf7fb59e32..b6f1136ea2b 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "umockdev-${version}"; - version = "0.12"; + version = "0.12.1"; outputs = [ "bin" "out" "dev" "doc" ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "martinpitt"; repo = "umockdev"; rev = version; - sha256 = "1j7kkxpqs991w3qdlb779gzv38l1vpnlk3laabi2ndk83j1wl5k2"; + sha256 = "0wnmz4jh04mvqzjnqvxrah969gg4x4v8d6ip61zc7jpbwnqb2fpg"; }; # autoreconfHook complains if we try to build the documentation From 61bd0e851ede843b7f4cdc8fcc7d776f880ee5fb Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 17 Dec 2018 16:33:18 +0100 Subject: [PATCH 130/219] postgresql: branch 9.3 is not maintained anymore See https://www.postgresql.org/support/versioning/. --- pkgs/servers/sql/postgresql/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 8c82385c1d8..2b56c32d635 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -106,6 +106,8 @@ let license = licenses.postgresql; maintainers = with maintainers; [ ocharles thoughtpolice ]; platforms = platforms.unix; + knownVulnerabilities = optional (!atLeast "9.4") + "PostgreSQL versions older than 9.4 are not maintained anymore!"; }; }); From 4ae47a69de4af13c0d4325acc7d66a95f3397f6b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 16:56:44 -0800 Subject: [PATCH 131/219] postgis: 2.5.0 -> 2.5.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/postgis/versions --- pkgs/development/libraries/postgis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 37cf29c8658..be7fc6f8c17 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -42,8 +42,8 @@ let - version = "2.5.0"; - sha256 = "1m9n1shhqhjrhbq6fd9fyfccxcgpng37s3lffhlmyrp98zbsnwxy"; + version = "2.5.1"; + sha256 = "14bsh4kflp4bxilypkpmhrpldknc9s9vgiax8yfhxbisyib704zv"; in stdenv.mkDerivation rec { name = "postgis-${version}"; From 27e174c6789c97c903657d07c72b4fc02b1c164c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 00:04:46 -0800 Subject: [PATCH 132/219] mercurialFull: 4.8 -> 4.8.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mercurial-full/versions --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 35d374866c8..d59b7241230 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -4,7 +4,7 @@ let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "4.8"; + version = "4.8.1"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; in python2Packages.buildPythonApplication { @@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "00rzjbf2blxkc0qwd9mdzx5fnzgpp4jxzijq6wgsjgmqscx40sy5"; + sha256 = "08gsn0s5802bs8ks77xqg7c8dwpbsh8df47kvb1gn14ivrf5z928"; }; inherit python; # pass it so that the same version can be used in hg2git From 5256cb8353c120e7507aecb579ec60441fa9bfa9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 17 Dec 2018 17:15:28 +0100 Subject: [PATCH 133/219] love_11: fix hash --- pkgs/development/interpreters/love/11.1.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix index 77cbd8a8245..7adaca7b865 100644 --- a/pkgs/development/interpreters/love/11.1.nix +++ b/pkgs/development/interpreters/love/11.1.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "rude"; repo = "love"; rev = "${version}"; - sha256 = "0bp22mzkjy48gncj5vm9b7whzrggcbs5pd4cnb6k8jpl9j02dhdv"; + sha256 = "0q1lsgc1621czrg49nmabq6am9sgxa9syxrwzlksqqr4dyzw4nmf"; }; nativeBuildInputs = [ pkgconfig ]; From f47b7d0213ecc19705f5971e63963622321917ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 17 Dec 2018 17:30:11 +0100 Subject: [PATCH 134/219] home-assistant: 0.84.2 -> 0.84.3 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f79390442a6..b34355c88b6 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.84.2"; + version = "0.84.3"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e4a68fdfc69..68bb42f51fb 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -85,7 +85,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.84.2"; + hassVersion = "0.84.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -100,7 +100,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1w1p0w8bwajiz6dms5x1vdc9sxnxdrjflnxvflxg4kba0w1mxq9m"; + sha256 = "0b7634niqqmcckhqb7vx1wimibfs4v042bwja7am90jy0hzafbji"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 006d242f841..0e1b327a264 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20181211.0"; + version = "20181211.1"; src = fetchPypi { inherit pname version; - sha256 = "ebb5d96154590794e9df9b5b48ec0c122419762c7460c4e67c535b65b7a00487"; + sha256 = "c3bb994e8e121d146fedc113b35ced0c007169fd70b489e9344df082f934dbdf"; }; propagatedBuildInputs = [ user-agents ]; From 3cca862a5f4ea8166d5b2968370cb49532e06ffc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Dec 2018 19:59:32 +0000 Subject: [PATCH 135/219] ocaml-ng.ocamlPackages_4_01_0.cstruct-lwt: fix evaluation --- pkgs/development/ocaml-modules/cstruct/lwt.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/cstruct/lwt.nix b/pkgs/development/ocaml-modules/cstruct/lwt.nix index fc621838966..5a10d7cae48 100644 --- a/pkgs/development/ocaml-modules/cstruct/lwt.nix +++ b/pkgs/development/ocaml-modules/cstruct/lwt.nix @@ -1,4 +1,8 @@ -{ buildDunePackage, cstruct, lwt }: +{ lib, buildDunePackage, cstruct, lwt }: + +if !lib.versionAtLeast (cstruct.version or "1") "3" +then cstruct +else buildDunePackage { pname = "cstruct-lwt"; From f41ac80d74d38321e60f8bc9efb431f498e5e31d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Dec 2018 19:59:40 +0000 Subject: [PATCH 136/219] ocaml-ng.ocamlPackages_4_01_0.cstruct-unix: fix evaluation --- pkgs/development/ocaml-modules/cstruct/unix.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/cstruct/unix.nix b/pkgs/development/ocaml-modules/cstruct/unix.nix index fb7612b5f05..604ad4fb083 100644 --- a/pkgs/development/ocaml-modules/cstruct/unix.nix +++ b/pkgs/development/ocaml-modules/cstruct/unix.nix @@ -1,4 +1,8 @@ -{ buildDunePackage, cstruct }: +{ lib, buildDunePackage, cstruct }: + +if !lib.versionAtLeast (cstruct.version or "1") "3" +then cstruct +else buildDunePackage { pname = "cstruct-unix"; From 5e786dedc1b99f68542c0ec8824a87a8d544aaa5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Dec 2018 19:59:45 +0000 Subject: [PATCH 137/219] ocaml-ng.ocamlPackages_4_01_0.ppx_cstruct: fix evaluation --- pkgs/development/ocaml-modules/cstruct/ppx.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix index 5f4130dc23f..78600b78306 100644 --- a/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -1,4 +1,8 @@ -{ buildDunePackage, cstruct, ppx_tools_versioned }: +{ lib, buildDunePackage, cstruct, ppx_tools_versioned }: + +if !lib.versionAtLeast (cstruct.version or "1") "3" +then cstruct +else buildDunePackage { pname = "ppx_cstruct"; From b5f580fa2e146c9f326bd64938099a4b5c848a9c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Dec 2018 19:59:50 +0000 Subject: [PATCH 138/219] ocamlPackages.labltk: fix evaluation with OCaml < 4.04 --- pkgs/development/ocaml-modules/labltk/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 10555771fee..b4a4e012560 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -1,5 +1,9 @@ { stdenv, fetchurl, ocaml, findlib, tcl, tk }: +if !stdenv.lib.versionAtLeast ocaml.version "4.04" +then throw "labltk is not available for OCaml ${ocaml.version}" +else + let param = { "4.04" = { version = "8.06.2"; From 585b741cb72f34912b07a5234057dce47550b0eb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Dec 2018 19:59:56 +0000 Subject: [PATCH 139/219] ocaml: fix build when X11 is not available --- pkgs/development/compilers/ocaml/generic.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 1ed6d2c6db2..d1ee43c9152 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -24,11 +24,13 @@ let name = "ocaml${optionalString flambdaSupport "+flambda"}-${version}"; in -stdenv.mkDerivation (args // rec { - +let x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; }; x11lib = x11env + "/lib"; x11inc = x11env + "/include"; +in + +stdenv.mkDerivation (args // rec { inherit name; inherit version; From d9b1ae9eab8631292e647736fc98d8fd423b25fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Dec 2018 09:49:34 -0800 Subject: [PATCH 140/219] msitools: 0.97 -> 0.98 * msitools: 0.97 -> 0.98 (#52188) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/msitools/versions * msitools: fetch from Gnome mirrors + misc cleanup --- pkgs/development/tools/misc/msitools/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index ebba56d56d3..4a5d87fb4f7 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -1,21 +1,21 @@ -{stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2}: +{ stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2 }: stdenv.mkDerivation rec { - version = "0.97"; + version = "0.98"; name = "msitools-${version}"; src = fetchurl { - url = "https://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz"; - sha256 = "0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs"; + url = "mirror://gnome/sources/msitools/${version}/${name}.tar.xz"; + sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [intltool glib libgsf libuuid gcab bzip2]; + nativeBuildInputs = [ intltool pkgconfig ]; + buildInputs = [ glib libgsf libuuid gcab bzip2 ]; meta = with stdenv.lib; { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; homepage = https://wiki.gnome.org/msitools; - license = [licenses.gpl2 licenses.lgpl21]; + license = [ licenses.gpl2 licenses.lgpl21 ]; platforms = platforms.unix; }; } From 26f6c15a42e8015a5332925719f45c8992a2fc9c Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 14 Dec 2018 21:13:35 +0300 Subject: [PATCH 141/219] fprintd: 0.8.0 -> 0.8.1 --- pkgs/tools/security/fprintd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index d0cf2f8091e..65eec89a09f 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fprintd-${version}"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://people.freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "00i21ycaya4x2qf94mys6s94xnbj5cfm8zhhd5sc91lvqjk4r99k"; + url = "https://gitlab.freedesktop.org/libfprint/fprintd/uploads/bdd9f91909f535368b7c21f72311704a/fprintd-${version}.tar.xz"; + sha256 = "124s0g9syvglgsmqnavp2a8c0zcq8cyaph8p8iyvbla11vfizs9l"; }; buildInputs = [ libfprint glib dbus-glib polkit nss pam systemd ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" "--localstatedir=/var" ]; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/fprint/fprintd/; + homepage = https://fprint.freedesktop.org/; description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus"; license = licenses.gpl2; platforms = platforms.linux; From 024ad6c4d5899bbbd2841a7b41e9c2f81719badf Mon Sep 17 00:00:00 2001 From: gnidorah Date: Mon, 17 Dec 2018 21:04:26 +0300 Subject: [PATCH 142/219] libfprint: 0.7.0 -> 0.99.0 --- .../libraries/libfprint/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 8b384a51f01..3f3062e3c08 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, libusb, pixman, glib, nss, nspr, gdk_pixbuf }: +{ stdenv, fetchurl, pkgconfig, meson, ninja, libusb, pixman, glib, nss, gtk3 +, coreutils, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: stdenv.mkDerivation rec { - name = "libfprint-0.7.0"; + name = "libfprint-${version}"; + version = "0.99.0"; src = fetchurl { - url = "https://people.freedesktop.org/~anarsoul/${name}.tar.xz"; - sha256 = "1wzi12zvdp8sw3w5pfbd9cwz6c71627bkr88rxv6gifbyj6fwgl6"; + url = "https://gitlab.freedesktop.org/libfprint/libfprint/uploads/82ba3cef5bdf72997df711eacdb13c0f/libfprint-${version}.tar.xz"; + sha256 = "16r4nl40y0jri57jiqmdz4s87byblx22lbhyvqpljd6mqm5rg187"; }; - buildInputs = [ libusb pixman glib nss nspr gdk_pixbuf ]; - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libusb pixman glib nss gtk3 ]; + nativeBuildInputs = [ pkgconfig meson ninja gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; + mesonFlags = [ "-Dudev_rules_dir=lib/udev/rules.d" "-Dx11-examples=false" ]; + + preConfigure = '' + substituteInPlace libfprint/meson.build \ + --replace /bin/echo ${coreutils}/bin/echo + ''; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/fprint/libfprint/; + homepage = https://fprint.freedesktop.org/; description = "A library designed to make it easy to add support for consumer fingerprint readers"; - license = licenses.lgpl2; + license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; From 18347fc05ca662c96c6fd85bd830d86da32981e0 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Tue, 11 Dec 2018 20:30:50 -0800 Subject: [PATCH 143/219] kubernetes: 1.12.3 -> 1.13.1 --- .../networking/cluster/kubernetes/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index bf42fb7da16..1a9df69fa59 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_10, go-bindata, makeWrapper, rsync +{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync , components ? [ "cmd/kubeadm" "cmd/kubectl" @@ -15,16 +15,16 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.12.3"; + version = "1.13.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0y227qzv7hsibf0sil5ylfdvkfsd43qlsyprc1dwgbj8igjl6q2d"; + sha256 = "048ckirz7v1djari6l9ddkcd9i4yafcv57wk131dv0cs2zady9va"; }; - buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ]; + buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; outputs = ["out" "man" "pause"]; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_10} '{}' + + find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' + ''; meta = { From 58db4c1a7e821d153ac0e1826a653498af83708d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 17 Dec 2018 19:23:59 +0100 Subject: [PATCH 144/219] Revert "nixos/tests: add clamav test" This reverts commit 6433f3b13b11c403065b86d43bb1d3ccceba6b71. Fixes #52446. --- nixos/tests/all-tests.nix | 1 - nixos/tests/clamav.nix | 37 ------------------------------------- 2 files changed, 38 deletions(-) delete mode 100644 nixos/tests/clamav.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ab1d32b911e..ca5015ded3e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -39,7 +39,6 @@ in cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {}; chromium = (handleTestOn ["x86_64-linux"] ./chromium.nix {}).stable or {}; cjdns = handleTest ./cjdns.nix {}; - clamav = handleTest ./clamav.nix {}; cloud-init = handleTest ./cloud-init.nix {}; codimd = handleTest ./codimd.nix {}; containers-bridge = handleTest ./containers-bridge.nix {}; diff --git a/nixos/tests/clamav.nix b/nixos/tests/clamav.nix deleted file mode 100644 index 84a08bcc49f..00000000000 --- a/nixos/tests/clamav.nix +++ /dev/null @@ -1,37 +0,0 @@ -import ./make-test.nix ({ pkgs, ... }: let - - eicarTestFile = pkgs.fetchurl { - url = "http://2016.eicar.org/download/eicar.com.txt"; - sha256 = "03zxa7vap2jkqjif4bzcjp33yrnip5yrz2bisia9wj5npwdh4ni7"; - }; - - clamavMain = builtins.fetchurl "http://database.clamav.net/main.cvd"; - clamavDaily = builtins.fetchurl "http://database.clamav.net/daily.cvd"; - clamavBytecode = builtins.fetchurl "http://database.clamav.net/bytecode.cvd"; - -in { - name = "clamav"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ fpletz ]; - }; - - nodes.machine = { ... }: { - virtualisation.memorySize = 1024; - - services.clamav.daemon.enable = true; - systemd.services.clamav-daemon.preStart = '' - mkdir -p /var/lib/clamav - ln -sf ${clamavMain} /var/lib/clamav/main.cvd - ln -sf ${clamavDaily} /var/lib/clamav/daily.cvd - ln -sf ${clamavBytecode} /var/lib/clamav/bytecode.cvd - ''; - }; - - testScript = '' - startAll; - $machine->waitForUnit("multi-user.target"); - $machine->waitForUnit("clamav-daemon.service"); - $machine->waitForFile("/run/clamav/clamd.ctl"); - $machine->fail("clamdscan ${eicarTestFile}"); - ''; -}) From c08ec87fe31e7314cfc4f7cbf00af93ff1594294 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Mon, 17 Dec 2018 12:34:39 -0600 Subject: [PATCH 145/219] Emacs site-start: Use correct feature name * pkgs/applications/editors/emacs/site-start.el (tramp-sh): Use correct feature name Tramp upstream recently dropped the autoload cookie from tramp-remote-path. This makes Emacs error when trying to load tramp. Using the correct feature name fixes this. --- pkgs/applications/editors/emacs/site-start.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index cc1ab1d0e30..34addc33a59 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -30,7 +30,7 @@ least specific (the system profile)" woman-manpath))) ;;; Make tramp work for remote NixOS machines -(eval-after-load 'tramp +(eval-after-load 'tramp-sh ;; TODO: We should also add the other `NIX_PROFILES' to this path. ;; However, these are user-specific, so we would need to discover ;; them dynamically after connecting via `tramp' From ace1f064e865fc9e8946da7635ad3229c866ea2c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 Dec 2018 11:04:10 -0800 Subject: [PATCH 146/219] glabels: 3.4.0 -> 3.4.1 * glabels: 3.4.0 -> 3.4.1 (#52285) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/glabels/versions * glabels: fetch from Gnome mirrors + corrected licensing - see https://github.com/jimevins/glabels/blob/glabels-3_4_1/COPYING.README_FIRST --- pkgs/applications/graphics/glabels/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index df8ebee020c..cf4ecf15523 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "glabels-${version}"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz"; - sha256 = "04345crf5yrhq6rlrymz630rxnm8yw41vx04hb6xn2nkjn9hf3nl"; + url = "mirror://gnome/sources/glabels/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "0f2rki8i27pkd9r0gz03cdl1g4vnmvp0j49nhxqn275vi8lmgr0q"; }; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - meta = { + meta = with stdenv.lib; { description = "Create labels and business cards"; - homepage = http://glabels.org/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + homepage = https://glabels.org/; + license = with licenses; [ gpl3Plus lgpl3Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.nico202 ]; }; } From dd99978853c9e18ad432efe097a291ea10c6ac1e Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Sun, 16 Dec 2018 20:17:02 -0800 Subject: [PATCH 147/219] plata-theme: init at 0.4.9 --- pkgs/data/themes/plata/default.nix | 80 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 82 insertions(+) create mode 100644 pkgs/data/themes/plata/default.nix diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix new file mode 100644 index 00000000000..d839d4a3dd8 --- /dev/null +++ b/pkgs/data/themes/plata/default.nix @@ -0,0 +1,80 @@ +{ stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel +, sassc, inkscape, libxml2, gnome2, gdk_pixbuf, librsvg, gtk-engine-murrine +, cinnamonSupport ? true +, gnomeFlashbackSupport ? true +, gnomeShellSupport ? true +, mateSupport ? true +, openboxSupport ? true +, xfceSupport ? true +, gtkNextSupport ? false +, plankSupport ? false +, telegramSupport ? false +, tweetdeckSupport ? false +, selectionColor ? null # Primary color for 'selected-items' (Default: #3F51B5 = Indigo500) +, accentColor ? null # Secondary color for notifications and OSDs (Default: #7986CB = Indigo300) +, suggestionColor ? null # Secondary color for 'suggested' buttons (Default: #673AB7 = DPurple500) +, destructionColor ? null # Tertiary color for 'destructive' buttons (Default: #F44336 = Red500) +}: + +stdenv.mkDerivation rec { + name = "plata-theme-${version}"; + version = "0.4.9"; + + src = fetchFromGitLab { + owner = "tista500"; + repo = "plata-theme"; + rev = version; + sha256 = "0kj04nj265rgkbbhzhz9f7q6z5yr1dxmcrnq1b5ldha3xqrq2pv9"; + }; + + preferLocalBuild = true; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + parallel + sassc + inkscape + libxml2 + gnome2.glib.dev + ]; + + buildInputs = [ + gdk_pixbuf + librsvg + ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + postPatch = "patchShebangs ."; + + configureFlags = + let + inherit (stdenv.lib) enableFeature optional; + withOptional = value: feat: optional (value != null) "--with-${feat}=${value}"; + in [ + "--enable-parallel" + (enableFeature cinnamonSupport "cinnamon") + (enableFeature gnomeFlashbackSupport "flashback") + (enableFeature gnomeShellSupport "gnome") + (enableFeature mateSupport "mate") + (enableFeature openboxSupport "openbox") + (enableFeature xfceSupport "xfce") + (enableFeature gtkNextSupport "gtk_next") + (enableFeature plankSupport "plank") + (enableFeature telegramSupport "telegram") + (enableFeature tweetdeckSupport "tweetdeck") + ] + ++ (withOptional selectionColor "selection_color") + ++ (withOptional accentColor "accent_color") + ++ (withOptional suggestionColor "suggestion_color") + ++ (withOptional destructionColor "destruction_color"); + + meta = with stdenv.lib; { + description = "A Gtk+ theme based on Material Design Refresh"; + homepage = https://gitlab.com/tista500/plata-theme; + license = with licenses; [ gpl2 cc-by-sa-40 ]; + platforms = platforms.linux; + maintainers = [ maintainers.tadfisher ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b3ce642bb9..af2334e3df2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15653,6 +15653,8 @@ in penna = callPackage ../data/fonts/penna { }; + plata-theme = callPackage ../data/themes/plata {}; + poly = callPackage ../data/fonts/poly { }; polytopes_db = callPackage ../data/misc/polytopes_db { }; From 8f25e3d4cd58fcaadc26f9cdb2ea3fd8ba4ab392 Mon Sep 17 00:00:00 2001 From: Tom Smeets Date: Mon, 17 Dec 2018 21:37:34 +0100 Subject: [PATCH 148/219] gamecube-tools: init at v1.0.2 --- .../tools/gamecube-tools/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/tools/gamecube-tools/default.nix diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/development/tools/gamecube-tools/default.nix new file mode 100644 index 00000000000..0857a3d4a7c --- /dev/null +++ b/pkgs/development/tools/gamecube-tools/default.nix @@ -0,0 +1,25 @@ +{ stdenv, which, autoconf, automake, fetchFromGitHub, + libtool, freeimage, mesa }: +stdenv.mkDerivation rec { + version = "v1.0.2"; + name = "gamecube-tools-${version}"; + + nativeBuildInputs = [ which autoconf automake libtool ]; + buildInputs = [ freeimage mesa ]; + + src = fetchFromGitHub { + owner = "devkitPro"; + repo = "gamecube-tools"; + rev = version; + sha256 = "0zvpkzqvl8iv4ndzhkjkmrzpampyzgb91spv0h2x2arl8zy4z7ca"; + }; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + description = "Tools for gamecube/wii projects"; + homepage = "https://github.com/devkitPro/gamecube-tools/"; + license = licenses.gpl2; + maintainers = with maintainers; [ tomsmeets ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b3ce642bb9..69048c6b182 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -730,6 +730,8 @@ in genymotion = callPackage ../development/mobile/genymotion { }; + gamecube-tools = callPackage ../development/tools/gamecube-tools { }; + gams = callPackage ../tools/misc/gams { licenseFile = config.gams.licenseFile or null; optgamsFile = config.gams.optgamsFile or null; From f0d3a6e7445e93a4becf58945dfa4bb08366dd95 Mon Sep 17 00:00:00 2001 From: Tom Smeets Date: Mon, 17 Dec 2018 21:45:43 +0100 Subject: [PATCH 149/219] wiiload: init at v0.5.1 --- pkgs/development/tools/wiiload/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/wiiload/default.nix diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/development/tools/wiiload/default.nix new file mode 100644 index 00000000000..aaf1b20ea6f --- /dev/null +++ b/pkgs/development/tools/wiiload/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, zlib }: +stdenv.mkDerivation rec { + version = "v0.5.1"; + name = "wiiload-${version}"; + + nativeBuildInputs = [ autoconf automake ]; + buildInputs = [ zlib ]; + + src = fetchFromGitHub { + owner = "devkitPro"; + repo = "wiiload"; + rev = version; + sha256 = "0dffy603zggkqv7g1a2jninmi64vy519gpgkdfhjnijhdm9gs5m3"; + }; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + description = "Load homebrew apps over network/usbgecko to your Wii"; + homepage = https://wiibrew.org/wiki/Wiiload; + license = licenses.gpl2; + maintainers = with maintainers; [ tomsmeets ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b3ce642bb9..43c42e96660 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -805,6 +805,8 @@ in inherit (darwin.apple_sdk.frameworks) Carbon; }; + wiiload = callPackage ../development/tools/wiiload { }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; ssh-agents = callPackage ../tools/networking/ssh-agents { }; From 6620de7594cf2b4dd89c1b15c49495a52140d785 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Dec 2018 20:14:42 +0000 Subject: [PATCH 150/219] ocamlPackages.atdgen: init at 2.0.0 Atdgen is a command-line program that takes as input type definitions in the ATD syntax and produces OCaml code suitable for data serialization and deserialization. Homepage: https://github.com/mjambon/atd --- .../ocaml-modules/atdgen/default.nix | 26 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/atdgen/default.nix diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix new file mode 100644 index 00000000000..d8ef2fec999 --- /dev/null +++ b/pkgs/development/ocaml-modules/atdgen/default.nix @@ -0,0 +1,26 @@ +{ buildDunePackage, atd, biniou, yojson }: + +let runtime = + buildDunePackage { + pname = "atdgen-runtime"; + inherit (atd) version src; + + propagatedBuildInputs = [ biniou yojson ]; + + meta = { inherit (atd.meta) license; }; + } +; in + +buildDunePackage { + pname = "atdgen"; + inherit (atd) version src; + + buildInputs = [ atd ]; + + propagatedBuildInputs = [ runtime ]; + + meta = { + description = "Generates efficient JSON serializers, deserializers and validators"; + inherit (atd.meta) license; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 0af48890ff1..9c3e81e3177 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -54,6 +54,8 @@ let atd = callPackage ../development/ocaml-modules/atd { }; + atdgen = callPackage ../development/ocaml-modules/atdgen { }; + base64 = callPackage ../development/ocaml-modules/base64 { }; bap = callPackage ../development/ocaml-modules/bap { From 5a44fef594ebffdbacc1b2fb94fe2b1617467f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Mon, 17 Dec 2018 23:08:56 +0100 Subject: [PATCH 151/219] adoptopenjdk: autogenerate sources + add support for aarch64 --- .../adoptopenjdk-bin/generate-sources.py | 69 ++++++++++++++ .../adoptopenjdk-bin/jdk-darwin-base.nix | 11 +-- .../adoptopenjdk-bin/jdk-linux-base.nix | 13 ++- .../adoptopenjdk-bin/jdk11-darwin.nix | 44 +-------- .../adoptopenjdk-bin/jdk11-linux.nix | 44 +-------- .../compilers/adoptopenjdk-bin/sources.json | 94 +++++++++++++++++++ 6 files changed, 184 insertions(+), 91 deletions(-) create mode 100755 pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py create mode 100644 pkgs/development/compilers/adoptopenjdk-bin/sources.json diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py new file mode 100755 index 00000000000..a410501de0a --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -0,0 +1,69 @@ +#!/usr/bin/env nix-shell +#!nix-shell --pure -i python3 -p python3 -p python3Packages.requests + +import json +import re +import requests +import sys + +releases = ["openjdk11"] +oses = ["mac", "linux"] +types = ["jre", "jdk"] +impls = ["hotspot", "openj9"] + +arch_to_nixos = { + "x64": "x86_64", + "aarch64": "aarch64", +} + +def get_sha256(url): + resp = requests.get(url) + if resp.status_code != 200: + print("error: could not fetch checksum from url {}: code {}".format(url, resp.code), file=sys.stderr) + sys.exit(1) + return resp.text.strip().split(" ")[0] + +RE_RELEASE_NAME = re.compile(r'[^-]+-([0-9.]+)\+([0-9]+)') # example release name: jdk-11.0.1+13 +def generate_sources(release, assets): + out = {} + for asset in assets: + if asset["os"] not in oses: continue + if asset["binary_type"] not in types: continue + if asset["openjdk_impl"] not in impls: continue + if asset["heap_size"] != "normal": continue + if asset["architecture"] not in arch_to_nixos: continue + + version, build = RE_RELEASE_NAME.match(asset["release_name"]).groups() + + type_map = out.setdefault(asset["os"], {}) + impl_map = type_map.setdefault(asset["binary_type"], {}) + arch_map = impl_map.setdefault(asset["openjdk_impl"], { + "version": version, + "build": build, + "packageType": asset["binary_type"], + "vmType": asset["openjdk_impl"], + }) + + if arch_map["version"] != version or arch_map["build"] != build: + print("error: architectures have different latest versions ({}+{} vs {}+{})".format( + arch_map["version"], arch_map["build"], version, build + ), file=sys.stderr) + sys.exit(1) + + arch_map[arch_to_nixos[asset["architecture"]]] = { + "url": asset["binary_link"], + "sha256": get_sha256(asset["checksum_link"]), + } + + return out + +out = {} +for release in releases: + resp = requests.get("https://api.adoptopenjdk.net/v2/latestAssets/releases/" + release) + if resp.status_code != 200: + print("error: could not fetch data for release {} (code {})".format(release, resp.code), file=sys.stderr) + sys.exit(1) + out[release] = generate_sources(release, resp.json()) + +with open("sources.json", "w") as f: + json.dump(out, f, indent=2, sort_keys=True) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix index c2c13649f88..958f36d3928 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -1,7 +1,4 @@ -{ name -, url -, sha256 -}: +sourcePerArch: { swingSupport ? true # not used for now , stdenv @@ -9,10 +6,12 @@ }: let result = stdenv.mkDerivation rec { - inherit name; + name = if sourcePerArch.packageType == "jdk" + then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}" + else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"; src = fetchurl { - inherit url sha256; + inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256; }; # See: https://github.com/NixOS/patchelf/issues/10 diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix index cf38ca9eaeb..eb614b0784f 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -1,7 +1,4 @@ -{ name -, url -, sha256 -}: +sourcePerArch: { swingSupport ? true , stdenv @@ -48,10 +45,12 @@ let in let result = stdenv.mkDerivation rec { - inherit name; + name = if sourcePerArch.packageType == "jdk" + then "adoptopenjdk-${sourcePerArch.vmType}-bin-${sourcePerArch.version}" + else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin-${sourcePerArch.version}"; src = fetchurl { - inherit url sha256; + inherit (sourcePerArch.${stdenv.hostPlatform.parsed.cpu.name}) url sha256; }; nativeBuildInputs = [ file ]; @@ -112,7 +111,7 @@ let result = stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.gpl2Classpath; description = "AdoptOpenJDK, prebuilt OpenJDK binary"; - platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms + platforms = stdenv.lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms maintainers = with stdenv.lib.maintainers; [ taku0 ]; }; diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix index 573f5e175ec..d1db77215d1 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix @@ -1,43 +1,9 @@ let - makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-darwin-base.nix { - name = if packageType == "jdk" - then - "adoptopenjdk-${vmType}-bin-${version}" - else - "adoptopenjdk-${packageType}-${vmType}-bin-${version}"; - - url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz"; - - inherit sha256; - }; + sources = builtins.fromJSON (builtins.readFile ./sources.json); in { - jdk-hotspot = makePackage { - version = "11"; - buildNumber = "28"; - packageType = "jdk"; - vmType = "hotspot"; - sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3"; - }; - jre-hotspot = makePackage { - version = "11"; - buildNumber = "28"; - packageType = "jre"; - vmType = "hotspot"; - sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c"; - }; - jdk-openj9 = makePackage { - version = "11.0.1"; - buildNumber = "13"; - packageType = "jdk"; - vmType = "openj9"; - sha256 = "c5e9b588b4ac5b0bd5b4edd69d59265d1199bb98af7ca3270e119b264ffb6e3f"; - }; - jre-openj9 = makePackage { - version = "11.0.1"; - buildNumber = "13"; - packageType = "jre"; - vmType = "openj9"; - sha256 = "0901dc5946fdf967f92f7b719ddfffdcdde5bd3fef86a83d7a3f2f39ddbef1f8"; - }; + jdk-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.hotspot; + jre-hotspot = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.hotspot; + jdk-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jdk.openj9; + jre-openj9 = import ./jdk-darwin-base.nix sources.openjdk11.mac.jre.openj9; } diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix index f4990b6effc..755ffaab271 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix @@ -1,43 +1,9 @@ let - makePackage = { version, buildNumber, packageType, vmType, sha256 }: import ./jdk-linux-base.nix { - name = if packageType == "jdk" - then - "adoptopenjdk-${vmType}-bin-${version}" - else - "adoptopenjdk-${packageType}-${vmType}-bin-${version}"; - - url = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}/OpenJDK11-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz"; - - inherit sha256; - }; + sources = builtins.fromJSON (builtins.readFile ./sources.json); in { - jdk-hotspot = makePackage { - version = "11"; - buildNumber = "28"; - packageType = "jdk"; - vmType = "hotspot"; - sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af"; - }; - jre-hotspot = makePackage { - version = "11"; - buildNumber = "28"; - packageType = "jre"; - vmType = "hotspot"; - sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c"; - }; - jdk-openj9 = makePackage { - version = "11.0.1"; - buildNumber = "13"; - packageType = "jdk"; - vmType = "openj9"; - sha256 = "765947ab9457a29d2aa9d11460a4849611343c1e0ea3b33b9c08409cd4672251"; - }; - jre-openj9 = makePackage { - version = "11.0.1"; - buildNumber = "13"; - packageType = "jre"; - vmType = "openj9"; - sha256 = "a016413fd8415429b42e543fed7a1bee5010b1dbaf71d29a26e1c699f334c6ff"; - }; + jdk-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.hotspot; + jre-hotspot = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.hotspot; + jdk-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jdk.openj9; + jre-openj9 = import ./jdk-linux-base.nix sources.openjdk11.linux.jre.openj9; } diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json new file mode 100644 index 00000000000..bacb468c0ec --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -0,0 +1,94 @@ +{ + "openjdk11": { + "linux": { + "jdk": { + "hotspot": { + "aarch64": { + "sha256": "b66121b9a0c2e7176373e670a499b9d55344bcb326f67140ad6d0dc24d13d3e2", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.1_13.tar.gz" + }, + "build": "13", + "packageType": "jdk", + "version": "11.0.1", + "vmType": "hotspot", + "x86_64": { + "sha256": "22bd2f1a2e0cb6e4075967bfeda4a960b0325879305aa739a0ba2d6e5cd4c3e2", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz" + } + }, + "openj9": { + "build": "13", + "packageType": "jdk", + "version": "11.0.1", + "vmType": "openj9", + "x86_64": { + "sha256": "ef9bf07cba79082285a9d426ea4eb3e8df57561ce2afe07cc5f299a8fa203279", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_openj9_jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz" + } + } + }, + "jre": { + "hotspot": { + "aarch64": { + "sha256": "6fd756bda392e3fddb48382460daae263c6fb5708683a691c8d30af2eb870bb8", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_aarch64_linux_hotspot_11_28.tar.gz" + }, + "build": "28", + "packageType": "jre", + "version": "11", + "vmType": "hotspot", + "x86_64": { + "sha256": "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_hotspot_11_28.tar.gz" + } + }, + "openj9": { + "build": "28", + "packageType": "jre", + "version": "11", + "vmType": "openj9", + "x86_64": { + "sha256": "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_linux_openj9_11_28.tar.gz" + } + } + } + }, + "mac": { + "jdk": { + "hotspot": { + "build": "13", + "packageType": "jdk", + "version": "11.0.1", + "vmType": "hotspot", + "x86_64": { + "sha256": "e219e7e2d586ed09ae65f4ec390fca5d5f0c37a61b47677648610194daf1aaa7", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz" + } + }, + "openj9": { + "build": "13", + "packageType": "jdk", + "version": "11.0.1", + "vmType": "openj9", + "x86_64": { + "sha256": "c9a816d6a3f8aac9dc5b3b41c5a9e4e5460af433a06e003ae25d5a06dea8375f", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_openj9_macosXL-jdk-11.0.1_13_openj9-0.11.0_11.0.1_13.tar.gz" + } + } + }, + "jre": { + "hotspot": { + "build": "28", + "packageType": "jre", + "version": "11", + "vmType": "hotspot", + "x86_64": { + "sha256": "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11%2B28/OpenJDK11-jre_x64_mac_hotspot_11_28.tar.gz" + } + } + } + } + } +} \ No newline at end of file From 28e9a1eef1668d86f744129a2055fd8bb62cc355 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 17 Dec 2018 23:10:39 +0100 Subject: [PATCH 152/219] youtube-dl: 2018.11.18 -> 2018.12.17 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index d898813b0a9..fbf925516f3 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2018.11.18"; + version = "2018.12.17"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "1wvvwyvxg9aadgpbcz0p6nzqmvnxzlbsqja3j6487l41s1ky1fyq"; + sha256 = "1nd4zr3wd35vldm775m9wcgbzma2013yyj134lcz19ipjs38isrk"; }; nativeBuildInputs = [ makeWrapper ]; From 8f525e762157f21914052869bbd5f025fd79d0c6 Mon Sep 17 00:00:00 2001 From: Ivan Jager Date: Mon, 17 Dec 2018 16:16:26 -0600 Subject: [PATCH 153/219] gnustep.base: Add explicit dependency on libbfd Before beb063a, binutils included a libbfd install, which is now being removed in postFixup https://github.com/NixOS/nixpkgs/commit/beb063a1031c08df77996d97e4f6f9a2da1d911a#diff-c59ce5deea2f4002004fffdb11c5ed57R131 Fixes #52283 --- pkgs/desktops/gnustep/base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index 40c79274aae..9d1606ea6b7 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -3,7 +3,7 @@ , cups , fetchurl , gmp, gnutls -, libffi +, libffi, libbfd , libjpeg, libtiff, libpng, giflib, libungif , libxml2, libxslt, libiconv , libobjc, libgcrypt @@ -24,7 +24,7 @@ gsmakeDerivation { aspell audiofile cups gmp gnutls - libffi + libffi libbfd libjpeg libtiff libpng giflib libungif libxml2 libxslt libiconv libobjc libgcrypt From 5fc271257e8db26dd7c1a28f33c0184f195402b8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 17 Dec 2018 23:26:41 +0100 Subject: [PATCH 154/219] prometheus_2: 2.4.3 -> 2.6.0 --- pkgs/servers/monitoring/prometheus/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 2430a8cf171..03080376ec2 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -50,7 +50,7 @@ in rec { }; prometheus_2 = generic { - version = "2.4.3"; - sha256 = "1kci2zhh4ixil0b72d138vm8006y117mw51wsyz8j0gyy4180msj"; + version = "2.6.0"; + sha256 = "1d9zwzs280pw9zspqwp7xx3ji04lfg2v9l5qhrfy3y633ghcmpxz"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59ac9b9bef5..7d0098a8cb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13855,10 +13855,10 @@ in inherit (callPackage ../servers/monitoring/prometheus { buildGoPackage = buildGo110Package; - }) - prometheus_1 - prometheus_2 - ; + }) prometheus_1; + + inherit (callPackage ../servers/monitoring/prometheus { }) + prometheus_2; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; prometheus = prometheus_1; From 5911d544574269792e18151835973957e1035f87 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 17 Dec 2018 23:55:09 +0100 Subject: [PATCH 155/219] libressl_2_6: remove, not maintained anymore --- pkgs/development/libraries/libressl/default.nix | 5 ----- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 154e84cfd0a..23361d03aa5 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -35,11 +35,6 @@ let in { - libressl_2_6 = generic { - version = "2.6.5"; - sha256 = "0anx9nlgixdjn811zclim85jm5yxmxwycj71ix27rlhr233xz7l5"; - }; - libressl_2_7 = generic { version = "2.7.4"; sha256 = "19kxa5i97q7p6rrps9qm0nd8zqhdjvzx02j72400c73cl2nryfhy"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d0098a8cb1..dca33827561 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11859,11 +11859,10 @@ in openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_2_6 libressl_2_7 libressl_2_8; - libressl = libressl_2_7; + libressl = libressl_2_8; boringssl = callPackage ../development/libraries/boringssl { }; From b7254b6b2c8069495d497454c17ab42cfa98b049 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 17 Dec 2018 23:56:08 +0100 Subject: [PATCH 156/219] libressl_2_7: 2.7.4 -> 2.7.5 --- pkgs/development/libraries/libressl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 23361d03aa5..e74918d5715 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -36,8 +36,8 @@ let in { libressl_2_7 = generic { - version = "2.7.4"; - sha256 = "19kxa5i97q7p6rrps9qm0nd8zqhdjvzx02j72400c73cl2nryfhy"; + version = "2.7.5"; + sha256 = "0h60bcx7k72171dwpx4vsbsrxxz9c18v75lh5fj600gghn6h7rdy"; }; libressl_2_8 = generic { From 949dc60acc3d0f506bbbd7ef6f182ca3102a0279 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 17 Dec 2018 23:57:13 +0100 Subject: [PATCH 157/219] libressl_2_8: 2.8.2 -> 2.8.3 --- pkgs/development/libraries/libressl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index e74918d5715..260be3476f2 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -41,7 +41,7 @@ in { }; libressl_2_8 = generic { - version = "2.8.2"; - sha256 = "1mag4lf3lmg2fh2yzkh663l69h4vjriadwl0zixmb50jkzjk3jxq"; + version = "2.8.3"; + sha256 = "0xw4z4z6m7lyf1r4m2w2w1k7as791c04ygnfk4d7d0ki0h9hnr4v"; }; } From 51c8e01676472b79721601af4e848031b2fc1485 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 17 Dec 2018 23:59:24 +0100 Subject: [PATCH 158/219] libressl_2_9: init at 2.9.0 --- pkgs/development/libraries/libressl/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 260be3476f2..631580aa7d1 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -44,4 +44,9 @@ in { version = "2.8.3"; sha256 = "0xw4z4z6m7lyf1r4m2w2w1k7as791c04ygnfk4d7d0ki0h9hnr4v"; }; + + libressl_2_9 = generic { + version = "2.9.0"; + sha256 = "1x1wl6b449m6hfhyxxzxbf2v8yfb5q92q6d01hdg28xp1222jpzb"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dca33827561..c60ba0002a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11860,7 +11860,8 @@ in inherit (callPackages ../development/libraries/libressl { }) libressl_2_7 - libressl_2_8; + libressl_2_8 + libressl_2_9; libressl = libressl_2_8; From 9f6c85bd5e04c040970b8ae59f7150540cbe00a7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 18 Dec 2018 00:03:56 +0100 Subject: [PATCH 159/219] lldpd: 1.0.1 -> 1.0.3 --- pkgs/tools/networking/lldpd/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 81456c1b852..193f44a62e2 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -1,25 +1,15 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, removeReferencesTo +{ stdenv, lib, fetchurl, pkgconfig, removeReferencesTo , libevent, readline, net_snmp }: stdenv.mkDerivation rec { name = "lldpd-${version}"; - version = "1.0.1"; + version = "1.0.3"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz"; - sha256 = "0lgiappbjm95r1m0xyxb6gzz4izcjixknbzq3s7pbqbsmhm642s5"; + sha256 = "0q63wiaan85a6d204jgk87w6dw5c9x0rb2z7pwb580b8a4wyvz1r"; }; - patches = [ - # Fixes #44507: The service fails to start due to a /bin/mkdir call. - # Should be included in the upstream release after 1.0.1. - # Please remove this patch when updating and ensure the NixOS service starts. - (fetchpatch { - url = "https://github.com/vincentbernat/lldpd/commit/90a50860ebdcdeb5b7dc85790b18bed23c97ec32.patch"; - sha256 = "005i4ldc4mfzfmvbnid6849ax2i93mx8nkyf8vjv8k73bfpdza8z"; - }) - ]; - configureFlags = [ "--localstatedir=/var" "--enable-pie" From a2080299e8a3e74754d29427890b598f0641bc99 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 18 Dec 2018 00:04:31 +0100 Subject: [PATCH 160/219] aubio: 0.4.7 -> 0.4.8 --- pkgs/development/libraries/aubio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 01ca9a3ec83..e6c4a8e0089 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "aubio-0.4.7"; + name = "aubio-0.4.8"; src = fetchurl { url = "https://aubio.org/pub/${name}.tar.bz2"; - sha256 = "0hd0kzfmr46am00ygxar8alrldv92c5azqy701iilfmbqpz4mvfb"; + sha256 = "1fjbz1l9axscrb7dl6jv4ifhvmq1g77ihvg0bbwwfg0j3qz4gxyw"; }; nativeBuildInputs = [ pkgconfig python wafHook ]; From 0ab65723240c47ea5c682a856417bb4c0d259c0c Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 5 Nov 2018 20:11:42 +0000 Subject: [PATCH 161/219] libvirt: 4.7.0 -> 4.10.0 --- pkgs/development/libraries/libvirt/default.nix | 6 +++--- pkgs/development/python-modules/libvirt/default.nix | 4 ++-- pkgs/top-level/perl-packages.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 733482ce268..9f183365aae 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -16,19 +16,19 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "4.7.0"; + version = "4.10.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "1r37aw1xxlwjkk4n6k503mw1caldijz8n7x86xdaq90n6bvpkhlj"; + sha256 = "0v17zzyyb25nn9l18v5244myg7590dp6ppwgi8xysipifc0q77bz"; } else fetchgit { url = git://libvirt.org/libvirt.git; rev = "v${version}"; - sha256 = "17byylhx0bny4b771hqv92d87a5dg21a5qjv861y50sckgwwi6f1"; + sha256 = "0dlpv3v6jpbmgvhpn29ryp0w2a1xny8ciqid8hnlf3klahz9kwz9"; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index 063245c0d4d..d6924d9d65c 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "libvirt"; - version = "4.7.0"; + version = "4.10.0"; src = assert version == libvirt.version; fetchgit { url = git://libvirt.org/libvirt-python.git; rev = "v${version}"; - sha256 = "1zv3fgwmnkvqif0qsnvpx8hhb6bdfr2b4v55z3nh93bfg8s4rbm8"; + sha256 = "184gd857fkks9ivh4zzbmva2fs2dfxg9lihvhfrwyd2pxflglvyf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 26f811bfb33..e3f02fa9728 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14428,12 +14428,12 @@ let }; SysVirt = buildPerlModule rec { - version = "4.7.0"; + version = "4.10.0"; name = "Sys-Virt-${version}"; src = assert version == pkgs.libvirt.version; pkgs.fetchgit { url = git://libvirt.org/libvirt-perl.git; rev = "v${version}"; - sha256 = "14q8s6k3d9a1qh6sh618qp30ib4p9qma2z4p2ynyh223i4w3virg"; + sha256 = "1dfwq4d46kx18lz27rb3jkxb0g1hirpq70vr4572sc38rybpq59v"; }; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; From 7722c43f0ad0b78bc810e874485cd7dd77baa51a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 21:32:34 -0800 Subject: [PATCH 162/219] olm: 2.3.0 -> 3.0.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/olm/versions --- pkgs/development/libraries/olm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index 05888ad60bb..4749efb5f00 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "olm-${version}"; - version = "2.3.0"; + version = "3.0.0"; meta = { description = "Implements double cryptographic ratchet and Megolm ratchet"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://matrix.org/git/olm/snapshot/${name}.tar.gz"; - sha256 = "1y2yasq94zjw3nadn1915j85xwc5j3pic3brhp0h83l6hkxi8dsk"; + sha256 = "1iivxjk458v9lhqgzp0c4k5azligsh9k3rk6irf9ssj29wzgjm2c"; }; doCheck = true; From 758f271fba854a25eef3ccd314b7e8a36407a765 Mon Sep 17 00:00:00 2001 From: Fritz Otlinghaus Date: Fri, 14 Dec 2018 15:54:22 +0800 Subject: [PATCH 163/219] github-changelog-generator: init at v1.14.3 Signed-off-by: Fritz Otlinghaus --- .../tools/github-changelog-generator/Gemfile | 4 + .../github-changelog-generator/Gemfile.lock | 49 ++++++ .../github-changelog-generator/default.nix | 15 ++ .../github-changelog-generator/gemset.nix | 155 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 225 insertions(+) create mode 100644 pkgs/development/tools/github-changelog-generator/Gemfile create mode 100644 pkgs/development/tools/github-changelog-generator/Gemfile.lock create mode 100644 pkgs/development/tools/github-changelog-generator/default.nix create mode 100644 pkgs/development/tools/github-changelog-generator/gemset.nix diff --git a/pkgs/development/tools/github-changelog-generator/Gemfile b/pkgs/development/tools/github-changelog-generator/Gemfile new file mode 100644 index 00000000000..5db8cdb7348 --- /dev/null +++ b/pkgs/development/tools/github-changelog-generator/Gemfile @@ -0,0 +1,4 @@ +# frozen_string_literal: true +source "https://rubygems.org" + +gem "github_changelog_generator", "1.14.3" diff --git a/pkgs/development/tools/github-changelog-generator/Gemfile.lock b/pkgs/development/tools/github-changelog-generator/Gemfile.lock new file mode 100644 index 00000000000..b1b955cba94 --- /dev/null +++ b/pkgs/development/tools/github-changelog-generator/Gemfile.lock @@ -0,0 +1,49 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (5.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + concurrent-ruby (1.1.4) + faraday (0.15.4) + multipart-post (>= 1.2, < 3) + faraday-http-cache (2.0.0) + faraday (~> 0.8) + github_changelog_generator (1.14.3) + activesupport + faraday-http-cache + multi_json + octokit (~> 4.6) + rainbow (>= 2.1) + rake (>= 10.0) + retriable (~> 2.1) + i18n (1.2.0) + concurrent-ruby (~> 1.0) + minitest (5.11.3) + multi_json (1.13.1) + multipart-post (2.0.0) + octokit (4.13.0) + sawyer (~> 0.8.0, >= 0.5.3) + public_suffix (3.0.3) + rainbow (3.0.0) + rake (12.3.2) + retriable (2.1.0) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) + thread_safe (0.3.6) + tzinfo (1.2.5) + thread_safe (~> 0.1) + +PLATFORMS + ruby + +DEPENDENCIES + github_changelog_generator (= 1.14.3) + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/development/tools/github-changelog-generator/default.nix b/pkgs/development/tools/github-changelog-generator/default.nix new file mode 100644 index 00000000000..9362ef3fe45 --- /dev/null +++ b/pkgs/development/tools/github-changelog-generator/default.nix @@ -0,0 +1,15 @@ +{ stdenv, lib, bundlerApp}: + +bundlerApp rec { + pname = "github_changelog_generator"; + gemdir = ./.; + exes = [ "github_changelog_generator" ]; + + meta = with lib; { + description = "Fully automated changelog generation - This gem generates a changelog file based on tags, issues and merged pull requests"; + homepage = https://github.com/github-changelog-generator/github-changelog-generator; + license = licenses.mit; + maintainers = with maintainers; [ Scriptkiddi ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/github-changelog-generator/gemset.nix b/pkgs/development/tools/github-changelog-generator/gemset.nix new file mode 100644 index 00000000000..3382557aaa5 --- /dev/null +++ b/pkgs/development/tools/github-changelog-generator/gemset.nix @@ -0,0 +1,155 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz"; + type = "gem"; + }; + version = "5.2.2"; + }; + addressable = { + dependencies = ["public_suffix"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + type = "gem"; + }; + version = "2.5.2"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1"; + type = "gem"; + }; + version = "1.1.4"; + }; + faraday = { + dependencies = ["multipart-post"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; + type = "gem"; + }; + version = "0.15.4"; + }; + faraday-http-cache = { + dependencies = ["faraday"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08j86fgcwl7z792qyijdsq680arzpfiydqd24ja405z2rbm7r2i0"; + type = "gem"; + }; + version = "2.0.0"; + }; + github_changelog_generator = { + dependencies = ["activesupport" "faraday-http-cache" "multi_json" "octokit" "rainbow" "rake" "retriable"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ylqfmc78i6jf42ydkyng0gzvsl5w80wr3rjkhd6q4kgi96n70lr"; + type = "gem"; + }; + version = "1.14.3"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr"; + type = "gem"; + }; + version = "1.2.0"; + }; + minitest = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; + type = "gem"; + }; + version = "5.11.3"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + type = "gem"; + }; + version = "1.13.1"; + }; + multipart-post = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + type = "gem"; + }; + version = "2.0.0"; + }; + octokit = { + dependencies = ["sawyer"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yh0yzzqg575ix3y2l2261b9ag82gv2v4f1wczdhcmfbxcz755x6"; + type = "gem"; + }; + version = "4.13.0"; + }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + type = "gem"; + }; + version = "3.0.3"; + }; + rainbow = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; + type = "gem"; + }; + version = "3.0.0"; + }; + rake = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; + type = "gem"; + }; + version = "12.3.2"; + }; + retriable = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1123kqmy3yk7k3vidvcwa46lknmhilv8axpaiag1wifa576hkqy1"; + type = "gem"; + }; + version = "2.1.0"; + }; + sawyer = { + dependencies = ["addressable" "faraday"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd"; + type = "gem"; + }; + version = "0.8.1"; + }; + thread_safe = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + type = "gem"; + }; + version = "1.2.5"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c60ba0002a7..06dbf7c0bd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -737,6 +737,8 @@ in git-fire = callPackage ../tools/misc/git-fire { }; + github-changelog-generator = callPackage ../development/tools/github-changelog-generator { }; + gitless = callPackage ../applications/version-management/gitless { }; gitter = callPackage ../applications/networking/instant-messengers/gitter { }; From f64bc036a55bb387b60c879bed89a54afd2c7a89 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Tue, 4 Dec 2018 19:00:18 +0000 Subject: [PATCH 164/219] nixos: add XDG sounds module --- nixos/modules/config/xdg/sounds.nix | 22 ++++++++++++++++++++++ nixos/modules/module-list.nix | 1 + 2 files changed, 23 insertions(+) create mode 100644 nixos/modules/config/xdg/sounds.nix diff --git a/nixos/modules/config/xdg/sounds.nix b/nixos/modules/config/xdg/sounds.nix new file mode 100644 index 00000000000..148240d631c --- /dev/null +++ b/nixos/modules/config/xdg/sounds.nix @@ -0,0 +1,22 @@ +{ config, lib, ... }: + +with lib; +{ + options = { + xdg.sounds.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to install files to support the + XDG Sound Theme specification. + ''; + }; + }; + + config = mkIf config.xdg.sounds.enable { + environment.pathsToLink = [ + "/share/sounds" + ]; + }; + +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 09ed55c0699..01eb766fb4d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -12,6 +12,7 @@ ./config/xdg/menus.nix ./config/xdg/mime.nix ./config/appstream.nix + ./config/xdg/sounds.nix ./config/gtk/gtk-icon-cache.nix ./config/gnu.nix ./config/i18n.nix From b4b67177b53c23c6fb77aea7f0bc5c559f8bebe5 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Mon, 17 Dec 2018 15:42:41 -0800 Subject: [PATCH 165/219] nixos/bash: Fix prompt regression in Emacs term mode --- nixos/modules/programs/bash/bash.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index 2b01c9d26c4..d22f9dfa319 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -98,7 +98,12 @@ in if [ "$TERM" != "dumb" -o -n "$INSIDE_EMACS" ]; then PROMPT_COLOR="1;31m" let $UID && PROMPT_COLOR="1;32m" - PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] " + if [ -n "$INSIDE_EMACS" ]; then + # Emacs term mode doesn't support xterm title escape sequence (\e]0;) + PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] " + else + PS1="\n\[\033[$PROMPT_COLOR\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] " + fi if test "$TERM" = "xterm"; then PS1="\[\033]2;\h:\u:\w\007\]$PS1" fi From 3380db94b1c04158bdc66944c4fa36d074aae157 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 2 Dec 2018 23:18:48 +0100 Subject: [PATCH 166/219] gtksourceviewmm: move from gnome3.gtksourceviewmm --- pkgs/desktops/gnome-3/default.nix | 4 +--- .../libraries}/gtksourceviewmm/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/{desktops/gnome-3/core => development/libraries}/gtksourceviewmm/default.nix (86%) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 626f4652ece..29b48873e72 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -36,7 +36,7 @@ lib.makeScope pkgs.newScope (self: with self; { ]; inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 - libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4 + libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda; @@ -155,8 +155,6 @@ lib.makeScope pkgs.newScope (self: with self; { gsound = callPackage ./core/gsound { }; - gtksourceviewmm = callPackage ./core/gtksourceviewmm { }; - gucharmap = callPackage ./core/gucharmap { }; gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix similarity index 86% rename from pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix rename to pkgs/development/libraries/gtksourceviewmm/default.nix index 6a0ee7fb56a..455cc4d4b81 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview, gnome3 }: +{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }: stdenv.mkDerivation rec { name = "gtksourceviewmm-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glibmm gtkmm gtksourceview ]; + buildInputs = [ glibmm gtkmm3 gtksourceview3 ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74be1ef73ec..32b56794c59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10221,6 +10221,8 @@ in gtksourceview4 = callPackage ../development/libraries/gtksourceview/4.x.nix { }; + gtksourceviewmm = callPackage ../development/libraries/gtksourceviewmm { }; + gtkspell2 = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; From 26785ae6facfc2b2e8ed79f35d521aa97deceb70 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 18 Dec 2018 01:52:07 +0100 Subject: [PATCH 167/219] gotop: 1.5.0 -> 1.7.1 --- pkgs/tools/system/gotop/default.nix | 6 +++-- pkgs/tools/system/gotop/deps.nix | 39 +++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/system/gotop/deps.nix diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 3aba05f7aef..2b918d15581 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "gotop-${version}"; - version = "1.5.0"; + version = "1.7.1"; goPackagePath = "github.com/cjbassi/gotop"; @@ -10,9 +10,11 @@ buildGoPackage rec { repo = "gotop"; owner = "cjbassi"; rev = version; - sha256 = "19kj7mziwkfcf9kkwph05jh5vlkfqpyrpxdk5gdf2swg07w1ld35"; + sha256 = "0dxnhal10kv6ypsg6mildzpz6vi1iw996q47f4rv8hvfyrffhzc9"; }; + goDeps = ./deps.nix; + meta = with stdenv.lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; homepage = https://github.com/cjbassi/gotop; diff --git a/pkgs/tools/system/gotop/deps.nix b/pkgs/tools/system/gotop/deps.nix new file mode 100644 index 00000000000..ceae7857551 --- /dev/null +++ b/pkgs/tools/system/gotop/deps.nix @@ -0,0 +1,39 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/cjbassi/termui"; + fetch = { + type = "git"; + url = "https://github.com/cjbassi/termui"; + rev = "e8dd23f6146c0e0d80f1be0163b8069abfbb921b"; + sha256 = "0jds2mpa7whrwaznlkcn2y92q41zbf2rjj5267kl8zqllbia8cbx"; + }; + } + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt-go"; + rev = "ee0de3bc6815ee19d4a46c7eb90f829db0e014b1"; + sha256 = "0hlra7rmi5pmd7d93rv56ahiy4qkgmq8a6mz0jpadvbi5qh8lq6j"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "51e6519305e4871657c291a6281fcddc6364bbef"; + sha256 = "1pvvaj51m0w2v6bp5hhhzfy27hbicf4ga7r9m073vqcwjnfyz431"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "9b800f95dbbc54abff0acf7ee32d88ba4e328c89"; + sha256 = "07v3l7q7y59cwvw0mc85i39v7qjcc1jh4svwi789rmrqqm5nq7q6"; + }; + } +] From 113a6b9325b92d483e6c2f12c35c2887ab175a8d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 17 Sep 2018 23:08:43 +0200 Subject: [PATCH 168/219] nixos/testing: disallow special chars in machine names in network expressions These names are referenced by Perl variables inside the testing frameworks which don't allow chars like `-` as character inside. An exemplary expression may look like this: ``` { x11-vm = { services.xserver.enable = true; }; } ``` This expression evaluates, e.g. when running `nixos-build-vms`, but when trying to run `./result/bin/nixos-run-vms`, an error like this occurs: ``` starting VDE switch for network 1 running the VM test script error: Can't modify subtraction (-) in scalar assignment at (eval 17) line 1, at EOF Bareword "test" not allowed while "strict subs" in use at (eval 17) line 1. Can't modify subtraction (-) in scalar assignment at (eval 17) line 1, at EOF Bareword "test" not allowed while "strict subs" in use at (eval 17) line 1. vde_switch: EOF on stdin, cleaning up and exiting cleaning up ``` This can be very confusing for beginners, this change breaks evaluation if such names are used for machines. --- nixos/lib/testing.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 42a0c60c7e1..3fb691409a0 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -149,9 +149,23 @@ in rec { test = passMeta (runTests driver); report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; }); - in (if makeCoverageReport then report else test) // { - inherit nodes driver test; - }; + nodeNames = builtins.attrNames nodes; + invalidNodeNames = lib.filter + (node: builtins.match "^[A-z_][A-z0-9_]+$" node == null) nodeNames; + + in + if lib.length invalidNodeNames > 0 then + throw '' + Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! + All machines are references as perl variables in the testing framework which will break the + script when special characters are allowed. + + Please stick to alphanumeric chars and underscores as separation. + '' + else + (if makeCoverageReport then report else test) // { + inherit nodes driver test; + }; runInMachine = { drv From fb66e2d7926eae8765b3dbbf11b385112174198b Mon Sep 17 00:00:00 2001 From: Stephen Date: Mon, 17 Dec 2018 18:49:54 -0800 Subject: [PATCH 169/219] terraform_0_11: 0.11.10 -> 0.11.11 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 8c97186b59a..dd0fe0a3eb1 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -88,8 +88,8 @@ let plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"]; in rec { terraform_0_11 = pluggable (generic { - version = "0.11.10"; - sha256 = "08mapla89g106bvqr41zfd7l4ki55by6207qlxq9caiha54nx4nb"; + version = "0.11.11"; + sha256 = "1hsi5sibs0fk1620wzzxrc1gqjs6slqrjvlqcgvgg1yl22q9g7f5"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From b4593b462985e445024bb375166b8f4f838a08eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 18 Dec 2018 03:55:02 +0100 Subject: [PATCH 170/219] buildGoPackage: also support pname Following python-modules and stdenv.mkDerivation. Hopefully zero rebuilds. Motivation: https://github.com/NixOS/nixpkgs/pull/52409 --- .../go-modules/generic/default.nix | 281 +++++++++--------- 1 file changed, 142 insertions(+), 139 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 6af5f72f2b7..b282a49e8af 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,7 +1,10 @@ { go, govers, lib, fetchgit, fetchhg, fetchbzr, rsync , removeReferencesTo, fetchFromGitHub, stdenv }: -{ name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? "" +{ buildInputs ? [] +, nativeBuildInputs ? [] +, passthru ? {} +, preFixup ? "" , shellHook ? "" # We want parallel builds by default @@ -34,7 +37,6 @@ , meta ? {}, ... } @ args': -if disabled then throw "${name} not supported for go ${go.meta.branch}" else with builtins; @@ -72,170 +74,171 @@ let goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs else extraSrcs; -in + package = go.stdenv.mkDerivation ( + (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // { -go.stdenv.mkDerivation ( - (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // { + nativeBuildInputs = [ removeReferencesTo go ] + ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; + buildInputs = buildInputs; - inherit name; - nativeBuildInputs = [ removeReferencesTo go ] - ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; - buildInputs = buildInputs; + inherit (go) GOOS GOARCH; - inherit (go) GOOS GOARCH; + configurePhase = args.configurePhase or '' + runHook preConfigure - configurePhase = args.configurePhase or '' - runHook preConfigure + # Extract the source + cd "$NIX_BUILD_TOP" + mkdir -p "go/src/$(dirname "$goPackagePath")" + mv "$sourceRoot" "go/src/$goPackagePath" - # Extract the source - cd "$NIX_BUILD_TOP" - mkdir -p "go/src/$(dirname "$goPackagePath")" - mv "$sourceRoot" "go/src/$goPackagePath" + '' + lib.flip lib.concatMapStrings goPath ({ src, goPackagePath }: '' + mkdir goPath + (cd goPath; unpackFile "${src}") + mkdir -p "go/src/$(dirname "${goPackagePath}")" + chmod -R u+w goPath/* + mv goPath/* "go/src/${goPackagePath}" + rmdir goPath - '' + lib.flip lib.concatMapStrings goPath ({ src, goPackagePath }: '' - mkdir goPath - (cd goPath; unpackFile "${src}") - mkdir -p "go/src/$(dirname "${goPackagePath}")" - chmod -R u+w goPath/* - mv goPath/* "go/src/${goPackagePath}" - rmdir goPath + '') + (lib.optionalString (extraSrcPaths != []) '' + ${rsync}/bin/rsync -a ${lib.concatMapStringsSep " " (p: "${p}/src") extraSrcPaths} go - '') + (lib.optionalString (extraSrcPaths != []) '' - ${rsync}/bin/rsync -a ${lib.concatMapStringsSep " " (p: "${p}/src") extraSrcPaths} go + '') + '' + export GOPATH=$NIX_BUILD_TOP/go:$GOPATH + export GOCACHE=$TMPDIR/go-cache - '') + '' - export GOPATH=$NIX_BUILD_TOP/go:$GOPATH - export GOCACHE=$TMPDIR/go-cache + runHook postConfigure + ''; - runHook postConfigure - ''; + renameImports = args.renameImports or ( + let + inputsWithAliases = lib.filter (x: x ? goPackageAliases) + (buildInputs ++ (args.propagatedBuildInputs or [ ])); + rename = to: from: "echo Renaming '${from}' to '${to}'; govers -d -m ${from} ${to}"; + renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases; + in lib.concatMapStringsSep "\n" renames inputsWithAliases); - renameImports = args.renameImports or ( - let - inputsWithAliases = lib.filter (x: x ? goPackageAliases) - (buildInputs ++ (args.propagatedBuildInputs or [ ])); - rename = to: from: "echo Renaming '${from}' to '${to}'; govers -d -m ${from} ${to}"; - renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases; - in lib.concatMapStringsSep "\n" renames inputsWithAliases); + buildPhase = args.buildPhase or '' + runHook preBuild - buildPhase = args.buildPhase or '' - runHook preBuild + runHook renameImports - runHook renameImports - - buildGoDir() { - local d; local cmd; - cmd="$1" - d="$2" - . $TMPDIR/buildFlagsArray - echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 - [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 - local OUT - if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then - if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then - echo "$OUT" >&2 - return 1 + buildGoDir() { + local d; local cmd; + cmd="$1" + d="$2" + . $TMPDIR/buildFlagsArray + echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 + [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 + local OUT + if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then + if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then + echo "$OUT" >&2 + return 1 + fi fi - fi - if [ -n "$OUT" ]; then - echo "$OUT" >&2 - fi - return 0 - } + if [ -n "$OUT" ]; then + echo "$OUT" >&2 + fi + return 0 + } - getGoDirs() { - local type; - type="$1" - if [ -n "$subPackages" ]; then - echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g" + getGoDirs() { + local type; + type="$1" + if [ -n "$subPackages" ]; then + echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g" + else + pushd "$NIX_BUILD_TOP/go/src" >/dev/null + find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq + popd >/dev/null + fi + } + + if (( "''${NIX_DEBUG:-0}" >= 1 )); then + buildFlagsArray+=(-x) + fi + + if [ ''${#buildFlagsArray[@]} -ne 0 ]; then + declare -p buildFlagsArray > $TMPDIR/buildFlagsArray else - pushd "$NIX_BUILD_TOP/go/src" >/dev/null - find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq - popd >/dev/null + touch $TMPDIR/buildFlagsArray fi - } - - if (( "''${NIX_DEBUG:-0}" >= 1 )); then - buildFlagsArray+=(-x) - fi - - if [ ''${#buildFlagsArray[@]} -ne 0 ]; then - declare -p buildFlagsArray > $TMPDIR/buildFlagsArray - else - touch $TMPDIR/buildFlagsArray - fi - export -f buildGoDir # xargs needs to see the function - if [ -z "$enableParallelBuilding" ]; then - export NIX_BUILD_CORES=1 - fi - getGoDirs "" | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir install "$@"' -- - '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - # normalize cross-compiled builds w.r.t. native builds - ( - dir=$NIX_BUILD_TOP/go/bin/${go.GOOS}_${go.GOARCH} - if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then - mv $dir/* $dir/.. + export -f buildGoDir # xargs needs to see the function + if [ -z "$enableParallelBuilding" ]; then + export NIX_BUILD_CORES=1 fi - if [[ -d $dir ]]; then - rmdir $dir - fi - ) - '' + '' - runHook postBuild - ''; + getGoDirs "" | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir install "$@"' -- + '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + # normalize cross-compiled builds w.r.t. native builds + ( + dir=$NIX_BUILD_TOP/go/bin/${go.GOOS}_${go.GOARCH} + if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then + mv $dir/* $dir/.. + fi + if [[ -d $dir ]]; then + rmdir $dir + fi + ) + '' + '' + runHook postBuild + ''; - doCheck = args.doCheck or false; - checkPhase = args.checkPhase or '' - runHook preCheck + doCheck = args.doCheck or false; + checkPhase = args.checkPhase or '' + runHook preCheck - getGoDirs test | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir test "$@"' -- + getGoDirs test | xargs -n1 -P $NIX_BUILD_CORES bash -c 'buildGoDir test "$@"' -- - runHook postCheck - ''; + runHook postCheck + ''; - installPhase = args.installPhase or '' - runHook preInstall + installPhase = args.installPhase or '' + runHook preInstall - mkdir -p $bin - dir="$NIX_BUILD_TOP/go/bin" - [ -e "$dir" ] && cp -r $dir $bin + mkdir -p $bin + dir="$NIX_BUILD_TOP/go/bin" + [ -e "$dir" ] && cp -r $dir $bin - runHook postInstall - ''; + runHook postInstall + ''; - preFixup = preFixup + '' - find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true - ''; + preFixup = preFixup + '' + find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + ''; - shellHook = '' - d=$(mktemp -d "--suffix=-$name") - '' + toString (map (dep: '' - mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")" - ln -s "${dep.src}" "$d/src/${dep.goPackagePath}" - '' - ) goPath) + '' - export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)} - '' + shellHook; + shellHook = '' + d=$(mktemp -d "--suffix=-$name") + '' + toString (map (dep: '' + mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")" + ln -s "${dep.src}" "$d/src/${dep.goPackagePath}" + '' + ) goPath) + '' + export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)} + '' + shellHook; - disallowedReferences = lib.optional (!allowGoReference) go - ++ lib.optional (!dontRenameImports) govers; + disallowedReferences = lib.optional (!allowGoReference) go + ++ lib.optional (!dontRenameImports) govers; - passthru = passthru // - { inherit go; } // - lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; }; + passthru = passthru // + { inherit go; } // + lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; }; - enableParallelBuilding = enableParallelBuilding; + enableParallelBuilding = enableParallelBuilding; - # I prefer to call this dev but propagatedBuildInputs expects $out to exist - outputs = args.outputs or [ "bin" "out" ]; + # I prefer to call this dev but propagatedBuildInputs expects $out to exist + outputs = args.outputs or [ "bin" "out" ]; - meta = { - # Add default meta information - homepage = "https://${goPackagePath}"; - platforms = go.meta.platforms or lib.platforms.all; - } // meta // { - # add an extra maintainer to every package - maintainers = (meta.maintainers or []) ++ - [ lib.maintainers.ehmry lib.maintainers.lethalman ]; - }; -}) + meta = { + # Add default meta information + homepage = "https://${goPackagePath}"; + platforms = go.meta.platforms or lib.platforms.all; + } // meta // { + # add an extra maintainer to every package + maintainers = (meta.maintainers or []) ++ + [ lib.maintainers.ehmry lib.maintainers.lethalman ]; + }; + }); +in if disabled then + throw "${package.name} not supported for go ${go.meta.branch}" +else + package From 7b884b68077f3c2a48595dc093aa0cd4d60e2597 Mon Sep 17 00:00:00 2001 From: Stephen Date: Mon, 17 Dec 2018 18:59:30 -0800 Subject: [PATCH 171/219] terraform-providers: bump versions --- .../cluster/terraform-providers/data.nix | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index a69229735f8..3b22aa3b04d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -39,15 +39,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.51.0"; - sha256 = "1hx4zbmwcbaslq2pj01m3y8b44gipw9gg235jsv7454nrd3jhvhg"; + version = "1.52.0"; + sha256 = "037n26spp49r4b4f6cyv6d3sgqw2d80g97fqgz1j0hcwi0am56h1"; }; azurerm = { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.19.0"; - sha256 = "1b07g90vmdvlfyz2q40sjd14xnbjyf9c7hgg7rzyhnkfi7imjbbf"; + version = "1.20.0"; + sha256 = "0hfq5gk4bhmw65x1rsdpwv0massgr1sczvcbyh572qlkkhvm59xd"; }; azurestack = { @@ -144,8 +144,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-digitalocean"; - version = "1.0.2"; - sha256 = "0ilkdnadzsidq8hia5wk4jyk6034pmajrpkgwf4ryz7kx41vy2g6"; + version = "1.1.0"; + sha256 = "1w5xslm8939rz13bsiv9hfcl8cyvi03gr0h24c0ybwj8alxmxhb4"; }; dme = { @@ -221,8 +221,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "1.19.1"; - sha256 = "1n2a1y9103xkndmvr5cvj7i1m8s9lv61vgijgk3m2f73pb4znak0"; + version = "1.20.0"; + sha256 = "1brkq4iz140miai6gzvzxfl28qi4j8gcc22igd7cb4qzafnlbxaj"; }; grafana = { @@ -242,15 +242,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-helm"; - version = "0.6.2"; - sha256 = "11j4lpzbrdszgkjf1gjyibh9c5w0fly01qdkrflv98ry5csx9q5b"; + version = "0.7.0"; + sha256 = "172l5cpl6vfdz75s3s60iqcavi5m66gwbrm7aw47hby8lv5ivflc"; }; heroku = { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "1.6.0"; - sha256 = "0byz9prx2x3nz9dl65mjnp0f33in62am35kcsza3538jcvymkhk2"; + version = "1.7.0"; + sha256 = "0zk5w4xwbg631m7592gfmdbsmrr0r7vla5nd1p5frh6szg6psy6m"; }; http = { @@ -396,8 +396,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - version = "3.9.0"; - sha256 = "1mm6q9crn2izx1il6fk3mhi9is1zrrsy7rnldcj05bzyywnq3r97"; + version = "3.10.0"; + sha256 = "0dhz3y62dp66jkn0q4x7v2cnqw8kiq34sgyfx8mw706hg9sdqb0l"; }; oneandone = { @@ -410,8 +410,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-opc"; - version = "1.3.0"; - sha256 = "1ksqjfp6gxgrpc9gcs9jv3wj5058z93h7prv4mhvc2bilal4gc0p"; + version = "1.3.1"; + sha256 = "0rpkhaja6vq1y1xah136vjlp1d5v9adymq300ajssbjkqf93wzs6"; }; openstack = { @@ -424,8 +424,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - version = "1.3.0"; - sha256 = "07rmav271wgjp1sby88s2ghh8w5hnkdy6rsc8pj69zy332i7n6wk"; + version = "1.4.0"; + sha256 = "0dv756npyhadzr08zlv28ghazaj1fdp3avcld7y6ri99hamncm95"; }; opsgenie = { @@ -438,8 +438,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oraclepaas"; - version = "1.3.2"; - sha256 = "138522cidaiy2akqqblik3w6qnx8zgn70ih7am1sxn13vqm1vlhb"; + version = "1.4.0"; + sha256 = "1hhkijxnwmm21b0w9qc3lk5vfcg0ac0sg7v4g0ffjqv68mssrz6x"; }; ovh = { @@ -599,8 +599,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-tfe"; - version = "0.4.0"; - sha256 = "02qvxc4ljb6s8bkw521wdsxhp53pmk7sbk3dyjbrwpz9xdg8dscn"; + version = "0.5.0"; + sha256 = "1acmmsb4nj3l4d7zlzjrh97nhrkgm99wlazjrfavxwly253ck283"; }; tls = { @@ -627,8 +627,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "1.3.1"; - sha256 = "1rhwq45g6jggmxf953w5lckqzngdr15g5ncwwl2mjhz2xakn44lh"; + version = "1.4.1"; + sha256 = "1nkhcgd2y7wyi179l2znjpakmjjcxarwc9j5mb7r191p2m27k27s"; }; vcd = { From 87c5f36e6828f9e4fe140a76718b14356429991f Mon Sep 17 00:00:00 2001 From: pacien Date: Tue, 18 Dec 2018 05:57:15 +0100 Subject: [PATCH 172/219] wego: 20160407-81d72ff -> 20170403-415efdf --- pkgs/applications/misc/wego/default.nix | 6 +++--- pkgs/applications/misc/wego/deps.nix | 21 +++++++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 7a09a804577..a3d3ace009e 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "wego-${version}"; - version = "20160407-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "81d72ffd761f032fbd73dba4f94bd94c8c2d53d5"; + version = "20170403-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "415efdfab5d5ee68300bf261a0c6f630c6c2584c"; goPackagePath = "github.com/schachmat/wego"; src = fetchgit { inherit rev; url = "https://github.com/schachmat/wego"; - sha256 = "14p3hvv82bsxqnbnzz8hjv75i39kzg154a132n6cdxx3vgw76gck"; + sha256 = "0w8sypwg0s2mvhk9cdibqr8bz5ipiiacs60a39sdswrpc4z486hg"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/wego/deps.nix b/pkgs/applications/misc/wego/deps.nix index 408b3908d8f..74ab69a30e1 100644 --- a/pkgs/applications/misc/wego/deps.nix +++ b/pkgs/applications/misc/wego/deps.nix @@ -1,11 +1,20 @@ [ + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } { goPackagePath = "github.com/mattn/go-runewidth"; fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "d6bea18f789704b5f83375793155289da36a3c7f"; - sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + rev = "v0.0.4"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; }; } { @@ -13,8 +22,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-colorable"; - rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe"; - sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; }; } { @@ -22,8 +31,8 @@ fetch = { type = "git"; url = "https://github.com/schachmat/ingo"; - rev = "fab41e4e62cbef5d92998746ec25f7e195100f38"; - sha256 = "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb"; + rev = "a4bdc0729a3fda62cc4069b6e490fc657fd54e33"; + sha256 = "1gw0kddy7jh3467imsqni86cf9yq7k6vpfc0ywkbwj0zsjsdgd49"; }; } ] From 7112cd88220dd53b95e8a5a43248f33328be357d Mon Sep 17 00:00:00 2001 From: Lana Black Date: Mon, 24 Sep 2018 19:40:45 +0000 Subject: [PATCH 173/219] nixos/hardware/bladeRF: init at 2.0.2 This allows to easily enable bladerf-related udev rules with nixos configuration. --- nixos/modules/hardware/bladeRF.nix | 28 +++++++++++++++++++ nixos/modules/module-list.nix | 1 + .../libraries/libbladeRF/default.nix | 14 ++++++++-- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 nixos/modules/hardware/bladeRF.nix diff --git a/nixos/modules/hardware/bladeRF.nix b/nixos/modules/hardware/bladeRF.nix new file mode 100644 index 00000000000..92544347714 --- /dev/null +++ b/nixos/modules/hardware/bladeRF.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.hardware.bladeRF; + +in + +{ + options.hardware.bladeRF = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables udev rules for BladeRF devices. By default grants access + to users in the "bladerf" group. You may want to install the + libbladeRF package. + ''; + }; + + }; + + config = mkIf cfg.enable { + services.udev.packages = [ pkgs.libbladeRF ]; + users.groups.bladerf = {}; + }; +} \ No newline at end of file diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1a8f522a969..aba2b3b562c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -33,6 +33,7 @@ ./config/vpnc.nix ./config/zram.nix ./hardware/all-firmware.nix + ./hardware/bladeRF.nix ./hardware/brightnessctl.nix ./hardware/ckb.nix ./hardware/cpu/amd-microcode.nix diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index ac8de886fad..45f24fc5fac 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: stdenv.mkDerivation rec { @@ -21,8 +21,17 @@ stdenv.mkDerivation rec { # Fixup shebang prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; + # Fixes macos and freebsd compilation issue. + # https://github.com/Nuand/bladeRF/commit/0cb4ea888543b2dc75b876f7024e180854fbe9c3 + patches = [ (fetchpatch { + name = "fix-OSX-and-FreeBSD-build.patch"; + url = "https://github.com/Nuand/bladeRF/commit/0cb4ea88.diff"; + sha256 = "1ccpa69vz2nlpdnxprh4rd1pgphk82z5lfmbrfdkn7srw6nxl469"; + }) + ]; + # Let us avoid nettools as a dependency. - patchPhase = '' + postPatch = '' sed -i 's/$(hostname)/hostname/' host/utilities/bladeRF-cli/src/cmd/doc/generate.bash ''; @@ -31,6 +40,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ "-DUDEV_RULES_PATH=etc/udev/rules.d" "-DINSTALL_UDEV_RULES=ON" + "-DBLADERF_GROUP=bladerf" ]; hardeningDisable = [ "fortify" ]; From 6bdcc10767dd0c3c96ad1a3c24b4bae38bea3fe1 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 18 Dec 2018 09:30:32 +0100 Subject: [PATCH 174/219] fluidsynth: keep version This avoids a mass-rebuild for packages which depend on fluidsynth 2.x. --- pkgs/applications/audio/fluidsynth/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 8727c49398e..d40544a0fa4 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -21,6 +21,7 @@ with versionMap.${version}; stdenv.mkDerivation rec { name = "fluidsynth-${fluidsynthVersion}"; + version = fluidsynthVersion; src = fetchFromGitHub { owner = "FluidSynth"; From a532c6318ac2ad112f9c9ac9f6c5455db0633c9f Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 18 Dec 2018 09:46:15 +0100 Subject: [PATCH 175/219] csound: document temp dependency on fluidsynth 1 --- pkgs/applications/audio/csound/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index da3cff0bac2..450ece6a12f 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { name = "csound-${version}"; + # When updating, please check if https://github.com/csound/csound/issues/1078 + # has been fixed in the new version so we can use the normal fluidsynth + # version and remove fluidsynth 1.x from nixpkgs again. version = "6.12.0"; enableParallelBuilding = true; From 53a7d5ec99ca2df635b16ce4236af60ac19a01b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 Dec 2018 03:28:01 -0800 Subject: [PATCH 176/219] squirrel-sql: 3.8.1 -> 3.9.0 * squirrel-sql: 3.8.1 -> 3.9.0 (#52029) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/squirrel-sql/versions * squirrel-sql: cleanup * squirrel-sql: don't pass stdenv as a build input --- .../tools/database/squirrel-sql/default.nix | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 7d4cf6ea5d5..548268bb762 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -5,29 +5,34 @@ , drivers ? [] }: let - version = "3.8.1"; + version = "3.9.0"; in stdenv.mkDerivation rec { name = "squirrel-sql-${version}"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "1vv38i4rwm8c8h0p9mmz21dyafd71pqprj7b8i5vx7f4q8xns2d2"; + sha256 = "0b16l7p7klagxnwkx2az4mbyd35kv4aj8xxbwm27pp3spz9dk8m0"; }; - buildInputs = [ - jre makeWrapper stdenv unzip - ]; + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ jre ]; unpackPhase = '' + runHook preUnpack unzip ${src} + runHook postUnpack ''; buildPhase = '' + runHook preBuild cd squirrelsql-${version}-standard chmod +x squirrel-sql.sh + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/share/squirrel-sql cp -r . $out/share/squirrel-sql @@ -47,6 +52,8 @@ in stdenv.mkDerivation rec { ln -s $out/share/squirrel-sql/icons/acorn.png \ $out/share/icons/hicolor/32x32/apps/squirrel-sql.png ln -s ${desktopItem}/share/applications $out/share + + runHook postInstall ''; desktopItem = makeDesktopItem { @@ -59,11 +66,11 @@ in stdenv.mkDerivation rec { icon = "squirrel-sql"; }; - meta = { + meta = with stdenv.lib; { description = "Universal SQL Client"; homepage = http://squirrel-sql.sourceforge.net/; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ khumba ]; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ khumba ]; }; } From 63576365fec31fa5defc1e58ac11fc8001dd6ade Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Dec 2018 12:50:07 +0100 Subject: [PATCH 177/219] python-osc: update to latest git snapshot --- pkgs/development/python-modules/osc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index 87bd6ee258c..7e620769759 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -11,14 +11,14 @@ buildPythonPackage { pname = "osc"; - version = "0.162.0-55-gb730f88"; - disabled = isPy3k; + version = "0.163.0-40-gb4b1ec7"; + disabled = isPy3k; # urlgrabber doesn't support python-3.x src = fetchFromGitHub { owner = "openSUSE"; repo = "osc"; - rev = "b730f880cfe85a8547f569355a21706f27ebfa78"; - sha256 = "0hh9j5zd2kc0804d2jmf1q3w5xm9l9s69hhgysbncrv5fw0414lh"; + rev = "b4b1ec7b64d4f9bb42f140754519221b810e232c"; + sha256 = "01z1b15x9vzhd7j94f6n3g50h5br7lwz86akgic0wpp41zv37jad"; }; buildInputs = [ pkgs.bashInteractive ]; # needed for bash-completion helper From f09d369fa5fdc99bf84aeda196449876fa6c7165 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 18 Dec 2018 13:10:41 +0100 Subject: [PATCH 178/219] soapybladerf: 0.3.5 -> 0.4.0 resolves compatability issue with libbladerf-2.0.2 --- pkgs/applications/misc/soapybladerf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/soapybladerf/default.nix b/pkgs/applications/misc/soapybladerf/default.nix index 4e1adc32946..bab829e05e3 100644 --- a/pkgs/applications/misc/soapybladerf/default.nix +++ b/pkgs/applications/misc/soapybladerf/default.nix @@ -3,7 +3,7 @@ } : let - version = "0.3.5"; + version = "0.4.0"; in stdenv.mkDerivation { name = "soapybladerf-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "pothosware"; repo = "SoapyBladeRF"; rev = "soapy-bladerf-${version}"; - sha256 = "1n7vy6y8k1smq3l729npxbhxbnrc79gz06dxkibsihz4k8sddkrg"; + sha256 = "1gf1azfydw033nlg2bgs9cbsbp9npjdrgjwlsffn0d9x0qbgxjqp"; }; nativeBuildInputs = [ cmake pkgconfig ]; From 685c4f56083272594a53143c19c08906961c4b23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Delgado=20Kr=C3=A4mer?= Date: Mon, 17 Dec 2018 19:11:40 +0100 Subject: [PATCH 179/219] nixos/oh-my-zsh: fix wrong manual information Manual still refers to 'programs.ohMyZsh' although it should be 'programs.zsh.ohMyZsh'. --- nixos/modules/programs/zsh/oh-my-zsh.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/zsh/oh-my-zsh.xml b/nixos/modules/programs/zsh/oh-my-zsh.xml index 5cf690c1a56..b26980daf06 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.xml +++ b/nixos/modules/programs/zsh/oh-my-zsh.xml @@ -19,7 +19,7 @@ configuration format of oh-my-zsh. { - programs.ohMyZsh = { + programs.zsh.ohMyZsh = { enable = true; plugins = [ "git" "python" "man" ]; theme = "agnoster"; @@ -51,7 +51,7 @@ The module can do this as well: { - programs.ohMyZsh.custom = "~/path/to/custom/scripts"; + programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts"; } @@ -73,7 +73,7 @@ { pkgs, ... }: { - programs.ohMyZsh.customPkgs = with pkgs; [ + programs.zsh.ohMyZsh.customPkgs = with pkgs; [ pkgs.nix-zsh-completions # and even more... ]; @@ -87,7 +87,7 @@ Please keep in mind that this is not compatible with - programs.ohMyZsh.custom as it requires an immutable store + programs.zsh.ohMyZsh.custom as it requires an immutable store path while custom shall remain mutable! An evaluation failure will be thrown if both custom and customPkgs are set. From db558b31b9af9db59a8000c85c21057c88efcc25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Dec 2018 14:44:37 +0100 Subject: [PATCH 180/219] python3.pkgs.git-annex-adapter: 0.2.0 -> 0.2.1 --- .../git-annex-adapter/default.nix | 38 ++----------------- .../not-a-git-repo-testcase.patch | 13 ------- 2 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index f4d690eedc3..d8fc12b1c42 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -4,16 +4,16 @@ buildPythonPackage rec { pname = "git-annex-adapter"; - version = "0.2.0"; + version = "0.2.1"; disabled = !isPy3k; - # There is only a wheel on PyPI - build from source instead + # No tests in PyPI tarball src = fetchFromGitHub { owner = "alpernebbi"; repo = pname; rev = "v${version}"; - sha256 = "1sbgp4ivgw4m8nngrlb1f78xdnssh639c1khv4z98753w3sdsxdz"; + sha256 = "146q1jhcfc7f96ajkhjffskkljk2xzivs5ih5clb8qx0sh7mj097"; }; prePatch = '' @@ -22,38 +22,6 @@ buildPythonPackage rec { --replace "'git-annex'" "'${git-annex}/bin/git-annex'" ''; - patches = [ - # fixes the "not-a-git-repo" testcase where recent git versions expect a slightly different error. - ./not-a-git-repo-testcase.patch - - # fixes the testcase which parses the output of `git-annex info` where several - # new lines are displayed that broke the test. - (fetchpatch { - url = "https://github.com/Ma27/git-annex-adapter/commit/39cb6da69c1aec3d57ea9f68c2dea5113ae1b764.patch"; - sha256 = "0wyy2icqan3jpiw7dm50arfq3mgq4b5s3g91k82srap763r9hg5m"; - }) - - # fixes the testcase which runs "git status" and complies with the - # slightly altered output. - (fetchpatch { - url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch"; - sha256 = "0yh66gial6bx7kbl7s7lkzljnkpgvgr8yahqqcq9z76d0w752dir"; - }) - - # fix test broken due to renaming of repository version 6 to 7 - (fetchpatch { - url = https://github.com/alpernebbi/git-annex-adapter/commit/a72efea02ec9b2ed9c7aad0b222056d72eb0c143.patch; - sha256 = "0nv9ms01jnwp3qzwsla4w8pcpakq5lh7c77xdbhiidbrx0n1p4q7"; - }) - ] ++ stdenv.lib.optionals stdenv.isDarwin [ - # `rev` is part of utillinux on NixOS which is not available on `nixpks` for darwin: - # https://logs.nix.ci/?key=nixos/nixpkgs.45061&attempt_id=271763ba-2ae7-4098-b469-b82b1d8edb9b - (fetchpatch { - url = "https://github.com/alpernebbi/git-annex-adapter/commit/0b60b4577528b309f6ac9d47b55a00dbda9850ea.patch"; - sha256 = "0z608hpmyzv1mm01dxr7d6bi1hc77h4yafghkynmv99ijgnm1qk7"; - }) - ]; - checkInputs = [ utillinux # `rev` is needed in tests/test_process.py ]; diff --git a/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch b/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch deleted file mode 100644 index 2a386ee3f2f..00000000000 --- a/pkgs/development/python-modules/git-annex-adapter/not-a-git-repo-testcase.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/test_process.py b/tests/test_process.py -index 493fc8f..feb1833 100644 ---- a/tests/test_process.py -+++ b/tests/test_process.py -@@ -126,7 +126,7 @@ class TestProcessOnEmptyDir(TempDirTestCase): - with self.assertRaises(subprocess.CalledProcessError) as cm: - runner('status', '-sb') - self.assertIn( -- "fatal: Not a git repository", -+ "fatal: not a git repository", - cm.exception.stderr, - ) - From fb227af6a079b5ec70e9996237d62850bdb59364 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 Dec 2018 06:11:23 -0800 Subject: [PATCH 181/219] subsonic: 6.1.3 -> 6.1.5 * subsonic: 6.1.3 -> 6.1.5 (#52019) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/subsonic/versions * subsonic: license is unfree Went closed-source since 6.0beta2 See: http://forum.subsonic.org/forum/viewtopic.php?f=4&t=16604#p71128 --- pkgs/servers/misc/subsonic/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix index f546b0b075e..50e754791e6 100644 --- a/pkgs/servers/misc/subsonic/default.nix +++ b/pkgs/servers/misc/subsonic/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, jre }: -let version = "6.1.3"; in - stdenv.mkDerivation rec { name = "subsonic-${version}"; - inherit version; + version = "6.1.5"; src = fetchurl { url = "mirror://sourceforge/subsonic/subsonic-${version}-standalone.tar.gz"; - sha256 = "1v21gfymaqcx6n6d88hvha60q9hgj5z1wsac5gcwq7cjah1893jx"; + sha256 = "1xz3flxd5hxcvvg1izzxpv5rxwb5zprk92vsgvmcniy7j7r66936"; }; inherit jre; @@ -16,20 +14,24 @@ stdenv.mkDerivation rec { # Create temporary directory to extract tarball into to satisfy Nix's need # for a directory to be created in the unpack phase. unpackPhase = '' + runHook preUnpack mkdir ${name} tar -C ${name} -xzf $src + runHook postUnpack ''; installPhase = '' + runHook preInstall mkdir $out cp -r ${name}/* $out + runHook postInstall ''; - meta = { + meta = with stdenv.lib; { homepage = http://subsonic.org; description = "Personal media streamer"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ telotortium ]; - platforms = with stdenv.lib.platforms; unix; + license = licenses.unfree; + maintainers = with maintainers; [ telotortium ]; + platforms = platforms.unix; }; phases = ["unpackPhase" "installPhase"]; From 4d1487908195d8c0975a3aca0b7a3a2dbf7301a8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 18 Dec 2018 09:11:56 -0500 Subject: [PATCH 182/219] linux: 4.4.167 -> 4.4.168 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 9ef3768332d..5005e5b1d84 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.167"; + version = "4.4.168"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pryjpih8js9640jhv74wzvka4199irnp7bzn33lyh35lll4rjik"; + sha256 = "0zhmhccwki1r7p99ap772p3bknl4hm6zfwvzk97nas42anqc0ylg"; }; } // (args.argsOverride or {})) From e60233db007a81eb846a39ca4a17db00d8d8cc26 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 Dec 2018 06:46:05 -0800 Subject: [PATCH 183/219] sundials: 3.2.1 -> 4.0.0 * sundials: 3.2.1 -> 4.0.0 (#52022) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/sundials/versions * sundials: cleanup --- pkgs/development/libraries/sundials/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index f3cfc1e56e8..2a5acc31382 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -3,23 +3,24 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "3.2.1"; + version = "4.0.0"; name = "${pname}-${version}"; src = fetchurl { - url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7"; + url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; + sha256 = "06cspmhx9qn7x722lmy9q2jr80hnnv2h7n54da7y5m951p1xfgcm"; }; preConfigure = '' export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$out -DEXAMPLES_INSTALL_PATH=$out/share/examples $cmakeFlags" ''; - buildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ python ]; meta = with stdenv.lib; { description = "Suite of nonlinear differential/algebraic equation solvers"; - homepage = https://computation.llnl.gov/casc/sundials/main.html; + homepage = https://computation.llnl.gov/projects/sundials; platforms = platforms.all; maintainers = [ maintainers.idontgetoutmuch ]; license = licenses.bsd3; From 3eb461dedb762289f3d5c9aa029cfc36a4b7f3c2 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 2 Dec 2018 11:11:38 -0500 Subject: [PATCH 184/219] pagmo2: 2.8 -> 2.9 fix broken package corrects the library nlopt location as well. --- pkgs/development/libraries/pagmo2/default.nix | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/pagmo2/default.nix b/pkgs/development/libraries/pagmo2/default.nix index c680efa95f8..842fae5ea93 100644 --- a/pkgs/development/libraries/pagmo2/default.nix +++ b/pkgs/development/libraries/pagmo2/default.nix @@ -11,32 +11,34 @@ stdenv.mkDerivation rec { name = "pagmo2-${version}"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "esa"; repo = "pagmo2"; rev = "v${version}"; - sha256 = "1xwxamcn3fkwr62jn6bkanrwy0cvsksf75hfwx4fvl56awnbz41z"; + sha256 = "0al2i59m5qr83wz5n5408zvys0b3mc40rszf0l5b9a0gp1axj400"; }; - buildInputs = [ cmake eigen nlopt ipopt boost ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ eigen nlopt ipopt boost ]; - preBuild = '' - cp -r $src/* . - ''; + cmakeFlags = [ + "-DPAGMO_BUILD_TESTS=no" + "-DPAGMO_WITH_EIGEN3=yes" + "-DPAGMO_WITH_NLOPT=yes" + "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt.so" + "-DPAGMO_WITH_IPOPT=yes" + "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" + ]; - cmakeFlags = [ "-DPAGMO_BUILD_TESTS=no" - "-DPAGMO_WITH_EIGEN3=yes" "-DPAGMO_WITH_NLOPT=yes" - "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt_cxx.so" "-DPAGMO_WITH_IPOPT=yes" - "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" ]; - - # All but one test pass skip for now (tests also take about 30 min to compile) + # tests pass but take 30+ minutes doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = https://esa.github.io/pagmo2/; description = "Scientific library for massively parallel optimization"; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; + maintainers = [ maintainers.costrouc ]; }; } From de6b13db63d3ff3cbc53d4152e31bc742ddf0991 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 13 Dec 2018 12:32:19 -0500 Subject: [PATCH 185/219] liberationsansnarrow_binary: remove --- .../fonts/liberationsansnarrow/binary.nix | 22 ------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 23 deletions(-) delete mode 100644 pkgs/data/fonts/liberationsansnarrow/binary.nix diff --git a/pkgs/data/fonts/liberationsansnarrow/binary.nix b/pkgs/data/fonts/liberationsansnarrow/binary.nix deleted file mode 100644 index c7afc91af84..00000000000 --- a/pkgs/data/fonts/liberationsansnarrow/binary.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, liberationsansnarrow }: - -stdenv.mkDerivation rec { - version = "1.07.3"; - name = "liberationsansnarrow-${version}"; - src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; - sha256 = "0qkr7n97jmj4q85jr20nsf6n5b48j118l9hr88vijn22ikad4wsp"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - mkdir -p $out/share/fonts/truetype - cp -v $(find . -name '*Narrow*.ttf') $out/share/fonts/truetype - - mkdir -p "$out/doc/${name}" - cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true - ''; - - inherit (liberationsansnarrow) meta; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9be90a907ef..a24d8c84050 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15536,7 +15536,6 @@ in liberation_ttf = liberation_ttf_v2_binary; liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { }; - liberationsansnarrow_binary = callPackage ../data/fonts/liberationsansnarrow/binary.nix { }; liberastika = callPackage ../data/fonts/liberastika { }; From ec8d663d597204402a6deea6600a070870ecf2f7 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 13 Dec 2018 12:36:11 -0500 Subject: [PATCH 186/219] liberationsansnarrow: 1.07.3 -> 1.07.6, rename to liberation-sans-narrow Upstream also moved to github --- .../default.nix | 24 +++++++++---------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) rename pkgs/data/fonts/{liberationsansnarrow => liberation-sans-narrow}/default.nix (63%) diff --git a/pkgs/data/fonts/liberationsansnarrow/default.nix b/pkgs/data/fonts/liberation-sans-narrow/default.nix similarity index 63% rename from pkgs/data/fonts/liberationsansnarrow/default.nix rename to pkgs/data/fonts/liberation-sans-narrow/default.nix index 0027d44d9db..97a1ff70f49 100644 --- a/pkgs/data/fonts/liberationsansnarrow/default.nix +++ b/pkgs/data/fonts/liberation-sans-narrow/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchurl, fontforge, pythonPackages, python}: +{ stdenv, fetchFromGitHub, fontforge, pythonPackages, python }: stdenv.mkDerivation rec { - pname = "liberationsansnarrow"; - version = "1.07.3"; - name = "${pname}-${version}"; + pname = "liberation-sans-narrow"; + version = "1.07.6"; - src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; - sha256 = "0qkr7n97jmj4q85jr20nsf6n5b48j118l9hr88vijn22ikad4wsp"; + src = fetchFromGitHub { + owner = "liberationfonts"; + repo = pname; + rev = version; + sha256 = "1qw554jbdnqkg6pjjl4cqkgsalq3398kzvww2naw30vykcz752bm"; }; buildInputs = [ fontforge pythonPackages.fonttools python ]; @@ -16,8 +17,8 @@ stdenv.mkDerivation rec { mkdir -p $out/share/fonts/truetype cp -v $(find . -name '*Narrow*.ttf') $out/share/fonts/truetype - mkdir -p "$out/doc/${name}" - cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true + mkdir -p "$out/doc/${pname}-${version}" + cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${pname}-${version}" || true ''; meta = with stdenv.lib; { @@ -32,8 +33,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; - homepage = https://fedorahosted.org/liberation-fonts/; - maintainers = [ maintainers.leenaars - ]; + homepage = https://github.com/liberationfonts; + maintainers = [ maintainers.leenaars ]; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8d29370c876..b92c02e9fa4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -161,6 +161,7 @@ mapAliases ({ libcap_progs = libcap.out; # added 2016-04-29 libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 libdbusmenu-glib = libdbusmenu; # added 2018-05-01 + liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12 libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgumbo = gumbo; # added 2018-01-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a24d8c84050..4843d2e1a48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15535,7 +15535,7 @@ in liberation_ttf_v2_binary; liberation_ttf = liberation_ttf_v2_binary; - liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { }; + liberation-sans-narrow = callPackage ../data/fonts/liberation-sans-narrow { }; liberastika = callPackage ../data/fonts/liberastika { }; From b2c6efeaed7a5897de33dae7ab632b9b582f6a2f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 13 Dec 2018 12:54:38 -0500 Subject: [PATCH 187/219] liberation_ttf: drop binary packages That means the following attributes are gone: - liberation_ttf_v1_binary - liberation_ttf_v2_binary Because of this Libreoffice uses liberation source fonts I've renamed these attributes because the binary form is gone: - liberation_ttf_v1_from_source -> liberation_ttf_v1 - liberation_ttf_v2_from_source -> liberation_ttf_v2 They're aliases for these. --- .../fonts/redhat-liberation-fonts/default.nix | 18 ++---------------- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 13 ++++++------- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 88d438096c1..bd83e16b89c 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -49,21 +49,14 @@ let }; in { - liberation_ttf_v1_from_source = common rec { + liberation_ttf_v1 = common rec { version = "1.07.4"; url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d"; nativeBuildInputs = [ fontforge ]; outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p"; }; - liberation_ttf_v1_binary = common rec { - version = "1.07.4"; - url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; - sha256 = "0p7frz29pmjlk2d0j2zs5kfspygwdnpzxkb2hwzcfhrafjvf59v1"; - nativeBuildInputs = [ ]; - outputHash = "12gwb9b4ij9d93ky4c9ykgp03fqr62axy37pds88q7y6zgciwkab"; - }; - liberation_ttf_v2_from_source = common rec { + liberation_ttf_v2 = common rec { version = "2.00.1"; url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; @@ -75,11 +68,4 @@ in { ''; outputHash = "0nldgawm0a6lpn86w4w3rzx01ns3ph09ar1knq1g4jkxc8ci5rqn"; }; - liberation_ttf_v2_binary = common rec { - version = "2.00.1"; - url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz"; - sha256 = "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q"; - nativeBuildInputs = [ ]; - outputHash = "19jky9li345zsig9pcb0rnlsjqqclh7r60vbi4pwh16f14850gpk"; - }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b92c02e9fa4..8360bf44706 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -161,6 +161,8 @@ mapAliases ({ libcap_progs = libcap.out; # added 2016-04-29 libdbusmenu_qt5 = libsForQt5.libdbusmenu; # added 2015-12-19 libdbusmenu-glib = libdbusmenu; # added 2018-05-01 + liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12 + liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12 liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12 libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4843d2e1a48..0688b2853f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15529,11 +15529,10 @@ in league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; inherit (callPackages ../data/fonts/redhat-liberation-fonts { }) - liberation_ttf_v1_from_source - liberation_ttf_v1_binary - liberation_ttf_v2_from_source - liberation_ttf_v2_binary; - liberation_ttf = liberation_ttf_v2_binary; + liberation_ttf_v1 + liberation_ttf_v2 + ; + liberation_ttf = liberation_ttf_v2; liberation-sans-narrow = callPackage ../data/fonts/liberation-sans-narrow { }; @@ -17910,8 +17909,8 @@ in fontDirectories = [ carlito dejavu_fonts freefont_ttf xorg.fontmiscmisc - liberation_ttf_v1_binary - liberation_ttf_v2_binary + liberation_ttf_v1 + liberation_ttf_v2 ]; }; clucene_core = clucene_core_2; From 0adf200ad593273543c7be9ea9391bea56501ad9 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 13 Dec 2018 12:58:09 -0500 Subject: [PATCH 188/219] liberation_ttf: v1: 1.07.4 -> 1.07.5 v2: 2.00.1 -> 2.00.4 Upstream moved to github. Using fetchFromGitHub. --- .../fonts/redhat-liberation-fonts/default.nix | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index bd83e16b89c..0ee2a0c308c 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -1,14 +1,18 @@ -{stdenv, fetchurl, fontforge, python2}: +{ stdenv, fetchFromGitHub, fontforge, python3 }: let - inherit (python2.pkgs) fonttools; + inherit (python3.pkgs) fonttools; common = - {version, url, sha256, nativeBuildInputs, postPatch ? null, outputHash}: + { version, repo, sha256, nativeBuildInputs, postPatch ? null, outputHash }: stdenv.mkDerivation rec { - name = "liberation-fonts-${version}"; - src = fetchurl { - inherit url sha256; + pname = "liberation-fonts"; + inherit version; + + src = fetchFromGitHub { + owner = "liberationfonts"; + rev = version; + inherit repo sha256; }; inherit nativeBuildInputs postPatch; @@ -17,8 +21,8 @@ let mkdir -p $out/share/fonts/truetype cp -v $( find . -name '*.ttf') $out/share/fonts/truetype - mkdir -p "$out/share/doc/${name}" - cp -v AUTHORS ChangeLog COPYING License.txt README "$out/share/doc/${name}" || true + mkdir -p "$out/share/doc/${pname}-${version}" + cp -v AUTHORS ChangeLog COPYING License.txt README "$out/share/doc/${pname}-${version}" || true ''; outputHashAlgo = "sha256"; @@ -40,7 +44,7 @@ let ''; license = licenses.ofl; - homepage = https://pagure.io/liberation-fonts/; + homepage = https://github.com/liberationfonts; maintainers = [ maintainers.raskin ]; @@ -50,22 +54,22 @@ let in { liberation_ttf_v1 = common rec { - version = "1.07.4"; - url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; - sha256 = "01jlg88q2s6by7qv6fmnrlx0lwjarrjrpxv811zjz6f2im4vg65d"; + repo = "liberation-1.7-fonts"; + version = "1.07.5"; nativeBuildInputs = [ fontforge ]; - outputHash = "1q102rmg4004p74f8m4y8a6iklmnva0q39sq260jsq3lhcfypg7p"; + sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; + outputHash = "16jn17p22z2vip58aza2dfg1ri31ki6z3hsnmidfqfi7v8k83vq4"; }; liberation_ttf_v2 = common rec { - version = "2.00.1"; - url = "https://releases.pagure.org/liberation-fonts/liberation-fonts-${version}.tar.gz"; - sha256 = "1ymryvd2nw4jmw4w5y1i3ll2dn48rpkqzlsgv7994lk6qc9cdjvs"; + repo = "liberation-fonts"; + version = "2.00.4"; nativeBuildInputs = [ fontforge fonttools ]; postPatch = '' substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ 'font = ttLib.TTFont(fontfile)' \ 'font = ttLib.TTFont(fontfile, recalcTimestamp=False)' ''; - outputHash = "0nldgawm0a6lpn86w4w3rzx01ns3ph09ar1knq1g4jkxc8ci5rqn"; + sha256 = "14bn1zlhyr4qaz5z2sx4h115pnbd41ix1vky8fxm2lx76xrjjiaa"; + outputHash = "14c0c5n4vzd5y0hf9jkh48h12kkd8hlg94npbmv41j449g6wv6vn"; }; } From 19d077a157caabb65133e48fbd109e94932ffab3 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Sun, 2 Dec 2018 11:21:50 -0500 Subject: [PATCH 189/219] pythonPackages.pygmo: 2.8 -> 2.9 refactor fix broken package Introduce a `pagmo2WithPython` which overrides the pagmo2 expression and enables the pygmo build. Then hand it over to `buildPythonPackage` by making it the src to produce a usable package. --- .../python-modules/pygmo/default.nix | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index 2500121dc9e..30e4444f552 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , buildPythonPackage -, cmake , eigen , nlopt , ipopt @@ -11,38 +10,44 @@ , cloudpickle , ipyparallel , numba +, python }: -buildPythonPackage rec { - pname = "pygmo"; - version = "2.8"; - - src = fetchFromGitHub { - owner = "esa"; - repo = "pagmo2"; - rev = "v${version}"; - sha256 = "1xwxamcn3fkwr62jn6bkanrwy0cvsksf75hfwx4fvl56awnbz41z"; - }; - - buildInputs = [ cmake eigen nlopt ipopt boost pagmo2 ]; +let propagatedBuildInputs = [ numpy cloudpickle ipyparallel numba ]; - preBuild = '' - cp -v -r $src/* . - cmake -DCMAKE_INSTALL_PREFIX=$out -DPAGMO_BUILD_TESTS=no -DCMAKE_SYSTEM_NAME=Linux -DPagmo_DIR=${pagmo2} -DPAGMO_BUILD_PYGMO=yes -DPAGMO_BUILD_PAGMO=no -DPAGMO_WITH_EIGEN3=yes -DPAGMO_WITH_NLOPT=yes -DNLOPT_LIBRARY=${nlopt}/lib/libnlopt_cxx.so -DPAGMO_WITH_IPOPT=yes -DIPOPT=${ipopt} + pagmo2WithPython = pagmo2.overrideAttrs (oldAttrs: { + cmakeFlags = oldAttrs.cmakeFlags ++ [ + "-DPAGMO_BUILD_PYGMO=yes" + "-DPAGMO_BUILD_PAGMO=no" + "-DPagmo_DIR=${pagmo2}" + ]; + buildInputs = [ eigen nlopt ipopt boost pagmo2 ] ++ propagatedBuildInputs; + postInstall = '' + mv wheel $out + ''; + }); - make install - mv $out/lib/python*/site-packages/pygmo wheel +in buildPythonPackage rec { + pname = "pygmo"; + version = pagmo2WithPython.version; + + inherit propagatedBuildInputs; + + src = pagmo2WithPython; + + preBuild = '' + mv ${python.sitePackages}/pygmo wheel cd wheel ''; # dont do tests doCheck = false; - meta = { + meta = with lib; { description = "Parallel optimisation for Python"; homepage = https://esa.github.io/pagmo2/; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ costrouc ]; + license = licenses.gpl3Plus; + maintainers = [ maintainers.costrouc ]; }; } From 66a6445f6671bf55807ecdd61e99371b2a34a986 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Nov 2018 15:27:07 -0800 Subject: [PATCH 190/219] python36Packages.ase: 3.16.2 -> 3.17.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.6-ase/versions --- pkgs/development/python-modules/ase/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index 1f7b9419278..3a466170c77 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -1,5 +1,5 @@ { lib -, fetchurl +, fetchPypi , buildPythonPackage , numpy , scipy @@ -10,12 +10,12 @@ }: buildPythonPackage rec { - version = "3.16.2"; pname = "ase"; + version = "3.17.0"; - src = fetchurl { - url = "https://gitlab.com/${pname}/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "171j3f4a261cfnqjq98px5fldxql65i3jgf60wc945xvh0mbc8ds"; + src = fetchPypi { + inherit pname version; + sha256 = "1d4gxypaahby45zcpl0rffcn2z7n55dg9lcd8sv6jjsmbbf9vr4g"; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; @@ -27,10 +27,10 @@ buildPythonPackage rec { # tests just hang most likely due to something with subprocesses and cli doCheck = false; - meta = { + meta = with lib; { description = "Atomic Simulation Environment"; homepage = https://wiki.fysik.dtu.dk/ase/; - license = lib.licenses.lgpl21Plus; - maintainers = with lib.maintainers; [ costrouc ]; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ costrouc ]; }; } From f486f475e712750b91e9d97bf69c2f77dcfc2e65 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 22:45:13 -0800 Subject: [PATCH 191/219] notejot: 1.4.7 -> 1.5.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/notejot/versions --- pkgs/applications/misc/notejot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 7ad834f8172..a687e104605 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "notejot"; - version = "1.4.7"; + version = "1.5.2"; name = "${pname}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0mjig4y2rb6v2dyzya44mfz0dxgp5wnjs3kdavf9ha2jzjjr5xyb"; + sha256 = "17rqyckq7z5cxj3mbfrar1zzgwbzhrx87ps7mm6bf798hwflm9qk"; }; nativeBuildInputs = [ From c2cde10f3086ff389b136636f812193532abfa62 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 3 Dec 2018 08:15:57 -0600 Subject: [PATCH 192/219] vivid: init at 0.4.0 --- pkgs/tools/misc/vivid/default.nix | 33 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/misc/vivid/default.nix diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix new file mode 100644 index 00000000000..7b1abd80758 --- /dev/null +++ b/pkgs/tools/misc/vivid/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "${pname}-${version}"; + pname = "vivid"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = pname; + rev = "v${version}"; + sha256 = "13x0295v5blvv8dxhimbdjh81l7xl0vm6zni3qjd85psfn61371q"; + }; + + postPatch = '' + substituteInPlace src/main.rs --replace /usr/share $out/share + ''; + + cargoSha256 = "156wapa2ds7ij1jhrpa8mm6dicwq934qxl56sqw3bgz6pfa8fldz"; + + postInstall = '' + mkdir -p $out/share/${pname} + cp -rv config/* themes $out/share/${pname} + ''; + + meta = with stdenv.lib; { + description = "A generator for LS_COLORS with support for multiple color themes"; + homepage = https://github.com/sharkdp/vivid; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = [ maintainers.dtzWill ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73eaccda0ce..9cd79c98beb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22890,6 +22890,8 @@ in virglrenderer = callPackage ../development/libraries/virglrenderer { }; + vivid = callPackage ../tools/misc/vivid { }; + vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { }; wavegain = callPackage ../applications/audio/wavegain { }; From a375d4bfc35998aec36ee15b7c71d99a5b78fa2d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 18 Dec 2018 10:50:53 -0500 Subject: [PATCH 193/219] stdenv: shorten evaluation errors when in Hydra MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hydra's page showing evaluation errors is about a mile long, showing buckets of user-friendly errors, like this: in job ‘seyren.aarch64-linux’: Package ‘oraclejre-8u191’ in /nix/store/fa9zzkbljkvdavwzirkrr5irg25ymbjl-source/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix:71 has an unfree license (‘unfree’), refusing to evaluate. a) For `nixos-rebuild` you can set { nixpkgs.config.allowUnfree = true; } in configuration.nix to override this. b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add { allowUnfree = true; } to ~/.config/nixpkgs/config.nix. in job ‘jetbrains.webstorm.x86_64-linux’: Package ‘webstorm-2018.3.1’ in /nix/store/fa9zzkbljkvdavwzirkrr5irg25ymbjl-source/pkgs/applications/editors/jetbrains/default.nix:230 has an unfree license (‘unfree’), refusing to evaluate. a) For `nixos-rebuild` you can set { nixpkgs.config.allowUnfree = true; } in configuration.nix to override this. b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add { allowUnfree = true; } to ~/.config/nixpkgs/config.nix. This makes it extremely hard to find actual issues in the output. This patch set makes the output much more condensed in Hydra: Failed to evaluate nifticlib-2.0.0: «unsupported»: is not supported on ‘x86_64-apple-darwin’ Failed to evaluate dmd-2.081.2: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’ Failed to evaluate dmdBuild-2.081.2: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’ Failed to evaluate ldc-1.11.0: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’ Failed to evaluate ldcBuild-1.11.0: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’ Failed to evaluate ldc-0.17.5: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’ Failed to evaluate ldcBuild-0.17.5: «unsupported»: is not supported on ‘aarch64-unknown-linux-gnu’ --- pkgs/stdenv/generic/check-meta.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index d09dff10b27..fe0c8cfad91 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -4,6 +4,10 @@ { lib, config, hostPlatform, meta }: let + # If we're in hydra, we can dispense with the more verbose error + # messages and make problems easier to spot. + inHydra = config.inHydra or false; + # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426 # for why this defaults to false, but I (@copumpkin) want to default it to true soon. shouldCheckMeta = config.checkMeta or false; @@ -141,10 +145,12 @@ let handleEvalIssue = attrs: { reason , errormsg ? "" }: let - msg = '' - Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate. + msg = if inHydra + then "Failed to evaluate ${attrs.name or "«name-missing»"}: «${reason}»: ${errormsg}" + else '' + Package ‘${attrs.name or "«name-missing»"}’ in ${pos_str} ${errormsg}, refusing to evaluate. - '' + (builtins.getAttr reason remediation) attrs; + '' + (builtins.getAttr reason remediation) attrs; handler = if config ? "handleEvalIssue" then config.handleEvalIssue reason From d268e3b2c07b9e99ab02c6d3f3241d5182675a21 Mon Sep 17 00:00:00 2001 From: Member Betty <45791182+memberbetty@users.noreply.github.com> Date: Tue, 18 Dec 2018 12:03:10 +0100 Subject: [PATCH 194/219] aws-google-auth: use python3 (#52445) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0688b2853f9..2d84dc296ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -622,7 +622,7 @@ in aws-env = callPackage ../tools/admin/aws-env { }; - aws-google-auth = pythonPackages.callPackage ../tools/admin/aws-google-auth { }; + aws-google-auth = python3Packages.callPackage ../tools/admin/aws-google-auth { }; aws-okta = callPackage ../tools/security/aws-okta { }; From 050dad2901375c1d6a21d7c8c019ce47fd1a4edf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 16:42:24 -0800 Subject: [PATCH 195/219] polar-bookshelf: 1.1.0 -> 1.1.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/polar-bookshelf/versions --- pkgs/applications/misc/polar-bookshelf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index f1325a6c6ac..e889a8fd8cb 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "polar-bookshelf-${version}"; - version = "1.1.0"; + version = "1.1.1"; # fetching a .deb because there's no easy way to package this Electron app src = fetchurl { url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb"; - sha256 = "13h6c9sqbc7c5p1rc1wm7wza249sh0j04aq67n6gnqg5p22a7pmw"; + sha256 = "0i83vwylszx1ci381izzrmcwbqmknrpny4r3rb0xn3jbz27126zr"; }; buildInputs = [ From d8b5275d43e2517eda50490d1c245e22c5a4e741 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 16 Dec 2018 22:06:43 -0500 Subject: [PATCH 196/219] vscode-extensions.ms-python.python: 2018.11.0 -> 2018.12.1 --- pkgs/misc/vscode-extensions/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 6860a0d2ad0..65130da9095 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -20,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2018.11.0"; - sha256 = "0z9ca14qzy6zw0cfir7hdnhin01c1wsr6lbb2xp6rpq06vh7nivl"; + version = "2018.12.1"; + sha256 = "1cf3yll2hfililcwq6avscgi35caccv8m8fdsvzqdfrggn5h41h4"; }; postPatch = '' From 2e64abd82f8bb85393a2e62f5238f788e8af2744 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 23:21:19 -0800 Subject: [PATCH 197/219] focuswriter: 1.6.16 -> 1.7.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/focuswriter/versions --- pkgs/applications/editors/focuswriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 000797c9b70..2708c40d509 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "focuswriter-${version}"; - version = "1.6.16"; + version = "1.7.0"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "1warfv9d485a7ysmjazxw4zvi9l0ih1021s6c5adkc86m88k296m"; + sha256 = "0321wqhjfs020q113lgh959qq03zfamm72zk22mnqxf3ng3adc3g"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; From a32c2f99ee6bca60e8635457cfd832680bc2413b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 05:09:51 -0800 Subject: [PATCH 198/219] libraw: 0.19.0 -> 0.19.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libraw/versions --- pkgs/development/libraries/libraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index e009a9f920b..e08cf3fe7a8 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "0nfj7s7qmgfy1cl8s3ck7dxjvprfq5glfi6iidmvmy8r7gl52gz8"; + sha256 = "1xjyw4n9gfr2r637pjbpbi3h98h9mdjn61b0hsxwqynq2vdij452"; }; outputs = [ "out" "lib" "dev" "doc" ]; From 2cb1949548531334d469aadba6a1c502935da96c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 17 Dec 2018 20:18:19 -0600 Subject: [PATCH 199/219] polar-bookshelf: 1.1.1 -> 1.5.1 --- pkgs/applications/misc/polar-bookshelf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index e889a8fd8cb..bcff0db65ab 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "polar-bookshelf-${version}"; - version = "1.1.1"; + version = "1.5.1"; # fetching a .deb because there's no easy way to package this Electron app src = fetchurl { url = "https://github.com/burtonator/polar-bookshelf/releases/download/v${version}/polar-bookshelf-${version}-amd64.deb"; - sha256 = "0i83vwylszx1ci381izzrmcwbqmknrpny4r3rb0xn3jbz27126zr"; + sha256 = "1nnbybrzk1ms83490gbw5gakfim0j2c8gp83d9iaqwl4590qgwlg"; }; buildInputs = [ From 33fcf39a6e959b3f985b927b9f6a02b4766af218 Mon Sep 17 00:00:00 2001 From: Frank Lanitz Date: Tue, 18 Dec 2018 19:39:06 +0100 Subject: [PATCH 200/219] Geany: Taking over maintainership --- pkgs/applications/editors/geany/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index d1499fc2180..caead872eb2 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = https://www.geany.org/; license = licenses.gpl2; - maintainers = []; + maintainers = with maintainers; [ frlan ]; platforms = platforms.all; }; } From 6da82e7c35fa60d102cd6b0f6a4665531e93efae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 14:04:21 -0800 Subject: [PATCH 201/219] python37Packages.fonttools: 3.32.0 -> 3.33.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-fonttools/versions --- pkgs/development/python-modules/fonttools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 0cab6fc18a5..d435cae9419 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "fonttools"; - version = "3.32.0"; + version = "3.33.0"; src = fetchPypi { inherit pname version; - sha256 = "16cg5v50x905c0dr34wqk70b0n3mqzp41iir2rd73f31d1z9jndq"; + sha256 = "196yl6m3fycrbsclcmg550821j18ga6dpghmk5nb1xi4j4yb62gq"; extension = "zip"; }; From 96203f5fc3ab771d63fa2f01870a10a6783862b4 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 16 Dec 2018 22:08:16 -0500 Subject: [PATCH 202/219] wakatime: 10.2.1 -> 10.6.0 --- pkgs/tools/misc/wakatime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix index 6d71a407239..710c6c61c64 100644 --- a/pkgs/tools/misc/wakatime/default.nix +++ b/pkgs/tools/misc/wakatime/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { name = "wakatime-${version}"; - version = "10.2.1"; + version = "10.6.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime"; rev = version; - sha256 = "14b87x6pd80qdf2dxj9dd53k3a61i793cnrm4nqycn3d7vq2akqx"; + sha256 = "0g4zvy1ll30jg55ddpfqmlncqd0igg6kqy87j4izs1dpapk7a1ln"; }; # needs more dependencies from https://github.com/wakatime/wakatime/blob/191b302bfb5f272ae928c6d3867d06f3dfcba4a8/dev-requirements.txt From ceb89f042ebecf50331a68231016483f41d88e5f Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sun, 16 Dec 2018 22:07:42 -0500 Subject: [PATCH 203/219] vscode-extensions.WakaTime.vscode-wakatime: 1.2.4 -> 1.2.5 --- pkgs/misc/vscode-extensions/wakatime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/wakatime/default.nix b/pkgs/misc/vscode-extensions/wakatime/default.nix index 48e7c9268ee..084a1e01375 100644 --- a/pkgs/misc/vscode-extensions/wakatime/default.nix +++ b/pkgs/misc/vscode-extensions/wakatime/default.nix @@ -7,8 +7,8 @@ in mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "1.2.4"; - sha256 = "0qghn4kakv0jrjcl65p1v5r6j7608269zyhh75b15p12mdvi21vb"; + version = "1.2.5"; + sha256 = "011yx3pwqbcz5fmzani57k0axgh458r4ipqwbjlklnrwbrkjhzra"; }; postPatch = '' From 23859991e90acb8cbd111d8204e13030c1a77d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 18 Dec 2018 20:24:58 +0100 Subject: [PATCH 204/219] adoptopenjdk-bin: use python-withPackages for shebang Co-Authored-By: bennofs --- pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py index a410501de0a..66e1abd05e9 100755 --- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py +++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell --pure -i python3 -p python3 -p python3Packages.requests +#!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" import json import re From 43dd779a8d019a0667e3eed1346f83ffe2004e05 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 14 Dec 2018 13:22:30 +0100 Subject: [PATCH 205/219] radarr: 0.2.0.1120 -> 0.2.0.1217 --- pkgs/servers/radarr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 8d920af654d..62cb2d7f348 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.1120"; + version = "0.2.0.1217"; src = fetchurl { - url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "0vsjaza0k4djb3vnazl2py4qmbxqfyyr0x9p4flq78yn79hp3439"; + url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.v${version}.linux.tar.gz"; + sha256 = "09zzvfqpv58b79a906013pjq42qwbibf16rz24gnqg7wq7az83jy"; }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/{bin,share/${name}} @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A Usenet/BitTorrent movie downloader."; + description = "A Usenet/BitTorrent movie downloader"; homepage = https://radarr.video/; license = licenses.gpl3; maintainers = with maintainers; [ edwtjo ]; From 016d1a991d8d1ef284f0d0a97f82a75a28a5ef6e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 07:49:24 -0800 Subject: [PATCH 206/219] jackett: 0.10.471 -> 0.10.504 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/jackett/versions --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index b3328538496..41da87d4065 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jackett-${version}"; - version = "0.10.471"; + version = "0.10.504"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0la05akvpvfg9jdgfd39wnc87zi7axzx7499w9m3py7qqqyvgyin"; + sha256 = "1nqci6a9is0kf0vn8wlbfbynllf0pkndcb1z49d1n3wwc8dhji86"; }; buildInputs = [ makeWrapper ]; From f751f85b638611844f4d3e4476e2ccfeef53f713 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 02:41:03 -0800 Subject: [PATCH 207/219] shotcut: 18.10.08 -> 18.11.18 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/shotcut/versions --- pkgs/applications/video/shotcut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 0c9d9757584..877d1a7525f 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "18.10.08"; + version = "18.11.18"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1s2zic675f7rx61j839fn86bwckb4823j9krv1q7z4hsvbpiyj08"; + sha256 = "0yhrjqc5cby9vc81z5zh5xg34mvh6q8dd896p2izfcqcdhdz7cs3"; }; enableParallelBuilding = true; From 61b435d8665d3e1ee2029e95b9934aed76fe0ef1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 04:36:18 -0800 Subject: [PATCH 208/219] librelp: 1.2.18 -> 1.3.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/librelp/versions --- pkgs/development/libraries/librelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index e5d64c4143f..284b95b8a2b 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnutls, zlib }: stdenv.mkDerivation rec { - name = "librelp-1.2.18"; + name = "librelp-1.3.0"; src = fetchurl { url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; - sha256 = "0grrnxhazd9iirj07al524xykk0k33vs0dgnpajz5vpqig4qyk53"; + sha256 = "1xg99ndn65984mrh30qvys5npc73ag4348whshghrcj9azya494z"; }; nativeBuildInputs = [ pkgconfig ]; From de9c97c0c872d06799075f18e263b5dd101bd839 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Dec 2018 03:25:01 -0800 Subject: [PATCH 209/219] libcouchbase: 2.10.0 -> 2.10.2 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libcouchbase/versions --- pkgs/development/libraries/libcouchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index c4824bf7a05..00e080d8584 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.10.0"; + version = "2.10.2"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "08bvnd0m18qs5akbblf80l54khm1523fdiiajp7fj88vrs86nbi2"; + sha256 = "1znhy99nhiv21j2jwsx9dsmg8br01wg0hsf1yfwsjny0myv13xkm"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; From b513231dc643f65db55bb32a5b25f67925b2fd94 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Fri, 30 Nov 2018 18:33:46 -0500 Subject: [PATCH 210/219] servant: Sphinx is a build-time dependency --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d2b9d566786..9e71044d823 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -736,7 +736,7 @@ self: super: { rev = "v${ver}"; sha256 = "0kqglih3rv12nmkzxvalhfaaafk4b2irvv9x5xmc48i1ns71y23l"; }}/doc"; - buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; + nativeBuildInputs = with pkgs.buildPackages.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; makeFlags = "html"; installPhase = '' mv _build/html $out From 6c6341335b26ac668a3c63c4f1c0c78ec5365138 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 18 Dec 2018 23:44:23 +0100 Subject: [PATCH 211/219] nixos/test-driver: fix wording in error message about invalid node names Since 113a6b9325b92d483e6c2f12c35c2887ab175a8d the test driver explicitly ensures if the node names won't break the resulting Perl script at runtime. This slightly improves the correctness of the error message. --- nixos/lib/testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 96a42c2f305..57b4412d9bb 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -164,8 +164,8 @@ in rec { if lib.length invalidNodeNames > 0 then throw '' Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! - All machines are references as perl variables in the testing framework which will break the - script when special characters are allowed. + All machines are referenced as perl variables in the testing framework which will break the + script when special characters are used. Please stick to alphanumeric chars and underscores as separation. '' From 9b2e8ddebef23d8e3ffda4e6b6a3cf890298f039 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 19 Dec 2018 00:24:51 +0100 Subject: [PATCH 212/219] oxidized: 0.21.0 -> 0.25.0, drop obsolete patch (#52492) This removes the patch for support of Dell X-series because oxidized now includes a model for these switches. --- .../ruby-modules/gem-config/default.nix | 7 - pkgs/tools/admin/oxidized/Gemfile | 6 +- pkgs/tools/admin/oxidized/Gemfile.lock | 51 +++--- pkgs/tools/admin/oxidized/gemset.nix | 146 ++++++++++++++---- .../admin/oxidized/temporary-x-series.patch | 22 --- 5 files changed, 150 insertions(+), 82 deletions(-) delete mode 100644 pkgs/tools/admin/oxidized/temporary-x-series.patch diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 9a2aaa91ad8..3671605a407 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -270,13 +270,6 @@ in ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; }; - oxidized = attrs: { - postInstall = '' - cd "$(cat "$out/nix-support/gem-meta/install-path")" - patch -p1 < ${../../../tools/admin/oxidized/temporary-x-series.patch} - ''; - }; - pango = attrs: { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ]; diff --git a/pkgs/tools/admin/oxidized/Gemfile b/pkgs/tools/admin/oxidized/Gemfile index 6a9a4254b11..dd41b89ad43 100644 --- a/pkgs/tools/admin/oxidized/Gemfile +++ b/pkgs/tools/admin/oxidized/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'oxidized' -gem 'oxidized-web' -gem 'oxidized-script' +gem 'oxidized', '0.25.0' +gem 'oxidized-web', '0.12.0' +gem 'oxidized-script', '0.6.0' diff --git a/pkgs/tools/admin/oxidized/Gemfile.lock b/pkgs/tools/admin/oxidized/Gemfile.lock index e4bdf5ccf39..d0c808fd2cd 100644 --- a/pkgs/tools/admin/oxidized/Gemfile.lock +++ b/pkgs/tools/admin/oxidized/Gemfile.lock @@ -2,43 +2,51 @@ GEM remote: https://rubygems.org/ specs: asetus (0.3.0) - backports (3.11.2) + backports (3.11.4) + charlock_holmes (0.7.6) emk-sinatra-url-for (0.2.1) sinatra (>= 0.9.1.1) - ffi (1.9.23) - haml (4.0.7) + ffi (1.9.25) + haml (5.0.4) + temple (>= 0.8.0) tilt htmlentities (4.3.4) + json (2.1.0) multi_json (1.13.1) net-ssh (4.1.0) - oxidized (0.21.0) + net-telnet (0.1.1) + oxidized (0.25.0) asetus (~> 0.1) net-ssh (~> 4.1.0) + net-telnet (~> 0.1.1) rugged (~> 0.21, >= 0.21.4) slop (~> 3.5) - oxidized-script (0.5.0) - oxidized (~> 0.21.0) + oxidized-script (0.6.0) + oxidized (~> 0.25) slop (~> 3.5) - oxidized-web (0.9.3) + oxidized-web (0.12.0) + charlock_holmes (~> 0.7.5) emk-sinatra-url-for (~> 0.2) - haml (~> 4.0) + haml (~> 5.0) htmlentities (~> 4.3) - oxidized (~> 0.21.0) - puma (~> 3) + json (>= 1.7.0) + oxidized (~> 0.25) + puma (~> 3.11.4) + rack-test (~> 0.7.0) sass (~> 3.3) sinatra (~> 1.4, >= 1.4.6) sinatra-contrib (~> 1.4, >= 1.4.6) - puma (3.11.3) + puma (3.11.4) rack (1.6.11) rack-protection (1.5.5) rack - rack-test (1.0.0) + rack-test (0.7.0) rack (>= 1.0, < 3) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rugged (0.27.0) - sass (3.5.6) + rb-inotify (0.10.0) + ffi (~> 1.0) + rugged (0.27.7) + sass (3.7.2) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -55,15 +63,16 @@ GEM sinatra (~> 1.4.0) tilt (>= 1.3, < 3) slop (3.6.0) - tilt (2.0.8) + temple (0.8.0) + tilt (2.0.9) PLATFORMS ruby DEPENDENCIES - oxidized - oxidized-script - oxidized-web + oxidized (= 0.25.0) + oxidized-script (= 0.6.0) + oxidized-web (= 0.12.0) BUNDLED WITH - 1.16.4 + 1.17.1 diff --git a/pkgs/tools/admin/oxidized/gemset.nix b/pkgs/tools/admin/oxidized/gemset.nix index 5a8b2ecefdc..e965e40530b 100644 --- a/pkgs/tools/admin/oxidized/gemset.nix +++ b/pkgs/tools/admin/oxidized/gemset.nix @@ -1,5 +1,7 @@ { asetus = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1zkr8cbp8klanqmhzz7qmimzlxh6zmsy98zb3s75af34l7znq790"; @@ -8,15 +10,29 @@ version = "0.3.0"; }; backports = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sw58rsz1hl821ia1jj3nnl3jr7xwfkcljgs56kpq3fakzcljcdz"; + sha256 = "1hshjxww2h7s0dk57njrygq4zpp0nlqrjfya7zwm27iq3rhc3y8g"; type = "gem"; }; - version = "3.11.2"; + version = "3.11.4"; + }; + charlock_holmes = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; + type = "gem"; + }; + version = "0.7.6"; }; emk-sinatra-url-for = { dependencies = ["sinatra"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0rd5b1lraklv0hblzdnmw2z3dragfg0qqk7wxbpn58f8y7jxzjgj"; @@ -25,23 +41,29 @@ version = "0.2.1"; }; ffi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; + sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; type = "gem"; }; - version = "1.9.23"; + version = "1.9.25"; }; haml = { - dependencies = ["tilt"]; + dependencies = ["temple" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p"; + sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.4"; }; htmlentities = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; @@ -49,7 +71,19 @@ }; version = "4.3.4"; }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; multi_json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; @@ -58,6 +92,8 @@ version = "1.13.1"; }; net-ssh = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q"; @@ -65,42 +101,62 @@ }; version = "4.1.0"; }; - oxidized = { - dependencies = ["asetus" "net-ssh" "rugged" "slop"]; + net-telnet = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xqx0iawj2cm6083a61y43d6a76xaypiw0nkyirx02lhynq07yz0"; + sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx"; type = "gem"; }; - version = "0.21.0"; + version = "0.1.1"; + }; + oxidized = { + dependencies = ["asetus" "net-ssh" "net-telnet" "rugged" "slop"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i8lbzjay60jpk6g86rpk59j4r0kyd1nnm79qdh64qvx6hy02ylq"; + type = "gem"; + }; + version = "0.25.0"; }; oxidized-script = { dependencies = ["oxidized" "slop"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12c15gksrrar9kradcv6mx2d4a8ixa4lykszb4pcapiw5mi35mxp"; + sha256 = "15cxsyaz2mwd7jj63gfv3lzyqkvb3gz29wxfy7xyjdzkc19c7vk6"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; oxidized-web = { - dependencies = ["emk-sinatra-url-for" "haml" "htmlentities" "oxidized" "puma" "sass" "sinatra" "sinatra-contrib"]; + dependencies = ["charlock_holmes" "emk-sinatra-url-for" "haml" "htmlentities" "json" "oxidized" "puma" "rack-test" "sass" "sinatra" "sinatra-contrib"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14s10pr8qaq6g19zi753igngp02li46k3nm5ap537r3743v1l4f9"; + sha256 = "12ib7380sh9ca7qirw1yhs8di2vv38l09imqaamibdzgmk0rvs1r"; type = "gem"; }; - version = "0.9.3"; + version = "0.12.0"; }; puma = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03313mnx8n6g9qs9l5zafqq90grrhq2nqrmjs8lsffi28mgd3cfd"; + sha256 = "06qiqx1pcfwq4gi9pdrrq8r6hgh3rwl7nl51r67zpm5xmqlp0g10"; type = "gem"; }; - version = "3.11.3"; + version = "3.11.4"; }; rack = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; @@ -110,6 +166,8 @@ }; rack-protection = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; @@ -119,14 +177,18 @@ }; rack-test = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l799s5qr2qrshvrggq5ch3v235y491zfww07b39w4pj4vpa65l1"; + sha256 = "0f50ljlbg38g21q242him0n12r0fz7r3rs9n6p8ppahzh7k22x11"; type = "gem"; }; - version = "1.0.0"; + version = "0.7.0"; }; rb-fsevent = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; @@ -136,32 +198,40 @@ }; rb-inotify = { dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4"; type = "gem"; }; - version = "0.9.10"; + version = "0.10.0"; }; rugged = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3"; + sha256 = "0znb9n1grdsqf22jqzwin58kyq7x7ml57h6pf48j219f8by21sj6"; type = "gem"; }; - version = "0.27.0"; + version = "0.27.7"; }; sass = { dependencies = ["sass-listen"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; + sha256 = "1phs6hnd8b95m7n5wbh5bsclmwaajd1sqlgw9fmj72bfqldbmcqa"; type = "gem"; }; - version = "3.5.6"; + version = "3.7.2"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; @@ -171,6 +241,8 @@ }; sinatra = { dependencies = ["rack" "rack-protection" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; @@ -180,6 +252,8 @@ }; sinatra-contrib = { dependencies = ["backports" "multi_json" "rack-protection" "rack-test" "sinatra" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0vi3i0icbi2figiayxpvxbqpbn1syma7w4p4zw5mav1ln4c7jnfr"; @@ -188,6 +262,8 @@ version = "1.4.7"; }; slop = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; @@ -195,12 +271,24 @@ }; version = "3.6.0"; }; - tilt = { + temple = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; + sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq"; type = "gem"; }; - version = "2.0.8"; + version = "0.8.0"; + }; + tilt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; + type = "gem"; + }; + version = "2.0.9"; }; } \ No newline at end of file diff --git a/pkgs/tools/admin/oxidized/temporary-x-series.patch b/pkgs/tools/admin/oxidized/temporary-x-series.patch deleted file mode 100644 index bf7ee992db1..00000000000 --- a/pkgs/tools/admin/oxidized/temporary-x-series.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb -index f602a36..3bac2d1 100644 ---- a/lib/oxidized/model/powerconnect.rb -+++ b/lib/oxidized/model/powerconnect.rb -@@ -4,7 +4,7 @@ class PowerConnect < Oxidized::Model - - comment '! ' - -- expect /^\s*--More--\s+.*$/ do |data, re| -+ expect /^([[:cntrl:]]...More:|\s*--More--\s+).*$/ do |data, re| - send ' ' - data.sub re, '' - end -@@ -60,7 +60,7 @@ class PowerConnect < Oxidized::Model - skip_blocks = 0 - cfg.each_line do |line| - # If this is a stackable switch we should skip this block of information -- if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i and @stackable == true) -+ if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i) - skip_blocks = 1 - # Some switches have another empty line. This is identified by this line having a colon - skip_blocks = 2 if line.match /:/ From f500a83e93864a5b5641be49959932dd598b1a1d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 18 Dec 2018 15:49:02 -0800 Subject: [PATCH 213/219] qtbitcointrader: 1.40.23 -> 1.40.30 * qtbitcointrader: 1.40.23 -> 1.40.30 (#52077) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/qtbitcointrader/versions * qtbitcointrader: cleanup use fetchzip on GitHub archive tarball --- .../misc/qtbitcointrader/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 4865ed7ee00..444c72602d3 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, qt5 }: +{ stdenv, fetchzip, qt5 }: let - version = "1.40.23"; + version = "1.40.30"; in stdenv.mkDerivation { name = "qtbitcointrader-${version}"; - src = fetchurl { + src = fetchzip { url = "https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${version}.tar.gz"; - sha256 = "11r2jzb09a62hf9fkg6aw8pg2js8c87k6lba9xz2q8n6d6jv44r1"; + sha256 = "0xbgdmwb8d3lrddcnx2amfsknd3g408f5gy5mdydcm3vqqfi9a0c"; }; buildInputs = [ qt5.qtbase qt5.qtmultimedia qt5.qtscript ]; @@ -25,11 +25,11 @@ stdenv.mkDerivation { runHook postConfigure ''; - meta = with stdenv.lib; - { description = "Bitcoin trading client"; - homepage = https://centrabit.com/; - license = licenses.lgpl3; - platforms = qt5.qtbase.meta.platforms; - maintainers = [ maintainers.ehmry ]; - }; + meta = with stdenv.lib; { + description = "Bitcoin trading client"; + homepage = https://centrabit.com/; + license = licenses.gpl3; + platforms = qt5.qtbase.meta.platforms; + maintainers = [ maintainers.ehmry ]; + }; } From 0c06faef52a763821c7e586cad87c652656ad6a1 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 18 Dec 2018 16:44:12 -0500 Subject: [PATCH 214/219] vscode: 1.30.0 -> 1.30.1 --- 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 35fe273cdac..167a8fe7b70 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -12,9 +12,9 @@ let }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "0bd2jdn67vnbhrsqy54bymz4di3fw3p18ni5j2wikqkl4d9h4jj1"; - "x86_64-linux" = "1zbnyff0q15xkvkrs14rfgyn6xb9v0xivcnbl8yckl71s45vb2l1"; - "x86_64-darwin" = "1qgzhpfzcwym1qyzx2v14336l106hzhs7ii84g356vxkm219x7kw"; + "i686-linux" = "1xadkgqfwsl53blm2f0kdvczwmag47585dswa1hpafzc8i86009b"; + "x86_64-linux" = "0h77kc6z9c5bkkb8svjxjabnbbv0lb835kzd1c2yypamkhag9j4a"; + "x86_64-darwin" = "1f8grgav5capd2mm1nx0416na8c6qjh91680cfvf1jh4pjihs6g4"; }.${stdenv.hostPlatform.system}; archive_fmt = if stdenv.hostPlatform.system == "x86_64-darwin" then "zip" else "tar.gz"; @@ -31,7 +31,7 @@ let in stdenv.mkDerivation rec { name = "vscode-${version}"; - version = "1.30.0"; + version = "1.30.1"; src = fetchurl { name = "VSCode_${version}_${plat}.${archive_fmt}"; From a0d15a0c684f1e493237f014325fbf9de46c754e Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 19 Dec 2018 01:19:08 +0000 Subject: [PATCH 215/219] mirrors.nix: remove bad cpan mirrors --- pkgs/build-support/fetchurl/mirrors.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 2d29728dd95..6ee9ceb5286 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -159,12 +159,8 @@ rec { # CPAN mirrors. cpan = [ - https://ftp.gwdg.de/pub/languages/perl/CPAN/ - https://download.xs4all.nl/mirror/CPAN/ https://cpan.metacpan.org/ https://cpan.perl.org/ - http://ftp.tuwien.ac.at/pub/CPAN/ - http://ftp.funet.fi/pub/CPAN/ http://backpan.perl.org/ # for old releases ]; From 946e6af857e84c723ad98e3882242c5e9968e0f2 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 1 Dec 2018 18:52:13 +0200 Subject: [PATCH 216/219] wine{Unstable,Staging}: 3.20 -> 4.0-rc2 Disabling the build of regression tests was proposed in #51341 but this change has been postponed until we reach a concensus. --- pkgs/misc/emulators/wine/sources.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 6ca22e261ee..5533c8d54a5 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "3.20"; - url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz"; - sha256 = "063garmflbna3mhph8k0dv0bkzq8x75x5xrd0j8y0mjh10i13mik"; + version = "4.0-rc2"; + url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz"; + sha256 = "0apqavsk1y56b6c4zkjpi014xwgn6gjg6pzjx94qy4nfr1gz63n4"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "049cwllf4aybrhj4l2i3vd5jvagjz4d448404zkyy0lfxr08id3p"; + sha256 = "1vqvy44h9rwfx32pad831kdyhazn68s8r14w8765ly42rixc6dgj"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From 825c7d7f402bf0cef7d518a12c575e649aed8518 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 Dec 2018 07:58:59 -0800 Subject: [PATCH 217/219] brave: 0.56.15 -> 0.57.18 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/brave/versions --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index f167980f0bf..409196715d6 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -74,11 +74,11 @@ let rpath = lib.makeLibraryPath [ in stdenv.mkDerivation rec { pname = "brave"; - version = "0.56.15"; + version = "0.57.18"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1d18fgnxcgl95bhkgfqjyv4p81q6fciqibd3ss4vwh1ljjy1fv76"; + sha256 = "0p5j3kkkalnyi6brgd9vfv43is00g2b6p1y3hajjr2vbm9iwpzg7"; }; dontConfigure = true; From e3a931c41eca8ccb988ceba2395b973568d991fc Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 18 Dec 2018 11:27:21 -0500 Subject: [PATCH 218/219] brave: add at-spi2-core Also correct the style. --- .../networking/browsers/brave/default.nix | 80 ++++++++++--------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 409196715d6..ec5b34da0a6 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -1,44 +1,46 @@ -{ stdenv, lib, fetchurl, - dpkg, - alsaLib, - at-spi2-atk, - atk, - cairo, - cups, - dbus, - expat, - fontconfig, - freetype, - gdk_pixbuf, - glib, - gnome2, - gnome3, - gtk3, - libuuid, - libX11, - libXcomposite, - libXcursor, - libXdamage, - libXext, - libXfixes, - libXi, - libXrandr, - libXrender, - libXScrnSaver, - libXtst, - nspr, - nss, - pango, - udev, - xorg, - zlib, - xdg_utils, - wrapGAppsHook +{ stdenv, lib, fetchurl +, dpkg +, alsaLib +, at-spi2-atk +, at-spi2-core +, atk +, cairo +, cups +, dbus +, expat +, fontconfig +, freetype +, gdk_pixbuf +, glib +, gnome2 +, gnome3 +, gtk3 +, libuuid +, libX11 +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXrandr +, libXrender +, libXScrnSaver +, libXtst +, nspr +, nss +, pango +, udev +, xorg +, zlib +, xdg_utils +, wrapGAppsHook }: let rpath = lib.makeLibraryPath [ alsaLib at-spi2-atk + at-spi2-core atk cairo cups @@ -50,8 +52,8 @@ let rpath = lib.makeLibraryPath [ glib gnome2.GConf gtk3 - libuuid libX11 + libXScrnSaver libXcomposite libXcursor libXdamage @@ -60,15 +62,15 @@ let rpath = lib.makeLibraryPath [ libXi libXrandr libXrender - libXScrnSaver libXtst + libuuid nspr nss pango udev + xdg_utils xorg.libxcb zlib - xdg_utils ]; From b9307eddd67e0e3f087dec608ccc84fec72deda5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Tue, 18 Dec 2018 12:05:33 +0100 Subject: [PATCH 219/219] zeroad: fix build with spidermonkey-38.8.0 --- pkgs/games/0ad/game.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index d05f19d3171..ab9ffd0470b 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -33,11 +33,15 @@ stdenv.mkDerivation rec { "-I${SDL2}/include/SDL2" ]; - patches = [ ./rootdir_env.patch ]; - - postPatch = '' - sed -i 's/MOZJS_MINOR_VERSION/false \&\& MOZJS_MINOR_VERSION/' source/scriptinterface/ScriptTypes.h - ''; + patches = [ + ./rootdir_env.patch + # Fixes build with spidermonkey-38.8.0, includes the minor version check: + # https://src.fedoraproject.org/rpms/0ad/c/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b + (fetchurl { + url = https://src.fedoraproject.org/rpms/0ad/raw/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b/f/0ad-mozjs-incompatible.patch; + sha256 = "1rzpaalcrzihsgvlk3nqd87n2kxjldlwvb3qp5fcd5ffzr6k90wa"; + }) + ]; configurePhase = '' # Delete shipped libraries which we don't need.