diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix
index 315d04093b1..0ea70107f71 100644
--- a/nixos/modules/profiles/qemu-guest.nix
+++ b/nixos/modules/profiles/qemu-guest.nix
@@ -1,7 +1,7 @@
# Common configuration for virtual machines running under QEMU (using
# virtio).
-{ ... }:
+{ lib, ... }:
{
boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
@@ -15,5 +15,5 @@
hwclock -s
'';
- security.rngd.enable = false;
+ security.rngd.enable = lib.mkDefault false;
}
diff --git a/nixos/modules/programs/less.nix b/nixos/modules/programs/less.nix
index e19935b77ca..75b3e707d57 100644
--- a/nixos/modules/programs/less.nix
+++ b/nixos/modules/programs/less.nix
@@ -54,8 +54,8 @@ in
type = types.attrsOf types.str;
default = {};
example = {
- h = "noaction 5\e(";
- l = "noaction 5\e)";
+ h = "noaction 5\\e(";
+ l = "noaction 5\\e)";
};
description = "Defines new command keys.";
};
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 3cf09611fba..11227354ad3 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -351,7 +351,7 @@ let
${let oath = config.security.pam.oath; in optionalString cfg.oathAuth
"auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"}
${let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth
- "auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so id=${toString yubi.id} ${optionalString yubi.debug "debug"}"}
+ "auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}"}
'' +
# Modules in this block require having the password set in PAM_AUTHTOK.
# pam_unix is marked as 'sufficient' on NixOS which means nothing will run
@@ -696,6 +696,23 @@ in
Debug output to stderr.
'';
};
+ mode = mkOption {
+ default = "client";
+ type = types.enum [ "client" "challenge-response" ];
+ description = ''
+ Mode of operation.
+
+ Use "client" for online validation with a YubiKey validation service such as
+ the YubiCloud.
+
+ Use "challenge-response" for offline validation using YubiKeys with HMAC-SHA-1
+ Challenge-Response configurations. See the man-page ykpamcfg(1) for further
+ details on how to configure offline Challenge-Response validation.
+
+ More information can be found here.
+ '';
+ };
};
security.pam.enableEcryptfs = mkOption {
@@ -742,13 +759,6 @@ in
environment.etc =
mapAttrsToList (n: v: makePAMService v) config.security.pam.services;
- systemd.tmpfiles.rules = optionals
- (any (s: s.updateWtmp) (attrValues config.security.pam.services))
- [
- "f /var/log/wtmp"
- "f /var/log/lastlog"
- ];
-
security.pam.services =
{ other.text =
''
diff --git a/nixos/modules/services/backup/postgresql-wal-receiver.nix b/nixos/modules/services/backup/postgresql-wal-receiver.nix
index d9a37037992..3d9869d5343 100644
--- a/nixos/modules/services/backup/postgresql-wal-receiver.nix
+++ b/nixos/modules/services/backup/postgresql-wal-receiver.nix
@@ -169,13 +169,14 @@ in {
systemd.services = with attrsets; mapAttrs' (name: config: nameValuePair "postgresql-wal-receiver-${name}" {
description = "PostgreSQL WAL receiver (${name})";
wantedBy = [ "multi-user.target" ];
+ startLimitIntervalSec = 0; # retry forever, useful in case of network disruption
serviceConfig = {
User = "postgres";
Group = "postgres";
KillSignal = "SIGINT";
Restart = "always";
- RestartSec = 30;
+ RestartSec = 60;
};
inherit (config) environment;
diff --git a/nixos/modules/services/mail/mailcatcher.nix b/nixos/modules/services/mail/mailcatcher.nix
index fa8d41e918d..f5b4508b335 100644
--- a/nixos/modules/services/mail/mailcatcher.nix
+++ b/nixos/modules/services/mail/mailcatcher.nix
@@ -3,7 +3,7 @@
let
cfg = config.services.mailcatcher;
- inherit (lib) mkEnableOption mkIf mkOption types;
+ inherit (lib) mkEnableOption mkIf mkOption types optionalString;
in
{
# interface
@@ -54,6 +54,7 @@ in
DynamicUser = true;
Restart = "always";
ExecStart = "${pkgs.mailcatcher}/bin/mailcatcher --foreground --no-quit --http-ip ${cfg.http.ip} --http-port ${toString cfg.http.port} --smtp-ip ${cfg.smtp.ip} --smtp-port ${toString cfg.smtp.port}";
+ AmbientCapabilities = optionalString (cfg.http.port < 1024 || cfg.smtp.port < 1024) "cap_net_bind_service";
};
};
};
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index 89aa9d17ff7..4db35d9e89a 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -68,7 +68,7 @@ let
replaced with rspamd_proxy.
'';
apply = let
- from = "services.rspamd.workers.\”${name}\".type";
+ from = "services.rspamd.workers.\"${name}\".type";
files = options.type.files;
warning = "The option `${from}` defined in ${showFiles files} has enum value `proxy` which has been renamed to `rspamd_proxy`";
in x: if x == "proxy" then traceWarning warning "rspamd_proxy" else x;
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 66da6864fca..1e1eb0fd9a1 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -673,6 +673,10 @@ in {
openssh
nodejs
gnupg
+
+ # Needed for GitLab project imports
+ gnutar
+ gzip
];
serviceConfig = {
Type = "simple";
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 64cb6c3da1e..f7874af3df2 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -239,7 +239,7 @@ in {
description = "Any metrics received which match one of the experssions will be dropped.";
default = null;
type = types.nullOr types.str;
- example = "^some\.noisy\.metric\.prefix\..*";
+ example = "^some\\.noisy\\.metric\\.prefix\\..*";
};
whitelist = mkOption {
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 76ce40cdbc7..fef3a7de48a 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -27,6 +27,7 @@ let
[logging]
level=${cfg.logLevel}
+ audit=${lib.boolToString config.security.audit.enable}
[connection]
ipv6.ip6-privacy=2
@@ -513,8 +514,9 @@ in {
security.polkit.extraConfig = polkitConf;
- services.dbus.packages =
- optional cfg.enableStrongSwan pkgs.strongswanNM ++ cfg.packages;
+ services.dbus.packages = cfg.packages
+ ++ optional cfg.enableStrongSwan pkgs.strongswanNM
+ ++ optional (cfg.dns == "dnsmasq") pkgs.dnsmasq;
services.udev.packages = cfg.packages;
};
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index 1ae063aa6bb..7a503e71166 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -465,7 +465,7 @@ in
modules_enabled = {
- ${ lib.concatStringsSep "\n\ \ " (lib.mapAttrsToList
+ ${ lib.concatStringsSep "\n " (lib.mapAttrsToList
(name: val: optionalString val "${toLua name};")
cfg.modules) }
${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)}
diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix
index d9f840408cc..1e34aff8d17 100644
--- a/nixos/modules/services/web-apps/matomo.nix
+++ b/nixos/modules/services/web-apps/matomo.nix
@@ -105,8 +105,8 @@ in {
default = null;
example = {
serverAliases = [
- "matomo.$\{config.networking.domain\}"
- "stats.$\{config.networking.domain\}"
+ "matomo.\${config.networking.domain}"
+ "stats.\${config.networking.domain}"
];
enableACME = false;
};
@@ -115,7 +115,7 @@ in {
Either this option or the webServerUser option is mandatory.
Set this to {} to just enable the virtualHost if you don't need any customization.
If enabled, then by default, the is
- ${user}.$\{config.networking.hostName\}.$\{config.networking.domain\},
+ ''${user}.''${config.networking.hostName}.''${config.networking.domain},
SSL is active, and certificates are acquired via ACME.
If this is set to null (the default), no nginx virtualHost will be configured.
'';
@@ -275,7 +275,7 @@ in {
fastcgi_pass unix:${phpSocket};
'';
# Any other attempt to access any php files is forbidden
- locations."~* ^.+\.php$".extraConfig = ''
+ locations."~* ^.+\\.php$".extraConfig = ''
return 403;
'';
# Disallow access to unneeded directories
@@ -284,7 +284,7 @@ in {
return 403;
'';
# Disallow access to several helper files
- locations."~* \.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = ''
+ locations."~* \\.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = ''
return 403;
'';
# No crawling of this site for bots that obey robots.txt - no useful information here.
diff --git a/nixos/modules/services/web-apps/restya-board.nix b/nixos/modules/services/web-apps/restya-board.nix
index 1e7882488ac..2c2f36ac598 100644
--- a/nixos/modules/services/web-apps/restya-board.nix
+++ b/nixos/modules/services/web-apps/restya-board.nix
@@ -235,7 +235,7 @@ in
locations."/".root = "${runDir}/client";
- locations."~ \.php$" = {
+ locations."~ \\.php$" = {
tryFiles = "$uri =404";
extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params;
@@ -246,7 +246,7 @@ in
'';
};
- locations."~* \.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = {
+ locations."~* \\.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = {
root = "${runDir}/client";
extraConfig = ''
if (-f $request_filename) {
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index abe4748591e..b92e3449894 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -548,7 +548,7 @@ let
index = "index.php";
};
- locations."~ \.php$" = {
+ locations."~ \\.php$" = {
extraConfig = ''
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 2287a82418f..5cf437bfbcb 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -858,7 +858,12 @@ in
"sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf";
"sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf";
+ "tmpfiles.d/journal-nocow.conf".source = "${systemd}/example/tmpfiles.d/journal-nocow.conf";
+ "tmpfiles.d/static-nodes-permissions.conf".source = "${systemd}/example/tmpfiles.d/static-nodes-permissions.conf";
"tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf";
+ "tmpfiles.d/systemd-nspawn.conf".source = "${systemd}/example/tmpfiles.d/system-nspawn.conf";
+ "tmpfiles.d/systemd-tmp.conf".source = "${systemd}/example/tmpfiles.d/system-tmp.conf";
+ "tmpfiles.d/var.conf".source = "${systemd}/example/tmpfiles.d/var.conf";
"tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf";
"tmpfiles.d/nixos.conf".text = ''
diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix
index d8fada45eb1..b8ec2d7116f 100644
--- a/pkgs/applications/audio/gigedit/default.nix
+++ b/pkgs/applications/audio/gigedit/default.nix
@@ -4,15 +4,13 @@
stdenv.mkDerivation rec {
pname = "gigedit";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchurl {
url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
- sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni";
+ sha256 = "08db12crwf0dy1dbyrmivqqpg5zicjikqkmf2kb1ywpq0a9hcxrb";
};
- patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ];
-
preConfigure = "make -f Makefile.svn";
nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ];
diff --git a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
deleted file mode 100644
index eb00fcc87a2..00000000000
--- a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/gigedit/wrapLabel.cc
-+++ b/src/gigedit/wrapLabel.cc
-@@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text
- : mWrapWidth(0),
- mWrapHeight(0)
- {
-- // pangomm >= 2.35.1
--#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1)))
-- get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR);
--#else
- get_layout()->set_wrap(Pango::WRAP_WORD_CHAR);
--#endif
- set_alignment(0.0, 0.0);
- set_text(text);
- }
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index c574c862f52..a5248e2a89e 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
];
propagatedBuildInputs = with pythonPackages; [
- gst-python pygobject3 pykka tornado_4 requests
+ gst-python pygobject3 pykka tornado_4 requests setuptools
] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;
# There are no tests
diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index 3a663fd33c8..90b81e1163d 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.39.0";
+ version = "3.40.0";
src = pythonPackages.fetchPypi {
inherit pname version;
- sha256 = "1d2g66gvm7yaz4nbxlh23lj2xfkhi3hsg2k646m1za510f8dzlag";
+ sha256 = "1cn68zmyvig114dsw7vhx761v9c1za3wnbq4y2z0f0cbl958n49v";
};
propagatedBuildInputs = [
diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix
index 06400af679f..bde73ec16c8 100644
--- a/pkgs/applications/blockchains/jormungandr/default.nix
+++ b/pkgs/applications/blockchains/jormungandr/default.nix
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "jormungandr";
- version = "0.3.9999";
+ version = "0.5.0";
src = fetchgit {
url = "https://github.com/input-output-hk/${pname}";
rev = "v${version}";
- sha256 = "11lr533fpispwbk4vsq9bnv40gkpybvpa7ajwczv9ky6afh8np5b";
+ sha256 = "19jqnja4mxyfgg79m4ak4815wjxvkg6qn04gk21c15xl3i8b4zf6";
fetchSubmodules = true;
};
- cargoSha256 = "0b5phmvwv5cyjawlxd9rmlc403lxzm4gnw0mclq70g5g0msqzd9m";
+ cargoSha256 = "1grrxmczdmkf2sd0f0b2iblzzcp8qlrsad5dkm0r5vxch22rcx7d";
nativeBuildInputs = [ pkgconfig protobuf ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index f535d7bff47..bca85c01016 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeDesktopItem, makeWrapper, patchelf, p7zip
+{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, p7zip
, coreutils, gnugrep, which, git, unzip, libsecret, libnotify
}:
@@ -28,7 +28,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
nativeBuildInputs = [ makeWrapper patchelf p7zip unzip ];
- patchPhase = ''
+ patchPhase = lib.optionalString (!stdenv.isDarwin) ''
get_file_size() {
local fname="$1"
echo $(ls -l $fname | cut -d ' ' -f5)
@@ -63,7 +63,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
item=${desktopItem}
makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
- --prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
+ --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
# Some internals want libstdc++.so.6
stdenv.cc.cc.lib libsecret
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index a302be304e5..16a1c01363d 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -134,7 +134,7 @@ let
as IntelliJ.
'';
maintainers = with maintainers; [ edwtjo ];
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
};
});
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 7d558dfb893..6808d7115c5 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
let
neovimLuaEnv = lua.withPackages(ps:
- (with ps; [ mpack lpeg luabitop ]
+ (with ps; [ lpeg luabitop mpack ]
++ optionals doCheck [
nvim-client luv coxpcall busted luafilesystem penlight inspect
]
@@ -21,13 +21,13 @@ let
in
stdenv.mkDerivation rec {
pname = "neovim-unwrapped";
- version = "0.3.8";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "neovim";
repo = "neovim";
rev = "v${version}";
- sha256 = "15flii3p4g9f65xy9jpkb8liajrvhm5ck4j39z6d6b1nkxr6ghwb";
+ sha256 = "13w446plvgl219lhj29jyimhiqvs1y1byrz4qpdmxgyddmx9xqss";
};
patches = [
@@ -41,14 +41,15 @@ in
enableParallelBuilding = true;
buildInputs = [
+ gperf
libtermkey
libuv
+ libvterm-neovim
+ lua.pkgs.luv.libluv
msgpack
ncurses
- libvterm-neovim
- unibilium
- gperf
neovimLuaEnv
+ unibilium
] ++ optional withJemalloc jemalloc
++ optional stdenv.isDarwin libiconv
++ optionals doCheck [ glibcLocales procps ]
@@ -77,8 +78,9 @@ in
disallowedReferences = [ stdenv.cc ];
cmakeFlags = [
- "-DLUA_PRG=${neovimLuaEnv.interpreter}"
"-DGPERF_PRG=${gperf}/bin/gperf"
+ "-DLIBLUV_LIBRARY=${lua.pkgs.luv}/lib/lua/${lua.luaversion}/luv.so"
+ "-DLUA_PRG=${neovimLuaEnv.interpreter}"
]
++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix
index 9af1a0fc914..b0e76d23dac 100644
--- a/pkgs/applications/graphics/gscan2pdf/default.nix
+++ b/pkgs/applications/graphics/gscan2pdf/default.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
perlPackages.buildPerlPackage rec {
pname = "gscan2pdf";
- version = "2.5.5";
+ version = "2.5.6";
src = fetchurl {
url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz";
- sha256 = "0gfhjmv768hx2l3jk2mjhh1snkgkaddgw70s14jq8kxhhzvhlmv8";
+ sha256 = "0wp81nsi5jfypabwmjqiamxr739jq5ij79n5fzn5pbw1hg5gcmfz";
};
nativeBuildInputs = [ wrapGAppsHook ];
diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix
index 241bb71983a..76d4e989e8c 100644
--- a/pkgs/applications/kde/dolphin.nix
+++ b/pkgs/applications/kde/dolphin.nix
@@ -15,6 +15,7 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ propagatedUserEnvPkgs = [ baloo ];
propagatedBuildInputs = [
baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index 09089a072b3..142dafe38eb 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -1,42 +1,64 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, muparser, which, boost, pkgconfig }:
+{ mkDerivation, lib, fetchFromGitHub, installShellFiles, pkgconfig, runtimeShell
+, qtbase, qtsvg, qttools, qmake
+, boost, muparser }:
-stdenv.mkDerivation rec {
- version = "2.1.3";
+mkDerivation rec {
pname = "librecad";
+ version = "2.2.0-rc1";
- src = fetchurl {
- url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}";
- name = "${pname}-${version}" + ".tar.gz";
- sha256 = "1czp8bja61hfav2m7184cq1np1n76w3w6vn0hlkp81hhz9zc62sx";
+ src = fetchFromGitHub {
+ owner = "LibreCAD";
+ repo = "LibreCAD";
+ rev = version;
+ sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3";
};
- patchPhase = ''
- sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
- sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp
+ patches = [ ./fix_qt_5_11_build.patch ];
+
+ postPatch = ''
+ substituteInPlace scripts/postprocess-unix.sh \
+ --replace /bin/sh ${runtimeShell}
+
+ substituteInPlace librecad/src/lib/engine/rs_system.cpp \
+ --replace /usr/share $out/share
+
+ substituteInPlace librecad/src/main/qc_applicationwindow.cpp \
+ --replace __DATE__ 0
'';
- qmakeFlags = [ "MUPARSER_DIR=${muparser}" "BOOST_DIR=${boost.dev}" ];
+ qmakeFlags = [
+ "MUPARSER_DIR=${muparser}"
+ "BOOST_DIR=${boost.dev}"
+ ];
installPhase = ''
- install -m 555 -D unix/librecad $out/bin/librecad
- install -m 444 -D desktop/librecad.desktop $out/share/applications/librecad.desktop
- install -m 444 -D desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml
- install -m 444 -D desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \
+ runHook preInstall
+
+ install -Dm555 -t $out/bin unix/{librecad,ttf2lff}
+ install -Dm444 -t $out/share/applications desktop/librecad.desktop
+ install -Dm644 -t $out/share/pixmaps librecad/res/main/librecad.png
+ install -Dm444 desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml
+ install -Dm444 desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \
$out/share/icons/hicolor/scalable/apps/librecad.svg
+
+ installManPage desktop/librecad.?
+
cp -R unix/resources $out/share/librecad
+
+ runHook postInstall
'';
- buildInputs = [ qt4 muparser which boost ];
- nativeBuildInputs = [ pkgconfig qmake4Hook ];
+ buildInputs = [ boost muparser qtbase qtsvg ];
+
+ nativeBuildInputs = [ installShellFiles pkgconfig qmake qttools ];
enableParallelBuilding = true;
- meta = {
- description = "A 2D CAD package based upon Qt";
- homepage = https://librecad.org;
- repositories.git = git://github.com/LibreCAD/LibreCAD.git;
- license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
+ meta = with lib; {
+ description = "2D CAD package based on Qt";
+ homepage = "https://librecad.org";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ viric ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch b/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
new file mode 100644
index 00000000000..04701e5ab1e
--- /dev/null
+++ b/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch
@@ -0,0 +1,36 @@
+diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp
+index 835e47d..2c878e8 100644
+--- a/librecad/src/ui/forms/qg_commandwidget.cpp
++++ b/librecad/src/ui/forms/qg_commandwidget.cpp
+@@ -27,6 +27,7 @@
+
+ #include
+
++#include
+ #include
+ #include
+ #include
+diff --git a/librecad/src/ui/generic/colorwizard.cpp b/librecad/src/ui/generic/colorwizard.cpp
+index 2beaceb..84068ad 100644
+--- a/librecad/src/ui/generic/colorwizard.cpp
++++ b/librecad/src/ui/generic/colorwizard.cpp
+@@ -27,6 +27,7 @@
+ #include "colorwizard.h"
+ #include "ui_colorwizard.h"
+
++#include
+ #include
+ #include
+ #include
+diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp
+index 7c35144..0e394f2 100644
+--- a/librecad/src/ui/generic/widgetcreator.cpp
++++ b/librecad/src/ui/generic/widgetcreator.cpp
+@@ -27,6 +27,7 @@
+ #include "widgetcreator.h"
+ #include "ui_widgetcreator.h"
+
++#include
+ #include
+ #include
+ #include
diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix
index d6153d2268b..12a0720e447 100644
--- a/pkgs/applications/misc/mucommander/default.nix
+++ b/pkgs/applications/misc/mucommander/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre, gsettings-desktop-schemas }:
+{ stdenv, fetchFromGitHub, gradle_4_10, perl, makeWrapper, jre, gsettings-desktop-schemas }:
let
- version = "0.9.2";
+ version = "0.9.3-3";
name = "mucommander-${version}";
src = fetchFromGitHub {
owner = "mucommander";
repo = "mucommander";
rev = version;
- sha256 = "1fvij0yjjz56hsyddznx7mdgq1zm25fkng3axl03iyrij976z7b8";
+ sha256 = "1zhglsx3b5k6np3ppfkkrqz9wg0j7ip598xxfgn75gjl020w0can";
};
postPatch = ''
# there is no .git anyway
substituteInPlace build.gradle \
--replace "git = org.ajoberstar.grgit.Grgit.open(file('.'))" "" \
- --replace "revision = git.head().id" "revision = 'abcdefgh'"
+ --replace "revision = git.head().id" "revision = 'abcdefgh'" \
+ --replace "proguard.enabled =" "// proguard.enabled =" \
+ --replace "version = '0.9.4'" "version = '${version}'"
# disable gradle plugins with native code and their targets
perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle
@@ -34,7 +36,7 @@ let
deps = stdenv.mkDerivation {
name = "${name}-deps";
inherit src postPatch;
- nativeBuildInputs = [ gradle_3_5 perl ];
+ nativeBuildInputs = [ gradle_4_10 perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
gradle --no-daemon build
@@ -47,12 +49,12 @@ let
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "199a9rc1pp9jjwpy83743qhjczfz0d1mkbic6si9bh8l62nw8qc7";
+ outputHash = "1v5a76pvk7llbyv2rg50wlxc2wf468l2cslz1vi20aihycbyky7j";
};
in stdenv.mkDerivation {
inherit name src postPatch;
- nativeBuildInputs = [ gradle_3_5 perl makeWrapper ];
+ nativeBuildInputs = [ gradle_4_10 perl makeWrapper ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
@@ -63,7 +65,7 @@ in stdenv.mkDerivation {
repositories { mavenLocal(); maven { url '${deps}' } }
#" {} \;
- gradle --offline --no-daemon build
+ gradle --offline --no-daemon distTar
'';
installPhase = ''
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 6a16741a06b..87125eb1b36 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -1,64 +1,75 @@
-{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
-, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
-, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome2 }:
+{ atomEnv, autoPatchelfHook, dpkg, fetchurl, makeDesktopItem, makeWrapper
+, stdenv, udev, wrapGAppsHook }:
-stdenv.mkDerivation rec {
+let
+ inherit (stdenv.hostPlatform) system;
- name = "simplenote-${pkgver}";
- pkgver = "1.1.3";
+ pname = "simplenote";
- src = fetchurl {
- url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-${pkgver}.tar.gz";
- sha256 = "1z92yyjmg3bgfqfdpnysf98h9hhhnqzdqqigwlmdmn3d7fy49kcf";
- };
+ version = "1.8.0";
- buildCommand = let
-
- packages = [
- stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
- fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr nss
- xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
- xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
- xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome2.GConf
- xorg.libxcb
- ];
-
- libPathNative = lib.makeLibraryPath packages;
- libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
- libPath = "${libPathNative}:${libPath64}";
-
- in ''
- mkdir -p $out/share/
- mkdir -p $out/bin
- tar xvzf $src -C $out/share/
- mv $out/share/Simplenote-linux-x64 $out/share/simplenote
- mv $out/share/simplenote/Simplenote $out/share/simplenote/simplenote
- mkdir -p $out/share/applications
-
- cat > $out/share/applications/simplenote.desktop << EOF
- [Desktop Entry]
- Name=Simplenote
- Comment=Simplenote for Linux
- Exec=$out/bin/simplenote
- Icon=$out/share/simplenote/Simplenote.png
- Type=Application
- StartupNotify=true
- Categories=Development;
- EOF
-
- fixupPhase
-
- patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
- --set-rpath "${libPath}:$out/share/simplenote" \
- $out/share/simplenote/simplenote
-
- ln -s $out/share/simplenote/simplenote $out/bin/simplenote
- '';
+ sha256 = {
+ x86_64-linux = "066gr1awdj5nwdr1z57mmvx7dd1z19g0wzsgbnrrb89bqfj67ykl";
+ }.${system};
meta = with stdenv.lib; {
description = "The simplest way to keep notes";
- homepage = https://github.com/Automattic/simplenote-electron;
- license = licenses.lgpl2;
+ homepage = "https://github.com/Automattic/simplenote-electron";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ kiwi ];
platforms = [ "x86_64-linux" ];
};
-}
+
+ linux = stdenv.mkDerivation rec {
+ inherit pname version meta;
+
+ src = fetchurl {
+ url =
+ "https://github.com/Automattic/simplenote-electron/releases/download/"
+ + "v${version}/Simplenote-linux-${version}-amd64.deb";
+ inherit sha256;
+ };
+
+ desktopItem = makeDesktopItem {
+ name = "simplenote";
+ comment = "Simplenote for Linux";
+ exec = "simplenote %U";
+ icon = "simplenote";
+ type = "Application";
+ startupNotify = "true";
+ desktopName = "Simplenote";
+ categories = "Development";
+ };
+
+ dontBuild = true;
+ dontConfigure = true;
+ dontPatchELF = true;
+ dontWrapGApps = true;
+
+ buildInputs = atomEnv.packages;
+
+ nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ];
+
+ unpackPhase = "dpkg-deb -x $src .";
+
+ installPhase = ''
+ mkdir -p "$out/bin"
+ cp -R "opt" "$out"
+ cp -R "usr/share" "$out/share"
+ chmod -R g-w "$out"
+
+ mkdir -p "$out/share/applications"
+ cp "${desktopItem}/share/applications/"* "$out/share/applications"
+ '';
+
+ runtimeDependencies = [ udev.lib ];
+
+ postFixup = ''
+ ls -ahl $out
+ makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \
+ "''${gappsWrapperArgs[@]}"
+ '';
+ };
+
+in
+ linux
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 45fb820a076..ae3659a21fe 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -82,11 +82,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
- version = "0.68.131";
+ version = "0.69.128";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
- sha256 = "0syhwy1gxy82jbxbryi1n4zp1ya7wvm20g1vqvd2s7kqspprsi0l";
+ sha256 = "1w5p2hbn14k239fbqrbxkw9h3p8wm7cdyjcyvrsss57fj00j8s4r";
};
dontConfigure = true;
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index ae7a40f6c10..1d89ee2a5d7 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -266,17 +266,17 @@ in rec {
gtk3Support = false;
};
- tor-browser-8-5 = tbcommon {
- ffversion = "60.8.0esr";
- tbversion = "8.5.4";
+ tor-browser-8-5 = tbcommon rec {
+ ffversion = "60.9.0esr";
+ tbversion = "8.5.6";
# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
- # branch "tor-browser-60.8.0esr-8.5-1-slnos"
- rev = "9ec7e4832a68ba3a77f5e8e21dc930a25757f55d";
- sha256 = "10x9h2nm1p8cs0qnd8yjp7ly5raxagqyfjn4sj2y3i86ya5zygb9";
+ # branch "tor-browser-60.9.0esr-8.5-2-slnos"
+ rev = "0489ae3158cd8c0e16c2e78b94083d8cbf0209dc";
+ sha256 = "0y5s7d8pg8ak990dp8d801j9823igaibfhv9hsa79nib5yllifzs";
};
patches = [
diff --git a/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix b/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix
new file mode 100644
index 00000000000..6ab53376310
--- /dev/null
+++ b/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, gcc7, pkg-config
+, next
+, webkitgtk, gsettings-desktop-schemas
+}:
+
+stdenv.mkDerivation rec {
+ pname = "next-gtk-webkit";
+ inherit (next) src version;
+
+ makeFlags = [ "gtk-webkit" "PREFIX=$(out)" ];
+ installTargets = "install-gtk-webkit";
+
+ nativeBuildInputs = [ gcc7 pkg-config ];
+ buildInputs = [
+ webkitgtk
+ gsettings-desktop-schemas
+ ];
+ meta = with stdenv.lib; {
+ description = "Infinitely extensible web-browser (user interface only)";
+ homepage = https://next.atlas.engineer;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.lewo ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/networking/browsers/next/default.nix b/pkgs/applications/networking/browsers/next/default.nix
new file mode 100644
index 00000000000..2b2e173342c
--- /dev/null
+++ b/pkgs/applications/networking/browsers/next/default.nix
@@ -0,0 +1,80 @@
+{ pkgs, stdenv, fetchFromGitHub
+, gcc7, pkg-config, makeWrapper
+, glib-networking
+, next-gtk-webkit
+, lispPackages
+, sbcl
+}:
+
+stdenv.mkDerivation rec {
+ pname = "next";
+ version = "1.3.1";
+
+ src = fetchFromGitHub {
+ owner = "atlas-engineer";
+ repo = "next";
+ rev = version;
+ sha256 = "01fn1f080ydk0wj1bwkyakqz93bdq9xb5x8qz820jpl9id17bqgj";
+ };
+
+ # Stripping destroys the generated SBCL image
+ dontStrip = true;
+
+ prePatch = ''
+ substituteInPlace source/ports/gtk-webkit.lisp \
+ --replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit"
+ '';
+
+ nativeBuildInputs = [ sbcl makeWrapper ];
+ buildInputs = with lispPackages; [
+ trivial-features
+ trivial-garbage
+ alexandria
+ bordeaux-threads
+ cl-json
+ cl-markup
+ cl-ppcre
+ cl-ppcre-unicode
+ closer-mop
+ dexador
+ ironclad
+ lparallel
+ parenscript
+ quri
+ cl-css
+ log4cl
+ mk-string-metrics
+ sqlite
+ str
+ swank
+ trivia
+ trivial-clipboard
+ unix-opts
+ dbus
+ ];
+ propagatedBuildInputs = [ next-gtk-webkit ];
+
+ buildPhase = ''
+ common-lisp.sh --eval "(require :asdf)" \
+ --eval "(asdf:load-asd (truename \"next.asd\") :name \"next\")" \
+ --eval '(asdf:make :next)' \
+ --quit
+ '';
+
+ installPhase = ''
+ install -D -m0755 next $out/bin/next
+ '';
+
+ preFixup = ''
+ wrapProgram $out/bin/next \
+ --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Infinitely extensible web-browser (with Lisp development files)";
+ homepage = https://next.atlas.engineer;
+ license = licenses.bsd3;
+ maintainers = [ maintainers.lewo ];
+ platforms = [ "x86_64-linux" ];
+ };
+ }
diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix
index bd38855109a..6fd66096b5b 100644
--- a/pkgs/applications/networking/irc/kvirc/default.nix
+++ b/pkgs/applications/networking/irc/kvirc/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub
+{ lib, mkDerivation, fetchFromGitHub
, qtbase, qtmultimedia, qtsvg, qtx11extras
, pkgconfig, cmake, gettext
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "kvirc";
version = "5.0.0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
pkgconfig cmake gettext
];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Advanced IRC Client";
homepage = "http://www.kvirc.net/";
license = licenses.gpl2;
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 6aacdde544b..6addd66ac63 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -1,5 +1,5 @@
{ monolithic ? true # build monolithic Quassel
-, daemon ? false # build Quassel daemon
+, enableDaemon ? false # build Quassel daemon
, client ? false # build Quassel client
, tag ? "-kf5" # tag added to the package name
, static ? false # link statically
@@ -21,11 +21,11 @@
let
buildClient = monolithic || client;
- buildCore = monolithic || daemon;
+ buildCore = monolithic || enableDaemon;
in
-assert monolithic -> !client && !daemon;
-assert client || daemon -> !monolithic;
+assert monolithic -> !client && !enableDaemon;
+assert client || enableDaemon -> !monolithic;
assert !buildClient -> !withKDE; # KDE is used by the client only
let
@@ -63,12 +63,12 @@ in with stdenv; mkDerivation rec {
]
++ edf static "STATIC"
++ edf monolithic "WANT_MONO"
- ++ edf daemon "WANT_CORE"
+ ++ edf enableDaemon "WANT_CORE"
++ edf client "WANT_QTCLIENT"
++ edf withKDE "WITH_KDE";
preFixup =
- lib.optionalString daemon ''
+ lib.optionalString enableDaemon ''
wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin"
'' +
lib.optionalString buildClient ''
diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix
index bfacac2eaf4..65490ada653 100644
--- a/pkgs/applications/networking/maestral/default.nix
+++ b/pkgs/applications/networking/maestral/default.nix
@@ -1,21 +1,23 @@
-{ lib, python3Packages, fetchFromGitHub
+{ stdenv, lib, python3Packages, fetchFromGitHub
, withGui ? false, wrapQtAppsHook ? null }:
python3Packages.buildPythonApplication rec {
pname = "maestral${lib.optionalString withGui "-gui"}";
- version = "0.2.6";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral-dropbox";
rev = "v${version}";
- sha256 = "1nfjm58f6hnqbx9xnz2h929s2175ka1yf5jjlk4i60v0wppnrrdf";
+ sha256 = "1jjn9cz43850xvs52gvx16qc5z4l91y4kpn6fpl05iwgaisbi1ws";
};
disabled = python3Packages.pythonOlder "3.6";
propagatedBuildInputs = (with python3Packages; [
- blinker click dropbox keyring keyrings-alt requests u-msgpack-python watchdog
+ blinker click dropbox keyring keyrings-alt Pyro4 requests u-msgpack-python watchdog
+ ] ++ lib.optionals stdenv.isLinux [
+ sdnotify systemd
] ++ lib.optional withGui pyqt5);
nativeBuildInputs = lib.optional withGui wrapQtAppsHook;
diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index 78b1aad03fb..7d7972c3e58 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "imapfilter";
- version = "2.6.12";
+ version = "2.6.13";
src = fetchFromGitHub {
owner = "lefcha";
repo = "imapfilter";
rev = "v${version}";
- sha256 = "0vzpc54fjf5vb5vx5w0fl20xvx1k9cg6a3hbl86mm8kwsqf3wrab";
+ sha256 = "02997rnnvid3rfkxmlgjpbspi4svdmq8r8wd2zvf25iadim3hxqi";
};
makeFlagsArray = "PREFIX=$(out)";
diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix
index 05c0c0e8ec6..4022383dbc7 100644
--- a/pkgs/applications/science/math/pynac/default.nix
+++ b/pkgs/applications/science/math/pynac/default.nix
@@ -9,14 +9,14 @@
}:
stdenv.mkDerivation rec {
- version = "0.7.25";
+ version = "0.7.26";
pname = "pynac";
src = fetchFromGitHub {
owner = "pynac";
repo = "pynac";
rev = "pynac-${version}";
- sha256 = "0nnifvg6kzx0lq6gz7znind8g30v3d2pjfwgsdiks3vv9kv9nbj3";
+ sha256 = "09d2p74x1arkydlxy6pw4p4byi7r8q7f29w373h4d8a215kadc6d";
};
buildInputs = [
diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix
index 8fd69f62171..0b67b3cff12 100644
--- a/pkgs/applications/science/math/sage/sage-env.nix
+++ b/pkgs/applications/science/math/sage/sage-env.nix
@@ -44,6 +44,7 @@
, gsl
, ntl
, jdk
+, less
}:
# This generates a `sage-env` shell file that will be sourced by sage on startup.
@@ -92,6 +93,7 @@ let
rubiks
flintqs
jdk # only needed for `jmol` which may be replaced in the future
+ less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved
]
));
in
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index e64254ed29f..a0f39bad363 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -147,6 +147,8 @@ let
lab = callPackage ./lab { };
+ lefthook = callPackage ./lefthook { };
+
pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
pass-git-helper = python3Packages.callPackage ./pass-git-helper { };
diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
new file mode 100644
index 00000000000..04ba4c7c48f
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "lefthook";
+ version = "0.6.3";
+
+ src = fetchFromGitHub {
+ rev = "v${version}";
+ owner = "Arkweid";
+ repo = "lefthook";
+ sha256 = "01zvlw2yyxjg92d1qag1b42kc2kd68h4fmrv9y6ar7z0rw3p9a5d";
+ };
+
+ modSha256 = "0mjhw778x40c2plmjlkiry4rwvr9xkz65b88a61j86liv2plbmq2";
+
+ meta = with stdenv.lib; {
+ description = "Fast and powerful Git hooks manager for any type of projects";
+ homepage = "https://github.com/Arkweid/lefthook";
+ license = licenses.mit;
+ maintainers = with maintainers; [ rencire ];
+ };
+}
diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix
index 4ddd84433e8..1b9f0d0997a 100644
--- a/pkgs/applications/video/kino/default.nix
+++ b/pkgs/applications/video/kino/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation {
postInstall = "
rpath=`patchelf --print-rpath \$out/bin/kino`;
- for i in $\buildInputs; do
+ for i in $buildInputs; do
echo adding \$i/lib
rpath=\$rpath\${rpath:+:}\$i/lib
done
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index 1787e40eb96..ecd792f74e7 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -9,19 +9,19 @@ in
rustPlatform.buildRustPackage rec {
pname = "dwm-status";
- version = "1.6.2";
+ version = "1.6.3";
src = fetchFromGitHub {
owner = "Gerschtli";
repo = "dwm-status";
rev = version;
- sha256 = "16vf7val1isc4227amng2ap9af34xa2va23dxv43px006xhrar78";
+ sha256 = "02sprsr7822ynkwpf3xdgmkdrgkw3vgijhlh65bayiv3b5lwb54n";
};
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
- cargoSha256 = "0pprf8509d321azg2l51lpxylgpk7290y38z9p5hxgkcwhrhrcss";
+ cargoSha256 = "0l6x59bzzilc78gsi5rlgq9zjvp8qjphfsds776ljzmkbdq8q4iz";
postInstall = lib.optionalString (bins != []) ''
wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}"
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 9e55d1172cb..7e2b2b347d9 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -185,6 +185,7 @@ rec {
keyutils.lib
libjack2
fribidi
+ p11_kit
# libraries not on the upstream include list, but nevertheless expected
# by at least one appimage
diff --git a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix b/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
deleted file mode 100644
index 9af5cbe652c..00000000000
--- a/pkgs/build-support/rust/cargo-vendor/cargo-vendor.nix
+++ /dev/null
@@ -1,693 +0,0 @@
-# Generated by carnix 0.10.0: carnix generate-nix --src .
-{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }:
-with buildRustCrateHelpers;
-let inherit (lib.lists) fold;
- inherit (lib.attrsets) recursiveUpdate;
-in
-rec {
- crates = cratesIO // rec {
-# cargo-vendor-0.1.23
-
- crates.cargo_vendor."0.1.23" = deps: { features?(features_.cargo_vendor."0.1.23" deps {}) }: buildRustCrate {
- crateName = "cargo-vendor";
- version = "0.1.23";
- description = "A Cargo subcommand to vendor all crates.io dependencies onto the local\nfilesystem.\n";
- authors = [ "Alex Crichton " ];
- edition = "2018";
- src = exclude [ ".git" "target" ] ./.;
- dependencies = mapFeatures features ([
- (cratesIO.crates."cargo"."${deps."cargo_vendor"."0.1.23"."cargo"}" deps)
- (cratesIO.crates."docopt"."${deps."cargo_vendor"."0.1.23"."docopt"}" deps)
- (cratesIO.crates."env_logger"."${deps."cargo_vendor"."0.1.23"."env_logger"}" deps)
- (cratesIO.crates."failure"."${deps."cargo_vendor"."0.1.23"."failure"}" deps)
- (cratesIO.crates."serde"."${deps."cargo_vendor"."0.1.23"."serde"}" deps)
- (cratesIO.crates."serde_json"."${deps."cargo_vendor"."0.1.23"."serde_json"}" deps)
- (cratesIO.crates."toml"."${deps."cargo_vendor"."0.1.23"."toml"}" deps)
- ]
- ++ (if features.cargo_vendor."0.1.23".openssl or false then [ (cratesIO.crates.openssl."${deps."cargo_vendor"."0.1.23".openssl}" deps) ] else []));
- features = mkFeatures (features."cargo_vendor"."0.1.23" or {});
- };
- features_.cargo_vendor."0.1.23" = deps: f: updateFeatures f (rec {
- cargo."${deps.cargo_vendor."0.1.23".cargo}".default = true;
- cargo_vendor."0.1.23".default = (f.cargo_vendor."0.1.23".default or true);
- docopt."${deps.cargo_vendor."0.1.23".docopt}".default = true;
- env_logger."${deps.cargo_vendor."0.1.23".env_logger}".default = true;
- failure."${deps.cargo_vendor."0.1.23".failure}".default = true;
- openssl = fold recursiveUpdate {} [
- { "${deps.cargo_vendor."0.1.23".openssl}"."vendored" =
- (f.openssl."${deps.cargo_vendor."0.1.23".openssl}"."vendored" or false) ||
- (cargo_vendor."0.1.23"."vendored-openssl" or false) ||
- (f."cargo_vendor"."0.1.23"."vendored-openssl" or false); }
- { "${deps.cargo_vendor."0.1.23".openssl}".default = true; }
- ];
- serde = fold recursiveUpdate {} [
- { "${deps.cargo_vendor."0.1.23".serde}"."derive" = true; }
- { "${deps.cargo_vendor."0.1.23".serde}".default = true; }
- ];
- serde_json."${deps.cargo_vendor."0.1.23".serde_json}".default = true;
- toml."${deps.cargo_vendor."0.1.23".toml}".default = true;
- }) [
- (cratesIO.features_.cargo."${deps."cargo_vendor"."0.1.23"."cargo"}" deps)
- (cratesIO.features_.docopt."${deps."cargo_vendor"."0.1.23"."docopt"}" deps)
- (cratesIO.features_.env_logger."${deps."cargo_vendor"."0.1.23"."env_logger"}" deps)
- (cratesIO.features_.failure."${deps."cargo_vendor"."0.1.23"."failure"}" deps)
- (cratesIO.features_.openssl."${deps."cargo_vendor"."0.1.23"."openssl"}" deps)
- (cratesIO.features_.serde."${deps."cargo_vendor"."0.1.23"."serde"}" deps)
- (cratesIO.features_.serde_json."${deps."cargo_vendor"."0.1.23"."serde_json"}" deps)
- (cratesIO.features_.toml."${deps."cargo_vendor"."0.1.23"."toml"}" deps)
- ];
-
-
-# end
-
- };
-
- cargo_vendor = crates.crates.cargo_vendor."0.1.23" deps;
- __all = [ (cargo_vendor {}) ];
- deps.adler32."1.0.3" = {};
- deps.aho_corasick."0.7.3" = {
- memchr = "2.2.0";
- };
- deps.ansi_term."0.11.0" = {
- winapi = "0.3.7";
- };
- deps.atty."0.2.11" = {
- termion = "1.5.1";
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.autocfg."0.1.2" = {};
- deps.backtrace."0.3.15" = {
- cfg_if = "0.1.7";
- rustc_demangle = "0.1.14";
- autocfg = "0.1.2";
- backtrace_sys = "0.1.28";
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.backtrace_sys."0.1.28" = {
- libc = "0.2.51";
- cc = "1.0.35";
- };
- deps.bitflags."1.0.4" = {};
- deps.bstr."0.1.2" = {
- memchr = "2.2.0";
- };
- deps.build_const."0.2.1" = {};
- deps.byteorder."1.3.1" = {};
- deps.bytes."0.4.12" = {
- byteorder = "1.3.1";
- iovec = "0.1.2";
- };
- deps.bytesize."1.0.0" = {};
- deps.cargo."0.35.0" = {
- atty = "0.2.11";
- byteorder = "1.3.1";
- bytesize = "1.0.0";
- clap = "2.33.0";
- crates_io = "0.23.0";
- crossbeam_utils = "0.6.5";
- crypto_hash = "0.3.3";
- curl = "0.4.21";
- curl_sys = "0.4.18";
- env_logger = "0.6.1";
- failure = "0.1.5";
- filetime = "0.2.4";
- flate2 = "1.0.7";
- fs2 = "0.4.3";
- git2 = "0.8.0";
- git2_curl = "0.9.0";
- glob = "0.2.11";
- hex = "0.3.2";
- home = "0.3.4";
- ignore = "0.4.7";
- im_rc = "12.3.4";
- jobserver = "0.1.13";
- lazy_static = "1.3.0";
- lazycell = "1.2.1";
- libc = "0.2.51";
- libgit2_sys = "0.7.11";
- log = "0.4.6";
- num_cpus = "1.10.0";
- opener = "0.3.2";
- rustc_workspace_hack = "1.0.0";
- rustfix = "0.4.5";
- same_file = "1.0.4";
- semver = "0.9.0";
- serde = "1.0.90";
- serde_ignored = "0.0.4";
- serde_json = "1.0.39";
- shell_escape = "0.1.4";
- tar = "0.4.22";
- tempfile = "3.0.7";
- termcolor = "1.0.4";
- toml = "0.4.10";
- unicode_width = "0.1.5";
- url = "1.7.2";
- url_serde = "0.2.0";
- core_foundation = "0.6.4";
- fwdansi = "1.0.1";
- miow = "0.3.3";
- winapi = "0.3.7";
- };
- deps.cargo_vendor."0.1.23" = {
- cargo = "0.35.0";
- docopt = "1.1.0";
- env_logger = "0.6.1";
- failure = "0.1.5";
- openssl = "0.10.20";
- serde = "1.0.90";
- serde_json = "1.0.39";
- toml = "0.5.0";
- };
- deps.cc."1.0.35" = {};
- deps.cfg_if."0.1.7" = {};
- deps.clap."2.33.0" = {
- atty = "0.2.11";
- bitflags = "1.0.4";
- strsim = "0.8.0";
- textwrap = "0.11.0";
- unicode_width = "0.1.5";
- vec_map = "0.8.1";
- ansi_term = "0.11.0";
- };
- deps.cloudabi."0.0.3" = {
- bitflags = "1.0.4";
- };
- deps.commoncrypto."0.2.0" = {
- commoncrypto_sys = "0.2.0";
- };
- deps.commoncrypto_sys."0.2.0" = {
- libc = "0.2.51";
- };
- deps.core_foundation."0.6.4" = {
- core_foundation_sys = "0.6.2";
- libc = "0.2.51";
- };
- deps.core_foundation_sys."0.6.2" = {};
- deps.crates_io."0.23.0" = {
- curl = "0.4.21";
- failure = "0.1.5";
- http = "0.1.17";
- serde = "1.0.90";
- serde_derive = "1.0.90";
- serde_json = "1.0.39";
- url = "1.7.2";
- };
- deps.crc."1.8.1" = {
- build_const = "0.2.1";
- };
- deps.crc32fast."1.2.0" = {
- cfg_if = "0.1.7";
- };
- deps.crossbeam_channel."0.3.8" = {
- crossbeam_utils = "0.6.5";
- smallvec = "0.6.9";
- };
- deps.crossbeam_utils."0.6.5" = {
- cfg_if = "0.1.7";
- lazy_static = "1.3.0";
- };
- deps.crypto_hash."0.3.3" = {
- hex = "0.3.2";
- commoncrypto = "0.2.0";
- openssl = "0.10.20";
- winapi = "0.3.7";
- };
- deps.curl."0.4.21" = {
- curl_sys = "0.4.18";
- libc = "0.2.51";
- socket2 = "0.3.8";
- openssl_probe = "0.1.2";
- openssl_sys = "0.9.43";
- kernel32_sys = "0.2.2";
- schannel = "0.1.15";
- winapi = "0.2.8";
- };
- deps.curl_sys."0.4.18" = {
- libc = "0.2.51";
- libnghttp2_sys = "0.1.1";
- libz_sys = "1.0.25";
- cc = "1.0.35";
- pkg_config = "0.3.14";
- openssl_sys = "0.9.43";
- winapi = "0.3.7";
- };
- deps.docopt."1.1.0" = {
- lazy_static = "1.3.0";
- regex = "1.1.6";
- serde = "1.0.90";
- strsim = "0.9.1";
- };
- deps.either."1.5.2" = {};
- deps.env_logger."0.6.1" = {
- atty = "0.2.11";
- humantime = "1.2.0";
- log = "0.4.6";
- regex = "1.1.6";
- termcolor = "1.0.4";
- };
- deps.failure."0.1.5" = {
- backtrace = "0.3.15";
- failure_derive = "0.1.5";
- };
- deps.failure_derive."0.1.5" = {
- proc_macro2 = "0.4.27";
- quote = "0.6.12";
- syn = "0.15.32";
- synstructure = "0.10.1";
- };
- deps.filetime."0.2.4" = {
- cfg_if = "0.1.7";
- redox_syscall = "0.1.54";
- libc = "0.2.51";
- };
- deps.flate2."1.0.7" = {
- crc32fast = "1.2.0";
- libc = "0.2.51";
- libz_sys = "1.0.25";
- miniz_sys = "0.1.11";
- miniz_oxide_c_api = "0.2.1";
- };
- deps.fnv."1.0.6" = {};
- deps.foreign_types."0.3.2" = {
- foreign_types_shared = "0.1.1";
- };
- deps.foreign_types_shared."0.1.1" = {};
- deps.fs2."0.4.3" = {
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.fuchsia_cprng."0.1.1" = {};
- deps.fwdansi."1.0.1" = {
- memchr = "2.2.0";
- termcolor = "1.0.4";
- };
- deps.git2."0.8.0" = {
- bitflags = "1.0.4";
- libc = "0.2.51";
- libgit2_sys = "0.7.11";
- log = "0.4.6";
- url = "1.7.2";
- openssl_probe = "0.1.2";
- openssl_sys = "0.9.43";
- };
- deps.git2_curl."0.9.0" = {
- curl = "0.4.21";
- git2 = "0.8.0";
- log = "0.4.6";
- url = "1.7.2";
- };
- deps.glob."0.2.11" = {};
- deps.globset."0.4.3" = {
- aho_corasick = "0.7.3";
- bstr = "0.1.2";
- fnv = "1.0.6";
- log = "0.4.6";
- regex = "1.1.6";
- };
- deps.hashbrown."0.1.8" = {
- byteorder = "1.3.1";
- scopeguard = "0.3.3";
- };
- deps.hex."0.3.2" = {};
- deps.home."0.3.4" = {
- scopeguard = "0.3.3";
- winapi = "0.3.7";
- };
- deps.http."0.1.17" = {
- bytes = "0.4.12";
- fnv = "1.0.6";
- itoa = "0.4.3";
- };
- deps.humantime."1.2.0" = {
- quick_error = "1.2.2";
- };
- deps.idna."0.1.5" = {
- matches = "0.1.8";
- unicode_bidi = "0.3.4";
- unicode_normalization = "0.1.8";
- };
- deps.ignore."0.4.7" = {
- crossbeam_channel = "0.3.8";
- globset = "0.4.3";
- lazy_static = "1.3.0";
- log = "0.4.6";
- memchr = "2.2.0";
- regex = "1.1.6";
- same_file = "1.0.4";
- thread_local = "0.3.6";
- walkdir = "2.2.7";
- winapi_util = "0.1.2";
- };
- deps.im_rc."12.3.4" = {
- sized_chunks = "0.1.3";
- typenum = "1.10.0";
- rustc_version = "0.2.3";
- };
- deps.iovec."0.1.2" = {
- libc = "0.2.51";
- winapi = "0.2.8";
- };
- deps.itertools."0.7.11" = {
- either = "1.5.2";
- };
- deps.itoa."0.4.3" = {};
- deps.jobserver."0.1.13" = {
- log = "0.4.6";
- libc = "0.2.51";
- rand = "0.6.5";
- };
- deps.kernel32_sys."0.2.2" = {
- winapi = "0.2.8";
- winapi_build = "0.1.1";
- };
- deps.lazy_static."1.3.0" = {};
- deps.lazycell."1.2.1" = {};
- deps.libc."0.2.51" = {};
- deps.libgit2_sys."0.7.11" = {
- curl_sys = "0.4.18";
- libc = "0.2.51";
- libssh2_sys = "0.2.11";
- libz_sys = "1.0.25";
- cc = "1.0.35";
- pkg_config = "0.3.14";
- openssl_sys = "0.9.43";
- };
- deps.libnghttp2_sys."0.1.1" = {
- libc = "0.2.51";
- cc = "1.0.35";
- };
- deps.libssh2_sys."0.2.11" = {
- libc = "0.2.51";
- libz_sys = "1.0.25";
- cc = "1.0.35";
- pkg_config = "0.3.14";
- openssl_sys = "0.9.43";
- };
- deps.libz_sys."1.0.25" = {
- libc = "0.2.51";
- cc = "1.0.35";
- pkg_config = "0.3.14";
- };
- deps.lock_api."0.1.5" = {
- scopeguard = "0.3.3";
- };
- deps.log."0.4.6" = {
- cfg_if = "0.1.7";
- };
- deps.matches."0.1.8" = {};
- deps.matrixmultiply."0.1.15" = {
- rawpointer = "0.1.0";
- };
- deps.memchr."2.2.0" = {};
- deps.miniz_sys."0.1.11" = {
- libc = "0.2.51";
- cc = "1.0.35";
- };
- deps.miniz_oxide."0.2.1" = {
- adler32 = "1.0.3";
- };
- deps.miniz_oxide_c_api."0.2.1" = {
- crc = "1.8.1";
- libc = "0.2.51";
- miniz_oxide = "0.2.1";
- cc = "1.0.35";
- };
- deps.miow."0.3.3" = {
- socket2 = "0.3.8";
- winapi = "0.3.7";
- };
- deps.ndarray."0.12.1" = {
- itertools = "0.7.11";
- matrixmultiply = "0.1.15";
- num_complex = "0.2.1";
- num_traits = "0.2.6";
- };
- deps.num_complex."0.2.1" = {
- num_traits = "0.2.6";
- };
- deps.num_traits."0.2.6" = {};
- deps.num_cpus."1.10.0" = {
- libc = "0.2.51";
- };
- deps.once_cell."0.1.8" = {
- parking_lot = "0.7.1";
- };
- deps.opener."0.3.2" = {
- failure = "0.1.5";
- failure_derive = "0.1.5";
- winapi = "0.3.7";
- };
- deps.openssl."0.10.20" = {
- bitflags = "1.0.4";
- cfg_if = "0.1.7";
- foreign_types = "0.3.2";
- lazy_static = "1.3.0";
- libc = "0.2.51";
- openssl_sys = "0.9.43";
- };
- deps.openssl_probe."0.1.2" = {};
- deps.openssl_src."111.2.1+1.1.1b" = {
- cc = "1.0.35";
- };
- deps.openssl_sys."0.9.43" = {
- libc = "0.2.51";
- cc = "1.0.35";
- openssl_src = "111.2.1+1.1.1b";
- pkg_config = "0.3.14";
- rustc_version = "0.2.3";
- };
- deps.parking_lot."0.7.1" = {
- lock_api = "0.1.5";
- parking_lot_core = "0.4.0";
- };
- deps.parking_lot_core."0.4.0" = {
- rand = "0.6.5";
- smallvec = "0.6.9";
- rustc_version = "0.2.3";
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.percent_encoding."1.0.1" = {};
- deps.pkg_config."0.3.14" = {};
- deps.proc_macro2."0.4.27" = {
- unicode_xid = "0.1.0";
- };
- deps.quick_error."1.2.2" = {};
- deps.quote."0.6.12" = {
- proc_macro2 = "0.4.27";
- };
- deps.rand."0.6.5" = {
- rand_chacha = "0.1.1";
- rand_core = "0.4.0";
- rand_hc = "0.1.0";
- rand_isaac = "0.1.1";
- rand_jitter = "0.1.3";
- rand_os = "0.1.3";
- rand_pcg = "0.1.2";
- rand_xorshift = "0.1.1";
- autocfg = "0.1.2";
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.rand_chacha."0.1.1" = {
- rand_core = "0.3.1";
- autocfg = "0.1.2";
- };
- deps.rand_core."0.3.1" = {
- rand_core = "0.4.0";
- };
- deps.rand_core."0.4.0" = {};
- deps.rand_hc."0.1.0" = {
- rand_core = "0.3.1";
- };
- deps.rand_isaac."0.1.1" = {
- rand_core = "0.3.1";
- };
- deps.rand_jitter."0.1.3" = {
- rand_core = "0.4.0";
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.rand_os."0.1.3" = {
- rand_core = "0.4.0";
- rdrand = "0.4.0";
- cloudabi = "0.0.3";
- fuchsia_cprng = "0.1.1";
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.rand_pcg."0.1.2" = {
- rand_core = "0.4.0";
- autocfg = "0.1.2";
- };
- deps.rand_xorshift."0.1.1" = {
- rand_core = "0.3.1";
- };
- deps.rawpointer."0.1.0" = {};
- deps.rdrand."0.4.0" = {
- rand_core = "0.3.1";
- };
- deps.redox_syscall."0.1.54" = {};
- deps.redox_termios."0.1.1" = {
- redox_syscall = "0.1.54";
- };
- deps.regex."1.1.6" = {
- aho_corasick = "0.7.3";
- memchr = "2.2.0";
- regex_syntax = "0.6.6";
- thread_local = "0.3.6";
- utf8_ranges = "1.0.2";
- };
- deps.regex_syntax."0.6.6" = {
- ucd_util = "0.1.3";
- };
- deps.remove_dir_all."0.5.1" = {
- winapi = "0.3.7";
- };
- deps.rustc_demangle."0.1.14" = {};
- deps.rustc_workspace_hack."1.0.0" = {};
- deps.rustc_version."0.2.3" = {
- semver = "0.9.0";
- };
- deps.rustfix."0.4.5" = {
- failure = "0.1.5";
- log = "0.4.6";
- serde = "1.0.90";
- serde_derive = "1.0.90";
- serde_json = "1.0.39";
- };
- deps.ryu."0.2.7" = {};
- deps.same_file."1.0.4" = {
- winapi_util = "0.1.2";
- };
- deps.schannel."0.1.15" = {
- lazy_static = "1.3.0";
- winapi = "0.3.7";
- };
- deps.scopeguard."0.3.3" = {};
- deps.semver."0.9.0" = {
- semver_parser = "0.7.0";
- serde = "1.0.90";
- };
- deps.semver_parser."0.7.0" = {};
- deps.serde."1.0.90" = {
- serde_derive = "1.0.90";
- };
- deps.serde_derive."1.0.90" = {
- proc_macro2 = "0.4.27";
- quote = "0.6.12";
- syn = "0.15.32";
- };
- deps.serde_ignored."0.0.4" = {
- serde = "1.0.90";
- };
- deps.serde_json."1.0.39" = {
- itoa = "0.4.3";
- ryu = "0.2.7";
- serde = "1.0.90";
- };
- deps.shell_escape."0.1.4" = {};
- deps.sized_chunks."0.1.3" = {
- typenum = "1.10.0";
- };
- deps.smallvec."0.6.9" = {};
- deps.socket2."0.3.8" = {
- cfg_if = "0.1.7";
- libc = "0.2.51";
- redox_syscall = "0.1.54";
- winapi = "0.3.7";
- };
- deps.strsim."0.8.0" = {};
- deps.strsim."0.9.1" = {
- hashbrown = "0.1.8";
- ndarray = "0.12.1";
- };
- deps.syn."0.15.32" = {
- proc_macro2 = "0.4.27";
- quote = "0.6.12";
- unicode_xid = "0.1.0";
- };
- deps.synstructure."0.10.1" = {
- proc_macro2 = "0.4.27";
- quote = "0.6.12";
- syn = "0.15.32";
- unicode_xid = "0.1.0";
- };
- deps.tar."0.4.22" = {
- filetime = "0.2.4";
- redox_syscall = "0.1.54";
- libc = "0.2.51";
- };
- deps.tempfile."3.0.7" = {
- cfg_if = "0.1.7";
- rand = "0.6.5";
- remove_dir_all = "0.5.1";
- redox_syscall = "0.1.54";
- libc = "0.2.51";
- winapi = "0.3.7";
- };
- deps.termcolor."1.0.4" = {
- wincolor = "1.0.1";
- };
- deps.termion."1.5.1" = {
- libc = "0.2.51";
- redox_syscall = "0.1.54";
- redox_termios = "0.1.1";
- };
- deps.textwrap."0.11.0" = {
- unicode_width = "0.1.5";
- };
- deps.thread_local."0.3.6" = {
- lazy_static = "1.3.0";
- };
- deps.toml."0.4.10" = {
- serde = "1.0.90";
- };
- deps.toml."0.5.0" = {
- serde = "1.0.90";
- };
- deps.typenum."1.10.0" = {};
- deps.ucd_util."0.1.3" = {};
- deps.unicode_bidi."0.3.4" = {
- matches = "0.1.8";
- };
- deps.unicode_normalization."0.1.8" = {
- smallvec = "0.6.9";
- };
- deps.unicode_width."0.1.5" = {};
- deps.unicode_xid."0.1.0" = {};
- deps.url."1.7.2" = {
- idna = "0.1.5";
- matches = "0.1.8";
- percent_encoding = "1.0.1";
- };
- deps.url_serde."0.2.0" = {
- serde = "1.0.90";
- url = "1.7.2";
- };
- deps.utf8_ranges."1.0.2" = {};
- deps.vcpkg."0.2.6" = {};
- deps.vec_map."0.8.1" = {};
- deps.walkdir."2.2.7" = {
- same_file = "1.0.4";
- winapi = "0.3.7";
- winapi_util = "0.1.2";
- };
- deps.winapi."0.2.8" = {};
- deps.winapi."0.3.7" = {
- winapi_i686_pc_windows_gnu = "0.4.0";
- winapi_x86_64_pc_windows_gnu = "0.4.0";
- };
- deps.winapi_build."0.1.1" = {};
- deps.winapi_i686_pc_windows_gnu."0.4.0" = {};
- deps.winapi_util."0.1.2" = {
- winapi = "0.3.7";
- };
- deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {};
- deps.wincolor."1.0.1" = {
- winapi = "0.3.7";
- winapi_util = "0.1.2";
- };
-}
diff --git a/pkgs/build-support/rust/cargo-vendor/default.nix b/pkgs/build-support/rust/cargo-vendor/default.nix
deleted file mode 100644
index f252c6a6cb1..00000000000
--- a/pkgs/build-support/rust/cargo-vendor/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchFromGitHub }:
-
-((callPackage ./cargo-vendor.nix {}).cargo_vendor {}).overrideAttrs (attrs: {
- src = fetchFromGitHub {
- owner = "alexcrichton";
- repo = "cargo-vendor";
- rev = "9355661303ce2870d68a69d99953fce22581e31e";
- sha256 = "0d4j3r09am3ynwhczimzv39264f5xz37jxa9js123y46w5by3wd2";
- };
-})
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index b3ab9f5ba78..1c4fe9daead 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -15,11 +15,6 @@ in
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
};
- cargo-vendor = attrs: {
- buildInputs = [ openssl zlib curl ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
- };
-
libz-sys = attrs: {
buildInputs = [ pkgconfig zlib ];
extraLinkFlags = ["-L${zlib.out}/lib"];
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 4e6058383d4..bc80db0947b 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -1,4 +1,4 @@
-{ stdenv, cacert, git, cargo, cargo-vendor, python3 }:
+{ stdenv, cacert, git, cargo, python3 }:
let cargo-vendor-normalise = stdenv.mkDerivation {
name = "cargo-vendor-normalise";
src = ./cargo-vendor-normalise.py;
@@ -20,7 +20,7 @@ in
{ name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "" }:
stdenv.mkDerivation {
name = "${name}-vendor";
- nativeBuildInputs = [ cacert cargo-vendor git cargo-vendor-normalise cargo ];
+ nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ];
inherit src srcs patches sourceRoot;
phases = "unpackPhase patchPhase installPhase";
diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index bfbf98b508e..b9de3743daf 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha";
- version = "2019-07";
+ version = "2019-09-23";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = "v${version}";
- sha256 = "1jv7qq4lsjpz40wchrqlzc8w4ggrmwjavy4ipzz11jal99skpv7i";
+ sha256 = "0fx6ksv9yb16drhx1sn4nq6jha36gha3cxnr1fjhj8dgarjqrg9k";
};
buildInputs = [ gdk-pixbuf librsvg ];
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 1349b7f0ddd..a6e3dfff4e0 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -14,6 +14,11 @@ let drv = stdenv.mkDerivation rec {
url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-linux-x64-b${version}.tar.gz";
sha256 = "121yzgvkfx7lq0k9s8wjnhz09a564br5y7zlkxgh191sbm2i7zdi";
}
+ else if stdenv.hostPlatform.system == "x86_64-darwin" then
+ fetchurl {
+ url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-osx-x64-b${version}.tar.gz";
+ sha256 = "1ly6kf59knvzbr2pjkc9fqyzfs28pdvnqg5pfffr8zp14xm44zmd";
+ }
else
throw "unsupported system: ${stdenv.hostPlatform.system}";
@@ -28,20 +33,20 @@ let drv = stdenv.mkDerivation rec {
jrePath=$out/jre
'';
- postFixup = ''
+ postFixup = lib.optionalString (!stdenv.isDarwin) ''
find $out -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \;
find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
'';
- rpath = lib.makeLibraryPath ([
+ rpath = lib.optionalString (!stdenv.isDarwin) (lib.makeLibraryPath ([
stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk zlib
(placeholder "out")
] ++ (with xorg; [
libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm
- ])) + ":${placeholder "out"}/lib/jli";
+ ])) + ":${placeholder "out"}/lib/jli");
passthru.home = drv;
@@ -61,6 +66,6 @@ let drv = stdenv.mkDerivation rec {
homepage = "https://bintray.com/jetbrains/intellij-jdk/";
license = licenses.gpl2;
maintainers = with maintainers; [ edwtjo ];
- platforms = with platforms; [ "x86_64-linux" ];
+ platforms = with platforms; [ "x86_64-linux" "x86_64-darwin" ];
};
}; in drv
diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix
new file mode 100644
index 00000000000..97634bca8ef
--- /dev/null
+++ b/pkgs/development/compilers/mozart/default.nix
@@ -0,0 +1,89 @@
+{ lib
+, fetchFromGitHub
+, fetchurl
+, cmake
+, unzip
+, makeWrapper
+, boost
+, llvmPackages
+, llvmPackages_4
+, gmp
+, emacs
+, emacs25-nox
+, jre_headless
+, tcl
+, tk
+}:
+
+let stdenv = llvmPackages.stdenv;
+
+in stdenv.mkDerivation rec {
+ pname = "mozart2";
+ version = "2.0.1";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/mozart/mozart2/releases/download/v${version}/${name}-Source.zip";
+ sha256 = "1mad9z5yzzix87cdb05lmif3960vngh180s2mb66cj5gwh5h9dll";
+ };
+
+ # This is a workaround to avoid using sbt.
+ # I guess it is acceptable to fetch the bootstrapping compiler in binary form.
+ bootcompiler = fetchurl {
+ url = "https://github.com/layus/mozart2/releases/download/v2.0.0-beta.1/bootcompiler.jar";
+ sha256 = "1hgh1a8hgzgr6781as4c4rc52m2wbazdlw3646s57c719g5xphjz";
+ };
+
+ postConfigure = ''
+ cp ${bootcompiler} bootcompiler/bootcompiler.jar
+ '';
+
+ nativeBuildInputs = [ cmake makeWrapper unzip ];
+
+ # We cannot compile with both gcc and clang, but we need clang during the
+ # process, so we compile everything with clang.
+ # BUT, we need clang4 for parsing, and a more recent clang for compiling.
+ cmakeFlags = [
+ "-DCMAKE_CXX_COMPILER=${llvmPackages.clang}/bin/clang++"
+ "-DCMAKE_C_COMPILER=${llvmPackages.clang}/bin/clang"
+ "-DBoost_USE_STATIC_LIBS=OFF"
+ "-DMOZART_BOOST_USE_STATIC_LIBS=OFF"
+ "-DCMAKE_PROGRAM_PATH=${llvmPackages_4.clang}/bin"
+ # Rationale: Nix's cc-wrapper needs to see a compile flag (like -c) to
+ # infer that it is not a linking call, and stop trashing the command line
+ # with linker flags.
+ # As it does not recognise -emit-ast, we pass -c immediately overridden
+ # by -emit-ast.
+ # The remaining is just the default flags that we cannot reuse and need
+ # to repeat here.
+ "-DMOZART_GENERATOR_FLAGS='-c;-emit-ast;--std=c++0x;-Wno-invalid-noreturn;-Wno-return-type;-Wno-braced-scalar-init'"
+ # We are building with clang, as nix does not support having clang and
+ # gcc together as compilers and we need clang for the sources generation.
+ # However, clang emits tons of warnings about gcc's atomic-base library.
+ "-DCMAKE_CXX_FLAGS=-Wno-braced-scalar-init"
+ ] ++ lib.optional stdenv.isDarwin "-DCMAKE_FIND_FRAMEWORK=LAST";
+
+ fixupPhase = ''
+ wrapProgram $out/bin/oz --set OZEMACS ${emacs}/bin/emacs
+ '';
+
+ buildInputs = [
+ boost
+ llvmPackages_4.llvm
+ llvmPackages_4.clang
+ llvmPackages_4.clang-unwrapped
+ gmp
+ emacs25-nox
+ jre_headless
+ tcl
+ tk
+ ];
+
+ meta = {
+ description = "An open source implementation of Oz 3.";
+ maintainers = [ lib.maintainers.layus ];
+ license = lib.licenses.bsd2;
+ homepage = "https://mozart.github.io";
+ };
+
+}
diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix
index dea6df1b7aa..6d87d4bbd49 100644
--- a/pkgs/development/compilers/terra/default.nix
+++ b/pkgs/development/compilers/terra/default.nix
@@ -1,29 +1,40 @@
-{ stdenv, fetchFromGitHub, fetchurl, llvmPackages, ncurses, lua }:
+{ stdenv, fetchurl, fetchFromGitHub
+, llvmPackages, ncurses, lua
+}:
let
luajitArchive = "LuaJIT-2.0.5.tar.gz";
luajitSrc = fetchurl {
- url = "http://luajit.org/download/${luajitArchive}";
+ url = "http://luajit.org/download/${luajitArchive}";
sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
};
in
-
stdenv.mkDerivation rec {
- pname = "terra-git";
- version = "1.0.0-beta1";
+ pname = "terra";
+ version = "1.0.0pre1175_${builtins.substring 0 7 src.rev}";
src = fetchFromGitHub {
- owner = "zdevito";
- repo = "terra";
- rev = "release-${version}";
- sha256 = "1blv3mbmlwb6fxkck6487ck4qq67cbwq6s1zlp86hy2wckgf8q2c";
+ owner = "zdevito";
+ repo = "terra";
+ rev = "ef6a75ffee15a30f3c74f4e6943851cfbc0fec3d";
+ sha256 = "0aky17vbv3d9zng34hp17p9zb00dbzwhvzsdjzrrqvk9lmyvix0s";
};
+ nativeBuildInputs = [ lua ];
+ buildInputs = with llvmPackages; [ llvm clang-unwrapped ncurses ];
+
+ doCheck = true;
+ enableParallelBuilding = true;
+ hardeningDisable = [ "fortify" ];
outputs = [ "bin" "dev" "out" "static" ];
+ patches = [ ./nix-cflags.patch ];
postPatch = ''
- substituteInPlace Makefile --replace \
- '-lcurses' '-lncurses'
+ substituteInPlace Makefile \
+ --replace '-lcurses' '-lncurses'
+
+ substituteInPlace src/terralib.lua \
+ --subst-var-by NIX_LIBC_INCLUDE ${stdenv.cc.libc.dev}/include
'';
preBuild = ''
@@ -36,6 +47,8 @@ stdenv.mkDerivation rec {
cp ${luajitSrc} build/${luajitArchive}
'';
+ checkPhase = "(cd tests && ../terra run)";
+
installPhase = ''
install -Dm755 -t $bin/bin release/bin/terra
install -Dm755 -t $out/lib release/lib/terra${stdenv.hostPlatform.extensions.sharedLibrary}
@@ -45,13 +58,11 @@ stdenv.mkDerivation rec {
cp -rv release/include/terra $dev/include
'';
- buildInputs = with llvmPackages; [ lua llvm clang-unwrapped ncurses ];
-
meta = with stdenv.lib; {
description = "A low-level counterpart to Lua";
- homepage = http://terralang.org/;
- platforms = platforms.x86_64;
- maintainers = with maintainers; [ jb55 ];
- license = licenses.mit;
+ homepage = http://terralang.org/;
+ platforms = platforms.x86_64;
+ maintainers = with maintainers; [ jb55 thoughtpolice ];
+ license = licenses.mit;
};
}
diff --git a/pkgs/development/compilers/terra/nix-cflags.patch b/pkgs/development/compilers/terra/nix-cflags.patch
new file mode 100644
index 00000000000..339ae23cef6
--- /dev/null
+++ b/pkgs/development/compilers/terra/nix-cflags.patch
@@ -0,0 +1,22 @@
+diff --git a/src/terralib.lua b/src/terralib.lua
+index 351238d..e638c90 100644
+--- a/src/terralib.lua
++++ b/src/terralib.lua
+@@ -3395,6 +3395,17 @@ function terra.includecstring(code,cargs,target)
+ args:insert("-internal-isystem")
+ args:insert(path)
+ end
++
++ -- NOTE(aseipp): include relevant Nix header files
++ args:insert("-isystem")
++ args:insert("@NIX_LIBC_INCLUDE@")
++
++ local nix_cflags = os.getenv('NIX_CFLAGS_COMPILE')
++ if nix_cflags ~= nil then
++ for w in nix_cflags:gmatch("%S+") do
++ args:insert(w)
++ end
++ end
+
+ if cargs then
+ args:insertall(cargs)
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f929844f55b..d1217ea37df 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -57676,7 +57676,7 @@ self: {
version = "0.1.0.1";
sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha";
libraryHaskellDepends = [ base ];
- description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`.";
+ description = "Haskell operator `g ... f = \\x1 .. xn -> g (f x1 .. xn)`.";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -253088,7 +253088,7 @@ self: {
base containers exceptions free spiros split text transformers
];
executableHaskellDepends = [ base ];
- description = "Automate keyboard\/mouse\/clipboard\/application interaction";
+ description = "Automate keyboard/mouse/clipboard/application interaction";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 1cc65b53b3e..6bfb80d3a17 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib
+{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib, fetchpatch
, aws-c-common, aws-c-event-stream, aws-checksums
, CoreAudio, AudioToolbox
, # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
@@ -50,6 +50,13 @@ stdenv.mkDerivation rec {
__darwinAllowLocalNetworking = true;
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch";
+ sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr";
+ })
+ ];
+
meta = with lib; {
description = "A C++ interface for Amazon Web Services";
homepage = https://github.com/awslabs/aws-sdk-cpp;
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 11fb21fe52e..d5cbbccba01 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess
-, withValgrind ? valgrind-light.meta.available, valgrind-light
+, withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch
}:
stdenv.mkDerivation rec {
@@ -17,7 +17,15 @@ stdenv.mkDerivation rec {
buildInputs = [ libpthreadstubs libpciaccess ]
++ lib.optional withValgrind valgrind-light;
- patches = [ ./cross-build-nm-path.patch ];
+ patches = [ ./cross-build-nm-path.patch ] ++
+ lib.optionals stdenv.hostPlatform.isMusl [
+ # Fix tests not building on musl because they use the glibc-specific
+ # (non-POSIX) `ioctl()` type signature. See #66441.
+ (fetchpatch {
+ url = "https://raw.githubusercontent.com/openembedded/openembedded-core/30a2af80f5f8c8ddf0f619e4f50451b02baa22dd/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch";
+ sha256 = "0rdmh4k5kb80hhk1sdhlil30yf0s8d8w0fnq0hzyvw3ir1mki3by";
+ })
+ ];
postPatch = ''
for a in */*-symbol-check ; do
diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix
index 080a1945215..db79bad745f 100644
--- a/pkgs/development/libraries/libotr/default.nix
+++ b/pkgs/development/libraries/libotr/default.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb";
};
+ outputs = [ "bin" "out" "dev" ];
+
nativeBuildInputs = [ autoreconfHook ];
- buildInputs = [ ];
propagatedBuildInputs = [ libgcrypt ];
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix
index 48dbc5f395c..231b426e6a7 100644
--- a/pkgs/development/libraries/libvterm-neovim/default.nix
+++ b/pkgs/development/libraries/libvterm-neovim/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation {
pname = "libvterm-neovim";
- version = "2018-11-26";
+ version = "2019-08-28";
src = fetchFromGitHub {
owner = "neovim";
repo = "libvterm";
- rev = "f600f523545b7d4018ebf320e3273795dbe43c8a";
- sha256 = "08lxd8xs9cg4axgq6bkb7afjxg3s29s1a3niqqm4wjb7iyi2jx5b";
+ rev = "1aa95e24d8f07a396aa80b7cd52f93e2b5bcca79";
+ sha256 = "0vjd397lqrfv4kc79i5izva4bynbymx3gllkg281fnk0b15vxfif";
};
buildInputs = [ perl ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
description = "VT220/xterm/ECMA-48 terminal emulator library";
homepage = http://www.leonerd.org.uk/code/libvterm/;
license = licenses.mit;
- maintainers = with maintainers; [ ];
+ maintainers = with maintainers; [ rvolosatovs ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix
new file mode 100644
index 00000000000..728b4117676
--- /dev/null
+++ b/pkgs/development/libraries/mimalloc/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, cmake
+, secureBuild ? true
+}:
+
+let
+ soext = stdenv.hostPlatform.extensions.sharedLibrary;
+in
+stdenv.mkDerivation rec {
+ name = "mimalloc-${version}";
+ version = "1.0.8";
+
+ src = fetchFromGitHub {
+ owner = "microsoft";
+ repo = "mimalloc";
+ rev = "refs/tags/v${version}";
+ sha256 = "04k2d3x84q2jfqdjxngy98hlw6czmigsqlf7gi3mhs6682n127r5";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ enableParallelBuilding = true;
+
+ cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ];
+
+ postInstall = ''
+ mkdir -p $dev
+ mv $out/lib/*/include $dev/include
+
+ rm -f $out/lib/libmimalloc*${soext} # weird duplicate
+
+ mv $out/lib/*/libmimalloc*${soext} $out/lib/libmimalloc${soext}
+ mv $out/lib/*/libmimalloc*.a $out/lib/libmimalloc.a
+ mv $out/lib/*/mimalloc*.o $out/lib/mimalloc.o
+
+ rm -rf $out/lib/mimalloc-*
+ '';
+
+ outputs = [ "out" "dev" ];
+
+ meta = with stdenv.lib; {
+ description = "Compact, fast, general-purpose memory allocator";
+ homepage = "https://github.com/microsoft/mimalloc";
+ license = licenses.bsd2;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ thoughtpolice ];
+ };
+}
diff --git a/pkgs/development/libraries/science/networking/ns3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix
similarity index 52%
rename from pkgs/development/libraries/science/networking/ns3/default.nix
rename to pkgs/development/libraries/science/networking/ns-3/default.nix
index 5218de07509..73be2a8ca6c 100644
--- a/pkgs/development/libraries/science/networking/ns3/default.nix
+++ b/pkgs/development/libraries/science/networking/ns-3/default.nix
@@ -1,5 +1,5 @@
{ stdenv
-, fetchFromGitHub
+, fetchFromGitLab
, python
, wafHook
@@ -22,75 +22,89 @@
, dia, tetex ? null, ghostscript ? null, texlive ? null
# generates python bindings
-, generateBindings ? false, ncurses ? null
+, pythonSupport ? false, ncurses ? null
# All modules can be enabled by choosing 'all_modules'.
# we include here the DCE mandatory ones
, modules ? [ "core" "network" "internet" "point-to-point" "fd-net-device" "netanim"]
-, gcc6
, lib
}:
let
pythonEnv = python.withPackages(ps:
stdenv.lib.optional withManual ps.sphinx
- ++ stdenv.lib.optionals generateBindings (with ps;[ pybindgen pygccxml ])
+ ++ stdenv.lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ])
);
in
stdenv.mkDerivation rec {
+ pname = "ns-3";
+ version = "30";
- name = "ns-3.${version}";
- version = "28";
-
- # the all in one https://www.nsnam.org/release/ns-allinone-3.27.tar.bz2;
- # fetches everything (netanim, etc), this package focuses on ns3-core
- src = fetchFromGitHub {
- owner = "nsnam";
- repo = "ns-3-dev-git";
- rev = name;
- sha256 = "17kzfjpgw2mvyx1c9bxccnvw67jpk09fxmcnlkqx9xisk10qnhng";
+ src = fetchFromGitLab {
+ owner = "nsnam";
+ repo = "ns-3-dev";
+ rev = "ns-3.${version}";
+ sha256 = "0smdi3gglmafpc7a20hj2lbmwks3d5fpsicpn39lmm3svazw0bvp";
};
nativeBuildInputs = [ wafHook ];
- # ncurses is a hidden dependency of waf when checking python
- buildInputs = lib.optionals generateBindings [ castxml ncurses ]
- ++ stdenv.lib.optional enableDoxygen [ doxygen graphviz imagemagick ]
- ++ stdenv.lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ];
- propagatedBuildInputs = [ gcc6 pythonEnv ];
+ outputs = [ "out" ] ++ lib.optional pythonSupport "py";
+
+ # ncurses is a hidden dependency of waf when checking python
+ buildInputs = lib.optionals pythonSupport [ castxml ncurses ]
+ ++ lib.optional enableDoxygen [ doxygen graphviz imagemagick ]
+ ++ lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ];
+
+ propagatedBuildInputs = [ pythonEnv ];
postPatch = ''
patchShebangs doc/ns3_html_theme/get_version.sh
'';
wafConfigureFlags = with stdenv.lib; [
- "--enable-modules=${stdenv.lib.concatStringsSep "," modules}"
+ "--enable-modules=${concatStringsSep "," modules}"
"--with-python=${pythonEnv.interpreter}"
]
++ optional (build_profile != null) "--build-profile=${build_profile}"
- ++ optional generateBindings [ ]
++ optional withExamples " --enable-examples "
++ optional doCheck " --enable-tests "
;
+ doCheck = true;
+
buildTargets = "build"
+ lib.optionalString enableDoxygen " doxygen"
+ lib.optionalString withManual "sphinx";
- doCheck = true;
+ # to prevent fatal error: 'backward_warning.h' file not found
+ CXXFLAGS = "-D_GLIBCXX_PERMIT_BACKWARD_HASH";
- # we need to specify the proper interpreter else ns3 can check against a
- # different version even though we
- checkPhase = ''
- ${pythonEnv.interpreter} ./test.py
+ postBuild = with stdenv.lib; let flags = concatStringsSep ";" (
+ optional enableDoxygen "./waf doxygen"
+ ++ optional withManual "./waf sphinx"
+ );
+ in "${flags}"
+ ;
+
+ postInstall = ''
+ moveToOutput "${pythonEnv.libPrefix}" "$py"
'';
- hardeningDisable = [ "fortify" ];
+ # we need to specify the proper interpreter else ns3 can check against a
+ # different version
+ checkPhase = ''
+ ${pythonEnv.interpreter} ./test.py --nowaf
+ '';
- meta = {
- homepage = http://www.nsnam.org;
- license = stdenv.lib.licenses.gpl3;
+ # strictoverflow prevents clang from discovering pyembed when bindings
+ hardeningDisable = [ "fortify" "strictoverflow"];
+
+ meta = with stdenv.lib; {
+ homepage = "http://www.nsnam.org";
+ license = licenses.gpl3;
description = "A discrete time event network simulator";
- platforms = with stdenv.lib.platforms; unix;
+ platforms = with platforms; unix;
+ maintainers = with maintainers; [ teto ];
};
}
diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix
index 5d7d0e664c6..e6a3fa9fbe1 100644
--- a/pkgs/development/libraries/yubico-pam/default.nix
+++ b/pkgs/development/libraries/yubico-pam/default.nix
@@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
pname = "yubico-pam";
- version = "unstable-2019-03-19";
+ version = "unstable-2019-07-01";
src = fetchFromGitHub {
owner = "Yubico";
repo = pname;
- rev = "1c6fa66825e77b3ad8df46513d0125bed9bde704";
- sha256 = "1g41wdwa1wbp391w1crbis4hwz60m3y06rd6j59m003zx40sk9s4";
+ rev = "b5bd00db81e0e0e0ecced65c684080bb56ddc35b";
+ sha256 = "10dq8dqi3jldllj6p8r9hldx9sank9n82c44w8akxrs1vli6nj3m";
};
nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc libxslt docbook_xsl ];
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index 586502945ba..15b907e341e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
{
baseName = ''alexandria'';
- version = ''20181210-git'';
+ version = ''20190710-git'';
description = ''Alexandria is a collection of portable public domain utilities.'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz'';
- sha256 = ''0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588'';
+ url = ''http://beta.quicklisp.org/archive/alexandria/2019-07-10/alexandria-20190710-git.tgz'';
+ sha256 = ''0127d5yyq46dpffvr4hla6d3ryiml48mxd2r6cgbg3mgz3b2nr70'';
};
packageName = "alexandria";
@@ -19,8 +19,8 @@ args @ { fetchurl, ... }:
}
/* (SYSTEM alexandria DESCRIPTION
Alexandria is a collection of portable public domain utilities. SHA256
- 0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588 URL
- http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz
- MD5 2a7530a412cd94a56b6d4e5864fb8819 NAME alexandria FILENAME alexandria
- DEPS NIL DEPENDENCIES NIL VERSION 20181210-git SIBLINGS (alexandria-tests)
+ 0127d5yyq46dpffvr4hla6d3ryiml48mxd2r6cgbg3mgz3b2nr70 URL
+ http://beta.quicklisp.org/archive/alexandria/2019-07-10/alexandria-20190710-git.tgz
+ MD5 2b5abc0a266aeafe9029bf26db90b292 NAME alexandria FILENAME alexandria
+ DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (alexandria-tests)
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index 1d64784a0a6..988b247482b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
{
baseName = ''array-utils'';
- version = ''20181018-git'';
+ version = ''20190710-git'';
description = ''A few utilities for working with arrays.'';
deps = [ ];
src = fetchurl {
- url = ''http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz'';
- sha256 = ''1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn'';
+ url = ''http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz'';
+ sha256 = ''1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh'';
};
packageName = "array-utils";
@@ -18,8 +18,8 @@ args @ { fetchurl, ... }:
overrides = x: x;
}
/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays.
- SHA256 1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn URL
- http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz
- MD5 e32cc0474cf299ad1f5666e2864aa3d8 NAME array-utils FILENAME array-utils
- DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS (array-utils-test)
+ SHA256 1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh URL
+ http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz
+ MD5 58c39c2ba3d2c8cd8a695fb867b72c33 NAME array-utils FILENAME array-utils
+ DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (array-utils-test)
PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
new file mode 100644
index 00000000000..1a56676f036
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-package-system.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''asdf-package-system'';
+ version = ''20150608-git'';
+
+ description = ''System lacks description'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz'';
+ sha256 = ''17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29'';
+ };
+
+ packageName = "asdf-package-system";
+
+ asdFilesToKeep = ["asdf-package-system.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM asdf-package-system DESCRIPTION System lacks description SHA256
+ 17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29 URL
+ http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz
+ MD5 9eee9d811aec4894843ac1d8ae6cbccd NAME asdf-package-system FILENAME
+ asdf-package-system DEPS NIL DEPENDENCIES NIL VERSION 20150608-git SIBLINGS
+ NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index 3209735adb5..365ae1d6ef6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''chunga'';
version = ''20180131-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ args."trivial-gray-streams" ];
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["chunga.asd"];
overrides = x: x;
}
-/* (SYSTEM chunga DESCRIPTION NIL SHA256
+/* (SYSTEM chunga DESCRIPTION System lacks description SHA256
0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq URL
http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz
MD5 044b684535b11b1eee1cf939bec6e14a NAME chunga FILENAME chunga DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
new file mode 100644
index 00000000000..ba295b6e43a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-css.nix
@@ -0,0 +1,24 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-css'';
+ version = ''20140914-git'';
+
+ description = ''Simple inline CSS generator'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz'';
+ sha256 = ''16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n'';
+ };
+
+ packageName = "cl-css";
+
+ asdFilesToKeep = ["cl-css.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cl-css DESCRIPTION Simple inline CSS generator SHA256
+ 16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n URL
+ http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz
+ MD5 a91f5a5d6a751af31d5c4fd8170f6ece NAME cl-css FILENAME cl-css DEPS NIL
+ DEPENDENCIES NIL VERSION 20140914-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index 7a1b7d9f863..f495d7b4c82 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''cl-dbi'';
version = ''20190521-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ];
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["cl-dbi.asd"];
overrides = x: x;
}
-/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256
+/* (SYSTEM cl-dbi DESCRIPTION System lacks description SHA256
1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME cl-dbi FILENAME cl-dbi DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
index b04a6cd8344..81b9153fff0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''cl-test-more'';
version = ''prove-20171130-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."prove" ];
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["cl-test-more.asd"];
overrides = x: x;
}
-/* (SYSTEM cl-test-more DESCRIPTION NIL SHA256
+/* (SYSTEM cl-test-more DESCRIPTION System lacks description SHA256
13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL
http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz
MD5 630df4367537f799570be40242f8ed52 NAME cl-test-more FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 4999da6d0b6..4ccd82f2ccc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''cl-utilities'';
version = ''1.2.4'';
- description = '''';
+ description = ''System lacks description'';
deps = [ ];
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["cl-utilities.asd"];
overrides = x: x;
}
-/* (SYSTEM cl-utilities DESCRIPTION NIL SHA256
+/* (SYSTEM cl-utilities DESCRIPTION System lacks description SHA256
1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87 URL
http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz
MD5 c3a4ba38b627448d3ed40ce888048940 NAME cl-utilities FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
new file mode 100644
index 00000000000..223c50f4716
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-xmlspam.nix
@@ -0,0 +1,34 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''cl-xmlspam'';
+ version = ''20101006-http'';
+
+ description = ''Streaming pattern matching for XML'';
+
+ deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."puri" args."trivial-features" args."trivial-gray-streams" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz'';
+ sha256 = ''1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h'';
+ };
+
+ packageName = "cl-xmlspam";
+
+ asdFilesToKeep = ["cl-xmlspam.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM cl-xmlspam DESCRIPTION Streaming pattern matching for XML SHA256
+ 1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h URL
+ http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz
+ MD5 6e3a0944e96e17916b1445f4207babb8 NAME cl-xmlspam FILENAME cl-xmlspam
+ DEPS
+ ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+ (NAME cl-ppcre FILENAME cl-ppcre)
+ (NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml)
+ (NAME puri FILENAME puri)
+ (NAME trivial-features FILENAME trivial-features)
+ (NAME trivial-gray-streams FILENAME trivial-gray-streams))
+ DEPENDENCIES
+ (alexandria babel cl-ppcre closure-common cxml puri trivial-features
+ trivial-gray-streams)
+ VERSION 20101006-http SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index 5f4a96dbcc4..4dcda09baea 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''clack-socket'';
version = ''clack-20190710-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ ];
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["clack-socket.asd"];
overrides = x: x;
}
-/* (SYSTEM clack-socket DESCRIPTION NIL SHA256
+/* (SYSTEM clack-socket DESCRIPTION System lacks description SHA256
1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-socket FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index 0234f764498..8f2a19519ac 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''clack-v1-compat'';
version = ''clack-20190710-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["clack-v1-compat.asd"];
overrides = x: x;
}
-/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256
+/* (SYSTEM clack-v1-compat DESCRIPTION System lacks description SHA256
1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-v1-compat FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
index 2746ccff6c9..7df1e251ece 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-html.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''closure-html'';
version = ''20180711-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ];
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["closure-html.asd"];
overrides = x: x;
}
-/* (SYSTEM closure-html DESCRIPTION NIL SHA256
+/* (SYSTEM closure-html DESCRIPTION System lacks description SHA256
0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq URL
http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz
MD5 461dc8caa65385da5f2d1cd8dd4f965f NAME closure-html FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index 0dd93c46fb2..c1c209093d0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''css-lite'';
version = ''20120407-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ ];
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["css-lite.asd"];
overrides = x: x;
}
-/* (SYSTEM css-lite DESCRIPTION NIL SHA256
+/* (SYSTEM css-lite DESCRIPTION System lacks description SHA256
1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg URL
http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz
MD5 9b25afb0d2c3f0c32d2303ab1d3f570d NAME css-lite FILENAME css-lite DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
new file mode 100644
index 00000000000..5043ff2e261
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbus.nix
@@ -0,0 +1,34 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''dbus'';
+ version = ''20190521-git'';
+
+ description = ''A D-BUS client library for Common Lisp'';
+
+ deps = [ args."alexandria" args."asdf-package-system" args."babel" args."cl-xmlspam" args."flexi-streams" args."ieee-floats" args."iolib" args."ironclad" args."trivial-garbage" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/dbus/2019-05-21/dbus-20190521-git.tgz'';
+ sha256 = ''0g4hsygy52rylhi19kxxhv9dbbirl6hdisgqw89whdxb9py6ifqq'';
+ };
+
+ packageName = "dbus";
+
+ asdFilesToKeep = ["dbus.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM dbus DESCRIPTION A D-BUS client library for Common Lisp SHA256
+ 0g4hsygy52rylhi19kxxhv9dbbirl6hdisgqw89whdxb9py6ifqq URL
+ http://beta.quicklisp.org/archive/dbus/2019-05-21/dbus-20190521-git.tgz MD5
+ 59e7ab92086503e4185273ec3f3ba3fc NAME dbus FILENAME dbus DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME asdf-package-system FILENAME asdf-package-system)
+ (NAME babel FILENAME babel) (NAME cl-xmlspam FILENAME cl-xmlspam)
+ (NAME flexi-streams FILENAME flexi-streams)
+ (NAME ieee-floats FILENAME ieee-floats) (NAME iolib FILENAME iolib)
+ (NAME ironclad FILENAME ironclad)
+ (NAME trivial-garbage FILENAME trivial-garbage))
+ DEPENDENCIES
+ (alexandria asdf-package-system babel cl-xmlspam flexi-streams ieee-floats
+ iolib ironclad trivial-garbage)
+ VERSION 20190521-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index b247ea27298..adecbd142d3 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
parasites = [ "external-program-test" ];
- description = '''';
+ description = ''System lacks description'';
deps = [ args."fiveam" args."trivial-features" ];
@@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["external-program.asd"];
overrides = x: x;
}
-/* (SYSTEM external-program DESCRIPTION NIL SHA256
+/* (SYSTEM external-program DESCRIPTION System lacks description SHA256
1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz URL
http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz
MD5 b30fe104c34059506fd4c493fa79fe1a NAME external-program FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
new file mode 100644
index 00000000000..1677e5adcde
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/introspect-environment.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''introspect-environment'';
+ version = ''20151031-git'';
+
+ description = ''Small interface to portable but nonstandard introspection of CL environments.'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/introspect-environment/2015-10-31/introspect-environment-20151031-git.tgz'';
+ sha256 = ''0npydsmksbm3nisy9whnivmmhgdira74plmncmaklp7yhqsvwc30'';
+ };
+
+ packageName = "introspect-environment";
+
+ asdFilesToKeep = ["introspect-environment.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM introspect-environment DESCRIPTION
+ Small interface to portable but nonstandard introspection of CL environments.
+ SHA256 0npydsmksbm3nisy9whnivmmhgdira74plmncmaklp7yhqsvwc30 URL
+ http://beta.quicklisp.org/archive/introspect-environment/2015-10-31/introspect-environment-20151031-git.tgz
+ MD5 3c61088583f11791530edb2e18f5d6f0 NAME introspect-environment FILENAME
+ introspect-environment DEPS NIL DEPENDENCIES NIL VERSION 20151031-git
+ SIBLINGS (introspect-environment-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index cdac924b439..c94277bb211 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''lack-component'';
version = ''lack-20190521-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ ];
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["lack-component.asd"];
overrides = x: x;
}
-/* (SYSTEM lack-component DESCRIPTION NIL SHA256
+/* (SYSTEM lack-component DESCRIPTION System lacks description SHA256
0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
7d7321550f0795e998c7afe4498e7a40 NAME lack-component FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index 68604485c77..3fc76c73576 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''lack-middleware-backtrace'';
version = ''lack-20190521-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ args."uiop" ];
@@ -17,8 +17,8 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["lack-middleware-backtrace.asd"];
overrides = x: x;
}
-/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256
- 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
+/* (SYSTEM lack-middleware-backtrace DESCRIPTION System lacks description
+ SHA256 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
7d7321550f0795e998c7afe4498e7a40 NAME lack-middleware-backtrace FILENAME
lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index cda7716151a..221ac216cf8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''lack-util'';
version = ''lack-20190521-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."nibbles" ];
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["lack-util.asd"];
overrides = x: x;
}
-/* (SYSTEM lack-util DESCRIPTION NIL SHA256
+/* (SYSTEM lack-util DESCRIPTION System lacks description SHA256
0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
7d7321550f0795e998c7afe4498e7a40 NAME lack-util FILENAME lack-util DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
new file mode 100644
index 00000000000..aeb37b15a49
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/log4cl.nix
@@ -0,0 +1,30 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''log4cl'';
+ version = ''20190107-git'';
+
+ parasites = [ "log4cl/syslog" "log4cl/test" ];
+
+ description = ''System lacks description'';
+
+ deps = [ args."alexandria" args."bordeaux-threads" args."stefil" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/log4cl/2019-01-07/log4cl-20190107-git.tgz'';
+ sha256 = ''0c5gsmz69jby5hmcl4igf1sh6xkwh8bx2jz6kd2gcnqjwq37h46p'';
+ };
+
+ packageName = "log4cl";
+
+ asdFilesToKeep = ["log4cl.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM log4cl DESCRIPTION System lacks description SHA256
+ 0c5gsmz69jby5hmcl4igf1sh6xkwh8bx2jz6kd2gcnqjwq37h46p URL
+ http://beta.quicklisp.org/archive/log4cl/2019-01-07/log4cl-20190107-git.tgz
+ MD5 ecfa1f67902c776f46d192acd55f628c NAME log4cl FILENAME log4cl DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME bordeaux-threads FILENAME bordeaux-threads)
+ (NAME stefil FILENAME stefil))
+ DEPENDENCIES (alexandria bordeaux-threads stefil) VERSION 20190107-git
+ SIBLINGS (log4cl-examples log4slime) PARASITES (log4cl/syslog log4cl/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
index ef0da68cfe4..13d0b971d44 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/misc-extensions.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''misc-extensions'';
version = ''20150608-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ ];
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["misc-extensions.asd"];
overrides = x: x;
}
-/* (SYSTEM misc-extensions DESCRIPTION NIL SHA256
+/* (SYSTEM misc-extensions DESCRIPTION System lacks description SHA256
0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj URL
http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz
MD5 ef8a05dd4382bb9d1e3960aeb77e332e NAME misc-extensions FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
new file mode 100644
index 00000000000..dc63474679a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mk-string-metrics.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''mk-string-metrics'';
+ version = ''20180131-git'';
+
+ description = ''efficient implementations of various string metric algorithms'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz'';
+ sha256 = ''10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4'';
+ };
+
+ packageName = "mk-string-metrics";
+
+ asdFilesToKeep = ["mk-string-metrics.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM mk-string-metrics DESCRIPTION
+ efficient implementations of various string metric algorithms SHA256
+ 10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4 URL
+ http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz
+ MD5 40f23794a7d841cb178f5951d3992886 NAME mk-string-metrics FILENAME
+ mk-string-metrics DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS
+ (mk-string-metrics-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index 60385ab5939..c041d1778fa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
parasites = [ "pcall-tests" ];
- description = '''';
+ description = ''System lacks description'';
deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" args."pcall-queue" ];
@@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["pcall.asd"];
overrides = x: x;
}
-/* (SYSTEM pcall DESCRIPTION NIL SHA256
+/* (SYSTEM pcall DESCRIPTION System lacks description SHA256
02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL
http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5
019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall FILENAME pcall DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
new file mode 100644
index 00000000000..583b30f9769
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove-asdf.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''prove-asdf'';
+ version = ''prove-20171130-git'';
+
+ description = ''System lacks description'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz'';
+ sha256 = ''13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar'';
+ };
+
+ packageName = "prove-asdf";
+
+ asdFilesToKeep = ["prove-asdf.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM prove-asdf DESCRIPTION System lacks description SHA256
+ 13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL
+ http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz
+ MD5 630df4367537f799570be40242f8ed52 NAME prove-asdf FILENAME prove-asdf
+ DEPS NIL DEPENDENCIES NIL VERSION prove-20171130-git SIBLINGS
+ (cl-test-more prove-test prove) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index 9bbc47275f8..92ac9e33d49 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
@@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''prove'';
version = ''20171130-git'';
- description = '''';
+ description = ''System lacks description'';
deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."uiop" ];
@@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["prove.asd"];
overrides = x: x;
}
-/* (SYSTEM prove DESCRIPTION NIL SHA256
+/* (SYSTEM prove DESCRIPTION System lacks description SHA256
13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL
http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz
MD5 630df4367537f799570be40242f8ed52 NAME prove FILENAME prove DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index f3c1dade821..7b5f33e7bc2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
parasites = [ "simple-date/postgres-glue" "simple-date/tests" ];
- description = '''';
+ description = ''System lacks description'';
deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ];
@@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["simple-date.asd"];
overrides = x: x;
}
-/* (SYSTEM simple-date DESCRIPTION NIL SHA256
+/* (SYSTEM simple-date DESCRIPTION System lacks description SHA256
1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5 URL
http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz
MD5 102567f386757cd52aca500c0c348d90 NAME simple-date FILENAME simple-date
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
new file mode 100644
index 00000000000..d4004f3f8b5
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/str.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''str'';
+ version = ''cl-20190710-git'';
+
+ description = ''Modern, consistent and terse Common Lisp string manipulation library.'';
+
+ deps = [ args."cl-ppcre" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/cl-str/2019-07-10/cl-str-20190710-git.tgz'';
+ sha256 = ''1mlnrj9g1d7zbpq6c4vhyw0idhvbm55zpzrbc8iiyv0dzijk70l9'';
+ };
+
+ packageName = "str";
+
+ asdFilesToKeep = ["str.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM str DESCRIPTION
+ Modern, consistent and terse Common Lisp string manipulation library.
+ SHA256 1mlnrj9g1d7zbpq6c4vhyw0idhvbm55zpzrbc8iiyv0dzijk70l9 URL
+ http://beta.quicklisp.org/archive/cl-str/2019-07-10/cl-str-20190710-git.tgz
+ MD5 d3c72394ea33291347d8c825c153c143 NAME str FILENAME str DEPS
+ ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION
+ cl-20190710-git SIBLINGS (str.test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
new file mode 100644
index 00000000000..74c84f0520f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia.nix
@@ -0,0 +1,44 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''trivia'';
+ version = ''20190710-git'';
+
+ description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase'';
+
+ deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+ sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+ };
+
+ packageName = "trivia";
+
+ asdFilesToKeep = ["trivia.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM trivia DESCRIPTION
+ NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase
+ SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+ http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+ MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia FILENAME trivia DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME closer-mop FILENAME closer-mop)
+ (NAME introspect-environment FILENAME introspect-environment)
+ (NAME iterate FILENAME iterate)
+ (NAME lisp-namespace FILENAME lisp-namespace)
+ (NAME trivia.balland2006 FILENAME trivia_dot_balland2006)
+ (NAME trivia.level0 FILENAME trivia_dot_level0)
+ (NAME trivia.level1 FILENAME trivia_dot_level1)
+ (NAME trivia.level2 FILENAME trivia_dot_level2)
+ (NAME trivia.trivial FILENAME trivia_dot_trivial)
+ (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i))
+ DEPENDENCIES
+ (alexandria closer-mop introspect-environment iterate lisp-namespace
+ trivia.balland2006 trivia.level0 trivia.level1 trivia.level2
+ trivia.trivial trivial-cltl2 type-i)
+ VERSION 20190710-git SIBLINGS
+ (trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
+ trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test
+ trivia.trivial)
+ PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
new file mode 100644
index 00000000000..d1237b5ac26
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_balland2006.nix
@@ -0,0 +1,43 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''trivia_dot_balland2006'';
+ version = ''trivia-20190710-git'';
+
+ description = ''Optimizer for Trivia based on (Balland 2006)'';
+
+ deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."iterate" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" args."type-i" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+ sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+ };
+
+ packageName = "trivia.balland2006";
+
+ asdFilesToKeep = ["trivia.balland2006.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM trivia.balland2006 DESCRIPTION
+ Optimizer for Trivia based on (Balland 2006) SHA256
+ 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+ http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+ MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.balland2006 FILENAME
+ trivia_dot_balland2006 DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME closer-mop FILENAME closer-mop)
+ (NAME introspect-environment FILENAME introspect-environment)
+ (NAME iterate FILENAME iterate)
+ (NAME lisp-namespace FILENAME lisp-namespace)
+ (NAME trivia.level0 FILENAME trivia_dot_level0)
+ (NAME trivia.level1 FILENAME trivia_dot_level1)
+ (NAME trivia.level2 FILENAME trivia_dot_level2)
+ (NAME trivia.trivial FILENAME trivia_dot_trivial)
+ (NAME trivial-cltl2 FILENAME trivial-cltl2) (NAME type-i FILENAME type-i))
+ DEPENDENCIES
+ (alexandria closer-mop introspect-environment iterate lisp-namespace
+ trivia.level0 trivia.level1 trivia.level2 trivia.trivial trivial-cltl2
+ type-i)
+ VERSION trivia-20190710-git SIBLINGS
+ (trivia trivia.benchmark trivia.cffi trivia.level0 trivia.level1
+ trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
+ PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
new file mode 100644
index 00000000000..30f82362537
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level0.nix
@@ -0,0 +1,29 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''trivia_dot_level0'';
+ version = ''trivia-20190710-git'';
+
+ description = ''Bootstrapping Pattern Matching Library for implementing Trivia'';
+
+ deps = [ args."alexandria" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+ sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+ };
+
+ packageName = "trivia.level0";
+
+ asdFilesToKeep = ["trivia.level0.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM trivia.level0 DESCRIPTION
+ Bootstrapping Pattern Matching Library for implementing Trivia SHA256
+ 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+ http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+ MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.level0 FILENAME
+ trivia_dot_level0 DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES
+ (alexandria) VERSION trivia-20190710-git SIBLINGS
+ (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level1
+ trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
+ PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
new file mode 100644
index 00000000000..13680b8706c
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level1.nix
@@ -0,0 +1,31 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''trivia_dot_level1'';
+ version = ''trivia-20190710-git'';
+
+ description = ''Core patterns of Trivia'';
+
+ deps = [ args."alexandria" args."trivia_dot_level0" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+ sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+ };
+
+ packageName = "trivia.level1";
+
+ asdFilesToKeep = ["trivia.level1.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM trivia.level1 DESCRIPTION Core patterns of Trivia SHA256
+ 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+ http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+ MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.level1 FILENAME
+ trivia_dot_level1 DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME trivia.level0 FILENAME trivia_dot_level0))
+ DEPENDENCIES (alexandria trivia.level0) VERSION trivia-20190710-git
+ SIBLINGS
+ (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
+ trivia.level2 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
+ PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
new file mode 100644
index 00000000000..acbcd0b31ec
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_level2.nix
@@ -0,0 +1,38 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''trivia_dot_level2'';
+ version = ''trivia-20190710-git'';
+
+ description = ''NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase'';
+
+ deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivial-cltl2" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+ sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+ };
+
+ packageName = "trivia.level2";
+
+ asdFilesToKeep = ["trivia.level2.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM trivia.level2 DESCRIPTION
+ NON-optimized pattern matcher compatible with OPTIMA, with extensible optimizer interface and clean codebase
+ SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+ http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+ MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.level2 FILENAME
+ trivia_dot_level2 DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME closer-mop FILENAME closer-mop)
+ (NAME lisp-namespace FILENAME lisp-namespace)
+ (NAME trivia.level0 FILENAME trivia_dot_level0)
+ (NAME trivia.level1 FILENAME trivia_dot_level1)
+ (NAME trivial-cltl2 FILENAME trivial-cltl2))
+ DEPENDENCIES
+ (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1
+ trivial-cltl2)
+ VERSION trivia-20190710-git SIBLINGS
+ (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
+ trivia.level1 trivia.ppcre trivia.quasiquote trivia.test trivia.trivial)
+ PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
new file mode 100644
index 00000000000..b82f6089b06
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_trivial.nix
@@ -0,0 +1,43 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''trivia_dot_trivial'';
+ version = ''trivia-20190710-git'';
+
+ description = ''Base level system of Trivia with a trivial optimizer.
+ Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system,
+ in order to avoid the circular dependency.'';
+
+ deps = [ args."alexandria" args."closer-mop" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivial-cltl2" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz'';
+ sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic'';
+ };
+
+ packageName = "trivia.trivial";
+
+ asdFilesToKeep = ["trivia.trivial.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM trivia.trivial DESCRIPTION
+ Base level system of Trivia with a trivial optimizer.
+ Systems that intend to enhance Trivia should depend on this package, not the TRIVIA system,
+ in order to avoid the circular dependency.
+ SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL
+ http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz
+ MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.trivial FILENAME
+ trivia_dot_trivial DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME closer-mop FILENAME closer-mop)
+ (NAME lisp-namespace FILENAME lisp-namespace)
+ (NAME trivia.level0 FILENAME trivia_dot_level0)
+ (NAME trivia.level1 FILENAME trivia_dot_level1)
+ (NAME trivia.level2 FILENAME trivia_dot_level2)
+ (NAME trivial-cltl2 FILENAME trivial-cltl2))
+ DEPENDENCIES
+ (alexandria closer-mop lisp-namespace trivia.level0 trivia.level1
+ trivia.level2 trivial-cltl2)
+ VERSION trivia-20190710-git SIBLINGS
+ (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0
+ trivia.level1 trivia.level2 trivia.ppcre trivia.quasiquote trivia.test)
+ PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
new file mode 100644
index 00000000000..16d265d465a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-clipboard.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''trivial-clipboard'';
+ version = ''20190202-git'';
+
+ description = ''trivial-clipboard let access system clipboard.'';
+
+ deps = [ args."uiop" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/trivial-clipboard/2019-02-02/trivial-clipboard-20190202-git.tgz'';
+ sha256 = ''06ic4lqampxnycz5s0frn7f8fqjpp8mlrnsnlh77gldxlh02pwq1'';
+ };
+
+ packageName = "trivial-clipboard";
+
+ asdFilesToKeep = ["trivial-clipboard.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM trivial-clipboard DESCRIPTION
+ trivial-clipboard let access system clipboard. SHA256
+ 06ic4lqampxnycz5s0frn7f8fqjpp8mlrnsnlh77gldxlh02pwq1 URL
+ http://beta.quicklisp.org/archive/trivial-clipboard/2019-02-02/trivial-clipboard-20190202-git.tgz
+ MD5 d9b9ee3754e10888ce243172681a0db2 NAME trivial-clipboard FILENAME
+ trivial-clipboard DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop)
+ VERSION 20190202-git SIBLINGS (trivial-clipboard-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
new file mode 100644
index 00000000000..a5242030473
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-cltl2.nix
@@ -0,0 +1,26 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''trivial-cltl2'';
+ version = ''20190710-git'';
+
+ description = ''Compatibility package exporting CLtL2 functionality'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/trivial-cltl2/2019-07-10/trivial-cltl2-20190710-git.tgz'';
+ sha256 = ''1qaxwgws8ji6dyh30ff608zpdrplifgkhfdhfnn0367d3rvy11jb'';
+ };
+
+ packageName = "trivial-cltl2";
+
+ asdFilesToKeep = ["trivial-cltl2.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM trivial-cltl2 DESCRIPTION
+ Compatibility package exporting CLtL2 functionality SHA256
+ 1qaxwgws8ji6dyh30ff608zpdrplifgkhfdhfnn0367d3rvy11jb URL
+ http://beta.quicklisp.org/archive/trivial-cltl2/2019-07-10/trivial-cltl2-20190710-git.tgz
+ MD5 8114f96b9770a9f0e0a94933918dc171 NAME trivial-cltl2 FILENAME
+ trivial-cltl2 DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS NIL
+ PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index 0ac57089e50..b4282ec33ce 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
parasites = [ "trivial-utf-8-tests" ];
- description = '''';
+ description = ''System lacks description'';
deps = [ ];
@@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["trivial-utf-8.asd"];
overrides = x: x;
}
-/* (SYSTEM trivial-utf-8 DESCRIPTION NIL SHA256
+/* (SYSTEM trivial-utf-8 DESCRIPTION System lacks description SHA256
1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb URL
http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz
MD5 0206c4ba7a6c0b9b23762f244aca6614 NAME trivial-utf-8 FILENAME
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
new file mode 100644
index 00000000000..40e718cc10b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/type-i.nix
@@ -0,0 +1,37 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''type-i'';
+ version = ''20190521-git'';
+
+ description = ''Type Inference Utility on Fundamentally 1-arg Predicates'';
+
+ deps = [ args."alexandria" args."closer-mop" args."introspect-environment" args."lisp-namespace" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/type-i/2019-05-21/type-i-20190521-git.tgz'';
+ sha256 = ''1d79g3vd8s387rqagrkf1nmxax6kq32j1ddjrnx7ly08ib6aca99'';
+ };
+
+ packageName = "type-i";
+
+ asdFilesToKeep = ["type-i.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM type-i DESCRIPTION
+ Type Inference Utility on Fundamentally 1-arg Predicates SHA256
+ 1d79g3vd8s387rqagrkf1nmxax6kq32j1ddjrnx7ly08ib6aca99 URL
+ http://beta.quicklisp.org/archive/type-i/2019-05-21/type-i-20190521-git.tgz
+ MD5 9906855a0650f93186f37e162429e58b NAME type-i FILENAME type-i DEPS
+ ((NAME alexandria FILENAME alexandria)
+ (NAME closer-mop FILENAME closer-mop)
+ (NAME introspect-environment FILENAME introspect-environment)
+ (NAME lisp-namespace FILENAME lisp-namespace)
+ (NAME trivia.level0 FILENAME trivia_dot_level0)
+ (NAME trivia.level1 FILENAME trivia_dot_level1)
+ (NAME trivia.level2 FILENAME trivia_dot_level2)
+ (NAME trivia.trivial FILENAME trivia_dot_trivial)
+ (NAME trivial-cltl2 FILENAME trivial-cltl2))
+ DEPENDENCIES
+ (alexandria closer-mop introspect-environment lisp-namespace trivia.level0
+ trivia.level1 trivia.level2 trivia.trivial trivial-cltl2)
+ VERSION 20190521-git SIBLINGS (type-i.test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix
new file mode 100644
index 00000000000..4af27c449a3
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/unix-opts.nix
@@ -0,0 +1,25 @@
+args @ { fetchurl, ... }:
+rec {
+ baseName = ''unix-opts'';
+ version = ''20180430-git'';
+
+ description = ''minimalistic parser of command line arguments'';
+
+ deps = [ ];
+
+ src = fetchurl {
+ url = ''http://beta.quicklisp.org/archive/unix-opts/2018-04-30/unix-opts-20180430-git.tgz'';
+ sha256 = ''05glzp47kn022jkbbvhnygaibrqnpr44q19lwhm20h4nkpkj3968'';
+ };
+
+ packageName = "unix-opts";
+
+ asdFilesToKeep = ["unix-opts.asd"];
+ overrides = x: x;
+}
+/* (SYSTEM unix-opts DESCRIPTION minimalistic parser of command line arguments
+ SHA256 05glzp47kn022jkbbvhnygaibrqnpr44q19lwhm20h4nkpkj3968 URL
+ http://beta.quicklisp.org/archive/unix-opts/2018-04-30/unix-opts-20180430-git.tgz
+ MD5 2875ea0a1f5c49ef2697bb1046c4c4e5 NAME unix-opts FILENAME unix-opts DEPS
+ NIL DEPENDENCIES NIL VERSION 20180430-git SIBLINGS (unix-opts-tests)
+ PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index ea08214cb6f..a9a1cfc7ec0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
parasites = [ "xmls/octets" "xmls/test" "xmls/unit-test" ];
- description = '''';
+ description = ''System lacks description'';
deps = [ args."cl-ppcre" args."fiveam" args."flexi-streams" ];
@@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["xmls.asd"];
overrides = x: x;
}
-/* (SYSTEM xmls DESCRIPTION NIL SHA256
+/* (SYSTEM xmls DESCRIPTION System lacks description SHA256
1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi URL
http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz MD5
2462bab4a5d74e87ef7bdef41cd06dc8 NAME xmls FILENAME xmls DEPS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index acc98215af0..2d643384ad1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -43,11 +43,24 @@ in
propagatedBuildInputs = (x.propagatedBuildInputs or [])
++ (with pkgs; [libfixposix gcc])
;
+ overrides = y: (x.overrides y) // {
+ prePatch = ''
+ sed 's|default \"libfixposix\"|default \"${pkgs.libfixposix}/lib/libfixposix\"|' -i src/syscalls/ffi-functions-unix.lisp
+ '';
+ };
+
};
cxml = skipBuildPhase;
wookie = addNativeLibs (with pkgs; [libuv openssl]);
lev = addNativeLibs [pkgs.libev];
- cl_plus_ssl = addNativeLibs [pkgs.openssl];
+ cl_plus_ssl = x: rec {
+ propagatedBuildInputs = [pkgs.openssl];
+ overrides = y: (x.overrides y) // {
+ prePatch = ''
+ sed 's|libssl.so|${pkgs.openssl.out}/lib/libssl.so|' -i src/reload.lisp
+ '';
+ };
+ };
cl-colors = skipBuildPhase;
cl-libuv = addNativeLibs [pkgs.libuv];
cl-async-ssl = addNativeLibs [pkgs.openssl (import ./openssl-lib-marked.nix)];
@@ -85,7 +98,14 @@ $out/lib/common-lisp/query-fs"
'';
};
};
- sqlite = addNativeLibs [pkgs.sqlite];
+ sqlite = x: {
+ propagatedBuildInputs = [pkgs.sqlite];
+ overrides = y: (x.overrides y) // {
+ prePatch = ((x.overrides y).preConfigure or "") + ''
+ sed 's|libsqlite3|${pkgs.sqlite.out}/lib/libsqlite3|' -i sqlite-ffi.lisp
+ '';
+ };
+ };
swank = x: {
overrides = y: (x.overrides y) // {
postPatch = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 5c56ddfa2a2..a4dee0bce57 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -10,8 +10,7 @@ cffi
cffi-grovel
chipz
circular-streams
-clack
-clack-v1-compat
+cl+ssl
cl-ansi-text
cl-async
cl-async-base
@@ -21,6 +20,7 @@ cl-base64
cl-cli
cl-colors
cl-cookie
+cl-css
cl-csv
cl-dbi
cl-emb
@@ -33,8 +33,6 @@ cl-json
cl-l10n
cl-libuv
cl-mysql
-closer-mop
-closure-html
cl-pdf
cl-ppcre
cl-ppcre-template
@@ -42,12 +40,6 @@ cl-ppcre-unicode
cl-protobufs
cl-reexport
cl-smtp
-clsql
-clsql-postgresql
-clsql-postgresql-socket
-clsql-sqlite3
-clss
-cl+ssl
cl-syntax-annot
cl-syntax-anonfun
cl-syntax-markup
@@ -58,9 +50,17 @@ cl-unification
cl-utilities
cl-vectors
cl-who
+clack
+clack-v1-compat
+closer-mop
+closure-html
+clsql
+clsql-postgresql
+clsql-postgresql-socket
+clsql-sqlite3
+clss
clx
clx-truetype
-xembed
command-line-arguments
css-lite
css-selectors
@@ -70,6 +70,7 @@ cxml
dbd-mysql
dbd-postgres
dbd-sqlite3
+dbus
dexador
documentation-utils
drakma
@@ -93,15 +94,17 @@ iterate
lack
let-plus
lev
-lisp-namespace
-local-time
lfarm-client
lfarm-server
lfarm-ssl
+lisp-namespace
+local-time
+log4cl
lparallel
lquery
marshal
misc-extensions
+mk-string-metrics
mt19937
nibbles
optima
@@ -111,24 +114,32 @@ plump
proc-parse
prove
prove
+prove-asdf
query-fs
quri
salza2
simple-date
smart-buffer
split-sequence
+sqlite
static-vectors
+str
stumpwm
+swank
swap-bytes
+trivia
trivial-backtrace
+trivial-clipboard
trivial-indent
trivial-mimes
trivial-types
trivial-utf-8
uffi
+unix-opts
usocket
woo
wookie
+xembed
xkeyboard
xmls
xsubseq
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 2e71e0174f6..d430f72353a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -20,18 +20,103 @@ let quicklisp-to-nix-packages = rec {
}));
- "lfarm-common" = buildLispPackage
+ "type-i" = buildLispPackage
((f: x: (x // (f x)))
- (qlOverrides."lfarm-common" or (x: {}))
- (import ./quicklisp-to-nix-output/lfarm-common.nix {
+ (qlOverrides."type-i" or (x: {}))
+ (import ./quicklisp-to-nix-output/type-i.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "cl-store" = quicklisp-to-nix-packages."cl-store";
- "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- "usocket" = quicklisp-to-nix-packages."usocket";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
+ "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+ "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+ "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+ "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+ "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
+ "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+ }));
+
+
+ "trivial-cltl2" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-cltl2" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-cltl2.nix {
+ inherit fetchurl;
+ }));
+
+
+ "trivia_dot_trivial" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivia_dot_trivial" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivia_dot_trivial.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+ "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+ "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+ "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+ "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+ }));
+
+
+ "trivia_dot_level2" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivia_dot_level2" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivia_dot_level2.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+ "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+ "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+ "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+ }));
+
+
+ "trivia_dot_level1" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivia_dot_level1" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivia_dot_level1.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+ }));
+
+
+ "trivia_dot_level0" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivia_dot_level0" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivia_dot_level0.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ }));
+
+
+ "trivia_dot_balland2006" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivia_dot_balland2006" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivia_dot_balland2006.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+ "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+ "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+ "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+ "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
+ "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+ "type-i" = quicklisp-to-nix-packages."type-i";
+ }));
+
+
+ "introspect-environment" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."introspect-environment" or (x: {}))
+ (import ./quicklisp-to-nix-output/introspect-environment.nix {
+ inherit fetchurl;
}));
@@ -47,6 +132,21 @@ let quicklisp-to-nix-packages = rec {
}));
+ "lfarm-common" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."lfarm-common" or (x: {}))
+ (import ./quicklisp-to-nix-output/lfarm-common.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cl-store" = quicklisp-to-nix-packages."cl-store";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ }));
+
+
"rt" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."rt" or (x: {}))
@@ -124,16 +224,27 @@ let quicklisp-to-nix-packages = rec {
}));
- "sqlite" = buildLispPackage
+ "cl-xmlspam" = buildLispPackage
((f: x: (x // (f x)))
- (qlOverrides."sqlite" or (x: {}))
- (import ./quicklisp-to-nix-output/sqlite.nix {
+ (qlOverrides."cl-xmlspam" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-xmlspam.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
"babel" = quicklisp-to-nix-packages."babel";
- "cffi" = quicklisp-to-nix-packages."cffi";
- "iterate" = quicklisp-to-nix-packages."iterate";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "closure-common" = quicklisp-to-nix-packages."closure-common";
+ "cxml" = quicklisp-to-nix-packages."cxml";
+ "puri" = quicklisp-to-nix-packages."puri";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ }));
+
+
+ "asdf-package-system" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."asdf-package-system" or (x: {}))
+ (import ./quicklisp-to-nix-output/asdf-package-system.nix {
+ inherit fetchurl;
}));
@@ -207,14 +318,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "swank" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."swank" or (x: {}))
- (import ./quicklisp-to-nix-output/swank.nix {
- inherit fetchurl;
- }));
-
-
"collectors" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."collectors" or (x: {}))
@@ -314,6 +417,16 @@ let quicklisp-to-nix-packages = rec {
}));
+ "clsql-uffi" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clsql-uffi" or (x: {}))
+ (import ./quicklisp-to-nix-output/clsql-uffi.nix {
+ inherit fetchurl;
+ "clsql" = quicklisp-to-nix-packages."clsql";
+ "uffi" = quicklisp-to-nix-packages."uffi";
+ }));
+
+
"cl-paths" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-paths" or (x: {}))
@@ -346,16 +459,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "clsql-uffi" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clsql-uffi" or (x: {}))
- (import ./quicklisp-to-nix-output/clsql-uffi.nix {
- inherit fetchurl;
- "clsql" = quicklisp-to-nix-packages."clsql";
- "uffi" = quicklisp-to-nix-packages."uffi";
- }));
-
-
"cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre";
@@ -884,6 +987,15 @@ let quicklisp-to-nix-packages = rec {
}));
+ "xembed" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."xembed" or (x: {}))
+ (import ./quicklisp-to-nix-output/xembed.nix {
+ inherit fetchurl;
+ "clx" = quicklisp-to-nix-packages."clx";
+ }));
+
+
"wookie" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."wookie" or (x: {}))
@@ -961,6 +1073,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "unix-opts" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."unix-opts" or (x: {}))
+ (import ./quicklisp-to-nix-output/unix-opts.nix {
+ inherit fetchurl;
+ }));
+
+
"uffi" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."uffi" or (x: {}))
@@ -1001,6 +1121,15 @@ let quicklisp-to-nix-packages = rec {
}));
+ "trivial-clipboard" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivial-clipboard" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivial-clipboard.nix {
+ inherit fetchurl;
+ "uiop" = quicklisp-to-nix-packages."uiop";
+ }));
+
+
"trivial-backtrace" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."trivial-backtrace" or (x: {}))
@@ -1009,6 +1138,26 @@ let quicklisp-to-nix-packages = rec {
}));
+ "trivia" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."trivia" or (x: {}))
+ (import ./quicklisp-to-nix-output/trivia.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+ "introspect-environment" = quicklisp-to-nix-packages."introspect-environment";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace";
+ "trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006";
+ "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0";
+ "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1";
+ "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2";
+ "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial";
+ "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2";
+ "type-i" = quicklisp-to-nix-packages."type-i";
+ }));
+
+
"swap-bytes" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."swap-bytes" or (x: {}))
@@ -1019,6 +1168,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "swank" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."swank" or (x: {}))
+ (import ./quicklisp-to-nix-output/swank.nix {
+ inherit fetchurl;
+ }));
+
+
"stumpwm" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."stumpwm" or (x: {}))
@@ -1030,6 +1187,15 @@ let quicklisp-to-nix-packages = rec {
}));
+ "str" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."str" or (x: {}))
+ (import ./quicklisp-to-nix-output/str.nix {
+ inherit fetchurl;
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ }));
+
+
"static-vectors" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."static-vectors" or (x: {}))
@@ -1045,6 +1211,19 @@ let quicklisp-to-nix-packages = rec {
}));
+ "sqlite" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."sqlite" or (x: {}))
+ (import ./quicklisp-to-nix-output/sqlite.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "iterate" = quicklisp-to-nix-packages."iterate";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ }));
+
+
"split-sequence" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."split-sequence" or (x: {}))
@@ -1124,6 +1303,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "prove-asdf" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."prove-asdf" or (x: {}))
+ (import ./quicklisp-to-nix-output/prove-asdf.nix {
+ inherit fetchurl;
+ }));
+
+
"prove" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."prove" or (x: {}))
@@ -1211,6 +1398,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "mk-string-metrics" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."mk-string-metrics" or (x: {}))
+ (import ./quicklisp-to-nix-output/mk-string-metrics.nix {
+ inherit fetchurl;
+ }));
+
+
"misc-extensions" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."misc-extensions" or (x: {}))
@@ -1251,6 +1446,38 @@ let quicklisp-to-nix-packages = rec {
}));
+ "log4cl" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."log4cl" or (x: {}))
+ (import ./quicklisp-to-nix-output/log4cl.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "stefil" = quicklisp-to-nix-packages."stefil";
+ }));
+
+
+ "local-time" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."local-time" or (x: {}))
+ (import ./quicklisp-to-nix-output/local-time.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+ "stefil" = quicklisp-to-nix-packages."stefil";
+ }));
+
+
+ "lisp-namespace" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."lisp-namespace" or (x: {}))
+ (import ./quicklisp-to-nix-output/lisp-namespace.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ }));
+
+
"lfarm-ssl" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."lfarm-ssl" or (x: {}))
@@ -1305,27 +1532,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "local-time" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."local-time" or (x: {}))
- (import ./quicklisp-to-nix-output/local-time.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "cl-fad" = quicklisp-to-nix-packages."cl-fad";
- "stefil" = quicklisp-to-nix-packages."stefil";
- }));
-
-
- "lisp-namespace" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."lisp-namespace" or (x: {}))
- (import ./quicklisp-to-nix-output/lisp-namespace.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- }));
-
-
"lev" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."lev" or (x: {}))
@@ -1670,6 +1876,23 @@ let quicklisp-to-nix-packages = rec {
}));
+ "dbus" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."dbus" or (x: {}))
+ (import ./quicklisp-to-nix-output/dbus.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "asdf-package-system" = quicklisp-to-nix-packages."asdf-package-system";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "cl-xmlspam" = quicklisp-to-nix-packages."cl-xmlspam";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "ieee-floats" = quicklisp-to-nix-packages."ieee-floats";
+ "iolib" = quicklisp-to-nix-packages."iolib";
+ "ironclad" = quicklisp-to-nix-packages."ironclad";
+ "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+ }));
+
+
"dbd-sqlite3" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."dbd-sqlite3" or (x: {}))
@@ -1865,15 +2088,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "xembed" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."xembed" or (x: {}))
- (import ./quicklisp-to-nix-output/xembed.nix {
- inherit fetchurl;
- "clx" = quicklisp-to-nix-packages."clx";
- }));
-
-
"clx-truetype" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clx-truetype" or (x: {}))
@@ -1902,6 +2116,167 @@ let quicklisp-to-nix-packages = rec {
}));
+ "clss" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clss" or (x: {}))
+ (import ./quicklisp-to-nix-output/clss.nix {
+ inherit fetchurl;
+ "array-utils" = quicklisp-to-nix-packages."array-utils";
+ "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
+ "plump" = quicklisp-to-nix-packages."plump";
+ "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
+ }));
+
+
+ "clsql-sqlite3" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clsql-sqlite3" or (x: {}))
+ (import ./quicklisp-to-nix-output/clsql-sqlite3.nix {
+ inherit fetchurl;
+ "clsql" = quicklisp-to-nix-packages."clsql";
+ "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
+ "uffi" = quicklisp-to-nix-packages."uffi";
+ }));
+
+
+ "clsql-postgresql-socket" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clsql-postgresql-socket" or (x: {}))
+ (import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix {
+ inherit fetchurl;
+ "clsql" = quicklisp-to-nix-packages."clsql";
+ "md5" = quicklisp-to-nix-packages."md5";
+ "uffi" = quicklisp-to-nix-packages."uffi";
+ }));
+
+
+ "clsql-postgresql" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clsql-postgresql" or (x: {}))
+ (import ./quicklisp-to-nix-output/clsql-postgresql.nix {
+ inherit fetchurl;
+ "clsql" = quicklisp-to-nix-packages."clsql";
+ "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
+ "uffi" = quicklisp-to-nix-packages."uffi";
+ }));
+
+
+ "clsql" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clsql" or (x: {}))
+ (import ./quicklisp-to-nix-output/clsql.nix {
+ inherit fetchurl;
+ "uffi" = quicklisp-to-nix-packages."uffi";
+ }));
+
+
+ "closure-html" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."closure-html" or (x: {}))
+ (import ./quicklisp-to-nix-output/closure-html.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "closure-common" = quicklisp-to-nix-packages."closure-common";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ }));
+
+
+ "closer-mop" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."closer-mop" or (x: {}))
+ (import ./quicklisp-to-nix-output/closer-mop.nix {
+ inherit fetchurl;
+ }));
+
+
+ "clack-v1-compat" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clack-v1-compat" or (x: {}))
+ (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "anaphora" = quicklisp-to-nix-packages."anaphora";
+ "babel" = quicklisp-to-nix-packages."babel";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "cffi" = quicklisp-to-nix-packages."cffi";
+ "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+ "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
+ "chipz" = quicklisp-to-nix-packages."chipz";
+ "chunga" = quicklisp-to-nix-packages."chunga";
+ "circular-streams" = quicklisp-to-nix-packages."circular-streams";
+ "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
+ "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+ "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
+ "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+ "cl-colors" = quicklisp-to-nix-packages."cl-colors";
+ "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
+ "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+ "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+ "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
+ "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+ "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+ "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+ "clack" = quicklisp-to-nix-packages."clack";
+ "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
+ "clack-socket" = quicklisp-to-nix-packages."clack-socket";
+ "clack-test" = quicklisp-to-nix-packages."clack-test";
+ "dexador" = quicklisp-to-nix-packages."dexador";
+ "fast-http" = quicklisp-to-nix-packages."fast-http";
+ "fast-io" = quicklisp-to-nix-packages."fast-io";
+ "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+ "http-body" = quicklisp-to-nix-packages."http-body";
+ "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
+ "ironclad" = quicklisp-to-nix-packages."ironclad";
+ "jonathan" = quicklisp-to-nix-packages."jonathan";
+ "lack" = quicklisp-to-nix-packages."lack";
+ "lack-component" = quicklisp-to-nix-packages."lack-component";
+ "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
+ "lack-util" = quicklisp-to-nix-packages."lack-util";
+ "let-plus" = quicklisp-to-nix-packages."let-plus";
+ "local-time" = quicklisp-to-nix-packages."local-time";
+ "marshal" = quicklisp-to-nix-packages."marshal";
+ "md5" = quicklisp-to-nix-packages."md5";
+ "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+ "nibbles" = quicklisp-to-nix-packages."nibbles";
+ "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+ "prove" = quicklisp-to-nix-packages."prove";
+ "quri" = quicklisp-to-nix-packages."quri";
+ "rfc2388" = quicklisp-to-nix-packages."rfc2388";
+ "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
+ "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+ "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+ "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+ "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+ "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+ "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+ "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
+ "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+ "uiop" = quicklisp-to-nix-packages."uiop";
+ "usocket" = quicklisp-to-nix-packages."usocket";
+ "xsubseq" = quicklisp-to-nix-packages."xsubseq";
+ }));
+
+
+ "clack" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."clack" or (x: {}))
+ (import ./quicklisp-to-nix-output/clack.nix {
+ inherit fetchurl;
+ "alexandria" = quicklisp-to-nix-packages."alexandria";
+ "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+ "ironclad" = quicklisp-to-nix-packages."ironclad";
+ "lack" = quicklisp-to-nix-packages."lack";
+ "lack-component" = quicklisp-to-nix-packages."lack-component";
+ "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
+ "lack-util" = quicklisp-to-nix-packages."lack-util";
+ "nibbles" = quicklisp-to-nix-packages."nibbles";
+ "uiop" = quicklisp-to-nix-packages."uiop";
+ }));
+
+
"cl-who" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-who" or (x: {}))
@@ -2010,77 +2385,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "cl_plus_ssl" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."cl_plus_ssl" or (x: {}))
- (import ./quicklisp-to-nix-output/cl_plus_ssl.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "cffi" = quicklisp-to-nix-packages."cffi";
- "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
- "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- "uiop" = quicklisp-to-nix-packages."uiop";
- }));
-
-
- "clss" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clss" or (x: {}))
- (import ./quicklisp-to-nix-output/clss.nix {
- inherit fetchurl;
- "array-utils" = quicklisp-to-nix-packages."array-utils";
- "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
- "plump" = quicklisp-to-nix-packages."plump";
- "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
- }));
-
-
- "clsql-sqlite3" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clsql-sqlite3" or (x: {}))
- (import ./quicklisp-to-nix-output/clsql-sqlite3.nix {
- inherit fetchurl;
- "clsql" = quicklisp-to-nix-packages."clsql";
- "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
- "uffi" = quicklisp-to-nix-packages."uffi";
- }));
-
-
- "clsql-postgresql-socket" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clsql-postgresql-socket" or (x: {}))
- (import ./quicklisp-to-nix-output/clsql-postgresql-socket.nix {
- inherit fetchurl;
- "clsql" = quicklisp-to-nix-packages."clsql";
- "md5" = quicklisp-to-nix-packages."md5";
- "uffi" = quicklisp-to-nix-packages."uffi";
- }));
-
-
- "clsql-postgresql" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clsql-postgresql" or (x: {}))
- (import ./quicklisp-to-nix-output/clsql-postgresql.nix {
- inherit fetchurl;
- "clsql" = quicklisp-to-nix-packages."clsql";
- "clsql-uffi" = quicklisp-to-nix-packages."clsql-uffi";
- "uffi" = quicklisp-to-nix-packages."uffi";
- }));
-
-
- "clsql" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clsql" or (x: {}))
- (import ./quicklisp-to-nix-output/clsql.nix {
- inherit fetchurl;
- "uffi" = quicklisp-to-nix-packages."uffi";
- }));
-
-
"cl-smtp" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-smtp" or (x: {}))
@@ -2165,28 +2469,6 @@ let quicklisp-to-nix-packages = rec {
}));
- "closure-html" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."closure-html" or (x: {}))
- (import ./quicklisp-to-nix-output/closure-html.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "babel" = quicklisp-to-nix-packages."babel";
- "closure-common" = quicklisp-to-nix-packages."closure-common";
- "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
- "trivial-features" = quicklisp-to-nix-packages."trivial-features";
- "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- }));
-
-
- "closer-mop" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."closer-mop" or (x: {}))
- (import ./quicklisp-to-nix-output/closer-mop.nix {
- inherit fetchurl;
- }));
-
-
"cl-mysql" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-mysql" or (x: {}))
@@ -2360,6 +2642,14 @@ let quicklisp-to-nix-packages = rec {
}));
+ "cl-css" = buildLispPackage
+ ((f: x: (x // (f x)))
+ (qlOverrides."cl-css" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl-css.nix {
+ inherit fetchurl;
+ }));
+
+
"cl-cookie" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."cl-cookie" or (x: {}))
@@ -2495,87 +2785,19 @@ let quicklisp-to-nix-packages = rec {
}));
- "clack-v1-compat" = buildLispPackage
+ "cl_plus_ssl" = buildLispPackage
((f: x: (x // (f x)))
- (qlOverrides."clack-v1-compat" or (x: {}))
- (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
+ (qlOverrides."cl_plus_ssl" or (x: {}))
+ (import ./quicklisp-to-nix-output/cl_plus_ssl.nix {
inherit fetchurl;
"alexandria" = quicklisp-to-nix-packages."alexandria";
- "anaphora" = quicklisp-to-nix-packages."anaphora";
"babel" = quicklisp-to-nix-packages."babel";
"bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
"cffi" = quicklisp-to-nix-packages."cffi";
- "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
- "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
- "chipz" = quicklisp-to-nix-packages."chipz";
- "chunga" = quicklisp-to-nix-packages."chunga";
- "circular-streams" = quicklisp-to-nix-packages."circular-streams";
- "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
- "cl-annot" = quicklisp-to-nix-packages."cl-annot";
- "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
- "cl-base64" = quicklisp-to-nix-packages."cl-base64";
- "cl-colors" = quicklisp-to-nix-packages."cl-colors";
- "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
- "cl-fad" = quicklisp-to-nix-packages."cl-fad";
- "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
- "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
- "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
- "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
- "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
- "clack" = quicklisp-to-nix-packages."clack";
- "clack-handler-hunchentoot" = quicklisp-to-nix-packages."clack-handler-hunchentoot";
- "clack-socket" = quicklisp-to-nix-packages."clack-socket";
- "clack-test" = quicklisp-to-nix-packages."clack-test";
- "dexador" = quicklisp-to-nix-packages."dexador";
- "fast-http" = quicklisp-to-nix-packages."fast-http";
- "fast-io" = quicklisp-to-nix-packages."fast-io";
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
- "http-body" = quicklisp-to-nix-packages."http-body";
- "hunchentoot" = quicklisp-to-nix-packages."hunchentoot";
- "ironclad" = quicklisp-to-nix-packages."ironclad";
- "jonathan" = quicklisp-to-nix-packages."jonathan";
- "lack" = quicklisp-to-nix-packages."lack";
- "lack-component" = quicklisp-to-nix-packages."lack-component";
- "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
- "lack-util" = quicklisp-to-nix-packages."lack-util";
- "let-plus" = quicklisp-to-nix-packages."let-plus";
- "local-time" = quicklisp-to-nix-packages."local-time";
- "marshal" = quicklisp-to-nix-packages."marshal";
- "md5" = quicklisp-to-nix-packages."md5";
- "named-readtables" = quicklisp-to-nix-packages."named-readtables";
- "nibbles" = quicklisp-to-nix-packages."nibbles";
- "proc-parse" = quicklisp-to-nix-packages."proc-parse";
- "prove" = quicklisp-to-nix-packages."prove";
- "quri" = quicklisp-to-nix-packages."quri";
- "rfc2388" = quicklisp-to-nix-packages."rfc2388";
- "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
- "split-sequence" = quicklisp-to-nix-packages."split-sequence";
- "static-vectors" = quicklisp-to-nix-packages."static-vectors";
- "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
"trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
- "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
- "trivial-types" = quicklisp-to-nix-packages."trivial-types";
- "uiop" = quicklisp-to-nix-packages."uiop";
- "usocket" = quicklisp-to-nix-packages."usocket";
- "xsubseq" = quicklisp-to-nix-packages."xsubseq";
- }));
-
-
- "clack" = buildLispPackage
- ((f: x: (x // (f x)))
- (qlOverrides."clack" or (x: {}))
- (import ./quicklisp-to-nix-output/clack.nix {
- inherit fetchurl;
- "alexandria" = quicklisp-to-nix-packages."alexandria";
- "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
- "ironclad" = quicklisp-to-nix-packages."ironclad";
- "lack" = quicklisp-to-nix-packages."lack";
- "lack-component" = quicklisp-to-nix-packages."lack-component";
- "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
- "lack-util" = quicklisp-to-nix-packages."lack-util";
- "nibbles" = quicklisp-to-nix-packages."nibbles";
"uiop" = quicklisp-to-nix-packages."uiop";
}));
diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix
index 41dae8347ee..48314642a01 100644
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -276,8 +276,19 @@ with super;
propagatedBuildInputs = [
pkgs.libuv
];
+
+ passthru = {
+ libluv = self.luv.override({
+ preBuild = self.luv.preBuild + ''
+ sed -i 's,\(option(BUILD_MODULE.*\)ON,\1OFF,' CMakeLists.txt
+ sed -i 's,\(option(BUILD_SHARED_LIBS.*\)OFF,\1ON,' CMakeLists.txt
+ sed -i 's,${"\${INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt
+ '';
+ });
+ };
});
+
rapidjson = super.rapidjson.override({
preBuild = ''
sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt
diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json
index ef5afe37117..bcb72488a9e 100644
--- a/pkgs/development/node-packages/node-packages-v10.json
+++ b/pkgs/development/node-packages/node-packages-v10.json
@@ -30,6 +30,7 @@
, "dat"
, "dhcp"
, "dnschain"
+, "dockerfile-language-server-nodejs"
, "elasticdump"
, "elm-live"
, "elm-oracle"
diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix
index 3f4c4d1b9b5..300299a4d88 100644
--- a/pkgs/development/node-packages/node-packages-v10.nix
+++ b/pkgs/development/node-packages/node-packages-v10.nix
@@ -13,31 +13,31 @@ let
sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ==";
};
};
- "@angular-devkit/architect-0.803.4" = {
+ "@angular-devkit/architect-0.803.5" = {
name = "_at_angular-devkit_slash_architect";
packageName = "@angular-devkit/architect";
- version = "0.803.4";
+ version = "0.803.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.4.tgz";
- sha512 = "Ek+xb9GfzHLbD+ATmupbzTSNFGddkH6dbb36cB6gme+vnlBVfXP0dxOg5lRKZoUIFJyREl9jSrA5zUhVwXaoVg==";
+ url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.5.tgz";
+ sha512 = "hOcYF5fG3oieTc/C1QZqXsON8m8cpdtfdWhY7F7tmqqZ4JBR7igH4SSFQOoQwTj77rsqtkOLI9isVLpoSGX0DQ==";
};
};
- "@angular-devkit/core-8.3.4" = {
+ "@angular-devkit/core-8.3.5" = {
name = "_at_angular-devkit_slash_core";
packageName = "@angular-devkit/core";
- version = "8.3.4";
+ version = "8.3.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.4.tgz";
- sha512 = "QjUN9EakpQ+sFYeMfBMecxVhgI4Vdg0k20h6PZDjZ9lqYNXjpaQVtBo7qiPYHh5kQeJEvdrzca6yeYuCP3TvZw==";
+ url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.5.tgz";
+ sha512 = "ag7Nr94wQUqCFtZjw+rMET+djGBmLk989Id5lLWViW99g4XFeS+e45mJv3JYRzF218+6EdicZz0DGQRYHekVeg==";
};
};
- "@angular-devkit/schematics-8.3.4" = {
+ "@angular-devkit/schematics-8.3.5" = {
name = "_at_angular-devkit_slash_schematics";
packageName = "@angular-devkit/schematics";
- version = "8.3.4";
+ version = "8.3.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.4.tgz";
- sha512 = "+QXhrAEcReQJL4fn+35NbcdW5d1vawqSZUokqga8E971YUVUk55mHpIQ39Vpj3S9jhTRYwxsHl+7v9N7UaREmg==";
+ url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.5.tgz";
+ sha512 = "RMtM10kS+Docg90jzFMa4HQ+UzX95Gi5rCT/kSydEkBhp+Jeu/B0K2y67Fm2/qTdVNRCujrCpEmtiRcp1qsOQg==";
};
};
"@antora/asciidoc-loader-2.1.1" = {
@@ -1273,13 +1273,13 @@ let
sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda";
};
};
- "@hapi/address-2.1.1" = {
+ "@hapi/address-2.1.2" = {
name = "_at_hapi_slash_address";
packageName = "@hapi/address";
- version = "2.1.1";
+ version = "2.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.1.tgz";
- sha512 = "DYuHzu978pP1XW1GD3HGvLnAFjbQTIgc2+V153FGkbS2pgo9haigCdwBnUDrbhaOkgiJlbZvoEqDrcxSLHpiWA==";
+ url = "https://registry.npmjs.org/@hapi/address/-/address-2.1.2.tgz";
+ sha512 = "O4QDrx+JoGKZc6aN64L04vqa7e41tIiLU+OvKdcYaEMP97UttL0f9GIi9/0A4WAMx0uBd6SidDIhktZhgOcN8Q==";
};
};
"@hapi/bourne-1.3.2" = {
@@ -1309,13 +1309,13 @@ let
sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==";
};
};
- "@hapi/topo-3.1.3" = {
+ "@hapi/topo-3.1.4" = {
name = "_at_hapi_slash_topo";
packageName = "@hapi/topo";
- version = "3.1.3";
+ version = "3.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.3.tgz";
- sha512 = "JmS9/vQK6dcUYn7wc2YZTqzIKubAQcJKu2KCKAru6es482U5RT5fP1EXCPtlXpiK7PR0On/kpQKI4fRKkzpZBQ==";
+ url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.4.tgz";
+ sha512 = "aVWQTOI9wBD6zawmOr6f+tdEIxQC8JXfQVLTjgGe8YEStAWGn/GNNVTobKJhbWKveQj2RyYF3oYbO9SC8/eOCA==";
};
};
"@iarna/toml-2.2.3" = {
@@ -1327,94 +1327,94 @@ let
sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg==";
};
};
- "@ionic/cli-framework-2.1.6" = {
+ "@ionic/cli-framework-2.1.7" = {
name = "_at_ionic_slash_cli-framework";
packageName = "@ionic/cli-framework";
- version = "2.1.6";
+ version = "2.1.7";
src = fetchurl {
- url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.6.tgz";
- sha512 = "V0jkrOXfPes0N1ECmiWDgcRZSaWq7PUFCctMNNqe4xwbQ61aDNypEIQCvVdgIk16zVBKrMI4EP94Qplvi6CYGw==";
+ url = "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-2.1.7.tgz";
+ sha512 = "osuKbmCIzT0H+g39lDy+EmsP5RHc+aYOv+BN+IngsaxKb7ya0V/JlLO1vLkd7RYT+lmiQWiCi7RpHPeEgQJFtw==";
};
};
- "@ionic/discover-2.0.5" = {
+ "@ionic/discover-2.0.6" = {
name = "_at_ionic_slash_discover";
packageName = "@ionic/discover";
- version = "2.0.5";
- src = fetchurl {
- url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.5.tgz";
- sha512 = "4gVq4UvCHzgQtE0Sffc6MZiwDE9XjWhYsKm81h85dz/iVT4sx0c5fFvJzGXg7OFHCsVN2PhmlIwdgmYetqB5Ow==";
- };
- };
- "@ionic/utils-array-1.2.0" = {
- name = "_at_ionic_slash_utils-array";
- packageName = "@ionic/utils-array";
- version = "1.2.0";
- src = fetchurl {
- url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.2.0.tgz";
- sha512 = "wJfshi287FRjZM43+w3OkMl4n7hDTmK/9Jxm9Ot5hBDgeLP6Fw/OBb6tt+nGjhRBJbk1oOi7ksJgyBw/+1ldzg==";
- };
- };
- "@ionic/utils-fs-2.0.6" = {
- name = "_at_ionic_slash_utils-fs";
- packageName = "@ionic/utils-fs";
version = "2.0.6";
src = fetchurl {
- url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.6.tgz";
- sha512 = "iU1UwU5NW2nlLvNNE3QoeH6I+wN3a4ypHFcS6Bp7qUDENeI+oTxHzVHKHM6qt7T/24TFLNcHVxcq/pGIt7vgOA==";
+ url = "https://registry.npmjs.org/@ionic/discover/-/discover-2.0.6.tgz";
+ sha512 = "OEjUcVDliTqCWlFGFbD+msTLwQCXNHXUTdg6PQIjDn5RipVSWtpVB+DjLO+D1zYkY6TgD9mxBcIwiYJBRuw5dg==";
};
};
- "@ionic/utils-network-1.0.4" = {
+ "@ionic/utils-array-1.2.1" = {
+ name = "_at_ionic_slash_utils-array";
+ packageName = "@ionic/utils-array";
+ version = "1.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-1.2.1.tgz";
+ sha512 = "t0/gXFf70oDPpviGUHpaDD9++zIx8nFXpPm8c3We8iH5dRwEJLSun+AJTqxO/XPzEhM24KBuj3rLY9bSYBadEg==";
+ };
+ };
+ "@ionic/utils-fs-2.0.7" = {
+ name = "_at_ionic_slash_utils-fs";
+ packageName = "@ionic/utils-fs";
+ version = "2.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-2.0.7.tgz";
+ sha512 = "rXTKJD66qocDs8w72+z7yw6P8H095yexIMsUbNiJFjMm3Cx542i+Tw9gbGwYN356WrA/0EATXD/zVZDzvDsSKQ==";
+ };
+ };
+ "@ionic/utils-network-1.0.5" = {
name = "_at_ionic_slash_utils-network";
packageName = "@ionic/utils-network";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.4.tgz";
- sha512 = "VDWlschcLc6t71AAk54ywycVwahRv2qK82DOxdiN02YwurqXclcT2wmZCjnzAgBOPEepqmxj0mKozPA9YYWcbg==";
+ url = "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-1.0.5.tgz";
+ sha512 = "seOoxQUKTugpNjQWYVAmylh6mfddPyE2EsWWyn6ojkp7HurMadvRZa9OQ/PrhMjkphHupPMyuIukaD7F2zMW9Q==";
};
};
- "@ionic/utils-object-1.0.4" = {
+ "@ionic/utils-object-1.0.5" = {
name = "_at_ionic_slash_utils-object";
packageName = "@ionic/utils-object";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.4.tgz";
- sha512 = "B05kWS+Uj0rGrvG1RvAzDBuggstmWM0X4OUb3p9GhZJJQsNK2/0W03VfPOkNuaDi15NF/WFwLS7/yp7kM25mTw==";
+ url = "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-1.0.5.tgz";
+ sha512 = "nyNH8EJcE/xl5G7Zyz5Thy5f1Otj+fhsXca3C5WsCG6y7yb2biDaaw3lgq/KtEYfXyH1znHsbs9hdJNLgCefGQ==";
};
};
- "@ionic/utils-process-1.0.4" = {
+ "@ionic/utils-process-1.0.5" = {
name = "_at_ionic_slash_utils-process";
packageName = "@ionic/utils-process";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.4.tgz";
- sha512 = "F70r4Dup0yz03lDVCiRva2Qz7+VXNtUnfx7pfIFaDQv54sUem7ozG6zl4db5EE3a4RAJUCbM5YQFsAojnEUc+g==";
+ url = "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-1.0.5.tgz";
+ sha512 = "zzDeLiz2lnpI9hKoMHbQiKfbnfFor9LXcW1ZWIKy9YkGOXv80UWbQq43CstMtnDtghcXLS02DaOVtcJPh47psw==";
};
};
- "@ionic/utils-stream-2.0.3" = {
+ "@ionic/utils-stream-2.0.4" = {
name = "_at_ionic_slash_utils-stream";
packageName = "@ionic/utils-stream";
- version = "2.0.3";
+ version = "2.0.4";
src = fetchurl {
- url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.3.tgz";
- sha512 = "Y1OAcJwP8uNCYQiRxywfo85jdOVbfdvRwjuvFVupFrLQet6kOBKh9wHHnivoS9du+Wlq4VjuFh03LmmAaHwenA==";
+ url = "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-2.0.4.tgz";
+ sha512 = "qha4Msonb44++xvf8YppBR27dNBRuMLSty4/THH9uD6UEdjU2+23LWACKuqnQUSsZjQdvALVDMcRRWEIYEL2VQ==";
};
};
- "@ionic/utils-subprocess-1.0.7" = {
+ "@ionic/utils-subprocess-1.0.8" = {
name = "_at_ionic_slash_utils-subprocess";
packageName = "@ionic/utils-subprocess";
- version = "1.0.7";
+ version = "1.0.8";
src = fetchurl {
- url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.7.tgz";
- sha512 = "QXCqdwSSGiyxgs36faSbxiVIRCUBI6ckmCSWSLRGZAo4EZ7MuPQUqU+oVILkTWTOPAMWNcJtS67zJNMTccsSUg==";
+ url = "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-1.0.8.tgz";
+ sha512 = "gfVCzccOQ3PVfY6d1hDZq1Qv7hOXAn3ZlepAEbUBOeFauIhXmwmwVdIRa9cfi3cESpDidNQ3dpmXyC+nKxv0Og==";
};
};
- "@ionic/utils-terminal-1.0.4" = {
+ "@ionic/utils-terminal-1.0.5" = {
name = "_at_ionic_slash_utils-terminal";
packageName = "@ionic/utils-terminal";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.4.tgz";
- sha512 = "+iJbFff7mnJ6ROE465+/DG8eweFmINVy69Bdw9fr8Vcf8WhJWxMw0vd59J/gaUSsHuxoufZYftVXVoWUd8RfWA==";
+ url = "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-1.0.5.tgz";
+ sha512 = "kaE/sKG3p6y9n73IfR0hU218YORS9P1sg4+GYCie+iGxSTixcKIX7yUBOCY1s2Oav0xS9mjGcpa6ppzANC70bw==";
};
};
"@kbrandwijk/swagger-to-graphql-2.4.3" = {
@@ -2065,13 +2065,13 @@ let
sha512 = "L4JaJDXn8SGT+5G0uX79rZLv0MNJmfGa4vb4vy1NnpjSnWDLJRy6m90udGwvMmavwsStgbv2QNkPzzTCMmL+ig==";
};
};
- "@octokit/rest-16.28.9" = {
+ "@octokit/rest-16.30.0" = {
name = "_at_octokit_slash_rest";
packageName = "@octokit/rest";
- version = "16.28.9";
+ version = "16.30.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.9.tgz";
- sha512 = "IKGnX+Tvzt7XHhs8f4ajqxyJvYAMNX5nWfoJm4CQj8LZToMiaJgutf5KxxpxoC3y5w7JTJpW5rnWnF4TsIvCLA==";
+ url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.30.0.tgz";
+ sha512 = "TN5MbqVuqxT/s87D6tGe3zsMvyHUQSkGFMBHuwBToPQGV3eG2a67rJW2rag2vJr7JusWyERDhQ4g/4HvFo9B1g==";
};
};
"@parcel/fs-1.11.0" = {
@@ -2218,31 +2218,31 @@ let
sha512 = "YXJqp9gdHcZKAmBY/WnwFpPtNQp2huD/ME2YMurH2YHJvxrVzYsmpKw/pb7yINArRpp8E++fwbQd3ajYXGA45Q==";
};
};
- "@schematics/angular-8.3.4" = {
+ "@schematics/angular-8.3.5" = {
name = "_at_schematics_slash_angular";
packageName = "@schematics/angular";
- version = "8.3.4";
+ version = "8.3.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.4.tgz";
- sha512 = "/HO6vZosULsJnwZLG9JLePyaR2g4MePrk27c3H/WbFNN4ajBePe1Mj34q6HCzje30NduLV8B3SykPnG1CoNy5Q==";
+ url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.5.tgz";
+ sha512 = "3YKurSNqUfjVrbENVlnTBNGYBWjdyjrWzJRlwWbCq+owQLhkZ/N5qVirt/SDw5T9hK2AEMOKjLkQYtpE+aOCgg==";
};
};
- "@schematics/update-0.803.4" = {
+ "@schematics/update-0.803.5" = {
name = "_at_schematics_slash_update";
packageName = "@schematics/update";
- version = "0.803.4";
+ version = "0.803.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.4.tgz";
- sha512 = "ZLCUR7VpUkv3zjeOmcny3UAtwHbQLeBeDsoLYIVQZyepqk3kRPBGaW/xYwmNng04bVfMCtcTx9yrs7n4+Lt/Iw==";
+ url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.5.tgz";
+ sha512 = "v2qU0ATb1jND8GIGQFnI1QLWoquUjJ2fJ37HoDSO3rmttZ/NvoV4sNDGhk/pPUcmeXa+prURfJCCCSeHZ/yKkw==";
};
};
- "@serverless/cli-1.2.1" = {
+ "@serverless/cli-1.2.3" = {
name = "_at_serverless_slash_cli";
packageName = "@serverless/cli";
- version = "1.2.1";
+ version = "1.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.2.1.tgz";
- sha512 = "+Ip9UsmrH2e6Q36ZHmeEWu4ez36Srl1hgeaM6t6YPGJlNRNFw650Xt43K5EAZpWVvGJNYuNaQs9FZs4ZnakLgQ==";
+ url = "https://registry.npmjs.org/@serverless/cli/-/cli-1.2.3.tgz";
+ sha512 = "N/hsPZrE/zK8Iv98bdEG7J6ZhotWXwywjc/bKWcbhZeXENqbS7UD2qtyL/pfGuNodFVG587l8Cf+UvK8OcA6Qg==";
};
};
"@serverless/component-metrics-1.0.8" = {
@@ -2263,13 +2263,13 @@ let
sha512 = "XP5KXvEGlrNIOV/KJ0KKwzeov9MqZQ+Ck3z7JW/gtd8ryoKK+5+ah2WL77DXETeHeEwxZhJdrNatqc0FXauEiw==";
};
};
- "@serverless/enterprise-plugin-2.0.0" = {
+ "@serverless/enterprise-plugin-3.0.0" = {
name = "_at_serverless_slash_enterprise-plugin";
packageName = "@serverless/enterprise-plugin";
- version = "2.0.0";
+ version = "3.0.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-2.0.0.tgz";
- sha512 = "jfTXC3eAFkgXbsHfDwLr6od3evwnmz0KhVs/p5HXXh37BGX8ETVFUoWsrIOf92flbGDPBEyzcHXX5cfNBlfNKA==";
+ url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.0.0.tgz";
+ sha512 = "+L+SeQV0MKQN9TBXC6Xmgcw7BVfW8Q3F/lMjB1MPsBd0RZPzYnVlWcVg4cA6tgvkpfdw8NVlh/QXFs+603zHrg==";
};
};
"@serverless/event-mocks-1.1.1" = {
@@ -5845,13 +5845,13 @@ let
sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
};
};
- "aws-sdk-2.529.0" = {
+ "aws-sdk-2.533.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.529.0";
+ version = "2.533.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.529.0.tgz";
- sha512 = "CtRxgI4ZVZ8cdFCddlIVIy06cEW5gzTJBpyouZ/ySgZ6BiYj+0e77LwoNsnQE2nUNWCbydTLn3dbz4ZZMDpuIg==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.533.0.tgz";
+ sha512 = "OSe7C0jnBdgfzedOtK+TgBEwtJaaZovm+Q2fbqIlfhUWg3rhhkt3oLyQ9bRD30/CFaunLhLr/8HAAN+/x+DWAA==";
};
};
"aws-sign2-0.6.0" = {
@@ -6943,6 +6943,15 @@ let
sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
};
};
+ "base64id-2.0.0" = {
+ name = "base64id";
+ packageName = "base64id";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz";
+ sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==";
+ };
+ };
"base64url-3.0.1" = {
name = "base64url";
packageName = "base64url";
@@ -7114,13 +7123,13 @@ let
sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
};
};
- "big-integer-1.6.44" = {
+ "big-integer-1.6.45" = {
name = "big-integer";
packageName = "big-integer";
- version = "1.6.44";
+ version = "1.6.45";
src = fetchurl {
- url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.44.tgz";
- sha512 = "7MzElZPTyJ2fNvBkPxtFQ2fWIkVmuzw41+BZHSzpEq3ymB2MfeKp1+yXl/tS75xCx+WnyV+yb0kp+K1C3UNwmQ==";
+ url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.45.tgz";
+ sha512 = "nmb9E7oEtVJ7SmSCH/DeJobXyuRmaofkpoQSimMFu3HKJ5MADtM825SPLhDuWhZ6TElLAQtgJbQmBZuHIRlZoA==";
};
};
"big.js-5.2.2" = {
@@ -7384,13 +7393,13 @@ let
sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129";
};
};
- "blessed-contrib-4.8.16" = {
+ "blessed-contrib-4.8.17" = {
name = "blessed-contrib";
packageName = "blessed-contrib";
- version = "4.8.16";
+ version = "4.8.17";
src = fetchurl {
- url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.16.tgz";
- sha512 = "B1fEJTR+8IsimEvYQbvXCvnV0L674rFxy9yMwqibiRO2nxa5fzwnoKhJjRJFCBYH27ztW+b6jKvnOvetnj30WA==";
+ url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.17.tgz";
+ sha512 = "uhywRrzJQxtpkowgDHdejIE911Pgt0raYOQUoFC/qREyQvXsz5DMj2J2JVjwcx2bpzbDdHRoP/lcWLE1Ol3vCQ==";
};
};
"blob-0.0.2" = {
@@ -9067,13 +9076,13 @@ let
sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==";
};
};
- "chokidar-3.1.0" = {
+ "chokidar-3.1.1" = {
name = "chokidar";
packageName = "chokidar";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/chokidar/-/chokidar-3.1.0.tgz";
- sha512 = "6vZfo+7W0EOlbSo0nhVKMz4yyssrwiPbBZ8wj1lq8/+l4ZhGZ2U4Md7PspvmijXp1a26D3B7AHEBmIB7aVtaOQ==";
+ url = "https://registry.npmjs.org/chokidar/-/chokidar-3.1.1.tgz";
+ sha512 = "df4o16uZmMHzVQwECZRHwfguOt5ixpuQVaZHjYMvYisgKhE+JXwcj/Tcr3+3bu/XeOJQ9ycYmzu7Mv8XrGxJDQ==";
};
};
"chownr-0.0.2" = {
@@ -9976,6 +9985,15 @@ let
sha512 = "mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==";
};
};
+ "colors-1.4.0" = {
+ name = "colors";
+ packageName = "colors";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz";
+ sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==";
+ };
+ };
"colorspace-1.1.2" = {
name = "colorspace";
packageName = "colorspace";
@@ -11290,6 +11308,15 @@ let
sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==";
};
};
+ "cross-spawn-7.0.0" = {
+ name = "cross-spawn";
+ packageName = "cross-spawn";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.0.tgz";
+ sha512 = "6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw==";
+ };
+ };
"cross-spawn-async-2.2.5" = {
name = "cross-spawn-async";
packageName = "cross-spawn-async";
@@ -12271,6 +12298,15 @@ let
sha1 = "80a4dd323748384bfa248083622aedec982adff3";
};
};
+ "decompress-response-4.2.1" = {
+ name = "decompress-response";
+ packageName = "decompress-response";
+ version = "4.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz";
+ sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==";
+ };
+ };
"decompress-tar-4.1.1" = {
name = "decompress-tar";
packageName = "decompress-tar";
@@ -12541,13 +12577,13 @@ let
sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4";
};
};
- "deferred-leveldown-5.2.0" = {
+ "deferred-leveldown-5.2.1" = {
name = "deferred-leveldown";
packageName = "deferred-leveldown";
- version = "5.2.0";
+ version = "5.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.2.0.tgz";
- sha512 = "E1s224a+nv7nEZQL/s+q4ARzBhsfo3KiEjK3qdvDAvMfWE68GnGsMRYKanoZgYqq+LNgyRMYPzBgEmAXjM2i5g==";
+ url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.2.1.tgz";
+ sha512 = "PwXZRn5EmW+IKYVAYVc7G9FsRkShr0myPubPuq+mtLhDq9xSUqfvTlNZKoeQGeXACHXkeCFurKrz5oo6TZ3qwg==";
};
};
"define-properties-1.1.3" = {
@@ -13207,6 +13243,15 @@ let
sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6";
};
};
+ "dockerfile-ast-0.0.12" = {
+ name = "dockerfile-ast";
+ packageName = "dockerfile-ast";
+ version = "0.0.12";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.12.tgz";
+ sha512 = "cIV8oXkAxpIuN5XgG0TGg07nLDgrj4olkfrdT77OTA3VypscsYHBUg/FjHxW9K3oA+CyH4Th/qtoMgTVpzSobw==";
+ };
+ };
"dockerfile-ast-0.0.16" = {
name = "dockerfile-ast";
packageName = "dockerfile-ast";
@@ -13216,6 +13261,33 @@ let
sha512 = "+HZToHjjiLPl46TqBrok5dMrg5oCkZFPSROMQjRmvin0zG4FxK0DJXTpV/CUPYY2zpmEvVza55XLwSHFx/xZMw==";
};
};
+ "dockerfile-language-service-0.0.8" = {
+ name = "dockerfile-language-service";
+ packageName = "dockerfile-language-service";
+ version = "0.0.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.8.tgz";
+ sha512 = "peko1rQtZ81e3QK3VLZgkCKkCMnuoSqZxCQuudyEbtYqqAe6jJ4r0bwOnWD9hyH/FMg7jMvI5uLsoo7/dHLNYw==";
+ };
+ };
+ "dockerfile-utils-0.0.11" = {
+ name = "dockerfile-utils";
+ packageName = "dockerfile-utils";
+ version = "0.0.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.11.tgz";
+ sha512 = "LNdPIgcl58343dF4KNCHvFzUScUhgLI9BRAR+Vln6D1tVBGvv1k5/qHuxWRCAM2uyFbj73QVkKMScXPhY7TqfQ==";
+ };
+ };
+ "dockerfile-utils-0.0.13" = {
+ name = "dockerfile-utils";
+ packageName = "dockerfile-utils";
+ version = "0.0.13";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.0.13.tgz";
+ sha512 = "+MAmhEnQ16B7+3C2UDWpmIS1D8EiKvpl4LDRjrMv94bOusaeRcLagRR0AvgV6NWT+oiRxDMLDyay6yjm6LESsw==";
+ };
+ };
"doctrine-2.1.0" = {
name = "doctrine";
packageName = "doctrine";
@@ -13801,13 +13873,13 @@ let
sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ==";
};
};
- "electron-to-chromium-1.3.260" = {
+ "electron-to-chromium-1.3.264" = {
name = "electron-to-chromium";
packageName = "electron-to-chromium";
- version = "1.3.260";
+ version = "1.3.264";
src = fetchurl {
- url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.260.tgz";
- sha512 = "wGt+OivF1C1MPwaSv3LJ96ebNbLAWlx3HndivDDWqwIVSQxmhL17Y/YmwUdEMtS/bPyommELt47Dct0/VZNQBQ==";
+ url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.264.tgz";
+ sha512 = "z8E7WkrrquCuGYv+kKyybuZIbdms+4PeHp7Zm2uIgEhAigP0bOwqXILItwj0YO73o+QyHY/7XtEfP5DsHOWQgQ==";
};
};
"elegant-spinner-1.0.1" = {
@@ -14081,6 +14153,15 @@ let
sha512 = "AsaA9KG7cWPXWHp5FvHdDWY3AMWeZ8x+2pUVLcn71qE5AtAzgGbxuclOytygskw8XGmiQafTmnI9Bix3uihu2w==";
};
};
+ "engine.io-3.4.0" = {
+ name = "engine.io";
+ packageName = "engine.io";
+ version = "3.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/engine.io/-/engine.io-3.4.0.tgz";
+ sha512 = "XCyYVWzcHnK5cMz7G4VTu2W7zJS7SM1QkcelghyIk/FmobWBtXE7fwhBusEKvCSqc3bMh8fNFMlUkCKTFRxH2w==";
+ };
+ };
"engine.io-client-1.3.1" = {
name = "engine.io-client";
packageName = "engine.io-client";
@@ -14108,6 +14189,15 @@ let
sha512 = "y0CPINnhMvPuwtqXfsGuWE8BB66+B6wTtCofQDRecMQPYX3MYUZXFNKDhdrSe3EVjgOu4V3rxdeqN/Tr91IgbQ==";
};
};
+ "engine.io-client-3.4.0" = {
+ name = "engine.io-client";
+ packageName = "engine.io-client";
+ version = "3.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.0.tgz";
+ sha512 = "a4J5QO2k99CM2a0b12IznnyQndoEvtA4UAldhGzKqnHf42I3Qs2W5SPnDvatZRcMaNZs4IevVicBPayxYt6FwA==";
+ };
+ };
"engine.io-parser-1.0.6" = {
name = "engine.io-parser";
packageName = "engine.io-parser";
@@ -14126,6 +14216,15 @@ let
sha512 = "6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==";
};
};
+ "engine.io-parser-2.2.0" = {
+ name = "engine.io-parser";
+ packageName = "engine.io-parser";
+ version = "2.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz";
+ sha512 = "6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w==";
+ };
+ };
"enhanced-resolve-2.3.0" = {
name = "enhanced-resolve";
packageName = "enhanced-resolve";
@@ -16349,13 +16448,13 @@ let
sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ==";
};
};
- "flow-parser-0.107.0" = {
+ "flow-parser-0.108.0" = {
name = "flow-parser";
packageName = "flow-parser";
- version = "0.107.0";
+ version = "0.108.0";
src = fetchurl {
- url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.107.0.tgz";
- sha512 = "GtMCS8qzP0VskiE5qfN4zYiwjnClV/BxPZ4zUqMRUfyaF+gBuLHDTPqVLJ4ndGedrdv54510rsXDSbkCqUig+g==";
+ url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.108.0.tgz";
+ sha512 = "Ug8VuwlyDIZq5Xgrf+T7XLpKydhqYyNd8lmFtf7PZbu90T5LL+FeHjWzxyrBn35RCCZMw7pXrjCrHOSs+2zXyg==";
};
};
"fluent-ffmpeg-2.1.2" = {
@@ -17663,13 +17762,13 @@ let
sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae";
};
};
- "glob-parent-5.0.0" = {
+ "glob-parent-5.1.0" = {
name = "glob-parent";
packageName = "glob-parent";
- version = "5.0.0";
+ version = "5.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz";
- sha512 = "Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==";
+ url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz";
+ sha512 = "qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==";
};
};
"glob-stream-3.1.18" = {
@@ -17735,13 +17834,13 @@ let
sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f";
};
};
- "global-agent-2.1.0" = {
+ "global-agent-2.1.1" = {
name = "global-agent";
packageName = "global-agent";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.0.tgz";
- sha512 = "o5BKvbhjGKHFRMkw+xtZeTEyyHGDsdXaFvOHDQx6pzCURtIaznEL2URkXfp2xxzth8Y/6n9yysHXnjjLH6soBw==";
+ url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.1.tgz";
+ sha512 = "MjLP2o331SpSxBMBFSWxs5PaWDhjXxysHepQ/hmBCjhjw74cbO9R/IBCbaSJ4GLPKm01dRcgXBtRr7p7XZEnfg==";
};
};
"global-dirs-0.1.1" = {
@@ -18060,6 +18159,15 @@ let
sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
};
};
+ "graceful-fs-4.2.1" = {
+ name = "graceful-fs";
+ packageName = "graceful-fs";
+ version = "4.2.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz";
+ sha512 = "b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==";
+ };
+ };
"graceful-fs-4.2.2" = {
name = "graceful-fs";
packageName = "graceful-fs";
@@ -18132,13 +18240,13 @@ let
sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog==";
};
};
- "graphql-14.5.6" = {
+ "graphql-14.5.7" = {
name = "graphql";
packageName = "graphql";
- version = "14.5.6";
+ version = "14.5.7";
src = fetchurl {
- url = "https://registry.npmjs.org/graphql/-/graphql-14.5.6.tgz";
- sha512 = "zJ6Oz8P1yptV4O4DYXdArSwvmirPetDOBnGFRBl0zQEC68vNW3Ny8qo8VzMgfr+iC8PKiRYJ+f2wub41oDCoQg==";
+ url = "https://registry.npmjs.org/graphql/-/graphql-14.5.7.tgz";
+ sha512 = "as410RMJSUFqF8RcH2QWxZ5ioqHzsH9VWnWbaU+UnDXJ/6azMDIYPrtXCBPXd8rlunEVb7W8z6fuUnNHMbFu9A==";
};
};
"graphql-anywhere-4.2.4" = {
@@ -18456,13 +18564,13 @@ let
sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5";
};
};
- "handlebars-4.2.0" = {
+ "handlebars-4.2.1" = {
name = "handlebars";
packageName = "handlebars";
- version = "4.2.0";
+ version = "4.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/handlebars/-/handlebars-4.2.0.tgz";
- sha512 = "Kb4xn5Qh1cxAKvQnzNWZ512DhABzyFNmsaJf3OAkWNa4NkaqWcNI8Tao8Tasi0/F4JD9oyG0YxuFyvyR57d+Gw==";
+ url = "https://registry.npmjs.org/handlebars/-/handlebars-4.2.1.tgz";
+ sha512 = "bqPIlDk06UWbVEIFoYj+LVo42WhK96J+b25l7hbFDpxrOXMphFM3fNIm+cluwg4Pk2jiLjWU5nHQY7igGE75NQ==";
};
};
"har-schema-1.0.5" = {
@@ -19330,6 +19438,15 @@ let
sha512 = "Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==";
};
};
+ "http-proxy-1.18.0" = {
+ name = "http-proxy";
+ packageName = "http-proxy";
+ version = "1.18.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz";
+ sha512 = "84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==";
+ };
+ };
"http-proxy-agent-2.1.0" = {
name = "http-proxy-agent";
packageName = "http-proxy-agent";
@@ -19609,15 +19726,6 @@ let
sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==";
};
};
- "ieee754-1.1.8" = {
- name = "ieee754";
- packageName = "ieee754";
- version = "1.1.8";
- src = fetchurl {
- url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz";
- sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4";
- };
- };
"iferr-0.1.5" = {
name = "iferr";
packageName = "iferr";
@@ -20095,6 +20203,15 @@ let
sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==";
};
};
+ "inquirer-7.0.0" = {
+ name = "inquirer";
+ packageName = "inquirer";
+ version = "7.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz";
+ sha512 = "rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==";
+ };
+ };
"inquirer-autocomplete-prompt-1.0.1" = {
name = "inquirer-autocomplete-prompt";
packageName = "inquirer-autocomplete-prompt";
@@ -21427,13 +21544,13 @@ let
sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d";
};
};
- "is-wsl-2.1.0" = {
+ "is-wsl-2.1.1" = {
name = "is-wsl";
packageName = "is-wsl";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchurl {
- url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.0.tgz";
- sha512 = "pFTjpv/x5HRj8kbZ/Msxi9VrvtOMRBqaDi3OIcbwPI3OuH+r3lLxVWukLITBaOGJIbA/w2+M1eVmVa4XNQlAmQ==";
+ url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz";
+ sha512 = "umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==";
};
};
"is-yarn-global-0.3.0" = {
@@ -23084,13 +23201,13 @@ let
sha512 = "SBSR60x+dghhwGUxPKS+BvV1xNqnwsEUBKmnFepPaHJ6VkBXyPK9SImGc3K2BkwBfpxlt7GKkBNlCnrdufsejA==";
};
};
- "leveldown-5.2.0" = {
+ "leveldown-5.2.1" = {
name = "leveldown";
packageName = "leveldown";
- version = "5.2.0";
+ version = "5.2.1";
src = fetchurl {
- url = "https://registry.npmjs.org/leveldown/-/leveldown-5.2.0.tgz";
- sha512 = "Ml6mWFqhhyUbuJUVaOd6ZVBHA5T0XLOK0cwNRIBEDJCjBiJBM3fpi4gdTIhU5/tWqtxMFMQbmo/U7a9rbA1stg==";
+ url = "https://registry.npmjs.org/leveldown/-/leveldown-5.2.1.tgz";
+ sha512 = "369I1rGibXV7CIoLhsSpp/ExwQucI3xUe0RXQrMu4ji6OG9PFMVAQuzsEXKwAi3BWsjFzcFtodAP8MW5fmfung==";
};
};
"levelup-0.19.1" = {
@@ -25956,6 +26073,15 @@ let
sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==";
};
};
+ "mimic-response-2.0.0" = {
+ name = "mimic-response";
+ packageName = "mimic-response";
+ version = "2.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mimic-response/-/mimic-response-2.0.0.tgz";
+ sha512 = "8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ==";
+ };
+ };
"min-document-2.19.0" = {
name = "min-document";
packageName = "min-document";
@@ -26091,13 +26217,13 @@ let
sha512 = "oP88Dw3LK/pdrKyMdlbmg3W50969UNr4ctISzJfPl+YPYHTAOrS+dihXnsgRNKSRIzDsrnV3eE2CCVlZbpOKdQ==";
};
};
- "minipass-2.6.2" = {
+ "minipass-2.8.1" = {
name = "minipass";
packageName = "minipass";
- version = "2.6.2";
+ version = "2.8.1";
src = fetchurl {
- url = "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz";
- sha512 = "38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ==";
+ url = "https://registry.npmjs.org/minipass/-/minipass-2.8.1.tgz";
+ sha512 = "QCG523ParRcE2+9A6wYh9UI3uy2FFLw4DQaVYQrY5HPfszc5M6VDD+j0QCwHm19LI2imes4RB+NBD8cOJccyCg==";
};
};
"minitouch-prebuilt-1.2.0" = {
@@ -28121,13 +28247,13 @@ let
sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==";
};
};
- "normalize-url-4.3.0" = {
+ "normalize-url-4.4.1" = {
name = "normalize-url";
packageName = "normalize-url";
- version = "4.3.0";
+ version = "4.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.3.0.tgz";
- sha512 = "0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ==";
+ url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.4.1.tgz";
+ sha512 = "rjH3yRt0Ssx19mUwS0hrDUOdG9VI+oRLpLHJ7tXRdjcuQ7v7wo6qPvOZppHRrqfslTKr0L2yBhjj4UXd7c3cQg==";
};
};
"now-and-later-2.0.1" = {
@@ -28184,13 +28310,13 @@ let
sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67";
};
};
- "npm-lifecycle-3.1.3" = {
+ "npm-lifecycle-3.1.4" = {
name = "npm-lifecycle";
packageName = "npm-lifecycle";
- version = "3.1.3";
+ version = "3.1.4";
src = fetchurl {
- url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.3.tgz";
- sha512 = "M0QmmqbEHBXxDrmc6X3+eKjW9+F7Edg1ENau92WkYw1sox6wojHzEZJIRm1ItljEiaigZlKL8mXni/4ylAy1Dg==";
+ url = "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.4.tgz";
+ sha512 = "tgs1PaucZwkxECGKhC/stbEgFyc3TGh2TJcg2CDr6jbvQRdteHNhmMeljRzpe4wgFAXQADoy1cSqqi7mtiAa5A==";
};
};
"npm-package-arg-6.1.0" = {
@@ -29490,13 +29616,13 @@ let
sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==";
};
};
- "p-timeout-3.1.0" = {
+ "p-timeout-3.2.0" = {
name = "p-timeout";
packageName = "p-timeout";
- version = "3.1.0";
+ version = "3.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.1.0.tgz";
- sha512 = "C27DYI+tCroT8J8cTEyySGydl2B7FlxrGNF5/wmMbl1V+jeehUCzEE/BVgzRebdm2K3ZitKOKx8YbdFumDyYmw==";
+ url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz";
+ sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==";
};
};
"p-try-1.0.0" = {
@@ -29697,13 +29823,13 @@ let
sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751";
};
};
- "parse-asn1-5.1.4" = {
+ "parse-asn1-5.1.5" = {
name = "parse-asn1";
packageName = "parse-asn1";
- version = "5.1.4";
+ version = "5.1.5";
src = fetchurl {
- url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz";
- sha512 = "Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==";
+ url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz";
+ sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==";
};
};
"parse-english-4.1.2" = {
@@ -30210,6 +30336,15 @@ let
sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40";
};
};
+ "path-key-3.1.0" = {
+ name = "path-key";
+ packageName = "path-key";
+ version = "3.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz";
+ sha512 = "8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==";
+ };
+ };
"path-loader-1.0.10" = {
name = "path-loader";
packageName = "path-loader";
@@ -32722,13 +32857,13 @@ let
sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
};
};
- "qs-6.8.0" = {
+ "qs-6.9.0" = {
name = "qs";
packageName = "qs";
- version = "6.8.0";
+ version = "6.9.0";
src = fetchurl {
- url = "https://registry.npmjs.org/qs/-/qs-6.8.0.tgz";
- sha512 = "tPSkj8y92PfZVbinY1n84i1Qdx75lZjMQYx9WZhnkofyxzw2r7Ho39G3/aEvSUdebxpnnM4LZJCtvE/Aq3+s9w==";
+ url = "https://registry.npmjs.org/qs/-/qs-6.9.0.tgz";
+ sha512 = "27RP4UotQORTpmNQDX8BHPukOnBP3p1uUJY5UnDhaJB+rMt9iMsok724XL+UHU23bEFOHRMQ2ZhI99qOWUMGFA==";
};
};
"query-string-1.0.1" = {
@@ -35908,13 +36043,13 @@ let
sha512 = "lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==";
};
};
- "simple-get-3.0.3" = {
+ "simple-get-3.1.0" = {
name = "simple-get";
packageName = "simple-get";
- version = "3.0.3";
+ version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/simple-get/-/simple-get-3.0.3.tgz";
- sha512 = "Wvre/Jq5vgoz31Z9stYWPLn0PqRqmBDpFSdypAnHu5AvRVCYPRYGnvryNLiXu8GOBNDH82J2FRHUGMjjHUpXFw==";
+ url = "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz";
+ sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==";
};
};
"simple-git-1.126.0" = {
@@ -35944,13 +36079,13 @@ let
sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3";
};
};
- "simple-peer-9.5.0" = {
+ "simple-peer-9.6.0" = {
name = "simple-peer";
packageName = "simple-peer";
- version = "9.5.0";
+ version = "9.6.0";
src = fetchurl {
- url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.5.0.tgz";
- sha512 = "3tROq3nBo/CIZI8PWlXGbAxQIlQF6KQ/zcd4lQ2pAC4+rPiV7E721hI22nTO54uw/nzb2HKbvmDtZ4Wr173+vA==";
+ url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.6.0.tgz";
+ sha512 = "NYqSKPu75xhkZYKGJhCbLCG5kfBtDHf8U9ddk4EKFfYNU7XgIisov+V8wMbVVgyMCfn8pm8uOqQQmE50FPDFWA==";
};
};
"simple-sha1-2.1.2" = {
@@ -36241,13 +36376,13 @@ let
sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
};
};
- "snyk-1.227.0" = {
+ "snyk-1.228.3" = {
name = "snyk";
packageName = "snyk";
- version = "1.227.0";
+ version = "1.228.3";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk/-/snyk-1.227.0.tgz";
- sha512 = "ejfq2FIca+b/zu4hkJwFUob1Emn+s9wXYw5VHJSS6BjiniNi6dIa24AARG3BWiVsN/3NvzCYAkcqhYGaJ6xyVw==";
+ url = "https://registry.npmjs.org/snyk/-/snyk-1.228.3.tgz";
+ sha512 = "TwyJcMXBvic1xJ+rVLdIYS1xDYuzcogIXdmyvGvXBZgwIQdjOVMnZBVxUo5igkOIntBL2sCynZiydQtGbe08JA==";
};
};
"snyk-config-2.2.3" = {
@@ -36286,13 +36421,13 @@ let
sha512 = "9hsGgloioGuey5hbZfv+MkFEslxXHyzUlaAazcR0NsY7VLyG/b2g3f88f/ZwCwlWaKL9LMv/ERIiey3oWAB/qg==";
};
};
- "snyk-gradle-plugin-3.0.2" = {
+ "snyk-gradle-plugin-3.1.0" = {
name = "snyk-gradle-plugin";
packageName = "snyk-gradle-plugin";
- version = "3.0.2";
+ version = "3.1.0";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.0.2.tgz";
- sha512 = "9nyR03kHmePqBGaQiUeo3RD1YJ4qE5/V4tOmDQ8LNjHTQ54Xr8OXFC5xlJMV8FCtXrRXY0/WX8RMUPEUAm4c9g==";
+ url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.1.0.tgz";
+ sha512 = "789Rqyhv1+WYbfy1Qilgsw0FMccedSaCO5n+54CXXGVUZWMsVvqJj3T8k7+vis+9Eq+Sgbdzti8vDtApz6rWWQ==";
};
};
"snyk-module-1.9.1" = {
@@ -36439,6 +36574,15 @@ let
sha512 = "wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==";
};
};
+ "socket.io-2.3.0" = {
+ name = "socket.io";
+ packageName = "socket.io";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz";
+ sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==";
+ };
+ };
"socket.io-adapter-0.2.0" = {
name = "socket.io-adapter";
packageName = "socket.io-adapter";
@@ -36484,6 +36628,15 @@ let
sha512 = "56ZrkTDbdTLmBIyfFYesgOxsjcLnwAKoN4CiPyTVkMQj3zTUh0QAx3GbvIvLpFEOvQWu92yyWICxB0u7wkVbYA==";
};
};
+ "socket.io-client-2.3.0" = {
+ name = "socket.io-client";
+ packageName = "socket.io-client";
+ version = "2.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz";
+ sha512 = "cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==";
+ };
+ };
"socket.io-parser-2.1.2" = {
name = "socket.io-parser";
packageName = "socket.io-parser";
@@ -36520,6 +36673,15 @@ let
sha512 = "hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng==";
};
};
+ "socket.io-parser-3.4.0" = {
+ name = "socket.io-parser";
+ packageName = "socket.io-parser";
+ version = "3.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.0.tgz";
+ sha512 = "/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ==";
+ };
+ };
"socks-2.3.2" = {
name = "socks";
packageName = "socks";
@@ -39059,13 +39221,13 @@ let
sha512 = "FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==";
};
};
- "tar-4.4.10" = {
+ "tar-4.4.11" = {
name = "tar";
packageName = "tar";
- version = "4.4.10";
+ version = "4.4.11";
src = fetchurl {
- url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz";
- sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==";
+ url = "https://registry.npmjs.org/tar/-/tar-4.4.11.tgz";
+ sha512 = "iI4zh3ktLJKaDNZKZc+fUONiQrSn9HkCFzamtb7k8FFmVilHVob7QsLX/VySAW8lAviMzMbFw4QtFb4errwgYA==";
};
};
"tar-fs-2.0.0" = {
@@ -39581,13 +39743,13 @@ let
sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f";
};
};
- "timeout-refresh-1.0.0" = {
+ "timeout-refresh-1.0.1" = {
name = "timeout-refresh";
packageName = "timeout-refresh";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchurl {
- url = "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-1.0.0.tgz";
- sha512 = "y5ajDPPtyhumr7xRnQgOMMVR5/EXMCVHPwM7RWnMUZx9UzT8FGRBtwG4/rh2AWHkDr7JR8dBHU6NDGx7tEiEAg==";
+ url = "https://registry.npmjs.org/timeout-refresh/-/timeout-refresh-1.0.1.tgz";
+ sha512 = "bW5oSShdwFCN9K7RpB5dkq5bqNlGt8Lwbfxr8vprysk8hDiK5yy7Mgf2Qlz2ssE0gfQfoYhk4VLY9Hhsnr9Ulw==";
};
};
"timers-browserify-1.4.2" = {
@@ -40535,13 +40697,13 @@ let
sha512 = "/XrQjW0e5Z915m1A0qeXD9tSLDmz8zGjR6imhGDme6rMtXYudFpXXhaToKnM52nPPCNdCh6YQsLLkwbbkFvzVA==";
};
};
- "type-1.0.3" = {
+ "type-1.2.0" = {
name = "type";
packageName = "type";
- version = "1.0.3";
+ version = "1.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/type/-/type-1.0.3.tgz";
- sha512 = "51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg==";
+ url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz";
+ sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==";
};
};
"type-check-0.3.2" = {
@@ -42758,6 +42920,15 @@ let
sha512 = "IKIWTdUPBnOtwznIrhxKnjVZ7hYxEzwZ3M2xmDi7OjjexuOM6LnGtoo1Dv4wYSik4epK4STEib6e8da2GxUsJA==";
};
};
+ "vscode-languageserver-types-3.6.0" = {
+ name = "vscode-languageserver-types";
+ packageName = "vscode-languageserver-types";
+ version = "3.6.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.6.0.tgz";
+ sha512 = "GSgQtGmtza4PoNH0+iHWylWg/1sw2DODezqYWRxbN910dPchI3CQaSJN76csKcQGv55wsWgX82T6n74q8mFSpw==";
+ };
+ };
"vscode-nls-3.2.5" = {
name = "vscode-nls";
packageName = "vscode-nls";
@@ -43019,13 +43190,13 @@ let
sha512 = "5nIvteTDCUws2DVvP9Qe+JPla7kWPPIDFZv55To7IycHWZ+Z5qBdaBYPyuXWdhggTufZkQwfIK+5rKQTVovm2A==";
};
};
- "webpack-cli-3.3.8" = {
+ "webpack-cli-3.3.9" = {
name = "webpack-cli";
packageName = "webpack-cli";
- version = "3.3.8";
+ version = "3.3.9";
src = fetchurl {
- url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz";
- sha512 = "RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw==";
+ url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz";
+ sha512 = "xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==";
};
};
"webpack-core-0.6.9" = {
@@ -44592,17 +44763,17 @@ in
"@angular/cli" = nodeEnv.buildNodePackage {
name = "_at_angular_slash_cli";
packageName = "@angular/cli";
- version = "8.3.4";
+ version = "8.3.5";
src = fetchurl {
- url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.4.tgz";
- sha512 = "5Jp7a1/Yepm2JkrMHY2Q7nO1FxlNvGp1Zc3m9dp4ydH08qO6/Z8WO0HF+/BxAsHZzB+XV91E1ZzbLR0RdsM8ag==";
+ url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.5.tgz";
+ sha512 = "gKzYV5YhypXKpt4vH/YJ/T7a72EqxTJynJ8dtoVsZw5YTdCzqa6APvObNs4lZaZ3pYxUOQr36W4Rz8Lv8CSBWA==";
};
dependencies = [
- sources."@angular-devkit/architect-0.803.4"
- sources."@angular-devkit/core-8.3.4"
- sources."@angular-devkit/schematics-8.3.4"
- sources."@schematics/angular-8.3.4"
- sources."@schematics/update-0.803.4"
+ sources."@angular-devkit/architect-0.803.5"
+ sources."@angular-devkit/core-8.3.5"
+ sources."@angular-devkit/schematics-8.3.5"
+ sources."@schematics/angular-8.3.5"
+ sources."@schematics/update-0.803.5"
sources."@yarnpkg/lockfile-1.1.0"
sources."JSONStream-1.3.5"
sources."agent-base-4.3.0"
@@ -44734,7 +44905,7 @@ in
sources."mimic-fn-2.1.0"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
- sources."minipass-2.6.2"
+ sources."minipass-2.8.1"
sources."minizlib-1.2.2"
sources."mississippi-3.0.0"
sources."mkdirp-0.5.1"
@@ -44846,7 +45017,7 @@ in
sources."strip-ansi-5.2.0"
sources."supports-color-5.5.0"
sources."symbol-observable-1.2.0"
- sources."tar-4.4.10"
+ sources."tar-4.4.11"
sources."through-2.3.8"
sources."through2-2.0.5"
sources."tmp-0.0.33"
@@ -44980,7 +45151,11 @@ in
sources."clean-git-ref-1.0.3"
sources."clone-2.1.2"
sources."clone-buffer-1.0.0"
- sources."clone-response-1.0.2"
+ (sources."clone-response-1.0.2" // {
+ dependencies = [
+ sources."mimic-response-1.0.1"
+ ];
+ })
sources."clone-stats-1.0.0"
(sources."cloneable-readable-1.1.3" // {
dependencies = [
@@ -45000,7 +45175,7 @@ in
sources."core-util-is-1.0.2"
sources."crc-32-1.2.0"
sources."decamelize-1.2.0"
- sources."decompress-response-3.3.0"
+ sources."decompress-response-4.2.1"
sources."deep-freeze-node-1.1.3"
sources."defer-to-connect-1.0.2"
sources."define-properties-1.1.3"
@@ -45059,7 +45234,12 @@ in
})
sources."globalyzer-0.1.4"
sources."globrex-0.1.2"
- sources."got-9.6.0"
+ (sources."got-9.6.0" // {
+ dependencies = [
+ sources."decompress-response-3.3.0"
+ sources."mimic-response-1.0.1"
+ ];
+ })
sources."graceful-fs-4.2.2"
(sources."gulp-vinyl-zip-2.1.2" // {
dependencies = [
@@ -45069,7 +45249,7 @@ in
sources."through2-2.0.5"
];
})
- sources."handlebars-4.2.0"
+ sources."handlebars-4.2.1"
sources."has-symbols-1.0.0"
sources."http-cache-semantics-4.0.3"
sources."ignore-5.1.4"
@@ -45110,7 +45290,7 @@ in
sources."matcher-2.0.0"
sources."mime-db-1.40.0"
sources."mime-types-2.1.24"
- sources."mimic-response-1.0.1"
+ sources."mimic-response-2.0.0"
sources."minimatch-3.0.4"
sources."minimatch-all-1.1.0"
sources."minimist-1.2.0"
@@ -45120,7 +45300,7 @@ in
sources."neo-async-2.6.1"
sources."nick-0.1.3"
sources."normalize-path-2.1.1"
- sources."normalize-url-4.3.0"
+ sources."normalize-url-4.4.1"
sources."now-and-later-2.0.1"
sources."object-keys-1.1.1"
sources."object.assign-4.1.0"
@@ -45179,7 +45359,7 @@ in
sources."safe-buffer-5.2.0"
sources."sha.js-2.4.11"
sources."simple-concat-1.0.0"
- sources."simple-get-3.0.3"
+ sources."simple-get-3.1.0"
sources."source-map-0.6.1"
sources."split-0.3.3"
sources."split2-3.1.1"
@@ -45347,11 +45527,11 @@ in
sources."@babel/template-7.6.0"
sources."@babel/traverse-7.6.0"
sources."@babel/types-7.6.1"
- sources."@hapi/address-2.1.1"
+ sources."@hapi/address-2.1.2"
sources."@hapi/bourne-1.3.2"
sources."@hapi/hoek-8.2.4"
sources."@hapi/joi-15.1.1"
- sources."@hapi/topo-3.1.3"
+ sources."@hapi/topo-3.1.4"
sources."@mrmlnc/readdir-enhanced-2.2.1"
sources."@nodelib/fs.stat-1.1.3"
sources."@protobufjs/aspromise-1.1.2"
@@ -45531,7 +45711,7 @@ in
sources."collection-visit-1.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colors-1.3.3"
+ sources."colors-1.4.0"
sources."combined-stream-1.0.8"
sources."commander-2.20.0"
sources."commondir-1.0.1"
@@ -45618,7 +45798,7 @@ in
sources."ecc-jsbn-0.1.2"
sources."ee-first-1.1.1"
sources."ejs-2.7.1"
- sources."electron-to-chromium-1.3.260"
+ sources."electron-to-chromium-1.3.264"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.1"
sources."entities-1.1.2"
@@ -45699,7 +45879,7 @@ in
})
sources."find-up-3.0.0"
sources."fkill-6.2.0"
- sources."flow-parser-0.107.0"
+ sources."flow-parser-0.108.0"
sources."for-in-1.0.2"
sources."forever-agent-0.6.1"
sources."form-data-2.3.3"
@@ -45741,7 +45921,7 @@ in
sources."got-6.7.1"
sources."graceful-fs-4.2.2"
sources."graceful-readlink-1.0.1"
- sources."graphql-14.5.6"
+ sources."graphql-14.5.7"
(sources."graphql-anywhere-4.2.4" // {
dependencies = [
sources."ts-invariant-0.3.3"
@@ -46583,7 +46763,7 @@ in
sources."chmodr-1.2.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colors-1.3.3"
+ sources."colors-1.4.0"
sources."commander-2.20.0"
sources."concat-map-0.0.1"
sources."convert-source-map-1.6.0"
@@ -47142,7 +47322,7 @@ in
sources."agent-base-4.3.0"
sources."ansi-styles-3.2.1"
sources."balanced-match-1.0.0"
- sources."big-integer-1.6.44"
+ sources."big-integer-1.6.45"
sources."binary-0.3.0"
sources."bluebird-3.4.7"
sources."brace-expansion-1.1.11"
@@ -47253,7 +47433,7 @@ in
sources."whatwg-url-7.0.0"
];
})
- sources."decompress-response-3.3.0"
+ sources."decompress-response-4.2.1"
sources."deep-extend-0.6.0"
sources."deep-is-0.1.3"
sources."delayed-stream-1.0.0"
@@ -47305,7 +47485,7 @@ in
sources."lodash.sortby-4.7.0"
sources."mime-db-1.40.0"
sources."mime-types-2.1.24"
- sources."mimic-response-1.0.1"
+ sources."mimic-response-2.0.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.0"
(sources."mkdirp-0.5.1" // {
@@ -47351,7 +47531,7 @@ in
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.2"
sources."simple-concat-1.0.0"
- sources."simple-get-3.0.3"
+ sources."simple-get-3.1.0"
sources."source-map-0.6.1"
sources."sshpk-1.16.1"
sources."stealthy-require-1.1.1"
@@ -47672,7 +47852,7 @@ in
sources."os-browserify-0.3.0"
sources."pako-1.0.10"
sources."parents-1.0.1"
- sources."parse-asn1-5.1.4"
+ sources."parse-asn1-5.1.5"
sources."path-browserify-0.0.1"
sources."path-is-absolute-1.0.1"
sources."path-parse-1.0.6"
@@ -48246,7 +48426,7 @@ in
sources."code-point-at-1.1.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colors-1.3.3"
+ sources."colors-1.4.0"
sources."commander-2.20.0"
sources."debug-3.2.6"
sources."escape-string-regexp-1.0.5"
@@ -48293,7 +48473,7 @@ in
sources."color-name-1.1.3"
sources."color-string-1.5.3"
sources."colornames-1.1.1"
- sources."colors-1.3.3"
+ sources."colors-1.4.0"
sources."colorspace-1.1.2"
sources."commander-2.19.0"
sources."core-util-is-1.0.2"
@@ -48395,7 +48575,7 @@ in
})
sources."base64-js-1.3.1"
sources."bcrypt-pbkdf-1.0.2"
- sources."big-integer-1.6.44"
+ sources."big-integer-1.6.45"
(sources."body-parser-1.19.0" // {
dependencies = [
sources."bytes-3.1.0"
@@ -49407,7 +49587,7 @@ in
sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1"
sources."pseudomap-1.0.2"
- sources."qs-6.8.0"
+ sources."qs-6.9.0"
sources."quicktask-1.1.0"
sources."raf-3.3.2"
sources."readable-stream-2.3.6"
@@ -49437,7 +49617,7 @@ in
sources."symbol-observable-1.2.0"
sources."through-2.3.8"
sources."tmp-0.0.33"
- sources."type-1.0.3"
+ sources."type-1.2.0"
sources."util-deprecate-1.0.2"
(sources."variable-diff-1.1.0" // {
dependencies = [
@@ -49461,10 +49641,10 @@ in
create-react-app = nodeEnv.buildNodePackage {
name = "create-react-app";
packageName = "create-react-app";
- version = "3.1.1";
+ version = "3.1.2";
src = fetchurl {
- url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.1.1.tgz";
- sha512 = "EaK59gIwEsSZjjIN4MyG0DkXcatF3cEXYODIH7rDrlUremb7iwi5RzZGGISmPIrfywLC82Qom/8CXiT8hwixPQ==";
+ url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.1.2.tgz";
+ sha512 = "y5wgEQwt6IpUP1N64uorVavhp8NPUAamVqA/paZmpvPSrW3l2c5UhXRi5m61plBBzDde2WyDr+3vCwDsfaS03w==";
};
dependencies = [
sources."ansi-escapes-3.2.0"
@@ -49761,7 +49941,7 @@ in
sources."collection-visit-1.0.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colors-1.3.3"
+ sources."colors-1.4.0"
sources."combined-stream-1.0.8"
sources."component-emitter-1.3.0"
sources."concat-map-0.0.1"
@@ -49796,7 +49976,7 @@ in
sources."dat-swarm-defaults-1.0.2"
sources."debug-4.1.1"
sources."decode-uri-component-0.2.0"
- sources."decompress-response-3.3.0"
+ sources."decompress-response-4.2.1"
sources."deep-equal-0.2.2"
sources."deep-extend-0.6.0"
sources."define-properties-1.1.3"
@@ -50006,7 +50186,7 @@ in
sources."mime-2.4.4"
sources."mime-db-1.40.0"
sources."mime-types-2.1.24"
- sources."mimic-response-1.0.1"
+ sources."mimic-response-2.0.0"
sources."min-document-2.19.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.0"
@@ -50139,7 +50319,7 @@ in
];
})
sources."simple-concat-1.0.0"
- sources."simple-get-3.0.3"
+ sources."simple-get-3.1.0"
sources."simple-sha1-2.1.2"
sources."siphash24-1.1.1"
sources."slice-ansi-1.0.0"
@@ -50234,7 +50414,7 @@ in
sources."throttle-1.0.3"
sources."thunky-1.0.3"
sources."timed-out-4.0.1"
- sources."timeout-refresh-1.0.0"
+ sources."timeout-refresh-1.0.1"
sources."to-buffer-1.1.1"
(sources."to-object-path-0.3.0" // {
dependencies = [
@@ -50491,13 +50671,54 @@ in
bypassCache = true;
reconstructLock = true;
};
+ dockerfile-language-server-nodejs = nodeEnv.buildNodePackage {
+ name = "dockerfile-language-server-nodejs";
+ packageName = "dockerfile-language-server-nodejs";
+ version = "0.0.21";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.21.tgz";
+ sha512 = "lZ7VFAlS4vTm5MvxmwpREcYMARB3RQaGX0OZdcY8oSytsu4i5mMGVa6mi9/pZ9soqcUC08uxEA8EcqIeL3lyAA==";
+ };
+ dependencies = [
+ sources."dockerfile-ast-0.0.16"
+ (sources."dockerfile-language-service-0.0.8" // {
+ dependencies = [
+ (sources."dockerfile-utils-0.0.13" // {
+ dependencies = [
+ sources."vscode-languageserver-types-3.6.0"
+ ];
+ })
+ ];
+ })
+ (sources."dockerfile-utils-0.0.11" // {
+ dependencies = [
+ sources."dockerfile-ast-0.0.12"
+ sources."vscode-languageserver-types-3.6.0"
+ ];
+ })
+ sources."vscode-jsonrpc-4.0.0"
+ sources."vscode-languageserver-5.2.1"
+ sources."vscode-languageserver-protocol-3.14.1"
+ sources."vscode-languageserver-types-3.14.0"
+ sources."vscode-uri-1.0.8"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "A language server for Dockerfiles powered by NodeJS, TypeScript, and VSCode technologies.";
+ homepage = "https://github.com/rcjsuen/dockerfile-language-server-nodejs#readme";
+ license = "MIT";
+ };
+ production = true;
+ bypassCache = true;
+ reconstructLock = true;
+ };
elasticdump = nodeEnv.buildNodePackage {
name = "elasticdump";
packageName = "elasticdump";
- version = "6.9.1";
+ version = "6.10.6";
src = fetchurl {
- url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.9.1.tgz";
- sha512 = "5nnktnPlrlJIMDlkgWrS64LUdT7VpPo5WgC1o2CMYSV7Bb0lxga6HotsEAMsiddwVT2wJg7tmAZQd6/Lz+N5Hg==";
+ url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.10.6.tgz";
+ sha512 = "Zjrmui3KS2Fem8OyVNoN1pWOCvULJP88rl1RdnBA/lkBx7u15G0B7FIlzOwX7sjBuJcqb9G5K9FuJXPU3MEqZg==";
};
dependencies = [
sources."JSONStream-1.3.5"
@@ -50506,7 +50727,7 @@ in
sources."assert-plus-1.0.0"
sources."async-2.6.3"
sources."asynckit-0.4.0"
- sources."aws-sdk-2.529.0"
+ sources."aws-sdk-2.533.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.8.0"
sources."base64-js-1.3.1"
@@ -50534,7 +50755,7 @@ in
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
sources."http-signature-1.2.0"
- sources."ieee754-1.1.8"
+ sources."ieee754-1.1.13"
sources."inherits-2.0.4"
sources."ini-1.3.5"
(sources."ip-address-6.1.0" // {
@@ -50561,7 +50782,7 @@ in
sources."optimist-0.6.1"
sources."p-finally-1.0.0"
sources."p-queue-6.1.1"
- sources."p-timeout-3.1.0"
+ sources."p-timeout-3.2.0"
sources."performance-now-2.1.0"
sources."process-nextick-args-2.0.1"
sources."psl-1.4.0"
@@ -50678,7 +50899,7 @@ in
sources."fresh-0.5.2"
sources."fsevents-2.0.7"
sources."get-stream-4.1.0"
- sources."glob-parent-5.0.0"
+ sources."glob-parent-5.1.0"
sources."has-ansi-2.0.0"
sources."http-errors-1.7.3"
sources."http-proxy-1.17.0"
@@ -51085,7 +51306,7 @@ in
sources."fs.realpath-1.0.0"
sources."functional-red-black-tree-1.0.1"
sources."glob-7.1.4"
- sources."glob-parent-5.0.0"
+ sources."glob-parent-5.1.0"
sources."globals-11.12.0"
sources."has-flag-3.0.0"
sources."iconv-lite-0.4.24"
@@ -51237,7 +51458,7 @@ in
sources."fs.realpath-1.0.0"
sources."functional-red-black-tree-1.0.1"
sources."glob-7.1.4"
- sources."glob-parent-5.0.0"
+ sources."glob-parent-5.1.0"
sources."globals-11.12.0"
sources."has-flag-3.0.0"
sources."iconv-lite-0.4.24"
@@ -51962,7 +52183,7 @@ in
sources."preserve-0.2.0"
(sources."prettyjson-1.2.1" // {
dependencies = [
- sources."colors-1.3.3"
+ sources."colors-1.4.0"
sources."minimist-1.2.0"
];
})
@@ -52606,7 +52827,7 @@ in
sources."ms-2.1.2"
];
})
- sources."graphql-14.5.6"
+ sources."graphql-14.5.7"
(sources."graphql-cli-prepare-1.4.19" // {
dependencies = [
sources."chalk-2.3.1"
@@ -52756,7 +52977,7 @@ in
sources."mimic-fn-1.2.0"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
- (sources."minipass-2.6.2" // {
+ (sources."minipass-2.8.1" // {
dependencies = [
sources."yallist-3.0.3"
];
@@ -52924,7 +53145,7 @@ in
sources."supports-color-5.5.0"
sources."swap-case-1.1.2"
sources."sync-exec-0.6.2"
- (sources."tar-4.4.10" // {
+ (sources."tar-4.4.11" // {
dependencies = [
sources."yallist-3.0.3"
];
@@ -53298,7 +53519,7 @@ in
sources."ansi-term-0.0.2"
sources."ansicolors-0.2.1"
sources."blessed-0.1.81"
- sources."blessed-contrib-4.8.16"
+ sources."blessed-contrib-4.8.17"
sources."bresenham-0.0.3"
sources."buffers-0.1.1"
sources."cardinal-1.0.0"
@@ -53335,7 +53556,7 @@ in
sources."lodash.assign-4.2.0"
sources."lodash.toarray-4.4.0"
sources."map-canvas-0.1.5"
- sources."marked-0.6.3"
+ sources."marked-0.7.0"
sources."marked-terminal-1.7.0"
sources."memory-streams-0.1.3"
sources."memorystream-0.3.1"
@@ -53781,7 +54002,7 @@ in
sources."to-regex-3.0.2"
sources."to-regex-range-2.1.1"
sources."to-through-2.0.0"
- sources."type-1.0.3"
+ sources."type-1.2.0"
sources."typedarray-0.0.6"
sources."unc-path-regex-0.1.2"
sources."undertaker-1.2.1"
@@ -54131,7 +54352,7 @@ in
})
sources."to-regex-3.0.2"
sources."to-regex-range-2.1.1"
- sources."type-1.0.3"
+ sources."type-1.2.0"
sources."typedarray-0.0.6"
sources."unc-path-regex-0.1.2"
sources."union-value-1.0.1"
@@ -54334,10 +54555,10 @@ in
sources."corser-2.0.1"
sources."debug-3.2.6"
sources."ecstatic-3.3.2"
- sources."eventemitter3-3.1.2"
+ sources."eventemitter3-4.0.0"
sources."follow-redirects-1.9.0"
sources."he-1.2.0"
- sources."http-proxy-1.17.0"
+ sources."http-proxy-1.18.0"
sources."mime-1.6.0"
sources."minimist-1.2.0"
(sources."mkdirp-0.5.1" // {
@@ -54525,26 +54746,26 @@ in
ionic = nodeEnv.buildNodePackage {
name = "ionic";
packageName = "ionic";
- version = "5.2.8";
+ version = "5.4.1";
src = fetchurl {
- url = "https://registry.npmjs.org/ionic/-/ionic-5.2.8.tgz";
- sha512 = "BeUquVJKI5CEqfyt1YlibDyvf/CyiXwg2957/vm6xkxp4At8D9tKJ3Ldb5e74SEgon5u1+mbcGNjDYB/OtTHgQ==";
+ url = "https://registry.npmjs.org/ionic/-/ionic-5.4.1.tgz";
+ sha512 = "z4Zdb1lEZoqx6HsURVgdqGw0INtDeNrbahTZacrqm3cNmjq6X4SOP+dILIeZoURq/V0KcyVcVQnssWRFbVd8TQ==";
};
dependencies = [
- sources."@ionic/cli-framework-2.1.6"
- sources."@ionic/discover-2.0.5"
- sources."@ionic/utils-array-1.2.0"
- sources."@ionic/utils-fs-2.0.6"
- sources."@ionic/utils-network-1.0.4"
- sources."@ionic/utils-object-1.0.4"
- sources."@ionic/utils-process-1.0.4"
- sources."@ionic/utils-stream-2.0.3"
- sources."@ionic/utils-subprocess-1.0.7"
- sources."@ionic/utils-terminal-1.0.4"
+ sources."@ionic/cli-framework-2.1.7"
+ sources."@ionic/discover-2.0.6"
+ sources."@ionic/utils-array-1.2.1"
+ sources."@ionic/utils-fs-2.0.7"
+ sources."@ionic/utils-network-1.0.5"
+ sources."@ionic/utils-object-1.0.5"
+ sources."@ionic/utils-process-1.0.5"
+ sources."@ionic/utils-stream-2.0.4"
+ sources."@ionic/utils-subprocess-1.0.8"
+ sources."@ionic/utils-terminal-1.0.5"
sources."@types/node-8.10.54"
sources."agent-base-4.3.0"
- sources."ansi-escapes-3.2.0"
- sources."ansi-regex-3.0.0"
+ sources."ansi-escapes-4.2.1"
+ sources."ansi-regex-4.1.0"
sources."ansi-styles-3.2.1"
sources."ast-types-0.13.2"
sources."astral-regex-1.0.0"
@@ -54556,7 +54777,7 @@ in
sources."chalk-2.4.2"
sources."chardet-0.7.0"
sources."chownr-1.1.2"
- sources."cli-cursor-2.1.0"
+ sources."cli-cursor-3.1.0"
sources."cli-width-2.2.0"
sources."co-4.6.0"
sources."color-convert-1.9.3"
@@ -54566,11 +54787,7 @@ in
sources."concat-map-0.0.1"
sources."cookiejar-2.1.2"
sources."core-util-is-1.0.2"
- (sources."cross-spawn-6.0.5" // {
- dependencies = [
- sources."semver-5.7.1"
- ];
- })
+ sources."cross-spawn-7.0.0"
sources."data-uri-to-buffer-2.0.1"
sources."debug-4.1.1"
sources."deep-is-0.1.3"
@@ -54595,11 +54812,17 @@ in
sources."esprima-3.1.3"
sources."estraverse-4.3.0"
sources."esutils-2.0.3"
- sources."execa-1.0.0"
+ (sources."execa-1.0.0" // {
+ dependencies = [
+ sources."cross-spawn-6.0.5"
+ sources."path-key-2.0.1"
+ sources."semver-5.7.1"
+ ];
+ })
sources."extend-3.0.2"
sources."external-editor-3.1.0"
sources."fast-levenshtein-2.0.6"
- sources."figures-2.0.0"
+ sources."figures-3.0.0"
sources."file-uri-to-path-1.0.0"
sources."form-data-2.5.1"
sources."formidable-1.2.1"
@@ -54634,15 +54857,7 @@ in
sources."imurmurhash-0.1.4"
sources."inflight-1.0.6"
sources."inherits-2.0.4"
- (sources."inquirer-6.5.2" // {
- dependencies = [
- (sources."string-width-2.1.1" // {
- dependencies = [
- sources."strip-ansi-4.0.0"
- ];
- })
- ];
- })
+ sources."inquirer-7.0.0"
sources."ip-1.1.5"
sources."is-fullwidth-code-point-2.0.0"
sources."is-promise-2.1.0"
@@ -54673,6 +54888,11 @@ in
sources."lodash.restparam-3.6.1"
(sources."log-update-3.3.0" // {
dependencies = [
+ sources."ansi-escapes-3.2.0"
+ sources."cli-cursor-2.1.0"
+ sources."mimic-fn-1.2.0"
+ sources."onetime-2.0.1"
+ sources."restore-cursor-2.0.0"
sources."string-width-3.1.0"
sources."wrap-ansi-5.1.0"
];
@@ -54683,10 +54903,10 @@ in
sources."mime-2.4.4"
sources."mime-db-1.40.0"
sources."mime-types-2.1.24"
- sources."mimic-fn-1.2.0"
+ sources."mimic-fn-2.1.0"
sources."minimatch-3.0.4"
sources."minimist-1.2.0"
- (sources."minipass-2.6.2" // {
+ (sources."minipass-2.8.1" // {
dependencies = [
sources."yallist-3.0.3"
];
@@ -54698,12 +54918,16 @@ in
];
})
sources."ms-2.1.2"
- sources."mute-stream-0.0.7"
+ sources."mute-stream-0.0.8"
sources."netmask-1.0.6"
sources."nice-try-1.0.5"
- sources."npm-run-path-2.0.2"
+ (sources."npm-run-path-2.0.2" // {
+ dependencies = [
+ sources."path-key-2.0.1"
+ ];
+ })
sources."once-1.4.0"
- sources."onetime-2.0.1"
+ sources."onetime-5.1.0"
sources."open-6.4.0"
sources."optionator-0.8.2"
sources."os-name-3.1.0"
@@ -54716,7 +54940,7 @@ in
})
sources."pac-resolver-3.0.0"
sources."path-is-absolute-1.0.1"
- sources."path-key-2.0.1"
+ sources."path-key-3.1.0"
sources."prelude-ls-1.1.2"
sources."process-nextick-args-2.0.1"
(sources."proxy-agent-3.1.0" // {
@@ -54727,10 +54951,10 @@ in
sources."proxy-from-env-1.0.0"
sources."pseudomap-1.0.2"
sources."pump-3.0.0"
- sources."qs-6.8.0"
+ sources."qs-6.9.0"
sources."raw-body-2.4.1"
sources."readable-stream-3.4.0"
- sources."restore-cursor-2.0.0"
+ sources."restore-cursor-3.1.0"
sources."rimraf-3.0.0"
sources."rsvp-3.6.2"
sources."run-async-2.3.0"
@@ -54769,11 +54993,7 @@ in
];
})
sources."string_decoder-1.3.0"
- (sources."strip-ansi-5.2.0" // {
- dependencies = [
- sources."ansi-regex-4.1.0"
- ];
- })
+ sources."strip-ansi-5.2.0"
sources."strip-eof-1.0.0"
sources."superagent-4.1.0"
(sources."superagent-proxy-2.0.0" // {
@@ -54782,7 +55002,7 @@ in
];
})
sources."supports-color-5.5.0"
- (sources."tar-4.4.10" // {
+ (sources."tar-4.4.11" // {
dependencies = [
sources."yallist-3.0.3"
];
@@ -54795,6 +55015,7 @@ in
sources."tree-kill-1.2.1"
sources."tslib-1.10.0"
sources."type-check-0.3.2"
+ sources."type-fest-0.5.2"
sources."typedarray-to-buffer-3.1.5"
sources."universalify-0.1.2"
sources."unpipe-1.0.0"
@@ -55056,7 +55277,7 @@ in
})
sources."debug-3.2.6"
sources."decode-uri-component-0.2.0"
- sources."decompress-response-3.3.0"
+ sources."decompress-response-4.2.1"
sources."deep-extend-0.6.0"
sources."deep-is-0.1.3"
sources."deepmerge-2.2.1"
@@ -55229,10 +55450,10 @@ in
sources."mime-2.4.4"
sources."mime-db-1.40.0"
sources."mime-types-2.1.24"
- sources."mimic-response-1.0.1"
+ sources."mimic-response-2.0.0"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
- sources."minipass-2.6.2"
+ sources."minipass-2.8.1"
sources."minizlib-1.2.2"
sources."mkdirp-0.5.1"
sources."moment-2.24.0"
@@ -55348,7 +55569,7 @@ in
sources."sharp-0.22.1"
sources."signal-exit-3.0.2"
sources."simple-concat-1.0.0"
- sources."simple-get-3.0.3"
+ sources."simple-get-3.1.0"
sources."simple-swizzle-0.2.2"
(sources."slice-ansi-1.0.0" // {
dependencies = [
@@ -55392,7 +55613,7 @@ in
sources."symbol-tree-3.2.4"
sources."syswide-cas-5.3.0"
sources."table-layout-0.4.5"
- sources."tar-4.4.10"
+ sources."tar-4.4.11"
sources."tar-fs-2.0.0"
(sources."tar-stream-2.1.0" // {
dependencies = [
@@ -55721,7 +55942,7 @@ in
sources."path-loader-1.0.10"
sources."process-nextick-args-2.0.1"
sources."punycode-2.1.1"
- sources."qs-6.8.0"
+ sources."qs-6.9.0"
sources."readable-stream-2.3.6"
sources."safe-buffer-5.1.2"
sources."slash-2.0.0"
@@ -55907,7 +56128,7 @@ in
sources."ms-2.0.0"
sources."nanoid-2.1.1"
sources."negotiator-0.6.2"
- sources."normalize-url-4.3.0"
+ sources."normalize-url-4.4.1"
sources."npm-run-path-2.0.2"
sources."oauth-sign-0.9.0"
sources."object-assign-4.1.1"
@@ -56084,8 +56305,8 @@ in
sources."buffer-fill-1.0.0"
sources."bytes-3.1.0"
sources."callsite-1.0.0"
- sources."chokidar-3.1.0"
- sources."colors-1.3.3"
+ sources."chokidar-3.1.1"
+ sources."colors-1.4.0"
sources."component-bind-1.0.0"
sources."component-emitter-1.2.1"
sources."component-inherit-0.0.3"
@@ -56115,7 +56336,7 @@ in
sources."engine.io-parser-2.1.3"
sources."ent-2.2.0"
sources."escape-html-1.0.3"
- sources."eventemitter3-3.1.2"
+ sources."eventemitter3-4.0.0"
sources."extend-3.0.2"
sources."fill-range-7.0.1"
sources."finalhandler-1.1.2"
@@ -56130,12 +56351,12 @@ in
sources."fs.realpath-1.0.0"
sources."fsevents-2.0.7"
sources."glob-7.1.4"
- sources."glob-parent-5.0.0"
+ sources."glob-parent-5.1.0"
sources."graceful-fs-4.2.2"
sources."has-binary2-1.0.3"
sources."has-cors-1.1.0"
sources."http-errors-1.7.2"
- sources."http-proxy-1.17.0"
+ sources."http-proxy-1.18.0"
sources."iconv-lite-0.4.24"
sources."indexof-0.0.1"
sources."inflight-1.0.6"
@@ -56372,7 +56593,7 @@ in
sources."code-point-at-1.1.0"
sources."color-convert-1.9.3"
sources."color-name-1.1.3"
- sources."colors-1.3.3"
+ sources."colors-1.4.0"
sources."combined-stream-1.0.8"
sources."concat-map-0.0.1"
sources."core-util-is-1.0.2"
@@ -56709,7 +56930,7 @@ in
];
})
sources."@octokit/request-error-1.0.4"
- sources."@octokit/rest-16.28.9"
+ sources."@octokit/rest-16.30.0"
sources."@types/events-3.0.0"
sources."@types/glob-7.1.1"
sources."@types/minimatch-3.0.3"
@@ -57014,7 +57235,7 @@ in
sources."git-url-parse-11.1.2"
sources."gitconfiglocal-1.0.0"
sources."glob-7.1.4"
- sources."glob-parent-5.0.0"
+ sources."glob-parent-5.1.0"
sources."glob-to-regexp-0.3.0"
(sources."globby-9.2.0" // {
dependencies = [
@@ -57022,7 +57243,7 @@ in
];
})
sources."graceful-fs-4.2.2"
- (sources."handlebars-4.2.0" // {
+ (sources."handlebars-4.2.1" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -57163,7 +57384,7 @@ in
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
sources."minimist-options-3.0.2"
- sources."minipass-2.6.2"
+ sources."minipass-2.8.1"
sources."minizlib-1.2.2"
sources."mississippi-3.0.0"
(sources."mixin-deep-1.3.2" // {
@@ -57197,7 +57418,7 @@ in
})
sources."normalize-url-3.3.0"
sources."npm-bundled-1.0.6"
- sources."npm-lifecycle-3.1.3"
+ sources."npm-lifecycle-3.1.4"
(sources."npm-package-arg-6.1.1" // {
dependencies = [
sources."semver-5.7.1"
@@ -57448,7 +57669,7 @@ in
];
})
sources."supports-color-5.5.0"
- sources."tar-4.4.10"
+ sources."tar-4.4.11"
sources."temp-dir-1.0.0"
sources."temp-write-3.4.0"
sources."text-extensions-2.0.0"
@@ -57717,7 +57938,7 @@ in
];
})
sources."collection-visit-1.0.0"
- sources."colors-1.3.3"
+ sources."colors-1.4.0"
sources."component-emitter-1.3.0"
sources."connect-3.7.0"
sources."copy-descriptor-0.1.1"
@@ -58018,7 +58239,7 @@ in
];
})
sources."base64-arraybuffer-0.1.5"
- sources."base64id-1.0.0"
+ sources."base64id-2.0.0"
sources."bcrypt-pbkdf-1.0.2"
sources."better-assert-1.0.2"
sources."binary-extensions-1.13.1"
@@ -58078,19 +58299,22 @@ in
sources."ee-first-1.1.1"
sources."emoji-regex-6.1.1"
sources."encodeurl-1.0.2"
- (sources."engine.io-3.3.2" // {
+ (sources."engine.io-3.4.0" // {
dependencies = [
sources."cookie-0.3.1"
- sources."debug-3.1.0"
+ sources."debug-4.1.1"
+ sources."ms-2.1.2"
];
})
- (sources."engine.io-client-3.3.2" // {
+ (sources."engine.io-client-3.4.0" // {
dependencies = [
sources."component-emitter-1.2.1"
- sources."debug-3.1.0"
+ sources."debug-4.1.1"
+ sources."ms-2.1.2"
+ sources."ws-6.1.4"
];
})
- sources."engine.io-parser-2.1.3"
+ sources."engine.io-parser-2.2.0"
sources."entities-1.1.2"
sources."escape-html-1.0.3"
sources."etag-1.8.1"
@@ -58384,24 +58608,33 @@ in
];
})
sources."snapdragon-util-3.0.1"
- (sources."socket.io-2.2.0" // {
+ (sources."socket.io-2.3.0" // {
dependencies = [
sources."debug-4.1.1"
sources."ms-2.1.2"
];
})
sources."socket.io-adapter-1.1.1"
- (sources."socket.io-client-2.2.0" // {
+ (sources."socket.io-client-2.3.0" // {
dependencies = [
sources."component-emitter-1.2.1"
- sources."debug-3.1.0"
+ sources."debug-4.1.1"
+ sources."isarray-2.0.1"
+ sources."ms-2.1.2"
+ (sources."socket.io-parser-3.3.0" // {
+ dependencies = [
+ sources."debug-3.1.0"
+ sources."ms-2.0.0"
+ ];
+ })
];
})
- (sources."socket.io-parser-3.3.0" // {
+ (sources."socket.io-parser-3.4.0" // {
dependencies = [
sources."component-emitter-1.2.1"
- sources."debug-3.1.0"
+ sources."debug-4.1.1"
sources."isarray-2.0.1"
+ sources."ms-2.1.2"
];
})
sources."source-map-0.5.7"
@@ -58468,7 +58701,7 @@ in
sources."uuid-3.3.3"
sources."vary-1.1.2"
sources."verror-1.10.0"
- sources."ws-6.1.4"
+ sources."ws-7.1.2"
sources."xmlhttprequest-ssl-1.5.5"
sources."yeast-0.1.2"
];
@@ -58949,7 +59182,7 @@ in
})
sources."duplexer3-0.1.4"
sources."duplexify-3.7.1"
- sources."electron-to-chromium-1.3.260"
+ sources."electron-to-chromium-1.3.264"
sources."elliptic-6.5.1"
sources."emoji-regex-7.0.3"
sources."emojis-list-2.1.0"
@@ -59140,7 +59373,7 @@ in
})
sources."get-stream-4.1.0"
sources."http-cache-semantics-4.0.3"
- sources."normalize-url-4.3.0"
+ sources."normalize-url-4.4.1"
sources."p-cancelable-1.1.0"
];
})
@@ -59386,7 +59619,7 @@ in
sources."pako-1.0.10"
sources."parallel-transform-1.2.0"
sources."paredit.js-0.3.4"
- sources."parse-asn1-5.1.4"
+ sources."parse-asn1-5.1.5"
sources."parse-glob-3.0.4"
sources."parse-json-2.2.0"
sources."parse-passwd-1.0.0"
@@ -59777,7 +60010,7 @@ in
sources."ms-2.0.0"
];
})
- (sources."webpack-cli-3.3.8" // {
+ (sources."webpack-cli-3.3.9" // {
dependencies = [
sources."supports-color-6.1.0"
];
@@ -60662,7 +60895,7 @@ in
sources."tough-cookie-2.3.4"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."type-1.0.3"
+ sources."type-1.2.0"
sources."typescript-3.5.3"
(sources."uglify-js-3.4.9" // {
dependencies = [
@@ -60918,7 +61151,7 @@ in
sources."path-loader-1.0.10"
sources."process-nextick-args-2.0.1"
sources."punycode-2.1.1"
- sources."qs-6.8.0"
+ sources."qs-6.9.0"
sources."readable-stream-2.3.6"
sources."safe-buffer-5.1.2"
sources."slash-2.0.0"
@@ -61062,7 +61295,7 @@ in
sources."mime-types-2.1.24"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
- sources."minipass-2.6.2"
+ sources."minipass-2.8.1"
sources."minizlib-1.2.2"
sources."mkdirp-0.5.1"
sources."nopt-3.0.6"
@@ -61089,7 +61322,7 @@ in
sources."string-width-1.0.2"
sources."string_decoder-1.1.1"
sources."strip-ansi-3.0.1"
- sources."tar-4.4.10"
+ sources."tar-4.4.11"
(sources."tough-cookie-2.4.3" // {
dependencies = [
sources."punycode-1.4.1"
@@ -61162,7 +61395,7 @@ in
sources."base64-js-0.0.8"
sources."bcrypt-pbkdf-1.0.2"
sources."biased-opener-0.2.8"
- sources."big-integer-1.6.44"
+ sources."big-integer-1.6.45"
sources."block-stream-0.0.9"
sources."body-parser-1.19.0"
sources."boom-2.10.1"
@@ -61471,7 +61704,7 @@ in
sources."isarray-1.0.0"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
- sources."minipass-2.6.2"
+ sources."minipass-2.8.1"
sources."minizlib-1.2.2"
sources."mkdirp-0.5.1"
sources."ms-2.1.2"
@@ -61505,7 +61738,7 @@ in
sources."string_decoder-1.1.1"
sources."strip-ansi-3.0.1"
sources."strip-json-comments-2.0.1"
- sources."tar-4.4.10"
+ sources."tar-4.4.11"
sources."util-deprecate-1.0.2"
sources."wide-align-1.1.3"
sources."wrappy-1.0.2"
@@ -61809,7 +62042,7 @@ in
sources."mime-types-2.1.24"
sources."minimatch-3.0.4"
sources."minimist-1.2.0"
- (sources."minipass-2.6.2" // {
+ (sources."minipass-2.8.1" // {
dependencies = [
sources."yallist-3.0.3"
];
@@ -61950,7 +62183,7 @@ in
sources."strip-ansi-3.0.1"
sources."strip-json-comments-2.0.1"
sources."tail-2.0.3"
- (sources."tar-4.4.10" // {
+ (sources."tar-4.4.11" // {
dependencies = [
sources."yallist-3.0.3"
];
@@ -61973,7 +62206,7 @@ in
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."twitter-ng-0.6.2"
- sources."type-1.0.3"
+ sources."type-1.2.0"
sources."type-is-1.6.18"
sources."typedarray-0.0.6"
sources."uc.micro-1.0.6"
@@ -62108,7 +62341,7 @@ in
sources."mime-types-2.1.24"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
- sources."minipass-2.6.2"
+ sources."minipass-2.8.1"
sources."minizlib-1.2.2"
sources."mkdirp-0.5.1"
sources."ncp-0.4.2"
@@ -62181,7 +62414,7 @@ in
];
})
sources."strip-ansi-3.0.1"
- sources."tar-4.4.10"
+ sources."tar-4.4.11"
sources."temp-0.9.0"
(sources."tough-cookie-2.4.3" // {
dependencies = [
@@ -62740,7 +62973,7 @@ in
sources."mimic-response-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
- sources."minipass-2.6.2"
+ sources."minipass-2.8.1"
sources."minizlib-1.2.2"
sources."mississippi-3.0.0"
sources."mkdirp-0.5.1"
@@ -62760,7 +62993,7 @@ in
sources."semver-5.7.1"
];
})
- sources."normalize-url-4.3.0"
+ sources."normalize-url-4.4.1"
sources."npm-bundled-1.0.6"
(sources."npm-package-arg-6.1.1" // {
dependencies = [
@@ -62886,7 +63119,7 @@ in
sources."strip-eof-1.0.0"
sources."strip-json-comments-2.0.1"
sources."supports-color-5.5.0"
- sources."tar-4.4.10"
+ sources."tar-4.4.11"
sources."term-size-1.2.0"
sources."through-2.3.8"
sources."through2-2.0.5"
@@ -63528,7 +63761,7 @@ in
sources."ecc-jsbn-0.1.2"
sources."editorconfig-0.15.3"
sources."ee-first-1.1.1"
- sources."electron-to-chromium-1.3.260"
+ sources."electron-to-chromium-1.3.264"
sources."elliptic-6.5.1"
sources."encodeurl-1.0.2"
sources."entities-1.1.2"
@@ -63798,7 +64031,7 @@ in
sources."os-tmpdir-1.0.2"
sources."osenv-0.1.5"
sources."pako-0.2.9"
- sources."parse-asn1-5.1.4"
+ sources."parse-asn1-5.1.5"
sources."parse-json-4.0.0"
sources."parse5-5.1.0"
sources."parseurl-1.3.3"
@@ -64146,7 +64379,7 @@ in
sources."balanced-match-1.0.0"
sources."base64-js-0.0.8"
sources."bencode-2.0.1"
- sources."big-integer-1.6.44"
+ sources."big-integer-1.6.45"
sources."bitfield-0.1.0"
(sources."bittorrent-dht-6.4.2" // {
dependencies = [
@@ -64466,7 +64699,7 @@ in
sources."balanced-match-1.0.0"
sources."base64-arraybuffer-0.1.5"
sources."base64-js-1.3.1"
- sources."base64id-1.0.0"
+ sources."base64id-2.0.0"
sources."basic-auth-2.0.1"
sources."bcrypt-pbkdf-1.0.2"
sources."bencode-0.7.0"
@@ -64535,18 +64768,21 @@ in
sources."ee-first-1.1.1"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.1"
- (sources."engine.io-3.3.2" // {
+ (sources."engine.io-3.4.0" // {
dependencies = [
sources."cookie-0.3.1"
- sources."debug-3.1.0"
+ sources."debug-4.1.1"
+ sources."ms-2.1.2"
];
})
- (sources."engine.io-client-3.3.2" // {
+ (sources."engine.io-client-3.4.0" // {
dependencies = [
- sources."debug-3.1.0"
+ sources."debug-4.1.1"
+ sources."ms-2.1.2"
+ sources."ws-6.1.4"
];
})
- sources."engine.io-parser-2.1.3"
+ sources."engine.io-parser-2.2.0"
sources."escape-html-1.0.3"
sources."etag-1.8.1"
sources."express-4.17.1"
@@ -64719,22 +64955,31 @@ in
sources."ws-2.3.1"
];
})
- (sources."socket.io-2.2.0" // {
+ (sources."socket.io-2.3.0" // {
dependencies = [
sources."debug-4.1.1"
sources."ms-2.1.2"
];
})
sources."socket.io-adapter-1.1.1"
- (sources."socket.io-client-2.2.0" // {
+ (sources."socket.io-client-2.3.0" // {
dependencies = [
- sources."debug-3.1.0"
+ sources."debug-4.1.1"
+ sources."isarray-2.0.1"
+ sources."ms-2.1.2"
+ (sources."socket.io-parser-3.3.0" // {
+ dependencies = [
+ sources."debug-3.1.0"
+ sources."ms-2.0.0"
+ ];
+ })
];
})
- (sources."socket.io-parser-3.3.0" // {
+ (sources."socket.io-parser-3.4.0" // {
dependencies = [
- sources."debug-3.1.0"
+ sources."debug-4.1.1"
sources."isarray-2.0.1"
+ sources."ms-2.1.2"
];
})
sources."speedometer-0.1.4"
@@ -64777,7 +65022,7 @@ in
sources."verror-1.10.0"
sources."which-1.3.1"
sources."wrappy-1.0.2"
- sources."ws-6.1.4"
+ sources."ws-7.1.2"
sources."xmlhttprequest-ssl-1.5.5"
sources."xtend-4.0.2"
sources."yeast-0.1.2"
@@ -64886,7 +65131,7 @@ in
sources."builtin-status-codes-3.0.0"
sources."cached-path-relative-1.0.2"
sources."cipher-base-1.0.4"
- sources."colors-1.3.3"
+ sources."colors-1.4.0"
sources."combine-source-map-0.8.0"
sources."concat-map-0.0.1"
(sources."concat-stream-2.0.0" // {
@@ -64980,7 +65225,7 @@ in
sources."os-browserify-0.3.0"
sources."pako-1.0.10"
sources."parents-1.0.1"
- sources."parse-asn1-5.1.4"
+ sources."parse-asn1-5.1.5"
sources."path-browserify-0.0.1"
sources."path-is-absolute-1.0.1"
sources."path-parse-1.0.6"
@@ -65483,13 +65728,13 @@ in
serverless = nodeEnv.buildNodePackage {
name = "serverless";
packageName = "serverless";
- version = "1.52.0";
+ version = "1.52.2";
src = fetchurl {
- url = "https://registry.npmjs.org/serverless/-/serverless-1.52.0.tgz";
- sha512 = "No+hosiPng/0MKfFMNj6lfLmNmn5vzLduss55YkefQNKZ9oJEBeZqBDrUEZC9reTHUpilCx0ESiLqkMoPBst2g==";
+ url = "https://registry.npmjs.org/serverless/-/serverless-1.52.2.tgz";
+ sha512 = "JLRh52heei1kiTg/mdXdVeJXlB26nXI6uK3/jQvG2a16WwrXD+h033azkD9qqk7WgISLgDKPJbvlnsCAXLcX5Q==";
};
dependencies = [
- sources."@serverless/cli-1.2.1"
+ sources."@serverless/cli-1.2.3"
(sources."@serverless/component-metrics-1.0.8" // {
dependencies = [
sources."node-fetch-2.6.0"
@@ -65501,7 +65746,7 @@ in
sources."semver-6.3.0"
];
})
- (sources."@serverless/enterprise-plugin-2.0.0" // {
+ (sources."@serverless/enterprise-plugin-3.0.0" // {
dependencies = [
sources."fs-extra-7.0.1"
sources."node-fetch-2.6.0"
@@ -65549,10 +65794,9 @@ in
sources."async-1.5.2"
sources."asynckit-0.4.0"
sources."atob-2.1.2"
- (sources."aws-sdk-2.529.0" // {
+ (sources."aws-sdk-2.533.0" // {
dependencies = [
sources."buffer-4.9.1"
- sources."ieee754-1.1.8"
sources."uuid-3.3.2"
];
})
@@ -65591,7 +65835,7 @@ in
sources."caw-2.0.1"
sources."chalk-2.4.2"
sources."chardet-0.7.0"
- sources."chokidar-3.1.0"
+ sources."chokidar-3.1.1"
sources."ci-info-1.6.0"
(sources."class-utils-0.3.6" // {
dependencies = [
@@ -65753,11 +65997,11 @@ in
sources."get-stream-4.1.0"
sources."get-value-2.0.6"
sources."glob-7.1.4"
- sources."glob-parent-5.0.0"
+ sources."glob-parent-5.1.0"
sources."global-dirs-0.1.1"
sources."globby-6.1.0"
sources."got-9.6.0"
- sources."graceful-fs-4.2.2"
+ sources."graceful-fs-4.2.1"
sources."graceful-readlink-1.0.1"
sources."graphlib-2.1.7"
(sources."has-ansi-2.0.0" // {
@@ -65829,7 +66073,7 @@ in
sources."is-retry-allowed-1.2.0"
sources."is-stream-1.1.0"
sources."is-windows-1.0.2"
- sources."is-wsl-2.1.0"
+ sources."is-wsl-2.1.1"
sources."isarray-1.0.0"
sources."isexe-2.0.0"
sources."iso8601-duration-1.2.0"
@@ -65908,7 +66152,7 @@ in
sources."node-dir-0.1.17"
sources."node-fetch-1.7.3"
sources."normalize-path-3.0.0"
- sources."normalize-url-4.3.0"
+ sources."normalize-url-4.4.1"
(sources."npm-conf-1.1.3" // {
dependencies = [
sources."pify-3.0.0"
@@ -66155,7 +66399,7 @@ in
sources."trim-repeated-1.0.0"
sources."tslib-1.10.0"
sources."tunnel-agent-0.6.0"
- sources."type-1.0.3"
+ sources."type-1.2.0"
sources."type-fest-0.5.2"
sources."type-is-1.6.18"
sources."typedarray-0.0.6"
@@ -66843,10 +67087,10 @@ in
snyk = nodeEnv.buildNodePackage {
name = "snyk";
packageName = "snyk";
- version = "1.227.0";
+ version = "1.228.3";
src = fetchurl {
- url = "https://registry.npmjs.org/snyk/-/snyk-1.227.0.tgz";
- sha512 = "ejfq2FIca+b/zu4hkJwFUob1Emn+s9wXYw5VHJSS6BjiniNi6dIa24AARG3BWiVsN/3NvzCYAkcqhYGaJ6xyVw==";
+ url = "https://registry.npmjs.org/snyk/-/snyk-1.228.3.tgz";
+ sha512 = "TwyJcMXBvic1xJ+rVLdIYS1xDYuzcogIXdmyvGvXBZgwIQdjOVMnZBVxUo5igkOIntBL2sCynZiydQtGbe08JA==";
};
dependencies = [
sources."@snyk/cli-interface-2.1.0"
@@ -67153,7 +67397,7 @@ in
sources."debug-4.1.1"
];
})
- (sources."snyk-gradle-plugin-3.0.2" // {
+ (sources."snyk-gradle-plugin-3.1.0" // {
dependencies = [
sources."debug-4.1.1"
];
@@ -67286,10 +67530,10 @@ in
"socket.io" = nodeEnv.buildNodePackage {
name = "socket.io";
packageName = "socket.io";
- version = "2.2.0";
+ version = "2.3.0";
src = fetchurl {
- url = "https://registry.npmjs.org/socket.io/-/socket.io-2.2.0.tgz";
- sha512 = "wxXrIuZ8AILcn+f1B4ez4hJTPG24iNgxBBDaJfT6MsyOhVYiTXWexGoPkd87ktJG8kQEcL/NBvRi64+9k4Kc0w==";
+ url = "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz";
+ sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==";
};
dependencies = [
sources."accepts-1.3.7"
@@ -67298,7 +67542,7 @@ in
sources."async-limiter-1.0.1"
sources."backo2-1.0.2"
sources."base64-arraybuffer-0.1.5"
- sources."base64id-1.0.0"
+ sources."base64id-2.0.0"
sources."better-assert-1.0.2"
sources."blob-0.0.5"
sources."callsite-1.0.0"
@@ -67307,19 +67551,13 @@ in
sources."component-inherit-0.0.3"
sources."cookie-0.3.1"
sources."debug-4.1.1"
- (sources."engine.io-3.3.2" // {
+ sources."engine.io-3.4.0"
+ (sources."engine.io-client-3.4.0" // {
dependencies = [
- sources."debug-3.1.0"
- sources."ms-2.0.0"
+ sources."ws-6.1.4"
];
})
- (sources."engine.io-client-3.3.2" // {
- dependencies = [
- sources."debug-3.1.0"
- sources."ms-2.0.0"
- ];
- })
- sources."engine.io-parser-2.1.3"
+ sources."engine.io-parser-2.2.0"
sources."has-binary2-1.0.3"
sources."has-cors-1.1.0"
sources."indexof-0.0.1"
@@ -67332,20 +67570,19 @@ in
sources."parseqs-0.0.5"
sources."parseuri-0.0.5"
sources."socket.io-adapter-1.1.1"
- (sources."socket.io-client-2.2.0" // {
+ (sources."socket.io-client-2.3.0" // {
dependencies = [
- sources."debug-3.1.0"
- sources."ms-2.0.0"
- ];
- })
- (sources."socket.io-parser-3.3.0" // {
- dependencies = [
- sources."debug-3.1.0"
sources."ms-2.0.0"
+ (sources."socket.io-parser-3.3.0" // {
+ dependencies = [
+ sources."debug-3.1.0"
+ ];
+ })
];
})
+ sources."socket.io-parser-3.4.0"
sources."to-array-0.1.4"
- sources."ws-6.1.4"
+ sources."ws-7.1.2"
sources."xmlhttprequest-ssl-1.5.5"
sources."yeast-0.1.2"
];
@@ -67668,7 +67905,7 @@ in
sources."decode-uri-component-0.2.0"
sources."deep-equal-1.1.0"
sources."deep-extend-0.6.0"
- (sources."deferred-leveldown-5.2.0" // {
+ (sources."deferred-leveldown-5.2.1" // {
dependencies = [
sources."abstract-leveldown-6.1.1"
];
@@ -67865,7 +68102,7 @@ in
sources."string_decoder-0.10.31"
];
})
- (sources."leveldown-5.2.0" // {
+ (sources."leveldown-5.2.1" // {
dependencies = [
sources."abstract-leveldown-6.1.1"
];
@@ -68429,7 +68666,7 @@ in
sources."async-1.5.2"
sources."async-limiter-1.0.1"
sources."asynckit-0.4.0"
- (sources."aws-sdk-2.529.0" // {
+ (sources."aws-sdk-2.533.0" // {
dependencies = [
sources."uuid-3.3.2"
];
@@ -68449,7 +68686,7 @@ in
sources."balanced-match-1.0.0"
sources."base64-arraybuffer-0.1.5"
sources."base64-js-1.3.1"
- sources."base64id-1.0.0"
+ sources."base64id-2.0.0"
sources."base64url-3.0.1"
sources."basic-auth-1.1.0"
sources."bcrypt-pbkdf-1.0.2"
@@ -68553,19 +68790,21 @@ in
sources."ejs-0.8.8"
sources."encodeurl-1.0.2"
sources."end-of-stream-1.4.1"
- (sources."engine.io-3.3.2" // {
+ (sources."engine.io-3.4.0" // {
dependencies = [
- sources."debug-3.1.0"
+ sources."debug-4.1.1"
+ sources."ms-2.1.2"
+ sources."ws-7.1.2"
+ ];
+ })
+ (sources."engine.io-client-3.4.0" // {
+ dependencies = [
+ sources."debug-4.1.1"
+ sources."ms-2.1.2"
sources."ws-6.1.4"
];
})
- (sources."engine.io-client-3.3.2" // {
- dependencies = [
- sources."debug-3.1.0"
- sources."ws-6.1.4"
- ];
- })
- sources."engine.io-parser-2.1.3"
+ sources."engine.io-parser-2.2.0"
sources."error-ex-1.3.2"
sources."escape-html-1.0.3"
sources."escape-string-regexp-1.0.5"
@@ -68655,15 +68894,15 @@ in
sources."inherits-2.0.3"
];
})
- (sources."http-proxy-1.17.0" // {
+ (sources."http-proxy-1.18.0" // {
dependencies = [
- sources."eventemitter3-3.1.2"
+ sources."eventemitter3-4.0.0"
];
})
sources."http-signature-1.1.1"
sources."https-proxy-agent-1.0.0"
sources."iconv-lite-0.4.24"
- sources."ieee754-1.1.8"
+ sources."ieee754-1.1.13"
sources."in-publish-2.0.0"
sources."indexof-0.0.1"
sources."inflight-1.0.6"
@@ -68952,22 +69191,31 @@ in
sources."signal-exit-3.0.2"
sources."slash-1.0.0"
sources."sntp-1.0.9"
- (sources."socket.io-2.2.0" // {
+ (sources."socket.io-2.3.0" // {
dependencies = [
sources."debug-4.1.1"
sources."ms-2.1.2"
];
})
sources."socket.io-adapter-1.1.1"
- (sources."socket.io-client-2.2.0" // {
+ (sources."socket.io-client-2.3.0" // {
dependencies = [
- sources."debug-3.1.0"
+ sources."debug-4.1.1"
+ sources."isarray-2.0.1"
+ sources."ms-2.1.2"
+ (sources."socket.io-parser-3.3.0" // {
+ dependencies = [
+ sources."debug-3.1.0"
+ sources."ms-2.0.0"
+ ];
+ })
];
})
- (sources."socket.io-parser-3.3.0" // {
+ (sources."socket.io-parser-3.4.0" // {
dependencies = [
- sources."debug-3.1.0"
+ sources."debug-4.1.1"
sources."isarray-2.0.1"
+ sources."ms-2.1.2"
];
})
sources."source-map-0.6.1"
@@ -69012,7 +69260,7 @@ in
sources."debug-3.2.6"
sources."form-data-2.5.1"
sources."ms-2.1.2"
- sources."qs-6.8.0"
+ sources."qs-6.9.0"
sources."readable-stream-2.3.6"
sources."string_decoder-1.1.1"
];
@@ -69025,7 +69273,7 @@ in
sources."esprima-4.0.1"
sources."js-yaml-3.13.1"
sources."lodash-3.10.1"
- sources."qs-6.8.0"
+ sources."qs-6.9.0"
];
})
sources."swagger-schema-official-2.0.0-bab6bed"
@@ -69474,7 +69722,7 @@ in
];
})
sources."growl-1.9.2"
- (sources."handlebars-4.2.0" // {
+ (sources."handlebars-4.2.1" // {
dependencies = [
sources."source-map-0.6.1"
];
@@ -69657,7 +69905,7 @@ in
dependencies = [
sources."debug-3.2.6"
sources."ms-2.1.2"
- sources."qs-6.8.0"
+ sources."qs-6.9.0"
sources."superagent-3.8.3"
];
})
@@ -71236,7 +71484,7 @@ in
sources."minimalistic-assert-1.0.1"
sources."minimatch-3.0.4"
sources."minimist-1.2.0"
- sources."minipass-2.6.2"
+ sources."minipass-2.8.1"
sources."minizlib-1.2.2"
(sources."mkdirp-0.5.1" // {
dependencies = [
@@ -71259,7 +71507,7 @@ in
];
})
sources."nopt-4.0.1"
- sources."normalize-url-4.3.0"
+ sources."normalize-url-4.4.1"
sources."npm-bundled-1.0.6"
sources."npm-packlist-1.4.4"
sources."npmlog-4.1.2"
@@ -71353,7 +71601,7 @@ in
sources."strip-json-comments-2.0.1"
sources."strip-outer-1.0.1"
sources."supports-color-5.5.0"
- sources."tar-4.4.10"
+ sources."tar-4.4.11"
sources."thelounge-ldapjs-non-maintained-fork-1.0.4"
sources."tlds-1.203.1"
sources."to-array-0.1.4"
@@ -71781,7 +72029,7 @@ in
sources."ansi-regex-2.1.1"
sources."ansi-styles-2.2.1"
sources."chalk-1.1.3"
- sources."colors-1.3.3"
+ sources."colors-1.4.0"
sources."diff-2.2.3"
sources."escape-string-regexp-1.0.5"
sources."has-ansi-2.0.0"
@@ -72524,7 +72772,7 @@ in
sources."graceful-fs-4.2.2"
sources."graceful-readlink-1.0.1"
sources."gray-matter-2.1.1"
- sources."handlebars-4.2.0"
+ sources."handlebars-4.2.1"
sources."har-schema-2.0.0"
sources."har-validator-5.1.3"
(sources."has-ansi-2.0.0" // {
@@ -73820,7 +74068,7 @@ in
dependencies = [
sources."get-stream-5.1.0"
sources."lowercase-keys-2.0.0"
- sources."normalize-url-4.3.0"
+ sources."normalize-url-4.4.1"
];
})
(sources."caller-path-0.1.0" // {
@@ -74694,7 +74942,7 @@ in
];
})
sources."snapdragon-util-3.0.1"
- (sources."snyk-1.227.0" // {
+ (sources."snyk-1.228.3" // {
dependencies = [
sources."ansi-regex-4.1.0"
sources."debug-3.2.6"
@@ -74723,7 +74971,7 @@ in
sources."tmp-0.0.33"
];
})
- (sources."snyk-gradle-plugin-3.0.2" // {
+ (sources."snyk-gradle-plugin-3.1.0" // {
dependencies = [
sources."debug-4.1.1"
sources."ms-2.1.2"
@@ -74903,7 +75151,7 @@ in
sources."tslib-1.10.0"
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
- sources."type-1.0.3"
+ sources."type-1.2.0"
sources."type-check-0.3.2"
sources."type-fest-0.3.1"
sources."typedarray-0.0.6"
@@ -75321,7 +75569,7 @@ in
sources."p-try-2.2.0"
sources."pako-1.0.10"
sources."parallel-transform-1.2.0"
- sources."parse-asn1-5.1.4"
+ sources."parse-asn1-5.1.5"
sources."pascalcase-0.1.1"
sources."path-browserify-0.0.1"
sources."path-dirname-1.0.2"
@@ -75509,10 +75757,10 @@ in
webpack-cli = nodeEnv.buildNodePackage {
name = "webpack-cli";
packageName = "webpack-cli";
- version = "3.3.8";
+ version = "3.3.9";
src = fetchurl {
- url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.8.tgz";
- sha512 = "RANYSXwikSWINjHMd/mtesblNSpjpDLoYTBtP99n1RhXqVI/wxN40Auqy42I7y4xrbmRBoA5Zy5E0JSBD5XRhw==";
+ url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.9.tgz";
+ sha512 = "xwnSxWl8nZtBl/AFJCOn9pG7s5CYUYdZxmmukv+fAHLcBIHM36dImfpQg3WfShZXeArkWlf6QRw24Klcsv8a5A==";
};
dependencies = [
sources."ansi-regex-4.1.0"
@@ -75879,8 +76127,10 @@ in
(sources."bittorrent-tracker-9.14.4" // {
dependencies = [
sources."debug-4.1.1"
+ sources."decompress-response-4.2.1"
+ sources."mimic-response-2.0.0"
sources."ms-2.1.2"
- sources."simple-get-3.0.3"
+ sources."simple-get-3.1.0"
];
})
sources."blob-to-buffer-1.2.8"
@@ -75981,7 +76231,9 @@ in
sources."last-one-wins-1.0.4"
(sources."load-ip-set-2.1.0" // {
dependencies = [
- sources."simple-get-3.0.3"
+ sources."decompress-response-4.2.1"
+ sources."mimic-response-2.0.0"
+ sources."simple-get-3.1.0"
];
})
sources."long-4.0.0"
@@ -76026,7 +76278,9 @@ in
sources."parse-numeric-range-0.0.2"
(sources."parse-torrent-7.0.1" // {
dependencies = [
- sources."simple-get-3.0.3"
+ sources."decompress-response-4.2.1"
+ sources."mimic-response-2.0.0"
+ sources."simple-get-3.1.0"
];
})
sources."path-is-absolute-1.0.1"
@@ -76067,7 +76321,7 @@ in
sources."semver-5.1.1"
sources."simple-concat-1.0.0"
sources."simple-get-2.8.1"
- (sources."simple-peer-9.5.0" // {
+ (sources."simple-peer-9.6.0" // {
dependencies = [
sources."debug-4.1.1"
sources."ms-2.1.2"
@@ -76123,8 +76377,10 @@ in
(sources."webtorrent-0.107.16" // {
dependencies = [
sources."debug-4.1.1"
+ sources."decompress-response-4.2.1"
+ sources."mimic-response-2.0.0"
sources."ms-2.1.2"
- sources."simple-get-3.0.3"
+ sources."simple-get-3.1.0"
];
})
sources."winreg-1.2.4"
@@ -76431,7 +76687,7 @@ in
];
})
sources."glob-to-regexp-0.3.0"
- (sources."global-agent-2.1.0" // {
+ (sources."global-agent-2.1.1" // {
dependencies = [
sources."semver-6.3.0"
];
diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix
index 63b388f88eb..dcc1c73c0fc 100644
--- a/pkgs/development/node-packages/node-packages-v12.nix
+++ b/pkgs/development/node-packages/node-packages-v12.nix
@@ -1255,13 +1255,13 @@ let
sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
};
};
- "minipass-2.6.2" = {
+ "minipass-2.8.1" = {
name = "minipass";
packageName = "minipass";
- version = "2.6.2";
+ version = "2.8.1";
src = fetchurl {
- url = "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz";
- sha512 = "38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ==";
+ url = "https://registry.npmjs.org/minipass/-/minipass-2.8.1.tgz";
+ sha512 = "QCG523ParRcE2+9A6wYh9UI3uy2FFLw4DQaVYQrY5HPfszc5M6VDD+j0QCwHm19LI2imes4RB+NBD8cOJccyCg==";
};
};
"minizlib-1.2.2" = {
@@ -2038,13 +2038,13 @@ let
sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
};
};
- "tar-4.4.10" = {
+ "tar-4.4.11" = {
name = "tar";
packageName = "tar";
- version = "4.4.10";
+ version = "4.4.11";
src = fetchurl {
- url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz";
- sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==";
+ url = "https://registry.npmjs.org/tar/-/tar-4.4.11.tgz";
+ sha512 = "iI4zh3ktLJKaDNZKZc+fUONiQrSn9HkCFzamtb7k8FFmVilHVob7QsLX/VySAW8lAviMzMbFw4QtFb4errwgYA==";
};
};
"temp-0.9.0" = {
@@ -2675,7 +2675,7 @@ in
sources."mime-types-2.1.24"
sources."minimatch-3.0.4"
sources."minimist-0.0.8"
- sources."minipass-2.6.2"
+ sources."minipass-2.8.1"
sources."minizlib-1.2.2"
sources."mkdirp-0.5.1"
sources."ncp-0.4.2"
@@ -2748,7 +2748,7 @@ in
];
})
sources."strip-ansi-3.0.1"
- sources."tar-4.4.10"
+ sources."tar-4.4.11"
sources."temp-0.9.0"
(sources."tough-cookie-2.4.3" // {
dependencies = [
diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix
index 0b342a654e6..75a2dab970e 100644
--- a/pkgs/development/ocaml-modules/odoc/default.nix
+++ b/pkgs/development/ocaml-modules/odoc/default.nix
@@ -1,22 +1,24 @@
-{ stdenv, fetchFromGitHub, buildDunePackage, cppo, bos, cmdliner, tyxml }:
+{ lib, fetchFromGitHub, buildDunePackage
+, astring, cmdliner, cppo, fpath, result, tyxml
+}:
buildDunePackage rec {
pname = "odoc";
- version = "1.3.0";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "ocaml";
repo = pname;
rev = version;
- sha256 = "0hjan5aj5zk8j8qyagv9r4hqm469mh207cv2m6kxwgnw0c3cz7sy";
+ sha256 = "0rvhx139jx6wmlfz355mja6mk03x4swq1xxvk5ky6jzhalq3cf5i";
};
- buildInputs = [ cppo bos cmdliner tyxml ];
+ buildInputs = [ astring cmdliner cppo fpath result tyxml ];
meta = {
description = "A documentation generator for OCaml";
- license = stdenv.lib.licenses.isc;
- maintainers = [ stdenv.lib.maintainers.vbgl ];
+ license = lib.licenses.isc;
+ maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage;
};
}
diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix
index f91b33d2010..574aeefa7fc 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/pkgs/development/python-modules/cairocffi/default.nix
@@ -19,8 +19,8 @@
}@args:
import ./generic.nix ({
- version = "1.0.2";
- sha256 = "01ac51ae12c4324ca5809ce270f9dd1b67f5166fe63bd3e497e9ea3ca91946ff";
+ version = "1.1.0";
+ sha256 = "1nq53f5jipgy9jgyfxp43j40qfbmrhgn1cj8bp5rrb3liy3wbh7i";
dlopen_patch = ./dlopen-paths.patch;
disabled = pythonOlder "3.5";
inherit withXcffib;
diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
index 10e2294981d..6542b4367eb 100644
--- a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
+++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
@@ -1,46 +1,61 @@
-commit 0435bc2577d4b18f54b78b2f5185abb2b2005982
-Author: Alexander V. Nikolaev
-Date: Sat Feb 6 08:09:06 2016 +0200
+Patch dlopen() to allow direct paths to all required libs
- Patch dlopen() to allow direct paths to all required libs
+This is an update of the patch submitted in
+https://github.com/NixOS/nixpkgs/commit/b13e44e094989d3a902f8c73b22e8d3c0cc7acf4
+by Alexander V. Nikolaev
- This patch is NixOS specific
+---
+ cairocffi/__init__.py | 34 ++++++++++++++++------------------
+ 1 file changed, 16 insertions(+), 18 deletions(-)
diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
-index 6061973..3538a58 100644
+index 307d58c..43c29e3 100644
--- a/cairocffi/__init__.py
+++ b/cairocffi/__init__.py
-@@ -21,19 +21,22 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip()
- version = '1.16.0'
- version_info = (1, 16, 0)
+@@ -21,28 +21,26 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip()
+ version = '1.17.2'
+ version_info = (1, 17, 2)
-+# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
++# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be
++# required for runtime
+_LIBS = {
+ 'cairo': '@cairo@/lib/libcairo@ext@',
+ 'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
+ 'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
+ 'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
+}
++
--def dlopen(ffi, *names):
-+def dlopen(ffi, name, *names):
+ def dlopen(ffi, library_names, filenames):
"""Try various names for the same library, for different platforms."""
-- for name in names:
-- for lib_name in (name, 'lib' + name):
-- try:
-- path = ctypes.util.find_library(lib_name)
-- lib = ffi.dlopen(path or lib_name)
-- if lib:
-- return lib
-- except OSError:
-- pass
-- raise OSError("dlopen() failed to load a library: %s" % ' / '.join(names))
-+ path = _LIBS.get(name, None)
-+ if path:
-+ lib = ffi.dlopen(path)
-+ if lib:
-+ return lib
-+ raise OSError("dlopen() failed to load a library: %s as %s" % (name, path))
+- exceptions = []
+-
+ for library_name in library_names:
+- library_filename = find_library(library_name)
+- if library_filename:
+- filenames = (library_filename,) + filenames
+- else:
+- exceptions.append(
+- 'no library called "{}" was found'.format(library_name))
+-
+- for filename in filenames:
+- try:
+- return ffi.dlopen(filename)
+- except OSError as exception: # pragma: no cover
+- exceptions.append(exception)
+-
+- error_message = '\n'.join( # pragma: no cover
+- str(exception) for exception in exceptions)
+- raise OSError(error_message) # pragma: no cover
++ path = _LIBS.get(library_name, None)
++ if path:
++ lib = ffi.dlopen(path)
++ if lib:
++ return lib
++
++ raise OSError("dlopen() failed to load a library: %s as %s" % (library_name, path))
- cairo = dlopen(ffi, 'cairo', 'cairo-2', 'cairo-gobject-2', 'cairo.so.2')
+ cairo = dlopen(
+--
+2.19.2
diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix
index af2607bca14..e135d8c7bc6 100644
--- a/pkgs/development/python-modules/dependency-injector/default.nix
+++ b/pkgs/development/python-modules/dependency-injector/default.nix
@@ -9,11 +9,11 @@ in
buildPythonPackage rec {
pname = "dependency-injector";
- version = "3.14.6";
+ version = "3.14.10";
src = fetchPypi {
inherit pname version;
- sha256 = "2e1889a0981381f557b0d14cba900adf7476817c53c13bfb04e2a30b3db0f1d3";
+ sha256 = "1c475axh40f8s4n5dqm52qczx9g2g8b8wsy0qvghirk84ikpca5y";
};
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix
index d4cd0e711a0..f3e4e0a8b73 100644
--- a/pkgs/development/python-modules/dynd/default.nix
+++ b/pkgs/development/python-modules/dynd/default.nix
@@ -26,6 +26,8 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "'--always', '--match', 'v*']).decode('ascii').strip('\n')" ""
'';
+ dontUseCmakeConfigure = true;
+
# Python 3 works but has a broken import test that I couldn't
# figure out.
doCheck = !isPy3k;
diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index e54283735a8..cf1eeb5392c 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -1,27 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi
-, setuptools_scm, entrypoints, secretstorage
+, dbus-python, setuptools_scm, entrypoints, secretstorage
, pytest, pytest-flake8 }:
buildPythonPackage rec {
pname = "keyring";
- version = "18.0.1";
+ version = "19.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "67d6cc0132bd77922725fae9f18366bb314fd8f95ff4d323a4df41890a96a838";
+ sha256 = "13frfmws03jdyz9wxb4ylkvk80qiyb6a3h3sn7wx3ry97bn5li3a";
};
nativeBuildInputs = [ setuptools_scm ];
checkInputs = [ pytest pytest-flake8 ];
- propagatedBuildInputs = [ entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage;
+ propagatedBuildInputs = [ dbus-python entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage;
- doCheck = !stdenv.isDarwin;
-
- checkPhase = ''
- py.test
- '';
+ # checks try to access a darwin path on linux
+ doCheck = false;
meta = with stdenv.lib; {
description = "Store and access your passwords safely";
diff --git a/pkgs/development/python-modules/license-expression/default.nix b/pkgs/development/python-modules/license-expression/default.nix
index 6d52e5f5c1f..2bf204a9a62 100644
--- a/pkgs/development/python-modules/license-expression/default.nix
+++ b/pkgs/development/python-modules/license-expression/default.nix
@@ -12,6 +12,7 @@ buildPythonPackage rec {
rev = "v${version}";
sha256 = "0q8sha38w7ajg7ar0rmbqrwv0n58l8yzyl96cqwcbvp578fn3ir0";
};
+ postPatch = "patchShebangs ./configure";
propagatedBuildInputs = [ boolean-py ];
diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix
new file mode 100644
index 00000000000..f91b8191eb1
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-check/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pytest
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-check";
+ version = "0.3.5";
+
+ src = fetchFromGitHub {
+ owner = "okken";
+ repo = "pytest-check";
+ rev = version;
+ sha256 = "11wb4f4sp4cr5mzqdakrbycwgfr2p1sx1l91fa6525wnfvgc0qy3";
+ };
+
+ buildInputs = [ pytest ];
+
+ checkInputs = [ pytest pytestCheckHook ];
+
+ meta = with stdenv.lib; {
+ description = "pytest plugin allowing multiple failures per test";
+ homepage = https://github.com/okken/pytest-check;
+ license = licenses.mit;
+ maintainers = [ maintainers.flokli ];
+ };
+}
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index cef7f0aecf2..468dc3f1579 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -441,13 +441,17 @@ let
nlme = [ pkgs.libiconv ];
Matrix = [ pkgs.libiconv ];
mgcv = [ pkgs.libiconv ];
+ minqa = [ pkgs.libiconv ];
igraph = [ pkgs.libiconv ];
ape = [ pkgs.libiconv ];
expm = [ pkgs.libiconv ];
mnormt = [ pkgs.libiconv ];
+ pan = [ pkgs.libiconv ];
phangorn = [ pkgs.libiconv ];
quadprog = [ pkgs.libiconv ];
+ randomForest = [ pkgs.libiconv ];
sundialr = [ pkgs.libiconv ];
+ ucminf = [ pkgs.libiconv ];
};
packagesRequireingX = [
diff --git a/pkgs/development/tools/misc/ctags/wrapped.nix b/pkgs/development/tools/misc/ctags/wrapped.nix
index 869e7a61121..08f8049aa8a 100644
--- a/pkgs/development/tools/misc/ctags/wrapped.nix
+++ b/pkgs/development/tools/misc/ctags/wrapped.nix
@@ -27,10 +27,10 @@ with pkgs.stdenv.lib;
# don't scan version control directories
defaultArgs = [
- "--exclude=\.svn"
- "--exclude=\.hg"
- "--exclude=\.git"
- "--exclude=\_darcs"
+ "--exclude=.svn"
+ "--exclude=.hg"
+ "--exclude=.git"
+ "--exclude=_darcs"
"--sort=yes"
];
@@ -38,8 +38,8 @@ with pkgs.stdenv.lib;
asLang = [
"--langdef=ActionScript"
"--langmap=ActionScript:.as"
- "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\1/f,function,functions/"
- "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\2/p,property,properties/"
+ "--regex-ActionScript=/function[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\1/f,function,functions/"
+ "--regex-ActionScript=/function[ \\t]+(set|get)[ \\t]+([A-Za-z0-9_]+)[ \\t]*\\(/\\2/p,property,properties/"
"--regex-ActionScript=/interface[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/i,interface,interfaces/"
"--regex-ActionScript=/package[ \\t]+([^ \\t]*)/\\1/p/"
"--regex-ActionScript=/class[ \\t]+[a-z0-9_.]*([A-Z][A-Za-z0-9_]+)/\\1/c,class,classes/"
@@ -67,7 +67,7 @@ with pkgs.stdenv.lib;
nixLang = [
"--langdef=NIX"
"--langmap=NIX:.nix"
- "--regex-NIX=/\([^ \\t*]*\)[ \\t]*=/\\1/f/"
+ "--regex-NIX=/([^ \\t*]*)[ \\t]*=/\\1/f/"
];
rubyLang = [
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index e7b21c40f17..e36f34bb10c 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -5,13 +5,13 @@
with stdenv.lib;
let
- version = "0.1.37";
+ version = "0.1.39";
src = fetchFromGitHub {
rev = "v${version}";
owner = "containers";
repo = "skopeo";
- sha256 = "1ly5yq3aj4ciqn6hbhvxqp1im81pbas9smdhbbks7iwjvh944d62";
+ sha256 = "1jkxmvh079pd9j4aa39ilmclwafnjs0yqdiigwh8cj7yf97x4vsi";
};
defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index b3764ea1efc..bac7bd345f9 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -1,54 +1,69 @@
-{ SDL2_image, SDL2_ttf, SDL2_net, fpc, qt5, ghcWithPackages, ffmpeg, freeglut
-, stdenv, makeWrapper, fetchhg, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer
-, zlib, libpng, libGLU_combined, physfs
+{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut
+, lib, fetchhg, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer
+, zlib, libpng, libGL, libGLU, physfs
+, qtbase, qttools
+, withServer ? true
}:
let
ghc = ghcWithPackages (pkgs: with pkgs; [
- network vector utf8-string bytestring random hslogger
- SHA entropy pkgs.zlib sandi regex-tdfa
+ SHA bytestring entropy hslogger network pkgs.zlib random
+ regex-tdfa sandi utf8-string vector
]);
+
in
-stdenv.mkDerivation {
- version = "1.0.0-beta1";
+mkDerivation rec {
pname = "hedgewars";
+ version = "1.0.0-beta2";
+
+ # it's crazy slow to fetch the whole repo but the beta versions are not
+ # released as tarballs
src = fetchhg {
url = "https://hg.hedgewars.org/hedgewars/";
- rev = "7ab5cf405686";
- sha256 = "1yrspi82ym5zpavka4cv0vh86g3i2mbbg8ccfcsid4f38lgbb9y4";
+ rev = "dff37ac61dcf";
+ sha256 = "1dsq6wfv3d7jfnr068b7ixpnqp0h6mj7zgby6h1viwblgbirri78";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ cmake pkgconfig qttools ];
+
buildInputs = [
- SDL2_ttf SDL2_net cmake lua5_1 SDL2 SDL2_mixer SDL2_image fpc
- ghc ffmpeg freeglut makeWrapper physfs
- qt5.qttools qt5.qtbase
- ];
+ SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image
+ fpc lua5_1
+ ffmpeg freeglut physfs
+ qtbase
+ ] ++ lib.optional withServer ghc;
postPatch = ''
- substituteInPlace gameServer/CMakeLists.txt --replace mask evaluate
+ substituteInPlace gameServer/CMakeLists.txt \
+ --replace mask evaluate
'';
- preBuild = ''
- export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL2_image}/lib
- -rpath ${SDL2_mixer}/lib
- -rpath ${SDL2_net}/lib
- -rpath ${SDL2_ttf}/lib
- -rpath ${SDL2.out}/lib
- -rpath ${libpng.out}/lib
- -rpath ${lua5_1}/lib
- -rpath ${libGLU_combined}/lib
- -rpath ${zlib.out}/lib
- "
- '';
+ cmakeFlags = [
+ "-DNOVERSIONINFOUPDATE=ON"
+ "-DNOSERVER=${if withServer then "OFF" else "ON"}"
+ ];
- postInstall = ''
- wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${stdenv.lib.makeLibraryPath [ libGLU_combined freeglut physfs ]}
- '';
+ NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [
+ SDL2.out
+ SDL2_image
+ SDL2_mixer
+ SDL2_net
+ SDL2_ttf
+ libGL
+ libGLU
+ libpng.out
+ lua5_1
+ physfs
+ zlib.out
+ ];
- meta = with stdenv.lib; {
+ qtWrapperArgs = [
+ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libGLU freeglut physfs ]}"
+ ];
+
+ meta = with lib; {
description = "Turn-based strategy artillery game similar to Worms";
- homepage = http://hedgewars.org/;
+ homepage = "http://hedgewars.org/";
license = licenses.gpl2;
longDescription = ''
Each player controls a team of several hedgehogs. During the course of
@@ -74,7 +89,7 @@ stdenv.mkDerivation {
hedgehog or hedgehogs after a player's or CPU turn is shown only when
all movement on the battlefield has ceased).'';
maintainers = with maintainers; [ kragniz fpletz ];
- platforms = ghc.meta.platforms;
+ inherit (ghc.meta) platforms;
hydraPlatforms = [];
};
}
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index cb0e3778201..138feea39e1 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -61,12 +61,12 @@ let
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2019-09-12";
+ version = "2019-09-20";
src = fetchFromGitHub {
owner = "w0rp";
repo = "ale";
- rev = "61cfb3fefb0ebd8654be452046bd2ba24025311f";
- sha256 = "11i5jr5zgvkl7wr99jjldyypbd5xsnyj8q9j379gl2xk5brjwbaf";
+ rev = "ab8e0433536dc6074c77f6ed1fa18325ea1be349";
+ sha256 = "0nlpcph9f0sfx50rvzdc2vz6b23x2hgx46ywjflfix54cmakpkl8";
};
};
@@ -83,12 +83,12 @@ let
ansible-vim = buildVimPluginFrom2Nix {
pname = "ansible-vim";
- version = "2019-01-30";
+ version = "2019-09-15";
src = fetchFromGitHub {
owner = "pearofducks";
repo = "ansible-vim";
- rev = "dec377ddffd6616aa156029a5f065496582f697b";
- sha256 = "1rmji65skhnf1658f67kaxbhfiwcc7yf91n96ni74djsp26mqfzm";
+ rev = "95531d40e5c5a6417aac53b7d4e8bd7130d5efe6";
+ sha256 = "1xa8hh95am0baxrjm411fdpzmf3mkkfcpb56cxr81n9idmq1qlqp";
};
};
@@ -138,12 +138,12 @@ let
awesome-vim-colorschemes = buildVimPluginFrom2Nix {
pname = "awesome-vim-colorschemes";
- version = "2019-08-29";
+ version = "2019-09-21";
src = fetchFromGitHub {
owner = "rafi";
repo = "awesome-vim-colorschemes";
- rev = "112b534f5a2b3c919cd9aa04767827bceae9ed18";
- sha256 = "09lhlllzapjawhhhsz5av11h1k944nq3bsg55xrfqsx8yghgdy7z";
+ rev = "21f5c63f22fe70b0fae3ff0fb9e55c602e622ea7";
+ sha256 = "1k7h8faz9qqyqzpkxxhsjsdqyah6amwk3rlhxygz9qg25mp558xf";
};
};
@@ -303,34 +303,34 @@ let
coc-git = buildVimPluginFrom2Nix {
pname = "coc-git";
- version = "2019-09-10";
+ version = "2019-09-19";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-git";
- rev = "c463de323cb7f162747e545bff694d6293a9be60";
- sha256 = "15r8gwsk69gg1p68jgi3gw0m29lbfs7iddcmhgr5qkrvk8rhhi1j";
+ rev = "672beb8976e0a8fe0e5c52dc00263144077b659d";
+ sha256 = "0g6cwcbirkqqnljyhlpfdx2q09b5irrp39bqlgl9qb912sz90fqg";
};
};
coc-go = buildVimPluginFrom2Nix {
pname = "coc-go";
- version = "2019-09-13";
+ version = "2019-09-16";
src = fetchFromGitHub {
owner = "josa42";
repo = "coc-go";
- rev = "059f6ecae0849024d299d9e744622d439c73ddca";
- sha256 = "0n9ffsk9qds5ap3049kw05v167ialhmix28mwygdxgzjvr9qpd4q";
+ rev = "3c7954c3e167ca3785efb96d3e95563b7e0d4045";
+ sha256 = "0nir8yvqrz2a8zmjp8ny4s08qlcvy3ms6k55i21xvyjwyrmrknpq";
};
};
coc-highlight = buildVimPluginFrom2Nix {
pname = "coc-highlight";
- version = "2019-08-03";
+ version = "2019-09-20";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-highlight";
- rev = "b84cfa2738ab0843217c742eb69b4b6e630d45fa";
- sha256 = "0yrl29fdn0hwyiz4z75km1gidc4bkx1ra6g1pfddlwbbjj32lbqp";
+ rev = "775dd5e0a2c8f6e3834e002ca855a305ca267422";
+ sha256 = "0dmzpfvxj8kw6knnsbfjzx1d3n9i5rff9nw7j9pl1brmgk2r5r77";
};
};
@@ -358,12 +358,12 @@ let
coc-java = buildVimPluginFrom2Nix {
pname = "coc-java";
- version = "2019-07-17";
+ version = "2019-09-17";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-java";
- rev = "50343bf5e965e311444aade22599f9d247902852";
- sha256 = "08crsdw2cgn30j6mbkm74zsgi92khb1xdkx53gk1r33qcgbzi47y";
+ rev = "7e3bdee15b28f5d7f3b1654429c89cb0d93436e5";
+ sha256 = "0r17w00mbs1gshshm8c56cqi37z5i5vdk2sifs2clazlyn9rl6zm";
};
};
@@ -424,12 +424,12 @@ let
coc-prettier = buildVimPluginFrom2Nix {
pname = "coc-prettier";
- version = "2019-09-10";
+ version = "2019-09-16";
src = fetchFromGitHub {
owner = "neoclide";
repo = "coc-prettier";
- rev = "b78dcb1000841a428d23d457ac93c190b98f7b35";
- sha256 = "0krc9dnzglh8rff68xyp27qjdgmqhxvl94jy1x4asl5a5srzz7v7";
+ rev = "5b25fc3a4709c1e0e61f95ec82f039d1b8c426a3";
+ sha256 = "1j4whxna3gjjs29ndlfr9wpzylapa889831yf1pn7lz2847hnjdr";
};
};
@@ -766,12 +766,12 @@ let
dart-vim-plugin = buildVimPluginFrom2Nix {
pname = "dart-vim-plugin";
- version = "2019-05-04";
+ version = "2019-09-20";
src = fetchFromGitHub {
owner = "dart-lang";
repo = "dart-vim-plugin";
- rev = "8ffc3e208c282f19afa237d343fa1533146bd2b4";
- sha256 = "1ypcn3212d7gzfgvarrsma0pvaial692f3m2c0blyr1q83al1pm8";
+ rev = "27b3ebd24f1c5690700b7f94f112c06216a0dd76";
+ sha256 = "012vg71h0jijhj430dqd38xh2gq5k79zr1m59gvh004jjb8bh8c7";
};
};
@@ -821,12 +821,12 @@ let
denite-nvim = buildVimPluginFrom2Nix {
pname = "denite-nvim";
- version = "2019-09-08";
+ version = "2019-09-19";
src = fetchFromGitHub {
owner = "Shougo";
repo = "denite.nvim";
- rev = "dedeed5cb3fab46465a1f30efa4875c4937ed2f7";
- sha256 = "1c65mhc4dw0zf1azqfnjf7l5gp2pxayq8qv0j1lvlqpn6q6gg1di";
+ rev = "a4969dfe9decc6184548b919379ec39027d627c6";
+ sha256 = "0crwjbvflvf5axgqqfj04q67ilgfnhchi0gxbxi152h6hm4f1wx3";
};
};
@@ -912,12 +912,12 @@ let
deoplete-lsp = buildVimPluginFrom2Nix {
pname = "deoplete-lsp";
- version = "2019-09-11";
+ version = "2019-09-20";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete-lsp";
- rev = "28b15222852a0668b25ce04b66302275ea8cd4c5";
- sha256 = "05n1smyjlzzq428h5hfs0drifxwjbshc9csv8jx7yjwpm4gqy2md";
+ rev = "335e8a03d5741aa42bd7ce64d79e31d7de570ab5";
+ sha256 = "0jn4fn9vkxf3av6mdmzixz20l9ca8n2sql7j9mcmh06mn86949bs";
};
};
@@ -945,12 +945,12 @@ let
deoplete-nvim = buildVimPluginFrom2Nix {
pname = "deoplete-nvim";
- version = "2019-09-14";
+ version = "2019-09-20";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deoplete.nvim";
- rev = "8df5ca1a9db11d919f3426f4d05b281be8913c89";
- sha256 = "0c0g9h8fajmwb2snkqj093jwc8d1ypxcvmv7s80c90l635bks1yj";
+ rev = "7f1d4d8b1f5dbf344f2d0d1f4b8c5d6a0aaa24a6";
+ sha256 = "1i8964nwarq2hwbixbj74n5a5k8c27hn7srbf8bbckk12rh1rjkj";
};
};
@@ -1057,12 +1057,12 @@ let
falcon = buildVimPluginFrom2Nix {
pname = "falcon";
- version = "2019-09-12";
+ version = "2019-09-17";
src = fetchFromGitHub {
owner = "fenetikm";
repo = "falcon";
- rev = "3ba858de194fc53b301fb640ab71b4263bc66175";
- sha256 = "1vbzlq7k2l0yqhdcnldkliwyzqskf1bqjgxl2l4c0nj8rcjm5bw3";
+ rev = "a6ba8a5d6745d92a23eb8b95562bbd9f05f8de5f";
+ sha256 = "0in4fs2aycwyspi1yck36f6w6m9jmjm5ckdq5wxisvjncnzxblhs";
};
};
@@ -1122,6 +1122,17 @@ let
};
};
+ float-preview-nvim = buildVimPluginFrom2Nix {
+ pname = "float-preview-nvim";
+ version = "2019-04-07";
+ src = fetchFromGitHub {
+ owner = "ncm2";
+ repo = "float-preview.nvim";
+ rev = "c5431b6d9bd4a8002f1a3eec42e9458ef4453ff3";
+ sha256 = "0ylrp0pmg822m7zp7dhyhmb05zbiy4gbq40l4whs249v0v4s9vyd";
+ };
+ };
+
floobits-neovim = buildVimPluginFrom2Nix {
pname = "floobits-neovim";
version = "2018-08-01";
@@ -1399,12 +1410,12 @@ let
jedi-vim = buildVimPluginFrom2Nix {
pname = "jedi-vim";
- version = "2019-08-18";
+ version = "2019-09-18";
src = fetchFromGitHub {
owner = "davidhalter";
repo = "jedi-vim";
- rev = "4f2499e4f2cb8bbecda6130a9dbb306fbb746ebe";
- sha256 = "1gnyrfx0qbap7vm2rvg0w70ybjdny7c1ixzymqd1w9wv7krz5h8y";
+ rev = "89c995e7d964fb71c715e6f4ac330e4c59b44128";
+ sha256 = "02ks1bwrdw7zmnf9mipvfjla9cv6904sx18q9qnyrqbkclrpfn0y";
fetchSubmodules = true;
};
};
@@ -1741,12 +1752,12 @@ let
neomake = buildVimPluginFrom2Nix {
pname = "neomake";
- version = "2019-09-03";
+ version = "2019-09-19";
src = fetchFromGitHub {
owner = "neomake";
repo = "neomake";
- rev = "776a6f6e27330e38324b7ad4873329760adf72e3";
- sha256 = "0lxqqknp1xmaa8ys5ck5m9pyxv0hbpaba1bsv6fx6j6jb71nz590";
+ rev = "ba38b8786ce68c36fc3cd2139a7820b25bea378a";
+ sha256 = "187zj4ircbbhn7gp3gabzrcnld3mz5g76ibp4wbcxngml60hhk9r";
};
};
@@ -1796,12 +1807,12 @@ let
neoterm = buildVimPluginFrom2Nix {
pname = "neoterm";
- version = "2019-09-12";
+ version = "2019-09-21";
src = fetchFromGitHub {
owner = "kassio";
repo = "neoterm";
- rev = "511f6c64ca2530f4356e0b301ee0f34b956ac7aa";
- sha256 = "1645q70jg81jy7gxdd8kr7i5pgkr2k7i71ijk4k23lxj0yd4fsim";
+ rev = "f6c22fda80455b52957b3fd11d94acc44db21250";
+ sha256 = "1r1fx958qhbs8xq31wrp5jyfvqjrs611xywv7avpwy9991rh33xv";
};
};
@@ -1829,23 +1840,23 @@ let
nerdcommenter = buildVimPluginFrom2Nix {
pname = "nerdcommenter";
- version = "2019-09-13";
+ version = "2019-09-20";
src = fetchFromGitHub {
owner = "scrooloose";
repo = "nerdcommenter";
- rev = "8228c7b0a7aa46b7846f7bf21bcb89ce24b9c20e";
- sha256 = "098alydvc9calcxkv77c8wkxw41p2az2dk70bx279ngz648i150c";
+ rev = "50f307bbf68e7402a1564689910ec65ae7ab1781";
+ sha256 = "0f3b9vx3lvq8612k1qnsdzbwp2drvy1vj3xqfxvxpzzsay10qcb1";
};
};
nerdtree = buildVimPluginFrom2Nix {
pname = "nerdtree";
- version = "2019-09-13";
+ version = "2019-09-15";
src = fetchFromGitHub {
owner = "scrooloose";
repo = "nerdtree";
- rev = "60ec10b477eefc81eeafafa2a8c1b00046ee48fb";
- sha256 = "1l9lz56cdkifp4arf05z298jg0yfvr2wvfbnzaff62yc38n4hb4b";
+ rev = "9193962ad88f15d9f426c3cfb8a274ff1dd0c5b2";
+ sha256 = "1mgi6k3q46za4c8z9nc4rn6pcj4bc9pkvfqbzymwn03pj4r6n8yp";
};
};
@@ -2016,12 +2027,12 @@ let
psc-ide-vim = buildVimPluginFrom2Nix {
pname = "psc-ide-vim";
- version = "2018-03-11";
+ version = "2019-09-17";
src = fetchFromGitHub {
owner = "frigoeu";
repo = "psc-ide-vim";
- rev = "6d4a3cc27e9782b703f6dd61ef5fdf27054bac0f";
- sha256 = "19w0cvrka3klxbh9z1yq873v92rhmxdj68bdnqxzwybf24hgsk9g";
+ rev = "5fb4e329e5c0c7d80f0356ab4028eee9c8bd3465";
+ sha256 = "0gzbxsq6wh8d9z9vyrff4hdpc66yg9y8hnxq4kjrz9qrccc75c1f";
};
};
@@ -2192,12 +2203,12 @@ let
rust-vim = buildVimPluginFrom2Nix {
pname = "rust-vim";
- version = "2019-08-30";
+ version = "2019-09-20";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust.vim";
- rev = "e99f3f5bc60e15c488989f6208769a271ccf0e9f";
- sha256 = "1sq6z878llxx78x7b8y3g1z9w1c412kj7zv9kq50njff43rddjiy";
+ rev = "d0456774a8a9616fea9df66e5131d6428450ebed";
+ sha256 = "1zbd7gbiyx1lmr8kg70xwad88rrs18q7rgy7yv85l57zs71ffnib";
};
};
@@ -2214,12 +2225,12 @@ let
semshi = buildVimPluginFrom2Nix {
pname = "semshi";
- version = "2019-09-12";
+ version = "2019-09-15";
src = fetchFromGitHub {
owner = "numirias";
repo = "semshi";
- rev = "741916c472adc40f82d191ec48e668e88251e626";
- sha256 = "0ld4fk8a8k2mf8q32zjq3lbb8nhdg214n5kp221z0vw2a72zgkjn";
+ rev = "ca6b2c16dd374d672861b2c73c33f41c88e5cb39";
+ sha256 = "0nmywnfs8rm6vlcyycnk1zvpp044n1d714xw5sn4qpw4gz1acbm7";
};
};
@@ -2245,6 +2256,17 @@ let
};
};
+ ShowMultiBase = buildVimPluginFrom2Nix {
+ pname = "ShowMultiBase";
+ version = "2010-10-18";
+ src = fetchFromGitHub {
+ owner = "vim-scripts";
+ repo = "ShowMultiBase";
+ rev = "85a39fd12668ce973d3d9282263912b2b8f0d338";
+ sha256 = "0hg5352ahzgh2kwqha5v8ai024fld93xag93hb53wjf5b8nzsz8i";
+ };
+ };
+
sky-color-clock-vim = buildVimPluginFrom2Nix {
pname = "sky-color-clock-vim";
version = "2018-11-03";
@@ -2863,12 +2885,12 @@ let
vim-airline-themes = buildVimPluginFrom2Nix {
pname = "vim-airline-themes";
- version = "2019-07-23";
+ version = "2019-09-18";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline-themes";
- rev = "b85165844240fe0b9121df487679a320e053abc7";
- sha256 = "0yi381n7k3flcld66n8hhb3fzbqflif5d07qwn8f6zsg9n52dciw";
+ rev = "0d5c5c1e2995126e76606a628316c8e3f5efb37a";
+ sha256 = "1xra1yiz03pap18hsq00053s42xf185ls9qydrkgpyjypqdnm5bg";
};
};
@@ -2984,12 +3006,12 @@ let
vim-choosewin = buildVimPluginFrom2Nix {
pname = "vim-choosewin";
- version = "2019-08-21";
+ version = "2019-09-17";
src = fetchFromGitHub {
owner = "t9md";
repo = "vim-choosewin";
- rev = "6da5c0b96e63f51f0801266b781dee0562e74da9";
- sha256 = "0f1x57gzvv97h8maz8i1h5dmgxqvf4lwf1bza380l0nm7m5bdpg5";
+ rev = "f91cdb9be92ce3bb9bccba16e8c659d5e8d7454f";
+ sha256 = "1nq1vpwv6h5sc849y26nzkrmr9w3aj6w32apyih9kx0jh4ybv0xs";
};
};
@@ -3138,12 +3160,12 @@ let
vim-devicons = buildVimPluginFrom2Nix {
pname = "vim-devicons";
- version = "2019-09-14";
+ version = "2019-09-17";
src = fetchFromGitHub {
owner = "ryanoasis";
repo = "vim-devicons";
- rev = "3e67b21c6e6f955ee5051608c559c2e91c2ce3e5";
- sha256 = "0105s1d1pn1ga2zpqi1lgjnx36plgfsniqx1b560dvmg8wglzpwx";
+ rev = "0f9146e9fafe3317693ca214a3f68cd1e036424f";
+ sha256 = "086ng0gja855bmh99qcwwvchwk64dgz1kj1j24yapx2ab314w6g8";
};
};
@@ -3171,12 +3193,12 @@ let
vim-dispatch = buildVimPluginFrom2Nix {
pname = "vim-dispatch";
- version = "2019-08-07";
+ version = "2019-09-20";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-dispatch";
- rev = "a76bec9196fe27e195d167a5c2ee1da763d31b96";
- sha256 = "0a9sxpdpll68drk3w98xvmv2z31q4afw70iwjrb7lmp8raxn0i2z";
+ rev = "1f39fa150fc9275ff264e1f8807fc6fcbbdae012";
+ sha256 = "0c1492hh0gldjyd8w3wsyz6py7qw4r2idfjh8klkk39pg9aajwjl";
};
};
@@ -3369,12 +3391,12 @@ let
vim-fugitive = buildVimPluginFrom2Nix {
pname = "vim-fugitive";
- version = "2019-09-11";
+ version = "2019-09-19";
src = fetchFromGitHub {
owner = "tpope";
repo = "vim-fugitive";
- rev = "26f6037de68254376cd062286aeeaa7db804a973";
- sha256 = "0cza5v99493llr02all1zwjy3gk19hypngk6j3kcrg7530c9sq6n";
+ rev = "1d8c0a38b2fc4ce9ca4204676573b6335725ff75";
+ sha256 = "0ln11qdpsssgqd122zldfmjvwyvxild8a0yxgdazp720dypkvgjm";
};
};
@@ -3413,12 +3435,12 @@ let
vim-gitgutter = buildVimPluginFrom2Nix {
pname = "vim-gitgutter";
- version = "2019-09-05";
+ version = "2019-09-19";
src = fetchFromGitHub {
owner = "airblade";
repo = "vim-gitgutter";
- rev = "b71ab64dc16a4665c3214f109000a11d30708079";
- sha256 = "1pqd9zf311s0in5x3njzcxkw6zyqa2vpznl5ahd4b9hk4qvcm2v8";
+ rev = "76aa5920dba9b05991940f7dc29dc79ad7af0a3e";
+ sha256 = "0yazz5aqyfkwhx2x44pp8x81wswrh7sjgslbimwa9d67yvnh0bz6";
};
};
@@ -3446,12 +3468,12 @@ let
vim-go = buildVimPluginFrom2Nix {
pname = "vim-go";
- version = "2019-09-13";
+ version = "2019-09-21";
src = fetchFromGitHub {
owner = "fatih";
repo = "vim-go";
- rev = "041ca9669bbbe4a50b382d8972a7191edf873f55";
- sha256 = "1q3sca1gpxc7iqdk6wkdzndwpf8i8z69is4jwmnhr0sk0jrjby6q";
+ rev = "6904ded741573113c20408abdce455c5d3969e08";
+ sha256 = "12ill4rpfc3bzxa6s47mscvbclidnckxci3rdixzkvrmwsyyip6k";
};
};
@@ -3710,12 +3732,12 @@ let
vim-javacomplete2 = buildVimPluginFrom2Nix {
pname = "vim-javacomplete2";
- version = "2019-02-07";
+ version = "2019-09-16";
src = fetchFromGitHub {
owner = "artur-shaik";
repo = "vim-javacomplete2";
- rev = "29fee1cb4554eef3e5a30984ac7a389766ee4da4";
- sha256 = "1kzx80hz9n2bawrx9lgsfqmjkljbgc1lpl8abnhfzkyy9ax9svk3";
+ rev = "24e7908bae33df5851f7085f5ec3af0ca81f060c";
+ sha256 = "1bqrhkxk6f5ha7xlkgqrp96a1pfk9258x5b4iz3kbk2gqp6mcrmb";
};
};
@@ -3799,12 +3821,12 @@ let
vim-jsx-pretty = buildVimPluginFrom2Nix {
pname = "vim-jsx-pretty";
- version = "2019-09-07";
+ version = "2019-09-18";
src = fetchFromGitHub {
owner = "MaxMEllon";
repo = "vim-jsx-pretty";
- rev = "6871eb1696478a8e295bab3e5ae7aae05faa2605";
- sha256 = "0i80d5vdd5ycx0g0h00raa3g48xhgw3wf3blp1m3hwap6cxy9p8h";
+ rev = "89c30c0defe8ddb31bc0d3cfa5f22f3f6d8eb24f";
+ sha256 = "1l5cwlbmihzxldpxlvn5gc47s0awqs908skzq43cy44iql829hir";
};
};
@@ -4162,12 +4184,12 @@ let
vim-parinfer = buildVimPluginFrom2Nix {
pname = "vim-parinfer";
- version = "2019-07-02";
+ version = "2019-09-19";
src = fetchFromGitHub {
owner = "bhurlow";
repo = "vim-parinfer";
- rev = "217255335414b3046f683bd3085fbf16b00bb090";
- sha256 = "10jhcmkivspr15xmprdi484r8va7v8jqflx9xkxwficfjd52lvck";
+ rev = "eba349553e2438dcc9d37f3a6aff2807af731c3f";
+ sha256 = "07cppsywz60ss0af86z4ia9kbixnwf9bl437fxq7hwhx6wig0njq";
};
};
@@ -4272,12 +4294,12 @@ let
vim-puppet = buildVimPluginFrom2Nix {
pname = "vim-puppet";
- version = "2019-04-23";
+ version = "2019-09-16";
src = fetchFromGitHub {
owner = "rodjek";
repo = "vim-puppet";
- rev = "b2ae19b3ef397ed7404bf15051cbc5ff655b893e";
- sha256 = "1hidg2cqls9qy0lazahxi26gyj4lwncpc3vzy4m9xjd3y1lmlqri";
+ rev = "fc6e9efef797c505b2e67631ad2517d7d6e8f00d";
+ sha256 = "0a4qv8f74g6c2i9l6kv3zbcq9lskhdqg86w12f8hshw1vkfmfr4x";
};
};
@@ -4503,12 +4525,12 @@ let
vim-snippets = buildVimPluginFrom2Nix {
pname = "vim-snippets";
- version = "2019-09-13";
+ version = "2019-09-19";
src = fetchFromGitHub {
owner = "honza";
repo = "vim-snippets";
- rev = "2221222df8cbc1a99c29f3e55a7c340f4d16b1ff";
- sha256 = "0vjgxxg7aq5j7lxc0pn0fral5gjb4fpc42442q8mkik6cpkd92h0";
+ rev = "db67e54d5998dbfbe9fe4161a29d74323031b1fa";
+ sha256 = "1d5mynnb90fnc1w0glfg2m953iphmhxndd5gmflg25720n3msdls";
};
};
@@ -4558,12 +4580,12 @@ let
vim-startify = buildVimPluginFrom2Nix {
pname = "vim-startify";
- version = "2019-08-27";
+ version = "2019-09-19";
src = fetchFromGitHub {
owner = "mhinz";
repo = "vim-startify";
- rev = "13b67af7aa6a454adbf1f0925bf41737889ed830";
- sha256 = "015vak1awjzxwwrhkq6hdwf7wb7v0llswm95ky7zvkpqv8yncxhh";
+ rev = "9814df57c199271a9b2b70c75ebe4189dc96b126";
+ sha256 = "1rsss95six8f9w075k46318kq2sapijik13jzkakf5nfxlbi2raw";
};
};
@@ -4657,12 +4679,12 @@ let
vim-terraform = buildVimPluginFrom2Nix {
pname = "vim-terraform";
- version = "2019-08-29";
+ version = "2019-09-15";
src = fetchFromGitHub {
owner = "hashivim";
repo = "vim-terraform";
- rev = "ed2b552cbf8d8c14a56f75d106a6efb4303f5233";
- sha256 = "0a67ayc12l6gc4b80lxic1qvr2sfbgsa6bxshdsq9p661vsmym1p";
+ rev = "81dd8ea296660a51618cefed62462ddff56f22fa";
+ sha256 = "1im4klyfgz5ab98ygc0jw1h9gnylab8zvzm4pk2rga2zbz9ymkxj";
};
};
@@ -4976,12 +4998,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2019-09-13";
+ version = "2019-09-20";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "365e3d27d922036d5770a2591a3670cc5a3db777";
- sha256 = "1rgafa05lfvyzznlq1y7cb3b3q3m2df5j82ggjwds7wfl4pm4zcz";
+ rev = "ece9f454ac2f590629ebbbbe4b0bb23deafdcb04";
+ sha256 = "05h1hya3c4k9z1x2k13k1a1zpq8lf7nr8ggg548mmayh0cv5qvqs";
};
};
@@ -5131,12 +5153,12 @@ let
youcompleteme = buildVimPluginFrom2Nix {
pname = "youcompleteme";
- version = "2019-08-31";
+ version = "2019-09-18";
src = fetchFromGitHub {
owner = "valloric";
repo = "youcompleteme";
- rev = "5274b73fc26deb5704733e0efbb4b2d53dc6dc9c";
- sha256 = "03kpq7mw4dimaahf9q6qm6nblzw7hr0p7i6m6x3b9ilkka5q13rz";
+ rev = "bdbfdd938fe711ff75155546fc0a0e0bebcb952a";
+ sha256 = "0dxip8xi6s74045hvbx6av16caid150lvywg2sn7kq5x6zcc9dgc";
fetchSubmodules = true;
};
};
@@ -5165,23 +5187,23 @@ let
zenburn = buildVimPluginFrom2Nix {
pname = "zenburn";
- version = "2019-09-13";
+ version = "2019-09-20";
src = fetchFromGitHub {
owner = "jnurmine";
repo = "zenburn";
- rev = "13254888f5ebe53c3d9276c8afc18efe6addec8e";
- sha256 = "1xdi8q4cggv16bv71ap8y8xrmzb7pjvknrymrnab55fgbpkxhzaj";
+ rev = "d39461f7ad13814307cc0115122b32901662a86e";
+ sha256 = "1ww4irkl6h2q9p1y2gj87j4hy0rh2gkfz8nyzfn32z6rjsmj5n3c";
};
};
zig-vim = buildVimPluginFrom2Nix {
pname = "zig-vim";
- version = "2019-09-05";
+ version = "2019-09-19";
src = fetchFromGitHub {
owner = "zig-lang";
repo = "zig.vim";
- rev = "06e918ba082bbe41544208430d6946b547ce3530";
- sha256 = "1sfh1xmsf8smgr7vpj6r11gp3wmw5zzf095w2li9rw8l2g54cwql";
+ rev = "29d9358a825c56a31f6438ea93eb09f091998f0d";
+ sha256 = "1rah0fm3qxv3jjb0ma2pn5kvbg2fwg4p5ycgm6vjbq95j73f5aq1";
};
};
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 926c509d12f..107105d6b72 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -239,6 +239,7 @@ nathanaelkane/vim-indent-guides
nathangrigg/vim-beancount
navicore/vissort.vim
nbouscal/vim-stylish-haskell
+ncm2/float-preview.nvim
ncm2/ncm2
ncm2/ncm2-bufword
ncm2/ncm2-jedi
@@ -445,6 +446,7 @@ vim-scripts/PreserveNoEOL
vim-scripts/random.vim
vim-scripts/Rename
vim-scripts/ReplaceWithRegister
+vim-scripts/ShowMultiBase
vim-scripts/tabmerge
vim-scripts/taglist.vim
vim-scripts/wombat256.vim
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
index 03556296ca1..16454cbc1a5 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
@@ -14,8 +14,8 @@ appleDerivation {
# + lib.optionalString hostPlatform.isAarch32 "-D__arm__";
NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1"
"-DDAEMON_GID=1"
- "-DDEFAULT_AT_QUEUE=\'a\'"
- "-DDEFAULT_BATCH_QUEUE=\'b\'"
+ "-DDEFAULT_AT_QUEUE='a'"
+ "-DDEFAULT_BATCH_QUEUE='b'"
"-DPERM_PATH=\"/usr/lib/cron/\""
"-DOPEN_DIRECTORY"
"-DNO_DIRECT_RPC"
diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix
index 036cd3f28a1..e66ac4d65ab 100644
--- a/pkgs/os-specific/linux/exfat/default.nix
+++ b/pkgs/os-specific/linux/exfat/default.nix
@@ -6,13 +6,13 @@ assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.versi
stdenv.mkDerivation rec {
name = "exfat-nofuse-${version}-${kernel.version}";
- version = "2018-04-16";
+ version = "2019-09-06";
src = fetchFromGitHub {
- owner = "dorimanx";
+ owner = "AdrianBan";
repo = "exfat-nofuse";
- rev = "01c30ad52625a7261e1b0d874553b6ca7af25966";
- sha256 = "0n1ibamf1yj8iqapc86lfscnky9p07ngsi4f2kpv3d5r2s6mzsh6";
+ rev = "5536f067373c196f152061f5000fe0032dc07c48";
+ sha256 = "00mhadsv2iw8z00a6170hwbvk3afx484nn3irmd5f5kmhs34sw7k";
};
hardeningDisable = [ "pic" ];
@@ -27,18 +27,9 @@ stdenv.mkDerivation rec {
install -m644 -b -D exfat.ko $out/lib/modules/${kernel.modDirVersion}/kernel/fs/exfat/exfat.ko
'';
- patches = [
- # fix compile-errors in 4.18 and 4.20
- # ref: https://github.com/dorimanx/exfat-nofuse/pull/137
- (fetchpatch {
- url = https://github.com/dorimanx/exfat-nofuse/compare/01c30ad52625a7261e1b0d874553b6ca7af25966...f93a47e6414d567a1e7f6ab7f34b015b20f9a050.patch ;
- sha256 = "0w57pi9h6dwjxfgc3zpwy6sr4zw42hn1zj72f7wgfpqrx6d8xkh5";
- } )
- ];
-
meta = {
description = "exfat kernel module";
- homepage = https://github.com/dorimanx/exfat-nofuse;
+ inherit (src.meta) homepage;
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ makefu ];
platforms = lib.platforms.linux;
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4ad222b83e4..3b409f15aba 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -52,6 +52,9 @@ let
CPU_FREQ_DEFAULT_GOV_PERFORMANCE = yes;
CPU_FREQ_GOV_SCHEDUTIL = whenAtLeast "4.9" yes;
PM_WAKELOCKS = yes;
+ # Power-capping framework and support for INTEL RAPL
+ POWERCAP = yes;
+ INTEL_RAPL = module;
};
external-firmware = {
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 1b4700a2e39..6c24311338a 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -54,6 +54,7 @@ lib.overrideDerivation (buildLinux (args // {
copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
'' + lib.optionalString (lib.elem stdenv.hostPlatform.system ["armv7l-linux" "aarch64-linux"]) ''
copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
+ copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb
copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb
'';
diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix
index a09bb2a6ceb..f2bf5c94970 100644
--- a/pkgs/os-specific/linux/libratbag/default.nix
+++ b/pkgs/os-specific/linux/libratbag/default.nix
@@ -1,15 +1,16 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
-, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3 }:
+, glib, systemd, udev, libevdev, gitMinimal, check, valgrind, swig, python3
+, json-glib, libunistring }:
stdenv.mkDerivation rec {
pname = "libratbag";
- version = "0.9.905";
+ version = "0.10";
src = fetchFromGitHub {
owner = "libratbag";
repo = "libratbag";
rev = "v${version}";
- sha256 = "0bh1nf9sv7wka0vh5bz9krf2cfxz0rr64hrpdm7imsb6cn39k01y";
+ sha256 = "10hahpv2n48b5z35d2draka7cz1a9vw53rvwfmpp5dibwnmi81jb";
};
nativeBuildInputs = [
@@ -17,7 +18,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- glib systemd udev libevdev
+ glib systemd udev libevdev json-glib libunistring
(python3.withPackages (ps: with ps; [ evdev pygobject3 ]))
];
diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix
index e177b284bbd..1229c442fa2 100644
--- a/pkgs/os-specific/linux/piper/default.nix
+++ b/pkgs/os-specific/linux/piper/default.nix
@@ -4,7 +4,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "piper";
- version = "0.2.903";
+ version = "0.3";
format = "other";
@@ -12,12 +12,16 @@ python3.pkgs.buildPythonApplication rec {
owner = "libratbag";
repo = "piper";
rev = version;
- sha256 = "0zh4lm074x5gwvx663bapdyv8lf84yjwfg8cpf77rszyja1hx13a";
+ sha256 = "1vz7blhx6qsfrk5znwr0fj1k8vahnlaz6rn7ifcgxmq398mmz8z7";
};
nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
- buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme python3 ];
- propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ];
+ buildInputs = [
+ gtk3 glib gnome3.adwaita-icon-theme python3
+ ];
+ propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [
+ gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now
+ ];
postPatch = ''
chmod +x meson_install.sh # patchShebangs requires executable file
diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix
index 81e5a2af9cd..d2c3c11c939 100644
--- a/pkgs/os-specific/linux/radeontools/default.nix
+++ b/pkgs/os-specific/linux/radeontools/default.nix
@@ -1,33 +1,25 @@
-{ stdenv, fetchurl, pciutils }:
+{ stdenv, fetchurl
+, autoreconfHook
+, pciutils
+, pkgconfig
+, xorg
+}:
-stdenv.mkDerivation {
- name = "radeontool-1.5";
-
- inherit pciutils;
-
- # Don't know wether it's a good idea to hardcode the lspci path..
- # But it will work on nix..
- postUnpack = ''
- cd $sourceRoot
- sed -i "s%lspci%$pciutils/sbin/lspci%g" radeontool.c
- cd ..
- '';
+stdenv.mkDerivation rec {
+ pname = "radeontool";
+ version = "1.6.3";
src = fetchurl {
- url = http://fdd.com/software/radeon/radeontool-1.5.tar.gz;
- sha256 = "0qbkawhhq0y0gqbbql7q04y0v0hims5c4jkjsbc1y03rf9kr10ar";
+ url = "https://people.freedesktop.org/~airlied/radeontool/${pname}-${version}.tar.gz";
+ sha256 = "0mjk9wr9rsb17yy92j6yi16hfpa6v5r1dbyiy60zp4r125wr63za";
};
- installPhase = ''
- mkdir -p $out/bin
- chmod +x lightwatch.pl
- cp radeontool lightwatch.pl $out/bin
- '';
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ xorg.libpciaccess ];
- meta = {
- description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards";
- homepage = http://fdd.com/software/radeon/;
- license = stdenv.lib.licenses.zlib;
- broken = true;
+ meta = with stdenv.lib; {
+ description = "Lowlevel tools to tweak register and dump state on radeon GPUs";
+ homepage = "https://airlied.livejournal.com/";
+ license = licenses.zlib;
};
}
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index 81c1f8ab0f5..68364580346 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, kernel, bc }:
+{ stdenv, fetchFromGitHub, kernel, bc, nukeReferences }:
stdenv.mkDerivation rec {
name = "rtl8812au-${kernel.version}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1fy0f8ihxd0i5kr8gmky8v8xl0ns6bhxfdn64c97c5irzdvg37sr";
};
- nativeBuildInputs = [ bc ];
+ nativeBuildInputs = [ bc nukeReferences ];
buildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" "format" ];
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
+ postInstall = ''
+ nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
+ '';
+
meta = with stdenv.lib; {
description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod";
homepage = https://github.com/zebulon2/rtl8812au-driver-5.2.20;
diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix
index ca63c5c6a8d..1829bd6763f 100644
--- a/pkgs/os-specific/linux/rtl8821au/default.nix
+++ b/pkgs/os-specific/linux/rtl8821au/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, kernel, bc }:
+{ stdenv, fetchFromGitHub, kernel, bc, nukeReferences }:
stdenv.mkDerivation rec {
name = "rtl8821au-${kernel.version}-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1kmdxgbh0s0v9809kdsi39p0jbm5cf10ivy40h8qj9hn70g1gw8q";
};
- nativeBuildInputs = [ bc ];
+ nativeBuildInputs = [ bc nukeReferences ];
buildInputs = kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" "format" ];
@@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'';
+ postInstall = ''
+ nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko
+ '';
+
meta = with stdenv.lib; {
description = "rtl8821AU, rtl8812AU and rtl8811AU chipset driver with firmware";
homepage = https://github.com/zebulon2/rtl8812au;
diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix
index 447f9127d60..94ba31d59e1 100644
--- a/pkgs/os-specific/linux/rtlwifi_new/default.nix
+++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix
@@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
in stdenv.mkDerivation rec {
pname = "rtlwifi_new";
- version = "2018-02-17";
+ version = "2019-08-21";
src = fetchFromGitHub {
owner = "lwfinger";
repo = "rtlwifi_new";
- rev = "0588ac0cc5f530e7764705416370b70d3c2afedc";
- sha256 = "1vs8rfw19lcs04bapa97zlnl5x0kf02sdw5ik0hdm27wgk0z969m";
+ rev = "a108e3de87c2ed30b71c3c4595b79ab7a2f9e348";
+ sha256 = "15kjs9i9vvmn1cdzccd5cljf3m45r4ssm65klkj2fdkf3kljj38k";
};
hardeningDisable = [ "pic" "format" ];
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index b4e0d64efb6..8c1dd904c3b 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -15,10 +15,7 @@
, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools
}:
-let
- pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation {
version = "243";
pname = "systemd";
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 675f1beb891..56fa95391cc 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -2,23 +2,23 @@
buildGoModule rec {
pname = "caddy";
- version = "1.0.0";
+ version = "1.0.3";
- goPackagePath = "github.com/mholt/caddy";
+ goPackagePath = "github.com/caddyserver/caddy";
subPackages = [ "caddy" ];
src = fetchFromGitHub {
- owner = "mholt";
- repo = "caddy";
+ owner = "caddyserver";
+ repo = pname;
rev = "v${version}";
- sha256 = "08hknms0lg5c6yhkz9g1i32d11xch2kqkjbk4w4kd1f1xpa6jvmz";
+ sha256 = "1n7i9w4vva5x5wry7gzkyfylk39x40ykv7ypf1ca3zbbk7w5x6mw";
};
- modSha256 = "02cb3swc180kh5vc2s5w8a6vidvw768l9bv5zg8zya183wzvfczs";
+ modSha256 = "0np0mbs0mrn8scqa0dgvi7ya1707b3883prdaf1whsqrcr71ig8q";
buildFlagsArray = ''
-ldflags=
- -X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version}
+ -s -w -X github.com/caddyserver/caddy/caddy/caddymain.gitTag=v${version}
'';
meta = with stdenv.lib; {
diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index b7c2e01e97a..e993f70b105 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "consul";
- version = "1.6.0";
+ version = "1.6.1";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/consul";
@@ -19,7 +19,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = pname;
inherit rev;
- sha256 = "16rngyv9dp19gjbjwfvnmlfxbq67fxs55hgvvcyn9mplm1j0bb52";
+ sha256 = "00dvvxi7y80v2b6wzwyfzhxv1ksnl1m0nmdjl98dhq5ikb0v7p28";
};
preBuild = ''
diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix
index 24e607f4b00..ae083f17ada 100644
--- a/pkgs/servers/dante/default.nix
+++ b/pkgs/servers/dante/default.nix
@@ -11,15 +11,15 @@ stdenv.mkDerivation rec {
buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc ];
- configureFlags = [
- "--with-libc=libc.so.6"
- ];
+ configureFlags = ["--with-libc=libc${stdenv.targetPlatform.extensions.sharedLibrary}"];
+
+ dontAddDisableDepTrack = stdenv.isDarwin;
meta = with stdenv.lib; {
description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity.";
homepage = "https://www.inet.no/dante/";
maintainers = [ maintainers.arobyn ];
license = licenses.bsdOriginal;
- platforms = platforms.linux;
+ platforms = platforms.linux ++ platforms.darwin;
};
}
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 615edeb81ec..3d61961321d 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "grafana";
- version = "6.3.5";
+ version = "6.3.6";
goPackagePath = "github.com/grafana/grafana";
@@ -12,12 +12,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "0qimqdlxkvh31n730gp1wl1va0bza69bw90nyzrmfb34733pmni2";
+ sha256 = "1dxsd32ny7wcpfyhhdf5m6anzgs0mkyvlrha7ps5pfyiix7brrlk";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "1rw2ws610ba2vl5kv3yay8s69xkqzisrl6q27zxa5kj48khvy101";
+ sha256 = "0cz6bg8q8lxxvqh9nb2b64rr5brkmbvpvvg4x7dykc04vcjivf6n";
};
postPatch = ''
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 2352d7c1088..ebd9938f12f 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -3,7 +3,7 @@
, libaio, libevent, jemalloc, cracklib, systemd, numactl, perl
, fixDarwinDylibNames, cctools, CoreServices
, asio, buildEnv, check, scons
-, less
+, less, fetchpatch
, withoutClient ? false
}:
@@ -49,7 +49,12 @@ common = rec { # attributes common to both builds
patches = [
./cmake-includedir.patch
./cmake-libmariadb-includedir.patch
- ];
+ ] ++ optional stdenv.hostPlatform.isDarwin (fetchpatch {
+ url = "https://github.com/MariaDB/mariadb-connector-c/commit/ee91b2c98a63acb787114dee4f2694e154630928.patch";
+ extraPrefix = "libmariadb/";
+ sha256 = "06i865zwyhs9fvrgmargzn09pbg1cmably3c4wifd241bj8ig8qk";
+ stripLen = 1;
+ });
cmakeFlags = [
"-DBUILD_CONFIG=mysql_release"
diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix
index de09931e7c1..a7199c66547 100644
--- a/pkgs/tools/admin/pulumi/default.nix
+++ b/pkgs/tools/admin/pulumi/default.nix
@@ -4,17 +4,17 @@ with lib;
let
- version = "0.17.27";
+ version = "1.1.0";
# switch the dropdown to “manual” on https://pulumi.io/quickstart/install.html # TODO: update script
pulumiArchPackage = {
x86_64-linux = {
url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-linux-x64.tar.gz";
- sha256 = "13ajgc8x5l3s93hmz6jg88if10bvd319jmkljy4n26zdp30vfqmw";
+ sha256 = "1r498pxsjdj9mhdzh9vh4nw8fcjxfga44xlg43b0yakkgrp7c224";
};
x86_64-darwin = {
url = "https://get.pulumi.com/releases/sdk/pulumi-v${version}-darwin-x64.tar.gz";
- sha256 = "0chpbnz2s4icwgmfq6kl8blz5mg4lpdqg061w3nh0p04adpgrn48";
+ sha256 = "02nr5yxn5aqgbwrnl4shgd6rh4n4v8giqki4qkbgx74xf3bbwihg";
};
};
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 21e748cc79d..241e552b05c 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -17,9 +17,12 @@
, enableKeyfinder ? true, keyfinder-cli ? null
, enableKodiupdate ? true
, enableLastfm ? true
+, enableLoadext ? true
, enableMpd ? true
+, enablePlaylist ? true
, enableReplaygain ? true, bs1770gain ? null
, enableSonosUpdate ? true
+, enableSubsonicupdate ? true
, enableThumbnails ? true
, enableWeb ? true
@@ -60,10 +63,13 @@ let
kodiupdate = enableKodiupdate;
lastgenre = enableLastfm;
lastimport = enableLastfm;
+ loadext = enableLoadext;
mpdstats = enableMpd;
mpdupdate = enableMpd;
+ playlist = enablePlaylist;
replaygain = enableReplaygain;
sonosupdate = enableSonosUpdate;
+ subsonicupdate = enableSubsonicupdate;
thumbnails = enableThumbnails;
web = enableWeb;
};
@@ -102,13 +108,13 @@ let
in pythonPackages.buildPythonApplication rec {
pname = "beets";
- version = "1.4.7";
+ version = "1.4.9";
src = fetchFromGitHub {
owner = "beetbox";
repo = "beets";
rev = "v${version}";
- sha256 = "17gfz0g7pqm6wha8zf63zpw07zgi787w1bjwdcxdh1l3z4m7jc9l";
+ sha256 = "1qxdqbzvz97zgykzdwn78g2xyxmg0q2jdb12dnjnrwvhmjv67vi8";
};
propagatedBuildInputs = [
@@ -127,6 +133,9 @@ in pythonPackages.buildPythonApplication rec {
++ optional (enableFetchart
|| enableEmbyupdate
|| enableKodiupdate
+ || enableLoadext
+ || enablePlaylist
+ || enableSubsonicupdate
|| enableAcousticbrainz)
pythonPackages.requests
++ optional enableConvert ffmpeg
@@ -160,14 +169,6 @@ in pythonPackages.buildPythonApplication rec {
patches = [
./replaygain-default-bs1770gain.patch
./keyfinder-default-bin.patch
-
- # Fix Python 3.7 compatibility
- (fetchpatch {
- url = "https://github.com/beetbox/beets/commit/"
- + "15d44f02a391764da1ce1f239caef819f08beed8.patch";
- sha256 = "12rjb4959nvnrm3fvvki7chxjkipa0cy8i0yi132xrcn8141dnpm";
- excludes = [ "docs/changelog.rst" ];
- })
];
postPatch = ''
diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix
index 591cd5fe040..7b1e5ed6c0a 100644
--- a/pkgs/tools/misc/diskus/default.nix
+++ b/pkgs/tools/misc/diskus/default.nix
@@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "diskus";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "diskus";
rev = "v${version}";
- sha256 = "18scxspi5ncags8bnxq4ah9w8hrlwwlgpq7q9qfh4d81asmbyr8n";
+ sha256 = "087w58q5kd3r23a9qnhqgvq4vhv69b5a6a7n3kh09g5cjszy8s05";
};
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ];
- cargoSha256 = "13d4h6f3idwj2bxafqrjihgwwr8v3k158r7b569jp7q2v1msqqx1";
+ cargoSha256 = "07wsl1vw2aimgmrlri03pfcxv13klqxyvmmsbzgnq9sc9qzzy8gp";
meta = with stdenv.lib; {
description = "A minimal, fast alternative to 'du -sh'";
@@ -21,5 +21,9 @@ rustPlatform.buildRustPackage rec {
license = with licenses; [ asl20 /* or */ mit ];
maintainers = [ maintainers.fuerbringer ];
platforms = platforms.unix;
+ longDescription = ''
+ diskus is a very simple program that computes the total size of the
+ current directory. It is a parallelized version of du -sh.
+ '';
};
}
diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
index 5b0ad830b19..59685aa721a 100644
--- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, mkDerivation, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }:
+{ stdenv, fetchurl, mkDerivation, pkgconfig, qtbase, qmake, imagemagick
+, libyubikey, yubikey-personalization }:
mkDerivation rec {
name = "yubikey-personalization-gui-3.1.25";
@@ -8,12 +9,27 @@ mkDerivation rec {
sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8";
};
- nativeBuildInputs = [ pkgconfig qmake ];
+ nativeBuildInputs = [ pkgconfig qmake imagemagick ];
buildInputs = [ yubikey-personalization qtbase libyubikey ];
installPhase = ''
- mkdir -p $out/bin
- cp build/release/yubikey-personalization-gui $out/bin
+ install -D -m0755 build/release/yubikey-personalization-gui "$out/bin/yubikey-personalization-gui"
+ install -D -m0644 resources/lin/yubikey-personalization-gui.1 "$out/share/man/man1/yubikey-personalization-gui.1"
+
+ # Desktop files
+ install -D -m0644 resources/lin/yubikey-personalization-gui.desktop "$out/share/applications/yubikey-personalization-gui.desktop"
+ install -D -m0644 resources/lin/yubikey-personalization-gui.desktop "$out/share/pixmaps/yubikey-personalization-gui.xpm"
+
+ # Icons
+ install -D -m0644 resources/lin/yubikey-personalization-gui.png "$out/share/icons/hicolor/128x128/apps/yubikey-personalization-gui.png"
+ for SIZE in 16 24 32 48 64 96; do
+ # set modify/create for reproducible builds
+ convert -scale ''${SIZE} +set date:create +set date:modify \
+ resources/lin/yubikey-personalization-gui.png \
+ yubikey-personalization-gui.png
+
+ install -D -m0644 yubikey-personalization-gui.png "$out/share/icons/hicolor/''${SIZE}x''${SIZE}/apps/yubikey-personalization-gui.png"
+ done
'';
meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index cf3c173e1b2..4230762d946 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -1,17 +1,35 @@
-{ stdenv, fetchurl, python3Packages }:
+{ stdenv, fetchFromGitHub, python3Packages, docutils, }:
python3Packages.buildPythonApplication rec {
pname = "httpie";
version = "1.0.3";
- src = python3Packages.fetchPypi {
- inherit pname version;
- sha256 = "103fcigpxf4nqmrdqjnyz7d9n4n16906slwmmqqc0gkxv8hnw6vd";
+ src = fetchFromGitHub {
+ owner = "jakubroztocil";
+ repo = "httpie";
+ rev = version;
+ sha256 = "0y30sp0x3nmgzi4dqw1rc3705hnn36ij0zlyyx7g6fqdq8bd8p5q";
};
propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ];
+ dontUseSetuptoolsCheck = true;
- doCheck = false;
+ disabledTests = [
+ "test_current_version"
+ "test_error"
+ ];
+
+ checkInputs = with python3Packages; [
+ mock
+ pytest
+ pytest-httpbin
+ pytestCheckHook
+ ];
+
+ # the tests call rst2pseudoxml.py from docutils
+ preCheck = ''
+ export PATH=${docutils}/bin:$PATH
+ '';
meta = {
description = "A command line HTTP client whose goal is to make CLI human-friendly";
diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index b9a4360abfb..7f6aeace7b8 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -1,29 +1,54 @@
{ monolithic ? true # build monolithic amule
-, daemon ? false # build amule daemon
+, enableDaemon ? false # build amule daemon
, httpServer ? false # build web interface for the daemon
, client ? false # build amule remote gui
-, fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null
-, pkgconfig, makeWrapper, libX11 ? null }:
+, fetchFromGitHub, fetchpatch, stdenv, lib, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null
+, autoreconfHook, pkgconfig, makeWrapper, libX11 ? null }:
assert httpServer -> libpng != null;
assert client -> libX11 != null;
-with stdenv;
-mkDerivation rec {
- name = "aMule-2.3.2";
+stdenv.mkDerivation rec {
+ pname = "amule";
+ version = "2.3.2";
- src = fetchurl {
- url = "mirror://sourceforge/amule/${name}.tar.xz";
- sha256 = "0a1rd33hjl30qyzgb5y8m7dxs38asci3kjnlvims1ky6r3yj0izn";
+ src = fetchFromGitHub {
+ owner = "amule-project";
+ repo = "amule";
+ rev = version;
+ sha256 = "010wxm6g9f92x6fympj501zbnjka32rzbx0sk3a2y4zpih5d2nsn";
};
- buildInputs =
- [ zlib wxGTK perl cryptopp libupnp gettext pkgconfig makeWrapper ]
- ++ lib.optional httpServer libpng
- ++ lib.optional client libX11;
+ patches = [
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/amule-project/amule/pull/135.patch";
+ sha256 = "1n24r1j28083b8ipbnh1nf6i4j6vx59pdkfl1c0g6bb4psx9wvvi";
+ name = "libupnp_18.patch";
+ })
+ ];
- # See: https://github.com/amule-project/amule/issues/126
- patches = [ ./upnp-1.8.patch ];
+ postPatch = ''
+ substituteInPlace src/libs/ec/file_generator.pl \
+ --replace /usr/bin/perl ${perl}/bin/perl
+
+ # autotools expects these to be in the root
+ cp docs/{AUTHORS,README} .
+ cp docs/Changelog ./ChangeLog
+ cp docs/Changelog ./NEWS
+ '';
+
+ preAutoreconf = ''
+ pushd src/pixmaps/flags_xpm >/dev/null
+ ./makeflags.sh
+ popd >/dev/null
+ '';
+
+ nativeBuildInputs = [ autoreconfHook gettext makeWrapper pkgconfig ];
+
+ buildInputs = [
+ zlib wxGTK perl cryptopp libupnp
+ ] ++ lib.optional httpServer libpng
+ ++ lib.optional client libX11;
enableParallelBuilding = true;
@@ -31,27 +56,21 @@ mkDerivation rec {
"--with-crypto-prefix=${cryptopp}"
"--disable-debug"
"--enable-optimize"
- (stdenv.lib.enableFeature monolithic "monolithic")
- (stdenv.lib.enableFeature daemon "amule-daemon")
- (stdenv.lib.enableFeature client "amule-gui")
- (stdenv.lib.enableFeature httpServer "webserver")
+ (lib.enableFeature monolithic "monolithic")
+ (lib.enableFeature enableDaemon "amule-daemon")
+ (lib.enableFeature client "amule-gui")
+ (lib.enableFeature httpServer "webserver")
];
- postConfigure = ''
- sed -i "src/libs/ec/file_generator.pl" \
- -es'|/usr/bin/perl|${perl}/bin/perl|g'
- '';
-
# aMule will try to `dlopen' libupnp and libixml, so help it
# find them.
postInstall = lib.optionalString monolithic ''
- wrapProgram "$out/bin/amule" --prefix LD_LIBRARY_PATH ":" "${libupnp}/lib"
+ wrapProgram $out/bin/amule \
+ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libupnp ]}
'';
- meta = {
- homepage = http://amule.org/;
+ meta = with lib; {
description = "Peer-to-peer client for the eD2K and Kademlia networks";
-
longDescription = ''
aMule is an eMule-like client for the eD2k and Kademlia
networks, supporting multiple platforms. Currently aMule
@@ -63,9 +82,9 @@ mkDerivation rec {
applications.
'';
- license = stdenv.lib.licenses.gpl2Plus;
-
- platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
- maintainers = [ stdenv.lib.maintainers.phreedom ];
+ homepage = "https://amule.org/";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ phreedom ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/tools/networking/p2p/amule/upnp-1.8.patch b/pkgs/tools/networking/p2p/amule/upnp-1.8.patch
deleted file mode 100644
index 3f5502582a2..00000000000
--- a/pkgs/tools/networking/p2p/amule/upnp-1.8.patch
+++ /dev/null
@@ -1,230 +0,0 @@
---- a/src/UPnPBase.cpp
-+++ b/src/UPnPBase.cpp
-@@ -29,22 +29,12 @@
-
- #ifdef ENABLE_UPNP
-
--// check for broken Debian-hacked libUPnP
- #include
--#ifdef STRING_H // defined in UpnpString.h Yes, I would have liked UPNPSTRING_H much better.
--#define BROKEN_DEBIAN_LIBUPNP
--#endif
-
- #include "UPnPBase.h"
-
- #include // For transform()
-
--#ifdef BROKEN_DEBIAN_LIBUPNP
-- #define GET_UPNP_STRING(a) UpnpString_get_String(a)
--#else
-- #define GET_UPNP_STRING(a) (a)
--#endif
--
- std::string stdEmptyString;
-
- const char s_argument[] = "argument";
-@@ -1127,7 +1117,7 @@
-
-
- // This function is static
--int CUPnPControlPoint::Callback(Upnp_EventType EventType, void *Event, void * /*Cookie*/)
-+int CUPnPControlPoint::Callback(Upnp_EventType EventType, const void *Event, void * /*Cookie*/)
- {
- std::ostringstream msg;
- std::ostringstream msg2;
-@@ -1149,24 +1139,24 @@
- msg2<< "UPNP_DISCOVERY_SEARCH_RESULT: ";
- // UPnP Discovery
- upnpDiscovery:
-- struct Upnp_Discovery *d_event = (struct Upnp_Discovery *)Event;
-+ UpnpDiscovery *d_event = (UpnpDiscovery *)Event;
- IXML_Document *doc = NULL;
- int ret;
-- if (d_event->ErrCode != UPNP_E_SUCCESS) {
-- msg << UpnpGetErrorMessage(d_event->ErrCode) << ".";
-+ if (UpnpDiscovery_get_ErrCode(d_event) != UPNP_E_SUCCESS) {
-+ msg << UpnpGetErrorMessage(UpnpDiscovery_get_ErrCode(d_event)) << ".";
- AddDebugLogLineC(logUPnP, msg);
- }
- // Get the XML tree device description in doc
-- ret = UpnpDownloadXmlDoc(d_event->Location, &doc);
-+ ret = UpnpDownloadXmlDoc(UpnpDiscovery_get_Location_cstr(d_event), &doc);
- if (ret != UPNP_E_SUCCESS) {
- msg << "Error retrieving device description from " <<
-- d_event->Location << ": " <<
-+ UpnpDiscovery_get_Location_cstr(d_event) << ": " <<
- UpnpGetErrorMessage(ret) <<
- "(" << ret << ").";
- AddDebugLogLineC(logUPnP, msg);
- } else {
- msg2 << "Retrieving device description from " <<
-- d_event->Location << ".";
-+ UpnpDiscovery_get_Location_cstr(d_event) << ".";
- AddDebugLogLineN(logUPnP, msg2);
- }
- if (doc) {
-@@ -1195,7 +1185,7 @@
- }
- // Add the root device to our list
- upnpCP->AddRootDevice(rootDevice, urlBase,
-- d_event->Location, d_event->Expires);
-+ UpnpDiscovery_get_Location_cstr(d_event), UpnpDiscovery_get_Expires(d_event));
- }
- // Free the XML doc tree
- IXML::Document::Free(doc);
-@@ -1216,28 +1206,28 @@
- case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: {
- //fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE\n");
- // UPnP Device Removed
-- struct Upnp_Discovery *dab_event = (struct Upnp_Discovery *)Event;
-- if (dab_event->ErrCode != UPNP_E_SUCCESS) {
-+ UpnpDiscovery *dab_event = (UpnpDiscovery *)Event;
-+ if (UpnpDiscovery_get_ErrCode(dab_event) != UPNP_E_SUCCESS) {
- msg << "error(UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE): " <<
-- UpnpGetErrorMessage(dab_event->ErrCode) <<
-+ UpnpGetErrorMessage(UpnpDiscovery_get_ErrCode(dab_event)) <<
- ".";
- AddDebugLogLineC(logUPnP, msg);
- }
-- std::string devType = dab_event->DeviceType;
-+ std::string devType = UpnpDiscovery_get_DeviceType_cstr(dab_event);
- // Check for an InternetGatewayDevice and removes it from the list
- std::transform(devType.begin(), devType.end(), devType.begin(), tolower);
- if (stdStringIsEqualCI(devType, UPnP::Device::IGW)) {
-- upnpCP->RemoveRootDevice(dab_event->DeviceId);
-+ upnpCP->RemoveRootDevice(UpnpDiscovery_get_DeviceID_cstr(dab_event));
- }
- break;
- }
- case UPNP_EVENT_RECEIVED: {
- //fprintf(stderr, "Callback: UPNP_EVENT_RECEIVED\n");
- // Event reveived
-- struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
-- const std::string Sid = e_event->Sid;
-+ UpnpEvent *e_event = (UpnpEvent *)Event;
-+ const std::string Sid = UpnpEvent_get_SID_cstr(e_event);
- // Parses the event
-- upnpCP->OnEventReceived(Sid, e_event->EventKey, e_event->ChangedVariables);
-+ upnpCP->OnEventReceived(Sid, UpnpEvent_get_EventKey(e_event), UpnpEvent_get_ChangedVariables(e_event));
- break;
- }
- case UPNP_EVENT_SUBSCRIBE_COMPLETE:
-@@ -1252,16 +1242,15 @@
- //fprintf(stderr, "Callback: UPNP_EVENT_RENEWAL_COMPLETE\n");
- msg << "error(UPNP_EVENT_RENEWAL_COMPLETE): ";
- upnpEventRenewalComplete:
-- struct Upnp_Event_Subscribe *es_event =
-- (struct Upnp_Event_Subscribe *)Event;
-- if (es_event->ErrCode != UPNP_E_SUCCESS) {
-+ UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
-+ if (UpnpEventSubscribe_get_ErrCode(es_event) != UPNP_E_SUCCESS) {
- msg << "Error in Event Subscribe Callback";
- UPnP::ProcessErrorMessage(
-- msg.str(), es_event->ErrCode, NULL, NULL);
-+ msg.str(), UpnpEventSubscribe_get_ErrCode(es_event), NULL, NULL);
- } else {
- #if 0
- TvCtrlPointHandleSubscribeUpdate(
-- GET_UPNP_STRING(es_event->PublisherUrl),
-+ UpnpEventSubscribe_get_PublisherUrl_cstr(es_event),
- es_event->Sid,
- es_event->TimeOut );
- #endif
-@@ -1280,29 +1269,29 @@
- msg << "error(UPNP_EVENT_SUBSCRIPTION_EXPIRED): ";
- msg2 << "UPNP_EVENT_SUBSCRIPTION_EXPIRED: ";
- upnpEventSubscriptionExpired:
-- struct Upnp_Event_Subscribe *es_event =
-- (struct Upnp_Event_Subscribe *)Event;
-+ UpnpEventSubscribe *es_event = (UpnpEventSubscribe *)Event;
- Upnp_SID newSID;
- memset(newSID, 0, sizeof(Upnp_SID));
- int TimeOut = 1801;
- int ret = UpnpSubscribe(
- upnpCP->m_UPnPClientHandle,
-- GET_UPNP_STRING(es_event->PublisherUrl),
-+
-+ UpnpEventSubscribe_get_PublisherUrl_cstr(es_event),
- &TimeOut,
- newSID);
- if (ret != UPNP_E_SUCCESS) {
- msg << "Error Subscribing to EventURL";
- UPnP::ProcessErrorMessage(
-- msg.str(), es_event->ErrCode, NULL, NULL);
-+ msg.str(), UpnpEventSubscribe_get_ErrCode(es_event), NULL, NULL);
- } else {
- ServiceMap::iterator it =
-- upnpCP->m_ServiceMap.find(GET_UPNP_STRING(es_event->PublisherUrl));
-+ upnpCP->m_ServiceMap.find(UpnpEventSubscribe_get_PublisherUrl_cstr(es_event));
- if (it != upnpCP->m_ServiceMap.end()) {
- CUPnPService &service = *(it->second);
- service.SetTimeout(TimeOut);
- service.SetSID(newSID);
- msg2 << "Re-subscribed to EventURL '" <<
-- GET_UPNP_STRING(es_event->PublisherUrl) <<
-+ UpnpEventSubscribe_get_PublisherUrl_cstr(es_event) <<
- "' with SID == '" <<
- newSID << "'.";
- AddDebugLogLineC(logUPnP, msg2);
-@@ -1321,17 +1310,16 @@
- case UPNP_CONTROL_ACTION_COMPLETE: {
- //fprintf(stderr, "Callback: UPNP_CONTROL_ACTION_COMPLETE\n");
- // This is here if we choose to do this asynchronously
-- struct Upnp_Action_Complete *a_event =
-- (struct Upnp_Action_Complete *)Event;
-- if (a_event->ErrCode != UPNP_E_SUCCESS) {
-+ UpnpActionComplete *a_event = (UpnpActionComplete *)Event;
-+ if (UpnpActionComplete_get_ErrCode(a_event) != UPNP_E_SUCCESS) {
- UPnP::ProcessErrorMessage(
- "UpnpSendActionAsync",
-- a_event->ErrCode, NULL,
-- a_event->ActionResult);
-+ UpnpActionComplete_get_ErrCode(a_event), NULL,
-+ UpnpActionComplete_get_ActionResult(a_event));
- } else {
- // Check the response document
- UPnP::ProcessActionResponse(
-- a_event->ActionResult,
-+ UpnpActionComplete_get_ActionResult(a_event),
- "");
- }
- /* No need for any processing here, just print out results.
-@@ -1342,12 +1330,11 @@
- case UPNP_CONTROL_GET_VAR_COMPLETE: {
- //fprintf(stderr, "Callback: UPNP_CONTROL_GET_VAR_COMPLETE\n");
- msg << "error(UPNP_CONTROL_GET_VAR_COMPLETE): ";
-- struct Upnp_State_Var_Complete *sv_event =
-- (struct Upnp_State_Var_Complete *)Event;
-- if (sv_event->ErrCode != UPNP_E_SUCCESS) {
-+ UpnpStateVarComplete *sv_event = (UpnpStateVarComplete *)Event;
-+ if (UpnpStateVarComplete_get_ErrCode(sv_event) != UPNP_E_SUCCESS) {
- msg << "m_UpnpGetServiceVarStatusAsync";
- UPnP::ProcessErrorMessage(
-- msg.str(), sv_event->ErrCode, NULL, NULL);
-+ msg.str(), UpnpStateVarComplete_get_ErrCode(sv_event), NULL, NULL);
- } else {
- #if 0
- // Warning: The use of UpnpGetServiceVarStatus and
---- a/src/UPnPBase.h
-+++ b/src/UPnPBase.h
-@@ -490,9 +490,19 @@
- // Callback function
- static int Callback(
- Upnp_EventType EventType,
-- void* Event,
-+ const void* Event,
- void* Cookie);
-
-+#if UPNP_VERSION < 10800
-+ /* in libupnp 1.6 Event is not const */
-+ static int Callback(
-+ Upnp_EventType EventType,
-+ void* Event,
-+ void* Cookie) {
-+ return Callback(EventType, (const void *)Event, Cookie);
-+ }
-+#endif
-+
- private:
- void OnEventReceived(
- const std::string &Sid,
\ No newline at end of file
diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix
index 7c883ebdc55..e6d427b2bcb 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/pkgs/tools/networking/telepresence/default.nix
@@ -8,22 +8,22 @@ let
url = "https://github.com/datawire/sshuttle.git";
rev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269";
sha256 = "1q20lnljndwcpgqv2qrf1k0lbvxppxf98a4g5r9zd566znhcdhx3";
- leaveDotGit = true;
};
- buildInputs = p.buildInputs ++ [ git ];
+ nativeBuildInputs = p.nativeBuildInputs ++ [ git ];
+
postPatch = "rm sshuttle/tests/client/test_methods_nat.py";
postInstall = "mv $out/bin/sshuttle $out/bin/sshuttle-telepresence";
});
in pythonPackages.buildPythonPackage rec {
pname = "telepresence";
- version = "0.93";
+ version = "0.101";
src = fetchFromGitHub {
owner = "datawire";
repo = "telepresence";
rev = version;
- sha256 = "1x8yjcqj8v35a5pxy2rxaixbznb4vk8ll958b4l46gnkfxf1kh1d";
+ sha256 = "1rxq22vcrw29682g7pdcwcjyifcg61z8y4my1di7yw731aldk274";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix
index 2683192c89e..24301fc76d8 100644
--- a/pkgs/tools/package-management/protontricks/default.nix
+++ b/pkgs/tools/package-management/protontricks/default.nix
@@ -4,13 +4,13 @@
buildPythonApplication rec {
pname = "protontricks";
- version = "1.2.4";
+ version = "1.2.5";
src = fetchFromGitHub {
owner = "Matoking";
repo = pname;
rev = version;
- sha256 = "0kwf2m62v4w7ds9y2fpcb8scazirkj114rn8y0ak62ph7lav8ma4";
+ sha256 = "1nkhp1mnvah7zkc1s55jji9lxxbph1miw8dfl9kb72khmaqfzsf0";
};
propagatedBuildInputs = [ vdf ];
diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix
index d271490ca1c..1fc462bad8b 100644
--- a/pkgs/tools/text/miller/default.nix
+++ b/pkgs/tools/text/miller/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "miller";
- version = "5.5.0";
+ version = "5.6.2";
src = fetchFromGitHub {
owner = "johnkerl";
repo = "miller";
rev = "v${version}";
- sha256 = "1zkh87vq0gqcx6z6yzf1rq30jmdgdpp0rx5f0vvl0zcn0hc2smpz";
+ sha256 = "1xajaab02y9bysanfn4i5c77q1zfmjzdswyvw2mzbidsxnjsgn6l";
};
nativeBuildInputs = [ autoreconfHook flex libtool ];
diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix
index 69fde7784f5..6622a03decc 100644
--- a/pkgs/tools/typesetting/tex/texlive/combine.nix
+++ b/pkgs/tools/typesetting/tex/texlive/combine.nix
@@ -136,9 +136,9 @@ in buildEnv {
script =
writeText "hyphens.sed" (
# pick up the header
- "1,/^\% from/p;"
+ "1,/^% from/p;"
# pick up all sections matching packages that we combine
- + lib.concatMapStrings (pname: "/^\% from ${pname}:$/,/^\%/p;\n") pnames
+ + lib.concatMapStrings (pname: "/^% from ${pname}:$/,/^%/p;\n") pnames
);
in ''
(
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 38ca7129645..3b2b32065fc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -217,6 +217,8 @@ mapAliases ({
mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25
module_init_tools = kmod; # added 2016-04-22
mono-zeroconf = throw "deprecated 2019-09-20: abandoned by upstream.";
+ mozart = mozart2-binary; # added 2019-09-23
+ mozart-binary = mozart2-binary; # added 2019-09-23
mpich2 = mpich; # added 2018-08-06
msf = metasploit; # added 2018-04-25
libmsgpack = msgpack; # added 2018-08-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f103af7323..3a2ca42ddf4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -716,7 +716,7 @@ in
amuleDaemon = appendToName "daemon" (amule.override {
monolithic = false;
- daemon = true;
+ enableDaemon = true;
});
amuleGui = appendToName "gui" (amule.override {
@@ -4227,6 +4227,8 @@ in
lbreakout2 = callPackage ../games/lbreakout2 { };
+ lefthook = gitAndTools.lefthook;
+
lego = callPackage ../tools/admin/lego { };
leocad = callPackage ../applications/graphics/leocad { };
@@ -4407,6 +4409,10 @@ in
netsniff-ng = callPackage ../tools/networking/netsniff-ng { };
+ next = callPackage ../applications/networking/browsers/next { };
+
+ next-gtk-webkit = callPackage ../applications/networking/browsers/next-gtk-webkit { };
+
nfpm = callPackage ../tools/package-management/nfpm { };
nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { };
@@ -8236,8 +8242,9 @@ in
mosml = callPackage ../development/compilers/mosml { };
- mozart-binary = callPackage ../development/compilers/mozart/binary.nix { };
- mozart = mozart-binary;
+ mozart2 = callPackage ../development/compilers/mozart { };
+
+ mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { };
nim = callPackage ../development/compilers/nim { };
nrpl = callPackage ../development/tools/nrpl { };
@@ -8317,7 +8324,6 @@ in
buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }).tests;
cratesIO = callPackage ../build-support/rust/crates-io.nix { };
- cargo-vendor = callPackage ../build-support/rust/cargo-vendor { };
cargo-web = callPackage ../development/tools/cargo-web {
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
@@ -12693,6 +12699,8 @@ in
microsoft_gsl = callPackage ../development/libraries/microsoft_gsl { };
+ mimalloc = callPackage ../development/libraries/mimalloc { };
+
minizip = callPackage ../development/libraries/minizip { };
mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { };
@@ -18309,7 +18317,6 @@ in
libpng = libpng_apng;
python = python2;
gnused = gnused_422;
- icu = icu63;
inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling
Kerberos AVFoundation MediaToolbox
CoreLocation Foundation AddressBook;
@@ -19151,7 +19158,7 @@ in
libowfat = callPackage ../development/libraries/libowfat { };
- librecad = callPackage ../applications/misc/librecad { };
+ librecad = libsForQt5.callPackage ../applications/misc/librecad { };
libreoffice = hiPrio libreoffice-still;
libreoffice-unwrapped = libreoffice.libreoffice;
@@ -20200,7 +20207,7 @@ in
quasselDaemon = quassel.override {
monolithic = false;
- daemon = true;
+ enableDaemon = true;
withKDE = false;
tag = "-daemon-qt5";
};
@@ -22094,9 +22101,8 @@ in
hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; };
- hedgewars = callPackage ../games/hedgewars {
+ hedgewars = libsForQt5.callPackage ../games/hedgewars {
inherit (haskellPackages) ghcWithPackages;
- ffmpeg = ffmpeg_2;
};
hexen = callPackage ../games/hexen { };
@@ -23530,7 +23536,7 @@ in
netlogo = callPackage ../applications/science/misc/netlogo { };
- ns-3 = callPackage ../development/libraries/science/networking/ns3 { };
+ ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; };
root = callPackage ../applications/science/misc/root {
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 560578f6eca..55b9ff14a03 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1052,6 +1052,8 @@ in {
pytest-click = callPackage ../development/python-modules/pytest-click { };
+ pytest-check = callPackage ../development/python-modules/pytest-check { };
+
pytest-env = callPackage ../development/python-modules/pytest-env { };
pytest-flask = callPackage ../development/python-modules/pytest-flask { };