diff options
80 files changed, 1679 insertions, 1108 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 08422d911eb..8a9a936d3b2 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -82,6 +82,7 @@ ./misc/version.nix ./programs/adb.nix ./programs/atop.nix + ./programs/autojump.nix ./programs/bash/bash.nix ./programs/bcc.nix ./programs/blcr.nix diff --git a/nixos/modules/programs/autojump.nix b/nixos/modules/programs/autojump.nix new file mode 100644 index 00000000000..3a8feec4bb4 --- /dev/null +++ b/nixos/modules/programs/autojump.nix @@ -0,0 +1,33 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.autojump; + prg = config.programs; +in +{ + options = { + programs.autojump = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable autojump. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + environment.pathsToLink = [ "/share/autojump" ]; + environment.systemPackages = [ pkgs.autojump ]; + + programs.bash.interactiveShellInit = "source ${pkgs.autojump}/share/autojump/autojump.bash"; + programs.zsh.interactiveShellInit = mkIf prg.zsh.enable "source ${pkgs.autojump}/share/autojump/autojump.zsh"; + programs.fish.interactiveShellInit = mkIf prg.fish.enable "source ${pkgs.autojump}/share/autojump/autojump.fish"; + }; +} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 24ab963f718..7bcdfdb5230 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -59,6 +59,7 @@ with lib; (mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ]) (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ]) (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ]) + (mkRenamedOptionModule [ "services" "vmwareGuest" ] [ "virtualisation" "vmware" "guest" ]) (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ]) (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ]) diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix index cbd6e8f7bf7..454e7d35bc0 100644 --- a/nixos/modules/services/cluster/kubernetes/dashboard.nix +++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix @@ -8,6 +8,13 @@ in { options.services.kubernetes.addons.dashboard = { enable = mkEnableOption "kubernetes dashboard addon"; + extraArgs = mkOption { + description = "Extra arguments to append to the dashboard cmdline"; + type = types.listOf types.str; + default = []; + example = ["--enable-skip-login"]; + }; + rbac = mkOption { description = "Role-based access control (RBAC) options"; default = {}; @@ -31,7 +38,7 @@ in { version = mkOption { description = "Which version of the kubernetes dashboard to deploy"; type = types.str; - default = "v1.8.3"; + default = "v1.10.1"; }; image = mkOption { @@ -39,9 +46,9 @@ in { type = types.attrs; default = { imageName = "k8s.gcr.io/kubernetes-dashboard-amd64"; - imageDigest = "sha256:dc4026c1b595435ef5527ca598e1e9c4343076926d7d62b365c44831395adbd0"; + imageDigest = "sha256:0ae6b69432e78069c5ce2bcde0fe409c5c4d6f0f4d9cd50a17974fea38898747"; finalImageTag = cfg.version; - sha256 = "18ajcg0q1vignfjk2sm4xj4wzphfz8wah69ps8dklqfvv0164mc8"; + sha256 = "01xrr4pwgr2hcjrjsi3d14ifpzdfbxzqpzxbk2fkbjb9zkv38zxy"; }; }; }; @@ -99,7 +106,7 @@ in { memory = "100Mi"; }; }; - args = ["--auto-generate-certificates"]; + args = ["--auto-generate-certificates"] ++ cfg.extraArgs; volumeMounts = [{ name = "tmp-volume"; mountPath = "/tmp"; diff --git a/nixos/modules/services/cluster/kubernetes/dns.nix b/nixos/modules/services/cluster/kubernetes/dns.nix index 5a3e281ea69..ea3e0706163 100644 --- a/nixos/modules/services/cluster/kubernetes/dns.nix +++ b/nixos/modules/services/cluster/kubernetes/dns.nix @@ -3,7 +3,7 @@ with lib; let - version = "1.2.5"; + version = "1.3.1"; cfg = config.services.kubernetes.addons.dns; ports = { dns = 10053; @@ -43,9 +43,9 @@ in { type = types.attrs; default = { imageName = "coredns/coredns"; - imageDigest = "sha256:33c8da20b887ae12433ec5c40bfddefbbfa233d5ce11fb067122e68af30291d6"; + imageDigest = "sha256:02382353821b12c21b062c59184e227e001079bb13ebd01f9d3270ba0fcbf1e4"; finalImageTag = version; - sha256 = "13q19rgwapv27xcs664dw502254yw4zw63insf6g2danidv2mg6i"; + sha256 = "0vbylgyxv2jm2mnzk6f28jbsj305zsxmx3jr6ngjq461czcl5fi5"; }; }; }; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 25c258ebe13..b8617e48d8e 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -22,7 +22,8 @@ let password = cfg.databasePassword; username = cfg.databaseUsername; encoding = "utf8"; - }; + pool = cfg.databasePool; + } // cfg.extraDatabaseConfig; }; gitalyToml = pkgs.writeText "gitaly.toml" '' @@ -253,6 +254,18 @@ in { description = "Gitlab database user."; }; + databasePool = mkOption { + type = types.int; + default = 5; + description = "Database connection pool size."; + }; + + extraDatabaseConfig = mkOption { + type = types.attrs; + default = {}; + description = "Extra configuration in config/database.yml."; + }; + host = mkOption { type = types.str; default = config.networking.hostName; diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix index 8d1b3d225a4..b18ce2b1f81 100644 --- a/nixos/modules/services/misc/jackett.nix +++ b/nixos/modules/services/misc/jackett.nix @@ -4,11 +4,36 @@ with lib; let cfg = config.services.jackett; + in { options = { services.jackett = { enable = mkEnableOption "Jackett"; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/jackett/.config/Jackett"; + description = "The directory where Jackett stores its data files."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Open ports in the firewall for the Jackett web interface."; + }; + + user = mkOption { + type = types.str; + default = "jackett"; + description = "User account under which Jackett runs."; + }; + + group = mkOption { + type = types.str; + default = "jackett"; + description = "Group under which Jackett runs."; + }; }; }; @@ -18,30 +43,38 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - test -d /var/lib/jackett/ || { - echo "Creating jackett data directory in /var/lib/jackett/" - mkdir -p /var/lib/jackett/ + test -d ${cfg.dataDir} || { + echo "Creating jackett data directory in ${cfg.dataDir}" + mkdir -p ${cfg.dataDir} } - chown -R jackett:jackett /var/lib/jackett/ - chmod 0700 /var/lib/jackett/ + chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir} + chmod 0700 ${cfg.dataDir} ''; serviceConfig = { Type = "simple"; - User = "jackett"; - Group = "jackett"; + User = cfg.user; + Group = cfg.group; PermissionsStartOnly = "true"; - ExecStart = "${pkgs.jackett}/bin/Jackett"; + ExecStart = "${pkgs.jackett}/bin/Jackett --NoUpdates --DataFolder '${cfg.dataDir}'"; Restart = "on-failure"; }; }; - users.users.jackett = { - uid = config.ids.uids.jackett; - home = "/var/lib/jackett"; - group = "jackett"; + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 9117 ]; + }; + + users.users = mkIf (cfg.user == "jackett") { + jackett = { + group = cfg.group; + home = cfg.dataDir; + uid = config.ids.uids.jackett; + }; }; - users.groups.jackett.gid = config.ids.gids.jackett; + users.groups = mkIf (cfg.group == "jackett") { + jackett.gid = config.ids.gids.jackett; + }; }; } diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix index 1a9fad3883c..9ab26d84832 100644 --- a/nixos/modules/services/misc/radarr.nix +++ b/nixos/modules/services/misc/radarr.nix @@ -4,11 +4,36 @@ with lib; let cfg = config.services.radarr; + in { options = { services.radarr = { enable = mkEnableOption "Radarr"; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/radarr/.config/Radarr"; + description = "The directory where Radarr stores its data files."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Open ports in the firewall for the Radarr web interface."; + }; + + user = mkOption { + type = types.str; + default = "radarr"; + description = "User account under which Radarr runs."; + }; + + group = mkOption { + type = types.str; + default = "radarr"; + description = "Group under which Radarr runs."; + }; }; }; @@ -18,30 +43,38 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - test -d /var/lib/radarr/ || { - echo "Creating radarr data directory in /var/lib/radarr/" - mkdir -p /var/lib/radarr/ + test -d ${cfg.dataDir} || { + echo "Creating radarr data directory in ${cfg.dataDir}" + mkdir -p ${cfg.dataDir} } - chown -R radarr:radarr /var/lib/radarr/ - chmod 0700 /var/lib/radarr/ + chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir} + chmod 0700 ${cfg.dataDir} ''; serviceConfig = { Type = "simple"; - User = "radarr"; - Group = "radarr"; + User = cfg.user; + Group = cfg.group; PermissionsStartOnly = "true"; - ExecStart = "${pkgs.radarr}/bin/Radarr"; + ExecStart = "${pkgs.radarr}/bin/Radarr -nobrowser -data='${cfg.dataDir}'"; Restart = "on-failure"; }; }; - users.users.radarr = { - uid = config.ids.uids.radarr; - home = "/var/lib/radarr"; - group = "radarr"; + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 7878 ]; + }; + + users.users = mkIf (cfg.user == "radarr") { + radarr = { + group = cfg.group; + home = cfg.dataDir; + uid = config.ids.uids.radarr; + }; }; - users.groups.radarr.gid = config.ids.gids.radarr; + users.groups = mkIf (cfg.group == "radarr") { + radarr.gid = config.ids.gids.radarr; + }; }; } diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index fa42ce81234..f7a3daa5fdd 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -40,7 +40,7 @@ let else if (cfg.database.passwordFile != null) then "file_get_contents('${cfg.database.passwordFile}')" else - "" + "''" }); define('DB_PORT', '${toString dbPort}'); diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index 15c78f14c52..d18778f8158 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -3,19 +3,17 @@ with lib; let - cfg = config.services.vmwareGuest; + cfg = config.virtualisation.vmware.guest; open-vm-tools = if cfg.headless then pkgs.open-vm-tools-headless else pkgs.open-vm-tools; xf86inputvmmouse = pkgs.xorg.xf86inputvmmouse; in { - options = { - services.vmwareGuest = { - enable = mkEnableOption "VMWare Guest Support"; - headless = mkOption { - type = types.bool; - default = false; - description = "Whether to disable X11-related features."; - }; + options.virtualisation.vmware.guest = { + enable = mkEnableOption "VMWare Guest Support"; + headless = mkOption { + type = types.bool; + default = false; + description = "Whether to disable X11-related features."; }; }; @@ -25,6 +23,8 @@ in message = "VMWare guest is not currently supported on ${pkgs.stdenv.hostPlatform.system}"; } ]; + boot.initrd.kernelModules = [ "vmw_pvscsi" ]; + environment.systemPackages = [ open-vm-tools ]; systemd.services.vmware = diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 45006fb8ef6..3e89101e042 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.32.4"; + version = "3.32.5"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "16b3dkxland4mjzjs2rz5gbqjapzzmap4d1mfhbrj2ch3plmdy7g"; + sha256 = "0vs8x26zcakk6c31sc774h2lcdw3syp236vyymmx1jnfsh1jaqpn"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 87f5f94bb30..d35cefb8841 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkgconfig, readline , libiconv, icu, curl -, outputsSupport ? false # outputs screen +, outputsSupport ? true # outputs screen , visualizerSupport ? false, fftw ? null # visualizer screen -, clockSupport ? false # clock screen +, clockSupport ? true # clock screen , taglibSupport ? true, taglib ? null # tag editor }: diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 4f268a3a104..4a48cde571a 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d +{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, libXcursor , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO, m17n_lib, libotf @@ -118,6 +118,17 @@ stdenv.mkDerivation rec { mv nextstep/Emacs.app $out/Applications ''; + postFixup = + let libPath = lib.makeLibraryPath [ + libXcursor + ]; + in lib.optionalString (withX && toolkit == "lucid") '' + patchelf --set-rpath \ + "$(patchelf --print-rpath "$out/bin/emacs"):${libPath}" \ + "$out/bin/emacs" + patchelf --add-needed "libXcursor.so.1" "$out/bin/emacs" + ''; + meta = with stdenv.lib; { description = "The extensible, customizable GNU text editor"; homepage = https://www.gnu.org/software/emacs/; diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix new file mode 100644 index 00000000000..532bb99e7d8 --- /dev/null +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }: + +let + pname = "kdev-php"; + version = "5.3.1"; +in +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; + sha256 = "1xiz4v6w30dsa7l4nk3jw3hxpkx71b0yaaj2k8s7xzgjif824bgl"; + }; + + cmakeFlags = [ + "-DBUILD_TESTING=OFF" + ]; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ]; + + meta = with lib; { + maintainers = [ maintainers.aanderse ]; + platforms = platforms.linux; + description = "PHP support for KDevelop"; + homepage = https://www.kdevelop.org; + license = [ licenses.gpl2 ]; + }; +} diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix new file mode 100644 index 00000000000..be27e10f42a --- /dev/null +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }: + +let + pname = "kdev-python"; + version = "5.3.1"; +in +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; + sha256 = "11hf8n6vrlaz31c0p3xbnf0df2q5j6ykgc9ip0l5g33kadwn5b9j"; + }; + + cmakeFlags = [ + "-DBUILD_TESTING=OFF" + "-DPYTHON_EXECUTABLE=${python}/bin/python" + ]; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + buildInputs = [ threadweaver ktexteditor kdevelop-unwrapped ]; + + meta = with lib; { + maintainers = [ maintainers.aanderse ]; + platforms = platforms.linux; + description = "Python support for KDevelop"; + homepage = https://www.kdevelop.org; + license = [ licenses.gpl2 ]; + }; +} diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index a35bd14f310..98154b4a5eb 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -43,6 +43,13 @@ mkDerivation rec { "-DCLANG_BUILTIN_DIR=${llvmPackages.clang-unwrapped}/lib/clang/${(builtins.parseDrvName llvmPackages.clang.name).version}/include" ]; + postPatch = '' + # FIXME: temporary until https://invent.kde.org/kde/kdevelop/merge_requests/8 is merged + substituteInPlace kdevplatform/language/backgroundparser/parsejob.cpp --replace \ + 'if (internalFilePath.startsWith(dataPath.canonicalPath() + QStringLiteral("/kdev"))) {' \ + 'if (internalFilePath.startsWith(dataPath.canonicalPath() + QStringLiteral("/kdev")) || localFile.startsWith(path + QStringLiteral("/kdev"))) {' + ''; + postInstall = '' # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. wrapProgram "$out/bin/kdevelop!" \ diff --git a/pkgs/applications/editors/kdevelop5/wrapper.nix b/pkgs/applications/editors/kdevelop5/wrapper.nix new file mode 100644 index 00000000000..86d3de9eb39 --- /dev/null +++ b/pkgs/applications/editors/kdevelop5/wrapper.nix @@ -0,0 +1,7 @@ +{ symlinkJoin, kdevelop-unwrapped, plugins ? null }: + +symlinkJoin { + name = "kdevelop-with-plugins"; + + paths = [ kdevelop-unwrapped ] ++ (if plugins != null then plugins else []); +} diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 44855d5c8b4..bce2e882698 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { qmakeFlags = [ "VERSION=${version}" ]; + # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory + enableParallelBuilding = false; # true by default due to qmake + doCheck = false; meta = { diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 9839bb74077..cf13c6fb05e 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,7 +6,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper stdenv.mkDerivation rec { name = "paraview-${version}"; - version = "5.5.2"; + version = "5.6.0"; # fetching from GitHub instead of taking an "official" source # tarball because of missing submodules there @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "Kitware"; repo = "ParaView"; rev = "v${version}"; - sha256 = "1jivph7lppnflmjsiirhgv0mnh8mxx41i1vzkk78ynn00rzacx3j"; + sha256 = "1j13yfdgcv4yzfr449i4c8r4rs1c9zr6qd3igr4vv3ani8zixkzi"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 89bd8ee4b3e..353cf620ee7 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew +{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, pythonPackages , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd , jackaudioSupport ? false, libjack2 -, cudaSupport ? false, cudatoolkit +, cudaSupport ? config.cudaSupport or false, cudatoolkit , colladaSupport ? true, opencollada , enableNumpy ? false, makeWrapper }: diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index c6f83104fb1..5f252d97d86 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -14,13 +14,13 @@ in python3Packages.buildPythonApplication rec { pname = "electrum"; - version = "3.3.2"; + version = "3.3.4"; src = fetchFromGitHub { owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "1jsn02azdydpq4plr2552s7ijyqgw6zqm2zx8skwsalgbwmhx12i"; + sha256 = "0yxdpc602jnd14xz3px85ka0b6db98zwbgfi9a3vj8p1k3mmiwaj"; }; propagatedBuildInputs = with python3Packages; [ @@ -53,9 +53,6 @@ python3Packages.buildPythonApplication rec { preBuild = '' sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py - pyrcc5 icons.qrc -o electrum/gui/qt/icons_rc.py - # Recording the creation timestamps introduces indeterminism to the build - sed -i '/Created: .*/d' electrum/gui/qt/icons_rc.py sed -i "s|name = 'libzbar.*'|name='${zbar}/lib/libzbar.so'|" electrum/qrscanner.py substituteInPlace ./electrum/ecc_fast.py --replace libsecp256k1.so.0 ${secp256k1}/lib/libsecp256k1.so.0 ''; diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 0fb2cec2916..6878bc5ab03 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -12,13 +12,13 @@ in stdenv'.mkDerivation rec { name = "xmr-stak-${version}"; - version = "2.7.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "fireice-uk"; repo = "xmr-stak"; rev = "${version}"; - sha256 = "1mlli8sx1f3922ygnwakmi2h3swccz62njxbzxfzbi4hlmvsaz0y"; + sha256 = "0z0fdh5fmiisx5dgfyyin3ddl8g28fpd64gn8nl8dd6sf3iw8z7p"; }; NIX_CFLAGS_COMPILE = "-O3"; diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index de11a116533..bb10349470f 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -4,7 +4,7 @@ }: let - version = "1.30.0"; + version = "1.31.0"; # Update these on version bumps according to Makefile centOsIsoVersion = "v1.14.0"; @@ -18,7 +18,7 @@ in buildGoPackage rec { owner = "minishift"; repo = "minishift"; rev = "v${version}"; - sha256 = "0p7g7r4m3brssy2znw7pd60aph6m6absqy23x88c07n5n4mv9wj8"; + sha256 = "0v5hngfz393yi3x4c328g5bjazw02jr59ljqh6ws0j6wzxzm8jxf"; }; nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; @@ -28,9 +28,6 @@ in buildGoPackage rec { subPackages = [ "cmd/minishift" ]; postPatch = '' - substituteInPlace vendor/github.com/containers/image/storage/storage_image.go \ - --replace 'nil, diff' 'diff' - # minishift downloads openshift if not found therefore set the cache to /nix/store/... substituteInPlace pkg/minishift/cache/oc_caching.go \ --replace 'filepath.Join(oc.MinishiftCacheDir, OC_CACHE_DIR, oc.OpenShiftVersion, runtime.GOOS)' '"${openshift}/bin"' \ diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 106be4fddc4..2fff46a1737 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -12,7 +12,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.28.1"; + version = "0.28.2"; name = "notmuch-${version}"; passthru = { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "0mcsfkrp6mpy374m5rwwgm9md8qzvwa3s4rbzid4cnkx2cwfj4fi"; + sha256 = "0cg9ff7h7mklgbqqknxigxxx1j3p3s2a9cxvrs5ih7j56f04k9l5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 794430ebbe8..234b7474997 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,17 +1,20 @@ -{ fetchurl, stdenv, ocamlPackages }: +{ fetchurl, stdenv, which, dune, ocamlPackages }: stdenv.mkDerivation rec { name = "alt-ergo-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { url = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "106zfgisq6qxr7dlk8z7gi68ly7qff4frn8wab2g8z2nkkwla92w"; + sha256 = "1ycr3ff0gacq1aqzs16n6swgfniwpim0m7rvhcam64kj0a80c6bz"; }; - buildInputs = with ocamlPackages; - [ ocaml findlib camlzip ocamlgraph zarith lablgtk ocplib-simplex psmt2-frontend menhir num ]; + buildInputs = [ dune which ] ++ (with ocamlPackages; [ + ocaml findlib camlzip lablgtk menhir num ocplib-simplex psmt2-frontend seq zarith + ]); + + preConfigure = "patchShebangs ./configure"; meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 4e8829f7e31..9ee56041ed3 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, runCommand +{ config, stdenv, lib, runCommand , fetchFromGitHub , fetchurl , cmake @@ -13,8 +13,8 @@ , Accelerate, CoreGraphics, CoreVideo , lmdbSupport ? true, lmdb , leveldbSupport ? true, leveldb, snappy -, cudaSupport ? stdenv.isLinux, cudatoolkit -, cudnnSupport ? false, cudnn ? null +, cudaSupport ? config.cudaSupport or false, cudatoolkit +, cudnnSupport ? cudaSupport, cudnn ? null , ncclSupport ? false, nccl ? null , pythonSupport ? false, python ? null, numpy ? null , substituteAll diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index fe5c77be8b2..4bf922c4e16 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchgit, fetchFromGitHub, cmake +{ config, lib, stdenv, fetchgit, fetchFromGitHub, cmake , openblas, opencv3, libzip, boost, protobuf, openmpi , onebitSGDSupport ? false -, cudaSupport ? false, cudatoolkit, nvidia_x11 -, cudnnSupport ? false, cudnn +, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 +, cudnnSupport ? cudaSupport, cudnn }: assert cudnnSupport -> cudaSupport; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 990d3f1a5d5..061f48bb3d9 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl, bash, cmake +{ config, stdenv, lib, fetchurl, bash, cmake , opencv, gtest, openblas, liblapack, perl -, cudaSupport ? false, cudatoolkit, nvidia_x11 -, cudnnSupport ? false, cudnn +, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 +, cudnnSupport ? cudaSupport, cudnn }: assert cudnnSupport -> cudaSupport; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index b5a5a9feb76..3298bc16751 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,32 +1,32 @@ { "ce": { - "version": "11.7.4", - "repo_hash": "0qq9snykdlpkpbznwpkv0n7bz1rsgz4z7lcjl4xkjxkf2gkf8pxp", - "deb_hash": "1j76jya0ydyg7v3vcdfjmcr5ir23yzdwmg9fxlirvgh74py7q85c", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.4-ce.0_amd64.deb/download.deb", + "version": "11.7.5", + "repo_hash": "0bbyx9zmscf9273fgypb82gw166psy7d3p7dnwb6f5r9yz7rmhbn", + "deb_hash": "1m6hdvrz467q33z626l9f3d5pssl0bbj2hkqy5g0b05wvdznmldy", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_11.7.5-ce.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ce", - "rev": "v11.7.4", + "rev": "v11.7.5", "passthru": { "GITALY_SERVER_VERSION": "1.12.2", "GITLAB_PAGES_VERSION": "1.3.1", "GITLAB_SHELL_VERSION": "8.4.4", - "GITLAB_WORKHORSE_VERSION": "8.0.1" + "GITLAB_WORKHORSE_VERSION": "8.0.2" } }, "ee": { - "version": "11.7.4", - "repo_hash": "0riqww094ylbbwb9mhjpsqhrdpxlcf6rc5p796p7x7f46p31mcjb", - "deb_hash": "02hnhhyrm4a3lgwnl399byka2dr5q3pjirki447373270ca93h5i", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.4-ee.0_amd64.deb/download.deb", + "version": "11.7.5", + "repo_hash": "05dzvqrdgxbzsrf9rbis5m3iic04midx2arxgg3g4f78qfjxzylm", + "deb_hash": "1nfd68vzy3zc6a3xn5lhr83kqv9d7aaxvzv4ca9awcz4va5b33kc", + "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.7.5-ee.0_amd64.deb/download.deb", "owner": "gitlab-org", "repo": "gitlab-ee", - "rev": "v11.7.4-ee", + "rev": "v11.7.5-ee", "passthru": { "GITALY_SERVER_VERSION": "1.12.2", "GITLAB_PAGES_VERSION": "1.3.1", "GITLAB_SHELL_VERSION": "8.4.4", - "GITLAB_WORKHORSE_VERSION": "8.0.1" + "GITLAB_WORKHORSE_VERSION": "8.0.2" } } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 96ea361a254..ad3b11f3b2c 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "gitlab-workhorse-${version}"; - version = "8.0.1"; + version = "8.0.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1aslcadag1q2rdirf9m0dl5vfaz8v3yy1232mvyjyvy1wb51pf4q"; + sha256 = "12xwr9yl59i58gnf0yn5yjp7zwz3s46042lk7rihvvzsa0kax690"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index 57f00887103..f7ccda27389 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib -, desktopSupport, xorg +, desktopSupport ? "gnomeflashback", xorg , gtk2 , gtk3, gnome3, mate , libxfce4util, xfce4-panel diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 4122af898de..142f5255caa 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -187,6 +187,7 @@ stdenv.mkDerivation { else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc" else if targetPlatform.isSparc then "sparc" else if targetPlatform.isAvr then "avr" + else if targetPlatform.isAlpha then "alpha" else throw "unknown emulation for platform: " + targetPlatform.config; in targetPlatform.platform.bfdEmulation or (fmt + sep + arch); diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 931b68c6329..f39f4e65e45 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -33,7 +33,9 @@ in stdenv.mkDerivation (fBuildAttrs // { # sandbox enabled. Code here # https://github.com/bazelbuild/bazel/blob/9323c57607d37f9c949b60e293b573584906da46/src/main/cpp/startup_options.cc#L123-L124 # - USER=homeless-shelter bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch $bazelFlags $bazelTarget + # On macOS Bazel will use the system installed Xcode or CLT toolchain instead of the one in the PATH unless we pass BAZEL_USE_CPP_ONLY_TOOLCHAIN + # + BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 USER=homeless-shelter bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" fetch $bazelFlags $bazelTarget runHook postBuild ''; @@ -90,7 +92,42 @@ in stdenv.mkDerivation (fBuildAttrs // { buildPhase = fBuildAttrs.buildPhase or '' runHook preBuild - bazel --output_base="$bazelOut" --output_user_root="$bazelUserRoot" build -j $NIX_BUILD_CORES $bazelFlags $bazelTarget + # Bazel sandboxes the execution of the tools it invokes, so even though we are + # calling the correct nix wrappers, the values of the environment variables + # the wrappers are expecting will not be set. So instead of relying on the + # wrappers picking them up, pass them in explicitly via `--copt`, `--linkopt` + # and related flags. + # + copts=() + host_copts=() + for flag in $NIX_CFLAGS_COMPILE; do + copts+=( "--copt=$flag" ) + host_copts+=( "--host_copt=$flag" ) + done + for flag in $NIX_CXXSTDLIB_COMPILE; do + copts+=( "--copt=$flag" ) + host_copts+=( "--host_copt=$flag" ) + done + linkopts=() + host_linkopts=() + for flag in $NIX_LD_FLAGS; do + linkopts+=( "--linkopt=$flag" ) + host_linkopts+=( "--host_linkopt=$flag" ) + done + + BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \ + USER=homeless-shelter \ + bazel \ + --output_base="$bazelOut" \ + --output_user_root="$bazelUserRoot" \ + build \ + -j $NIX_BUILD_CORES \ + "''${copts[@]}" \ + "''${host_copts[@]}" \ + "''${linkopts[@]}" \ + "''${host_linkopts[@]}" \ + $bazelFlags \ + $bazelTarget runHook postBuild ''; diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index 39d1652fc70..41c325c2b1a 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, libtool, zip, libffi, libsigsegv, readline, gmp, -gnutls, gnome2, cairo, SDL, sqlite, emacsSupport ? false, emacs ? null }: +{ config, stdenv, fetchurl, pkgconfig, libtool +, zip, libffi, libsigsegv, readline, gmp +, gnutls, gnome2, cairo, SDL, sqlite +, emacsSupport ? config.emacsSupport or false, emacs ? null }: assert emacsSupport -> (emacs != null); diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 39f8d251410..d26ad077c14 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 +, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2, libzip }: @@ -28,6 +28,7 @@ let , curlSupport ? config.php.curl or true , gettextSupport ? config.php.gettext or true , pcntlSupport ? config.php.pcntl or true + , pdo_odbcSupport ? config.php.pdo_odbc or true , postgresqlSupport ? config.php.postgresql or true , pdo_pgsqlSupport ? config.php.pdo_pgsql or true , readlineSupport ? config.php.readline or true @@ -88,6 +89,7 @@ let ++ optional readlineSupport readline ++ optional sqliteSupport sqlite ++ optional postgresqlSupport postgresql + ++ optional pdo_odbcSupport unixODBC ++ optional pdo_pgsqlSupport postgresql ++ optional pdo_mysqlSupport mysqlBuildInputs ++ optional mysqliSupport mysqlBuildInputs @@ -141,6 +143,7 @@ let ++ optional readlineSupport "--with-readline=${readline.dev}" ++ optional sqliteSupport "--with-pdo-sqlite=${sqlite.dev}" ++ optional postgresqlSupport "--with-pgsql=${postgresql}" + ++ optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}" ++ optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}" ++ optional pdo_mysqlSupport "--with-pdo-mysql=${if mysqlndSupport then "mysqlnd" else mysql.connector-c}" ++ optionals mysqliSupport [ diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix new file mode 100644 index 00000000000..dd200304ab6 --- /dev/null +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "aws-c-common"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = pname; + rev = "v${version}"; + sha256 = "169ha105qgcvj93hf1bhlya2nlwh8g5fvypd6whfjs9k0hqddi0c"; + }; + + nativeBuildInputs = [ cmake ]; + + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + "-Wno-nullability-extension" + "-Wno-typedef-redefinition" + ]; + + meta = with lib; { + description = "AWS SDK for C common core"; + homepage = https://github.com/awslabs/aws-c-common; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej eelco ]; + }; +} diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix new file mode 100644 index 00000000000..47363e12a68 --- /dev/null +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, cmake, aws-c-common, aws-checksums }: + +stdenv.mkDerivation rec { + pname = "aws-c-event-stream"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = pname; + rev = "v${version}"; + sha256 = "0anjynfghk3inysy21wqvhxha33xsswh3lm8pr7nx7cpj6cmr37m"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ aws-c-common aws-checksums ]; + + cmakeFlags = [ + "-DCMAKE_MODULE_PATH=${aws-c-common}/lib/cmake" + ]; + + meta = with lib; { + description = "C99 implementation of the vnd.amazon.eventstream content-type"; + homepage = https://github.com/awslabs/aws-c-event-stream; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej eelco ]; + }; +} diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix new file mode 100644 index 00000000000..0e47398b346 --- /dev/null +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "aws-checksums"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "awslabs"; + repo = pname; + rev = "v${version}"; + sha256 = "1r21sfs1ik6cb8bz17w6gp6y2xa9rbjxjka0p6airb3qds094iv5"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "HW accelerated CRC32c and CRC32"; + homepage = https://github.com/awslabs/aws-checksums; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej eelco ]; + }; +} diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index a5517a2522d..9ba611b0f96 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib +, aws-c-common, aws-c-event-stream, aws-checksums , CoreAudio, AudioToolbox , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] @@ -6,22 +7,15 @@ customMemoryManagement ? true }: -let - loaderVar = - if stdenv.isLinux - then "LD_LIBRARY_PATH" - else if stdenv.isDarwin - then "DYLD_LIBRARY_PATH" - else throw "Unsupported system!"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.6.52"; + version = "1.7.53"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "17hyq6rv1xl3f70p2pfkkxm86gbfimq2pwpakv1wv3xjibmppbrf"; + sha256 = "0ybccffz5nrhp4n4nyb6ykrk9fdi0vqqqhjkaxx3l0xvmqx9rbrv"; }; # FIXME: might be nice to put different APIs in different outputs @@ -30,43 +24,35 @@ in stdenv.mkDerivation rec { separateDebugInfo = stdenv.isLinux; nativeBuildInputs = [ cmake curl ]; - buildInputs = [ zlib curl openssl ] - ++ lib.optionals (stdenv.isDarwin && + + buildInputs = [ + curl openssl zlib + aws-c-common aws-c-event-stream aws-checksums + ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis))) [ CoreAudio AudioToolbox ]; - cmakeFlags = - lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" + cmakeFlags = [ + "-DBUILD_DEPS=OFF" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + ] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DENABLE_TESTING=OFF" ++ lib.optional (apis != ["*"]) "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; - enableParallelBuilding = true; - - # Behold the escaping nightmare below on loaderVar o.O - preBuild = - '' - # Ensure that the unit tests can find the *.so files. - for i in testing-resources aws-cpp-sdk-*; do - export ${loaderVar}=$(pwd)/$i:''${${loaderVar}} - done - ''; - preConfigure = '' rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp ''; - NIX_CFLAGS_COMPILE = [ "-Wno-error=noexcept-type" ]; - __darwinAllowLocalNetworking = true; - meta = { + meta = with lib; { description = "A C++ interface for Amazon Web Services"; homepage = https://github.com/awslabs/aws-sdk-cpp; - license = lib.licenses.asl20; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.eelco ]; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ eelco orivej ]; }; } diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index d6f7b46079f..1a2c75ecf91 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -31,7 +31,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-cplusplus" ] ++ lib.optional enableLargeConfig "--enable-large-config" - ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static"; + ++ lib.optional (stdenv.hostPlatform.libc == "musl") "--disable-static" + # Configure script can't detect whether C11 atomic intrinsics are available + # when cross-compiling, so it links to libatomic_ops, which has to be + # propagated to all dependencies. To avoid this, assume that the intrinsics + # are available. + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--with-libatomic-ops=none"; doCheck = true; # not cross; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index f161e0f511a..845b09053ad 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv +{ config, stdenv, fetchurl, fetchpatch, pkgconfig, libiconv , libintl, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 -, glSupport ? true, libGL ? null # libGLU_combined is no longer a big dependency +, libGLSupported +, glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips) +, libGL ? null # libGLU_combined is no longer a big dependency , pdfSupport ? true , darwin }: diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 7e99a0c18d7..cb4571265af 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -94,7 +94,8 @@ stdenv.mkDerivation ({ }) ] ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch - ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch; + ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch + ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; postPatch = '' diff --git a/pkgs/development/libraries/glibc/darwin-cross-build.patch b/pkgs/development/libraries/glibc/darwin-cross-build.patch new file mode 100644 index 00000000000..7b224924104 --- /dev/null +++ b/pkgs/development/libraries/glibc/darwin-cross-build.patch @@ -0,0 +1,103 @@ +enable cross-compilation of glibc on Darwin (build=Darwin, host=Linux) +* increase ulimit for open files: macOS default of 256 is too low for glibc build system +* use host version of ar, which is given by environment variable +* build system uses stamp.os and stamp.oS files, which only differ in case; + this fails on macOS, so replace .oS with .o_S +* libintl.h does not exist (and is not needed) on macOS + +--- glibc-2.27/Makefile.in 2018-02-01 17:17:18.000000000 +0100 ++++ glibc-2.27/Makefile.in 2019-02-15 17:38:27.022965553 +0100 +@@ -6,9 +6,11 @@ + .PHONY: all install bench + + all .DEFAULT: +- $(MAKE) -r PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@ ++ ulimit -n 1024; \ ++ $(MAKE) -r AR=$$AR PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@ + + install: ++ ulimit -n 1024; \ + LC_ALL=C; export LC_ALL; \ + $(MAKE) -r PARALLELMFLAGS="$(PARALLELMFLAGS)" -C $(srcdir) objdir=`pwd` $@ + +--- glibc-2.27/Makerules 2018-02-01 17:17:18.000000000 +0100 ++++ glibc-2.27/Makerules 2019-02-15 17:43:11.196039000 +0100 +@@ -915,8 +915,8 @@ + ifndef objects + + # Create the stamp$o files to keep the parent makefile happy. +-subdir_lib: $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o) +-$(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o): ++subdir_lib: $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$(subst .oS,.o_S,$o)) ++$(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$(subst .oS,.o_S,$o)): + $(make-target-directory) + rm -f $@; > $@ + else +@@ -927,7 +927,7 @@ + # The parent will then actually add them all to the archive in the + # archive rule, below. + define o-iterator-doit +-$(objpfx)stamp$o: $(o-objects); $$(do-stamp) ++$(objpfx)stamp$(subst .oS,.o_S,$o): $(o-objects); $$(do-stamp) + endef + define do-stamp + $(make-target-directory) +@@ -943,14 +943,14 @@ + # on the stamp files built above. + define o-iterator-doit + $(common-objpfx)$(patsubst %,$(libtype$o),c): \ +- $(subdirs-stamp-o) $(common-objpfx)stamp$o; $$(do-makelib) ++ $(subdirs-stamp-o) $(common-objpfx)stamp$(subst .oS,.o_S,$o); $$(do-makelib) + endef + define do-makelib + cd $(common-objdir) && \ + $(AR) $(CREATE_ARFLAGS) $(@F) `cat $(patsubst $(common-objpfx)%,%,$^)` + endef + subdirs-stamps := $(foreach d,$(subdirs),$(common-objpfx)$d/stamp%) +-subdirs-stamp-o = $(subst %,$o,$(subdirs-stamps)) ++subdirs-stamp-o = $(subst %,$(subst .oS,.o_S,$o),$(subdirs-stamps)) + ifndef subdir + $(subdirs-stamps): subdir_lib; + endif +@@ -961,7 +961,7 @@ + # This makes all the object files. + .PHONY: objects objs libobjs extra-objs + objects objs: libobjs extra-objs +-libobjs: $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$o) ++libobjs: $(foreach o,$(object-suffixes-for-libc),$(objpfx)stamp$(subst .oS,.o_S,$o)) + extra-objs: $(addprefix $(objpfx),$(extra-objs)) + + # Canned sequence for building an extra library archive. +@@ -1615,7 +1615,7 @@ + $(rmobjs) + define rmobjs + $(foreach o,$(object-suffixes-for-libc), +--rm -f $(objpfx)stamp$o $(o-objects)) ++-rm -f $(objpfx)stamp$(subst .oS,.o_S,$o) $(o-objects)) + endef + + # Also remove the dependencies and generated source files. +--- glibc-2.27/sunrpc/rpc_main.c 2019-02-15 17:32:43.710244513 +0100 ++++ glibc-2.27/sunrpc/rpc_main.c 2019-02-15 17:23:57.139617796 +0100 +@@ -38,7 +38,9 @@ + #include <stdio.h> + #include <string.h> + #include <unistd.h> ++#ifndef __APPLE__ + #include <libintl.h> ++#endif + #include <locale.h> + #include <ctype.h> + #include <sys/types.h> +--- glibc-2.27/sunrpc/rpc_scan.c 2019-02-15 17:32:54.845490606 +0100 ++++ glibc-2.27/sunrpc/rpc_scan.c 2019-02-15 17:24:54.288066644 +0100 +@@ -37,7 +37,9 @@ + #include <stdio.h> + #include <ctype.h> + #include <string.h> ++#ifndef __APPLE__ + #include <libintl.h> ++#endif + #include "rpc_scan.h" + #include "rpc_parse.h" + #include "rpc_util.h" diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index c7638ea5fe5..8dad69eb998 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg +{ config, stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg , gdk_pixbuf, xlibsWrapper, gobject-introspection , xineramaSupport ? stdenv.isLinux -, cupsSupport ? true, cups ? null +, cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null , gdktarget ? if stdenv.isDarwin then "quartz" else "x11" , AppKit, Cocoa , fetchpatch diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix index f41f6303e01..98096371e40 100644 --- a/pkgs/development/libraries/libtensorflow/default.nix +++ b/pkgs/development/libraries/libtensorflow/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ config, stdenv , fetchurl , patchelf -, cudaSupport ? false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11 +, cudaSupport ? config.cudaSupport or false, symlinkJoin, cudatoolkit, cudnn, nvidia_x11 }: with stdenv.lib; let diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 614df6fb063..57f1c9830a6 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU +{ config, lib, stdenv, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU , libGL, glew, ocl-icd, python3 -, cudaSupport ? false, cudatoolkit +, cudaSupport ? config.cudaSupport or false, cudatoolkit , darwin }: diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 30f8ad8e8a3..01214878cd8 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rivet-${version}"; - version = "2.6.2"; + version = "2.7.0"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "0yp3mllr2b4bhsmixjmmpl2n4x78bgw74a9xy2as4f10q3alkplx"; + sha256 = "12mlj2j1glidjhiaxlr25qz2vfb865wip1vwwg8vlyd3yzisf533"; }; patches = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { substituteInPlace analyses/Makefile.in \ --replace "!(tmp)" "" substituteInPlace bin/rivet-buildplugin.in \ - --replace '"which"' '"${which}/bin/which"' \ + --replace 'which' '"${which}/bin/which"' \ --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \ --replace 'mycxxflags="' "mycxxflags=\"-std=c++11 $NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK " ''; diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 59dab2beabd..b6e24c63222 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -62,8 +62,8 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; - qtwebengine = - optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch + qtwebengine = [ ./qtwebengine-no-build-skip.patch ] + ++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch ++ optional stdenv.isDarwin ./qtwebengine-darwin-sdk-10.10.patch; qtwebkit = [ ./qtwebkit.patch ]; }; @@ -94,7 +94,9 @@ let }; qtcharts = callPackage ../modules/qtcharts.nix {}; - qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; + qtconnectivity = callPackage ../modules/qtconnectivity.nix { + inherit cf-private; + }; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch b/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch new file mode 100644 index 00000000000..f332d5e1bb2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.11/qtwebengine-no-build-skip.patch @@ -0,0 +1,12 @@ +diff --git a/qtwebengine.pro b/qtwebengine.pro +--- a/qtwebengine.pro ++++ b/qtwebengine.pro +@@ -5,7 +5,7 @@ runConfigure() + + !isEmpty(skipBuildReason) { + SUBDIRS = +- log($${skipBuildReason}$${EOL}) ++ error($${skipBuildReason}$${EOL}) + log(QtWebEngine will not be built.$${EOL}) + } + diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 22535deb767..4b002837c3d 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -60,6 +60,7 @@ let qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; + qtwebengine = [ ./qtwebengine-no-build-skip.patch ]; qtwebkit = [ ./qtwebkit.patch ]; }; @@ -89,7 +90,9 @@ let }; qtcharts = callPackage ../modules/qtcharts.nix {}; - qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; + qtconnectivity = callPackage ../modules/qtconnectivity.nix { + inherit cf-private; + }; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.12/qtwebengine-no-build-skip.patch b/pkgs/development/libraries/qt-5/5.12/qtwebengine-no-build-skip.patch new file mode 100644 index 00000000000..f332d5e1bb2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.12/qtwebengine-no-build-skip.patch @@ -0,0 +1,12 @@ +diff --git a/qtwebengine.pro b/qtwebengine.pro +--- a/qtwebengine.pro ++++ b/qtwebengine.pro +@@ -5,7 +5,7 @@ runConfigure() + + !isEmpty(skipBuildReason) { + SUBDIRS = +- log($${skipBuildReason}$${EOL}) ++ error($${skipBuildReason}$${EOL}) + log(QtWebEngine will not be built.$${EOL}) + } + diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index bf0ae42ea1f..e493fc169ab 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -29,6 +29,7 @@ existing packages here and modify it as necessary. stdenv, fetchurl, fetchpatch, makeSetupHook, bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, + cf-private, # options developerBuild ? false, @@ -132,7 +133,9 @@ let /* qtactiveqt = not packaged */ /* qtandroidextras = not packaged */ /* qtcanvas3d = not packaged */ - qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; + qtconnectivity = callPackage ../modules/qtconnectivity.nix { + inherit cf-private; + }; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 68c6745bcb5..589f175efd9 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -43,6 +43,7 @@ let qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; qttools = [ ./qttools.patch ]; + qtwebengine = [ ./qtwebengine-no-build-skip.patch ]; qtwebkit = [ ./qtwebkit.patch ]; qtvirtualkeyboard = [ (fetchpatch { @@ -91,7 +92,9 @@ let }; qtcharts = callPackage ../modules/qtcharts.nix {}; - qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; + qtconnectivity = callPackage ../modules/qtconnectivity.nix { + inherit cf-private; + }; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine-no-build-skip.patch b/pkgs/development/libraries/qt-5/5.9/qtwebengine-no-build-skip.patch new file mode 100644 index 00000000000..f332d5e1bb2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine-no-build-skip.patch @@ -0,0 +1,12 @@ +diff --git a/qtwebengine.pro b/qtwebengine.pro +--- a/qtwebengine.pro ++++ b/qtwebengine.pro +@@ -5,7 +5,7 @@ runConfigure() + + !isEmpty(skipBuildReason) { + SUBDIRS = +- log($${skipBuildReason}$${EOL}) ++ error($${skipBuildReason}$${EOL}) + log(QtWebEngine will not be built.$${EOL}) + } + diff --git a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix index d866edb052b..17e7f0ee7cf 100644 --- a/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-5/modules/qtconnectivity.nix @@ -1,8 +1,8 @@ -{ qtModule, qtbase, qtdeclarative, bluez }: +{ qtModule, stdenv, qtbase, qtdeclarative, bluez, cf-private }: qtModule { name = "qtconnectivity"; qtInputs = [ qtbase qtdeclarative ]; - buildInputs = [ bluez ]; + buildInputs = if stdenv.isDarwin then [ cf-private ] else [ bluez ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix new file mode 100644 index 00000000000..0ea8107cad1 --- /dev/null +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -0,0 +1,47 @@ +{ stdenv, lib, fetchurl +, cmocka, doxygen, ibm-sw-tpm2, iproute, openssl, perl, pkgconfig, procps +, uthash, which }: + +stdenv.mkDerivation rec { + pname = "tpm2-tss"; + version = "2.2.0"; + + src = fetchurl { + url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; + sha256 = "10r5wgrq21p0y700gh5iirh26pc5gsaib2b8b2nzmbr27apiw4y9"; + }; + + nativeBuildInputs = [ + doxygen perl pkgconfig + # For unit tests and integration tests. + ibm-sw-tpm2 iproute procps which + ]; + buildInputs = [ + openssl + # For unit tests and integration tests. + cmocka uthash + ]; + + postPatch = "patchShebangs script"; + + configureFlags = [ + "--enable-unit" + "--enable-integration" + ]; + + doCheck = true; + + postInstall = '' + # Do not install the upstream udev rules, they rely on specific + # users/groups which aren't guaranteed to exist on the system. + rm -R $out/lib/udev + ''; + + meta = with lib; { + description = "OSS implementation of the TCG TPM2 Software Stack (TSS2)"; + homepage = https://github.com/tpm2-software/tpm2-tss; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ delroth ]; + }; +} diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index ad1cc2efc87..b4c79d7f816 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchgit, cmake -, cudaSupport ? false, cudatoolkit +{ config, stdenv, lib, fetchgit, cmake +, cudaSupport ? config.cudaSupport or false, cudatoolkit , ncclSupport ? false, nccl , llvmPackages }: diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index fc71c183240..69c781c1d98 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -91,6 +91,7 @@ , "pulp" , "react-tools" , "react-native-cli" +, "reveal.js" , "s3http" , "scuttlebot" , "semver" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index b63a0a9e869..7f2b73da2d9 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -13,33 +13,6 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.13.1" = { - name = "_at_angular-devkit_slash_architect"; - packageName = "@angular-devkit/architect"; - version = "0.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.13.1.tgz"; - sha512 = "QDmIbqde75ZZSEFbw6Q6kQWq4cY6C7D67yujXw6XTyubDNAs1tyXJyxTIB8vjSlEKwRizTTDd/B0ZXVcke3Mvw=="; - }; - }; - "@angular-devkit/core-7.3.1" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "7.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.1.tgz"; - sha512 = "56XDWWfIzOAkEk69lBLgmCYybPUA4yjunhmMlCk7vVdb7gbQUyzNjFD04Uj0GjlejatAQ5F76tRwygD9C+3RXQ=="; - }; - }; - "@angular-devkit/schematics-7.3.1" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "7.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-7.3.1.tgz"; - sha512 = "cd7usiasfSgw75INz72/VssrLr9tiVRYfo1TEdvr9ww0GuQbuQpB33xbV8W135eAV8+wzQ3Ce8ohaDHibvj6Yg=="; - }; - }; "@apollographql/apollo-tools-0.3.3" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; @@ -913,13 +886,13 @@ let sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; }; }; - "@iarna/toml-2.2.1" = { + "@iarna/toml-2.2.2" = { name = "_at_iarna_slash_toml"; packageName = "@iarna/toml"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.1.tgz"; - sha512 = "I2EjI9TbEFJNLziNPFfpo64PNanOaK17iL2kTW/jGlGOa4bvHw4VEied83kOEB7NJjXf1KfvmsQ2aEjy3xjiGg=="; + url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.2.tgz"; + sha512 = "xm/Wpip5LRK1y1ZlzQLC/pDHlk0e1lNpQgOqWamfZSAU9pbTBHJFLM8wS4EB7LOc3EySARf9lZoGVX7cO26tJQ=="; }; }; "@ionic/cli-framework-1.6.1" = { @@ -1489,13 +1462,13 @@ let sha512 = "5YRqYNZOAaL7+nt7w3Scp6Sz4P2g7wKFP9npx1xdExMomk8/M/ICXVLYVam2wzxeY0cIc6wcKpjC5KI4jiNbGw=="; }; }; - "@octokit/rest-16.15.0" = { + "@octokit/rest-16.16.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.15.0"; + version = "16.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.15.0.tgz"; - sha512 = "Un+e7rgh38RtPOTe453pT/KPM/p2KZICimBmuZCd2wEo8PacDa4h6RqTPZs+f2DPazTTqdM7QU4LKlUjgiBwWw=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.16.0.tgz"; + sha512 = "Q6L5OwQJrdJ188gLVmUHLKNXBoeCU0DynKPYW8iZQQoGNGws2hkP/CePVNlzzDgmjuv7o8dCrJgecvDcIHccTA=="; }; }; "@parcel/fs-1.11.0" = { @@ -1633,24 +1606,6 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@schematics/angular-7.3.1" = { - name = "_at_schematics_slash_angular"; - packageName = "@schematics/angular"; - version = "7.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-7.3.1.tgz"; - sha512 = "0Ne8APPlTAjKg5CSZqluwCuW/5yPjr3ALCWzqwPxN0suE745usThtasBmqrjw0RMIt8nRqRgtg54Z7lCPO9ZFg=="; - }; - }; - "@schematics/update-0.13.1" = { - name = "_at_schematics_slash_update"; - packageName = "@schematics/update"; - version = "0.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.13.1.tgz"; - sha512 = "EHOqolT/d/jRGuVTCUESLpk8JNpuaPlsVHfeK7Kdp/t0wSEnmtOelZX4+leS25lGXDaDUF3138ntjrZR4n6bGw=="; - }; - }; "@sindresorhus/is-0.14.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; @@ -1669,22 +1624,22 @@ let sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; }; }; - "@snyk/dep-graph-1.1.2" = { + "@snyk/dep-graph-1.4.0" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.1.2"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.1.2.tgz"; - sha512 = "mCoAFKtmezBL61JOzLMzqqd/sXXxp0iektEwf4zw+sM3zuG4Tnmhf8OqNO6Wscn84bMIfLlI/nvECdxvSS7MTw=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.4.0.tgz"; + sha512 = "dz4Fo4L9sN0Rt8hMe+zMYZ4mAiljtyIeWvujLyCxhIT5iHSlceUYlba5TDsOFuKyuZKkuhVjORWY1oFEuRzCcA=="; }; }; - "@snyk/gemfile-1.1.0" = { + "@snyk/gemfile-1.2.0" = { name = "_at_snyk_slash_gemfile"; packageName = "@snyk/gemfile"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.1.0.tgz"; - sha512 = "mLwF+ccuvRZMS0SxUAxA3dAp8mB3m2FxIsBIUWFTYvzxl+E4XTZb8uFrUqXHbcxhZH1Z8taHohNTbzXZn3M8ag=="; + url = "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.2.0.tgz"; + sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -2866,15 +2821,6 @@ let sha512 = "7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg=="; }; }; - "ajv-6.7.0" = { - name = "ajv"; - packageName = "ajv"; - version = "6.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz"; - sha512 = "RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg=="; - }; - }; "ajv-6.9.1" = { name = "ajv"; packageName = "ajv"; @@ -3010,6 +2956,15 @@ let sha512 = "SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA=="; }; }; + "ansi-colors-3.2.3" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; + sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; + }; + }; "ansi-cyan-0.1.1" = { name = "ansi-cyan"; packageName = "ansi-cyan"; @@ -4414,13 +4369,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.404.0" = { + "aws-sdk-2.405.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.404.0"; + version = "2.405.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.404.0.tgz"; - sha512 = "eQ+hv2hOpcyHUoUUIXcb7TVItzFfgTC0HIribcaDlbF4Kc1p9PSg+2jnK7ibjT6iMcoERx9Hr/vt6Cfc3Sgh5w=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.405.0.tgz"; + sha512 = "krgJBy/5FFGFjlOoODLH4ryXqUSQKz6He6QdIboKXvjIEV2CNxsoB+tFaThKD3SZmFcRxoWjho7R17dIlswTtQ=="; }; }; "aws-sign2-0.6.0" = { @@ -7114,22 +7069,13 @@ let sha1 = "798e689778151c8076b4b360e5edd28cda2bb468"; }; }; - "chokidar-2.0.4" = { - name = "chokidar"; - packageName = "chokidar"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz"; - sha512 = "z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ=="; - }; - }; - "chokidar-2.1.1" = { + "chokidar-2.1.2" = { name = "chokidar"; packageName = "chokidar"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.1.tgz"; - sha512 = "gfw3p2oQV2wEt+8VuMlNsPjCxDxvvgnm/kz+uATu805mWVF8IJN7uz9DN7iBz+RMJISmiVbCOBFs9qBGMjtPfQ=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-2.1.2.tgz"; + sha512 = "IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg=="; }; }; "chownr-0.0.2" = { @@ -8077,15 +8023,6 @@ let sha512 = "b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="; }; }; - "commander-2.15.1" = { - name = "commander"; - packageName = "commander"; - version = "2.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz"; - sha512 = "VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="; - }; - }; "commander-2.17.1" = { name = "commander"; packageName = "commander"; @@ -8257,13 +8194,13 @@ let sha1 = "524a9f10903f3a813389b0225d27c48bb751890f"; }; }; - "compressible-2.0.15" = { + "compressible-2.0.16" = { name = "compressible"; packageName = "compressible"; - version = "2.0.15"; + version = "2.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.15.tgz"; - sha512 = "4aE67DL33dSW9gw4CI2H/yTxqHLNcxp0yS6jB+4h+wr3e43+1z7vm0HU9qXOH8j+qjKuL8+UtkOxYQSMq60Ylw=="; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.16.tgz"; + sha512 = "JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA=="; }; }; "compression-1.5.2" = { @@ -12165,13 +12102,13 @@ let sha512 = "D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ=="; }; }; - "eslint-5.14.0" = { + "eslint-5.14.1" = { name = "eslint"; packageName = "eslint"; - version = "5.14.0"; + version = "5.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.14.0.tgz"; - sha512 = "jrOhiYyENRrRnWlMYANlGZTqb89r2FuRT+615AabBoajhNjeh9ywDNlh2LU9vTqf0WYN+L3xdXuIi7xuj/tK9w=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.14.1.tgz"; + sha512 = "CyUMbmsjxedx8B0mr79mNOqetvkbij/zrXnFeK2zc3pGRn3/tibjiNAv/3UxFEyfMDjh+ZqTrJrEGBFiGfD5Og=="; }; }; "eslint-plugin-no-unsafe-innerhtml-1.0.16" = { @@ -13668,6 +13605,15 @@ let sha512 = "lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q=="; }; }; + "flat-4.1.0" = { + name = "flat"; + packageName = "flat"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz"; + sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="; + }; + }; "flat-cache-1.3.4" = { name = "flat-cache"; packageName = "flat-cache"; @@ -15884,15 +15830,6 @@ let sha1 = "2c05ffaef90b68e860f3fd2b54ef580989277ee2"; }; }; - "he-1.1.1" = { - name = "he"; - packageName = "he"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; - sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; - }; - }; "he-1.2.0" = { name = "he"; packageName = "he"; @@ -16181,13 +16118,13 @@ let sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; }; }; - "http-errors-1.7.1" = { + "http-errors-1.7.2" = { name = "http-errors"; packageName = "http-errors"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.1.tgz"; - sha512 = "jWEUgtZWGSMba9I1N3gc1HmvpBUaNC9vDdA46yScAdp+C5rdEuKWUBLWTQpW9FwSWSbYYs++b6SDCxf9UEJzfw=="; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; }; }; "http-headers-3.0.2" = { @@ -16865,15 +16802,6 @@ let sha512 = "QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg=="; }; }; - "inquirer-6.2.1" = { - name = "inquirer"; - packageName = "inquirer"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz"; - sha512 = "088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg=="; - }; - }; "inquirer-6.2.2" = { name = "inquirer"; packageName = "inquirer"; @@ -17243,6 +17171,15 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; + "is-buffer-2.0.3" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz"; + sha512 = "U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="; + }; + }; "is-callable-1.1.4" = { name = "is-callable"; packageName = "is-callable"; @@ -17765,15 +17702,6 @@ let sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; }; }; - "is-relative-url-2.0.0" = { - name = "is-relative-url"; - packageName = "is-relative-url"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-relative-url/-/is-relative-url-2.0.0.tgz"; - sha1 = "72902d7fe04b3d4792e7db15f9db84b7204c9cef"; - }; - }; "is-resolvable-1.1.0" = { name = "is-resolvable"; packageName = "is-resolvable"; @@ -19458,15 +19386,6 @@ let sha1 = "bf967ba0dd31faaf09ab5bdb3676ad7f2aa18493"; }; }; - "link-check-4.4.4" = { - name = "link-check"; - packageName = "link-check"; - version = "4.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/link-check/-/link-check-4.4.4.tgz"; - sha512 = "yvowNBZEMOFH9nGLiJ5/YV68PBMVTo4opC2SzcACO8g4gSPTB9Rwa5GIziOX9Z5Er3Yf01DHoOyVV2LeApIw8w=="; - }; - }; "linkify-it-2.1.0" = { name = "linkify-it"; packageName = "linkify-it"; @@ -21141,15 +21060,6 @@ let sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw=="; }; }; - "markdown-link-extractor-1.2.0" = { - name = "markdown-link-extractor"; - packageName = "markdown-link-extractor"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-extractor/-/markdown-link-extractor-1.2.0.tgz"; - sha512 = "1unDsoZSSiF5oGFu/2y8M3E2I2YhWT/jiKGTQxa1IAmkC1OcyHo9OYNu3qCuVSj5Ty87+mFtgQxJPUfc08WirA=="; - }; - }; "markdown-table-0.4.0" = { name = "markdown-table"; packageName = "markdown-table"; @@ -21168,15 +21078,6 @@ let sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; }; }; - "marked-0.4.0" = { - name = "marked"; - packageName = "marked"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.4.0.tgz"; - sha512 = "tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw=="; - }; - }; "matchdep-2.0.0" = { name = "matchdep"; packageName = "matchdep"; @@ -22329,13 +22230,13 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "multiserver-3.1.2" = { + "multiserver-3.2.0" = { name = "multiserver"; packageName = "multiserver"; - version = "3.1.2"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/multiserver/-/multiserver-3.1.2.tgz"; - sha512 = "6jXoKH0vGfm5NxwaSkReuD+3VB9mq25WYsdMgB7YC43XboVCufhmFQ724DVz0Jx8Z8RNPKvjVfCiuXpsKgwV0Q=="; + url = "https://registry.npmjs.org/multiserver/-/multiserver-3.2.0.tgz"; + sha512 = "cJ9nnh/+aMwOpegTPSLC1zFRFJKn6f3va6WI0WPV84R55Llh8TinhpH8ZrpYfRofETykRWIvWhX6sQRZg04F1Q=="; }; }; "multiserver-address-1.0.1" = { @@ -23035,6 +22936,15 @@ let sha512 = "Li9NfZTL83/URoUEWly+iHJeOcZRBYUaeIL4MImnB4r21oe/xpkR6JRHjdNjLf1rMtO0tgPyOvuGW4Beytaaow=="; }; }; + "node-environment-flags-1.0.4" = { + name = "node-environment-flags"; + packageName = "node-environment-flags"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.4.tgz"; + sha512 = "M9rwCnWVLW7PX+NUWe3ejEdiLYinRpsEre9hMkU/6NS4h+EEulYaDH1gCEZ2gyXsmw+RXYDaV2JkkTNcsPDJ0Q=="; + }; + }; "node-fetch-1.7.3" = { name = "node-fetch"; packageName = "node-fetch"; @@ -24872,22 +24782,13 @@ let sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; }; }; - "pacote-9.4.0" = { - name = "pacote"; - packageName = "pacote"; - version = "9.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-9.4.0.tgz"; - sha512 = "WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w=="; - }; - }; - "pacote-9.4.1" = { + "pacote-9.5.0" = { name = "pacote"; packageName = "pacote"; - version = "9.4.1"; + version = "9.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-9.4.1.tgz"; - sha512 = "YKSRsQqmeHxgra0KCdWA2FtVxDPUlBiCdmew+mSe44pzlx5t1ViRMWiQg18T+DREA+vSqYfKzynaToFR4hcKHw=="; + url = "https://registry.npmjs.org/pacote/-/pacote-9.5.0.tgz"; + sha512 = "aUplXozRbzhaJO48FaaeClmN+2Mwt741MC6M3bevIGZwdCaP7frXzbUOfOWa91FPHoLITzG0hYaKY363lxO3bg=="; }; }; "pad-0.0.5" = { @@ -28581,13 +28482,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp-tree-0.1.4" = { + "regexp-tree-0.1.5" = { name = "regexp-tree"; packageName = "regexp-tree"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.4.tgz"; - sha512 = "DohP6WXzgrc7gFs9GsTQgigUfMXZqXkPk+20qkMF6YCy0Qk0FsHL1/KtxTycGR/62DHRtJ1MHQF2g8YzywP4kA=="; + url = "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.5.tgz"; + sha512 = "nUmxvfJyAODw+0B13hj8CFVAxhe7fDEAgJgaotBu3nnR+IgGgZq59YedJP5VYTlkEfqjuK6TuRpnymKdatLZfQ=="; }; }; "regexp.prototype.flags-1.2.0" = { @@ -29580,15 +29481,6 @@ let sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw=="; }; }; - "rxjs-6.3.3" = { - name = "rxjs"; - packageName = "rxjs"; - version = "6.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz"; - sha512 = "JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw=="; - }; - }; "rxjs-6.4.0" = { name = "rxjs"; packageName = "rxjs"; @@ -29922,15 +29814,6 @@ let sha1 = "13e8c2658ab9691cb0cd71093240280d36f77a5b"; }; }; - "semver-intersect-1.4.0" = { - name = "semver-intersect"; - packageName = "semver-intersect"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz"; - sha512 = "d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ=="; - }; - }; "semver-regex-1.0.0" = { name = "semver-regex"; packageName = "semver-regex"; @@ -30210,6 +30093,15 @@ let sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; }; }; + "setprototypeof-1.1.1" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + }; + }; "sha.js-2.4.11" = { name = "sha.js"; packageName = "sha.js"; @@ -30759,13 +30651,13 @@ let sha512 = "SQE4sudrscd48EoRJqy5h5S6c8YBiOw0r0Se3rfg1l6ElJGgCB9je6XEzfe+UmfES06D7ueFYepiQPxTwH4Qww=="; }; }; - "snyk-1.133.0" = { + "snyk-1.134.2" = { name = "snyk"; packageName = "snyk"; - version = "1.133.0"; + version = "1.134.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.133.0.tgz"; - sha512 = "/6xQISFy08oWJasSye77eOaRScPkTIzD7AZYlSWfyS+flYJHgUhNJcTimXGcDwwBmfPtESpDtFpB1LBA16NUOg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.134.2.tgz"; + sha512 = "WGR3TTZxXOdALEEcQtADFEOHaanhbzwLvS6gyg5vF6Akj7qRAwIIXYBUycbNdAax1mylAsXCzR352dkTwKD9lg=="; }; }; "snyk-config-2.2.0" = { @@ -30777,6 +30669,15 @@ let sha512 = "mq0wbP/AgjcmRq5i5jg2akVVV3iSYUPTowZwKn7DChRLDL8ySOzWAwan+ImXiyNbrWo87FNI/15O6MpOnTxOIg=="; }; }; + "snyk-config-2.2.1" = { + name = "snyk-config"; + packageName = "snyk-config"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.1.tgz"; + sha512 = "eCsFKHHE4J2DpD/1NzAtCmkmVDK310OXRtmoW0RlLnld1ESprJ5A/QRJ5Zxx1JbA8gjuwERY5vfUFA8lEJeopA=="; + }; + }; "snyk-docker-plugin-1.12.3" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; @@ -30885,22 +30786,22 @@ let sha512 = "3qIndzkxCxiaGvAwMkqChbChGdwhNePPyfi0WjhC/nJGwecqU3Fb/NeTW7lgyT+xoq/dFnzW0DgBJ4+AyNA2gA=="; }; }; - "snyk-nuget-plugin-1.7.1" = { + "snyk-nuget-plugin-1.7.2" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.7.1.tgz"; - sha512 = "j4VavJ9HtDDnLZgqJRFzXfBLErC3YtIwAwvECL2xs3q2mVQlw3GpWH+6gQJVfzRm8CWZpbDNdr1DD5lkXxTXXg=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.7.2.tgz"; + sha512 = "zmYD9veH7OeIqGnZHiGv8c8mKtmYrxo2o7P4lNUkpHdCMMsar7moRJxGgO9WlcIrwAGjIhMdP9fUvJ+jVDEteQ=="; }; }; - "snyk-paket-parser-1.4.1" = { + "snyk-paket-parser-1.4.3" = { name = "snyk-paket-parser"; packageName = "snyk-paket-parser"; - version = "1.4.1"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.4.1.tgz"; - sha512 = "JabIAWwbjfSOkR0os6/KkdkLt7MN6ILFbyP5KgPxGP26V+1bJyXP24/h1blq/0dQY8UOiCQ62eP6Ycv+lfzCBg=="; + url = "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.4.3.tgz"; + sha512 = "6m736zGVoeT/zS9KEtlmqTSPEPjAfLe8iYoQ3AwbyxDhzuLY49lTaV67MyZtGwjhi1x4KBe+XOgeWwyf6Avf/A=="; }; }; "snyk-php-plugin-1.5.1" = { @@ -31173,13 +31074,13 @@ let sha512 = "+2r83WaRT3PXYoO/1z+RDEBE7Z2f9YcdQnJ0K/ncXXbV5gJ6wYfNAebYFYiiUjM6E4JyXnPY8cimwyvFYHVUUA=="; }; }; - "socks-2.3.1" = { + "socks-2.3.2" = { name = "socks"; packageName = "socks"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.3.1.tgz"; - sha512 = "srMrPbfQnLOVRDv/sQvBeM4rvFvKT4ErhdcXejaLHLQFPmCMt5XPF0TeE9Uv3iVa+GpXDevs1VgqZgwykr78Yw=="; + url = "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz"; + sha512 = "pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ=="; }; }; "socks-proxy-agent-3.0.1" = { @@ -31389,15 +31290,6 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "source-map-0.7.3" = { - name = "source-map"; - packageName = "source-map"; - version = "0.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"; - sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; - }; - }; "source-map-resolve-0.5.2" = { name = "source-map-resolve"; packageName = "source-map-resolve"; @@ -32874,22 +32766,22 @@ let sha512 = "Ts0Mu/A1S1aZxEJNG88I4Oc9rcZSBFNac5e27yh4j2mqbhZSSzR1Ah79EYwSn9Zuh7lrlGD2cVGzw1RKGzyLSg=="; }; }; - "supports-color-5.4.0" = { + "supports-color-5.5.0" = { name = "supports-color"; packageName = "supports-color"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz"; - sha512 = "zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w=="; + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; - "supports-color-5.5.0" = { + "supports-color-6.0.0" = { name = "supports-color"; packageName = "supports-color"; - version = "5.5.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; + sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; }; }; "supports-color-6.1.0" = { @@ -34342,15 +34234,6 @@ let sha512 = "tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA=="; }; }; - "typescript-3.2.4" = { - name = "typescript"; - packageName = "typescript"; - version = "3.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz"; - sha512 = "0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="; - }; - }; "typewise-1.0.3" = { name = "typewise"; packageName = "typewise"; @@ -37142,6 +37025,15 @@ let sha512 = "yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ=="; }; }; + "yargs-unparser-1.5.0" = { + name = "yargs-unparser"; + packageName = "yargs-unparser"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.5.0.tgz"; + sha512 = "HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw=="; + }; + }; "yauzl-2.10.0" = { name = "yauzl"; packageName = "yauzl"; @@ -37298,444 +37190,6 @@ let }; in { - "@angular/cli" = nodeEnv.buildNodePackage { - name = "_at_angular_slash_cli"; - packageName = "@angular/cli"; - version = "7.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-7.3.1.tgz"; - sha512 = "8EvXYRhTqTaTk5PKv7VZxIWJiyG51R9RC9gtpRFx4bbnurqBHdEUxGMmaRsGT8QDbfvVsWnuakE0eeW1CrfZAQ=="; - }; - dependencies = [ - sources."@angular-devkit/architect-0.13.1" - sources."@angular-devkit/core-7.3.1" - sources."@angular-devkit/schematics-7.3.1" - sources."@schematics/angular-7.3.1" - sources."@schematics/update-0.13.1" - sources."@yarnpkg/lockfile-1.1.0" - sources."JSONStream-1.3.5" - sources."agent-base-4.2.1" - sources."agentkeepalive-3.5.2" - sources."ajv-6.7.0" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" - sources."anymatch-2.0.0" - sources."aproba-1.2.0" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-unique-0.3.2" - sources."assign-symbols-1.0.0" - sources."async-each-1.0.1" - sources."atob-2.1.2" - sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."binary-extensions-1.13.0" - sources."bluebird-3.5.3" - sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) - sources."buffer-from-1.1.1" - sources."builtins-1.0.3" - sources."cacache-11.3.2" - sources."cache-base-1.0.1" - sources."chalk-2.4.2" - sources."chardet-0.7.0" - sources."chokidar-2.0.4" - sources."chownr-1.1.1" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" - sources."collection-visit-1.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."component-emitter-1.2.1" - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."copy-concurrently-1.0.5" - sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" - sources."cyclist-0.2.2" - sources."debug-2.6.9" - sources."decode-uri-component-0.2.0" - sources."define-property-2.0.2" - sources."duplexify-3.7.1" - sources."encoding-0.1.12" - sources."end-of-stream-1.4.1" - sources."err-code-1.1.2" - sources."es6-promise-4.2.6" - sources."es6-promisify-5.0.0" - sources."escape-string-regexp-1.0.5" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" - ]; - }) - sources."extend-shallow-3.0.2" - sources."external-editor-3.0.3" - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) - sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" - sources."figgy-pudding-3.5.1" - sources."figures-2.0.0" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) - sources."flush-write-stream-1.1.1" - sources."for-in-1.0.2" - sources."fragment-cache-0.2.1" - sources."from2-2.3.0" - sources."fs-minipass-1.2.5" - sources."fs-write-stream-atomic-1.0.10" - sources."fs.realpath-1.0.0" - sources."fsevents-1.2.7" - sources."genfun-5.0.0" - sources."get-stream-4.1.0" - sources."get-value-2.0.6" - sources."glob-7.1.3" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."graceful-fs-4.1.15" - sources."has-flag-3.0.0" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."hosted-git-info-2.7.1" - sources."http-cache-semantics-3.8.1" - (sources."http-proxy-agent-2.1.0" // { - dependencies = [ - sources."debug-3.1.0" - ]; - }) - (sources."https-proxy-agent-2.2.1" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.1" - ]; - }) - sources."humanize-ms-1.2.1" - sources."iconv-lite-0.4.24" - sources."iferr-0.1.5" - sources."ignore-walk-3.0.1" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.3" - sources."ini-1.3.5" - sources."inquirer-6.2.1" - sources."ip-1.1.5" - sources."is-accessor-descriptor-1.0.0" - sources."is-binary-path-1.0.1" - sources."is-buffer-1.1.6" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-extendable-1.0.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" - sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."json-parse-better-errors-1.0.2" - sources."json-schema-traverse-0.4.1" - sources."jsonparse-1.3.1" - sources."kind-of-6.0.2" - sources."lodash-4.17.11" - sources."lodash.debounce-4.0.8" - sources."lru-cache-5.1.1" - (sources."make-fetch-happen-4.0.1" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."micromatch-3.1.10" - sources."mimic-fn-1.2.0" - sources."minimatch-3.0.4" - sources."minimist-0.0.8" - sources."minipass-2.3.5" - sources."minizlib-1.2.1" - sources."mississippi-3.0.0" - sources."mixin-deep-1.3.1" - sources."mkdirp-0.5.1" - sources."move-concurrently-1.0.1" - sources."ms-2.0.0" - sources."mute-stream-0.0.7" - sources."nan-2.12.1" - sources."nanomatch-1.2.13" - sources."node-fetch-npm-2.0.2" - sources."normalize-package-data-2.5.0" - sources."normalize-path-2.1.1" - sources."npm-bundled-1.0.6" - sources."npm-package-arg-6.1.0" - sources."npm-packlist-1.3.0" - sources."npm-pick-manifest-2.2.3" - (sources."npm-registry-fetch-3.9.0" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" - sources."once-1.4.0" - sources."onetime-2.0.1" - sources."opn-5.4.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" - sources."pacote-9.4.0" - sources."parallel-transform-1.1.0" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" - sources."posix-character-classes-0.1.1" - sources."process-nextick-args-2.0.0" - sources."promise-inflight-1.0.1" - sources."promise-retry-1.1.1" - sources."protoduck-5.0.1" - sources."pseudomap-1.0.2" - sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) - sources."punycode-2.1.1" - sources."readable-stream-2.3.6" - sources."readdirp-2.2.1" - sources."regex-not-1.0.2" - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" - sources."resolve-1.10.0" - sources."resolve-url-0.2.1" - sources."restore-cursor-2.0.0" - sources."ret-0.1.15" - sources."retry-0.10.1" - sources."rimraf-2.6.3" - sources."run-async-2.3.0" - sources."run-queue-1.0.3" - sources."rxjs-6.3.3" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - sources."safer-buffer-2.1.2" - sources."semver-5.6.0" - sources."semver-intersect-1.4.0" - (sources."set-value-2.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - ]; - }) - sources."signal-exit-3.0.2" - sources."smart-buffer-4.0.2" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."is-extendable-0.1.1" - sources."kind-of-5.1.0" - sources."source-map-0.5.7" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."socks-2.2.3" - sources."socks-proxy-agent-4.0.1" - sources."source-map-0.7.3" - sources."source-map-resolve-0.5.2" - sources."source-map-url-0.4.0" - sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" - sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.3" - sources."split-string-3.1.0" - sources."ssri-6.0.1" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."stream-each-1.2.3" - sources."stream-shift-1.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - sources."string_decoder-1.1.1" - (sources."strip-ansi-5.0.0" // { - dependencies = [ - sources."ansi-regex-4.0.0" - ]; - }) - sources."supports-color-5.5.0" - sources."symbol-observable-1.2.0" - sources."tar-4.4.8" - sources."through-2.3.8" - sources."through2-2.0.5" - sources."tmp-0.0.33" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" - sources."tslib-1.9.3" - sources."typedarray-0.0.6" - sources."typescript-3.2.4" - (sources."union-value-1.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - sources."is-extendable-0.1.1" - sources."set-value-0.4.3" - ]; - }) - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.1" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."upath-1.1.0" - sources."uri-js-4.2.2" - sources."urix-0.1.0" - sources."use-3.1.1" - sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-3.0.0" - sources."which-1.3.1" - sources."wrappy-1.0.2" - sources."xtend-4.0.1" - sources."y18n-4.0.0" - sources."yallist-3.0.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "CLI tool for Angular"; - homepage = https://github.com/angular/angular-cli; - license = "MIT"; - }; - production = true; - bypassCache = true; - }; asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; @@ -38894,7 +38348,7 @@ in sources."color-name-1.1.3" sources."combine-source-map-0.8.0" sources."combined-stream-1.0.7" - sources."compressible-2.0.15" + sources."compressible-2.0.16" sources."compression-1.7.3" sources."concat-map-0.0.1" (sources."concat-stream-1.5.2" // { @@ -40594,7 +40048,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.2" sources."asynckit-0.4.0" - sources."aws-sdk-2.404.0" + sources."aws-sdk-2.405.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.0" @@ -41824,10 +41278,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "5.14.0"; + version = "5.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-5.14.0.tgz"; - sha512 = "jrOhiYyENRrRnWlMYANlGZTqb89r2FuRT+615AabBoajhNjeh9ywDNlh2LU9vTqf0WYN+L3xdXuIi7xuj/tK9w=="; + url = "https://registry.npmjs.org/eslint/-/eslint-5.14.1.tgz"; + sha512 = "CyUMbmsjxedx8B0mr79mNOqetvkbij/zrXnFeK2zc3pGRn3/tibjiNAv/3UxFEyfMDjh+ZqTrJrEGBFiGfD5Og=="; }; dependencies = [ sources."@babel/code-frame-7.0.0" @@ -41999,7 +41453,7 @@ in sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" sources."escape-string-regexp-1.0.5" - sources."eslint-5.14.0" + sources."eslint-5.14.1" sources."eslint-scope-4.0.0" sources."eslint-utils-1.3.1" sources."eslint-visitor-keys-1.0.0" @@ -42961,6 +42415,7 @@ in sources."chloride-2.2.10" sources."chloride-test-1.2.2" sources."commander-2.19.0" + sources."debug-4.1.1" sources."deep-equal-1.0.1" sources."deep-extend-0.6.0" sources."diff-3.5.0" @@ -43003,8 +42458,9 @@ in }) sources."moment-2.24.0" sources."moo-0.4.3" + sources."ms-2.1.1" sources."multicb-1.2.2" - sources."multiserver-3.1.2" + sources."multiserver-3.2.0" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.4.2" @@ -43076,7 +42532,7 @@ in sources."separator-escape-0.0.0" sources."sha.js-2.4.5" sources."smart-buffer-4.0.2" - sources."socks-2.3.1" + sources."socks-2.3.2" sources."sodium-browserify-1.2.4" (sources."sodium-browserify-tweetnacl-0.2.3" // { dependencies = [ @@ -44077,7 +43533,7 @@ in sources."buffer-from-1.1.1" sources."cache-base-1.0.1" sources."camelcase-3.0.0" - (sources."chokidar-2.1.1" // { + (sources."chokidar-2.1.2" // { dependencies = [ sources."normalize-path-3.0.0" ]; @@ -44825,8 +44281,8 @@ in sha512 = "Zn+mo0NNXIW7+pWfdIZx49IfmuVI4I1UPjZhXFvc0Rq7fHul//gbVASrnxtiTbOOCNvD4JKVvKkpo4BNDzHi6w=="; }; dependencies = [ - sources."@snyk/dep-graph-1.1.2" - sources."@snyk/gemfile-1.1.0" + sources."@snyk/dep-graph-1.4.0" + sources."@snyk/gemfile-1.2.0" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.2.1" @@ -44889,7 +44345,7 @@ in sources."core-js-2.3.0" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" - sources."cross-spawn-5.1.0" + sources."cross-spawn-6.0.5" sources."crypto-random-string-1.0.0" sources."csslint-1.0.5" sources."dashdash-1.14.1" @@ -44924,7 +44380,7 @@ in sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."execa-0.7.0" + sources."execa-0.10.0" sources."exit-0.1.2" sources."extend-3.0.2" sources."external-editor-2.2.0" @@ -45048,7 +44504,7 @@ in sources."lodash.set-4.3.2" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - sources."macos-release-1.1.0" + sources."macos-release-2.0.0" sources."make-dir-1.3.0" sources."mime-db-1.38.0" sources."mime-types-2.1.22" @@ -45074,6 +44530,7 @@ in ]; }) sources."netmask-1.0.6" + sources."nice-try-1.0.5" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" @@ -45082,7 +44539,7 @@ in sources."opn-5.4.0" sources."optionator-0.8.2" sources."os-locale-1.4.0" - sources."os-name-2.0.1" + sources."os-name-3.0.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."pac-proxy-agent-2.0.2" @@ -45144,16 +44601,16 @@ in sources."shelljs-0.3.0" sources."signal-exit-3.0.2" sources."smart-buffer-1.1.15" - sources."snyk-1.133.0" - sources."snyk-config-2.2.0" + sources."snyk-1.134.2" + sources."snyk-config-2.2.1" sources."snyk-docker-plugin-1.22.0" sources."snyk-go-plugin-1.6.1" sources."snyk-gradle-plugin-2.1.3" sources."snyk-module-1.9.1" sources."snyk-mvn-plugin-2.0.1" sources."snyk-nodejs-lockfile-parser-1.11.0" - sources."snyk-nuget-plugin-1.7.1" - sources."snyk-paket-parser-1.4.1" + sources."snyk-nuget-plugin-1.7.2" + sources."snyk-paket-parser-1.4.3" sources."snyk-php-plugin-1.5.2" sources."snyk-policy-1.13.3" sources."snyk-python-plugin-1.9.1" @@ -45177,7 +44634,12 @@ in sources."supports-color-5.5.0" sources."temp-dir-1.0.0" sources."tempfile-2.0.0" - sources."term-size-1.2.0" + (sources."term-size-1.2.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + sources."execa-0.7.0" + ]; + }) sources."then-fs-2.0.0" sources."through-2.3.8" sources."thunkify-2.1.2" @@ -45205,8 +44667,8 @@ in sources."vscode-languageserver-types-3.14.0" sources."which-1.3.1" sources."widest-line-2.0.1" - sources."win-release-1.1.1" sources."window-size-0.1.4" + sources."windows-release-3.1.0" sources."wordwrap-1.0.0" (sources."wrap-ansi-2.1.0" // { dependencies = [ @@ -46168,7 +45630,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.7" - sources."compressible-2.0.15" + sources."compressible-2.0.16" sources."compression-1.7.3" sources."configstore-3.1.2" sources."connect-pause-0.1.1" @@ -46488,7 +45950,7 @@ in sources."bytes-3.0.0" sources."cache-base-1.0.1" sources."callsite-1.0.0" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" sources."circular-json-0.5.9" (sources."class-utils-0.3.6" // { dependencies = [ @@ -47268,7 +46730,7 @@ in sources."@octokit/endpoint-3.1.3" sources."@octokit/plugin-enterprise-rest-2.1.1" sources."@octokit/request-2.3.0" - sources."@octokit/rest-16.15.0" + sources."@octokit/rest-16.16.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.2.1" @@ -47764,7 +47226,7 @@ in sources."p-reduce-1.0.0" sources."p-try-2.0.0" sources."p-waterfall-1.0.0" - sources."pacote-9.4.1" + sources."pacote-9.5.0" sources."parallel-transform-1.1.0" sources."parse-github-repo-url-1.4.1" sources."parse-json-4.0.0" @@ -48185,7 +47647,7 @@ in ]; }) sources."cache-base-1.0.1" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -49276,7 +48738,7 @@ in ]; }) sources."cherow-1.6.9" - (sources."chokidar-2.1.1" // { + (sources."chokidar-2.1.2" // { dependencies = [ sources."array-unique-0.3.2" sources."braces-2.3.2" @@ -49963,7 +49425,7 @@ in sources."regenerator-transform-0.13.3" sources."regex-cache-0.4.4" sources."regex-not-1.0.2" - sources."regexp-tree-0.1.4" + sources."regexp-tree-0.1.5" sources."regexpu-core-4.4.0" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { @@ -50349,94 +49811,6 @@ in production = true; bypassCache = true; }; - markdown-link-check = nodeEnv.buildNodePackage { - name = "markdown-link-check"; - packageName = "markdown-link-check"; - version = "3.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-link-check/-/markdown-link-check-3.7.2.tgz"; - sha512 = "rt6d75iz0Bw9LHmN+DT1a7kiVrkK3gsGhPVB/PwwZDq8LHlILQToC/hwq9tE2CUDg8OdZOV1+7j8vuG9Mu4sIQ=="; - }; - dependencies = [ - sources."ajv-6.9.1" - sources."ansi-styles-3.2.1" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" - sources."async-2.6.2" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.8.0" - sources."bcrypt-pbkdf-1.0.2" - sources."caseless-0.12.0" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."combined-stream-1.0.7" - sources."commander-2.19.0" - sources."core-util-is-1.0.2" - sources."dashdash-1.14.1" - sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.2" - sources."escape-string-regexp-1.0.5" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-2.0.1" - sources."fast-json-stable-stringify-2.0.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."getpass-0.1.7" - sources."har-schema-2.0.0" - sources."har-validator-5.1.3" - sources."has-flag-3.0.0" - sources."http-signature-1.2.0" - sources."is-absolute-url-2.1.0" - sources."is-relative-url-2.0.0" - sources."is-typedarray-1.0.0" - sources."isemail-3.2.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" - sources."link-check-4.4.4" - sources."lodash-4.17.11" - sources."markdown-link-extractor-1.2.0" - sources."marked-0.4.0" - sources."mime-db-1.38.0" - sources."mime-types-2.1.22" - sources."ms-2.1.1" - sources."oauth-sign-0.9.0" - sources."performance-now-2.1.0" - sources."progress-2.0.3" - sources."psl-1.1.31" - sources."punycode-2.1.1" - sources."qs-6.5.2" - sources."request-2.88.0" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."sshpk-1.16.1" - sources."supports-color-5.5.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."uri-js-4.2.2" - sources."uuid-3.3.2" - sources."verror-1.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "checks the all of the hyperlinks in a markdown text to determine if they are alive or dead"; - homepage = "https://github.com/tcort/markdown-link-check#readme"; - license = "ISC"; - }; - production = true; - bypassCache = true; - }; mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; @@ -51217,35 +50591,350 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "5.2.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz"; - sha512 = "2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-6.0.0.tgz"; + sha512 = "A7g9k3yr8oJaXn2IItFnfgjyxFc/LTe6Wwv7FczP+e8G74o9xYNSbMYmCf1ouldRojLrFcOb+z75P6Ak0GX6ug=="; }; dependencies = [ + sources."ansi-colors-3.2.3" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."assign-symbols-1.0.0" + sources."atob-2.1.2" sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) sources."browser-stdout-1.3.1" - sources."commander-2.15.1" + sources."cache-base-1.0.1" + sources."camelcase-5.0.0" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."cliui-4.1.0" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."component-emitter-1.2.1" sources."concat-map-0.0.1" - sources."debug-3.1.0" + sources."copy-descriptor-0.1.1" + sources."cross-spawn-6.0.5" + sources."debug-3.2.6" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."detect-file-1.0.0" sources."diff-3.5.0" + sources."end-of-stream-1.4.1" + sources."es-abstract-1.13.0" + sources."es-to-primitive-1.2.0" sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."execa-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + sources."expand-tilde-2.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."find-up-3.0.0" + sources."findup-sync-2.0.0" + (sources."flat-4.1.0" // { + dependencies = [ + sources."is-buffer-2.0.3" + ]; + }) + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.2" + sources."function-bind-1.1.1" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."glob-7.1.3" + sources."global-modules-1.0.0" + sources."global-prefix-1.0.2" sources."growl-1.10.5" + sources."has-1.0.3" sources."has-flag-3.0.0" - sources."he-1.1.1" + sources."has-symbols-1.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."he-1.2.0" + sources."homedir-polyfill-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."invert-kv-2.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-buffer-1.1.6" + sources."is-callable-1.1.4" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.1" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-3.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-regex-1.0.4" + sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" + sources."is-windows-1.0.2" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."js-yaml-3.12.0" + sources."kind-of-6.0.2" + sources."lcid-2.0.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.11" + sources."log-symbols-2.2.0" + sources."map-age-cleaner-0.1.3" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."mem-4.1.0" + sources."micromatch-3.1.10" + sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" + (sources."mixin-deep-1.3.1" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) sources."mkdirp-0.5.1" - sources."ms-2.0.0" + sources."ms-2.1.1" + sources."nanomatch-1.2.13" + sources."nice-try-1.0.5" + sources."node-environment-flags-1.0.4" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-keys-1.1.0" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.0.3" + sources."object.pick-1.3.0" sources."once-1.4.0" + sources."os-locale-3.1.0" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.0.0" + sources."p-limit-2.1.0" + sources."p-locate-3.0.0" + sources."p-try-2.0.0" + sources."parse-passwd-1.0.0" + sources."pascalcase-0.1.1" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" - sources."supports-color-5.4.0" + sources."path-key-2.0.1" + sources."posix-character-classes-0.1.1" + sources."pump-3.0.0" + sources."regex-not-1.0.2" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."resolve-dir-1.0.1" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."safe-regex-1.1.0" + sources."semver-5.6.0" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-6.0.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + (sources."union-value-1.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + sources."set-value-0.4.3" + ]; + }) + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."urix-0.1.0" + sources."use-3.1.1" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."wide-align-1.1.3" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."wrappy-1.0.2" + sources."y18n-4.0.0" + sources."yargs-12.0.5" + sources."yargs-parser-11.1.1" + sources."yargs-unparser-1.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -52082,7 +51771,7 @@ in sources."camelcase-4.1.0" sources."capture-stack-trace-1.0.1" sources."chalk-2.4.2" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -53576,7 +53265,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."compressible-2.0.15" + sources."compressible-2.0.16" sources."compression-1.5.2" sources."concat-map-0.0.1" (sources."connect-2.30.2" // { @@ -53691,7 +53380,7 @@ in }) sources."has-cors-1.1.0" sources."hat-0.0.3" - sources."http-errors-1.7.1" + sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.11" sources."ieee754-1.1.12" @@ -53850,7 +53539,7 @@ in sources."statuses-1.2.1" ]; }) - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" sources."simple-peer-6.4.4" @@ -54059,7 +53748,7 @@ in sources."@babel/template-7.2.2" sources."@babel/traverse-7.2.3" sources."@babel/types-7.3.3" - sources."@iarna/toml-2.2.1" + sources."@iarna/toml-2.2.2" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@parcel/fs-1.11.0" @@ -54169,7 +53858,7 @@ in sources."caniuse-db-1.0.30000938" sources."caniuse-lite-1.0.30000938" sources."chalk-2.4.2" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" sources."cipher-base-1.0.4" (sources."clap-1.2.3" // { dependencies = [ @@ -54751,7 +54440,7 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexp-tree-0.1.4" + sources."regexp-tree-0.1.5" sources."regexpu-core-4.4.0" sources."regjsgen-0.5.0" (sources."regjsparser-0.6.0" // { @@ -55027,7 +54716,7 @@ in sources."builtin-status-codes-3.0.0" sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -55526,6 +55215,23 @@ in production = true; bypassCache = true; }; + reveal = nodeEnv.buildNodePackage { + name = "reveal"; + packageName = "reveal"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/reveal/-/reveal-0.0.4.tgz"; + sha1 = "1c1428193359fb03bc029139062ea29f8f691d85"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "The HTML presentation framework"; + homepage = https://github.com/ForbesLindesay/reveal; + license = "MIT"; + }; + production = true; + bypassCache = true; + }; s3http = nodeEnv.buildNodePackage { name = "s3http"; packageName = "s3http"; @@ -56010,7 +55716,12 @@ in sources."multiblob-1.13.3" sources."multiblob-http-0.4.2" sources."multicb-1.2.2" - sources."multiserver-3.1.2" + (sources."multiserver-3.2.0" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.1" + ]; + }) sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.4.2" @@ -56305,7 +56016,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."socks-2.3.1" + sources."socks-2.3.2" sources."sodium-browserify-1.2.4" (sources."sodium-browserify-tweetnacl-0.2.3" // { dependencies = [ @@ -56506,7 +56217,7 @@ in }) sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."compressible-2.0.15" + sources."compressible-2.0.16" sources."compression-1.7.3" sources."concat-map-0.0.1" sources."content-disposition-0.5.2" @@ -57191,14 +56902,14 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.133.0"; + version = "1.134.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.133.0.tgz"; - sha512 = "/6xQISFy08oWJasSye77eOaRScPkTIzD7AZYlSWfyS+flYJHgUhNJcTimXGcDwwBmfPtESpDtFpB1LBA16NUOg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.134.2.tgz"; + sha512 = "WGR3TTZxXOdALEEcQtADFEOHaanhbzwLvS6gyg5vF6Akj7qRAwIIXYBUycbNdAax1mylAsXCzR352dkTwKD9lg=="; }; dependencies = [ - sources."@snyk/dep-graph-1.1.2" - sources."@snyk/gemfile-1.1.0" + sources."@snyk/dep-graph-1.4.0" + sources."@snyk/gemfile-1.2.0" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.2.1" @@ -57247,7 +56958,7 @@ in sources."core-js-2.3.0" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" - sources."cross-spawn-5.1.0" + sources."cross-spawn-6.0.5" sources."crypto-random-string-1.0.0" sources."data-uri-to-buffer-1.2.0" sources."debug-3.2.6" @@ -57268,7 +56979,7 @@ in sources."esprima-3.1.3" sources."estraverse-4.2.0" sources."esutils-2.0.2" - sources."execa-0.7.0" + sources."execa-0.10.0" sources."extend-3.0.2" sources."external-editor-2.2.0" sources."fast-levenshtein-2.0.6" @@ -57357,7 +57068,7 @@ in sources."lodash.set-4.3.2" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - sources."macos-release-1.1.0" + sources."macos-release-2.0.0" sources."make-dir-1.3.0" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" @@ -57377,13 +57088,14 @@ in ]; }) sources."netmask-1.0.6" + sources."nice-try-1.0.5" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."onetime-2.0.1" sources."opn-5.4.0" sources."optionator-0.8.2" sources."os-locale-1.4.0" - sources."os-name-2.0.1" + sources."os-name-3.0.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."pac-proxy-agent-2.0.2" @@ -57435,15 +57147,15 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" sources."smart-buffer-1.1.15" - sources."snyk-config-2.2.0" + sources."snyk-config-2.2.1" sources."snyk-docker-plugin-1.22.0" sources."snyk-go-plugin-1.6.1" sources."snyk-gradle-plugin-2.1.3" sources."snyk-module-1.9.1" sources."snyk-mvn-plugin-2.0.1" sources."snyk-nodejs-lockfile-parser-1.11.0" - sources."snyk-nuget-plugin-1.7.1" - sources."snyk-paket-parser-1.4.1" + sources."snyk-nuget-plugin-1.7.2" + sources."snyk-paket-parser-1.4.3" sources."snyk-php-plugin-1.5.2" sources."snyk-policy-1.13.3" sources."snyk-python-plugin-1.9.1" @@ -57466,7 +57178,12 @@ in sources."supports-color-5.5.0" sources."temp-dir-1.0.0" sources."tempfile-2.0.0" - sources."term-size-1.2.0" + (sources."term-size-1.2.0" // { + dependencies = [ + sources."cross-spawn-5.1.0" + sources."execa-0.7.0" + ]; + }) sources."then-fs-2.0.0" sources."through-2.3.8" sources."thunkify-2.1.2" @@ -57485,8 +57202,8 @@ in sources."vscode-languageserver-types-3.14.0" sources."which-1.3.1" sources."widest-line-2.0.1" - sources."win-release-1.1.1" sources."window-size-0.1.4" + sources."windows-release-3.1.0" sources."wordwrap-1.0.0" (sources."wrap-ansi-2.1.0" // { dependencies = [ @@ -57760,7 +57477,7 @@ in sources."capture-stack-trace-1.0.1" sources."chalk-1.1.3" sources."charenc-0.0.2" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -59674,6 +59391,7 @@ in dependencies = [ sources."debug-2.6.9" sources."http-errors-1.6.3" + sources."setprototypeof-1.1.0" ]; }) sources."boxen-1.3.0" @@ -59696,7 +59414,7 @@ in sources."caw-2.0.1" sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -59842,6 +59560,7 @@ in (sources."express-4.16.4" // { dependencies = [ sources."debug-2.6.9" + sources."setprototypeof-1.1.0" sources."statuses-1.4.0" ]; }) @@ -59945,7 +59664,7 @@ in sources."hash.js-1.1.7" sources."hoek-6.1.2" sources."homedir-polyfill-1.0.1" - sources."http-errors-1.7.1" + sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.23" sources."ieee754-1.1.12" @@ -60173,6 +59892,7 @@ in (sources."raw-body-2.3.3" // { dependencies = [ sources."http-errors-1.6.3" + sources."setprototypeof-1.1.0" ]; }) sources."rc-1.2.8" @@ -60223,12 +59943,13 @@ in dependencies = [ sources."debug-2.6.9" sources."http-errors-1.6.3" + sources."setprototypeof-1.1.0" sources."statuses-1.4.0" ]; }) sources."serve-static-1.13.2" sources."set-value-2.0.0" - sources."setprototypeof-1.1.0" + sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -60725,7 +60446,7 @@ in sources."builtin-status-codes-3.0.0" sources."cacache-11.3.2" sources."cache-base-1.0.1" - sources."chokidar-2.1.1" + sources."chokidar-2.1.2" sources."chownr-1.1.1" sources."chrome-trace-event-1.0.0" sources."cipher-base-1.0.4" @@ -61895,7 +61616,7 @@ in sources."chalk-2.4.0" sources."chardet-0.4.2" sources."cheerio-1.0.0-rc.2" - (sources."chokidar-2.1.1" // { + (sources."chokidar-2.1.2" // { dependencies = [ sources."fsevents-1.2.7" sources."normalize-path-3.0.0" diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index c09cf5a77c1..57f1a832f56 100644 --- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -5,14 +5,14 @@ then throw "psmt2-frontend is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "0.1"; + version = "0.2"; name = "ocaml${ocaml.version}-psmt2-frontend-${version}"; src = fetchFromGitHub { owner = "Coquera"; repo = "psmt2-frontend"; rev = version; - sha256 = "0k7jlsbkdyg7hafmvynp0ik8xk7mfr00wz27vxn4ncnmp20yz4vn"; + sha256 = "097zmbrx4gp2gnrxdmsm9lkkp5450gwi0blpxqy3833m6k5brx3n"; }; prefixKey = "-prefix "; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 19e8e1eede9..e8e2dde5e1e 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "5.4.0"; + version = "5.4.1"; src = fetchPypi { inherit pname version; - sha256 = "a8a2749f972592aa9250db975304af6b7337f32337e523a2c995cc9e12c07807"; + sha256 = "302554a2e219bc0fc84f3edd3e79953f3767b46ab67626fdec16e38ba3f7efe4"; }; checkInputs = [ nose pytest glibcLocales ]; diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix new file mode 100644 index 00000000000..ad6de3d3175 --- /dev/null +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, docutils +, jinja2 +, nbconvert +, nbformat +, sphinx +, traitlets +, python +}: + +buildPythonPackage rec { + pname = "nbsphinx"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "b794219e465b3aab500b800884ff40fd152bb19d8b6f87580de1f3a07170aef8"; + }; + + propagatedBuildInputs = [ + docutils + jinja2 + nbconvert + nbformat + sphinx + traitlets + ]; + + checkPhase = '' + ${python.interpreter} -m nbsphinx + ''; + + meta = with lib; { + description = "Jupyter Notebook Tools for Sphinx"; + homepage = https://nbsphinx.readthedocs.io/; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/development/tools/documentation/mdsh/default.nix index 74cde43440b..3c6e6728529 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/development/tools/documentation/mdsh/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { name = "mdsh-${version}"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "zimbatm"; repo = "mdsh"; rev = "v${version}"; - sha256 = "0sggclzghm54g4wnbab00qw4ry49min4zyw3hjwi0v741aa51xb2"; + sha256 = "17pd090wpnx7i8q9pp9rhps35ahm1xn4h6pm1cfsafm072qd7rff"; }; cargoSha256 = "1hsnz4sj8kff9azcbw9pkr2ipxlymz4zcm4vhfwydfkdlvdncpxm"; diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index 497c765b5b1..993305bd98f 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -1,17 +1,18 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "godef-${version}"; - version = "1.0.0"; - rev = "7b4626be9fa8081987905fd4719d2f6628f9d8b5"; + version = "1.1.1"; + rev = "v${version}"; goPackagePath = "github.com/rogpeppe/godef"; - excludedPackages = "go/printer/testdata"; + subPackages = [ "." ]; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/rogpeppe/godef"; - sha256 = "0zhw4ba19hy0kv74c58ax759h8721khmwj04fak2y5800ymsgndg"; + owner = "rogpeppe"; + repo = "godef"; + sha256 = "1bpzqnb9fsk1pjjap3gm94pqch1jz02rfah9hg8iqbfm0dzpy31b"; }; meta = { diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 3892c37a1d5..6bb021c4958 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -25,6 +25,39 @@ in # adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test... let plugins = { + v330 = stdenv.mkDerivation rec { + name = "iscan-v330-bundle"; + version = "1.0.1"; + pluginVersion = "0.2.0"; + + src = fetchurl { + url = "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz"; + sha256 = "f6fa455f04cdfbc3d38526573260746e9546830de93ba182d0365f557d2f7df9"; + }; + + buildInputs = [ patchelf rpm ]; + + installPhase = '' + ${rpm}/bin/rpm2cpio "plugins/esci-interpreter-perfection-v330-${pluginVersion}-1.x86_64.rpm" | ${cpio}/bin/cpio -idmv + mkdir $out{,/share,/lib} + cp -r ./usr/share/{iscan-data,esci}/ $out/share/ + cp -r ./usr/lib64/esci $out/lib + ''; + + preFixup = '' + lib=$out/lib/esci/libesci-interpreter-perfection-v330.so + rpath=${gcc.cc.lib}/lib/ + patchelf --set-rpath $rpath $lib + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin" + ''; + hw = "Perfection V330 Photo"; + }; + meta = common_meta // { description = "Plugin to support "+passthru.hw+" scanner in sane."; }; + }; x770 = stdenv.mkDerivation rec { pname = "iscan-gt-x770-bundle"; version = "1.0.1"; diff --git a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix index 94152d1628d..c111492f2b3 100644 --- a/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix +++ b/pkgs/os-specific/darwin/apple-sdk/impure-deps.nix @@ -155,7 +155,6 @@ rec { "/System/Library/PrivateFrameworks/Symbolication.framework/Versions/A/Symbolication" "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC" "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation" - "/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity" "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport" "/usr/lib/libCRFSuite.dylib" "/usr/lib/libOpenScriptingUtil.dylib" @@ -203,7 +202,6 @@ rec { "/System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv" "/System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices" "/System/Library/PrivateFrameworks/ChunkingLibrary.framework/Versions/A/ChunkingLibrary" - "/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity" "/System/Library/PrivateFrameworks/Sharing.framework/Versions/A/Sharing" "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Apple80211" "/System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage" diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix index 7725b9f3d1a..f54d667d6ae 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix @@ -101,7 +101,6 @@ "/System/Library/PrivateFrameworks/Symbolication.framework/Versions/A/Symbolication" "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC" "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation" - "/System/Library/PrivateFrameworks/Ubiquity.framework/Versions/A/Ubiquity" "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport" "/usr/lib/libCRFSuite.dylib" "/usr/lib/libOpenScriptingUtil.dylib" 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 57135bf515b..df917888dc7 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-12-13"; + version = "2019-02-13"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; - rev = "813fa1fc6fba6638decd974c4a6a2e485069ea15"; - sha256 = "0zspisbrvplgz1plk4ya22h7ilnsk60srk4q38h6n5d18fpn7rdw"; + rev = "710963fe53ee3f227556d36839df3858daf6e232"; + sha256 = "1q3jvlqqxba08s2mrh9hwl0d5w6nhkwj63j0m6amxqpf10k49jxp"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1yr6wcvc3s97h4w0qapma4l17dqsj175an6kmn5w6dppz19g0r5b"; + outputHash = "13gqnr6gm7336pm48v5p37clphwwdmgbrcipsg3w44wdwgc7fa2f"; meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 1a56e68fa4b..e8126c23d3d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -203,6 +203,7 @@ let SND_HDA_RECONFIG = yes; # Support reconfiguration of jack functions # Support configuring jack functions via fw mechanism at boot SND_HDA_PATCH_LOADER = yes; + SND_OSSEMUL = yes; SND_USB_CAIAQ_INPUT = yes; # Enable PSS mixer (Beethoven ADSP-16 and other compatible) PSS_MIXER = whenOlder "4.12" yes; diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index 93e2c097ff7..aeb4d78d0ec 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -1,10 +1,9 @@ -{ stdenv, fetchurl +{ config, lib, stdenv, fetchurl , yacc, flex , sysfsutils, kmod, udev -, firmware # Special pcmcia cards. -, config # Special hardware (map memory & port & irq) -, lib # used to generate postInstall script. -}: +, firmware ? config.pcmciaUtils.firmware or [] # Special pcmcia cards. +, configOpts ? config.pcmciaUtils.config or null # Special hardware (map memory & port & irq) +}: # used to generate postInstall script. # FIXME: should add an option to choose between hotplug and udev. stdenv.mkDerivation rec { @@ -28,8 +27,8 @@ stdenv.mkDerivation rec { " src/{startup.c,pcmcia-check-broken-cis.c} # fix-color */ '' + (if firmware == [] then ''sed -i "s,STARTUP = true,STARTUP = false," Makefile'' else "") - + (if config == null then "" else '' - ln -sf ${config} ./config/config.opts'') + + (if configOpts == null then "" else '' + ln -sf ${configOpts} ./config/config.opts'') ; makeFlags = "LEX=flex"; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix new file mode 100644 index 00000000000..ea3fbd58e2e --- /dev/null +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "mautrix-unstable-${version}"; + version = "2019-02-11"; + + goPackagePath = "maunium.net/go/mautrix-whatsapp"; + + src = fetchFromGitHub { + owner = "tulir"; + repo = "mautrix-whatsapp"; + rev = "f689297ba6704265a938951f307b365e829fcfa1"; + sha256 = "1658bika9ylhm64k9lxavp43dxilygn6vx7yn6y1l10j8by2akxk"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/tulir/mautrix-whatsapp; + description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge"; + license = licenses.agpl3; + maintainers = with maintainers; [ vskilet ]; + }; +} diff --git a/pkgs/servers/mautrix-whatsapp/deps.nix b/pkgs/servers/mautrix-whatsapp/deps.nix new file mode 100644 index 00000000000..8a1543ac012 --- /dev/null +++ b/pkgs/servers/mautrix-whatsapp/deps.nix @@ -0,0 +1,201 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/Baozisoftware/qrcode-terminal-go"; + fetch = { + type = "git"; + url = "https://github.com/Baozisoftware/qrcode-terminal-go"; + rev = "c0650d8dff0f"; + sha256 = "166h9zy9y7ygayhybg7d080hpdcf1mvkf3rwnq5lqg8i3cg71s7b"; + }; + } + { + goPackagePath = "github.com/Rhymen/go-whatsapp"; + fetch = { + type = "git"; + url = "https://github.com/Rhymen/go-whatsapp"; + rev = "2ca6af00572c"; + sha256 = "0lrscj59n9nmd5z0h9r2c952m0da672r3aj33bi443ap0h97w19i"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "v1.6.2"; + sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "v1.4.0"; + sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + 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-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "v1.10.0"; + sha256 = "1zmz6asplixfihxhj11spgfs0v3xzb3nv0hlq6n6zsg781ni31xx"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v2.0.1"; + sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "v1.0.0"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + }; + } + { + goPackagePath = "github.com/skip2/go-qrcode"; + fetch = { + type = "git"; + url = "https://github.com/skip2/go-qrcode"; + rev = "dc11ecdae0a9"; + sha256 = "0mc70hsn5x2a66a9sbwlq51cng2s1aq7rw4pr9pif4xdzflkl057"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "ff983b9c42bc"; + sha256 = "1hpr06kzn8jnn3gvzp0p9zn4fz4l9h69f7x66idx142w4xdlaanz"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "915654e7eabc"; + sha256 = "0fzd7n2yc4qnnf2wk21zxy6gb01xviq2z1dzrbqcn8p1s4fjsqw5"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "37e7f081c4d4"; + sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "48ac38b7c8cb"; + sha256 = "037vs8sdvq310j3b6z9k62zlby1mzmsr9ha01rcy98dv5v8bkhin"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } + { + goPackagePath = "maunium.net/go/mauflag"; + fetch = { + type = "git"; + url = "https://github.com/tulir/mauflag.git"; + rev = "v1.0.0"; + sha256 = "09jv1819jwq5i29y6ngf4j4ii6qwlshydvprfvsfplc419dkz1vx"; + }; + } + { + goPackagePath = "maunium.net/go/maulogger"; + fetch = { + type = "git"; + url = "https://github.com/tulir/maulogger.git"; + rev = "v2.0.0"; + sha256 = "0qz4cpaqvcmrj3fb2bb6yrhw3k5h51crskricyqgg1b7aklphan5"; + }; + } + { + goPackagePath = "maunium.net/go/mautrix"; + fetch = { + type = "git"; + url = "https://github.com/tulir/mautrix-go.git"; + rev = "v0.1.0-alpha.3"; + sha256 = "12nlyij57ss2a5d1f1k1vsmjjvxp1fannlrbnp2jsj6rrsq0d2wr"; + }; + } + { + goPackagePath = "maunium.net/go/mautrix-appservice"; + fetch = { + type = "git"; + url = "https://github.com/tulir/mautrix-appservice-go.git"; + rev = "v0.1.0-alpha.3"; + sha256 = "17y11wgqbrafbq6bnn4rp2lzd50fjz9d6f8j3382jsara7ps95vr"; + }; + } +] diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 8d3452b912b..d019457ab8a 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl }: let - version = "0.3.0"; + version = "0.6.pre15"; in stdenv.mkDerivation { name = "oil-${version}"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "0j4fyn6xjaf29xqyzm09ahazmq9v1hkxv4kps7n3lzdfr32a4kk9"; + sha256 = "1azdmicv39rp30msl6fpw6921gi6ib8lxiyc8kanljqk5d7zg4p6"; }; postPatch = '' diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 0598976ec98..fbba83d7a33 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 = "2019.01.30.1"; + version = "2019.02.18"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0wamv1fs4w8jjx67p60rgrgdi6k04yy0h4p3cwscza5pzhpmvnlf"; + sha256 = "1sr0f6ixpaqyp3cf29zswx84y3nfabwnk3sljcgvgnmjp73zzfv1"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix new file mode 100644 index 00000000000..cec31cec377 --- /dev/null +++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, lib, openssl }: + +stdenv.mkDerivation rec { + pname = "ibm-sw-tpm2"; + version = "1332"; + + src = fetchurl { + url = "mirror://sourceforge/ibmswtpm2/ibmtpm${version}.tar.gz"; + sha256 = "1zdhi8acd4jfp1v7ibd86hcv0g39yk8qrnhxjmmgzn8i7npr70cf"; + }; + + buildInputs = [ openssl ]; + + sourceRoot = "src"; + + prePatch = '' + # Fix hardcoded path to GCC. + substituteInPlace makefile --replace /usr/bin/gcc "${stdenv.cc}/bin/cc" + + # Remove problematic default CFLAGS. + substituteInPlace makefile \ + --replace -Werror "" \ + --replace -O0 "" \ + --replace -ggdb "" + ''; + + installPhase = '' + mkdir -p $out/bin + cp tpm_server $out/bin + ''; + + meta = with lib; { + description = "IBM's Software TPM 2.0, an implementation of the TCG TPM 2.0 specification"; + homepage = https://sourceforge.net/projects/ibmswtpm2/; + platforms = platforms.linux; + maintainers = with maintainers; [ delroth ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix new file mode 100644 index 00000000000..84369e6ea54 --- /dev/null +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, fetchpatch, lib +, cmocka, curl, pandoc, pkgconfig, openssl, tpm2-tss }: + +stdenv.mkDerivation rec { + pname = "tpm2-tools"; + version = "3.1.3"; + + src = fetchurl { + url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; + sha256 = "05is1adwcg7y2p121yldd8m1gigdnzf9izbjazvsr6yg95pmg5fc"; + }; + + patches = [ + (fetchpatch { + name = "tests-tss-2.2.0-compat.patch"; + url = "https://patch-diff.githubusercontent.com/raw/tpm2-software/tpm2-tools/pull/1322.patch"; + sha256 = "0yy5qbgbd13d7cl8pzsji95a6qnwiik5s2cyqj35jd8blymikqxh"; + }) + ]; + + nativeBuildInputs = [ pandoc pkgconfig ]; + buildInputs = [ + curl openssl tpm2-tss + # For unit tests. + cmocka + ]; + + configureFlags = [ "--enable-unit" ]; + doCheck = true; + + meta = with lib; { + description = "Command line tools that provide access to a TPM 2.0 compatible device"; + homepage = https://github.com/tpm2-software/tpm2-tools; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ delroth ]; + }; +} diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 2b918d15581..745139f9e50 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.7.1"; + version = "2.0.1"; goPackagePath = "github.com/cjbassi/gotop"; @@ -10,11 +10,9 @@ buildGoPackage rec { repo = "gotop"; owner = "cjbassi"; rev = version; - sha256 = "0dxnhal10kv6ypsg6mildzpz6vi1iw996q47f4rv8hvfyrffhzc9"; + sha256 = "0xpm8nrn53kz65f93czflgdgr2a33qfi1w0gsgngrmaliq1vlpji"; }; - 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 deleted file mode 100644 index ceae7857551..00000000000 --- a/pkgs/tools/system/gotop/deps.nix +++ /dev/null @@ -1,39 +0,0 @@ -# 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"; - }; - } -] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7487ff65d69..555e944a252 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -936,7 +936,6 @@ in tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; libtensorflow = callPackage ../development/libraries/libtensorflow { - cudaSupport = config.cudaSupport or false; inherit (linuxPackages) nvidia_x11; cudatoolkit = cudatoolkit_9_0; cudnn = cudnn_cudatoolkit_9_0; @@ -3363,6 +3362,8 @@ in iannix = libsForQt5.callPackage ../applications/audio/iannix { }; + ibm-sw-tpm2 = callPackage ../tools/security/ibm-sw-tpm2 { }; + ibniz = callPackage ../tools/graphics/ibniz { }; icecast = callPackage ../servers/icecast { }; @@ -3749,6 +3750,8 @@ in mautrix-telegram = callPackage ../servers/mautrix-telegram { }; + mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; + mdbook = callPackage ../tools/text/mdbook { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -5827,6 +5830,8 @@ in tpm-luks = callPackage ../tools/security/tpm-luks { }; + tpm2-tools = callPackage ../tools/security/tpm2-tools { }; + trezord = callPackage ../servers/trezord { }; tthsum = callPackage ../applications/misc/tthsum { }; @@ -6958,9 +6963,7 @@ in inherit (gnome2) libart_lgpl; }); - gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { - emacsSupport = config.emacsSupport or false; - }; + gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; gccgo = gccgo6; gccgo6 = wrapCC (gcc6.cc.override { @@ -9361,6 +9364,12 @@ in inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; }; + aws-c-common = callPackage ../development/libraries/aws-c-common { }; + + aws-c-event-stream = callPackage ../development/libraries/aws-c-event-stream { }; + + aws-checksums = callPackage ../development/libraries/aws-checksums { }; + aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; @@ -10180,11 +10189,7 @@ in pixman = callPackage ../development/libraries/pixman { }; - cairo = callPackage ../development/libraries/cairo { - glSupport = config.cairo.gl or (stdenv.isLinux && - !stdenv.isAarch32 && !stdenv.isMips); - }; - + cairo = callPackage ../development/libraries/cairo { }; cairomm = callPackage ../development/libraries/cairomm { }; @@ -10211,7 +10216,6 @@ in elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { - cupsSupport = config.gtk2.cups or stdenv.isLinux; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -11935,7 +11939,6 @@ in openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { }; opensubdiv = callPackage ../development/libraries/opensubdiv { - cudaSupport = config.cudaSupport or false; cmake = cmake_2_8; }; @@ -12140,6 +12143,7 @@ in harfbuzz = harfbuzzFull; inherit libGL; inherit perl; + inherit (darwin) cf-private; inherit (gst_all_1) gstreamer gst-plugins-base; }); @@ -12830,6 +12834,8 @@ in totem-pl-parser = callPackage ../development/libraries/totem-pl-parser { }; + tpm2-tss = callPackage ../development/libraries/tpm2-tss { }; + tremor = callPackage ../development/libraries/tremor { }; twolame = callPackage ../development/libraries/twolame { }; @@ -13073,9 +13079,7 @@ in xalanc = callPackage ../development/libraries/xalanc {}; - xgboost = callPackage ../development/libraries/xgboost { - cudaSupport = config.cudaSupport or false; - }; + xgboost = callPackage ../development/libraries/xgboost { }; xgeometry-select = callPackage ../tools/X11/xgeometry-select { }; @@ -15102,10 +15106,7 @@ in pax-utils = callPackage ../os-specific/linux/pax-utils { }; - pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { - firmware = config.pcmciaUtils.firmware or []; - config = config.pcmciaUtils.config or null; - }; + pcmciaUtils = callPackage ../os-specific/linux/pcmciautils { }; pcstat = callPackage ../tools/system/pcstat { }; @@ -16292,7 +16293,6 @@ in bleachbit = callPackage ../applications/misc/bleachbit { }; blender = callPackage ../applications/misc/blender { - cudaSupport = config.cudaSupport or false; pythonPackages = python35Packages; stdenv = overrideCC stdenv gcc6; }; @@ -17895,12 +17895,19 @@ in inherit (kdeFrameworks) kdesu; - kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {}; + kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; - kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { + kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { llvmPackages = llvmPackages_7; }; + kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; + kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix { + python = python3; + }; + + kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { }; + keepnote = callPackage ../applications/office/keepnote { }; kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; @@ -18749,7 +18756,7 @@ in pavucontrol = callPackage ../applications/audio/pavucontrol { }; - paraview = libsForQt59.callPackage ../applications/graphics/paraview { }; + paraview = libsForQt5.callPackage ../applications/graphics/paraview { }; packet = callPackage ../development/tools/packet { }; @@ -20295,18 +20302,15 @@ in }; xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet { - desktopSupport = "gnomeflashback"; inherit (xfce) libxfce4util xfce4-panel; }; xmonad_log_applet_mate = xmonad_log_applet.override { desktopSupport = "mate"; - inherit (xfce) libxfce4util xfce4-panel; }; xmonad_log_applet_xfce = xmonad_log_applet.override { desktopSupport = "xfce4"; - inherit (xfce) libxfce4util xfce4-panel; }; xmpp-client = callPackage ../applications/networking/instant-messengers/xmpp-client { }; @@ -21993,28 +21997,21 @@ in ### SCIENCE / MATH - caffe = callPackage ../applications/science/math/caffe rec { - cudaSupport = config.caffe.cudaSupport or config.cudaSupport or false; - cudnnSupport = cudaSupport; - # Used only for image loading. - opencv3 = opencv3WithoutCuda; + caffe = callPackage ../applications/science/math/caffe ({ + opencv3 = opencv3WithoutCuda; # Used only for image loading. inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; - }; + } // (config.caffe or {})); caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec { inherit (python36Packages) python future six numpy pydot; protobuf = protobuf3_1; python-protobuf = python36Packages.protobuf.override { inherit protobuf; }; - # Used only for image loading. - opencv3 = opencv3WithoutCuda; + opencv3 = opencv3WithoutCuda; # Used only for image loading. }); - cntk = callPackage ../applications/science/math/cntk rec { - cudaSupport = pkgs.config.cudaSupport or false; - cudnnSupport = cudaSupport; + cntk = callPackage ../applications/science/math/cntk { inherit (linuxPackages) nvidia_x11; - # Used only for image loading. - opencv3 = opencv3WithoutCuda; + opencv3 = opencv3WithoutCuda; # Used only for image loading. }; ecm = callPackage ../applications/science/math/ecm { }; @@ -22045,9 +22042,7 @@ in sbcl = null; }; - mxnet = callPackage ../applications/science/math/mxnet rec { - cudaSupport = config.cudaSupport or false; - cudnnSupport = cudaSupport; + mxnet = callPackage ../applications/science/math/mxnet { inherit (linuxPackages) nvidia_x11; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07715ce856a..24c2110403d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -305,7 +305,7 @@ in { cdecimal = callPackage ../development/python-modules/cdecimal { }; cfn-flip = callPackage ../development/python-modules/cfn-flip { }; - + chalice = callPackage ../development/python-modules/chalice { }; cleo = callPackage ../development/python-modules/cleo { }; @@ -492,6 +492,8 @@ in { nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; + nbsphinx = callPackage ../development/python-modules/nbsphinx { }; + nbval = callPackage ../development/python-modules/nbval { }; nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; |